From b09866df19b3d392f5a20ec85e03dc4a692310d9 Mon Sep 17 00:00:00 2001 From: Russbear <95584169+collectanos@users.noreply.github.com> Date: Thu, 9 Nov 2023 00:17:07 +0700 Subject: [PATCH 01/24] Create high_tech_weapons_melee.json and add Laser Saber --- .../items/melee/high_tech_weapons_melee.json | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 data/json/items/melee/high_tech_weapons_melee.json diff --git a/data/json/items/melee/high_tech_weapons_melee.json b/data/json/items/melee/high_tech_weapons_melee.json new file mode 100644 index 0000000000000..e78d6017f7b99 --- /dev/null +++ b/data/json/items/melee/high_tech_weapons_melee.json @@ -0,0 +1,67 @@ +[ + { + "id": "plasma_saber", + "type": "TOOL", + "category": "weapons", + "name": { "str": "plasma saber (off)", "str_pl": "plasma sabers (off)" }, + "description": "Plasma sabers when activated consisted of a superheated plasma blade, powered by a focusing crystal in adition to a battery, that was emitted from a usually metal hilt and could be shut off at will. The weapon requires skill and training in order not to cause permanent harm to the user and is greatly enhanced when used in conjunction with the Force.", + "weight": "1000 g", + "volume": "500 ml", + "longest_side": "20 cm", + "price": 5000, + "price_postapoc": 3000, + "to_hit": 3, + "bashing": 9, + "material": [ "steel" ], + "symbol": "/", + "color": "light_gray", + "ammo": [ "battery" ], + "charges_per_use": 1, + "techniques": [ "RAPID", "WBLOCK_2", "PRECISE", "WIDE" ], + "qualities": [ [ "CUT", 10 ], [ "BUTCHER", -1 ], [ "WELD", 2 ], [ "AXE", 3 ], [ "SAW_M", 2 ] ], + "use_action": [ + { "type": "firestarter", "moves": 200, "moves_slow": 2000 }, + { + "target": "plasma_saber_on", + "msg": "The plasma saber activates.", + "active": true, + "need_charges": 1, + "need_charges_msg": "The plasma saber power cell is empty.", + "type": "transform" + } + ], + "flags": [ "DURABLE_MELEE", "FIRESTARTER", "BELT_CLIP" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "rigid": true, + "holster": true, + "max_contains_volume": "525 ml", + "max_contains_weight": "1 kg", + "item_restriction": [ "medium_plus_battery_cell", "medium_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] + } + ] + }, + { + "id": "plasma_saber_on", + "copy-from": "plasma_saber", + "type": "TOOL", + "name": { "str": "plasma saber (on)", "str_pl": "plasma sabers (on)" }, + "description": "An activated plasma saber consisted of a superheated plasma blade, powered by a focusing crystal in adition to a battery, that was emitted from a usually metal hilt and could be shut off at will. The weapon requires skill and training in order not to cause permanent harm to the user and is greatly enhanced when used in conjunction with the Force.", + "material": [ "steel" ], + "longest_side": "180 cm", + "cutting": 80, + "revert_to": "plasma_saber", + "power_draw": 5000, + "use_action": [ + { "type": "firestarter", "moves": 200, "moves_slow": 2000 }, + { + "target": "plasma_saber", + "msg": "The plasma saber deactivates.", + "menu_text": "Turn off", + "type": "transform" + } + ], + "flags": [ "LIGHT_50", "DURABLE_MELEE", "TRADER_AVOID", "FIRESTARTER", "STAB", "NONCONDUCTIVE" ] + } +] From 654952e026d1869956d580e7979d652c0245a638 Mon Sep 17 00:00:00 2001 From: Russbear <95584169+collectanos@users.noreply.github.com> Date: Thu, 9 Nov 2023 22:48:21 +0700 Subject: [PATCH 02/24] Add RC scout car --- data/json/EraOfDecay/items/tools/other.json | 47 +++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/data/json/EraOfDecay/items/tools/other.json b/data/json/EraOfDecay/items/tools/other.json index dcd7eeeb3871b..0badc49c8cfb4 100644 --- a/data/json/EraOfDecay/items/tools/other.json +++ b/data/json/EraOfDecay/items/tools/other.json @@ -70,5 +70,52 @@ "name": { "str": "sharpened entrenching tool" }, "description": "A stout, collapsible spade. It's commonly used by military forces and favored by hikers for digging. This one had its edges crudely shapened, turning it into a much more dangerous weapon in melee combat.", "melee_damage": { "bash": 6, "cut": 16 } + }, + { + "id": "rc_scout_car", + "copy-from": "rc_scout_car", + "type": "TOOL", + "name": { "str": "RC scout car" }, + "description": "A small wheeled drone, nimble and almost undetectable it mounts a robotic eye for espionage work. Once turned on, a remote controller will let you use it as a mobile camera.", + "symbol": "e", + "ammo": [ "battery" ], + "charges_per_use": 1, + "proportional": { "weight": 0.73, "volume": 0.75, "price": 0.8 }, + "use_action": { + "target": "rc_scout_car_on", + "menu_text": "Activate RC scout car", + "msg": "You activate the RC scout car.", + "active": true, + "type": "transform" + }, + "flags": [ "RADIO_CONTAINER" ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "holster": true, + "rigid": true, + "max_contains_volume": "2 L", + "max_contains_weight": "2 kg", + "item_restriction": [ "light_minus_disposable_cell", "light_minus_battery_cell", "light_minus_atomic_battery_cell" ] + } + ] + }, +{ + "id": "rc_scout_car_on", + "copy-from": "rc_scout_car", + "type": "TOOL", + "name": { "str": "RC scout car (on)", "str_pl": "RC scout cars (on)" }, + "description": "This RC scout car is on, and continuously transmitting a video-feed of its immediate surroundings. Use a remote control to drive it around.", + "turns_per_charge": 5, + "revert_to": "rc_scout_car", + "use_action": { + "target": "rc_scout_car", + "menu_text": "Deactivate RC scout car", + "msg": "You deactivate the RC scout car.", + "type": "transform" + }, + "emits": [ "emit_clairvoyant" ], + "flags": [ "LIGHT_15", "RADIO_CONTAINER", "RADIOCAR" ] } ] +] From 911f4713cbbeb34dd86d26b2696f49b47987440e Mon Sep 17 00:00:00 2001 From: Russbear <95584169+collectanos@users.noreply.github.com> Date: Fri, 10 Nov 2023 00:26:53 +0700 Subject: [PATCH 03/24] Update data/json/items/melee/high_tech_weapons_melee.json Co-authored-by: Kenshut <120565475+Kenshut@users.noreply.github.com> --- data/json/items/melee/high_tech_weapons_melee.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/melee/high_tech_weapons_melee.json b/data/json/items/melee/high_tech_weapons_melee.json index e78d6017f7b99..db40c756f26f5 100644 --- a/data/json/items/melee/high_tech_weapons_melee.json +++ b/data/json/items/melee/high_tech_weapons_melee.json @@ -62,6 +62,6 @@ "type": "transform" } ], - "flags": [ "LIGHT_50", "DURABLE_MELEE", "TRADER_AVOID", "FIRESTARTER", "STAB", "NONCONDUCTIVE" ] + "flags": [ "LIGHT_50", "DURABLE_MELEE", "TRADER_AVOID", "FIRESTARTER", "NONCONDUCTIVE" ] } ] From 11670e8374a9b41a8c037c25e71a1cf8b359a087 Mon Sep 17 00:00:00 2001 From: Russbear <95584169+collectanos@users.noreply.github.com> Date: Fri, 10 Nov 2023 00:27:24 +0700 Subject: [PATCH 04/24] Update data/json/EraOfDecay/items/tools/other.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/json/EraOfDecay/items/tools/other.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/EraOfDecay/items/tools/other.json b/data/json/EraOfDecay/items/tools/other.json index 0badc49c8cfb4..22fd1b3428a90 100644 --- a/data/json/EraOfDecay/items/tools/other.json +++ b/data/json/EraOfDecay/items/tools/other.json @@ -71,7 +71,7 @@ "description": "A stout, collapsible spade. It's commonly used by military forces and favored by hikers for digging. This one had its edges crudely shapened, turning it into a much more dangerous weapon in melee combat.", "melee_damage": { "bash": 6, "cut": 16 } }, - { + { "id": "rc_scout_car", "copy-from": "rc_scout_car", "type": "TOOL", From b28fcea3fec2352754110d6876ff3f50788b582c Mon Sep 17 00:00:00 2001 From: Russbear <95584169+collectanos@users.noreply.github.com> Date: Fri, 10 Nov 2023 00:27:43 +0700 Subject: [PATCH 05/24] Update data/json/EraOfDecay/items/tools/other.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/json/EraOfDecay/items/tools/other.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/EraOfDecay/items/tools/other.json b/data/json/EraOfDecay/items/tools/other.json index 22fd1b3428a90..cd6d0ce48333b 100644 --- a/data/json/EraOfDecay/items/tools/other.json +++ b/data/json/EraOfDecay/items/tools/other.json @@ -100,7 +100,7 @@ } ] }, -{ + { "id": "rc_scout_car_on", "copy-from": "rc_scout_car", "type": "TOOL", From f16e00bbc291aaa146a8106dac7365712c05fe42 Mon Sep 17 00:00:00 2001 From: Russbear <95584169+collectanos@users.noreply.github.com> Date: Fri, 10 Nov 2023 00:28:06 +0700 Subject: [PATCH 06/24] Update data/json/items/melee/high_tech_weapons_melee.json Co-authored-by: Kenshut <120565475+Kenshut@users.noreply.github.com> --- data/json/items/melee/high_tech_weapons_melee.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/melee/high_tech_weapons_melee.json b/data/json/items/melee/high_tech_weapons_melee.json index db40c756f26f5..c9d852614e36d 100644 --- a/data/json/items/melee/high_tech_weapons_melee.json +++ b/data/json/items/melee/high_tech_weapons_melee.json @@ -10,7 +10,7 @@ "longest_side": "20 cm", "price": 5000, "price_postapoc": 3000, - "to_hit": 3, + "to_hit": -1, "bashing": 9, "material": [ "steel" ], "symbol": "/", From c8d37908d09cfd107e48410b6d833376d3298c82 Mon Sep 17 00:00:00 2001 From: Russbear <95584169+collectanos@users.noreply.github.com> Date: Fri, 10 Nov 2023 00:28:41 +0700 Subject: [PATCH 07/24] Update data/json/items/melee/high_tech_weapons_melee.json Co-authored-by: Kenshut <120565475+Kenshut@users.noreply.github.com> --- data/json/items/melee/high_tech_weapons_melee.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/melee/high_tech_weapons_melee.json b/data/json/items/melee/high_tech_weapons_melee.json index c9d852614e36d..4d22407e71a54 100644 --- a/data/json/items/melee/high_tech_weapons_melee.json +++ b/data/json/items/melee/high_tech_weapons_melee.json @@ -11,7 +11,7 @@ "price": 5000, "price_postapoc": 3000, "to_hit": -1, - "bashing": 9, + "melee_damage": { "bash": 9 }, "material": [ "steel" ], "symbol": "/", "color": "light_gray", From df3034030337206ebdb6b79ede00c78b4108bdf5 Mon Sep 17 00:00:00 2001 From: Russbear <95584169+collectanos@users.noreply.github.com> Date: Fri, 10 Nov 2023 00:29:06 +0700 Subject: [PATCH 08/24] Update data/json/items/melee/high_tech_weapons_melee.json Co-authored-by: Kenshut <120565475+Kenshut@users.noreply.github.com> --- data/json/items/melee/high_tech_weapons_melee.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/json/items/melee/high_tech_weapons_melee.json b/data/json/items/melee/high_tech_weapons_melee.json index 4d22407e71a54..87a0883b63fb4 100644 --- a/data/json/items/melee/high_tech_weapons_melee.json +++ b/data/json/items/melee/high_tech_weapons_melee.json @@ -17,7 +17,6 @@ "color": "light_gray", "ammo": [ "battery" ], "charges_per_use": 1, - "techniques": [ "RAPID", "WBLOCK_2", "PRECISE", "WIDE" ], "qualities": [ [ "CUT", 10 ], [ "BUTCHER", -1 ], [ "WELD", 2 ], [ "AXE", 3 ], [ "SAW_M", 2 ] ], "use_action": [ { "type": "firestarter", "moves": 200, "moves_slow": 2000 }, From c92e2c5d01047fb35bc49c9f5a39cd649d3cfe03 Mon Sep 17 00:00:00 2001 From: Russbear <95584169+collectanos@users.noreply.github.com> Date: Fri, 10 Nov 2023 00:29:24 +0700 Subject: [PATCH 09/24] Update data/json/items/melee/high_tech_weapons_melee.json Co-authored-by: Kenshut <120565475+Kenshut@users.noreply.github.com> --- data/json/items/melee/high_tech_weapons_melee.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/json/items/melee/high_tech_weapons_melee.json b/data/json/items/melee/high_tech_weapons_melee.json index 87a0883b63fb4..4d1161393d643 100644 --- a/data/json/items/melee/high_tech_weapons_melee.json +++ b/data/json/items/melee/high_tech_weapons_melee.json @@ -17,7 +17,6 @@ "color": "light_gray", "ammo": [ "battery" ], "charges_per_use": 1, - "qualities": [ [ "CUT", 10 ], [ "BUTCHER", -1 ], [ "WELD", 2 ], [ "AXE", 3 ], [ "SAW_M", 2 ] ], "use_action": [ { "type": "firestarter", "moves": 200, "moves_slow": 2000 }, { From 1cb7aeb298d686f0e8f5384b336c8b4200a23742 Mon Sep 17 00:00:00 2001 From: Russbear <95584169+collectanos@users.noreply.github.com> Date: Fri, 10 Nov 2023 00:29:52 +0700 Subject: [PATCH 10/24] Update data/json/items/melee/high_tech_weapons_melee.json Co-authored-by: Kenshut <120565475+Kenshut@users.noreply.github.com> --- data/json/items/melee/high_tech_weapons_melee.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/json/items/melee/high_tech_weapons_melee.json b/data/json/items/melee/high_tech_weapons_melee.json index 4d1161393d643..50ff60ac15df0 100644 --- a/data/json/items/melee/high_tech_weapons_melee.json +++ b/data/json/items/melee/high_tech_weapons_melee.json @@ -18,7 +18,6 @@ "ammo": [ "battery" ], "charges_per_use": 1, "use_action": [ - { "type": "firestarter", "moves": 200, "moves_slow": 2000 }, { "target": "plasma_saber_on", "msg": "The plasma saber activates.", From c7d3482742c66349fcc6eb6d0a68dd1e646ec985 Mon Sep 17 00:00:00 2001 From: Russbear <95584169+collectanos@users.noreply.github.com> Date: Fri, 10 Nov 2023 00:30:10 +0700 Subject: [PATCH 11/24] Update data/json/items/melee/high_tech_weapons_melee.json Co-authored-by: Kenshut <120565475+Kenshut@users.noreply.github.com> --- data/json/items/melee/high_tech_weapons_melee.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/melee/high_tech_weapons_melee.json b/data/json/items/melee/high_tech_weapons_melee.json index 50ff60ac15df0..efe5b3d3eaa59 100644 --- a/data/json/items/melee/high_tech_weapons_melee.json +++ b/data/json/items/melee/high_tech_weapons_melee.json @@ -27,7 +27,7 @@ "type": "transform" } ], - "flags": [ "DURABLE_MELEE", "FIRESTARTER", "BELT_CLIP" ], + "flags": [ "DURABLE_MELEE", "BELT_CLIP" ], "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", From 8182864accdd3bbee9285a553d2512b41d3dde3f Mon Sep 17 00:00:00 2001 From: Russbear <95584169+collectanos@users.noreply.github.com> Date: Fri, 10 Nov 2023 00:30:23 +0700 Subject: [PATCH 12/24] Update data/json/items/melee/high_tech_weapons_melee.json Co-authored-by: Kenshut <120565475+Kenshut@users.noreply.github.com> --- data/json/items/melee/high_tech_weapons_melee.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/json/items/melee/high_tech_weapons_melee.json b/data/json/items/melee/high_tech_weapons_melee.json index efe5b3d3eaa59..274347460dd96 100644 --- a/data/json/items/melee/high_tech_weapons_melee.json +++ b/data/json/items/melee/high_tech_weapons_melee.json @@ -31,7 +31,8 @@ "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", - "rigid": true, + "flag_restriction": [ "BATTERY_HEAVY" ], + "default_magazine": "heavy_plus_battery_cell" "holster": true, "max_contains_volume": "525 ml", "max_contains_weight": "1 kg", From 660d0768b8d16bb11517ae524cb58627feab19a2 Mon Sep 17 00:00:00 2001 From: Russbear <95584169+collectanos@users.noreply.github.com> Date: Fri, 10 Nov 2023 00:31:06 +0700 Subject: [PATCH 13/24] Update data/json/items/melee/high_tech_weapons_melee.json Co-authored-by: Kenshut <120565475+Kenshut@users.noreply.github.com> --- data/json/items/melee/high_tech_weapons_melee.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/json/items/melee/high_tech_weapons_melee.json b/data/json/items/melee/high_tech_weapons_melee.json index 274347460dd96..edaa207f61aa9 100644 --- a/data/json/items/melee/high_tech_weapons_melee.json +++ b/data/json/items/melee/high_tech_weapons_melee.json @@ -34,7 +34,6 @@ "flag_restriction": [ "BATTERY_HEAVY" ], "default_magazine": "heavy_plus_battery_cell" "holster": true, - "max_contains_volume": "525 ml", "max_contains_weight": "1 kg", "item_restriction": [ "medium_plus_battery_cell", "medium_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] } From 31aab12ddc16d19a456a3c44914efe38cb8824ce Mon Sep 17 00:00:00 2001 From: Russbear <95584169+collectanos@users.noreply.github.com> Date: Fri, 10 Nov 2023 00:31:29 +0700 Subject: [PATCH 14/24] Update data/json/items/melee/high_tech_weapons_melee.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/json/items/melee/high_tech_weapons_melee.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/items/melee/high_tech_weapons_melee.json b/data/json/items/melee/high_tech_weapons_melee.json index edaa207f61aa9..0afdb557aef89 100644 --- a/data/json/items/melee/high_tech_weapons_melee.json +++ b/data/json/items/melee/high_tech_weapons_melee.json @@ -46,9 +46,9 @@ "name": { "str": "plasma saber (on)", "str_pl": "plasma sabers (on)" }, "description": "An activated plasma saber consisted of a superheated plasma blade, powered by a focusing crystal in adition to a battery, that was emitted from a usually metal hilt and could be shut off at will. The weapon requires skill and training in order not to cause permanent harm to the user and is greatly enhanced when used in conjunction with the Force.", "material": [ "steel" ], - "longest_side": "180 cm", - "cutting": 80, - "revert_to": "plasma_saber", + "longest_side": "180 cm", + "cutting": 80, + "revert_to": "plasma_saber", "power_draw": 5000, "use_action": [ { "type": "firestarter", "moves": 200, "moves_slow": 2000 }, From 1010aa738651eeacb632fef4f58680b7a5ccc518 Mon Sep 17 00:00:00 2001 From: Russbear <95584169+collectanos@users.noreply.github.com> Date: Fri, 10 Nov 2023 00:32:21 +0700 Subject: [PATCH 15/24] Update data/json/EraOfDecay/items/tools/other.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/json/EraOfDecay/items/tools/other.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/json/EraOfDecay/items/tools/other.json b/data/json/EraOfDecay/items/tools/other.json index cd6d0ce48333b..61ddb7d3733bf 100644 --- a/data/json/EraOfDecay/items/tools/other.json +++ b/data/json/EraOfDecay/items/tools/other.json @@ -118,4 +118,3 @@ "flags": [ "LIGHT_15", "RADIO_CONTAINER", "RADIOCAR" ] } ] -] From addf9a3a7d18b9b4020ed4c7e824d24308594959 Mon Sep 17 00:00:00 2001 From: Russbear <95584169+collectanos@users.noreply.github.com> Date: Fri, 10 Nov 2023 00:32:54 +0700 Subject: [PATCH 16/24] Update data/json/items/melee/high_tech_weapons_melee.json Co-authored-by: Kenshut <120565475+Kenshut@users.noreply.github.com> --- data/json/items/melee/high_tech_weapons_melee.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/json/items/melee/high_tech_weapons_melee.json b/data/json/items/melee/high_tech_weapons_melee.json index 0afdb557aef89..3623bb852ec6e 100644 --- a/data/json/items/melee/high_tech_weapons_melee.json +++ b/data/json/items/melee/high_tech_weapons_melee.json @@ -33,7 +33,6 @@ "pocket_type": "MAGAZINE_WELL", "flag_restriction": [ "BATTERY_HEAVY" ], "default_magazine": "heavy_plus_battery_cell" - "holster": true, "max_contains_weight": "1 kg", "item_restriction": [ "medium_plus_battery_cell", "medium_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] } From 5e712b94ee6110e454d63c1cbf4a1d191ff5e8c0 Mon Sep 17 00:00:00 2001 From: Russbear <95584169+collectanos@users.noreply.github.com> Date: Fri, 10 Nov 2023 00:33:03 +0700 Subject: [PATCH 17/24] Update data/json/items/melee/high_tech_weapons_melee.json Co-authored-by: Kenshut <120565475+Kenshut@users.noreply.github.com> --- data/json/items/melee/high_tech_weapons_melee.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/json/items/melee/high_tech_weapons_melee.json b/data/json/items/melee/high_tech_weapons_melee.json index 3623bb852ec6e..c66e9a370e7b0 100644 --- a/data/json/items/melee/high_tech_weapons_melee.json +++ b/data/json/items/melee/high_tech_weapons_melee.json @@ -33,7 +33,6 @@ "pocket_type": "MAGAZINE_WELL", "flag_restriction": [ "BATTERY_HEAVY" ], "default_magazine": "heavy_plus_battery_cell" - "max_contains_weight": "1 kg", "item_restriction": [ "medium_plus_battery_cell", "medium_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] } ] From 78e7d91c1e53cc5dc702da5a3364a002072ec357 Mon Sep 17 00:00:00 2001 From: Russbear <95584169+collectanos@users.noreply.github.com> Date: Fri, 10 Nov 2023 00:33:15 +0700 Subject: [PATCH 18/24] Update data/json/items/melee/high_tech_weapons_melee.json Co-authored-by: Kenshut <120565475+Kenshut@users.noreply.github.com> --- data/json/items/melee/high_tech_weapons_melee.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/json/items/melee/high_tech_weapons_melee.json b/data/json/items/melee/high_tech_weapons_melee.json index c66e9a370e7b0..524e510c6214d 100644 --- a/data/json/items/melee/high_tech_weapons_melee.json +++ b/data/json/items/melee/high_tech_weapons_melee.json @@ -33,7 +33,6 @@ "pocket_type": "MAGAZINE_WELL", "flag_restriction": [ "BATTERY_HEAVY" ], "default_magazine": "heavy_plus_battery_cell" - "item_restriction": [ "medium_plus_battery_cell", "medium_battery_cell", "medium_atomic_battery_cell", "medium_disposable_cell" ] } ] }, From d22f60769e23b1a17caf8e9321fb6a756c8af818 Mon Sep 17 00:00:00 2001 From: Russbear <95584169+collectanos@users.noreply.github.com> Date: Fri, 10 Nov 2023 00:38:43 +0700 Subject: [PATCH 19/24] Update data/json/items/melee/high_tech_weapons_melee.json Co-authored-by: Kenshut <120565475+Kenshut@users.noreply.github.com> --- data/json/items/melee/high_tech_weapons_melee.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/json/items/melee/high_tech_weapons_melee.json b/data/json/items/melee/high_tech_weapons_melee.json index 524e510c6214d..d270c299ff729 100644 --- a/data/json/items/melee/high_tech_weapons_melee.json +++ b/data/json/items/melee/high_tech_weapons_melee.json @@ -44,7 +44,8 @@ "description": "An activated plasma saber consisted of a superheated plasma blade, powered by a focusing crystal in adition to a battery, that was emitted from a usually metal hilt and could be shut off at will. The weapon requires skill and training in order not to cause permanent harm to the user and is greatly enhanced when used in conjunction with the Force.", "material": [ "steel" ], "longest_side": "180 cm", - "cutting": 80, +"melee_damage": { "cutting": 60 }, +"qualities": [ [ "CUT", 10 ], [ "BUTCHER", -1 ], [ "SAW_M", 2 ] ], "revert_to": "plasma_saber", "power_draw": 5000, "use_action": [ From 798613e3693806196b1195805daa920bf12b1ca8 Mon Sep 17 00:00:00 2001 From: Russbear <95584169+collectanos@users.noreply.github.com> Date: Fri, 10 Nov 2023 00:38:54 +0700 Subject: [PATCH 20/24] Update data/json/items/melee/high_tech_weapons_melee.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/json/items/melee/high_tech_weapons_melee.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/melee/high_tech_weapons_melee.json b/data/json/items/melee/high_tech_weapons_melee.json index d270c299ff729..892d78e19273e 100644 --- a/data/json/items/melee/high_tech_weapons_melee.json +++ b/data/json/items/melee/high_tech_weapons_melee.json @@ -27,8 +27,8 @@ "type": "transform" } ], - "flags": [ "DURABLE_MELEE", "BELT_CLIP" ], - "pocket_data": [ + "flags": [ "DURABLE_MELEE", "BELT_CLIP" ], + "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "flag_restriction": [ "BATTERY_HEAVY" ], From cf7a1a6d93dc37ab52094947e294dcd1cc9c4356 Mon Sep 17 00:00:00 2001 From: Russbear <95584169+collectanos@users.noreply.github.com> Date: Fri, 10 Nov 2023 00:39:05 +0700 Subject: [PATCH 21/24] Update data/json/items/melee/high_tech_weapons_melee.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../items/melee/high_tech_weapons_melee.json | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/data/json/items/melee/high_tech_weapons_melee.json b/data/json/items/melee/high_tech_weapons_melee.json index 892d78e19273e..6fdf48a9143c7 100644 --- a/data/json/items/melee/high_tech_weapons_melee.json +++ b/data/json/items/melee/high_tech_weapons_melee.json @@ -1,23 +1,23 @@ [ - { - "id": "plasma_saber", - "type": "TOOL", - "category": "weapons", - "name": { "str": "plasma saber (off)", "str_pl": "plasma sabers (off)" }, - "description": "Plasma sabers when activated consisted of a superheated plasma blade, powered by a focusing crystal in adition to a battery, that was emitted from a usually metal hilt and could be shut off at will. The weapon requires skill and training in order not to cause permanent harm to the user and is greatly enhanced when used in conjunction with the Force.", - "weight": "1000 g", - "volume": "500 ml", - "longest_side": "20 cm", - "price": 5000, - "price_postapoc": 3000, - "to_hit": -1, - "melee_damage": { "bash": 9 }, - "material": [ "steel" ], - "symbol": "/", - "color": "light_gray", - "ammo": [ "battery" ], - "charges_per_use": 1, - "use_action": [ + { + "id": "plasma_saber", + "type": "TOOL", + "category": "weapons", + "name": { "str": "plasma saber (off)", "str_pl": "plasma sabers (off)" }, + "description": "Plasma sabers when activated consisted of a superheated plasma blade, powered by a focusing crystal in adition to a battery, that was emitted from a usually metal hilt and could be shut off at will. The weapon requires skill and training in order not to cause permanent harm to the user and is greatly enhanced when used in conjunction with the Force.", + "weight": "1000 g", + "volume": "500 ml", + "longest_side": "20 cm", + "price": 5000, + "price_postapoc": 3000, + "to_hit": -1, + "melee_damage": { "bash": 9 }, + "material": [ "steel" ], + "symbol": "/", + "color": "light_gray", + "ammo": [ "battery" ], + "charges_per_use": 1, + "use_action": [ { "target": "plasma_saber_on", "msg": "The plasma saber activates.", From 71972db8863175d35346f66aa6caa2b49e77232c Mon Sep 17 00:00:00 2001 From: Russbear <95584169+collectanos@users.noreply.github.com> Date: Tue, 14 Nov 2023 00:37:20 +0700 Subject: [PATCH 22/24] Add colored hoodie --- data/json/items/armor/torso_clothes.json | 85 +++++++++++++++++++++++- 1 file changed, 84 insertions(+), 1 deletion(-) diff --git a/data/json/items/armor/torso_clothes.json b/data/json/items/armor/torso_clothes.json index e5c6b035265bb..7e95f028c487b 100644 --- a/data/json/items/armor/torso_clothes.json +++ b/data/json/items/armor/torso_clothes.json @@ -742,7 +742,90 @@ "warmth": 20, "material_thickness": 1, "valid_mods": [ "steel_padded" ], - "flags": [ "VARSIZE", "POCKETS", "HOOD" ] + "flags": [ "VARSIZE", "POCKETS", "HOOD" ], + "variant_type": "generic", + "variants": [ + { + "id": "hoodie_red", + "name": { "str": "red hoodie" }, + "description": "This one is colored red.", + "color": "red", + "append": true, + "weight": 24 + }, + { + "id": "hoodie_blue", + "name": { "str": "blue hoodie" }, + "color": "blue", + "description": "This one is colored blue.", + "append": true, + "weight": 24 + }, + { + "id": "hoodie_yellow", + "name": { "str": "yellow hoodie" }, + "color": "yellow", + "description": "This one is colored yellow.", + "append": true, + "weight": 24 + }, + { + "id": "hoodie_green", + "name": { "str": "green hoodie" }, + "color": "green", + "description": "This one is colored green.", + "append": true, + "weight": 24 + }, + { + "id": "hoodie_purple", + "name": { "str": "purple hoodie" }, + "color": "magenta", + "description": "This one is colored purple.", + "append": true, + "weight": 24 + }, + { + "id": "hoodie_pink", + "name": { "str": "pink hoodie" }, + "color": "magenta", + "description": "This one is colored pink.", + "append": true, + "weight": 24 + }, + { + "id": "hoodie_cyan", + "name": { "str": "cyan hoodie" }, + "color": "cyan", + "description": "This one is colored cyan.", + "append": true, + "weight": 24 + }, + { + "id": "hoodie_black", + "name": { "str": "black hoodie" }, + "color": "dark_gray", + "description": "This one is colored black.", + "append": true, + "weight": 24 + }, + { + "id": "hoodie_white", + "name": { "str": "white hoodie" }, + "color": "light_gray", + "description": "This one is colored white.", + "append": true, + "weight": 24 + }, + { + "id": "hoodie_brown", + "name": { "str": "brown hoodie" }, + "color": "brown", + "description": "This one is colored brown.", + "append": true, + "weight": 24 + } + ] }, { "id": "jersey", From c0344912e4529db6555741be9f4bd70ee0cbb301 Mon Sep 17 00:00:00 2001 From: Russbear <95584169+collectanos@users.noreply.github.com> Date: Tue, 14 Nov 2023 00:48:12 +0700 Subject: [PATCH 23/24] Add Colored skirts --- data/json/items/armor/legs_clothes.json | 101 ++++++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/data/json/items/armor/legs_clothes.json b/data/json/items/armor/legs_clothes.json index e5afd509335e3..1706f49483a81 100644 --- a/data/json/items/armor/legs_clothes.json +++ b/data/json/items/armor/legs_clothes.json @@ -1718,8 +1718,109 @@ "armor": [ { "coverage": 100, "covers": [ "leg_l", "leg_r" ], "specifically_covers": [ "leg_hip_l", "leg_hip_r" ] }, { "coverage": 75, "covers": [ "leg_l", "leg_r" ], "specifically_covers": [ "leg_upper_l", "leg_upper_r" ] } + ], + "variant_type": "generic", + "variants": [ + { + "id": "skirt_red", + "name": { "str": "red skirt" }, + "description": "This one is colored red.", + "color": "red", + "append": true, + "weight": 40 + }, + { + "id": "skirt_blue", + "name": { "str": "blue skirt" }, + "color": "blue", + "description": "This one is colored blue.", + "append": true, + "weight": 24 + }, + { + "id": "skirt_yellow", + "name": { "str": "yellow skirt" }, + "color": "yellow", + "description": "This one is colored yellow.", + "append": true, + "weight": 24 + }, + { + "id": "skirt_green", + "name": { "str": "green skirt" }, + "color": "green", + "description": "This one is colored green.", + "append": true, + "weight": 24 + }, + { + "id": "skirt_purple", + "name": { "str": "purple skirt" }, + "color": "magenta", + "description": "This one is colored purple.", + "append": true, + "weight": 24 + }, + { + "id": "skirt_pink", + "name": { "str": "pink skirt" }, + "color": "magenta", + "description": "This one is colored pink.", + "append": true, + "weight": 24 + }, + { + "id": "skirt_cyan", + "name": { "str": "cyan skirt" }, + "color": "cyan", + "description": "This one is colored cyan.", + "append": true, + "weight": 24 + }, + { + "id": "skirt_black", + "name": { "str": "black skirt" }, + "color": "dark_gray", + "description": "This one is colored black.", + "append": true, + "weight": 24 + }, + { + "id": "skirt_white", + "name": { "str": "white skirt" }, + "color": "light_gray", + "description": "This one is colored white.", + "append": true, + "weight": 24 + }, + { + "id": "skirt_brown", + "name": { "str": "brown skirt" }, + "color": "brown", + "description": "This one is colored brown.", + "append": true, + "weight": 24 + } ] }, + { + "id": "skirt_long", + "type": "ARMOR", + "name": { "str": "long skirt" }, + "description": "A long skirt with no pockets. Slightly more cumbersome but warmer than a normal skirt.", + "weight": "500 g", + "volume": "550 ml", + "price": 6500, + "price_postapoc": 75, + "material": [ "cotton" ], + "symbol": "[", + "looks_like": "kilt", + "color": "black", + "warmth": 10, + "material_thickness": 0.2, + "flags": [ "VARSIZE" ], + "armor": [ { "coverage": 100, "covers": [ "leg_l", "leg_r" ] } ] + }, { "id": "skirt_grass", "type": "ARMOR", From 21d3b6742f2027f8c6253edd9a335e3e573ba6a1 Mon Sep 17 00:00:00 2001 From: AtomicFox556 <98733651+AtomicFox556@users.noreply.github.com> Date: Mon, 13 Nov 2023 22:29:35 +0300 Subject: [PATCH 24/24] Update data/json/items/melee/high_tech_weapons_melee.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/json/items/melee/high_tech_weapons_melee.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/melee/high_tech_weapons_melee.json b/data/json/items/melee/high_tech_weapons_melee.json index 6fdf48a9143c7..7241b7a2ed1b0 100644 --- a/data/json/items/melee/high_tech_weapons_melee.json +++ b/data/json/items/melee/high_tech_weapons_melee.json @@ -44,8 +44,8 @@ "description": "An activated plasma saber consisted of a superheated plasma blade, powered by a focusing crystal in adition to a battery, that was emitted from a usually metal hilt and could be shut off at will. The weapon requires skill and training in order not to cause permanent harm to the user and is greatly enhanced when used in conjunction with the Force.", "material": [ "steel" ], "longest_side": "180 cm", -"melee_damage": { "cutting": 60 }, -"qualities": [ [ "CUT", 10 ], [ "BUTCHER", -1 ], [ "SAW_M", 2 ] ], + "melee_damage": { "cutting": 60 }, + "qualities": [ [ "CUT", 10 ], [ "BUTCHER", -1 ], [ "SAW_M", 2 ] ], "revert_to": "plasma_saber", "power_draw": 5000, "use_action": [