Skip to content

Commit

Permalink
active gas masks now use GASMASK_DEACTIVATE
Browse files Browse the repository at this point in the history
  • Loading branch information
@BalthazarArgall
BalthazarArgall committed Apr 9, 2024
1 parent 1d137de commit fa29618
Showing 1 changed file with 16 additions and 112 deletions.
128 changes: 16 additions & 112 deletions data/json/items/tool_armor.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1964,13 +1964,7 @@
"name": { "str": "filter mask (on)" },

Check failure on line 1964 in data/json/items/tool_armor.json

View workflow job for this annotation

GitHub Actions / Basic Build and Test (Clang 10, Ubuntu, Curses) 

([slow] ~starting_items)=> Cannot autogenerate plural form.  Please specify the plural form explicitly using 'str' and 'str_pl', or 'str_sp' if the singular and plural forms are the same.

    "copy-from": "mask_filter",
    "type": "TOOL_ARMOR",
    "name": { "str": "filter mask (on)" },
                   ▲▲▲
    "armor": [ { "encumbrance": 15, "rigid_layer_only": true, "coverage": 100, "covers": [ "mouth" ] } ],
    "tick_action": [ "GASMASK" ],
"armor": [ { "encumbrance": 15, "rigid_layer_only": true, "coverage": 100, "covers": [ "mouth" ] } ],
"tick_action": [ "GASMASK" ],
"use_action": {
"type": "transform",
"msg": "You set up the mask to stop using its filter.",
"target": "mask_filter",
"active": true,
"need_worn": true
}
"use_action": [ "GASMASK_DEACTIVATE" ]
},
{
"id": "mask_gas",
Expand Down Expand Up @@ -2062,13 +2056,7 @@
{ "covers": [ "mouth" ], "rigid_layer_only": true, "coverage": 100, "encumbrance": 35 }
],
"tick_action": [ "GASMASK" ],
"use_action": {
"type": "transform",
"msg": "You set up the mask to stop using its filter.",
"target": "mask_gas_xl",
"active": false,
"need_worn": true
}
"use_action": [ "GASMASK_DEACTIVATE" ]
},
{
"id": "mask_gas_xs",
Expand Down Expand Up @@ -2114,13 +2102,7 @@
{ "covers": [ "mouth" ], "rigid_layer_only": true, "coverage": 100, "encumbrance": 35 }
],
"tick_action": [ "GASMASK" ],
"use_action": {
"type": "transform",
"msg": "You set up the mask to stop using its filter.",
"target": "mask_gas_xs",
"active": false,
"need_worn": true
}
"use_action": [ "GASMASK_DEACTIVATE" ]
},
{
"id": "mask_gas_half",
Expand Down Expand Up @@ -2160,13 +2142,7 @@
"name": { "str": "half-face gas mask (on)" },

Check failure on line 2142 in data/json/items/tool_armor.json

View workflow job for this annotation

GitHub Actions / Basic Build and Test (Clang 10, Ubuntu, Curses) 

([slow] ~starting_items)=> Cannot autogenerate plural form.  Please specify the plural form explicitly using 'str' and 'str_pl', or 'str_sp' if the singular and plural forms are the same.

    "copy-from": "mask_gas_half",
    "type": "TOOL_ARMOR",
    "name": { "str": "half-face gas mask (on)" },
                   ▲▲▲
    "armor": [ { "covers": [ "mouth" ], "rigid_layer_only": true, "coverage": 100, "encumbrance": 35 } ],
    "tick_action": [ "GASMASK" ],
"armor": [ { "covers": [ "mouth" ], "rigid_layer_only": true, "coverage": 100, "encumbrance": 35 } ],
"tick_action": [ "GASMASK" ],
"use_action": {
"type": "transform",
"msg": "You set up the mask to stop using its filter.",
"target": "mask_gas_half",
"active": false,
"need_worn": true
}
"use_action": [ "GASMASK_DEACTIVATE" ]
},
{
"id": "mask_fsurvivor",
Expand Down Expand Up @@ -2237,13 +2213,7 @@
}
],
"tick_action": [ "GASMASK" ],
"use_action": {
"type": "transform",
"msg": "You set up the mask to stop using its filter.",
"target": "mask_fsurvivor",
"active": false,
"need_worn": true
}
"use_action": [ "GASMASK_DEACTIVATE" ]
},
{
"id": "mask_fsurvivorxl",
Expand Down Expand Up @@ -2277,13 +2247,7 @@
}
],
"tick_action": [ "GASMASK" ],
"use_action": {
"type": "transform",
"msg": "You set up the mask to stop using its filter.",
"target": "mask_fsurvivorxl",
"active": false,
"need_worn": true
}
"use_action": [ "GASMASK_DEACTIVATE" ]
},
{
"id": "mask_fsurvivorxs",
Expand Down Expand Up @@ -2317,13 +2281,7 @@
}
],
"tick_action": [ "GASMASK" ],
"use_action": {
"type": "transform",
"msg": "You set up the mask to stop using its filter.",
"target": "mask_fsurvivorxs",
"active": false,
"need_worn": true
}
"use_action": [ "GASMASK_DEACTIVATE" ]
},
{
"id": "mask_bunker",
Expand Down Expand Up @@ -2394,13 +2352,7 @@
}
],
"tick_action": [ "GASMASK" ],
"use_action": {
"type": "transform",
"msg": "You set up the mask to stop using its filter.",
"target": "mask_bunker",
"active": false,
"need_worn": true
}
"use_action": [ "GASMASK_DEACTIVATE" ]
},
{
"id": "mask_hsurvivor",
Expand Down Expand Up @@ -2477,13 +2429,7 @@
}
],
"tick_action": [ "GASMASK" ],
"use_action": {
"type": "transform",
"msg": "You set up the mask to stop using its filter.",
"target": "mask_hsurvivor",
"active": false,
"need_worn": true
}
"use_action": [ "GASMASK_DEACTIVATE" ]
},
{
"id": "mask_hsurvivorxl",
Expand Down Expand Up @@ -2520,13 +2466,7 @@
}
],
"tick_action": [ "GASMASK" ],
"use_action": {
"type": "transform",
"msg": "You set up the mask to stop using its filter.",
"target": "mask_hsurvivorxl",
"active": false,
"need_worn": true
}
"use_action": [ "GASMASK_DEACTIVATE" ]
},
{
"id": "mask_hsurvivorxs",
Expand Down Expand Up @@ -2563,13 +2503,7 @@
}
],
"tick_action": [ "GASMASK" ],
"use_action": {
"type": "transform",
"msg": "You set up the mask to stop using its filter.",
"target": "mask_hsurvivorxs",
"active": false,
"need_worn": true
}
"use_action": [ "GASMASK_DEACTIVATE" ]
},
{
"id": "mask_lsurvivor",
Expand Down Expand Up @@ -2622,13 +2556,7 @@
}
],
"tick_action": [ "GASMASK" ],
"use_action": {
"type": "transform",
"msg": "You set up the mask to stop using its filter.",
"target": "mask_lsurvivor",
"active": false,
"need_worn": true
}
"use_action": [ "GASMASK_DEACTIVATE" ]
},
{
"id": "mask_lsurvivorxl",
Expand All @@ -2653,13 +2581,7 @@
}
],
"tick_action": [ "GASMASK" ],
"use_action": {
"type": "transform",
"msg": "You set up the mask to stop using its filter.",
"target": "mask_lsurvivorxl",
"active": false,
"need_worn": true
}
"use_action": [ "GASMASK_DEACTIVATE" ]
},
{
"id": "mask_lsurvivorxs",
Expand All @@ -2684,13 +2606,7 @@
}
],
"tick_action": [ "GASMASK" ],
"use_action": {
"type": "transform",
"msg": "You set up the mask to stop using its filter.",
"target": "mask_lsurvivorxs",
"active": false,
"need_worn": true
}
"use_action": [ "GASMASK_DEACTIVATE" ]
},
{
"id": "mask_survivor",
Expand Down Expand Up @@ -2755,13 +2671,7 @@
}
],
"tick_action": [ "GASMASK" ],
"use_action": {
"type": "transform",
"msg": "You set up the mask to stop using its filter.",
"target": "mask_survivor",
"active": false,
"need_worn": true
}
"use_action": [ "GASMASK_DEACTIVATE" ]
},
{
"id": "mask_survivorxl",
Expand Down Expand Up @@ -2792,13 +2702,7 @@
}
],
"tick_action": [ "GASMASK" ],
"use_action": {
"type": "transform",
"msg": "You set up the mask to stop using its filter.",
"target": "mask_survivorxl",
"active": false,
"need_worn": true
}
"use_action": [ "GASMASK_DEACTIVATE" ]
},
{
"id": "mask_survivorxs",
Expand Down

0 comments on commit fa29618

Please sign in to comment.