Skip to content

Commit

Permalink
feat(content,port): Triffid Regrowth (#4154)
Browse files Browse the repository at this point in the history
* Triffid Regrowth

Co-Authored-By: Mom-Bun <43492737+mom-bun@users.noreply.github.com>

* style(autofix.ci): automated formatting

* Update triffid_grove.json

* Update mapgen.cpp

* Update data/json/effects.json

Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>

* Update data/json/field_type.json

Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>

* Update data/json/effects.json

Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>

* Update data/json/field_type.json

Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>

* Update data/json/furniture_and_terrain/furniture-triffid.json

Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>

* Update data/json/furniture_and_terrain/furniture-triffid.json

Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>

* Update data/json/furniture_and_terrain/terrain-triffid.json

Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>

* Update data/json/furniture_and_terrain/terrain-triffid.json

Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>

---------

Co-authored-by: Mom-Bun <43492737+mom-bun@users.noreply.github.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
  • Loading branch information
4 people authored Jan 25, 2024
1 parent 273f510 commit f683d5b
Show file tree
Hide file tree
Showing 27 changed files with 1,354 additions and 328 deletions.
25 changes: 25 additions & 0 deletions data/json/effects.json
Original file line number Diff line number Diff line change
Expand Up @@ -512,6 +512,31 @@
"vomit_chance": [ 600, 1200 ]
}
},
{
"type": "effect_type",
"id": "tpollen",
"name": [ "Pollen Inhalation" ],
"desc": [ "The pollen makes it hard to breathe!" ],
"miss_messages": [ [ "Your head is swimming from the pollen in the air.", 1 ] ],
"rating": "bad",
"harmful_cough": true,
"pain_sizing": true,
"hurt_sizing": true,
"main_parts_only": true,
"base_mods": {
"per_mod": [ -2, -1 ],
"dex_mod": [ -1, -1 ],
"str_mod": [ -2, 0 ],
"pain_min": [ 2 ],
"pain_chance": [ 150, 900 ],
"hurt_min": [ 2 ],
"hurt_chance": [ 450, 2700 ],
"speed_mod": [ -10 ],
"cough_chance": [ 10 ]
},
"show_in_info": true,
"blood_analysis_description": "Unknown Organic Toxin"
},
{
"type": "effect_type",
"id": "paralyzepoison",
Expand Down
7 changes: 7 additions & 0 deletions data/json/emit.json
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,13 @@
"intensity": 3,
"qty": 40
},
{
"id": "emit_pollen_stream",
"type": "emit",
"field": "fd_pollen_triffid",
"intensity": 2,
"qty": 24
},
{
"id": "emit_cold_air2_stream",
"type": "emit",
Expand Down
56 changes: 56 additions & 0 deletions data/json/field_type.json
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,62 @@
"display_field": true,
"looks_like": "fd_fire"
},
{
"id": "fd_pollen_triffid",
"type": "field_type",
"legacy_enum_id": 51,
"intensity_levels": [
{
"name": "faint triffid pollen",
"sym": "8",
"dangerous": true,
"translucency": 1,
"effects": [
{
"effect_id": "tpollen",
"body_part": "mouth",
"intensity": 2,
"min_duration": "2 minutes",
"max_duration": "2 minutes",
"immune_inside_vehicle": true,
"message": "You feel sick from inhaling the triffid pollen.",
"message_type": "bad"
}
]
},
{
"name": "triffid pollen",
"color": "light_green",
"transparent": false,
"translucency": 10,
"effects": [
{
"effect_id": "tpollen",
"body_part": "mouth",
"intensity": 5,
"min_duration": "3 minutes",
"max_duration": "3 minutes",
"immune_inside_vehicle": true,
"message": "You feel sick from inhaling the triffid pollen.",
"message_type": "bad"
}
]
}
],
"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",
"display_items": false,
"display_field": true,
"looks_like": "fd_nuke_gas"
},
{
"id": "fd_electricity",
"type": "field_type",
Expand Down
52 changes: 52 additions & 0 deletions data/json/furniture_and_terrain/furniture-triffid.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
[
{
"type": "furniture",
"id": "f_glowingbulb",
"name": "luminous plant bulb",
"description": "A small plant grows among the roots here, its green onion-like bulb illuminating the area around it.",
"symbol": "!",
"color": "brown",
"move_cost_mod": 6,
"required_str": -1,
"light_emitted": 15,
"flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "ORGANIC" ],
"bash": {
"str_min": 6,
"str_max": 30,
"sound": "smash!",
"sound_fail": "whump.",
"items": [ { "item": "splinter", "count": [ 3, 5 ] } ]
}
},
{
"type": "furniture",
"id": "f_brambles",
"name": "brambles",
"symbol": "#",
"bgcolor": "brown",
"description": "A wall of tangled roots blocks the path here, you'd have destroy it to get past.",
"move_cost_mod": -1,
"coverage": 60,
"required_str": -1,
"flags": [ "TRANSPARENT", "BLOCKSDOOR", "SHORT", "THIN_OBSTACLE" ],
"bash": {
"str_min": 10,
"str_max": 60,
"sound": "smash",
"sound_fail": "whump.",
"items": [ { "item": "splinter", "count": [ 10, 15 ] } ]
}
},
{
"type": "furniture",
"id": "f_midden",
"name": "composting midden",
"description": "A hole that has been dug into the roots here, a pretty unpleasant smell emits from it.",
"symbol": "O",
"bgcolor": "brown",
"move_cost_mod": 3,
"coverage": 35,
"required_str": -1,
"flags": [ "TRANSPARENT", "CONTAINER", "PLACE_ITEM", "SHORT", "MOUNTABLE" ]
}
]
191 changes: 191 additions & 0 deletions data/json/furniture_and_terrain/terrain-triffid.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,191 @@
[
{
"type": "terrain",
"id": "t_triffid_bark_wall",
"name": "solid bark wall",
"description": "A solid wall of bark, enclosing the trunk of a massive tree. It will probably burn quite well.",
"symbol": "LINE_OXOX",
"color": "brown",
"move_cost": 0,
"coverage": 100,
"flags": [ "FLAMMABLE", "NOITEM", "SUPPORTS_ROOF", "WALL", "NO_SCENT", "AUTO_WALL_SYMBOL", "MINEABLE", "BLOCK_WIND" ],
"connects_to": "WALL",
"bash": {
"str_min": 60,
"str_max": 180,
"sound": "crunch!",
"sound_fail": "whump!",
"ter_set": "t_bark_wall_chipped",
"items": [ { "item": "splinter", "count": [ 5, 10 ] } ]
}
},
{
"type": "terrain",
"id": "t_bark_wall_chipped",
"name": "chipped bark wall",
"description": "A solid wall of bark enclosing the trunk of a massive tree. Some of it has been broken away.",
"symbol": "LINE_OXOX",
"color": "brown",
"move_cost": 0,
"coverage": 100,
"flags": [ "FLAMMABLE", "NOITEM", "SUPPORTS_ROOF", "WALL", "REDUCE_SCENT", "AUTO_WALL_SYMBOL", "MINEABLE", "BLOCK_WIND" ],
"connects_to": "WALL",
"bash": {
"str_min": 40,
"str_max": 160,
"sound": "crunch!",
"sound_fail": "whump!",
"ter_set": "t_bark_wall_broken",
"items": [ { "item": "splinter", "count": [ 5, 10 ] } ]
}
},
{
"type": "terrain",
"id": "t_bark_wall_broken",
"name": "broken bark wall",
"description": "A formerly solid wall of bark, now almost completely destroyed and waiting to collapse.",
"symbol": "&",
"color": "brown",
"move_cost": 0,
"flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "NOITEM", "SUPPORTS_ROOF", "REDUCE_SCENT", "PERMEABLE", "CONNECT_TO_WALL" ],
"bash": {
"str_min": 8,
"str_max": 150,
"sound": "crash!",
"sound_fail": "whump!",
"ter_set": "t_barkfloor",
"items": [ { "item": "splinter", "count": [ 10, 20 ] } ]
}
},
{
"type": "terrain",
"id": "t_triffid_wood_wall",
"name": "solid wood wall",
"description": "A solid wall of naturally grown wood. Likely very flammable.",
"symbol": "LINE_OXOX",
"color": "brown",
"move_cost": 0,
"coverage": 100,
"flags": [ "FLAMMABLE", "NOITEM", "SUPPORTS_ROOF", "WALL", "NO_SCENT", "AUTO_WALL_SYMBOL", "MINEABLE", "BLOCK_WIND" ],
"connects_to": "WALL",
"bash": {
"str_min": 80,
"str_max": 180,
"sound": "crunch!",
"sound_fail": "whump!",
"ter_set": "t_barkfloor",
"items": [ { "item": "splinter", "count": [ 20, 25 ] } ]
}
},
{
"type": "terrain",
"id": "t_barkfloor",
"name": "bark",
"description": "A solid piece of bark covers the floor here.",
"symbol": ".",
"color": "cyan",
"move_cost": 2,
"flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "ROAD" ],
"bash": {
"sound": "SMASH!",
"ter_set": "t_dirt",
"str_min": 50,
"str_max": 400,
"str_min_supported": 100,
"items": [ { "item": "splinter", "count": [ 2, 8 ] } ]
}
},
{
"type": "terrain",
"id": "t_triffid_leaves",
"name": "branches with leaves",
"description": "Thin branches emerge here, covered with thick, large leaves.",
"symbol": "#",
"color": "green",
"move_cost": 8,
"coverage": 40,
"flags": [ "TRANSPARENT", "FLAMMABLE_ASH" ],
"bash": { "str_min": 4, "str_max": 60, "sound": "crunch.", "sound_fail": "poof!", "ter_set": "t_null" }
},
{
"type": "terrain",
"id": "t_root_floor",
"name": "root floor",
"description": "A dirt floor covered with roots.",
"symbol": "#",
"color": "brown",
"move_cost": 2,
"flags": [ "SUPPORTS_ROOF", "WALL", "NO_SCENT" ],
"bash": {
"str_min": 12,
"str_max": 150,
"sound": "crunch!",
"sound_fail": "whump!",
"ter_set": "t_dirt",
"items": [ { "item": "splinter", "count": [ 2, 5 ] } ]
}
},
{
"type": "terrain",
"id": "t_triffid_slope_down",
"name": "downward root slope",
"connects_to": "PAVEMENT",
"description": "A downward-facing slope of root-covered dirt.",
"symbol": ">",
"color": "brown",
"move_cost": 2,
"flags": [ "TRANSPARENT", "GOES_DOWN", "PLACE_ITEM", "SUPPORTS_ROOF" ]
},
{
"type": "terrain",
"id": "t_triffid_slope_up",
"name": "upward root slope",
"connects_to": "WALL",
"description": "An upward-facing slope of root-covered dirt.",
"symbol": "<",
"color": "brown",
"move_cost": 2,
"flags": [ "TRANSPARENT", "GOES_UP", "PLACE_ITEM", "SUPPORTS_ROOF" ]
},
{
"type": "terrain",
"id": "t_bramble_door_c",
"name": "closed bramble roots",
"description": "A bramble of roots can be seen here, covering a hole. They could easily be pulled apart.",
"symbol": "+",
"color": "brown",
"move_cost": 0,
"coverage": 95,
"roof": "t_flat_roof",
"flags": [ "FLAMMABLE_ASH", "DOOR", "NOITEM", "BARRICADABLE_DOOR", "CONNECT_TO_WALL", "BLOCK_WIND" ],
"open": "t_bramble_door_o",
"bash": {
"str_min": 12,
"str_max": 150,
"sound": "crunch!",
"sound_fail": "whump!",
"ter_set": "t_null",
"items": [ { "item": "splinter", "count": [ 2, 5 ] } ]
}
},
{
"type": "terrain",
"id": "t_bramble_door_o",
"name": "open bramble roots",
"description": "A bramble of roots can be seen here, they have been pulled apart to reveal a hole.",
"symbol": "'",
"color": "brown",
"move_cost": 2,
"roof": "t_flat_roof",
"flags": [ "FLAMMABLE_ASH", "TRANSPARENT", "FLAT", "BARRICADABLE_DOOR", "CONNECT_TO_WALL", "ROAD" ],
"close": "t_bramble_door_c",
"bash": {
"str_min": 12,
"str_max": 150,
"sound": "crunch!",
"sound_fail": "whump!",
"ter_set": "t_null",
"items": [ { "item": "splinter", "count": [ 2, 5 ] } ]
}
}
]
Loading

0 comments on commit f683d5b

Please sign in to comment.