From a9a6e182e787d6c8ec9991ef27257a30c941dc8a Mon Sep 17 00:00:00 2001 From: k4gi Date: Mon, 6 Jan 2020 12:08:47 +1100 Subject: [PATCH 1/7] add box backpack and recipe --- data/json/items/armor/backpacks.json | 22 ++++++++++++++++++++++ data/json/recipes/armor/storage.json | 12 ++++++++++++ 2 files changed, 34 insertions(+) diff --git a/data/json/items/armor/backpacks.json b/data/json/items/armor/backpacks.json index 135c87e83754d..a5f10ea1101aa 100644 --- a/data/json/items/armor/backpacks.json +++ b/data/json/items/armor/backpacks.json @@ -570,5 +570,27 @@ "warmth": 8, "material_thickness": 2, "flags": [ "BELTED", "WATERPROOF" ] + }, + { + "id": "boxpack", + "type": "ARMOR", + "name": "box backpack", + "description": "A makeshift backpack comprised of a wooden box and a couple of ropes.", + "weight": "8000 g", + "to_hit": -5, + "color": "brown", + "symbol": "]", + "looks_like": "jerrypack", + "material": [ "wood", "cotton" ], + "volume": "15 L", + "storage": "15 L", + "covers": [ "TORSO" ], + "coverage": 40, + "encumbrance": 30, + "warmth": 5, + "bashing": 16, + "cutting": 4, + "price": 3500, + "flags": [ "BELTED", "OVERSIZE" ] } ] diff --git a/data/json/recipes/armor/storage.json b/data/json/recipes/armor/storage.json index a4785e43a926b..5ad65805f474a 100644 --- a/data/json/recipes/armor/storage.json +++ b/data/json/recipes/armor/storage.json @@ -387,6 +387,18 @@ "qualities": [ { "id": "HAMMER", "level": 3 } ], "components": [ [ [ "rag", 6 ], [ "leather", 6 ], [ "cordage_short", 3, "LIST" ] ], [ [ "jerrycan", 1 ] ] ] }, + { + "result": "boxpack", + "type": "recipe", + "category": "CC_ARMOR", + "subcategory": "CSC_ARMOR_STORAGE", + "skill_used": "fabrication", + "difficulty": 2, + "time": "6 m", + "autolearn": true, + "qualities": [ { "id": "HAMMER", "level": 1 } ], + "components": [ [ [ "2x4", 5 ] ], [ [ "nail", 20 ] ], [ [ "cordage", 2, "LIST" ] ] ] + }, { "result": "leather_belt", "type": "recipe", From 45b02e44b94c25d56f67446c1822431dc7c55603 Mon Sep 17 00:00:00 2001 From: k4gi Date: Mon, 6 Jan 2020 12:38:31 +1100 Subject: [PATCH 2/7] add NO_REPAIR flag --- data/json/items/armor/backpacks.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/armor/backpacks.json b/data/json/items/armor/backpacks.json index a5f10ea1101aa..9520167b9c723 100644 --- a/data/json/items/armor/backpacks.json +++ b/data/json/items/armor/backpacks.json @@ -591,6 +591,6 @@ "bashing": 16, "cutting": 4, "price": 3500, - "flags": [ "BELTED", "OVERSIZE" ] + "flags": [ "BELTED", "OVERSIZE", "NO_REPAIR" ] } ] From 7b72444ea8d38ac8aecae777383c5c8d27ec4f65 Mon Sep 17 00:00:00 2001 From: k4gi Date: Mon, 6 Jan 2020 12:43:16 +1100 Subject: [PATCH 3/7] edit description and recipe --- data/json/items/armor/backpacks.json | 2 +- data/json/recipes/armor/storage.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/armor/backpacks.json b/data/json/items/armor/backpacks.json index 9520167b9c723..254206acd2998 100644 --- a/data/json/items/armor/backpacks.json +++ b/data/json/items/armor/backpacks.json @@ -575,7 +575,7 @@ "id": "boxpack", "type": "ARMOR", "name": "box backpack", - "description": "A makeshift backpack comprised of a wooden box and a couple of ropes.", + "description": "A makeshift backpack comprised of a wooden box and a pair of ropes.", "weight": "8000 g", "to_hit": -5, "color": "brown", diff --git a/data/json/recipes/armor/storage.json b/data/json/recipes/armor/storage.json index 5ad65805f474a..bb3cf8ff52c72 100644 --- a/data/json/recipes/armor/storage.json +++ b/data/json/recipes/armor/storage.json @@ -397,7 +397,7 @@ "time": "6 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 } ], - "components": [ [ [ "2x4", 5 ] ], [ [ "nail", 20 ] ], [ [ "cordage", 2, "LIST" ] ] ] + "components": [ [ [ "2x4", 5 ] ], [ [ "nail", 20 ] ], [ [ "rope_natural", 1, "LIST" ] ] ] }, { "result": "leather_belt", From 2c28b0bb881ba3911e66d0f0c02f900bc7554465 Mon Sep 17 00:00:00 2001 From: k4gi Date: Wed, 8 Jan 2020 10:25:04 +1100 Subject: [PATCH 4/7] Update data/json/recipes/armor/storage.json Co-Authored-By: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> --- data/json/recipes/armor/storage.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/armor/storage.json b/data/json/recipes/armor/storage.json index bb3cf8ff52c72..432b60cc80c58 100644 --- a/data/json/recipes/armor/storage.json +++ b/data/json/recipes/armor/storage.json @@ -397,7 +397,7 @@ "time": "6 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 } ], - "components": [ [ [ "2x4", 5 ] ], [ [ "nail", 20 ] ], [ [ "rope_natural", 1, "LIST" ] ] ] + "components": [ [ [ "2x4", 3 ] ], [ [ "wood_panel", 1 ] ], [ [ "nail", 20 ] ], [ [ "rope_natural", 1, "LIST" ] ] ] }, { "result": "leather_belt", From dc33df4fad295a4458d9065fd59c7a516a91b46e Mon Sep 17 00:00:00 2001 From: k4gi Date: Wed, 8 Jan 2020 10:25:21 +1100 Subject: [PATCH 5/7] Update data/json/recipes/armor/storage.json Co-Authored-By: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> --- data/json/recipes/armor/storage.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/armor/storage.json b/data/json/recipes/armor/storage.json index 432b60cc80c58..afb8b3d2297b6 100644 --- a/data/json/recipes/armor/storage.json +++ b/data/json/recipes/armor/storage.json @@ -396,7 +396,7 @@ "difficulty": 2, "time": "6 m", "autolearn": true, - "qualities": [ { "id": "HAMMER", "level": 1 } ], + "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 2 } ], ], "components": [ [ [ "2x4", 3 ] ], [ [ "wood_panel", 1 ] ], [ [ "nail", 20 ] ], [ [ "rope_natural", 1, "LIST" ] ] ] }, { From bccdce0b3b30088afdf667eb1d7c751ca6b86387 Mon Sep 17 00:00:00 2001 From: k4gi Date: Wed, 8 Jan 2020 10:25:33 +1100 Subject: [PATCH 6/7] Update data/json/recipes/armor/storage.json Co-Authored-By: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> --- data/json/recipes/armor/storage.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/armor/storage.json b/data/json/recipes/armor/storage.json index afb8b3d2297b6..6272244abb81d 100644 --- a/data/json/recipes/armor/storage.json +++ b/data/json/recipes/armor/storage.json @@ -394,7 +394,7 @@ "subcategory": "CSC_ARMOR_STORAGE", "skill_used": "fabrication", "difficulty": 2, - "time": "6 m", + "time": "60 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 2 } ], ], "components": [ [ [ "2x4", 3 ] ], [ [ "wood_panel", 1 ] ], [ [ "nail", 20 ] ], [ [ "rope_natural", 1, "LIST" ] ] ] From ea6a5dfe39279532176725a014475b94620edf77 Mon Sep 17 00:00:00 2001 From: k4gi Date: Wed, 8 Jan 2020 10:30:52 +1100 Subject: [PATCH 7/7] remove stray bracket --- data/json/recipes/armor/storage.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/armor/storage.json b/data/json/recipes/armor/storage.json index 6272244abb81d..66b176a6977fc 100644 --- a/data/json/recipes/armor/storage.json +++ b/data/json/recipes/armor/storage.json @@ -396,7 +396,7 @@ "difficulty": 2, "time": "60 m", "autolearn": true, - "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 2 } ], ], + "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_W", "level": 2 } ], "components": [ [ [ "2x4", 3 ] ], [ [ "wood_panel", 1 ] ], [ [ "nail", 20 ] ], [ [ "rope_natural", 1, "LIST" ] ] ] }, {