From 78afd44f784f133f1b6b6c8e19901f372c01f75a Mon Sep 17 00:00:00 2001 From: submariwastaken1time <79896755+submariwastaken1time@users.noreply.github.com> Date: Thu, 17 Jul 2025 14:35:02 +0700 Subject: [PATCH 01/26] Add a new longer sling to the game, along with name changes to help with distinguishing between the two. Throwing weapons need some love --- data/json/items/ranged/slings.json | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/data/json/items/ranged/slings.json b/data/json/items/ranged/slings.json index addbc200538bc..40c95c47c467f 100644 --- a/data/json/items/ranged/slings.json +++ b/data/json/items/ranged/slings.json @@ -1,6 +1,6 @@ [ { - "id": "sling", + "id": "shepherd's_sling", "looks_like": "slingshot", "type": "ITEM", "subtypes": [ "GUN" ], @@ -122,4 +122,31 @@ "reload": 50, "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "pebble": 1 }, "open_container": true } ] } + { + "id": "long_shepherd's_sling", + "looks_like": "slingshot", + "type": "ITEM", + "subtypes": [ "GUN" ], + "symbol": "(", + "color": "brown", + "name": { "ctxt": "weapon", "str": "sling" }, + "description": "A longer sling, still easy to use and accurate. It uses pebbles as ammunition. It also packs a bigger punch", + "price": "1 USD 50 cent", + "//": "It's little more than a piece of slightly shaped leather", + "material": [ "leather" ], + "flags": [ "RELOAD_AND_SHOOT", "NEVER_JAMS", "PRIMITIVE_RANGED_WEAPON", "BELT_CLIP", "WATERPROOF_GUN" ], + "ammo_effects": [ "NEVER_MISFIRES", "NO_PENETRATE_OBSTACLES" ], + "skill": "throw", + "ammo": [ "pebble" ], + "weight": "105 g", + "volume": "90 ml", + "price_postapoc": "2 USD 50 cent", + "ranged_damage": { "damage_type": "bullet", "amount": 4 }, + "range": 16, + "dispersion": 150, + "durability": 6, + "clip_size": 1, + "reload": 50, + "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "pebble": 1 }, "open_container": true } ] + }, ] From 309705cd2d8a66d2bc9d9b56391491b25a13f9f8 Mon Sep 17 00:00:00 2001 From: submariwastaken1time <79896755+submariwastaken1time@users.noreply.github.com> Date: Thu, 17 Jul 2025 15:07:47 +0700 Subject: [PATCH 02/26] resolving stuff --- data/json/items/ranged/slings.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/items/ranged/slings.json b/data/json/items/ranged/slings.json index 40c95c47c467f..ca1cd33532b7c 100644 --- a/data/json/items/ranged/slings.json +++ b/data/json/items/ranged/slings.json @@ -122,6 +122,7 @@ "reload": 50, "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "pebble": 1 }, "open_container": true } ] } + , { "id": "long_shepherd's_sling", "looks_like": "slingshot", From 87461f94aef66b17e8c2fdb8496aaa4348dc3053 Mon Sep 17 00:00:00 2001 From: submariwastaken1time <79896755+submariwastaken1time@users.noreply.github.com> Date: Thu, 17 Jul 2025 17:58:18 +0700 Subject: [PATCH 03/26] likely final tweaks? --- data/json/items/ranged/slings.json | 11 +++++------ data/json/recipes/weapon/ranged.json | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/data/json/items/ranged/slings.json b/data/json/items/ranged/slings.json index ca1cd33532b7c..69e78df2527c3 100644 --- a/data/json/items/ranged/slings.json +++ b/data/json/items/ranged/slings.json @@ -1,12 +1,12 @@ [ { - "id": "shepherd's_sling", + "id": "sling", "looks_like": "slingshot", "type": "ITEM", "subtypes": [ "GUN" ], "symbol": "(", "color": "brown", - "name": { "ctxt": "weapon", "str": "sling" }, + "name": { "ctxt": "weapon", "str": "shepherd's sling" }, "description": "A leather sling, easy to use and accurate. It uses pebbles as ammunition.", "price": "1 USD 50 cent", "//": "It's little more than a piece of slightly shaped leather", @@ -121,16 +121,15 @@ "valid_mod_locations": [ [ "underbarrel mount", 1 ] ], "reload": 50, "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "pebble": 1 }, "open_container": true } ] - } - , + }, { - "id": "long_shepherd's_sling", + "id": "sling_long", "looks_like": "slingshot", "type": "ITEM", "subtypes": [ "GUN" ], "symbol": "(", "color": "brown", - "name": { "ctxt": "weapon", "str": "sling" }, + "name": { "ctxt": "weapon", "str": "long shepherd's sling" }, "description": "A longer sling, still easy to use and accurate. It uses pebbles as ammunition. It also packs a bigger punch", "price": "1 USD 50 cent", "//": "It's little more than a piece of slightly shaped leather", diff --git a/data/json/recipes/weapon/ranged.json b/data/json/recipes/weapon/ranged.json index 61a18d1539116..dd94794f2d5f3 100644 --- a/data/json/recipes/weapon/ranged.json +++ b/data/json/recipes/weapon/ranged.json @@ -546,6 +546,22 @@ "autolearn": true, "proficiencies": [ { "proficiency": "prof_fibers", "skill_penalty": 0 } ], "using": [ [ "cordage", 3 ] ] + }, + { + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "result": "sling_long", + "id_suffix": "cord", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_RANGED", + "skill_used": "fabrication", + "skills_required": [ [ "throw", 1 ] ], + "difficulty": 1, + "time": "45 m", + "reversible": true, + "autolearn": true, + "proficiencies": [ { "proficiency": "prof_fibers", "skill_penalty": 0 } ], + "using": [ [ "cordage", 6 ] ] }, { "type": "recipe", From 90a47f5bbb733437e6df8539930759537d4bfef7 Mon Sep 17 00:00:00 2001 From: submariwastaken1time <79896755+submariwastaken1time@users.noreply.github.com> Date: Thu, 17 Jul 2025 18:02:34 +0700 Subject: [PATCH 04/26] more tweaks --- data/json/items/ranged/slings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/ranged/slings.json b/data/json/items/ranged/slings.json index 69e78df2527c3..f9a27500a96f8 100644 --- a/data/json/items/ranged/slings.json +++ b/data/json/items/ranged/slings.json @@ -148,5 +148,5 @@ "clip_size": 1, "reload": 50, "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "pebble": 1 }, "open_container": true } ] - }, + } ] From 5f0e80aaba735b629c70fcabde295ca9de557bc9 Mon Sep 17 00:00:00 2001 From: submariwastaken1time <79896755+submariwastaken1time@users.noreply.github.com> Date: Thu, 17 Jul 2025 18:08:24 +0700 Subject: [PATCH 05/26] babby's first pull request? --- data/json/recipes/weapon/ranged.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/weapon/ranged.json b/data/json/recipes/weapon/ranged.json index dd94794f2d5f3..9e25880204c8f 100644 --- a/data/json/recipes/weapon/ranged.json +++ b/data/json/recipes/weapon/ranged.json @@ -547,7 +547,7 @@ "proficiencies": [ { "proficiency": "prof_fibers", "skill_penalty": 0 } ], "using": [ [ "cordage", 3 ] ] }, - { + { "type": "recipe", "activity_level": "LIGHT_EXERCISE", "result": "sling_long", From 2d6730c2a4d8770b4548282965fbb1bcc88497cc Mon Sep 17 00:00:00 2001 From: submariwastaken1time <79896755+submariwastaken1time@users.noreply.github.com> Date: Thu, 17 Jul 2025 18:13:18 +0700 Subject: [PATCH 06/26] go home github CLI you're drunk --- data/json/items/ranged/slings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/ranged/slings.json b/data/json/items/ranged/slings.json index f9a27500a96f8..46c822a7e024d 100644 --- a/data/json/items/ranged/slings.json +++ b/data/json/items/ranged/slings.json @@ -121,7 +121,7 @@ "valid_mod_locations": [ [ "underbarrel mount", 1 ] ], "reload": 50, "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "pebble": 1 }, "open_container": true } ] - }, + } { "id": "sling_long", "looks_like": "slingshot", From 216d78178e5f69b12073ebbc03b15db72261bcb7 Mon Sep 17 00:00:00 2001 From: submariwastaken1time <79896755+submariwastaken1time@users.noreply.github.com> Date: Thu, 17 Jul 2025 18:14:43 +0700 Subject: [PATCH 07/26] non --- data/json/items/ranged/slings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/ranged/slings.json b/data/json/items/ranged/slings.json index 46c822a7e024d..f9a27500a96f8 100644 --- a/data/json/items/ranged/slings.json +++ b/data/json/items/ranged/slings.json @@ -121,7 +121,7 @@ "valid_mod_locations": [ [ "underbarrel mount", 1 ] ], "reload": 50, "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "pebble": 1 }, "open_container": true } ] - } + }, { "id": "sling_long", "looks_like": "slingshot", From f663bcfffd2dc14a79162601332f92581d1045bf Mon Sep 17 00:00:00 2001 From: submariwastaken1time <79896755+submariwastaken1time@users.noreply.github.com> Date: Sun, 20 Jul 2025 13:20:58 +0700 Subject: [PATCH 08/26] ran files through the linting tool --- data/json/items/ranged/slings.json | 50 +++++++++++++++--------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/data/json/items/ranged/slings.json b/data/json/items/ranged/slings.json index f9a27500a96f8..bb18417d1b6c7 100644 --- a/data/json/items/ranged/slings.json +++ b/data/json/items/ranged/slings.json @@ -123,30 +123,30 @@ "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "pebble": 1 }, "open_container": true } ] }, { - "id": "sling_long", - "looks_like": "slingshot", - "type": "ITEM", - "subtypes": [ "GUN" ], - "symbol": "(", - "color": "brown", - "name": { "ctxt": "weapon", "str": "long shepherd's sling" }, - "description": "A longer sling, still easy to use and accurate. It uses pebbles as ammunition. It also packs a bigger punch", - "price": "1 USD 50 cent", - "//": "It's little more than a piece of slightly shaped leather", - "material": [ "leather" ], - "flags": [ "RELOAD_AND_SHOOT", "NEVER_JAMS", "PRIMITIVE_RANGED_WEAPON", "BELT_CLIP", "WATERPROOF_GUN" ], - "ammo_effects": [ "NEVER_MISFIRES", "NO_PENETRATE_OBSTACLES" ], - "skill": "throw", - "ammo": [ "pebble" ], - "weight": "105 g", - "volume": "90 ml", - "price_postapoc": "2 USD 50 cent", - "ranged_damage": { "damage_type": "bullet", "amount": 4 }, - "range": 16, - "dispersion": 150, - "durability": 6, - "clip_size": 1, - "reload": 50, - "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "pebble": 1 }, "open_container": true } ] + "id": "sling_long", + "looks_like": "slingshot", + "type": "ITEM", + "subtypes": [ "GUN" ], + "symbol": "(", + "color": "brown", + "name": { "ctxt": "weapon", "str": "long shepherd's sling" }, + "description": "A longer sling, still easy to use and accurate. It uses pebbles as ammunition. It also packs a bigger punch", + "price": "1 USD 50 cent", + "//": "It's little more than a piece of slightly shaped leather", + "material": [ "leather" ], + "flags": [ "RELOAD_AND_SHOOT", "NEVER_JAMS", "PRIMITIVE_RANGED_WEAPON", "BELT_CLIP", "WATERPROOF_GUN" ], + "ammo_effects": [ "NEVER_MISFIRES", "NO_PENETRATE_OBSTACLES" ], + "skill": "throw", + "ammo": [ "pebble" ], + "weight": "105 g", + "volume": "90 ml", + "price_postapoc": "2 USD 50 cent", + "ranged_damage": { "damage_type": "bullet", "amount": 4 }, + "range": 16, + "dispersion": 150, + "durability": 6, + "clip_size": 1, + "reload": 50, + "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "pebble": 1 }, "open_container": true } ] } ] From da4f461590749d979c2d1982e80bcecd1b18bc79 Mon Sep 17 00:00:00 2001 From: submariwastaken1time <79896755+submariwastaken1time@users.noreply.github.com> Date: Sun, 20 Jul 2025 13:39:00 +0700 Subject: [PATCH 09/26] finishing touches added, babby's first commit finished? --- data/json/items/ranged/slings.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/ranged/slings.json b/data/json/items/ranged/slings.json index bb18417d1b6c7..23c5f16252d36 100644 --- a/data/json/items/ranged/slings.json +++ b/data/json/items/ranged/slings.json @@ -130,7 +130,7 @@ "symbol": "(", "color": "brown", "name": { "ctxt": "weapon", "str": "long shepherd's sling" }, - "description": "A longer sling, still easy to use and accurate. It uses pebbles as ammunition. It also packs a bigger punch", + "description": "A longer sling, still easy to use and accurate. It uses pebbles as ammunition while also packing a bigger punch.", "price": "1 USD 50 cent", "//": "It's little more than a piece of slightly shaped leather", "material": [ "leather" ], @@ -141,7 +141,7 @@ "weight": "105 g", "volume": "90 ml", "price_postapoc": "2 USD 50 cent", - "ranged_damage": { "damage_type": "bullet", "amount": 4 }, + "ranged_damage": { "damage_type": "bullet", "amount": 6 }, "range": 16, "dispersion": 150, "durability": 6, From fd02c2e80d520bc15f563ee17c6102d6752ba64b Mon Sep 17 00:00:00 2001 From: submariwastaken1time <79896755+submariwastaken1time@users.noreply.github.com> Date: Tue, 22 Jul 2025 14:51:43 +0700 Subject: [PATCH 10/26] minor final tweaks, works ingame as expected --- data/json/items/ranged/slings.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/ranged/slings.json b/data/json/items/ranged/slings.json index 23c5f16252d36..2a9abb894bd6f 100644 --- a/data/json/items/ranged/slings.json +++ b/data/json/items/ranged/slings.json @@ -130,7 +130,7 @@ "symbol": "(", "color": "brown", "name": { "ctxt": "weapon", "str": "long shepherd's sling" }, - "description": "A longer sling, still easy to use and accurate. It uses pebbles as ammunition while also packing a bigger punch.", + "description": "A longer sling, still easy to use and accurate. It uses pebbles as ammunition while also packing a bigger punch and longer range.", "price": "1 USD 50 cent", "//": "It's little more than a piece of slightly shaped leather", "material": [ "leather" ], @@ -146,7 +146,7 @@ "dispersion": 150, "durability": 6, "clip_size": 1, - "reload": 50, + "reload": 75, "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "pebble": 1 }, "open_container": true } ] } ] From ab899daf9bd00b4933b6fb78cf91e74e19bad55d Mon Sep 17 00:00:00 2001 From: submariwastaken1time <79896755+submariwastaken1time@users.noreply.github.com> Date: Tue, 22 Jul 2025 14:59:50 +0700 Subject: [PATCH 11/26] more tweaks at kevin's request --- data/json/items/ranged/slings.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/ranged/slings.json b/data/json/items/ranged/slings.json index 2a9abb894bd6f..58d430f30e96c 100644 --- a/data/json/items/ranged/slings.json +++ b/data/json/items/ranged/slings.json @@ -6,7 +6,7 @@ "subtypes": [ "GUN" ], "symbol": "(", "color": "brown", - "name": { "ctxt": "weapon", "str": "shepherd's sling" }, + "name": { "ctxt": "weapon", "str": "sling" }, "description": "A leather sling, easy to use and accurate. It uses pebbles as ammunition.", "price": "1 USD 50 cent", "//": "It's little more than a piece of slightly shaped leather", @@ -129,7 +129,7 @@ "subtypes": [ "GUN" ], "symbol": "(", "color": "brown", - "name": { "ctxt": "weapon", "str": "long shepherd's sling" }, + "name": { "ctxt": "weapon", "str": "long sling" }, "description": "A longer sling, still easy to use and accurate. It uses pebbles as ammunition while also packing a bigger punch and longer range.", "price": "1 USD 50 cent", "//": "It's little more than a piece of slightly shaped leather", From 52f0e1332f35adb14e36440a2ad0b5518b961e4c Mon Sep 17 00:00:00 2001 From: submariwastaken1time <79896755+submariwastaken1time@users.noreply.github.com> Date: Tue, 22 Jul 2025 15:03:57 +0700 Subject: [PATCH 12/26] some dispersion tweaks i forgot to add in --- data/json/items/ranged/slings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/ranged/slings.json b/data/json/items/ranged/slings.json index 58d430f30e96c..d281dacce23fb 100644 --- a/data/json/items/ranged/slings.json +++ b/data/json/items/ranged/slings.json @@ -143,7 +143,7 @@ "price_postapoc": "2 USD 50 cent", "ranged_damage": { "damage_type": "bullet", "amount": 6 }, "range": 16, - "dispersion": 150, + "dispersion": 225, "durability": 6, "clip_size": 1, "reload": 75, From 3fa7e66eb8da48774640facc40a1e6270fa04694 Mon Sep 17 00:00:00 2001 From: submariwastaken1time <79896755+submariwastaken1time@users.noreply.github.com> Date: Tue, 22 Jul 2025 20:33:51 +0700 Subject: [PATCH 13/26] basic mass and volume changes --- data/json/items/ranged/slings.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/ranged/slings.json b/data/json/items/ranged/slings.json index d281dacce23fb..9eeaaf7162700 100644 --- a/data/json/items/ranged/slings.json +++ b/data/json/items/ranged/slings.json @@ -138,8 +138,8 @@ "ammo_effects": [ "NEVER_MISFIRES", "NO_PENETRATE_OBSTACLES" ], "skill": "throw", "ammo": [ "pebble" ], - "weight": "105 g", - "volume": "90 ml", + "weight": "144 g", + "volume": "120 ml", "price_postapoc": "2 USD 50 cent", "ranged_damage": { "damage_type": "bullet", "amount": 6 }, "range": 16, From aaff541168fff6ca39ecbede7c13a6a8b18603b6 Mon Sep 17 00:00:00 2001 From: submariwastaken1time <79896755+submariwastaken1time@users.noreply.github.com> Date: Tue, 22 Jul 2025 21:44:17 +0700 Subject: [PATCH 14/26] tweaks to appease density test --- data/json/items/ranged/slings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/ranged/slings.json b/data/json/items/ranged/slings.json index 9eeaaf7162700..f998feda3dbb5 100644 --- a/data/json/items/ranged/slings.json +++ b/data/json/items/ranged/slings.json @@ -148,5 +148,5 @@ "clip_size": 1, "reload": 75, "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "pebble": 1 }, "open_container": true } ] - } + } ] From 02dc0cbfe9cef54e4ee343296662ed09b294bdcd Mon Sep 17 00:00:00 2001 From: submariwastaken1time <79896755+submariwastaken1time@users.noreply.github.com> Date: Wed, 23 Jul 2025 13:28:43 +0700 Subject: [PATCH 15/26] final tweaks --- data/json/items/ranged/slings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/ranged/slings.json b/data/json/items/ranged/slings.json index f998feda3dbb5..9eeaaf7162700 100644 --- a/data/json/items/ranged/slings.json +++ b/data/json/items/ranged/slings.json @@ -148,5 +148,5 @@ "clip_size": 1, "reload": 75, "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "pebble": 1 }, "open_container": true } ] - } + } ] From fd748e161de3a1f66094f51f3721ba53ffb700be Mon Sep 17 00:00:00 2001 From: submariwastaken1time <79896755+submariwastaken1time@users.noreply.github.com> Date: Thu, 24 Jul 2025 13:10:05 +0700 Subject: [PATCH 16/26] changing things again --- data/json/items/ranged/slings.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/ranged/slings.json b/data/json/items/ranged/slings.json index 9eeaaf7162700..19e317575a21e 100644 --- a/data/json/items/ranged/slings.json +++ b/data/json/items/ranged/slings.json @@ -138,8 +138,8 @@ "ammo_effects": [ "NEVER_MISFIRES", "NO_PENETRATE_OBSTACLES" ], "skill": "throw", "ammo": [ "pebble" ], - "weight": "144 g", - "volume": "120 ml", + "weight": "90 g", + "volume": "100 ml", "price_postapoc": "2 USD 50 cent", "ranged_damage": { "damage_type": "bullet", "amount": 6 }, "range": 16, From b66bb4408ec1498c4cbd311f317f202b49ebe309 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sat, 26 Jul 2025 21:56:51 -0500 Subject: [PATCH 17/26] Update data/json/recipes/weapon/ranged.json --- data/json/recipes/weapon/ranged.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/weapon/ranged.json b/data/json/recipes/weapon/ranged.json index 9e25880204c8f..a9344e80173e1 100644 --- a/data/json/recipes/weapon/ranged.json +++ b/data/json/recipes/weapon/ranged.json @@ -561,7 +561,7 @@ "reversible": true, "autolearn": true, "proficiencies": [ { "proficiency": "prof_fibers", "skill_penalty": 0 } ], - "using": [ [ "cordage", 6 ] ] + "using": [ [ [ "cordage", 6 ] ], [ "scrap_leather", 1 ] ] ] }, { "type": "recipe", From 36bc460887dd84d974885f96d81be4830c9abf8d Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sat, 26 Jul 2025 21:57:22 -0500 Subject: [PATCH 18/26] Update data/json/recipes/weapon/ranged.json --- data/json/recipes/weapon/ranged.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/weapon/ranged.json b/data/json/recipes/weapon/ranged.json index a9344e80173e1..8b4095915a8c1 100644 --- a/data/json/recipes/weapon/ranged.json +++ b/data/json/recipes/weapon/ranged.json @@ -561,7 +561,7 @@ "reversible": true, "autolearn": true, "proficiencies": [ { "proficiency": "prof_fibers", "skill_penalty": 0 } ], - "using": [ [ [ "cordage", 6 ] ], [ "scrap_leather", 1 ] ] ] + "using": [ [ [ "cordage", 6 ] ], [ [ "scrap_leather", 1 ] ] ] }, { "type": "recipe", From e62798377e589f822ebcba571061d6c2e28a0171 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Mon, 28 Jul 2025 22:29:01 -0500 Subject: [PATCH 19/26] Update data/json/recipes/weapon/ranged.json --- data/json/recipes/weapon/ranged.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/weapon/ranged.json b/data/json/recipes/weapon/ranged.json index 8b4095915a8c1..bcba7e625d7d6 100644 --- a/data/json/recipes/weapon/ranged.json +++ b/data/json/recipes/weapon/ranged.json @@ -561,7 +561,7 @@ "reversible": true, "autolearn": true, "proficiencies": [ { "proficiency": "prof_fibers", "skill_penalty": 0 } ], - "using": [ [ [ "cordage", 6 ] ], [ [ "scrap_leather", 1 ] ] ] + "components": [ [ [ "cordage", 6 ] ], [ [ "scrap_leather", 1 ] ] ] }, { "type": "recipe", From 225b1b7e204e178d4603ee17cb21671e49c76ae6 Mon Sep 17 00:00:00 2001 From: submariwastaken1time <79896755+submariwastaken1time@users.noreply.github.com> Date: Tue, 29 Jul 2025 13:09:26 +0700 Subject: [PATCH 20/26] tweaks --- data/json/recipes/weapon/ranged.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/data/json/recipes/weapon/ranged.json b/data/json/recipes/weapon/ranged.json index 9e25880204c8f..d8b2c8ddbfbf7 100644 --- a/data/json/recipes/weapon/ranged.json +++ b/data/json/recipes/weapon/ranged.json @@ -563,6 +563,21 @@ "proficiencies": [ { "proficiency": "prof_fibers", "skill_penalty": 0 } ], "using": [ [ "cordage", 6 ] ] }, + { + "type": "recipe", // different recipe variant with leather or fur for a leather cupped sling + "activity_level": "LIGHT_EXERCISE", + "result": "sling_long", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_RANGED", + "skill_used": "fabrication", + "skills_required": [ [ "throw", 1 ], [ "tailor", 1 ] ], + "time": "20 m", + "reversible": true, + "autolearn": true, + "proficiencies": [ { "proficiency": "prof_leatherworking_basic" } ], + "qualities": [ { "id": "CUT", "level": 2 }, { "id": "SEW", "level": 1 } ], + "components": [ [ [ "filament", 40, "LIST" ] ], [ [ "leather", 1 ], [ "fur", 1 ] ] ] + }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", From a778d46953f2f58facb80e1e3e2819234c186971 Mon Sep 17 00:00:00 2001 From: submariwastaken1time <79896755+submariwastaken1time@users.noreply.github.com> Date: Tue, 29 Jul 2025 14:07:04 +0700 Subject: [PATCH 21/26] more tweaks --- data/json/recipes/weapon/ranged.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/weapon/ranged.json b/data/json/recipes/weapon/ranged.json index 5bee46e4b9711..97ef564b49c35 100644 --- a/data/json/recipes/weapon/ranged.json +++ b/data/json/recipes/weapon/ranged.json @@ -564,7 +564,7 @@ "components": [ [ [ "cordage", 6 ] ], [ [ "scrap_leather", 1 ] ] ] }, { - "type": "recipe", // different recipe variant with leather or fur for a leather cupped sling + "type": "recipe", "activity_level": "LIGHT_EXERCISE", "result": "sling_long", "category": "CC_WEAPON", From d605d6f0facb874194140c249f6aa575b8a683e8 Mon Sep 17 00:00:00 2001 From: submariwastaken1time <79896755+submariwastaken1time@users.noreply.github.com> Date: Tue, 29 Jul 2025 14:44:29 +0700 Subject: [PATCH 22/26] tweaks again --- data/json/recipes/weapon/ranged.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/weapon/ranged.json b/data/json/recipes/weapon/ranged.json index 97ef564b49c35..ff95cc7c4501e 100644 --- a/data/json/recipes/weapon/ranged.json +++ b/data/json/recipes/weapon/ranged.json @@ -561,7 +561,7 @@ "reversible": true, "autolearn": true, "proficiencies": [ { "proficiency": "prof_fibers", "skill_penalty": 0 } ], - "components": [ [ [ "cordage", 6 ] ], [ [ "scrap_leather", 1 ] ] ] + "components": [ [ [ "cordage", 6 ] ] ] }, { "type": "recipe", From ec8303f128d77d85b1c07ce37f3d01e88c666c94 Mon Sep 17 00:00:00 2001 From: submariwastaken1time <79896755+submariwastaken1time@users.noreply.github.com> Date: Fri, 1 Aug 2025 14:32:31 +0700 Subject: [PATCH 23/26] push to get this passing basic build --- data/json/recipes/weapon/ranged.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/weapon/ranged.json b/data/json/recipes/weapon/ranged.json index ff95cc7c4501e..2e504796bb4a5 100644 --- a/data/json/recipes/weapon/ranged.json +++ b/data/json/recipes/weapon/ranged.json @@ -551,7 +551,7 @@ "type": "recipe", "activity_level": "LIGHT_EXERCISE", "result": "sling_long", - "id_suffix": "cord", + "id_suffix": "cord",v "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_RANGED", "skill_used": "fabrication", From 90bb7115cef6942c85e7d8e1bacc4f8f678f7899 Mon Sep 17 00:00:00 2001 From: submariwastaken1time <79896755+submariwastaken1time@users.noreply.github.com> Date: Fri, 1 Aug 2025 14:34:41 +0700 Subject: [PATCH 24/26] push to get this passing basic build --- data/json/recipes/weapon/ranged.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/weapon/ranged.json b/data/json/recipes/weapon/ranged.json index 2e504796bb4a5..ff95cc7c4501e 100644 --- a/data/json/recipes/weapon/ranged.json +++ b/data/json/recipes/weapon/ranged.json @@ -551,7 +551,7 @@ "type": "recipe", "activity_level": "LIGHT_EXERCISE", "result": "sling_long", - "id_suffix": "cord",v + "id_suffix": "cord", "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_RANGED", "skill_used": "fabrication", From 00b5e550c4d025f57b04f7aa99d2c31908a90611 Mon Sep 17 00:00:00 2001 From: submariwastaken1time <79896755+submariwastaken1time@users.noreply.github.com> Date: Tue, 5 Aug 2025 13:20:01 +0700 Subject: [PATCH 25/26] hopefully this will pass basic build --- data/json/recipes/weapon/ranged.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/weapon/ranged.json b/data/json/recipes/weapon/ranged.json index ff95cc7c4501e..64f261f4020a0 100644 --- a/data/json/recipes/weapon/ranged.json +++ b/data/json/recipes/weapon/ranged.json @@ -561,7 +561,7 @@ "reversible": true, "autolearn": true, "proficiencies": [ { "proficiency": "prof_fibers", "skill_penalty": 0 } ], - "components": [ [ [ "cordage", 6 ] ] ] + "using": [ [ "cordage", 6 ] ] }, { "type": "recipe", From 3c38d21d6304518c3fc5f1fbdbc39cc7180dace0 Mon Sep 17 00:00:00 2001 From: submariwastaken1time <79896755+submariwastaken1time@users.noreply.github.com> Date: Tue, 5 Aug 2025 13:31:56 +0700 Subject: [PATCH 26/26] more changes --- data/json/items/ranged/slings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/ranged/slings.json b/data/json/items/ranged/slings.json index 19e317575a21e..84185dc73d229 100644 --- a/data/json/items/ranged/slings.json +++ b/data/json/items/ranged/slings.json @@ -130,7 +130,7 @@ "symbol": "(", "color": "brown", "name": { "ctxt": "weapon", "str": "long sling" }, - "description": "A longer sling, still easy to use and accurate. It uses pebbles as ammunition while also packing a bigger punch and longer range.", + "description": "A long sling, still easy to use and accurate. It's length allows the user to launch pebbles with greate force and range", "price": "1 USD 50 cent", "//": "It's little more than a piece of slightly shaped leather", "material": [ "leather" ],