Skip to content

Commit

Permalink
feat(content): Add stiletto category (#4345)
Browse files Browse the repository at this point in the history
* Add stiletto category

KNIVES category doesn't make sense for soldering iron and screwdriver.

Added to Ninjutsu and Eskrima cause it feels like it'd be weapons they use, feel free to correct me.

* style(autofix.ci): automated formatting

---------

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
  • Loading branch information
KheirFerrum and autofix-ci[bot] committed Mar 14, 2024
1 parent e5799ef commit 6ae1617
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 4 deletions.
4 changes: 2 additions & 2 deletions data/json/items/tool/workshop.json
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,7 @@
"id": "screwdriver",
"type": "GENERIC",
"category": "tools",
"weapon_category": [ "KNIVES" ],
"weapon_category": [ "STILETTOS" ],
"name": { "str": "screwdriver" },
"description": "This is a Philips-head screwdriver. It is important for almost all electronics crafting, most mechanics crafting, and has many more uses.",
"weight": "170 g",
Expand Down Expand Up @@ -870,7 +870,7 @@
"id": "soldering_iron",
"type": "TOOL",
"category": "tools",
"weapon_category": [ "KNIVES" ],
"weapon_category": [ "STILETTOS" ],
"name": { "str": "soldering iron" },
"description": "This is a device with a metal tip that can get very hot. It is necessary for advanced electronics crafting. You could also use it to cauterize wounds, if you had to.",
"weight": "181 g",
Expand Down
4 changes: 2 additions & 2 deletions data/json/martialarts.json
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@
"tec_eskrima_low",
"tec_eskrima_combination"
],
"weapon_category": [ "KNIVES", "SHORT_SWORDS", "BATONS", "TONFAS", "QUARTERSTAVES", "FIST_WEAPONS" ]
"weapon_category": [ "STILETTOS", "KNIVES", "SHORT_SWORDS", "BATONS", "TONFAS", "QUARTERSTAVES", "FIST_WEAPONS" ]
},
{
"type": "martial_art",
Expand Down Expand Up @@ -828,7 +828,7 @@
}
],
"techniques": [ "tec_ninjutsu_swift", "tec_ninjutsu_takedown", "tec_ninjutsu_precise" ],
"weapon_category": [ "KNIVES", "SHORT_SWORDS", "1H_SWORDS", "JAPANESE_SWORDS", "BATONS", "QUARTERSTAVES", "BIONIC_WEAPONRY" ],
"weapon_category": [ "STILETTOS", "KNIVES", "SHORT_SWORDS", "1H_SWORDS", "JAPANESE_SWORDS", "BATONS", "QUARTERSTAVES", "BIONIC_WEAPONRY" ],
"weapons": [ "sickle" ]
},
{
Expand Down
6 changes: 6 additions & 0 deletions data/json/weapon_categories.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@
"name": "Fist Weapons",
"//": "Handheld weapons used to supplement fists in martial arts."
},
{
"type": "weapon_category",
"id": "STILETTOS",
"name": "Stilettos",
"//": "Short, tapering 'blade' fixed onto a handle, has no cutting edge"
},
{
"type": "weapon_category",
"id": "KNIVES",
Expand Down
1 change: 1 addition & 0 deletions doc/src/content/docs/en/mod/json/reference/json_info.md
Original file line number Diff line number Diff line change
Expand Up @@ -1806,6 +1806,7 @@ container. It could also be written as a generic item ("type": "GENERIC") with "
| --------------- | ---------------------------------------------------------------------------------------- |
| FIST_WEAPONS | Handheld weapons used to supplement fists in martial arts. |
| --- | --- |
| STILETTOS | Short, tapering 'blade' fixed onto a handle, has no cutting edge |
| KNIVES | Short blade fixed onto a handle, for cutting or as weapon. |
| SHORT_SWORDS | One handed sword of length between a large knife and a 'proper' sword. |
| 1H_SWORDS | Sword meant to be wielded with one hand. |
Expand Down

0 comments on commit 6ae1617

Please sign in to comment.