Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(content): tool axe rebalance, tomahawks #4452

Merged
merged 11 commits into from
Apr 8, 2024
Merged

feat(content): tool axe rebalance, tomahawks #4452

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cd901a1
Boop
yay855 Apr 7, 2024
2175efb
Copper, stone axe to-hit
yay855 Apr 7, 2024
1702d28
Added copper tomahawk
yay855 Apr 7, 2024
6533515
Made stone and copper axe 2handed
yay855 Apr 7, 2024
a6b30cc
Adjusted tomahawk damages
yay855 Apr 7, 2024
e1f76b0
Made the tomahawks use the axe sheath
yay855 Apr 7, 2024
928791f
style(autofix.ci): automated formatting
autofix-ci[bot] Apr 7, 2024
5039dc8
Update data/json/items/tool/woodworking.json
yay855 Apr 7, 2024
1b4d26a
Update data/json/items/tool/woodworking.json
yay855 Apr 7, 2024
0b00e48
Update data/json/items/tool/woodworking.json
yay855 Apr 7, 2024
6c05e7e
Rebalanced hatchet & copper tomahawk
yay855 Apr 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 48 additions & 5 deletions data/json/items/tool/woodworking.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
"id": "copper_ax",
"type": "GENERIC",
"category": "tools",
"weapon_category": [ "1H_AXES" ],
"weapon_category": [ "2H_AXES" ],
"name": { "str": "copper axe" },
"description": "This is a decent-sized chunk of worked copper affixed to a wooden shaft, to make a crude yet effective axe.",
"weight": "3700 g",
Expand All @@ -130,7 +130,7 @@
"price_postapoc": "50 cent",
"bashing": 30,
"cutting": 20,
"to_hit": -2,
"to_hit": 0,

Check failure on line 133 in data/json/items/tool/woodworking.json

View workflow job for this annotation

GitHub Actions / GCC 12, Ubuntu, Curses 

(~[slow] ~[.],starting_items)=> cannot assign explicit value the same as default or inherited value

Check failure on line 133 in data/json/items/tool/woodworking.json

View workflow job for this annotation

GitHub Actions / GCC 12, Ubuntu, Curses 

([slow] ~starting_items)=> cannot assign explicit value the same as default or inherited value

Check failure on line 133 in data/json/items/tool/woodworking.json

View workflow job for this annotation

GitHub Actions / GCC 12, Ubuntu, Tiles, Sound, Lua, CMake, Languages 

([slow] ~starting_items)=> cannot assign explicit value the same as default or inherited value

Check failure on line 133 in data/json/items/tool/woodworking.json

View workflow job for this annotation

GitHub Actions / GCC 12, Ubuntu, Tiles, Sound, Lua, CMake, Languages 

(~[slow] ~[.],starting_items)=> cannot assign explicit value the same as default or inherited value
yay855 marked this conversation as resolved.
Show resolved Hide resolved
"material": [ "wood", "copper" ],
"symbol": "/",
"color": "brown",
Expand All @@ -155,7 +155,7 @@
"volume": "1 L",
"bashing": 17,
"cutting": 28,
"to_hit": -2,
"to_hit": 1,
"flags": [ "DURABLE_MELEE", "BELT_CLIP", "NONCONDUCTIVE", "SHEATH_AXE" ],
"qualities": [ [ "AXE", 2 ], [ "CUT", 1 ], [ "HAMMER", 2 ], [ "HAMMER_FINE", 1 ], [ "BUTCHER", 16 ] ]
},
Expand Down Expand Up @@ -229,7 +229,7 @@
"id": "primitive_axe",
"type": "GENERIC",
"category": "tools",
"weapon_category": [ "1H_AXES" ],
"weapon_category": [ "2H_AXES" ],
"name": { "str": "stone axe" },
"description": "This is a stone with a narrow edge affixed to a stick. It can chop wood, but requires much more effort than a modern axe.",
"weight": "3154 g",
Expand All @@ -238,7 +238,7 @@
"price_postapoc": "50 cent",
"bashing": 9,
"cutting": 15,
"to_hit": -2,
"to_hit": 0,

Check failure on line 241 in data/json/items/tool/woodworking.json

View workflow job for this annotation

GitHub Actions / GCC 12, Ubuntu, Curses 

(~[slow] ~[.],starting_items)=> cannot assign explicit value the same as default or inherited value

Check failure on line 241 in data/json/items/tool/woodworking.json

View workflow job for this annotation

GitHub Actions / GCC 12, Ubuntu, Curses 

([slow] ~starting_items)=> cannot assign explicit value the same as default or inherited value

Check failure on line 241 in data/json/items/tool/woodworking.json

View workflow job for this annotation

GitHub Actions / GCC 12, Ubuntu, Tiles, Sound, Lua, CMake, Languages 

([slow] ~starting_items)=> cannot assign explicit value the same as default or inherited value

Check failure on line 241 in data/json/items/tool/woodworking.json

View workflow job for this annotation

GitHub Actions / GCC 12, Ubuntu, Tiles, Sound, Lua, CMake, Languages 

(~[slow] ~[.],starting_items)=> cannot assign explicit value the same as default or inherited value
yay855 marked this conversation as resolved.
Show resolved Hide resolved
"material": [ "wood", "stone" ],
"symbol": "/",
"color": "light_gray",
Expand Down Expand Up @@ -280,5 +280,48 @@
"color": "light_gray",
"qualities": [ [ "CHISEL", 1 ] ],
"flags": [ "BELT_CLIP" ]
},
{
"id": "tomahawk_primitive",
"type": "GENERIC",
"category": "weapons",
"weapon_category": [ "1H_AXES" ],
"symbol": ";",
"color": "light_gray",
"name": { "str": "stone tomahawk" },
"description": "A lightweight one-handed combat hatchet typically made of stone or bone, originally used by the Algonquian people. It makes for a half decent tool and weapon.",
"price_postapoc": 100,
"material": [ "wood", "stone" ],
"techniques": [ "WBLOCK_1" ],
"volume": "1750 ml",
"weight": "2800 g",
"looks_like": "hatchet",
"bashing": 5,
"cutting": 12,
"to_hit": 1,
"flags": [ "DURABLE_MELEE", "SHEATH_AXE" ],
"qualities": [ [ "CUT", 1 ], [ "BUTCHER", 10 ] ]
},
{
"id": "tomahawk_copper",
"type": "GENERIC",
"category": "weapons",
"weapon_category": [ "1H_AXES" ],
"symbol": ";",
"color": "light_red",
"name": { "str": "copper tomahawk" },
"description": "A lightweight one-handed combat hatchet made using basic copper; slightly better than stone, though not as historically accurate.",

Check failure on line 313 in data/json/items/tool/woodworking.json

View workflow job for this annotation

GitHub Actions / GCC 12, Ubuntu, Curses 

(~[slow] ~[.],starting_items)=> excessive spaces at this location.  1 required, but 2 found.

Check failure on line 313 in data/json/items/tool/woodworking.json

View workflow job for this annotation

GitHub Actions / GCC 12, Ubuntu, Curses 

([slow] ~starting_items)=> excessive spaces at this location.  1 required, but 2 found.

Check failure on line 313 in data/json/items/tool/woodworking.json

View workflow job for this annotation

GitHub Actions / GCC 12, Ubuntu, Tiles, Sound, Lua, CMake, Languages 

([slow] ~starting_items)=> excessive spaces at this location.  1 required, but 2 found.

Check failure on line 313 in data/json/items/tool/woodworking.json

View workflow job for this annotation

GitHub Actions / GCC 12, Ubuntu, Tiles, Sound, Lua, CMake, Languages 

(~[slow] ~[.],starting_items)=> excessive spaces at this location.  1 required, but 2 found.
yay855 marked this conversation as resolved.
Show resolved Hide resolved
"price": 3000,
"price_postapoc": 600,
"material": [ "copper", "wood" ],
"techniques": [ "WBLOCK_1" ],
"volume": "1750 ml",
"weight": "2600 g",
"looks_like": "hatchet",
"bashing": 15,
"cutting": 26,
"to_hit": 1,
"flags": [ "DURABLE_MELEE", "SHEATH_AXE", "NONCONDUCTIVE" ],
"qualities": [ [ "CUT", 1 ], [ "BUTCHER", 12 ] ]
}
]
55 changes: 55 additions & 0 deletions data/json/recipes/weapon/cutting.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,5 +623,60 @@
"autolearn": true,
"book_learn": [ [ "textbook_weapeast", 3 ], [ "recipe_melee", 4 ] ],
"using": [ [ "blacksmithing_standard", 12 ], [ "steel_standard", 3 ] ]
},
{
"type": "recipe",
"result": "tomahawk_primitive",
"category": "CC_WEAPON",
"subcategory": "CSC_WEAPON_CUTTING",
"skill_used": "fabrication",
"difficulty": 3,
"skills_required": [ "survival", 3 ],
"time": "1 h",
"reversible": true,
"autolearn": true,
"book_learn": [ [ "mag_survival", 1 ], [ "atomic_survival", 1 ], [ "textbook_carpentry", 2 ] ],
"qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ],
"components": [
[ [ "rock", 1 ], [ "ceramic_shard", 1 ], [ "sharp_rock", 1 ], [ "bone_sturdy", 1, "LIST" ] ],
[ [ "stick", 1 ], [ "2x4", 1 ] ],
[
[ "cordage_short", 2, "LIST" ],
[ "filament", 100, "LIST" ],
[ "rag", 1 ],
[ "leather", 1 ],
[ "fur", 1 ],
[ "faux_fur", 1 ],
[ "felt_patch", 1 ]
]
]
},
{
"type": "recipe",
"result": "tomahawk_copper",
"category": "CC_WEAPON",
"subcategory": "CSC_WEAPON_CUTTING",
"skill_used": "fabrication",
"difficulty": 4,
"skills_required": [ "survival", 3 ],
"time": "1 h",
"reversible": true,
"autolearn": true,
"book_learn": [ [ "mag_survival", 1 ], [ "atomic_survival", 1 ], [ "textbook_carpentry", 2 ] ],
"qualities": [ { "id": "HAMMER", "level": 2 } ],
"tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
"components": [
[ [ "stick", 1 ], [ "2x4", 1 ] ],
[ [ "copper_scrap_equivalent", 25, "LIST" ] ],
[
[ "cordage_short", 2, "LIST" ],
[ "filament", 100, "LIST" ],
[ "rag", 1 ],
[ "leather", 1 ],
[ "fur", 1 ],
[ "faux_fur", 1 ],
[ "felt_patch", 1 ]
]
]
}
]
Loading