Skip to content

Commit

Permalink
feat(balance): move battleaxe to 2H_AXEScategory, obsolete `HAND_AX…
Browse files Browse the repository at this point in the history
…ES` in favor of `1H_AXES` (#5994)
  • Loading branch information
chaosvolt authored Jan 27, 2025
1 parent 06bfb24 commit 77d7938
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion data/json/items/melee/axes.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"id": "battleaxe",
"type": "GENERIC",
"category": "weapons",
"weapon_category": [ "1H_AXES" ],
"weapon_category": [ "2H_AXES" ],
"name": { "str": "battle axe" },
"description": "This is a huge axe designed for warfare. Though intended for use as a weapon, it can also be pressed into service as a rather clumsy woodcutting tool.",
"weight": "2002 g",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/tool/entry_tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"id": "iceaxe",
"type": "GENERIC",
"category": "tools_entry",
"weapon_category": [ "HAND_AXES" ],
"weapon_category": [ "1H_AXES" ],
"name": { "str": "ice axe" },
"description": "This is an ice axe with hammer on its head, a multi-purpose hiking and climbing tool used by mountaineers. It is sturdy enough to pry open closed doors or lift manhole covers.",
"weight": "500 g",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/tool/firefighting.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"id": "crash_axe",
"type": "GENERIC",
"category": "tools_entry",
"weapon_category": [ "HAND_AXES" ],
"weapon_category": [ "1H_AXES" ],
"symbol": ";",
"color": "light_gray",
"name": { "str": "crash axe" },
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/tool/woodworking.json
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
"id": "hatchet",
"type": "GENERIC",
"category": "weapons",
"weapon_category": [ "HAND_AXES" ],
"weapon_category": [ "1H_AXES" ],
"symbol": ";",
"color": "light_gray",
"name": { "str": "hatchet" },
Expand Down
6 changes: 6 additions & 0 deletions data/json/obsoletion/uncategorized.json
Original file line number Diff line number Diff line change
Expand Up @@ -421,5 +421,11 @@
"//": "destroy_threshold equal to str_min instead of str_max due to delicate electronics",
"ranged": { "reduction": [ 16, 32 ], "destroy_threshold": 32, "block_unaimed_chance": "50%" }
}
},
{
"type": "weapon_category",
"id": "HAND_AXES",
"name": "Hand Axes",
"//": "Axe with a short handle, typically wielded in one hand, ocassionally thrown."
}
]
10 changes: 2 additions & 8 deletions data/json/weapon_categories.json
Original file line number Diff line number Diff line change
Expand Up @@ -107,23 +107,17 @@
"name": "Two-handed Hammers",
"//": "Hammers meant to be wielded with both hands."
},
{
"type": "weapon_category",
"id": "HAND_AXES",
"name": "Hand Axes",
"//": "Axe with a short handle, typically wielded in one hand, ocassionally thrown."
},
{
"type": "weapon_category",
"id": "1H_AXES",
"name": "One-handed Axes",
"//": "Axes meant to be wielded with one hand, typically with a handle longer than the handaxe."
"//": "Axes meant to be wielded with one hand."
},
{
"type": "weapon_category",
"id": "2H_AXES",
"name": "Two-handed Axes",
"//": "Axes meant to be wielded with two hands."
"//": "Axes with a handle long enough to allow or require wielding with two hands."
},
{
"type": "weapon_category",
Expand Down
2 changes: 1 addition & 1 deletion data/mods/CRT_EXPANSION/items/crt_tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@
{
"type": "GENERIC",
"id": "crt_hatchet_extended",
"weapon_category": [ "1H_AXES" ],
"weapon_category": [ "2H_AXES" ],
"symbol": ";",
"color": "light_gray",
"name": "C.R.I.T axe",
Expand Down
4 changes: 2 additions & 2 deletions data/mods/MMA/martialarts.json
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@
"mma_tec_iron_heart_wide",
"mma_tec_iron_heart_wide_crit"
],
"weapon_category": [ "HAND_AXES", "2H_SWORDS", "1H_SWORDS" ]
"weapon_category": [ "1H_AXES", "2H_AXES", "2H_SWORDS", "1H_SWORDS" ]
},
{
"type": "martial_art",
Expand Down Expand Up @@ -576,6 +576,6 @@
}
],
"techniques": [ "mma_tec_tiger_claw_break" ],
"weapon_category": [ "1H_AXES", "FIST_WEAPONS", "KNIVES", "HAND_AXES" ]
"weapon_category": [ "1H_AXES", "FIST_WEAPONS", "KNIVES" ]
}
]
2 changes: 1 addition & 1 deletion data/mods/Magical_Nights/items/class_items.json
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@
"id": "rune_stormshaper_weapon",
"type": "GENERIC",
"name": { "str": "Stormshaper axe" },
"weapon_category": [ "1H_AXES" ],
"weapon_category": [ "2H_AXES" ],
"//": "Equivalent to copper ax +1, with volume reduction so it can be sheathed like the other school weapons. Metals chosen for being two most conductive metals + balancing reasons",
"description": "A forged copper axe with silver trimmings and a wooden handle. There is a Stormshaper rune embedded in the eye.",
"weight": "3330 g",
Expand Down

0 comments on commit 77d7938

Please sign in to comment.