Skip to content

Commit

Permalink
fix(content): add BELT_CLIP to cudgel and shillelagh, adjust belt v…
Browse files Browse the repository at this point in the history
…olumes. (cataclysmbnteam#5620)

Cudgel at 600 ml volume was just under the default 1/3 of maximum volume
calcuation for minimum volume for police/fire belt. Shillelagh was
just over the maximum volume for webbing belt, for the webbing belt
the new 2000 ml volume is taken to match the webbing belts volume in CDDA.
  • Loading branch information
ratmice authored Oct 28, 2024
1 parent facb568 commit 6e5f460
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
6 changes: 4 additions & 2 deletions data/json/items/armor/belts.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"type": "holster",
"holster_prompt": "Attach what to belt loop?",
"holster_msg": "You clip your %s to your %s",
"min_volume": "600 ml",
"max_volume": "2 L",
"max_weight": "3600 g",
"flags": [ "BELT_CLIP" ]
Expand Down Expand Up @@ -168,6 +169,7 @@
"type": "holster",
"holster_prompt": "Attach what to holder?",
"holster_msg": "You attach your %s to your %s.",
"min_volume": "600 ml",
"max_volume": "2250 ml",
"max_weight": "3600 g",
"flags": [ "BELT_CLIP" ]
Expand Down Expand Up @@ -258,8 +260,8 @@
"type": "holster",
"holster_prompt": "Stick what into your belt",
"holster_msg": "You tuck your %s into your %s",
"max_volume": "1250 ml",
"max_weight": "1500 g",
"max_volume": "2000 ml",
"max_weight": "2500 g",
"min_volume": "40 ml",
"flags": [ "BELT_CLIP" ]
},
Expand Down
5 changes: 3 additions & 2 deletions data/json/items/melee/bludgeons.json
Original file line number Diff line number Diff line change
Expand Up @@ -276,13 +276,14 @@
"weapon_category": [ "BATONS" ],
"name": { "str": "cudgel" },
"description": "A slender long rod of wood, while traditionally intended as a training tool for many dueling moves, it still makes a good melee weapon in a pinch.",
"weight": "400 g",
"to_hit": 2,
"price_postapoc": "50 cent",
"color": "brown",
"symbol": "/",
"material": [ "wood" ],
"techniques": [ "WBLOCK_2", "RAPID", "PRECISE" ],
"flags": [ "BELT_CLIP" ],
"weight": "400 g",
"volume": "600 ml",
"bashing": 8,
"price": "10 USD"
Expand Down Expand Up @@ -812,7 +813,7 @@
"price_postapoc": "1250 cent",
"material": "wood",
"techniques": [ "WBLOCK_1", "SWEEP" ],
"flags": [ "DURABLE_MELEE" ],
"flags": [ "DURABLE_MELEE", "BELT_CLIP" ],
"weight": "910 g",
"volume": "1500 ml",
"bashing": 26,
Expand Down

0 comments on commit 6e5f460

Please sign in to comment.