Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update heat and atmosphere in mi-go base #35618

Merged
merged 14 commits into from
Nov 26, 2019
29 changes: 29 additions & 0 deletions data/json/effects.json
Original file line number Diff line number Diff line change
Expand Up @@ -1817,6 +1817,35 @@
},
"int_decay_step": 0
},
{
"type": "effect_type",
"id": "migo_atmosphere",
"name": [ "Stinking air", "Disorienting air", "Disorienting air", "Smothering air", "Smothering air" ],
"desc": [
"The air in here smells like vinegar and mold.",
"The air in here smells like vinegar and mold. It makes you feel soft-headed and confused.",
"The air in here smells like vinegar and mold. It makes you feel soft-headed and confused.",
"The air in here smells like vinegar and mold. It is closing in and smothering you, making it impossible to think clearly.",
"The air in here smells like vinegar and mold. It is closing in and smothering you, making it impossible to think clearly."
],
"apply_message": "The air in here smells like vinegar and mold, and hurts your lungs a bit.",
"max_intensity": 5,
"int_dur_factor": "5 seconds",
"rating": "bad",
"miss_messages": [ [ "You feel groggy in this sweltering, foul air.", 2 ] ],
"harmful_cough": false,
"base_mods": { "cough_chance": [ -1002 ] },
"scaling_mods": {
"str_mod": [ -0.25 ],
"per_mod": [ -0.5 ],
"dex_mod": [ -0.25 ],
"int_mod": [ -0.75 ],
"speed_mod": [ -10 ],
"vomit_chance": [ 10 ],
"cough_chance": [ 501 ]
},
"show_in_info": true
},
{
"type": "effect_type",
"id": "has_og_comm_freq"
Expand Down
21 changes: 21 additions & 0 deletions data/json/emit.json
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,27 @@
"intensity": 3,
"qty": 1
},
{
"id": "emit_hot_air_migo_seep",
"type": "emit",
"field": "fd_hot_air_sauna",
"intensity": 3,
"qty": 50
},
{
"id": "emit_hot_air_migo_blast",
"type": "emit",
"field": "fd_hot_air_sauna",
"intensity": 3,
"qty": 300
},
{
"id": "emit_migo_atmosphere",
"type": "emit",
"field": "fd_migo_atmosphere",
"intensity": 3,
"qty": 300
},
{
"id": "emit_glimmer",
"type": "emit",
Expand Down
72 changes: 72 additions & 0 deletions data/json/field_type.json
Original file line number Diff line number Diff line change
Expand Up @@ -935,6 +935,78 @@
"phase": "gas",
"display_field": true
},
{
"id": "fd_hot_air_sauna",
"type": "field_type",
"intensity_levels": [
{ "name": "hot air sauna", "sym": "&", "convection_temperature_mod": 65 },
{ "color": "yellow", "convection_temperature_mod": 68 },
{ "color": "red", "convection_temperature_mod": 71 }
],
"decay_amount_factor": 5,
"percent_spread": 100,
"outdoor_age_speedup": "100 minutes",
"priority": -1,
"half_life": "50 minutes",
"phase": "gas",
"display_field": true
},
{
"id": "fd_migo_atmosphere",
"type": "field_type",
"intensity_levels": [
{
"name": "foul-smelling air",
"sym": "8",
"dangerous": true,
"effects": [
{
"effect_id": "migo_atmosphere",
"body_part": "MOUTH",
"intensity": 1,
"min_duration": "5 seconds",
"max_duration": "10 seconds",
"immune_inside_vehicle": true
}
]
},
{
"name": "foul-smelling air",
"translucency": 1,
"effects": [
{
"effect_id": "migo_atmosphere",
"body_part": "MOUTH",
"intensity": 2,
"min_duration": "10 seconds",
"max_duration": "25 seconds"
}
]
},
{
"name": "foul-smelling air",
"effects": [
{
"effect_id": "migo_atmosphere",
"body_part": "MOUTH",
"intensity": 4,
"min_duration": "15 seconds",
"max_duration": "25 seconds"
}
]
}
],
"decay_amount_factor": 5,
"gas_absorption_factor": 15,
"percent_spread": 30,
"outdoor_age_speedup": "3 minutes",
"dirty_transparency_cache": true,
"has_fume": true,
"immunity_data": { "body_part_env_resistance": [ [ "MOUTH", 15 ] ] },
"priority": 8,
"half_life": "10 minutes",
"phase": "gas"
},
{
"id": "fd_fungicidal_gas",
"type": "field_type",
Expand Down
6 changes: 3 additions & 3 deletions data/json/furniture_and_terrain/furniture-migo.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"required_str": -1,
"light_emitted": 3,
"flags": [ "TRANSPARENT", "EMITTER" ],
"emissions": [ "emit_heater_vehicle" ],
"emissions": [ "emit_hot_air_migo_seep" ],
"bash": { "str_min": 13, "str_max": 26, "sound": "splorch!", "sound_fail": "whump!", "furn_set": "f_alien_scar" }
},
{
Expand All @@ -39,7 +39,7 @@
"coverage": 40,
"required_str": -1,
"flags": [ "TRANSPARENT", "EMITTER" ],
"emissions": [ "emit_toxic_cloud", "emit_hot_air4_blast" ],
"emissions": [ "emit_migo_atmosphere", "emit_hot_air_migo_blast" ],
"//": "TODO: Make a custom toxic gas emission that is not visible to the player",
"bash": { "str_min": 30, "str_max": 60, "sound": "splorch!", "sound_fail": "whump!", "furn_set": "f_alien_scar" }
},
Expand Down Expand Up @@ -69,7 +69,7 @@
"coverage": 40,
"required_str": -1,
"flags": [ "TRANSPARENT", "EMITTER" ],
"emissions": [ "emit_toxic_leak", "emit_hot_air4_blast", "emit_shock_burst" ],
"emissions": [ "emit_hot_air_migo_seep", "emit_shock_burst" ],
"//": "TODO: Make a custom toxic gas emission that is not visible to the player",
"bash": { "str_min": 250, "str_max": 600, "sound": "splorch!", "sound_fail": "splat!" }
},
Expand Down