diff --git a/data/json/items/book/abstract.json b/data/json/items/book/abstract.json index 52a513ae0b8f2..9ed7e4cad9d41 100644 --- a/data/json/items/book/abstract.json +++ b/data/json/items/book/abstract.json @@ -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, @@ -451,7 +450,6 @@ "flags": [ "PAPER_SHAPED" ], "price": "10 USD", "price_postapoc": "10 USD", - "to_hit": -1, "material": [ "paper" ], "symbol": ";", "color": "light_gray" diff --git a/data/json/items/containers/generic.json b/data/json/items/containers/generic.json index cb69f15766ad5..9af8c0a4128a5 100644 --- a/data/json/items/containers/generic.json +++ b/data/json/items/containers/generic.json @@ -172,7 +172,6 @@ "longest_side": "150 cm", "price": 0, "price_postapoc": 0, - "to_hit": -3, "use_action": [ "CHANGE_OUTFIT" ], "material": [ "plastic" ], "pocket_data": [ diff --git a/data/json/items/corpses/dead_exodii.json b/data/json/items/corpses/dead_exodii.json index 1dcaaa688a5e8..205e3614e29c3 100644 --- a/data/json/items/corpses/dead_exodii.json +++ b/data/json/items/corpses/dead_exodii.json @@ -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", @@ -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", @@ -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", @@ -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" ] } ] diff --git a/data/json/items/corpses/dead_yrax.json b/data/json/items/corpses/dead_yrax.json index e036a52e70785..79aaf8d824c0a 100644 --- a/data/json/items/corpses/dead_yrax.json +++ b/data/json/items/corpses/dead_yrax.json @@ -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", @@ -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", @@ -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" ] @@ -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" ] @@ -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" ] diff --git a/data/json/items/corpses/inactive_bots.json b/data/json/items/corpses/inactive_bots.json index 035e622b19e6d..f7e7894e4bef5 100644 --- a/data/json/items/corpses/inactive_bots.json +++ b/data/json/items/corpses/inactive_bots.json @@ -4,11 +4,11 @@ "type": "TOOL", "name": { "str": "inactive EMP hack" }, "description": "An inactive EMP hack. Manhacks are fist-sized robots that fly through the air. This one contains an EMP grenade and attacks by flying at its target and detonating. Use this item to reprogram and release the EMP hack. Electronics and computer skill determines if the targeting matrix is reprogrammed successfully.", - "weight": "2000 g", + "weight": "2 kg", "volume": "750 ml", "price": "645 USD", "price_postapoc": "30 USD", - "to_hit": -3, + "to_hit": { "grip": "bad", "length": "hand", "surface": "line", "balance": "clumsy" }, "material": [ "aluminum", "plastic" ], "symbol": ",", "color": "cyan", @@ -34,7 +34,7 @@ "volume": "250 ml", "price": "675 USD", "price_postapoc": "30 USD", - "to_hit": -3, + "to_hit": { "grip": "bad", "length": "hand", "surface": "line", "balance": "clumsy" }, "material": [ "aluminum", "plastic" ], "symbol": ",", "color": "light_gray", @@ -60,7 +60,7 @@ "volume": "750 ml", "price": "595 USD", "price_postapoc": "5 USD", - "to_hit": -3, + "to_hit": { "grip": "bad", "length": "hand", "surface": "line", "balance": "clumsy" }, "material": [ "aluminum", "plastic" ], "symbol": ",", "color": "dark_gray", @@ -82,11 +82,11 @@ "type": "TOOL", "name": { "str": "inactive tear gas hack" }, "description": "An inactive tear gas hack. Manhacks are fist-sized robots that fly through the air. This one contains a tear gas canister and attacks by flying at its target and releasing the gas. Use this item to reprogram and activate the tear gas hack. Electronics and computer skill determines if the targeting matrix is reprogrammed successfully.", - "weight": "3000 g", + "weight": "3 kg", "volume": "750 ml", "price": "605 USD", "price_postapoc": "5 USD", - "to_hit": -3, + "to_hit": { "grip": "bad", "length": "hand", "surface": "line", "balance": "clumsy" }, "material": [ "aluminum", "plastic" ], "symbol": ",", "color": "dark_gray", @@ -108,11 +108,11 @@ "type": "TOOL", "name": { "str": "inactive grenade hack" }, "description": "An inactive grenade hack. Manhacks are fist-sized robots that fly through the air. This one contains a grenade and attacks by flying at its target and detonating. Use this item to reprogram and activate the grenade hack. Electronics and computer skill determines if the targeting matrix is reprogrammed successfully.", - "weight": "2000 g", + "weight": "2 kg", "volume": "250 ml", "price": "600 USD", "price_postapoc": "10 USD", - "to_hit": -3, + "to_hit": { "grip": "bad", "length": "hand", "surface": "line", "balance": "clumsy" }, "material": [ "aluminum", "plastic" ], "symbol": ",", "color": "green", @@ -138,7 +138,6 @@ "volume": "30 L", "price": "5 kUSD 5 USD", "price_postapoc": "80 USD", - "to_hit": -3, "material": [ "steel", "plastic" ], "symbol": ";", "color": "red", @@ -149,8 +148,7 @@ "moves": 100, "skills": [ "electronics", "computer" ] }, - "flags": [ "SINGLE_USE", "NO_SALVAGE" ], - "melee_damage": { "bash": 8 } + "flags": [ "SINGLE_USE", "NO_SALVAGE" ] }, { "id": "bot_manhack", @@ -161,7 +159,7 @@ "volume": "750 ml", "price": "600 USD", "price_postapoc": "5 USD", - "to_hit": -3, + "to_hit": { "grip": "bad", "length": "hand", "surface": "line", "balance": "clumsy" }, "material": [ "aluminum", "plastic" ], "symbol": ",", "color": "light_green", @@ -186,7 +184,6 @@ "weight": "172 kg", "volume": "30 L", "price": "5 kUSD", - "to_hit": -3, "price_postapoc": "50 USD", "material": [ "steel", "plastic" ], "symbol": ";", @@ -198,8 +195,7 @@ "moves": 100, "skills": [ "electronics", "computer" ] }, - "flags": [ "SINGLE_USE", "NO_SALVAGE" ], - "melee_damage": { "bash": 8 } + "flags": [ "SINGLE_USE", "NO_SALVAGE" ] }, { "id": "bot_crows_m240", @@ -210,7 +206,6 @@ "volume": "30 L", "price": "5 kUSD", "price_postapoc": "60 USD", - "to_hit": -3, "material": [ "steel", "plastic" ], "symbol": ";", "color": "green", @@ -221,19 +216,17 @@ "moves": 100, "skills": [ "electronics", "computer" ] }, - "flags": [ "SINGLE_USE", "NO_SALVAGE" ], - "melee_damage": { "bash": 8 } + "flags": [ "SINGLE_USE", "NO_SALVAGE" ] }, { "id": "bot_turret_riot", "type": "TOOL", "name": { "str": "inactive riot control turret" }, "description": "An inactive riot control turret. Using this item involves loading the unit with the 40x46mm M1006 sponge rounds in your inventory (if you wish to divide your ammunition, set aside whatever beanbag rounds you do NOT want to give the turret), turning it on, and placing it on the ground, where it will attach itself. If programmed successfully, the turret will then identify you as a friendly, and attack all enemies with its riot control gun.", - "weight": "125000 g", + "weight": "125 kg", "volume": "60 L", "price": "2 kUSD 5 USD", "price_postapoc": "20 USD", - "to_hit": -3, "material": [ "steel", "plastic" ], "symbol": ";", "color": "red", @@ -244,8 +237,7 @@ "moves": 100, "skills": [ "electronics", "computer" ] }, - "flags": [ "SINGLE_USE", "NO_SALVAGE" ], - "melee_damage": { "bash": 8 } + "flags": [ "SINGLE_USE", "NO_SALVAGE" ] }, { "id": "bot_turret", @@ -256,7 +248,6 @@ "volume": "30 L", "price": "4 kUSD", "price_postapoc": "30 USD", - "to_hit": -3, "material": [ "steel", "plastic" ], "symbol": ";", "color": "light_green", @@ -267,8 +258,7 @@ "moves": 100, "skills": [ "electronics", "computer" ] }, - "flags": [ "SINGLE_USE" ], - "melee_damage": { "bash": 8 } + "flags": [ "SINGLE_USE" ] }, { "id": "bot_secubot", @@ -279,7 +269,6 @@ "volume": "30 L", "price": "7 kUSD 500 USD", "price_postapoc": "40 USD", - "to_hit": -3, "material": [ "steel" ], "symbol": ";", "color": "light_green", @@ -292,8 +281,7 @@ "moves": 150, "skills": [ "electronics", "computer" ] }, - "flags": [ "SINGLE_USE" ], - "melee_damage": { "bash": 8 } + "flags": [ "SINGLE_USE" ] }, { "id": "bot_talon_m202a1", @@ -304,7 +292,6 @@ "volume": "30 L", "price": "7 kUSD 500 USD", "price_postapoc": "30 USD", - "to_hit": -3, "material": [ "steel" ], "symbol": ";", "color": "light_green", @@ -317,8 +304,7 @@ "moves": 150, "skills": [ "electronics", "computer" ] }, - "flags": [ "SINGLE_USE" ], - "melee_damage": { "bash": 8 } + "flags": [ "SINGLE_USE" ] }, { "id": "bot_secubot_liberty", @@ -329,7 +315,6 @@ "volume": "30 L", "price": "7 kUSD 500 USD", "price_postapoc": "25 USD", - "to_hit": -3, "material": [ "steel" ], "symbol": "F", "color": "light_gray", @@ -342,8 +327,7 @@ "moves": 150, "skills": [ "electronics", "computer", "fabrication" ] }, - "flags": [ "SINGLE_USE" ], - "melee_damage": { "bash": 8 } + "flags": [ "SINGLE_USE" ] }, { "id": "bot_nursebot", @@ -354,7 +338,6 @@ "weight": "81500 g", "price": "7 kUSD 500 USD", "price_postapoc": "20 USD", - "to_hit": -3, "material": [ "steel" ], "symbol": ";", "color": "light_blue", @@ -367,8 +350,7 @@ "moves": 150, "skills": [ "electronics", "computer" ] }, - "flags": [ "SINGLE_USE" ], - "melee_damage": { "bash": 8 } + "flags": [ "SINGLE_USE" ] }, { "id": "bot_grocerybot", @@ -379,7 +361,6 @@ "weight": "81500 g", "price": "7 kUSD 500 USD", "price_postapoc": "2 USD 50 cent", - "to_hit": -3, "material": [ "steel" ], "symbol": ";", "color": "white", @@ -392,8 +373,7 @@ "moves": 150, "skills": [ "electronics", "computer" ] }, - "flags": [ "SINGLE_USE" ], - "melee_damage": { "bash": 8 } + "flags": [ "SINGLE_USE" ] }, { "id": "bot_grocerybot_busted", @@ -404,7 +384,6 @@ "weight": "81500 g", "price": "7 kUSD 500 USD", "price_postapoc": "1 USD", - "to_hit": -3, "material": [ "steel" ], "symbol": ";", "color": "white", @@ -417,8 +396,7 @@ "moves": 150, "skills": [ "electronics", "computer" ] }, - "flags": [ "SINGLE_USE" ], - "melee_damage": { "bash": 8 } + "flags": [ "SINGLE_USE" ] }, { "id": "bot_broken_cyborg", @@ -430,7 +408,6 @@ "//": "It is a disgusting mass of rotting flesh and jagged metal pieces, no one will buy it.", "price": "0 cent", "price_postapoc": "0 cent", - "to_hit": -3, "material": [ "steel", "flesh" ], "symbol": ";", "color": "light_green", @@ -444,8 +421,7 @@ "moves": 250, "skills": [ "electronics", "computer" ] }, - "flags": [ "SINGLE_USE" ], - "melee_damage": { "bash": 8 } + "flags": [ "SINGLE_USE" ] }, { "id": "bot_prototype_cyborg", @@ -457,7 +433,6 @@ "//": "It is an affront to humanity, no one will buy it.", "price": "0 cent", "price_postapoc": "0 cent", - "to_hit": -3, "material": [ "steel", "flesh" ], "symbol": ";", "color": "light_green", @@ -471,8 +446,7 @@ "moves": 250, "skills": [ "electronics", "computer" ] }, - "flags": [ "SINGLE_USE" ], - "melee_damage": { "bash": 8 } + "flags": [ "SINGLE_USE" ] }, { "id": "bot_hazmatbot", @@ -483,7 +457,6 @@ "volume": "62500 ml", "price": "100 USD", "price_postapoc": "5 USD", - "to_hit": -3, "material": [ "steel" ], "symbol": ";", "color": "light_green", @@ -497,8 +470,7 @@ "moves": 100, "skills": [ "electronics", "computer" ] }, - "flags": [ "SINGLE_USE" ], - "melee_damage": { "bash": 8 } + "flags": [ "SINGLE_USE" ] }, { "id": "bot_molebot", @@ -510,7 +482,6 @@ "volume": "62500 ml", "price": "250 USD", "price_postapoc": "10 USD", - "to_hit": -3, "material": [ "steel" ], "symbol": ";", "color": "light_green", @@ -524,8 +495,7 @@ "moves": 100, "skills": [ "electronics", "computer" ] }, - "flags": [ "SINGLE_USE" ], - "melee_damage": { "bash": 8 } + "flags": [ "SINGLE_USE" ] }, { "id": "bot_skitterbot", @@ -538,7 +508,6 @@ "volume": "105 L", "price": "800 USD", "price_postapoc": "100 USD", - "to_hit": -3, "material": [ "steel", "plastic" ], "symbol": ";", "color": "light_green", @@ -552,8 +521,7 @@ "moves": 100, "skills": [ "electronics", "computer" ] }, - "flags": [ "SINGLE_USE", "ROBOFAC_ROBOT_MEDIUM" ], - "melee_damage": { "bash": 8 } + "flags": [ "SINGLE_USE", "ROBOFAC_ROBOT_MEDIUM" ] }, { "id": "bot_robofac_skittergun", @@ -563,10 +531,9 @@ "description": "An inactive Hub 01 exterminatron. Using this item involves placing it on the ground and turning it on. If reprogrammed and reloaded successfully, the robot will track you while providing fire-support.", "//": "Volume and weight based on Boston Dynamics Spot.", "volume": "125 L", - "weight": "36000 g", + "weight": "36 kg", "price": "800 USD", "price_postapoc": "250 USD", - "to_hit": -3, "material": [ "steel", "plastic" ], "symbol": ";", "color": "light_green", @@ -580,8 +547,7 @@ "moves": 100, "skills": [ "electronics", "computer" ] }, - "flags": [ "SINGLE_USE", "ROBOFAC_ROBOT_MEDIUM" ], - "melee_damage": { "bash": 8 } + "flags": [ "SINGLE_USE", "ROBOFAC_ROBOT_MEDIUM" ] }, { "id": "bot_science_bot", @@ -589,11 +555,10 @@ "type": "TOOL", "name": { "str": "inactive lab defense bot" }, "description": "An inactive experimental robot plundered from a science lab. It resembles a human-sized spider and was designed to deploy manhacks. Using this item involves placing it on the ground and turning it on. If reprogrammed and rewired successfully, the robot will race towards enemies and deploy a variety of experimental devices.", - "weight": "100000 g", - "volume": "65000 ml", + "weight": "100 kg", + "volume": "65 L", "price": "800 USD", "price_postapoc": "15 USD", - "to_hit": -3, "material": [ "steel" ], "symbol": ";", "color": "light_green", @@ -607,19 +572,17 @@ "moves": 100, "skills": [ "electronics", "computer" ] }, - "flags": [ "SINGLE_USE" ], - "melee_damage": { "bash": 8 } + "flags": [ "SINGLE_USE" ] }, { "id": "bot_turret_searchlight", "type": "TOOL", "name": { "str": "inactive milspec searchlight" }, "description": "An inactive military-grade automated searchlight. Using this item involves placing it on the ground and turning it on. If reprogrammed and rewired successfully, the searchlight will then identify you as an ally, survey the area, and illuminate approaching hostiles. Seems to have an unhealthy fascination with you.", - "weight": "120000 g", + "weight": "120 kg", "volume": "92500 ml", "price": "5 kUSD", "price_postapoc": "10 USD", - "to_hit": -3, "material": [ "steel" ], "symbol": ";", "color": "light_green", @@ -633,8 +596,7 @@ "moves": 150, "skills": [ "electronics", "computer" ] }, - "flags": [ "SINGLE_USE" ], - "melee_damage": { "bash": 8 } + "flags": [ "SINGLE_USE" ] }, { "id": "bot_dispatch", @@ -645,7 +607,6 @@ "weight": "250 kg", "price": "100 kUSD", "price_postapoc": "100 USD", - "to_hit": -3, "material": [ "steel" ], "symbol": ";", "color": "yellow", @@ -658,8 +619,7 @@ "moves": 300, "skills": [ "electronics", "computer" ] }, - "flags": [ "SINGLE_USE" ], - "melee_damage": { "bash": 6 } + "flags": [ "SINGLE_USE" ] }, { "id": "bot_dispatch_military", @@ -670,7 +630,6 @@ "weight": "300 kg", "price": "1000 kUSD", "price_postapoc": "250 USD", - "to_hit": -3, "material": [ "steel" ], "symbol": ";", "color": "green", @@ -683,8 +642,7 @@ "moves": 300, "skills": [ "electronics", "computer" ] }, - "flags": [ "SINGLE_USE" ], - "melee_damage": { "bash": 6 } + "flags": [ "SINGLE_USE" ] }, { "id": "bot_turret_speaker", @@ -695,7 +653,6 @@ "volume": "50500 ml", "price": "5 kUSD", "price_postapoc": "100 USD", - "to_hit": -3, "material": [ "steel" ], "symbol": ";", "color": "light_green", @@ -708,8 +665,7 @@ "moves": 150, "skills": [ "electronics", "computer" ] }, - "flags": [ "SINGLE_USE" ], - "melee_damage": { "bash": 8 } + "flags": [ "SINGLE_USE" ] }, { "id": "bot_tazer_hack", @@ -720,7 +676,7 @@ "volume": "750 ml", "price": "645 USD", "price_postapoc": "30 USD", - "to_hit": -3, + "to_hit": { "grip": "bad", "length": "hand", "surface": "line", "balance": "clumsy" }, "material": [ "aluminum", "plastic" ], "symbol": ",", "color": "cyan", @@ -746,13 +702,11 @@ "volume": "50 L", "price": "645 USD", "price_postapoc": "30 USD", - "to_hit": -3, "material": [ "steel", "ceramic" ], "symbol": ",", "color": "cyan", "use_action": { "type": "effect_on_conditions", "menu_text": "Activate", "effect_on_conditions": [ "yrax_trifacet_activation" ] }, - "flags": [ "SINGLE_USE" ], - "melee_damage": { "bash": 6, "cut": 6 } + "flags": [ "SINGLE_USE" ] }, { "type": "TOOL", @@ -766,10 +720,8 @@ "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", "SINGLE_USE" ], - "use_action": { "type": "effect_on_conditions", "menu_text": "Activate", "effect_on_conditions": [ "yrax_triakis_activation" ] }, - "melee_damage": { "bash": 20, "cut": 15 } + "use_action": { "type": "effect_on_conditions", "menu_text": "Activate", "effect_on_conditions": [ "yrax_triakis_activation" ] } }, { "id": "bot_golden_monolith", @@ -785,7 +737,6 @@ "material": [ "yrax_quartz", "gold" ], "color": "yellow", "flags": [ "TRADER_AVOID", "NO_REPAIR", "SINGLE_USE" ], - "melee_damage": { "bash": 1000 }, "use_action": { "type": "effect_on_conditions", "menu_text": "Activate", @@ -822,7 +773,7 @@ "volume": "750 ml", "price": "600 USD", "price_postapoc": "8 USD", - "to_hit": -3, + "to_hit": { "grip": "bad", "length": "hand", "surface": "line", "balance": "clumsy" }, "material": [ "aluminum", "plastic" ], "symbol": ",", "color": "light_green", @@ -848,7 +799,7 @@ "volume": "750 ml", "price": "600 USD", "price_postapoc": "8 USD", - "to_hit": -3, + "to_hit": { "grip": "bad", "length": "hand", "surface": "line", "balance": "clumsy" }, "material": [ "aluminum", "plastic" ], "symbol": ",", "color": "light_green", @@ -874,7 +825,7 @@ "volume": "750 ml", "price": "600 USD", "price_postapoc": "8 USD", - "to_hit": -3, + "to_hit": { "grip": "bad", "length": "hand", "surface": "line", "balance": "clumsy" }, "material": [ "aluminum", "plastic" ], "symbol": ",", "color": "yellow", @@ -900,7 +851,7 @@ "volume": "750 ml", "price": "600 USD", "price_postapoc": "8 USD", - "to_hit": -3, + "to_hit": { "grip": "bad", "length": "hand", "surface": "line", "balance": "clumsy" }, "material": [ "aluminum", "plastic" ], "symbol": ",", "color": "blue", @@ -926,7 +877,7 @@ "volume": "750 ml", "price": "600 USD", "price_postapoc": "8 USD", - "to_hit": -3, + "to_hit": { "grip": "bad", "length": "hand", "surface": "line", "balance": "clumsy" }, "material": [ "aluminum", "plastic" ], "symbol": ",", "color": "cyan", @@ -952,7 +903,7 @@ "volume": "750 ml", "price": "600 USD", "price_postapoc": "8 USD", - "to_hit": -3, + "to_hit": { "grip": "bad", "length": "hand", "surface": "line", "balance": "clumsy" }, "material": [ "aluminum", "plastic" ], "symbol": ",", "color": "dark_gray", @@ -979,7 +930,6 @@ "volume": "30 L", "price": "100 USD", "price_postapoc": "5 USD", - "to_hit": -3, "material": [ "steel", "plastic" ], "symbol": ";", "color": "light_green", @@ -992,7 +942,6 @@ "moves": 100, "skills": [ "electronics", "computer" ] }, - "flags": [ "SINGLE_USE", "NO_SALVAGE" ], - "melee_damage": { "bash": 8 } + "flags": [ "SINGLE_USE", "NO_SALVAGE" ] } ] diff --git a/data/json/items/furniture/seating.json b/data/json/items/furniture/seating.json index 6a93f4a437fb6..5c45caa69cffd 100644 --- a/data/json/items/furniture/seating.json +++ b/data/json/items/furniture/seating.json @@ -13,7 +13,8 @@ "volume": "30 L", "weight": "12 kg", "material": [ "wood" ], - "to_hit": -3 + "to_hit": { "grip": "none", "length": "long", "surface": "any", "balance": "clumsy" }, + "melee_damage": { "bash": 6 } }, { "type": "GENERIC", @@ -28,8 +29,9 @@ "longest_side": "110 cm", "volume": "570 L", "weight": "27 kg", - "material": [ { "type": "cotton", "portion": 75 }, { "type": "wood", "portion": 25 } ], - "to_hit": -4 + "material": [ { "type": "cotton", "portion": 3 }, { "type": "wood", "portion": 1 } ], + "to_hit": { "grip": "bad", "length": "long", "surface": "any", "balance": "clumsy" }, + "melee_damage": { "bash": 6 } }, { "type": "GENERIC", @@ -44,7 +46,9 @@ "longest_side": "45 cm", "volume": "17 L", "weight": "3 kg", - "material": [ "wood" ] + "material": [ "wood" ], + "to_hit": { "grip": "none", "length": "short", "surface": "any", "balance": "clumsy" }, + "melee_damage": { "bash": 6 } }, { "type": "GENERIC", @@ -59,7 +63,9 @@ "longest_side": "50 cm", "volume": "20 L", "weight": "11 kg", - "material": [ "wood" ] + "material": [ "wood" ], + "to_hit": { "grip": "bad", "length": "short", "surface": "any", "balance": "clumsy" }, + "melee_damage": { "bash": 6 } }, { "type": "GENERIC", @@ -73,7 +79,10 @@ "longest_side": "80 cm", "volume": "30 L", "weight": "7500 g", - "material": [ { "type": "steel", "portion": 975 }, { "type": "leather", "portion": 25 } ] + "material": [ { "type": "steel", "portion": 39 }, { "type": "leather", "portion": 1 } ], + "flags": [ "NO_SALVAGE" ], + "to_hit": { "grip": "none", "length": "short", "surface": "any", "balance": "clumsy" }, + "melee_damage": { "bash": 6 } }, { "type": "GENERIC", @@ -88,8 +97,9 @@ "longest_side": "80 cm", "volume": "30 L", "weight": "5 kg", - "material": [ { "type": "wood", "portion": 85 }, { "type": "steel", "portion": 15 } ], - "to_hit": -3 + "material": [ { "type": "wood", "portion": 17 }, { "type": "steel", "portion": 3 } ], + "to_hit": { "grip": "none", "length": "short", "surface": "any", "balance": "clumsy" }, + "melee_damage": { "bash": 6 } }, { "type": "GENERIC", diff --git a/data/json/items/furniture/storage.json b/data/json/items/furniture/storage.json index dfe264e7cf7bd..fda23c54e3229 100644 --- a/data/json/items/furniture/storage.json +++ b/data/json/items/furniture/storage.json @@ -25,6 +25,7 @@ ], "use_action": { "type": "deploy_furn", "furn_type": "f_foot_locker_aluminum" }, "to_hit": { "grip": "bad", "length": "long", "surface": "any", "balance": "clumsy" }, + "melee_damage": { "bash": 6 }, "//": "Weight and pocket data recalculated from foot_locker with the use of the same resources but with the assumption that walls are gauge 16 aluminum." }, { diff --git a/data/json/items/generic.json b/data/json/items/generic.json index 0317981cbd479..b776da27fa4c9 100644 --- a/data/json/items/generic.json +++ b/data/json/items/generic.json @@ -1465,9 +1465,7 @@ "material": [ "steel", "plastic" ], "weight": "31520 g", "volume": "15 L", - "to_hit": { "grip": "bad", "length": "short", "surface": "line", "balance": "clumsy" }, - "flags": [ "TRADER_AVOID", "NO_REPAIR", "NO_SALVAGE" ], - "melee_damage": { "bash": 6, "cut": 6 } + "flags": [ "TRADER_AVOID", "NO_REPAIR", "NO_SALVAGE" ] }, { "type": "GENERIC", @@ -1482,9 +1480,7 @@ "material": [ "steel", "plastic" ], "weight": "32700 g", "volume": "105 L", - "to_hit": { "grip": "bad", "length": "short", "surface": "line", "balance": "clumsy" }, - "flags": [ "TRADER_AVOID", "NO_REPAIR" ], - "melee_damage": { "bash": 4, "cut": 4 } + "flags": [ "TRADER_AVOID", "NO_REPAIR" ] }, { "type": "GENERIC", @@ -1499,9 +1495,7 @@ "material": [ "steel", "plastic" ], "weight": "32700 g", "volume": "105 L", - "to_hit": { "grip": "bad", "length": "long", "surface": "line", "balance": "clumsy" }, - "flags": [ "TRADER_AVOID", "NO_REPAIR" ], - "melee_damage": { "bash": 4, "cut": 4 } + "flags": [ "TRADER_AVOID", "NO_REPAIR" ] }, { "type": "GENERIC", @@ -1515,10 +1509,8 @@ "price_postapoc": "10 cent", "material": [ "steel", "plastic" ], "weight": "100 kg", - "volume": "65000 ml", - "to_hit": { "grip": "bad", "length": "long", "surface": "line", "balance": "clumsy" }, - "flags": [ "TRADER_AVOID", "NO_REPAIR" ], - "melee_damage": { "bash": 4, "cut": 4 } + "volume": "65 L", + "flags": [ "TRADER_AVOID", "NO_REPAIR" ] }, { "type": "GENERIC", @@ -1533,9 +1525,7 @@ "material": [ "steel", "plastic" ], "weight": "140 kg", "volume": "62500 ml", - "to_hit": { "grip": "bad", "length": "long", "surface": "line", "balance": "clumsy" }, - "flags": [ "TRADER_AVOID", "NO_REPAIR" ], - "melee_damage": { "bash": 6, "cut": 6 } + "flags": [ "TRADER_AVOID", "NO_REPAIR" ] }, { "type": "GENERIC", @@ -1550,9 +1540,7 @@ "material": [ "steel", "plastic" ], "weight": "140 kg", "volume": "62500 ml", - "to_hit": { "grip": "bad", "length": "long", "surface": "line", "balance": "clumsy" }, - "flags": [ "TRADER_AVOID", "NO_REPAIR" ], - "melee_damage": { "bash": 6, "cut": 6 } + "flags": [ "TRADER_AVOID", "NO_REPAIR" ] }, { "type": "GENERIC", @@ -1567,9 +1555,7 @@ "material": [ "steel", "plastic" ], "weight": "140 kg", "volume": "62500 ml", - "to_hit": { "grip": "bad", "length": "long", "surface": "line", "balance": "clumsy" }, - "flags": [ "TRADER_AVOID", "NO_REPAIR" ], - "melee_damage": { "bash": 6, "cut": 6 } + "flags": [ "TRADER_AVOID", "NO_REPAIR" ] }, { "type": "GENERIC", @@ -1590,9 +1576,7 @@ "material": [ "steel", "plastic" ], "weight": "140 kg", "volume": "62500 ml", - "to_hit": { "grip": "bad", "length": "long", "surface": "line", "balance": "clumsy" }, - "flags": [ "TRADER_AVOID" ], - "melee_damage": { "bash": 6, "cut": 6 } + "flags": [ "TRADER_AVOID" ] }, { "type": "GENERIC", @@ -1607,9 +1591,7 @@ "material": [ "steel", "plastic" ], "weight": "170200 g", "volume": "62500 ml", - "to_hit": { "grip": "bad", "length": "long", "surface": "line", "balance": "clumsy" }, - "flags": [ "TRADER_AVOID", "NO_REPAIR" ], - "melee_damage": { "bash": 6, "cut": 10 } + "flags": [ "TRADER_AVOID", "NO_REPAIR" ] }, { "type": "GENERIC", @@ -1620,12 +1602,10 @@ "volume": "125 L", "price": "10 USD", "price_postapoc": "10 cent", - "to_hit": { "grip": "bad", "length": "long", "surface": "any", "balance": "clumsy" }, "material": [ "superalloy" ], "symbol": ";", "color": "light_green", - "flags": [ "TRADER_AVOID", "NO_REPAIR" ], - "melee_damage": { "bash": 7 } + "flags": [ "TRADER_AVOID", "NO_REPAIR" ] }, { "type": "GENERIC", @@ -1636,12 +1616,10 @@ "volume": "250 L", "price": "10 USD", "price_postapoc": "10 cent", - "to_hit": { "grip": "bad", "length": "long", "surface": "any", "balance": "clumsy" }, "material": [ "superalloy" ], "symbol": ";", "color": "light_green", - "flags": [ "TRADER_AVOID", "NO_REPAIR" ], - "melee_damage": { "bash": 8 } + "flags": [ "TRADER_AVOID", "NO_REPAIR" ] }, { "type": "GENERIC", @@ -1652,12 +1630,10 @@ "volume": "250 L", "price": "10 USD", "price_postapoc": "10 cent", - "to_hit": { "grip": "bad", "length": "long", "surface": "any", "balance": "clumsy" }, "material": [ "superalloy" ], "symbol": ";", "color": "light_green", - "flags": [ "TRADER_AVOID", "NO_REPAIR" ], - "melee_damage": { "bash": 8 } + "flags": [ "TRADER_AVOID", "NO_REPAIR" ] }, { "type": "GENERIC", @@ -1672,9 +1648,7 @@ "material": [ "steel", "plastic" ], "weight": "100 kg", "volume": "85 L", - "to_hit": { "grip": "bad", "length": "long", "surface": "line", "balance": "clumsy" }, - "flags": [ "TRADER_AVOID", "NO_REPAIR" ], - "melee_damage": { "bash": 4, "cut": 4 } + "flags": [ "TRADER_AVOID", "NO_REPAIR" ] }, { "type": "AMMO", diff --git a/data/json/items/generic/bathroom_house.json b/data/json/items/generic/bathroom_house.json index 2b7fb3e8baa42..f64d16f5bec99 100644 --- a/data/json/items/generic/bathroom_house.json +++ b/data/json/items/generic/bathroom_house.json @@ -10,9 +10,7 @@ "price_postapoc": "0 cent", "weight": "100 g", "volume": "100 ml", - "material": [ "plastic" ], - "to_hit": -1, - "melee_damage": { "bash": 1 } + "material": [ "plastic" ] }, { "id": "soap_holder", @@ -177,7 +175,6 @@ "volume": "400 ml", "longest_side": "24 cm", "price": "6 USD", - "to_hit": { "grip": "solid", "length": "short", "surface": "any", "balance": "neutral" }, "snippet_category": [ { "id": "hbrush1", "text": "An instrument of hair torture. There are round safety tips on the bristles." }, { "id": "hbrush2", "text": "An old-fashioned hair-straightening device with a faux-wood handle." }, @@ -240,8 +237,8 @@ "volume": "2100 ml", "//": "the volume is pretty bulky, but this is an old fashioned model.", "material": [ "wood", "rubber" ], - "to_hit": -1, - "melee_damage": { "bash": 5 } + "to_hit": { "grip": "solid", "length": "short", "surface": "any", "balance": "neutral" }, + "melee_damage": { "bash": 2 } }, { "id": "plunger_futuristic", @@ -254,9 +251,7 @@ "price_postapoc": "10 cent", "weight": "680 g", "volume": "2400 ml", - "material": [ "plastic" ], - "to_hit": -1, - "melee_damage": { "bash": 2 } + "material": [ "plastic" ] }, { "id": "toilet_paper", @@ -305,8 +300,8 @@ "charges_per_use": 35, "use_action": [ { "type": "link_up", "cable_length": 2, "charge_rate": "1500 W" } ], "charged_qualities": [ [ "WINNOW", 1 ], [ "BLOW_HOT_AIR", 1 ] ], - "to_hit": -1, - "melee_damage": { "bash": 3 } + "to_hit": { "grip": "none", "length": "short", "surface": "any", "balance": "clumsy" }, + "melee_damage": { "bash": 2 } }, { "id": "curling_iron", @@ -320,7 +315,7 @@ "volume": "250 ml", "weight": "590 g", "material": [ "ceramic", "steel" ], - "to_hit": 1, + "to_hit": { "grip": "none", "length": "short", "surface": "any", "balance": "uneven" }, "melee_damage": { "bash": 3 } }, { @@ -334,9 +329,7 @@ "price_postapoc": "0 cent", "volume": "500 ml", "weight": "160 g", - "material": [ "steel", "plastic" ], - "to_hit": 1, - "melee_damage": { "bash": 3 } + "material": [ "steel", "plastic" ] }, { "id": "comb_lice", diff --git a/data/json/items/generic/bedding.json b/data/json/items/generic/bedding.json index cf9944d138916..df7b1f1b05380 100644 --- a/data/json/items/generic/bedding.json +++ b/data/json/items/generic/bedding.json @@ -10,7 +10,6 @@ "volume": "90 ml", "price": "6 USD 50 cent", "price_postapoc": "2 cent", - "to_hit": { "grip": "none", "length": "short", "surface": "any", "balance": "clumsy" }, "material": [ "cotton" ], "flags": [ "SLEEP_AID_CONTAINER" ], "pocket_data": [ { "pocket_type": "CONTAINER", "max_contains_volume": "15 L", "max_contains_weight": "15 kg", "moves": 400 } ], @@ -57,7 +56,6 @@ "volume": "564 ml", "price": "20 USD", "price_postapoc": "50 cent", - "to_hit": -1, "material": [ "cotton" ], "symbol": "[", "looks_like": "blanket", @@ -82,7 +80,6 @@ "volume": "15500 ml", "price": "15 USD", "price_postapoc": "50 cent", - "to_hit": { "grip": "none", "length": "long", "surface": "any", "balance": "clumsy" }, "material": [ "cotton" ], "symbol": "[", "looks_like": "towel", @@ -197,7 +194,6 @@ "volume": "15 L", "price": "55 USD", "price_postapoc": "1 USD 50 cent", - "to_hit": -1, "material": [ "cotton" ], "symbol": "[", "looks_like": "blanket", @@ -223,7 +219,6 @@ "volume": "31 L", "price": "195 USD", "price_postapoc": "2 USD 50 cent", - "to_hit": -1, "material": [ "cotton", "fur" ], "symbol": "[", "looks_like": "blanket", @@ -249,7 +244,6 @@ "volume": "5 L", "price": "55 USD", "price_postapoc": "2 USD", - "to_hit": -1, "material": [ "wool" ], "symbol": "[", "color": "white", @@ -316,7 +310,6 @@ "volume": "1 L", "price": "205 USD", "price_postapoc": "5 USD", - "to_hit": -1, "material": [ "cotton" ], "symbol": "[", "looks_like": "blanket", @@ -373,7 +366,6 @@ "volume": "700 ml", "price": "5 USD", "price_postapoc": "50 cent", - "to_hit": -1, "material": [ "dry_plant" ], "symbol": "[", "looks_like": "blanket", @@ -398,7 +390,6 @@ "volume": "1400 ml", "price": "10 USD", "price_postapoc": "1 USD", - "to_hit": -1, "material": [ "dry_plant" ], "symbol": "[", "looks_like": "blanket", diff --git a/data/json/items/generic/dining_kitchen.json b/data/json/items/generic/dining_kitchen.json index 5e4097cdadbfa..43e10a342c492 100644 --- a/data/json/items/generic/dining_kitchen.json +++ b/data/json/items/generic/dining_kitchen.json @@ -11,8 +11,8 @@ "weight": "48 g", "volume": "25 ml", "material": [ "steel" ], - "to_hit": -1, - "melee_damage": { "bash": 2, "cut": 1 } + "to_hit": { "grip": "solid", "length": "hand", "surface": "point", "balance": "neutral" }, + "melee_damage": { "cut": 1 } }, { "abstract": "base_utensil", @@ -26,8 +26,8 @@ "weight": "158 g", "volume": "75 ml", "material": [ "steel" ], - "to_hit": -1, - "melee_damage": { "bash": 3, "cut": 2 } + "to_hit": { "grip": "solid", "length": "hand", "surface": "point", "balance": "neutral" }, + "melee_damage": { "cut": 2 } }, { "abstract": "base_plastic_silverware", @@ -40,8 +40,7 @@ "price_postapoc": "0 cent", "weight": "28 g", "volume": "25 ml", - "material": [ "plastic" ], - "melee_damage": { "bash": 1, "cut": 1 } + "material": [ "plastic" ] }, { "abstract": "base_ceramic_dish", @@ -55,7 +54,8 @@ "material": [ "ceramic" ], "weight": "375 g", "volume": "375 ml", - "to_hit": -1, + "to_hit": { "grip": "bad", "length": "hand", "surface": "any", "balance": "clumsy" }, + "flags": [ "FRAGILE_MELEE" ], "melee_damage": { "bash": 3 } }, { @@ -70,7 +70,8 @@ "material": [ "glass" ], "weight": "322 g", "volume": "262 ml", - "to_hit": -1, + "to_hit": { "grip": "bad", "length": "hand", "surface": "any", "balance": "clumsy" }, + "flags": [ "FRAGILE_MELEE" ], "melee_damage": { "bash": 3 } }, { @@ -85,7 +86,7 @@ "material": [ "tin" ], "weight": "262 g", "volume": "262 ml", - "to_hit": -1, + "to_hit": { "grip": "bad", "length": "hand", "surface": "any", "balance": "clumsy" }, "melee_damage": { "bash": 2 } }, { @@ -99,9 +100,7 @@ "price_postapoc": "0 cent", "material": [ "plastic" ], "weight": "130 g", - "volume": "262 ml", - "to_hit": -1, - "melee_damage": { "bash": 1 } + "volume": "262 ml" }, { "abstract": "base_cookpot", @@ -1256,12 +1255,12 @@ "category": "tools", "name": { "str": "makeshift pot" }, "description": "A sheet of metal crudely hammered into a cooking pot. Good enough to cook food and boil water, but not as useful as proper cookware.", - "weight": "6000 g", + "weight": "6 kg", "volume": "1050 ml", "longest_side": "20 cm", "price": "2 USD", "price_postapoc": "5 cent", - "to_hit": 1, + "to_hit": { "grip": "bad", "length": "hand", "surface": "any", "balance": "clumsy" }, "material": [ "steel" ], "symbol": ")", "color": "light_gray", @@ -1277,7 +1276,7 @@ "qualities": [ [ "COOK", 2 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ] ], "use_action": [ "HEAT_ALL_ITEMS" ], "flags": [ "ALLOWS_REMOTE_USE" ], - "melee_damage": { "bash": 10 } + "melee_damage": { "bash": 6 } }, { "id": "pot_makeshift_copper", @@ -1290,7 +1289,7 @@ "longest_side": "20 cm", "price": "2 USD", "price_postapoc": "5 cent", - "to_hit": 1, + "to_hit": { "grip": "bad", "length": "hand", "surface": "any", "balance": "clumsy" }, "material": [ "copper" ], "symbol": ")", "color": "light_red", @@ -1306,7 +1305,7 @@ "qualities": [ [ "COOK", 2 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ] ], "use_action": [ "HEAT_ALL_ITEMS" ], "flags": [ "ALLOWS_REMOTE_USE" ], - "melee_damage": { "bash": 10 } + "melee_damage": { "bash": 2 } }, { "type": "GENERIC", @@ -1400,10 +1399,8 @@ "material": [ "steel" ], "weight": "300 g", "volume": "250 ml", - "to_hit": -1, "qualities": [ [ "COOK", 1 ], [ "CONTAIN", 1 ] ], - "use_action": [ "HEAT_SOLID_ITEMS" ], - "melee_damage": { "bash": 2 } + "use_action": [ "HEAT_SOLID_ITEMS" ] }, { "type": "GENERIC", diff --git a/data/json/items/generic/spares.json b/data/json/items/generic/spares.json index 053391d75e325..503392918131b 100644 --- a/data/json/items/generic/spares.json +++ b/data/json/items/generic/spares.json @@ -142,10 +142,10 @@ "material": [ "steel" ], "weight": "7 kg", "volume": "3 L", - "to_hit": -4, + "to_hit": { "grip": "bad", "length": "short", "surface": "any", "balance": "clumsy" }, "price": "100 USD", "price_postapoc": "20 USD", - "melee_damage": { "bash": 16 } + "melee_damage": { "bash": 8 } }, { "id": "nitrogen_membrane_filter", diff --git a/data/json/items/generic/storage.json b/data/json/items/generic/storage.json index ca905469cb6c5..9fa074c02977c 100644 --- a/data/json/items/generic/storage.json +++ b/data/json/items/generic/storage.json @@ -23,7 +23,6 @@ "longest_side": "45 cm", "price": "40 USD", "price_postapoc": "2 USD", - "to_hit": -1, "material": [ "nylon" ], "symbol": "[", "looks_like": "rope_6", diff --git a/data/json/items/generic/toys_and_sports.json b/data/json/items/generic/toys_and_sports.json index ae11e1f27fdbe..464ccb271f22f 100644 --- a/data/json/items/generic/toys_and_sports.json +++ b/data/json/items/generic/toys_and_sports.json @@ -9,7 +9,6 @@ "volume": "725 ml", "price": "60 USD", "price_postapoc": "0 cent", - "to_hit": -1, "material": [ "plastic" ], "symbol": "|", "color": "pink", @@ -46,12 +45,10 @@ "longest_side": "37 cm", "price": "12 USD", "price_postapoc": "5 cent", - "to_hit": -1, "color": "blue", "symbol": "/", "material": [ "plastic" ], - "flags": [ "NONCONDUCTIVE", "FLOTATION" ], - "melee_damage": { "bash": 4 } + "flags": [ "NONCONDUCTIVE", "FLOTATION" ] }, { "id": "shuttlecock", @@ -66,8 +63,7 @@ "price_postapoc": "0 cent", "material": [ "rubber", "plastic" ], "symbol": "-", - "color": "white", - "to_hit": -5 + "color": "white" }, { "id": "golf_tee", @@ -97,9 +93,7 @@ "price_postapoc": "0 cent", "material": [ "plastic" ], "symbol": "*", - "color": "white", - "to_hit": -3, - "melee_damage": { "bash": 5 } + "color": "white" }, { "type": "AMMO", @@ -117,14 +111,12 @@ "weight": "170 g", "volume": "250 ml", "longest_side": "57 mm", - "damage": { "damage_type": "bash", "amount": 8 }, "range": 10, "dispersion": 14, "loudness": 0, - "to_hit": -3, "recovery_chance": 98, "effects": [ "NEVER_MISFIRES", "NON_FOULING" ], - "melee_damage": { "bash": 8 } + "thrown_damage": [ { "damage_type": "bash", "amount": 3 } ] }, { "type": "GENERIC", @@ -161,10 +153,9 @@ "range": 12, "dispersion": 12, "loudness": 0, - "to_hit": 3, "recovery_chance": 99, "effects": [ "NEVER_MISFIRES", "NON_FOULING" ], - "thrown_damage": [ { "damage_type": "bash", "amount": 6 } ] + "thrown_damage": [ { "damage_type": "bash", "amount": 3 } ] }, { "type": "GENERIC", @@ -179,9 +170,7 @@ "material": [ { "type": "leather", "portion": 9 }, { "type": "rubber" } ], "weight": "400 g", "volume": "750 ml", - "longest_side": "29 cm", - "to_hit": -1, - "melee_damage": { "bash": 4 } + "longest_side": "29 cm" }, { "type": "GENERIC", @@ -196,9 +185,7 @@ "material": [ "rubber" ], "weight": "800 g", "volume": "1 L", - "longest_side": "239 mm", - "to_hit": -1, - "melee_damage": { "bash": 6 } + "longest_side": "239 mm" }, { "type": "GENERIC", @@ -213,9 +200,7 @@ "material": [ "rubber" ], "weight": "260 g", "volume": "1 L", - "longest_side": "26 cm", - "to_hit": -1, - "melee_damage": { "bash": 4 } + "longest_side": "26 cm" }, { "type": "TOOL", diff --git a/data/mods/TEST_DATA/expected_dps_data/junk_dps.json b/data/mods/TEST_DATA/expected_dps_data/junk_dps.json index c0d013764a514..80c1f644f7988 100644 --- a/data/mods/TEST_DATA/expected_dps_data/junk_dps.json +++ b/data/mods/TEST_DATA/expected_dps_data/junk_dps.json @@ -17,7 +17,6 @@ "expected_dps": { "banjo": 5.53, "saxophone": 5.55, - "pool_ball": 5.58, "knuckle_skewer": 5.58, "rock_sock": 5.63, "2x4": 5.66, @@ -78,7 +77,6 @@ "arisaka_monopod_deployed": 8.66, "arisaka_monopod": 8.66, "stick": 9.04, - "pot_makeshift_copper": 9.61, "bolt_ballista_steel": 7.64, "chain": 9.64, "pastaextruder": 5.89 diff --git a/data/mods/TEST_DATA/legacy_to_hit.json b/data/mods/TEST_DATA/legacy_to_hit.json index 695b2a1afb0a0..bbdb41c96d33a 100644 --- a/data/mods/TEST_DATA/legacy_to_hit.json +++ b/data/mods/TEST_DATA/legacy_to_hit.json @@ -29,7 +29,6 @@ "anvil_heavy", "ar10", "arisaka_monopod", - "armchair", "art_crystal", "art_disc", "art_jelly", @@ -49,9 +48,7 @@ "ballista", "barb_launcher", "barometer", - "baseball", "basket", - "basketball", "battery_charger", "bbgun", "bee_sting", @@ -76,59 +73,16 @@ "bone_fossil", "bone_plaster", "boobytrap", - "bot_EMP_hack", - "bot_antimateriel", - "bot_broken_cyborg", - "bot_c4_hack", - "bot_crows_m240", - "bot_dispatch", - "bot_dispatch_military", - "bot_flashbang_hack", - "bot_gasbomb_hack", - "bot_grenade_hack", - "bot_grocerybot", - "bot_grocerybot_busted", - "bot_hazmatbot", - "bot_lab_security_drone_BM", - "bot_lab_security_drone_BM2", - "bot_lab_security_drone_BS", - "bot_lab_security_drone_GM", - "bot_lab_security_drone_GR", - "bot_lab_security_drone_YM", - "bot_manhack", - "bot_molebot", - "bot_nursebot", - "bot_prototype_cyborg", - "bot_rifleturret", - "bot_robofac_camspy", - "bot_robofac_skittergun", - "bot_science_bot", - "bot_secubot", - "bot_secubot_liberty", - "bot_skitterbot", - "bot_talon_m202a1", - "bot_tazer_hack", - "bot_turret", - "bot_turret_riot", - "bot_turret_searchlight", - "bot_turret_speaker", - "bot_yrax_trifacet", "boxcutter", "bren2_556", "bren2_762", "brogyaga", "brogyeki", - "broken_exodii_quad", - "broken_exodii_sniper_drone", - "broken_exodii_turret", - "broken_exodii_worker", - "broken_yrax_trifacet", "bronze_hoe", "bronze_shears", "broom", "browning_blr", "brush", - "brush_toilet", "burette", "butane_tank", "c4", @@ -147,8 +101,6 @@ "chainsaw_off", "chainsaw_on", "chair_folding", - "chair_plywood", - "chair_wood", "cheek_pad", "chemical_thrower", "chemistry_set", @@ -171,7 +123,6 @@ "compbow", "compcrossbow", "compositecrossbow", - "compressor", "copper_knife", "cot", "counterweight", @@ -180,7 +131,6 @@ "cu_pipe", "cured_hide", "cured_pelt", - "curling_iron", "cuvettes", "cz600", "damaged_shelter_kit", @@ -194,7 +144,6 @@ "digging_stick", "directional_antenna", "diveknife", - "down_blanket", "draw_plate", "drift", "drill_rock_primitive", @@ -231,7 +180,6 @@ "floodlight", "fn_fal_semi", "foldframe", - "football", "forged_shears", "frame", "frame_wood", @@ -241,7 +189,6 @@ "full_barrel_bomb", "full_barrel_bomb_act", "funnel_separation", - "fur_blanket", "g_shovel", "garand", "gas_charger", @@ -257,9 +204,6 @@ "glowstick", "glowstick_dead", "glowstick_lit", - "golf_ball", - "grass_blanket", - "grass_sheet", "grenade", "grenade_act", "grenade_emp", @@ -267,7 +211,6 @@ "grenade_inc", "grenade_inc_act", "grinder_blade", - "hair_dryer", "half_barrel_bomb", "half_barrel_bomb_act", "hammer_pocket_test", @@ -292,7 +235,6 @@ "hydrogen_tank", "hygrometer", "hygroscope", - "indoor_volleyball", "inflatable_airbag", "inflatable_section", "integrated_electrokit", @@ -348,7 +290,6 @@ "masonrysaw_on", "mdrx", "melting_point", - "mess_tray", "metal_butcher_rack", "metal_funnel", "metal_smoking_rack", @@ -392,7 +333,6 @@ "oil_press_electric", "omnicamera", "omnicamera_reinforced", - "outfit_storage", "oxygen_cylinder", "p220_10", "p226_357sig", @@ -414,13 +354,8 @@ "plasma_rifle", "plastic_boat_hull", "platinum_grille", - "plunger_futuristic", - "plunger_toilet", "pockknife", - "pool_ball", "portal", - "pot_makeshift", - "pot_makeshift_copper", "power_cord", "pressure_tank", "primitive_knife", @@ -428,7 +363,6 @@ "psl", "punch_bone", "punch_nail", - "quilt", "rack_test_tube", "rack_test_tube_micro", "radio", @@ -487,16 +421,13 @@ "sharps", "shavingkit", "shears", - "sheet", "sheet_metal_small", "shelter_kit", "shot_suppressor", "shotgun_s", "shovel", - "shuttlecock", "sig_assault_rifle", "sks", - "sleeping_bag", "sm_extinguisher", "smg_40", "smg_45", @@ -516,16 +447,13 @@ "still_lab", "stone_chopper", "stopcock", - "storage_line", "suppressor", "surv_rocket_launcher", "survivor_hairtrimmer", "survivor_shavingkit", "swage", - "swimming_kickboard", "tac338", "tac50", - "talking_doll", "tavor_12", "tearer", "telepad", @@ -728,11 +656,6 @@ "xlswat_armor" ] }, - { - "type": "test_data", - "//": "Generic Guns", - "legacy_to_hit": [ "bot_antimateriel", "bot_rifleturret", "bot_secubot", "bot_talon_m202a1", "bot_turret" ] - }, { "type": "test_data", "//": "Limb WIP",