Skip to content

Commit

Permalink
Hook up snippets and clean up
Browse files Browse the repository at this point in the history
-Set the new snippets to be called by their respective items
-Linting
  • Loading branch information
TheSaddestGoomba committed Feb 24, 2024
1 parent 5c71789 commit 999764b
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 9 deletions.
2 changes: 2 additions & 0 deletions data/json/items/comestibles/mutagen.json
Original file line number Diff line number Diff line change
Expand Up @@ -966,6 +966,7 @@
"name": { "str": "tainted limb" },
"description": "A rotted and then shredded arm. Not much use unless you want to scrape the meat from the bones.",
"copy-from": "arm",
"snippet_category": "arm_zed_desc",
"use_action": [ "POISON" ],
"color": "red",
"material": [ "flesh" ],
Expand All @@ -978,6 +979,7 @@
"name": { "str": "tainted limb" },
"description": "What's left of some zombie's limb. Most likely a leg based on the proportions. Though it's rotted, there is quite a bit of meat still on it.",
"copy-from": "leg",
"snippet_category": "leg_zed_desc",
"use_action": [ "POISON" ],
"color": "red",
"material": [ "flesh" ],
Expand Down
3 changes: 2 additions & 1 deletion data/json/items/generic/skulls.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@
"id": "skull_human_tainted",
"name": { "str": "tainted human skull" },
"description": "The stained skull of what was once a human being. It is rotted and noticeably warped from its lively form. Carrying this around probably isn't going to win you any friends.",
"copy-from": "skull_abstract"
"copy-from": "skull_abstract",
"snippet_category": "skull_human_tainted_desc"
},
{
"type": "GENERIC",
Expand Down
14 changes: 7 additions & 7 deletions data/json/monster_special_attacks/monster_deaths.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"name": { "str": "Boomer Clothes" },
"description": "Triggers EoC to drop filthy clothing.",
"shape": "blast",
"valid_targets": [ "ground", "self" ],
"valid_targets": [ "ground" ],
"flags": [ "SILENT", "NO_EXPLOSION_SFX" ],
"effect": "effect_on_condition",
"effect_str": "EOC_BOOMER_CLOTHING"
Expand Down Expand Up @@ -271,7 +271,7 @@
"description": "Causes a small explosion of toxic gas and leave clothing.",
"flags": [ "NO_EXPLOSION_SFX" ],
"valid_targets": [ "self" ],
"effect": "noise",
"effect": "noise",
"shape": "blast",
"extra_effects": [ { "id": "death_gas", "hit_self": true }, { "id": "boomer_clothes", "hit_self": true } ]
},
Expand Down Expand Up @@ -306,7 +306,7 @@
"description": "Calls a small explosion of teargas and boomer clothes.",
"flags": [ "NO_EXPLOSION_SFX" ],
"valid_targets": [ "self" ],
"effect": "noise",
"effect": "noise",
"shape": "blast",
"extra_effects": [ { "id": "death_tearburst", "hit_self": true }, { "id": "boomer_clothes", "hit_self": true } ]
},
Expand All @@ -330,7 +330,7 @@
"flags": [ "NO_EXPLOSION_SFX" ],
"valid_targets": [ "self" ],
"shape": "blast",
"effect": "noise",
"effect": "noise",
"extra_effects": [ { "id": "death_relax_gas", "hit_self": true }, { "id": "boomer_clothes", "hit_self": true } ]
},
{
Expand All @@ -354,7 +354,7 @@
"valid_targets": [ "self" ],
"flags": [ "NO_EXPLOSION_SFX" ],
"shape": "blast",
"effect": "noise",
"effect": "noise",
"extra_effects": [ { "id": "death_fungalburst", "hit_self": true }, { "id": "boomer_clothes", "hit_self": true } ]
},
{
Expand Down Expand Up @@ -396,7 +396,7 @@
"valid_targets": [ "self" ],
"flags": [ "SILENT", "NO_EXPLOSION_SFX" ],
"shape": "blast",
"effect": "noise",
"effect": "noise",
"extra_effects": [ { "id": "death_fungus", "hit_self": true }, { "id": "boomer_clothes", "hit_self": true } ]
},
{
Expand Down Expand Up @@ -468,7 +468,7 @@
"name": { "str": "Gasoline Boomer Death" },
"valid_targets": [ "self" ],
"description": "Calls Conflagration Death and Boomer Clothes",
"effect": "noise",
"effect": "noise",
"shape": "blast",
"extra_effects": [ { "id": "death_conflagration" }, { "id": "boomer_clothes" } ]
},
Expand Down
2 changes: 1 addition & 1 deletion data/json/snippets/zombie_anatomy.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
},
{
"id": "skull_human_tainted_4",
"text": "The brain has ossified inside this tainted skull. It doesn't feel noticeably heavier and you surmise that the brain-turned-bone must be deeply porous or hollow itself"
"text": "The brain has ossified inside this tainted skull. It doesn't feel noticeably heavier and you surmise that the brain-turned-bone must be deeply porous or hollow itself."
},
{
"id": "skull_human_tainted_5",
Expand Down

0 comments on commit 999764b

Please sign in to comment.