Skip to content

Commit

Permalink
Merge pull request #72172 from Fris0uman/no_looney_toons
Browse files Browse the repository at this point in the history 
Revert #69555
  • Loading branch information
@kevingranade
kevingranade authored Mar 7, 2024
2 parents e586e92 + f81bc0b commit e46ffd3
Show file tree
Hide file tree
Showing 18 changed files with 132 additions and 439 deletions.
87 changes: 0 additions & 87 deletions data/json/effects.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3054,74 +3054,6 @@
"max_duration": 14515200,
"dur_add_perc": 50
},
{
"//": "For player, indistinguishable from pre_conjunctivitis_bacterial, but separate here to allow for separate resistances from antibiotics.",
"type": "effect_type",
"id": "pre_conjunctivitis_viral",
"show_in_info": false,
"immune_flags": [ "INFECTION_IMMUNE", "SEESLEEP" ],
"blood_analysis_description": "Viral Infection",
"max_duration": "71 h"
},
{
"//": "For player, indistinguishable from pre_conjunctivitis_viral, but separate here to allow for separate resistances from antibiotics.",
"type": "effect_type",
"id": "pre_conjunctivitis_bacterial",
"show_in_info": false,
"immune_flags": [ "INFECTION_IMMUNE", "SEESLEEP" ],
"blood_analysis_description": "Bacterial Infection",
"max_duration": "71 h"
},
{
"//": "For player, indistinguishable from conjunctivitis_bacterial, but separate here to allow for separate resistances from antibiotics.",
"type": "effect_type",
"id": "conjunctivitis_viral",
"name": [ "Conjunctivitis" ],
"desc": [
"Commonly known as pinkeye, this minor infection can be treated with antihistamines. If it's bacterial, antibiotics may help, but you can't tell without a lab analysis."
],
"apply_memorial_log": "Got pinkeye.",
"remove_memorial_log": "Got over a pinkeye infection.",
"apply_message": "Your itchy eye leaks a filmy discharge.",
"rating": "bad",
"resist_effects": [ "took_antihistamine", "took_flumed" ],
"resist_traits": [ "INFRESIST", "PER_SLIME_OK" ],
"immune_flags": [ "INFECTION_IMMUNE", "SEESLEEP" ],
"int_dur_factor": "50 m",
"base_mods": { "int_mod": [ -1 ], "per_mod": [ -2 ], "pain_min": [ 1 ], "pain_chance": [ 400, 1000 ] },
"limb_score_mods": [
{ "limb_score": "vision", "modifier": 0.8, "resist_modifier": 0.9 },
{ "limb_score": "night_vis", "modifier": 0.8, "resist_modifier": 0.9 }
],
"miss_messages": [ [ "It feels like there's sand in your eye.", 1 ] ],
"flags": [ "EFFECT_LIMB_SCORE_MOD" ],
"blood_analysis_description": "Viral Infection"
},
{
"//": "For player, indistinguishable from conjunctivitis_bacterial, but separate here to allow for separate resistances from antibiotics.",
"type": "effect_type",
"id": "conjunctivitis_bacterial",
"name": [ "Conjunctivitis" ],
"desc": [
"Commonly known as pinkeye, this minor infection can be treated with antihistamines. If it's bacterial, antibiotics may help, but you can't tell without a lab analysis."
],
"apply_memorial_log": "Got pinkeye.",
"remove_memorial_log": "Got over a pinkeye infection.",
"apply_message": "Your itchy eye leaks a filmy discharge.",
"rating": "bad",
"resist_effects": [ "took_antihistamine", "took_flumed" ],
"resist_traits": [ "INFRESIST", "PER_SLIME_OK" ],
"immune_flags": [ "INFECTION_IMMUNE", "SEESLEEP" ],
"int_dur_factor": "50 m",
"base_mods": { "int_mod": [ -1 ], "per_mod": [ -2 ], "pain_min": [ 1 ], "pain_chance": [ 400, 1000 ] },
"miss_messages": [ [ "It feels like there's sand in your eye.", 1 ] ],
"limb_score_mods": [
{ "limb_score": "vision", "modifier": 0.8, "resist_modifier": 0.9 },
{ "limb_score": "night_vis", "modifier": 0.8, "resist_modifier": 0.9 }
],
"flags": [ "EFFECT_LIMB_SCORE_MOD" ],
"blood_analysis_description": "Bacterial Infection"
},
{
"type": "effect_type",
"id": "prophylactic_antivenom",
Expand Down Expand Up @@ -3169,10 +3101,6 @@
"rat_bite_fever",
"infected",
"asthma",
"pre_conjunctivitis_viral",
"pre_conjunctivitis_bacterial",
"conjunctivitis_viral",
"conjunctivitis_bacterial",
"common_cold",
"flu"
],
Expand Down Expand Up @@ -4792,21 +4720,6 @@
}
]
},
{
"id": "slippery_terrain",
"type": "effect_type",
"max_duration": "1 s",
"name": [ "Slick Surface", "Slippery Terrain", "Dangerously Slippery" ],
"desc": [
"There's a slippery surface here, running may be a bad idea.",
"It's quite slippery, it may not be safe to stand here.",
"This area is extremely slippery."
],
"rating": "bad",
"show_intensity": true,
"resist_traits": [ "GASTROPOD_BALANCE" ],
"show_in_info": true
},
{
"type": "effect_type",
"id": "hay_fever",
Expand Down
56 changes: 0 additions & 56 deletions data/json/effects_on_condition/misc_effect_on_condition.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,62 +128,6 @@
"id": "add_effect",
"effect": { "u_add_effect": { "context_val": "effect" }, "duration": { "context_val": "duration" } }
},
{
"type": "effect_on_condition",
"id": "EOC_PRE_CONJUNCTIVITIS_VIRAL",
"recurrence": [ "24 hours", "72 hours" ],
"condition": {
"and": [
{ "u_has_effect": "pre_conjunctivitis_viral" },
{ "not": { "u_has_effect": "conjunctivitis_bacterial" } },
{ "not": { "u_has_effect": "conjunctivitis_viral" } },
{ "not": { "u_has_trait": "SEESLEEP" } },
{ "not": { "u_has_bionics": "armor_bio_eyes" } }
]
},
"effect": [
{ "u_add_effect": "conjunctivitis_viral", "duration": { "math": [ "rand(259200) + 432000" ] }, "target_part": "eyes" },
{ "u_lose_effect": "pre_conjunctivitis_bacterial" },
{ "u_lose_effect": "pre_conjunctivitis_viral" }
]
},
{
"type": "effect_on_condition",
"id": "EOC_PRE_CONJUNCTIVITIS_BACTERIAL",
"recurrence": [ "24 hours", "72 hours" ],
"condition": {
"and": [
{ "u_has_effect": "pre_conjunctivitis_bacterial" },
{ "not": { "u_has_effect": "conjunctivitis_bacterial" } },
{ "not": { "u_has_effect": "conjunctivitis_viral" } },
{ "not": { "u_has_trait": "SEESLEEP" } },
{ "not": { "u_has_bionics": "armor_bio_eyes" } }
]
},
"effect": [
{
"u_add_effect": "conjunctivitis_bacterial",
"duration": { "math": [ "rand(259200) + 432000" ] },
"target_part": "eyes"
},
{ "u_lose_effect": "pre_conjunctivitis_viral" },
{ "u_lose_effect": "pre_conjunctivitis_bacterial" }
]
},
{
"type": "effect_on_condition",
"id": "EOC_CONJUNCTIVITIS",
"recurrence": [ "10 minutes", "45 minutes" ],
"condition": {
"and": [
{ "or": [ { "u_has_effect": "conjunctivitis_viral" }, { "u_has_effect": "conjunctivitis_bacterial" } ] },
{ "not": { "u_has_effect": "formication" } },
{ "not": { "u_has_effect": "took_antihistamine" } },
{ "not": { "u_has_effect": "sleep" } }
]
},
"effect": [ { "u_add_effect": "formication", "duration": "5 minutes", "target_part": "head" } ]
},
{
"type": "effect_on_condition",
"id": "sewer_morale_debuff",
Expand Down
11 changes: 2 additions & 9 deletions data/json/effects_on_condition/mutation_eocs/mutation_effect_eocs.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,15 +226,8 @@
{
"type": "effect_on_condition",
"id": "rashy_skin",
"recurrence": [ "2 hours", "24 hours" ],
"condition": {
"and": [
{ "u_has_trait": "SKIN_RASHY" },
{ "not": { "u_has_effect": "took_flumed" } },
{ "not": { "u_has_effect": "took_antihistamine" } },
{ "not": { "u_has_effect": "formication" } }
]
},
"recurrence": [ "2 hour", "24 hours" ],
"condition": { "and": [ { "u_has_trait": "SKIN_RASHY" }, { "not": { "u_has_effect": "formication" } } ] },
"effect": [ { "u_add_effect": "formication", "duration": "10 minutes", "target_part": "random" } ]
},
{
Expand Down
86 changes: 6 additions & 80 deletions data/json/field_type.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,51 +17,12 @@
"id": "fd_bile",
"type": "field_type",
"legacy_enum_id": 2,
"intensity_levels": [
{
"name": "bile splatter",
"sym": "}",
"color": "pink",
"effects": [
{
"effect_id": "slippery_terrain",
"intensity": 1,
"min_duration": "1 second",
"immune_in_vehicle": true,
"is_environmental": false
}
]
},
{
"name": "bile stain",
"effects": [
{
"effect_id": "slippery_terrain",
"intensity": 2,
"min_duration": "1 second",
"immune_in_vehicle": true,
"is_environmental": false
}
]
},
{
"name": "puddle of bile",
"effects": [
{
"effect_id": "slippery_terrain",
"intensity": 3,
"min_duration": "1 second",
"immune_in_vehicle": true,
"is_environmental": false
}
]
}
],
"intensity_levels": [ { "name": "bile splatter", "color": "pink" }, { "name": "bile stain" }, { "name": "puddle of bile" } ],
"description_affix": "covered_in",
"underwater_age_speedup": "25 minutes",
"decay_amount_factor": 2,
"is_splattering": true,
"half_life": "30 minutes",
"half_life": "1 days",
"phase": "liquid",
"accelerated_decay": true,
"display_field": true,
Expand Down Expand Up @@ -215,50 +176,15 @@
"type": "field_type",
"legacy_enum_id": 6,
"intensity_levels": [
{
"name": "slime trail",
"color": "light_green",
"effects": [
{
"effect_id": "slippery_terrain",
"intensity": 1,
"min_duration": "1 second",
"immune_in_vehicle": true,
"is_environmental": false
}
]
},
{
"name": "slime stain",
"effects": [
{
"effect_id": "slippery_terrain",
"intensity": 2,
"min_duration": "1 second",
"immune_in_vehicle": true,
"is_environmental": false
}
]
},
{
"name": "puddle of slime",
"color": "green",
"effects": [
{
"effect_id": "slippery_terrain",
"intensity": 3,
"min_duration": "1 second",
"immune_in_vehicle": true,
"is_environmental": false
}
]
}
{ "name": "slime trail", "color": "light_green" },
{ "name": "slime stain" },
{ "name": "puddle of slime", "color": "green" }
],
"description_affix": "covered_in",
"decay_amount_factor": 2,
"apply_slime_factor": 10,
"is_splattering": true,
"half_life": "25 minutes",
"half_life": "1 days",
"phase": "liquid",
"accelerated_decay": true,
"display_field": true,
Expand Down
7 changes: 0 additions & 7 deletions data/json/itemgroups/Drugs_Tobacco_Alcohol/drugs.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -739,13 +739,6 @@
"container-item": "bottle_plastic_pill_prescription",
"entries": [ { "item": "melatonin_tablet", "container-item": "null", "count": 30 } ]
},
{
"type": "item_group",
"id": "antihistamine_bottle_full",
"subtype": "collection",
"container-item": "bottle_plastic_pill_prescription",
"entries": [ { "item": "antihistamine", "container-item": "null", "count": 30 } ]
},
{
"type": "item_group",
"id": "protein_bottle_full",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/armor/eyewear.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
"material_thickness": 3,
"environmental_protection": 4,
"flags": [ "WATER_FRIENDLY", "SUN_GLASSES", "SKINTIGHT" ],
"armor": [ { "encumbrance": 5, "coverage": 95, "covers": [ "eyes" ], "rigid_layer_only": true } ]
"armor": [ { "encumbrance": 5, "coverage": 100, "covers": [ "eyes" ], "rigid_layer_only": true } ]
},
{
"id": "glasses_bifocal",
Expand Down
Loading

0 comments on commit e46ffd3

Please sign in to comment.