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

Pruning the old to-hit syntax - Part 11 #77838

Merged
merged 7 commits into from
Nov 15, 2024
Merged

Pruning the old to-hit syntax - Part 11 #77838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
29fc1be
bots and some random shit
Karol1223 Nov 14, 2024
3f807a0
furniture
Karol1223 Nov 14, 2024
4148f67
generic
Karol1223 Nov 14, 2024
ab1fcb6
Update generic.json
Karol1223 Nov 14, 2024
db9a7e1
no more
Karol1223 Nov 14, 2024
b68d376
please the tests
Karol1223 Nov 14, 2024
b89da8e
Update legacy_to_hit.json
Karol1223 Nov 14, 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
2 changes: 0 additions & 2 deletions data/json/items/book/abstract.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,6 @@
"volume": "250 ml",
"price": "1 kUSD",
"price_postapoc": "7 USD 50 cent",
"to_hit": -1,
"material": [ "paper" ],
"skill": "electronics",
"required_level": 7,
Expand All @@ -451,7 +450,6 @@
"flags": [ "PAPER_SHAPED" ],
"price": "10 USD",
"price_postapoc": "10 USD",
"to_hit": -1,
"material": [ "paper" ],
"symbol": ";",
"color": "light_gray"
Expand Down
1 change: 0 additions & 1 deletion data/json/items/containers/generic.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,6 @@
"longest_side": "150 cm",
"price": 0,
"price_postapoc": 0,
"to_hit": -3,
"use_action": [ "CHANGE_OUTFIT" ],
"material": [ "plastic" ],
"pocket_data": [
Expand Down
16 changes: 4 additions & 12 deletions data/json/items/corpses/dead_exodii.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@
"material": [ "steel" ],
"volume": "119 L",
"weight": "221 kg",
"to_hit": -3,
"flags": [ "TRADER_AVOID", "NO_REPAIR" ],
"melee_damage": { "bash": 20, "cut": 15 }
"flags": [ "TRADER_AVOID", "NO_REPAIR" ]
},
{
"type": "GENERIC",
Expand All @@ -27,9 +25,7 @@
"material": [ "steel" ],
"volume": "410 L",
"weight": "498 kg",
"to_hit": -3,
"flags": [ "TRADER_AVOID", "NO_REPAIR" ],
"melee_damage": { "bash": 20, "cut": 15 }
"flags": [ "TRADER_AVOID", "NO_REPAIR" ]
},
{
"type": "GENERIC",
Expand All @@ -43,9 +39,7 @@
"material": [ "steel" ],
"weight": "206 kg",
"volume": "105 L",
"to_hit": -3,
"flags": [ "TRADER_AVOID", "NO_REPAIR" ],
"melee_damage": { "bash": 20, "cut": 15 }
"flags": [ "TRADER_AVOID", "NO_REPAIR" ]
},
{
"type": "GENERIC",
Expand All @@ -59,8 +53,6 @@
"material": [ "steel" ],
"volume": "70 L",
"weight": "150 kg",
"to_hit": -3,
"flags": [ "TRADER_AVOID", "NO_REPAIR" ],
"melee_damage": { "bash": 20, "cut": 15 }
"flags": [ "TRADER_AVOID", "NO_REPAIR" ]
}
]
11 changes: 2 additions & 9 deletions data/json/items/corpses/dead_yrax.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@
"material": [ "steel", "yrax_quartz" ],
"volume": "119 L",
"weight": "221 kg",
"to_hit": -3,
"flags": [ "TRADER_AVOID", "NO_REPAIR" ],
"melee_damage": { "bash": 20, "cut": 15 }
"flags": [ "TRADER_AVOID", "NO_REPAIR" ]
},
{
"type": "GENERIC",
Expand All @@ -27,9 +25,7 @@
"material": [ "steel", "yrax_quartz" ],
"volume": "119 L",
"weight": "221 kg",
"to_hit": { "grip": "bad", "length": "hand", "surface": "any", "balance": "clumsy" },
"flags": [ "TRADER_AVOID", "NO_REPAIR" ],
"melee_damage": { "bash": 20, "cut": 15 }
"flags": [ "TRADER_AVOID", "NO_REPAIR" ]
},
{
"id": "broken_golden_monolith",
Expand All @@ -42,7 +38,6 @@
"weight": "8282 kg",
"price": "50 USD",
"price_postapoc": "50 USD",
"melee_damage": { "bash": 1000 },
"material": [ "yrax_quartz", "gold" ],
"color": "yellow",
"flags": [ "TRADER_AVOID", "NO_REPAIR" ]
Expand Down Expand Up @@ -79,7 +74,6 @@
"longest_side": "400 cm",
"price": "50 USD",
"price_postapoc": "50 USD",
"melee_damage": { "bash": 100 },
"material": [ "yrax_quartz", "gold" ],
"color": "yellow",
"flags": [ "TRADER_AVOID", "NO_REPAIR" ]
Expand All @@ -96,7 +90,6 @@
"longest_side": "400 cm",
"price": "50 USD",
"price_postapoc": "50 USD",
"melee_damage": { "bash": 100 },
"material": [ "yrax_quartz", "gold" ],
"color": "yellow",
"flags": [ "TRADER_AVOID", "NO_REPAIR" ]
Expand Down
Loading
Loading