From a6f7b65c6dc11a1a81e5265532c8636b9c4051d5 Mon Sep 17 00:00:00 2001 From: xanderrootslayer Date: Sun, 19 Apr 2020 00:39:15 -0400 Subject: [PATCH 01/33] Crude Weapons April 2020 a few weapons which were missing so far... --- .../itemgroups/Clothing_Gear/clothing.json | 1 + .../Clothing_Gear/gear_civilian.json | 1 + data/json/itemgroups/activities_hobbies.json | 1 + data/json/itemgroups/art_antiques_crafts.json | 4 +- data/json/items/melee/bludgeons.json | 42 +++++++++++-- data/json/items/melee/misc.json | 18 ++++++ data/json/items/melee/swords_and_blades.json | 35 +++++++++++ data/json/recipes/recipe_weapon.json | 60 +++++++++++++++++++ 8 files changed, 156 insertions(+), 6 deletions(-) diff --git a/data/json/itemgroups/Clothing_Gear/clothing.json b/data/json/itemgroups/Clothing_Gear/clothing.json index fca3edb3f15ba..30fb058d1eae4 100644 --- a/data/json/itemgroups/Clothing_Gear/clothing.json +++ b/data/json/itemgroups/Clothing_Gear/clothing.json @@ -2361,6 +2361,7 @@ [ "ashot", 4 ], [ "pickaxe", 1 ], [ "makeshift_machete", 4 ], + [ "machete_gimmick", 3 ], [ "flamethrower_crude", 6 ], [ "fungicide", 10 ], [ "insecticide", 10 ], diff --git a/data/json/itemgroups/Clothing_Gear/gear_civilian.json b/data/json/itemgroups/Clothing_Gear/gear_civilian.json index d7d767a11db22..995e72c563eca 100644 --- a/data/json/itemgroups/Clothing_Gear/gear_civilian.json +++ b/data/json/itemgroups/Clothing_Gear/gear_civilian.json @@ -23,6 +23,7 @@ [ "pockknife", 50 ], [ "knife_folding", 30 ], [ "knife_swissarmy", 10 ], + [ "machete_gimmick", 5 ], [ "teleumbrella", 20 ], [ "umbrella", 20 ], [ "aspirin", 100 ], diff --git a/data/json/itemgroups/activities_hobbies.json b/data/json/itemgroups/activities_hobbies.json index 6a91bddfaa310..e1fcb91fa29f2 100644 --- a/data/json/itemgroups/activities_hobbies.json +++ b/data/json/itemgroups/activities_hobbies.json @@ -196,6 +196,7 @@ [ "knife_hunting", 18 ], [ "knife_rambo", 20 ], [ "machete", 5 ], + [ "machete_gimmick", 5 ], [ "vest", 15 ], [ "backpack", 38 ], [ "backpack_leather", 18 ], diff --git a/data/json/itemgroups/art_antiques_crafts.json b/data/json/itemgroups/art_antiques_crafts.json index 506489d29d9d4..206f29f2333db 100644 --- a/data/json/itemgroups/art_antiques_crafts.json +++ b/data/json/itemgroups/art_antiques_crafts.json @@ -95,6 +95,7 @@ { "item": "baldric", "prob": 4 }, { "item": "nodachi", "prob": 1 }, { "item": "nodachi_inferior", "prob": 2 }, + { "item": "knife_churl", "prob": 2 }, { "item": "gambeson", "prob": 3 }, { "item": "tunic", "prob": 1 }, { "item": "armor_lamellar", "prob": 2 }, @@ -253,7 +254,8 @@ { "item": "dao", "prob": 3 }, { "item": "sword_xiphos", "prob": 4 }, { "item": "khopesh", "prob": 4 }, - { "item": "spear_dory", "prob": 3 } + { "item": "spear_dory", "prob": 3 }, + { "item": "knife_churl", "prob": 3 } ] }, { diff --git a/data/json/items/melee/bludgeons.json b/data/json/items/melee/bludgeons.json index 203a697b8f000..859c57f2b6a3e 100644 --- a/data/json/items/melee/bludgeons.json +++ b/data/json/items/melee/bludgeons.json @@ -242,6 +242,25 @@ "to_hit": 1, "category": "weapons" }, + { + "id:": "plunger_weapon", + "name": "brain cleaner", + "type": "TOOL", + "description": "A barbaric war pick made by driving a metal spike into a toilet plunger. World War IV will be fought with sticks and stones...", + "symbol": "/", + "color": "red", + "weight": "1138", + "volume": "2500 ml", + "price": "0", + "//": "This isn't making a weapon so much as it is ruining a plumbing tool. The sale price has gone down.", + "price_postapoc": "90", + "to_hit": 0, + "bashing": 7, + "cutting": 8, + "material": [ "wood", "plastic", "steel" ], + "techniques": [ "WBLOCK_1" ], + "flags": [ "SPEAR", "FRAGILE_MELEE", "NONCONDUCTIVE" ] + }, { "type": "GENERIC", "id": "bowling_axe", @@ -361,6 +380,18 @@ "cutting": 6, "flags": [ "SHEATH_KNIFE", "CONDUCTIVE", "FRAGILE_MELEE" ], "qualities": [ [ "BUTCHER", -18 ] ] + }, + { + "type": "recipe", + "result": "bone_knife", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_PIERCING", + "skill_used": "fabrication", + "skill_required": [ "survival", 1 ], + "time": "2 m", + "autolearn": true, + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ "bone", 1 ], "bone_human", 1 ] }, { "type": "GENERIC", @@ -870,16 +901,17 @@ "id": "sharp_toothbrush", "symbol": ",", "color": "light_blue", - "name": { "str": "sharpened toothbrush", "str_pl": "sharpened toothbrushes" }, - "description": "A personal hygiene item turned into a shank.", + "name": "plastic shank", + "name_plural": "plastic shanks", + "description": "An oblong plastic trinket with the far end ground down into a stabbing point.", "category": "weapons", "price": 400, + "price_postapoc": 0, "material": [ "plastic" ], "weight": "49 g", "volume": "250 ml", - "bashing": 2, - "cutting": 1, - "price_postapoc": 10, + "bashing": 1, + "cutting": 3, "flags": [ "STAB", "SHEATH_KNIFE", "CONDUCTIVE" ] }, { diff --git a/data/json/items/melee/misc.json b/data/json/items/melee/misc.json index c0677b12c4cc0..83fa153060f12 100644 --- a/data/json/items/melee/misc.json +++ b/data/json/items/melee/misc.json @@ -15,6 +15,24 @@ "cutting": 3, "category": "weapons" }, + { + "id:": "bullwhip_razor", + "name": "scourge", + "type": "TOOL", + "description": "The \"cat 'o nine tails\", a handle with nine short leather whips each sporting a razor-sharp metal tip. This ancient instrument of torture causes massive bleeding but is an ineffecient weapon by design.", + "symbol": "/", + "color": "brown", + "weight": "3496", + "volume": 9, + "price": 4800, + "price_postapoc": 5200, + "to_hit": 2, + "//": "There's no way you can swing this thing without hitting SOMETHING.", + "bashing": 0, + "cutting": 10, + "material": [ "leather", "steel" ], + "flags": [ "REACHATTACK", "WHIP", "NONCONDUCTIVE" ] + }, { "id": "lobotomizer", "type": "TOOL", diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json index e9f0c90bfa1b6..429078e75442b 100644 --- a/data/json/items/melee/swords_and_blades.json +++ b/data/json/items/melee/swords_and_blades.json @@ -246,6 +246,23 @@ "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 11 ] ], "flags": [ "STAB", "SHEATH_KNIFE" ] }, + { + "id": "knife_churl", + "type": "TOOL", + "name": "baselard", + "description": "A medieval dagger forged from rough iron. It is not the sharpest tool in the shed, but it is certainly one of the largest.", + "weight": "420 g", + "volume": "250 ml", + "price": 19590, + "to_hit": 1, + "bashing": 2, + "cutting": 12, + "material": [ "iron" ], + "symbol": ";", + "color": "dark_gray", + "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 15 ] ], + "flags": [ "STAB", "SHEATHE_KNIFE" ] + }, { "id": "makeshift_machete", "type": "TOOL", @@ -286,6 +303,24 @@ "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 15 ] ], "flags": [ "DURABLE_MELEE", "SHEATH_SWORD" ] }, + { + "id": "machete_gimmick", + "name": "machete multitool", + "type": "TOOL", + "description": "A thin, wobbly steel blade with sawteeth on one side and a flat chisel tip for digging. A jack of many trades and a master of none.", + "symbol": "/", + "color": "green", + "weight": 522, + "volume": 1, + "price": 2300, + "price_postapoc": 1800, + "to_hit": -1, + "bashing": 4, + "cutting": 10, + "material": "steel", + "qualiies": [ [ "CUT", 1 ], [ "BUTCHER", 8 ], [ "SAW_W", 1 ], [ "DIG", 1 ], [ "PRY", 1 ] ], + "flags": [ "SHEATH_SWORD", "FRAGILE_MELEE" ] + }, { "id": "cavalry_sabre", "type": "TOOL", diff --git a/data/json/recipes/recipe_weapon.json b/data/json/recipes/recipe_weapon.json index 412848d43ed95..24da073011394 100644 --- a/data/json/recipes/recipe_weapon.json +++ b/data/json/recipes/recipe_weapon.json @@ -92,6 +92,20 @@ [ [ "spike", 1 ] ] ] }, + { + "type": "recipe", + "result": "knife_churl", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_PIERCING", + "skill_used": "fabrication", + "difficulty": 4, + "time": "5 h", + "autolearn": true, + "using": [ [ "blacksmithing_standard", 4 ], [ "steel_standard", 1 ] ], + "qualities": [ { "id": "CHISEL", "level": 3 } ], + "tools": [ [ "swage", -1 ] ], + "components": [ [ "fur", 1 ], [ "leather", 1 ] ] + }, { "type": "recipe", "result": "pointy_stick", @@ -215,6 +229,19 @@ "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "leather", 20 ] ], [ [ "rope_superior_short", 2, "LIST" ] ] ] }, + { + "type": "recipe", + "result": "bullwhip_razor", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_RANGED", + "skill_used": "fabrication", + "difficulty": 6, + "time": "4 h", + "reversible": true, + "autolearn": true, + "qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ], + "components": [ [ "leather", 30 ], [ "rope_superior_short", 2, "LIST" ], [ [ "scrap", 9 ], [ "razor_blade", 9 ] ] ] + }, { "type": "recipe", "result": "spear_wood", @@ -578,6 +605,17 @@ "autolearn": true, "components": [ [ [ "bowling_pin", 1 ] ], [ [ "spike", 2 ] ], [ [ "duct_tape", 100 ] ] ] }, + { + "type": "recipe", + "result": "plunger_weapon", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_PIERCING", + "skill_used": "fabrication", + "time": "30 s", + "reversible": true, + "autolearn": true, + "components": [ [ "plunger_toilet", 1 ], [ "spike", 1 ] ] + }, { "type": "recipe", "result": "revolver_shotgun", @@ -1922,6 +1960,28 @@ "tools": [ ], "components": [ [ [ "glass_shard", 1 ] ], [ [ "rag", 1 ], [ "duct_tape", 10 ] ] ] }, + { + "type": "recipe", + "result": "bone_knife", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_PIERCING", + "skill_used": "fabrication", + "skill_required": [ "survival", 1 ], + "time": "2 m", + "autolearn": true, + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ "bone", 1 ], "bone_human", 1 ] + }, + { + "type": "recipe", + "result": "sharp_toothbrush", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_PIERCING", + "skill_used": "fabrication", + "time": "30 sec", + "autolearn": true, + "components": [ [ "toothbrush_plain", 1 ], [ "hairbrush", 1 ], [ "comb_pocket", 1 ], [ "plastic_chunk", 1 ] ] + }, { "type": "recipe", "result": "sword_crude", From d5e6d0da3b692c35710da29eab61e49d96ca3d1b Mon Sep 17 00:00:00 2001 From: xanderrootslayer Date: Sun, 19 Apr 2020 00:42:46 -0400 Subject: [PATCH 02/33] almost forgot had to have the damn thing spawn somewhere. --- data/json/itemgroups/Locations_MapExtras/mansion.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/itemgroups/Locations_MapExtras/mansion.json b/data/json/itemgroups/Locations_MapExtras/mansion.json index 407e62dfad610..b6cf66de0b656 100644 --- a/data/json/itemgroups/Locations_MapExtras/mansion.json +++ b/data/json/itemgroups/Locations_MapExtras/mansion.json @@ -728,6 +728,7 @@ [ "bondage_mask", 10 ], [ "zentai", 2 ], [ "bullwhip", 10 ], + [ "bullwhip_razor", 10 ], [ "leather_cat_ears", 5 ], [ "leather_cat_tail", 5 ], [ "leather_collar", 5 ], From c75c36d030464481b58e6c1e10cf26e4b74ef662 Mon Sep 17 00:00:00 2001 From: xanderrootslayer Date: Sun, 19 Apr 2020 22:34:14 -0400 Subject: [PATCH 03/33] recipe fixes some suggested edits --- data/json/items/melee/bludgeons.json | 15 +-------------- data/json/items/melee/swords_and_blades.json | 19 +++++++++++++++++++ data/json/recipes/recipe_weapon.json | 4 +++- 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/data/json/items/melee/bludgeons.json b/data/json/items/melee/bludgeons.json index 859c57f2b6a3e..1ca9b16d0b697 100644 --- a/data/json/items/melee/bludgeons.json +++ b/data/json/items/melee/bludgeons.json @@ -380,18 +380,6 @@ "cutting": 6, "flags": [ "SHEATH_KNIFE", "CONDUCTIVE", "FRAGILE_MELEE" ], "qualities": [ [ "BUTCHER", -18 ] ] - }, - { - "type": "recipe", - "result": "bone_knife", - "category": "CC_WEAPON", - "subcategory": "CSC_WEAPON_PIERCING", - "skill_used": "fabrication", - "skill_required": [ "survival", 1 ], - "time": "2 m", - "autolearn": true, - "qualities": [ { "id": "HAMMER", "level": 1 } ], - "components": [ [ "bone", 1 ], "bone_human", 1 ] }, { "type": "GENERIC", @@ -901,8 +889,7 @@ "id": "sharp_toothbrush", "symbol": ",", "color": "light_blue", - "name": "plastic shank", - "name_plural": "plastic shanks", + "name": { "str": "plastic shank", "str_pl": "plastic shanks" }, "description": "An oblong plastic trinket with the far end ground down into a stabbing point.", "category": "weapons", "price": 400, diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json index 429078e75442b..82dacca873dfa 100644 --- a/data/json/items/melee/swords_and_blades.json +++ b/data/json/items/melee/swords_and_blades.json @@ -246,6 +246,25 @@ "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 11 ] ], "flags": [ "STAB", "SHEATH_KNIFE" ] }, + { + "id": "bone_knife", + "name": "bone shiv", + "type": "TOOL", + "description": "A femur or other bone, at least 30 cm long, which has been broken at one end and sharpened into a cutting tool. Its jagged edge is wicked but fragile.", + "symbol": "/", + "color": "white", + "weight": 169, + "//": "literally 75% of a bone.", + "volume": "188 ml", + "price": 0, + "price_postapoc": 0, + "to_hit": -1, + "bashing": 1, + "cutting": 6, + "material": "bone", + "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 12 ] ], + "flags": [ "STAB", "SHEATH_KNIFE", "FRAGILE_MELEE" ] + }, { "id": "knife_churl", "type": "TOOL", diff --git a/data/json/recipes/recipe_weapon.json b/data/json/recipes/recipe_weapon.json index 24da073011394..fd1d04a32fdc5 100644 --- a/data/json/recipes/recipe_weapon.json +++ b/data/json/recipes/recipe_weapon.json @@ -612,8 +612,9 @@ "subcategory": "CSC_WEAPON_PIERCING", "skill_used": "fabrication", "time": "30 s", - "reversible": true, "autolearn": true, + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "//": "In the absence of walls or floors being valid ways to grind a sharp point onto an object, sandpaper/files not being fully implemented, and this being a prison shank, just pick up a rock and rub it on the toothbrush.", "components": [ [ "plunger_toilet", 1 ], [ "spike", 1 ] ] }, { @@ -1980,6 +1981,7 @@ "skill_used": "fabrication", "time": "30 sec", "autolearn": true, + "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ "toothbrush_plain", 1 ], [ "hairbrush", 1 ], [ "comb_pocket", 1 ], [ "plastic_chunk", 1 ] ] }, { From 97e3328eadf5a3a96e71d8204f63ea181255d3db Mon Sep 17 00:00:00 2001 From: xanderrootslayer Date: Sun, 19 Apr 2020 23:07:49 -0400 Subject: [PATCH 04/33] plural fix realized what was missing --- data/json/items/melee/bludgeons.json | 2 +- data/json/items/melee/misc.json | 2 +- data/json/items/melee/swords_and_blades.json | 4 ++-- data/json/recipes/recipe_weapon.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/data/json/items/melee/bludgeons.json b/data/json/items/melee/bludgeons.json index 1ca9b16d0b697..aa3010b157043 100644 --- a/data/json/items/melee/bludgeons.json +++ b/data/json/items/melee/bludgeons.json @@ -244,7 +244,7 @@ }, { "id:": "plunger_weapon", - "name": "brain cleaner", + "name": { "str": "brain cleaner" }, "type": "TOOL", "description": "A barbaric war pick made by driving a metal spike into a toilet plunger. World War IV will be fought with sticks and stones...", "symbol": "/", diff --git a/data/json/items/melee/misc.json b/data/json/items/melee/misc.json index 83fa153060f12..aacc19094df17 100644 --- a/data/json/items/melee/misc.json +++ b/data/json/items/melee/misc.json @@ -17,7 +17,7 @@ }, { "id:": "bullwhip_razor", - "name": "scourge", + "name": { "str: ""scourge" }, "type": "TOOL", "description": "The \"cat 'o nine tails\", a handle with nine short leather whips each sporting a razor-sharp metal tip. This ancient instrument of torture causes massive bleeding but is an ineffecient weapon by design.", "symbol": "/", diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json index 82dacca873dfa..2b5c99d48bb24 100644 --- a/data/json/items/melee/swords_and_blades.json +++ b/data/json/items/melee/swords_and_blades.json @@ -268,7 +268,7 @@ { "id": "knife_churl", "type": "TOOL", - "name": "baselard", + "name": { "str": "baselard" }, "description": "A medieval dagger forged from rough iron. It is not the sharpest tool in the shed, but it is certainly one of the largest.", "weight": "420 g", "volume": "250 ml", @@ -324,7 +324,7 @@ }, { "id": "machete_gimmick", - "name": "machete multitool", + "name": { "str": "machete multitool" }, "type": "TOOL", "description": "A thin, wobbly steel blade with sawteeth on one side and a flat chisel tip for digging. A jack of many trades and a master of none.", "symbol": "/", diff --git a/data/json/recipes/recipe_weapon.json b/data/json/recipes/recipe_weapon.json index fd1d04a32fdc5..9924358d250f2 100644 --- a/data/json/recipes/recipe_weapon.json +++ b/data/json/recipes/recipe_weapon.json @@ -614,7 +614,6 @@ "time": "30 s", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 } ], - "//": "In the absence of walls or floors being valid ways to grind a sharp point onto an object, sandpaper/files not being fully implemented, and this being a prison shank, just pick up a rock and rub it on the toothbrush.", "components": [ [ "plunger_toilet", 1 ], [ "spike", 1 ] ] }, { @@ -1982,6 +1981,7 @@ "time": "30 sec", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 } ], + "//": "In the absence of walls or floors being valid ways to grind a sharp point onto an object, sandpaper/files not being fully implemented, and this being a prison shank, just pick up a rock and rub it on the toothbrush.", "components": [ [ "toothbrush_plain", 1 ], [ "hairbrush", 1 ], [ "comb_pocket", 1 ], [ "plastic_chunk", 1 ] ] }, { From e47d997ce2c162d0fb833ad277e70bd98cee0345 Mon Sep 17 00:00:00 2001 From: xanderrootslayer Date: Sun, 19 Apr 2020 23:08:33 -0400 Subject: [PATCH 05/33] one more hasty... --- data/json/items/melee/bludgeons.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/melee/bludgeons.json b/data/json/items/melee/bludgeons.json index aa3010b157043..2a4f472539682 100644 --- a/data/json/items/melee/bludgeons.json +++ b/data/json/items/melee/bludgeons.json @@ -886,7 +886,7 @@ }, { "type": "GENERIC", - "id": "sharp_toothbrush", + "id": { "str": "sharp_toothbrush" }, "symbol": ",", "color": "light_blue", "name": { "str": "plastic shank", "str_pl": "plastic shanks" }, From 1bb79716ff0c4d687d52b7c5f403362cf4d652c1 Mon Sep 17 00:00:00 2001 From: xanderrootslayer Date: Sun, 19 Apr 2020 23:09:32 -0400 Subject: [PATCH 06/33] yet one more hasty! --- data/json/items/melee/swords_and_blades.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json index 2b5c99d48bb24..dfc833cd2e6bf 100644 --- a/data/json/items/melee/swords_and_blades.json +++ b/data/json/items/melee/swords_and_blades.json @@ -248,7 +248,7 @@ }, { "id": "bone_knife", - "name": "bone shiv", + "name": { "str": "bone shiv" }, "type": "TOOL", "description": "A femur or other bone, at least 30 cm long, which has been broken at one end and sharpened into a cutting tool. Its jagged edge is wicked but fragile.", "symbol": "/", From ef14b8202c8be2f904f7f91631ca6c6a5089e3f5 Mon Sep 17 00:00:00 2001 From: xanderrootslayer Date: Mon, 20 Apr 2020 22:53:15 -0400 Subject: [PATCH 07/33] good old compliance knives updated to match 0.E standards --- data/json/items/melee/bludgeons.json | 20 +------------------- data/json/items/melee/swords_and_blades.json | 15 ++++++++------- 2 files changed, 9 insertions(+), 26 deletions(-) diff --git a/data/json/items/melee/bludgeons.json b/data/json/items/melee/bludgeons.json index 2a4f472539682..d2187ea2eb755 100644 --- a/data/json/items/melee/bludgeons.json +++ b/data/json/items/melee/bludgeons.json @@ -242,25 +242,6 @@ "to_hit": 1, "category": "weapons" }, - { - "id:": "plunger_weapon", - "name": { "str": "brain cleaner" }, - "type": "TOOL", - "description": "A barbaric war pick made by driving a metal spike into a toilet plunger. World War IV will be fought with sticks and stones...", - "symbol": "/", - "color": "red", - "weight": "1138", - "volume": "2500 ml", - "price": "0", - "//": "This isn't making a weapon so much as it is ruining a plumbing tool. The sale price has gone down.", - "price_postapoc": "90", - "to_hit": 0, - "bashing": 7, - "cutting": 8, - "material": [ "wood", "plastic", "steel" ], - "techniques": [ "WBLOCK_1" ], - "flags": [ "SPEAR", "FRAGILE_MELEE", "NONCONDUCTIVE" ] - }, { "type": "GENERIC", "id": "bowling_axe", @@ -899,6 +880,7 @@ "volume": "250 ml", "bashing": 1, "cutting": 3, + "to_hit": -3, "flags": [ "STAB", "SHEATH_KNIFE", "CONDUCTIVE" ] }, { diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json index dfc833cd2e6bf..14e9e5ce9de41 100644 --- a/data/json/items/melee/swords_and_blades.json +++ b/data/json/items/melee/swords_and_blades.json @@ -258,9 +258,9 @@ "volume": "188 ml", "price": 0, "price_postapoc": 0, - "to_hit": -1, - "bashing": 1, - "cutting": 6, + "to_hit": 0, + "bashing": 4, + "cutting": 20, "material": "bone", "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 12 ] ], "flags": [ "STAB", "SHEATH_KNIFE", "FRAGILE_MELEE" ] @@ -274,8 +274,8 @@ "volume": "250 ml", "price": 19590, "to_hit": 1, - "bashing": 2, - "cutting": 12, + "bashing": 5, + "cutting": 20, "material": [ "iron" ], "symbol": ";", "color": "dark_gray", @@ -334,8 +334,9 @@ "price": 2300, "price_postapoc": 1800, "to_hit": -1, - "bashing": 4, - "cutting": 10, + "bashing": 8, + "cutting": 15, + "to_hit": 1, "material": "steel", "qualiies": [ [ "CUT", 1 ], [ "BUTCHER", 8 ], [ "SAW_W", 1 ], [ "DIG", 1 ], [ "PRY", 1 ] ], "flags": [ "SHEATH_SWORD", "FRAGILE_MELEE" ] From 05864d7fd6fa8e5ed4f5d842630920141b59b65f Mon Sep 17 00:00:00 2001 From: xanderrootslayer Date: Tue, 21 Apr 2020 16:56:06 -0400 Subject: [PATCH 08/33] remove recipe never half-ass it. --- data/json/recipes/recipe_weapon.json | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/data/json/recipes/recipe_weapon.json b/data/json/recipes/recipe_weapon.json index 9924358d250f2..ba6cf0e1200b5 100644 --- a/data/json/recipes/recipe_weapon.json +++ b/data/json/recipes/recipe_weapon.json @@ -605,17 +605,6 @@ "autolearn": true, "components": [ [ [ "bowling_pin", 1 ] ], [ [ "spike", 2 ] ], [ [ "duct_tape", 100 ] ] ] }, - { - "type": "recipe", - "result": "plunger_weapon", - "category": "CC_WEAPON", - "subcategory": "CSC_WEAPON_PIERCING", - "skill_used": "fabrication", - "time": "30 s", - "autolearn": true, - "qualities": [ { "id": "HAMMER", "level": 1 } ], - "components": [ [ "plunger_toilet", 1 ], [ "spike", 1 ] ] - }, { "type": "recipe", "result": "revolver_shotgun", From a33489a8b1794b84d1a76ae0b7e78659e861b5b8 Mon Sep 17 00:00:00 2001 From: Kevin Granade Date: Wed, 22 Apr 2020 01:42:05 +0000 Subject: [PATCH 09/33] Apply suggestions from code review --- data/json/itemgroups/art_antiques_crafts.json | 4 ++-- data/json/items/melee/bludgeons.json | 2 +- data/json/items/melee/swords_and_blades.json | 2 +- data/json/recipes/recipe_weapon.json | 5 ++--- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/data/json/itemgroups/art_antiques_crafts.json b/data/json/itemgroups/art_antiques_crafts.json index 206f29f2333db..1fc319800412c 100644 --- a/data/json/itemgroups/art_antiques_crafts.json +++ b/data/json/itemgroups/art_antiques_crafts.json @@ -95,7 +95,7 @@ { "item": "baldric", "prob": 4 }, { "item": "nodachi", "prob": 1 }, { "item": "nodachi_inferior", "prob": 2 }, - { "item": "knife_churl", "prob": 2 }, + { "item": "knife_baselard", "prob": 2 }, { "item": "gambeson", "prob": 3 }, { "item": "tunic", "prob": 1 }, { "item": "armor_lamellar", "prob": 2 }, @@ -255,7 +255,7 @@ { "item": "sword_xiphos", "prob": 4 }, { "item": "khopesh", "prob": 4 }, { "item": "spear_dory", "prob": 3 }, - { "item": "knife_churl", "prob": 3 } + { "item": "knife_baselard", "prob": 3 } ] }, { diff --git a/data/json/items/melee/bludgeons.json b/data/json/items/melee/bludgeons.json index d2187ea2eb755..cfe325b4afe08 100644 --- a/data/json/items/melee/bludgeons.json +++ b/data/json/items/melee/bludgeons.json @@ -867,7 +867,7 @@ }, { "type": "GENERIC", - "id": { "str": "sharp_toothbrush" }, + "id": "sharp_toothbrush", "symbol": ",", "color": "light_blue", "name": { "str": "plastic shank", "str_pl": "plastic shanks" }, diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json index 14e9e5ce9de41..564c57f6d5f1e 100644 --- a/data/json/items/melee/swords_and_blades.json +++ b/data/json/items/melee/swords_and_blades.json @@ -266,7 +266,7 @@ "flags": [ "STAB", "SHEATH_KNIFE", "FRAGILE_MELEE" ] }, { - "id": "knife_churl", + "id": "knife_baselard", "type": "TOOL", "name": { "str": "baselard" }, "description": "A medieval dagger forged from rough iron. It is not the sharpest tool in the shed, but it is certainly one of the largest.", diff --git a/data/json/recipes/recipe_weapon.json b/data/json/recipes/recipe_weapon.json index ba6cf0e1200b5..7334d0c1f9f48 100644 --- a/data/json/recipes/recipe_weapon.json +++ b/data/json/recipes/recipe_weapon.json @@ -94,7 +94,7 @@ }, { "type": "recipe", - "result": "knife_churl", + "result": "knife_baselard", "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_PIERCING", "skill_used": "fabrication", @@ -1969,8 +1969,7 @@ "skill_used": "fabrication", "time": "30 sec", "autolearn": true, - "qualities": [ { "id": "HAMMER", "level": 1 } ], - "//": "In the absence of walls or floors being valid ways to grind a sharp point onto an object, sandpaper/files not being fully implemented, and this being a prison shank, just pick up a rock and rub it on the toothbrush.", + "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "GRIND", "level": 1 } ], "components": [ [ "toothbrush_plain", 1 ], [ "hairbrush", 1 ], [ "comb_pocket", 1 ], [ "plastic_chunk", 1 ] ] }, { From 21a054d1cf66669fbfa592220dffab7d709716be Mon Sep 17 00:00:00 2001 From: xanderrootslayer Date: Tue, 21 Apr 2020 23:54:34 -0400 Subject: [PATCH 10/33] what's in a name call it what it is --- data/json/itemgroups/art_antiques_crafts.json | 4 ++-- data/json/items/melee/bludgeons.json | 2 +- data/json/items/melee/swords_and_blades.json | 2 +- data/json/recipes/recipe_weapon.json | 5 ++--- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/data/json/itemgroups/art_antiques_crafts.json b/data/json/itemgroups/art_antiques_crafts.json index 206f29f2333db..1fc319800412c 100644 --- a/data/json/itemgroups/art_antiques_crafts.json +++ b/data/json/itemgroups/art_antiques_crafts.json @@ -95,7 +95,7 @@ { "item": "baldric", "prob": 4 }, { "item": "nodachi", "prob": 1 }, { "item": "nodachi_inferior", "prob": 2 }, - { "item": "knife_churl", "prob": 2 }, + { "item": "knife_baselard", "prob": 2 }, { "item": "gambeson", "prob": 3 }, { "item": "tunic", "prob": 1 }, { "item": "armor_lamellar", "prob": 2 }, @@ -255,7 +255,7 @@ { "item": "sword_xiphos", "prob": 4 }, { "item": "khopesh", "prob": 4 }, { "item": "spear_dory", "prob": 3 }, - { "item": "knife_churl", "prob": 3 } + { "item": "knife_baselard", "prob": 3 } ] }, { diff --git a/data/json/items/melee/bludgeons.json b/data/json/items/melee/bludgeons.json index d2187ea2eb755..cfe325b4afe08 100644 --- a/data/json/items/melee/bludgeons.json +++ b/data/json/items/melee/bludgeons.json @@ -867,7 +867,7 @@ }, { "type": "GENERIC", - "id": { "str": "sharp_toothbrush" }, + "id": "sharp_toothbrush", "symbol": ",", "color": "light_blue", "name": { "str": "plastic shank", "str_pl": "plastic shanks" }, diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json index 14e9e5ce9de41..564c57f6d5f1e 100644 --- a/data/json/items/melee/swords_and_blades.json +++ b/data/json/items/melee/swords_and_blades.json @@ -266,7 +266,7 @@ "flags": [ "STAB", "SHEATH_KNIFE", "FRAGILE_MELEE" ] }, { - "id": "knife_churl", + "id": "knife_baselard", "type": "TOOL", "name": { "str": "baselard" }, "description": "A medieval dagger forged from rough iron. It is not the sharpest tool in the shed, but it is certainly one of the largest.", diff --git a/data/json/recipes/recipe_weapon.json b/data/json/recipes/recipe_weapon.json index ba6cf0e1200b5..7334d0c1f9f48 100644 --- a/data/json/recipes/recipe_weapon.json +++ b/data/json/recipes/recipe_weapon.json @@ -94,7 +94,7 @@ }, { "type": "recipe", - "result": "knife_churl", + "result": "knife_baselard", "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_PIERCING", "skill_used": "fabrication", @@ -1969,8 +1969,7 @@ "skill_used": "fabrication", "time": "30 sec", "autolearn": true, - "qualities": [ { "id": "HAMMER", "level": 1 } ], - "//": "In the absence of walls or floors being valid ways to grind a sharp point onto an object, sandpaper/files not being fully implemented, and this being a prison shank, just pick up a rock and rub it on the toothbrush.", + "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "GRIND", "level": 1 } ], "components": [ [ "toothbrush_plain", 1 ], [ "hairbrush", 1 ], [ "comb_pocket", 1 ], [ "plastic_chunk", 1 ] ] }, { From 5de9d84e498294a7e61b2748689fba949aaa34dc Mon Sep 17 00:00:00 2001 From: Kevin Granade Date: Wed, 22 Apr 2020 08:09:32 +0000 Subject: [PATCH 11/33] Apply suggestions from code review --- data/json/recipes/recipe_weapon.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/recipes/recipe_weapon.json b/data/json/recipes/recipe_weapon.json index 7334d0c1f9f48..da950d49c45be 100644 --- a/data/json/recipes/recipe_weapon.json +++ b/data/json/recipes/recipe_weapon.json @@ -104,7 +104,7 @@ "using": [ [ "blacksmithing_standard", 4 ], [ "steel_standard", 1 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ "swage", -1 ] ], - "components": [ [ "fur", 1 ], [ "leather", 1 ] ] + "components": [ [ [ "fur", 1 ], [ "leather", 1 ] ] ] }, { "type": "recipe", @@ -240,7 +240,7 @@ "reversible": true, "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ], - "components": [ [ "leather", 30 ], [ "rope_superior_short", 2, "LIST" ], [ [ "scrap", 9 ], [ "razor_blade", 9 ] ] ] + "components": [ [ [ "leather", 30 ], [ "rope_superior_short", 2, "LIST" ], [ [ "scrap", 9 ], [ "razor_blade", 9 ] ] ] }, { "type": "recipe", @@ -1970,7 +1970,7 @@ "time": "30 sec", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "GRIND", "level": 1 } ], - "components": [ [ "toothbrush_plain", 1 ], [ "hairbrush", 1 ], [ "comb_pocket", 1 ], [ "plastic_chunk", 1 ] ] + "components": [ [ [ "toothbrush_plain", 1 ], [ "hairbrush", 1 ], [ "comb_pocket", 1 ], [ "plastic_chunk", 1 ] ] ] }, { "type": "recipe", From 31f58cb906021c86e94623bd71e64caa51af4f08 Mon Sep 17 00:00:00 2001 From: xanderrootslayer Date: Wed, 22 Apr 2020 19:30:22 -0400 Subject: [PATCH 12/33] CDDA styling and some flagrant errors corrected --- data/json/items/melee/misc.json | 2 +- data/json/recipes/recipe_weapon.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/melee/misc.json b/data/json/items/melee/misc.json index aacc19094df17..893a1876ce2bb 100644 --- a/data/json/items/melee/misc.json +++ b/data/json/items/melee/misc.json @@ -17,7 +17,7 @@ }, { "id:": "bullwhip_razor", - "name": { "str: ""scourge" }, + "name": { "str": "scourge" }, "type": "TOOL", "description": "The \"cat 'o nine tails\", a handle with nine short leather whips each sporting a razor-sharp metal tip. This ancient instrument of torture causes massive bleeding but is an ineffecient weapon by design.", "symbol": "/", diff --git a/data/json/recipes/recipe_weapon.json b/data/json/recipes/recipe_weapon.json index da950d49c45be..4c15481b21efc 100644 --- a/data/json/recipes/recipe_weapon.json +++ b/data/json/recipes/recipe_weapon.json @@ -240,7 +240,7 @@ "reversible": true, "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ], - "components": [ [ [ "leather", 30 ], [ "rope_superior_short", 2, "LIST" ], [ [ "scrap", 9 ], [ "razor_blade", 9 ] ] ] + "components": [ [ [ "leather", 30 ], [ "rope_superior_short", 2, "LIST" ], [ [ "scrap", 9 ], [ "razor_blade", 9 ] ] ] ] }, { "type": "recipe", From 984d9995dfa0b1f1c720b83b998b1b8291e1e2aa Mon Sep 17 00:00:00 2001 From: Kevin Granade Date: Wed, 22 Apr 2020 23:43:22 +0000 Subject: [PATCH 13/33] Apply suggestions from code review --- data/json/items/melee/misc.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/melee/misc.json b/data/json/items/melee/misc.json index 893a1876ce2bb..74e0d705dead0 100644 --- a/data/json/items/melee/misc.json +++ b/data/json/items/melee/misc.json @@ -15,7 +15,7 @@ "cutting": 3, "category": "weapons" }, - { + { "id:": "bullwhip_razor", "name": { "str": "scourge" }, "type": "TOOL", @@ -31,7 +31,7 @@ "bashing": 0, "cutting": 10, "material": [ "leather", "steel" ], - "flags": [ "REACHATTACK", "WHIP", "NONCONDUCTIVE" ] + "flags": [ "REACHATTACK", "WHIP", "NONCONDUCTIVE" ] }, { "id": "lobotomizer", From 6feb56e3ca7c0f79d99272187c8f901440aafe29 Mon Sep 17 00:00:00 2001 From: xanderrootslayer Date: Wed, 22 Apr 2020 19:44:26 -0400 Subject: [PATCH 14/33] more styling trailing spaces? --- data/json/items/melee/misc.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/melee/misc.json b/data/json/items/melee/misc.json index 893a1876ce2bb..74e0d705dead0 100644 --- a/data/json/items/melee/misc.json +++ b/data/json/items/melee/misc.json @@ -15,7 +15,7 @@ "cutting": 3, "category": "weapons" }, - { + { "id:": "bullwhip_razor", "name": { "str": "scourge" }, "type": "TOOL", @@ -31,7 +31,7 @@ "bashing": 0, "cutting": 10, "material": [ "leather", "steel" ], - "flags": [ "REACHATTACK", "WHIP", "NONCONDUCTIVE" ] + "flags": [ "REACHATTACK", "WHIP", "NONCONDUCTIVE" ] }, { "id": "lobotomizer", From b43a7e70bf178f1021386988174f2e27a7eec1a3 Mon Sep 17 00:00:00 2001 From: xanderrootslayer Date: Wed, 22 Apr 2020 20:47:04 -0400 Subject: [PATCH 15/33] one last bracket forgot something --- data/json/recipes/recipe_weapon.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/recipe_weapon.json b/data/json/recipes/recipe_weapon.json index 4c15481b21efc..92537c67a5cd0 100644 --- a/data/json/recipes/recipe_weapon.json +++ b/data/json/recipes/recipe_weapon.json @@ -103,7 +103,7 @@ "autolearn": true, "using": [ [ "blacksmithing_standard", 4 ], [ "steel_standard", 1 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], - "tools": [ [ "swage", -1 ] ], + "tools": [ [ [ "swage", -1 ] ] ], "components": [ [ [ "fur", 1 ], [ "leather", 1 ] ] ] }, { From b3061beabb0522c0744411a040d5c412723fdbaf Mon Sep 17 00:00:00 2001 From: xanderrootslayer Date: Wed, 22 Apr 2020 22:31:21 -0400 Subject: [PATCH 16/33] brackets oops --- data/json/recipes/recipe_weapon.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/recipe_weapon.json b/data/json/recipes/recipe_weapon.json index 92537c67a5cd0..48d0a1481ec11 100644 --- a/data/json/recipes/recipe_weapon.json +++ b/data/json/recipes/recipe_weapon.json @@ -240,7 +240,7 @@ "reversible": true, "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ], - "components": [ [ [ "leather", 30 ], [ "rope_superior_short", 2, "LIST" ], [ [ "scrap", 9 ], [ "razor_blade", 9 ] ] ] ] + "components": [ [ "leather", 30 ], [ "rope_superior_short", 2, "LIST" ], [ [ "scrap", 9 ], [ "razor_blade", 9 ] ] ] }, { "type": "recipe", From 4e1295b4e5d66ab48e3ec4b39aa65a447cf91bd0 Mon Sep 17 00:00:00 2001 From: Kevin Granade Date: Fri, 24 Apr 2020 05:17:47 +0000 Subject: [PATCH 17/33] Update data/json/recipes/recipe_weapon.json --- data/json/recipes/recipe_weapon.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/recipe_weapon.json b/data/json/recipes/recipe_weapon.json index 48d0a1481ec11..5c4282bf2b659 100644 --- a/data/json/recipes/recipe_weapon.json +++ b/data/json/recipes/recipe_weapon.json @@ -240,7 +240,7 @@ "reversible": true, "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ], - "components": [ [ "leather", 30 ], [ "rope_superior_short", 2, "LIST" ], [ [ "scrap", 9 ], [ "razor_blade", 9 ] ] ] + "components": [ [ [ "leather", 30 ], [ "rope_superior_short", 2, "LIST" ] ], [ [ "scrap", 9 ], [ "razor_blade", 9 ] ] ] }, { "type": "recipe", From 10a2f0957dba561addd9fa7176701f0b51da6db8 Mon Sep 17 00:00:00 2001 From: Kevin Granade Date: Fri, 24 Apr 2020 05:25:03 +0000 Subject: [PATCH 18/33] Update data/json/recipes/recipe_weapon.json --- data/json/recipes/recipe_weapon.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/recipe_weapon.json b/data/json/recipes/recipe_weapon.json index 5c4282bf2b659..0369de789f8ff 100644 --- a/data/json/recipes/recipe_weapon.json +++ b/data/json/recipes/recipe_weapon.json @@ -1959,7 +1959,7 @@ "time": "2 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 } ], - "components": [ [ "bone", 1 ], "bone_human", 1 ] + "components": [ [ [ "bone", 1 ], [ "bone_human", 1 ] ] ] }, { "type": "recipe", From 2e89b751f3c1e4cd28f77066b9bacbb1199252dd Mon Sep 17 00:00:00 2001 From: xanderrootslayer Date: Fri, 24 Apr 2020 18:23:43 -0400 Subject: [PATCH 19/33] more brackets linters only detect fatal crashes, not nonsense that technically still runs. --- data/json/recipes/recipe_weapon.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/recipes/recipe_weapon.json b/data/json/recipes/recipe_weapon.json index 48d0a1481ec11..0369de789f8ff 100644 --- a/data/json/recipes/recipe_weapon.json +++ b/data/json/recipes/recipe_weapon.json @@ -240,7 +240,7 @@ "reversible": true, "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ], - "components": [ [ "leather", 30 ], [ "rope_superior_short", 2, "LIST" ], [ [ "scrap", 9 ], [ "razor_blade", 9 ] ] ] + "components": [ [ [ "leather", 30 ], [ "rope_superior_short", 2, "LIST" ] ], [ [ "scrap", 9 ], [ "razor_blade", 9 ] ] ] }, { "type": "recipe", @@ -1959,7 +1959,7 @@ "time": "2 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 } ], - "components": [ [ "bone", 1 ], "bone_human", 1 ] + "components": [ [ [ "bone", 1 ], [ "bone_human", 1 ] ] ] }, { "type": "recipe", From 23d2ae642548f2b542a26d60e36baa4fb54561ba Mon Sep 17 00:00:00 2001 From: xanderrootslayer Date: Fri, 24 Apr 2020 19:46:30 -0400 Subject: [PATCH 20/33] s, not sec dangit --- data/json/recipes/recipe_weapon.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/recipe_weapon.json b/data/json/recipes/recipe_weapon.json index 0369de789f8ff..759258556474a 100644 --- a/data/json/recipes/recipe_weapon.json +++ b/data/json/recipes/recipe_weapon.json @@ -1967,7 +1967,7 @@ "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_PIERCING", "skill_used": "fabrication", - "time": "30 sec", + "time": "30 s", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "GRIND", "level": 1 } ], "components": [ [ [ "toothbrush_plain", 1 ], [ "hairbrush", 1 ], [ "comb_pocket", 1 ], [ "plastic_chunk", 1 ] ] ] From 1d1097413fc8e793ac4388dea7882efc8be52f6e Mon Sep 17 00:00:00 2001 From: xanderrootslayer Date: Fri, 24 Apr 2020 21:43:03 -0400 Subject: [PATCH 21/33] toothbrush! oops. --- data/json/items/melee/bludgeons.json | 2 +- data/json/recipes/recipe_weapon.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/melee/bludgeons.json b/data/json/items/melee/bludgeons.json index cfe325b4afe08..527eb6c9dc569 100644 --- a/data/json/items/melee/bludgeons.json +++ b/data/json/items/melee/bludgeons.json @@ -870,7 +870,7 @@ "id": "sharp_toothbrush", "symbol": ",", "color": "light_blue", - "name": { "str": "plastic shank", "str_pl": "plastic shanks" }, + "name": { "str": "plastic shank" }, "description": "An oblong plastic trinket with the far end ground down into a stabbing point.", "category": "weapons", "price": 400, diff --git a/data/json/recipes/recipe_weapon.json b/data/json/recipes/recipe_weapon.json index 759258556474a..2f8aa88467c40 100644 --- a/data/json/recipes/recipe_weapon.json +++ b/data/json/recipes/recipe_weapon.json @@ -1954,7 +1954,7 @@ "result": "bone_knife", "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_PIERCING", - "skill_used": "fabrication", + "skill_used": "survival", "skill_required": [ "survival", 1 ], "time": "2 m", "autolearn": true, From 84fb03accc986cb28916c0622ce0008755cd8e18 Mon Sep 17 00:00:00 2001 From: xanderrootslayer Date: Fri, 24 Apr 2020 23:02:12 -0400 Subject: [PATCH 22/33] bone headed it was genuinely just spelled wrong. --- data/json/items/melee/misc.json | 2 +- data/json/recipes/recipe_weapon.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/melee/misc.json b/data/json/items/melee/misc.json index 74e0d705dead0..2fa85f0dc79db 100644 --- a/data/json/items/melee/misc.json +++ b/data/json/items/melee/misc.json @@ -22,7 +22,7 @@ "description": "The \"cat 'o nine tails\", a handle with nine short leather whips each sporting a razor-sharp metal tip. This ancient instrument of torture causes massive bleeding but is an ineffecient weapon by design.", "symbol": "/", "color": "brown", - "weight": "3496", + "weight": "3496 g", "volume": 9, "price": 4800, "price_postapoc": 5200, diff --git a/data/json/recipes/recipe_weapon.json b/data/json/recipes/recipe_weapon.json index 2f8aa88467c40..c8dd114c60f0e 100644 --- a/data/json/recipes/recipe_weapon.json +++ b/data/json/recipes/recipe_weapon.json @@ -1955,7 +1955,7 @@ "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_PIERCING", "skill_used": "survival", - "skill_required": [ "survival", 1 ], + "skills_required": [ "survival", 1 ], "time": "2 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 } ], From 1fa51eba6a65b1df60a33d327ab3b66fc9b4e975 Mon Sep 17 00:00:00 2001 From: xanderrootslayer Date: Fri, 24 Apr 2020 23:43:37 -0400 Subject: [PATCH 23/33] the last whip more errors, hopefully the last --- data/json/items/melee/misc.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/data/json/items/melee/misc.json b/data/json/items/melee/misc.json index 2fa85f0dc79db..9d157ddb96d31 100644 --- a/data/json/items/melee/misc.json +++ b/data/json/items/melee/misc.json @@ -16,10 +16,10 @@ "category": "weapons" }, { - "id:": "bullwhip_razor", + "id": "bullwhip_razor", "name": { "str": "scourge" }, "type": "TOOL", - "description": "The \"cat 'o nine tails\", a handle with nine short leather whips each sporting a razor-sharp metal tip. This ancient instrument of torture causes massive bleeding but is an ineffecient weapon by design.", + "description": "The \"cat 'o nine tails\", a handle with nine short leather whips each sporting a razor-sharp metal tip. This ancient instrument of torture causes massive bleeding but is an ineffecient weapon by design.", "symbol": "/", "color": "brown", "weight": "3496 g", @@ -28,7 +28,6 @@ "price_postapoc": 5200, "to_hit": 2, "//": "There's no way you can swing this thing without hitting SOMETHING.", - "bashing": 0, "cutting": 10, "material": [ "leather", "steel" ], "flags": [ "REACHATTACK", "WHIP", "NONCONDUCTIVE" ] From 16448e104f1fc84a06d0326f6bb34bee463c1e80 Mon Sep 17 00:00:00 2001 From: xanderrootslayer Date: Sat, 25 Apr 2020 21:08:16 -0400 Subject: [PATCH 24/33] Spacing appveyor enforces style too --- data/json/items/melee/swords_and_blades.json | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json index 564c57f6d5f1e..88a0e61c9b380 100644 --- a/data/json/items/melee/swords_and_blades.json +++ b/data/json/items/melee/swords_and_blades.json @@ -250,7 +250,7 @@ "id": "bone_knife", "name": { "str": "bone shiv" }, "type": "TOOL", - "description": "A femur or other bone, at least 30 cm long, which has been broken at one end and sharpened into a cutting tool. Its jagged edge is wicked but fragile.", + "description": "A femur or other bone, at least 30 cm long, which has been broken at one end and sharpened into a cutting tool. Its jagged edge is wicked but fragile.", "symbol": "/", "color": "white", "weight": 169, @@ -258,7 +258,6 @@ "volume": "188 ml", "price": 0, "price_postapoc": 0, - "to_hit": 0, "bashing": 4, "cutting": 20, "material": "bone", @@ -269,7 +268,7 @@ "id": "knife_baselard", "type": "TOOL", "name": { "str": "baselard" }, - "description": "A medieval dagger forged from rough iron. It is not the sharpest tool in the shed, but it is certainly one of the largest.", + "description": "A medieval dagger forged from rough iron. It is not the sharpest tool in the shed, but it is certainly one of the largest.", "weight": "420 g", "volume": "250 ml", "price": 19590, @@ -333,10 +332,9 @@ "volume": 1, "price": 2300, "price_postapoc": 1800, - "to_hit": -1, + "to_hit": 1, "bashing": 8, "cutting": 15, - "to_hit": 1, "material": "steel", "qualiies": [ [ "CUT", 1 ], [ "BUTCHER", 8 ], [ "SAW_W", 1 ], [ "DIG", 1 ], [ "PRY", 1 ] ], "flags": [ "SHEATH_SWORD", "FRAGILE_MELEE" ] From 199b5bb67f163d35d0fdb5b15e88446bcfbc3344 Mon Sep 17 00:00:00 2001 From: xanderrootslayer Date: Sun, 26 Apr 2020 16:18:48 -0400 Subject: [PATCH 25/33] still spacing also bad speiling --- data/json/items/melee/swords_and_blades.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json index 88a0e61c9b380..4e3e392db3f1f 100644 --- a/data/json/items/melee/swords_and_blades.json +++ b/data/json/items/melee/swords_and_blades.json @@ -325,7 +325,7 @@ "id": "machete_gimmick", "name": { "str": "machete multitool" }, "type": "TOOL", - "description": "A thin, wobbly steel blade with sawteeth on one side and a flat chisel tip for digging. A jack of many trades and a master of none.", + "description": "A thin, wobbly steel blade with sawteeth on one side and a flat chisel tip for digging. A jack of many trades and a master of none.", "symbol": "/", "color": "green", "weight": 522, @@ -336,7 +336,7 @@ "bashing": 8, "cutting": 15, "material": "steel", - "qualiies": [ [ "CUT", 1 ], [ "BUTCHER", 8 ], [ "SAW_W", 1 ], [ "DIG", 1 ], [ "PRY", 1 ] ], + "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 8 ], [ "SAW_W", 1 ], [ "DIG", 1 ], [ "PRY", 1 ] ], "flags": [ "SHEATH_SWORD", "FRAGILE_MELEE" ] }, { From c40171c3c189dcb6b2ae3e83e88ad67a204434a2 Mon Sep 17 00:00:00 2001 From: xanderrootslayer Date: Sun, 26 Apr 2020 16:40:03 -0400 Subject: [PATCH 26/33] science.json mystery I must have branched RIGHT before the plurals were updated. --- data/json/items/tool/science.json | 171 +++++++++++++++++++++++++++++- 1 file changed, 169 insertions(+), 2 deletions(-) diff --git a/data/json/items/tool/science.json b/data/json/items/tool/science.json index 99f2cb9f1ef6d..bdf168cd3d7d9 100644 --- a/data/json/items/tool/science.json +++ b/data/json/items/tool/science.json @@ -99,6 +99,173 @@ ], "magazine_well": 0 }, + { + "id": "filter_paper_qualitative", + "type": "TOOL", + "name": { "str_sp": "qualitative filter paper" }, + "description": "filter paper for seperating solids from liquids. This filter paper has a rating of 2 microns, seperating more solids out than quantitative filter paper but the process takes longer.", + "symbol": "E", + "color": "dark_gray", + "looks_like": "paper", + "weight": "20 g", + "volume": "250 ml", + "price": 100, + "to_hit": 10, + "cutting": 1, + "material": "paper", + "qualities": [ [ "FILTER", 2 ] ] + }, + { + "id": "filter_paper_quantitative", + "type": "TOOL", + "name": { "str_sp": "quantitative filter paper" }, + "description": "filter paper for seperating solids from liquids. This filter paper has a rating of 20 microns, seperating less solids out than qualitative filter paper but the process is much faster.", + "symbol": "E", + "color": "dark_gray", + "looks_like": "paper", + "weight": "20 g", + "volume": "250 ml", + "price": 100, + "to_hit": 10, + "cutting": 1, + "material": "paper", + "qualities": [ [ "FILTER", 1 ] ] + }, + { + "id": "vac_pump", + "type": "TOOL", + "name": { "str": "vacuum pump" }, + "description": "A small belt driven mechanical pump capable of achieving a vacuum of -29.99 hg (50 microns).", + "symbol": "E", + "color": "dark_gray", + "looks_like": "motor", + "weight": "22700 g", + "volume": "6 L", + "price": 300000, + "to_hit": -5, + "bashing": 10, + "material": "iron", + "flags": [ "ALLOWS_REMOTE_USE" ], + "ammo": "battery", + "charges_per_use": 1, + "use_action": { + "target": "vac_pump_on", + "msg": "You turn on the vacuum pump.", + "menu_text": "turn on", + "active": true, + "need_charges": 1, + "need_charges_msg": "The vacuum pump's batteries need more charge.", + "type": "transform" + }, + "magazines": [ + [ + "battery", + [ + "medium_battery_cell", + "medium_plus_battery_cell", + "medium_disposable_cell", + "medium_atomic_battery_cell", + "heavy_battery_cell", + "heavy_plus_battery_cell", + "heavy_disposable_cell", + "heavy_atomic_battery_cell", + "small_storage_battery", + "medium_storage_battery", + "large_storage_battery", + "storage_battery" + ] + ] + ] + }, + { + "id": "vac_pump_on", + "type": "TOOL", + "name": { "str": "vacuum pump (on)", "str_pl": "vacuum pumps (on)" }, + "description": "A small belt driven mechanical pump capable of achieving a vacuum of -29.99 hg (50 microns).", + "symbol": "E", + "color": "dark_gray", + "looks_like": "motor", + "weight": "22700 g", + "volume": "6 L", + "price": 200000, + "to_hit": -5, + "bashing": 10, + "material": "iron", + "ammo": "battery", + "power_draw": 600000, + "charges_per_use": 1, + "flags": [ "TRADER_AVOID", "ALLOWS_REMOTE_USE" ], + "revert_to": "vac_pump", + "use_action": { + "target": "vac_pump", + "msg": "You turn off the vacuum pump.", + "menu_text": "turn off", + "active": false, + "need_charges": 1, + "need_charges_msg": "The vacuum pump's batteries need more charge.", + "type": "transform" + }, + "magazines": [ + [ + "battery", + [ + "medium_battery_cell", + "medium_plus_battery_cell", + "medium_disposable_cell", + "medium_atomic_battery_cell", + "heavy_battery_cell", + "heavy_plus_battery_cell", + "heavy_disposable_cell", + "heavy_atomic_battery_cell", + "small_storage_battery", + "medium_storage_battery", + "large_storage_battery", + "storage_battery" + ] + ] + ] + }, + { + "id": "recovery_pump", + "type": "TOOL", + "name": { "str": "recovery pump" }, + "description": "A medium sized vacuum pump designed to recover solvent (hydrocarbons) from extracted essential oils.", + "symbol": "E", + "color": "dark_gray", + "looks_like": "well_pump", + "weight": "27240 g", + "volume": "8 L", + "price": 280000, + "to_hit": -5, + "bashing": 10, + "material": "steel" + }, + { + "id": "butane_tank", + "type": "TOOL", + "name": { "str": "butane tank", "str_pl": "tanks of butane" }, + "description": "This is a tank of compressed butane. It can be used to extract essential oils from organic material.", + "weight": "22700 g", + "volume": "18950 ml", + "price": 25000, + "to_hit": -4, + "bashing": 10, + "material": [ "steel", "plastic" ], + "symbol": ";", + "color": "dark_gray", + "initial_charges": 20, + "max_charges": 20, + "charges_per_use": 1, + "looks_like": "oxygen_tank", + "flags": [ "EXPLOSIVE", "EXPLODES" ], + "explosion": { + "power": 90100, + "distance_factor": 0.5, + "fire": true, + "shrapnel": { "casing_mass": 200, "fragment_mass": 1, "recovery": 0 } + }, + "explode_in_fire": true + }, { "id": "hydrogen_tank", "type": "TOOL", @@ -122,7 +289,7 @@ "id": "hygrometer", "type": "TOOL", "category": "tools", - "name": { "str": "hygrometer", "str_pl": "hygrometers" }, + "name": { "str": "hygrometer" }, "description": "A plastic hygrometer that can read the relative humidity in the air.", "weight": "1 g", "volume": "250 ml", @@ -761,4 +928,4 @@ "symbol": "[", "color": "light_gray" } -] +] \ No newline at end of file From 52606ec3aa180e8f21c11a2b08582f4e67608e53 Mon Sep 17 00:00:00 2001 From: xanderrootslayer Date: Sun, 26 Apr 2020 16:48:21 -0400 Subject: [PATCH 27/33] conflict resolution Sorry about the pikes, I worked around them --- data/json/recipes/recipe_weapon.json | 36 ++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/data/json/recipes/recipe_weapon.json b/data/json/recipes/recipe_weapon.json index c8dd114c60f0e..9ad64cb5e85b5 100644 --- a/data/json/recipes/recipe_weapon.json +++ b/data/json/recipes/recipe_weapon.json @@ -229,6 +229,42 @@ "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "leather", 20 ] ], [ [ "rope_superior_short", 2, "LIST" ] ] ] }, + { + "result": "pike_wood", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_PIERCING", + "skill_used": "fabrication", + "skills_required": [ "survival", 1 ], + "difficulty": 3, + "time": "30 m", + "autolearn": true, + "qualities": [ { "id": "CUT", "level": 1 } ], + "tools": [ [ [ "fire", -1 ] ] ], + "components": [ + [ [ "long_pole", 1 ] ], + [ [ "rag", 1 ], [ "felt_patch", 1 ], [ "leather", 1 ], [ "fur", 1 ] ], + [ [ "duct_tape", 20 ], [ "filament", 20, "LIST" ] ] + ] + }, + { + "type": "recipe", + "result": "pike_copper", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_PIERCING", + "skill_used": "fabrication", + "difficulty": 3, + "time": "40 m", + "reversible": true, + "autolearn": true, + "qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ], + "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], + "components": [ + [ [ "long_pole", 1 ] ], + [ [ "rag", 1 ], [ "felt_patch", 1 ], [ "leather", 1 ], [ "fur", 1 ] ], + [ [ "duct_tape", 20 ], [ "cordage_short", 1, "LIST" ], [ "filament", 50, "LIST" ] ], + [ [ "copper_scrap_equivalent", 12, "LIST" ] ] + ] + }, { "type": "recipe", "result": "bullwhip_razor", From 69ba3ed46f8b52a1228ce8b6420b0725c65f3ed3 Mon Sep 17 00:00:00 2001 From: xanderrootslayer Date: Sun, 26 Apr 2020 16:55:15 -0400 Subject: [PATCH 28/33] linting? it was copied from master... --- data/json/items/tool/science.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/tool/science.json b/data/json/items/tool/science.json index bdf168cd3d7d9..b1d231b17b2f7 100644 --- a/data/json/items/tool/science.json +++ b/data/json/items/tool/science.json @@ -928,4 +928,4 @@ "symbol": "[", "color": "light_gray" } -] \ No newline at end of file +] From d0d36723c75a6fc5b98078d7ea157cf5419cc717 Mon Sep 17 00:00:00 2001 From: xanderrootslayer Date: Sun, 26 Apr 2020 17:40:14 -0400 Subject: [PATCH 29/33] linted again --- data/json/recipes/recipe_weapon.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/recipe_weapon.json b/data/json/recipes/recipe_weapon.json index 9ad64cb5e85b5..e460d85003631 100644 --- a/data/json/recipes/recipe_weapon.json +++ b/data/json/recipes/recipe_weapon.json @@ -230,7 +230,7 @@ "components": [ [ [ "leather", 20 ] ], [ [ "rope_superior_short", 2, "LIST" ] ] ] }, { - "result": "pike_wood", + "result": "pike_wood", "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_PIERCING", "skill_used": "fabrication", From bc857f474e8418acf64f68c39b081a35c890b062 Mon Sep 17 00:00:00 2001 From: xanderrootslayer Date: Sun, 26 Apr 2020 19:33:20 -0400 Subject: [PATCH 30/33] my bad pasted wrong --- data/json/recipes/recipe_weapon.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/recipes/recipe_weapon.json b/data/json/recipes/recipe_weapon.json index e460d85003631..e866f4892d5b0 100644 --- a/data/json/recipes/recipe_weapon.json +++ b/data/json/recipes/recipe_weapon.json @@ -230,6 +230,7 @@ "components": [ [ [ "leather", 20 ] ], [ [ "rope_superior_short", 2, "LIST" ] ] ] }, { + "type": "recipe", "result": "pike_wood", "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_PIERCING", From cbd10eaf3bc4b334b068ffe4e257b27eacc2ca13 Mon Sep 17 00:00:00 2001 From: xanderrootslayer Date: Sun, 26 Apr 2020 19:44:38 -0400 Subject: [PATCH 31/33] conflict resolution? perhaps I should have just copied the master --- data/json/recipes/recipe_weapon.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/data/json/recipes/recipe_weapon.json b/data/json/recipes/recipe_weapon.json index e866f4892d5b0..87c7ef2a2aaf8 100644 --- a/data/json/recipes/recipe_weapon.json +++ b/data/json/recipes/recipe_weapon.json @@ -266,19 +266,6 @@ [ [ "copper_scrap_equivalent", 12, "LIST" ] ] ] }, - { - "type": "recipe", - "result": "bullwhip_razor", - "category": "CC_WEAPON", - "subcategory": "CSC_WEAPON_RANGED", - "skill_used": "fabrication", - "difficulty": 6, - "time": "4 h", - "reversible": true, - "autolearn": true, - "qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ], - "components": [ [ [ "leather", 30 ], [ "rope_superior_short", 2, "LIST" ] ], [ [ "scrap", 9 ], [ "razor_blade", 9 ] ] ] - }, { "type": "recipe", "result": "spear_wood", @@ -2777,5 +2764,18 @@ "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "swage", -1 ] ] ], "components": [ [ [ "stick_long", 1 ] ], [ [ "fur", 2 ], [ "leather", 2 ] ] ] + }, + { + "type": "recipe", + "result": "bullwhip_razor", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_RANGED", + "skill_used": "fabrication", + "difficulty": 6, + "time": "4 h", + "reversible": true, + "autolearn": true, + "qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "leather", 30 ], [ "rope_superior_short", 2, "LIST" ] ], [ [ "scrap", 9 ], [ "razor_blade", 9 ] ] ] } ] From ebfdff2628138fdf097a734f73bd88cc7ed87c14 Mon Sep 17 00:00:00 2001 From: xanderrootslayer Date: Sun, 26 Apr 2020 21:03:07 -0400 Subject: [PATCH 32/33] catchup it changed while I was running validation! --- data/json/items/tool/science.json | 302 ++++++++++++++++++++++++++++++ 1 file changed, 302 insertions(+) diff --git a/data/json/items/tool/science.json b/data/json/items/tool/science.json index b1d231b17b2f7..b323c9a0a527a 100644 --- a/data/json/items/tool/science.json +++ b/data/json/items/tool/science.json @@ -99,6 +99,308 @@ ], "magazine_well": 0 }, + { + "id": "vac_oven_small", + "type": "TOOL", + "name": { "str": "small vacuum oven" }, + "description": "A small 0.9 cubic foot vacuum oven used to purge residual solvents out of liquids and solid. Looks kind of like a microwave.", + "looks_like": "microwave", + "weight": "40860 g", + "ammo": "battery", + "charges_per_use": 1, + "magazines": [ [ "battery", [ "large_storage_battery", "storage_battery" ] ] ], + "volume": "27 L", + "price": 100000, + "to_hit": -10, + "bashing": 10, + "material": "steel", + "symbol": "E", + "flags": [ "ALLOWS_REMOTE_USE" ], + "color": "dark_gray" + }, + { + "id": "vac_oven_small_full", + "type": "TOOL", + "name": { "str": "filled small vacuum oven" }, + "description": "A small vacuum oven filled with extract ready to be purged of residual solvents.", + "looks_like": "microwave", + "weight": "40860 g", + "volume": "27 L", + "price": 100000, + "to_hit": -10, + "bashing": 10, + "material": "steel", + "ammo": "battery", + "charges_per_use": 1, + "magazines": [ [ "battery", [ "large_storage_battery", "storage_battery" ] ] ], + "symbol": "E", + "color": "dark_gray", + "use_action": { + "target": "vac_oven_small_on", + "msg": "You turn on the vacuum oven and pump.", + "active": true, + "need_charges": 1, + "need_charges_msg": "The vacuum oven's batteries need more charge.", + "type": "transform" + }, + "flags": [ "TRADER_AVOID", "ALLOWS_REMOTE_USE" ] + }, + { + "id": "vac_oven_small_on", + "type": "TOOL", + "name": { "str": "small vacuum oven (on)", "str_pl": "small vacuum ovens (on)" }, + "description": "A small vacuum oven filled with extract currently purging out all residual solvents. This process takes about 72hrs.", + "looks_like": "microwave", + "weight": "40952 g", + "volume": "27 L", + "price": 100000, + "to_hit": -10, + "bashing": 10, + "ammo": "battery", + "power_draw": 120000, + "revert_to": "vac_oven_small_full", + "charges_per_use": 1, + "magazines": [ [ "battery", [ "large_storage_battery", "storage_battery" ] ] ], + "material": "steel", + "symbol": "E", + "color": "dark_gray", + "use_action": { + "target": "vac_oven_small_done", + "msg": "The vacuum oven is done purging. Your shatter is ready!", + "active": false, + "moves": 0, + "type": "delayed_transform", + "transform_age": 259200, + "not_ready_msg": "The vacuum oven is still purging." + }, + "flags": [ "TRADER_AVOID", "NO_UNLOAD", "ALLOWS_REMOTE_USE" ] + }, + { + "id": "vac_oven_small_done", + "type": "TOOL", + "name": { "str": "finished small vacuum oven" }, + "description": "A small vacuum oven filled with extract ready to package up for consumption. WooHoo!", + "looks_like": "microwave", + "weight": "40944 g", + "volume": "27 L", + "price": 100000, + "to_hit": -10, + "bashing": 10, + "ammo": "battery", + "charges_per_use": 1, + "magazines": [ [ "battery", [ "large_storage_battery", "storage_battery" ] ] ], + "material": "steel", + "symbol": "E", + "color": "dark_gray", + "flags": [ "TRADER_AVOID", "ALLOWS_REMOTE_USE" ] + }, + { + "id": "closed_loop_extractor_small", + "type": "TOOL", + "name": { "str": "small closed loop extractor" }, + "description": "A small closed loop extractor used for extracting essential oils from organic material producing a high quality extract. It consists of a long metal tube clamped onto a steel \"honey pot\". Organic material is packed in the tube, flushed with solvent, and essential oils gathered from the pot. Must be powered up to operate.", + "symbol": "E", + "color": "dark_gray", + "looks_like": "still", + "weight": "36000 g", + "volume": "60 L", + "price": 500000, + "to_hit": -10, + "bashing": 40, + "material": "steel", + "flags": [ "ALLOWS_REMOTE_USE" ], + "ammo": "battery", + "power_draw": 1500000, + "charges_per_use": 1, + "use_action": { + "target": "closed_loop_extractor_small_on", + "msg": "You turn on the small closed loop extractor.", + "menu_text": "turn on", + "active": true, + "need_charges": 1, + "need_charges_msg": "The small closed loop extractor's batteries need more charge.", + "type": "transform" + }, + "magazines": [ + [ + "battery", + [ + "medium_battery_cell", + "medium_plus_battery_cell", + "medium_disposable_cell", + "medium_atomic_battery_cell", + "heavy_battery_cell", + "heavy_plus_battery_cell", + "heavy_disposable_cell", + "heavy_atomic_battery_cell", + "small_storage_battery", + "medium_storage_battery", + "large_storage_battery", + "storage_battery" + ] + ] + ], + "qualities": [ [ "EXTRACT", 2 ] ] + }, + { + "id": "closed_loop_extractor_small_on", + "type": "TOOL", + "name": { "str": "small closed loop extractor (on)", "str_pl": "small closed loop extractors (on)" }, + "description": "The small closed loop extractor is running, it just needs some material to pack the tube with and an organic solvent like butane and it's good to go.", + "symbol": "E", + "color": "dark_gray", + "looks_like": "still", + "weight": "36000 g", + "volume": "60 L", + "price": 500000, + "to_hit": -10, + "bashing": 40, + "material": "steel", + "flags": [ "ALLOWS_REMOTE_USE", "TRADER_AVOID" ], + "ammo": "battery", + "power_draw": 1500000, + "revert_to": "closed_loop_extractor_small", + "charges_per_use": 1, + "use_action": { + "target": "closed_loop_extractor_small", + "msg": "You turn off the small closed loop extractor.", + "menu_text": "turn off", + "need_charges": 0, + "need_charges_msg": "The small closed loop extractor's batteries need more charge.", + "type": "transform" + }, + "magazines": [ + [ + "battery", + [ + "medium_battery_cell", + "medium_plus_battery_cell", + "medium_disposable_cell", + "medium_atomic_battery_cell", + "heavy_battery_cell", + "heavy_plus_battery_cell", + "heavy_disposable_cell", + "heavy_atomic_battery_cell", + "small_storage_battery", + "medium_storage_battery", + "large_storage_battery", + "storage_battery" + ] + ] + ], + "qualities": [ [ "EXTRACT", 2 ] ] + }, + { + "id": "closed_loop_extractor_large", + "type": "TOOL", + "name": { "str": "large closed loop extractor" }, + "description": "A large machine used for extracting essential oils from large batches of organic material producing a low quality crude oil. It consists of three long metal tubes funneled into a large drum that's set horizontally. A series of hoses and tubes come out of the machine going to different valves. It needs to be powered up to operate.", + "looks_like": "still", + "weight": "181600 g", + "volume": "240 L", + "price": 2000000, + "to_hit": -10, + "bashing": 40, + "material": "steel", + "symbol": "E", + "color": "dark_gray", + "flags": [ "ALLOWS_REMOTE_USE", "TRADER_AVOID" ], + "ammo": "battery", + "charges_per_use": 1, + "magazines": [ + [ + "battery", + [ + "medium_battery_cell", + "medium_plus_battery_cell", + "medium_disposable_cell", + "medium_atomic_battery_cell", + "heavy_battery_cell", + "heavy_plus_battery_cell", + "heavy_disposable_cell", + "heavy_atomic_battery_cell", + "small_storage_battery", + "medium_storage_battery", + "large_storage_battery", + "storage_battery" + ] + ] + ], + "use_action": { + "target": "closed_loop_extractor_large_on", + "msg": "You turn on the large closed loop extractor.", + "menu_text": "turn on", + "active": true, + "need_charges": 1, + "need_charges_msg": "The large closed loop extractor's batteries need more charge.", + "type": "transform" + }, + "qualities": [ [ "EXTRACT", 1 ] ] + }, + { + "id": "closed_loop_extractor_large_on", + "type": "TOOL", + "name": { "str": "large closed loop extractor (on)", "str_pl": "large closed loop extractors (on)" }, + "description": "The large closed loop extractor is running, it just needs some material to pack the tube with and an organic solvent like butane and it's good to go.", + "looks_like": "still", + "weight": "181600 g", + "volume": "240 L", + "price": 2000000, + "to_hit": -10, + "bashing": 40, + "material": "steel", + "symbol": "E", + "color": "dark_gray", + "flags": [ "ALLOWS_REMOTE_USE", "TRADER_AVOID" ], + "ammo": "battery", + "power_draw": 1500000, + "revert_to": "closed_loop_extractor_large", + "charges_per_use": 1, + "magazines": [ + [ + "battery", + [ + "medium_battery_cell", + "medium_plus_battery_cell", + "medium_disposable_cell", + "medium_atomic_battery_cell", + "heavy_battery_cell", + "heavy_plus_battery_cell", + "heavy_disposable_cell", + "heavy_atomic_battery_cell", + "small_storage_battery", + "medium_storage_battery", + "large_storage_battery", + "storage_battery" + ] + ] + ], + "use_action": { + "target": "closed_loop_extractor_large", + "msg": "You turn off the large closed loop extractor.", + "menu_text": "turn off", + "need_charges": 0, + "need_charges_msg": "The large closed loop extractor's batteries need more charge.", + "type": "transform" + }, + "qualities": [ [ "EXTRACT", 1 ] ] + }, + { + "id": "oil_extractor_crude", + "type": "TOOL", + "name": { "str": "makeshift essential oil extractor" }, + "description": "A makeshift extraction system. It's pretty much just a 55gal drum, a pipe to stir the solution, and a faucet at the bottom to drain the extractor. Not the most ideal piece of equipment but it will work.", + "symbol": "E", + "color": "dark_gray", + "looks_like": "55gal_drum", + "weight": "22700 g", + "volume": "210 L", + "price": 20000, + "to_hit": -5, + "bashing": 8, + "material": "steel", + "qualities": [ [ "EXTRACT", 1 ] ] + }, { "id": "filter_paper_qualitative", "type": "TOOL", From 3b733754c3054034ed69544c7aad49a15b164f63 Mon Sep 17 00:00:00 2001 From: xanderrootslayer Date: Sun, 26 Apr 2020 22:34:14 -0400 Subject: [PATCH 33/33] enough conflicts why is Science even in here --- data/json/items/tool/science.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/tool/science.json b/data/json/items/tool/science.json index b323c9a0a527a..5eaae1e192835 100644 --- a/data/json/items/tool/science.json +++ b/data/json/items/tool/science.json @@ -166,7 +166,7 @@ "color": "dark_gray", "use_action": { "target": "vac_oven_small_done", - "msg": "The vacuum oven is done purging. Your shatter is ready!", + "msg": "The vacuum oven is done purging. Your shatter is ready!", "active": false, "moves": 0, "type": "delayed_transform",