From 0a50999ad266edbf30ad226ae135dbd67ca5dba4 Mon Sep 17 00:00:00 2001 From: LaVeyanFiend Date: Sun, 8 Sep 2019 14:37:09 -0400 Subject: [PATCH 01/13] Professions keep their items loaded --- data/json/professions.json | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/data/json/professions.json b/data/json/professions.json index 9786e4a89978c..d9e2f2fd4c5bc 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -562,9 +562,7 @@ "items": { "both": { "items": [ - "foodperson_mask", "pants_cargo", - "briefs", "cape_fp", "dress_shirt", "armguard_hard", @@ -574,8 +572,10 @@ "chestguard_hard", "boots_rubber" ], - "entries": [ { "item": "medium_disposable_cell" }, { "group": "snacks_fancy" }, { "group": "snacks" }, { "item": "bat" } ] - } + "entries": [ { { "item": "medium_disposable_cell", "ammo-item": "battery", "charges": 1200, "container-item": "foodperson_mask" }, { "group": "snacks_fancy" }, { "group": "snacks" }, { "item": "bat" } ] + }, + "male": [ "briefs" ], + "female": [ "panties" ] } }, { @@ -3171,12 +3171,10 @@ "longshirt", "jacket_light", "baton", - "tazer", - "medium_disposable_cell", "pockknife", "wristwatch" ], - "entries": [ { "group": "charged_cell_phone" }, { "group": "charged_flashlight" } ] + "entries": [ { "group": "charged_cell_phone" }, { "group": "charged_flashlight" }, { "item": "medium_disposable_cell", "ammo-item": "battery", "charges": 1200, "container-item": "tazer" } ] }, "male": [ "boxer_shorts" ], "female": [ "bra", "boy_shorts" ] From 021bcc02b30660ab8d8ac1f6b2216336abbc2691 Mon Sep 17 00:00:00 2001 From: LaVeyanFiend Date: Sun, 8 Sep 2019 14:58:35 -0400 Subject: [PATCH 02/13] Charged mp3 item_group --- data/json/professions.json | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/data/json/professions.json b/data/json/professions.json index d9e2f2fd4c5bc..b911bf2fc3f04 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -27,6 +27,14 @@ "magazine": 100, "entries": [ { "item": "flashlight" } ] }, + { + "type": "item_group", + "subtype": "collection", + "id": "charged_mp3", + "ammo": 100, + "magazine": 100, + "entries": [ { "item": "mp3" } ] + }, { "type": "item_group", "subtype": "collection", @@ -2163,11 +2171,10 @@ "weed", "tobacco", "rolling_paper", - "mp3", "ref_lighter", "wristwatch" ], - "entries": [ { "group": "charged_cell_phone" } ] + "entries": [ { "group": "charged_cell_phone" }, { "group": "charged_mp3" } ] }, "male": [ "pants_cargo", "tank_top", "boxer_shorts" ], "female": [ "skirt", "corset", "boxer_shorts" ] @@ -2219,10 +2226,9 @@ "rolling_paper", "tobacco", "wristwatch", - "mp3", "ref_lighter" ], - "entries": [ { "group": "charged_cell_phone" } ] + "entries": [ { "group": "charged_cell_phone" }, { "group": "charged_mp3" } ] }, "male": [ "briefs" ], "female": [ "bra", "panties" ] From 853d6180858d3514dd852f4ab657eba913c9266f Mon Sep 17 00:00:00 2001 From: LaVeyanFiend Date: Sun, 8 Sep 2019 15:58:03 -0400 Subject: [PATCH 03/13] Profession battery check, mainline --- data/json/professions.json | 72 ++++++++++++++++++++------------------ 1 file changed, 37 insertions(+), 35 deletions(-) diff --git a/data/json/professions.json b/data/json/professions.json index b911bf2fc3f04..1cc70d7aa1109 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -35,6 +35,14 @@ "magazine": 100, "entries": [ { "item": "mp3" } ] }, + { + "type": "item_group", + "subtype": "collection", + "id": "charged_two_way_radio", + "ammo": 100, + "magazine": 100, + "entries": [ { "item": "two_way_radio" } ] + }, { "type": "item_group", "subtype": "collection", @@ -374,12 +382,10 @@ "socks", "dress_shoes", "knit_scarf", - "tailors_kit", - "thread", "scissors", "wristwatch" ], - "entries": [ { "group": "charged_cell_phone" } ] + "entries": [ { "group": "charged_cell_phone" }, { "item": "tailors_kit", "ammo-item": "thread", "charges": 100 } ] }, "male": [ "briefs" ], "female": [ "bra", "panties" ] @@ -580,7 +586,7 @@ "chestguard_hard", "boots_rubber" ], - "entries": [ { { "item": "medium_disposable_cell", "ammo-item": "battery", "charges": 1200, "container-item": "foodperson_mask" }, { "group": "snacks_fancy" }, { "group": "snacks" }, { "item": "bat" } ] + "entries": [ { "item": "medium_disposable_cell", "ammo-item": "battery", "charges": 1200, "container-item": "foodperson_mask" }, { "group": "snacks_fancy" }, { "group": "snacks" }, { "item": "bat" } ] }, "male": [ "briefs" ], "female": [ "panties" ] @@ -959,11 +965,11 @@ "police_belt", "boots", "dog_whistle", - "two_way_radio", "wristwatch" ], "entries": [ { "group": "charged_cell_phone" }, + { "group": "charged_two_way_radio" }, { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] }, { "item": "usp_45", "ammo-item": "45_acp", "charges": 12, "container-item": "holster" }, { "item": "legpouch_large", "contents-group": "army_mags_usp45" } @@ -1018,11 +1024,11 @@ "police_belt", "boots", "whistle", - "two_way_radio", "wristwatch" ], "entries": [ { "group": "charged_cell_phone" }, + { "group": "charged_two_way_radio" }, { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] }, { "item": "usp_45", "ammo-item": "45_acp", "charges": 12, "container-item": "holster" }, { "item": "legpouch_large", "contents-group": "army_mags_usp45" } @@ -1055,12 +1061,12 @@ "wristwatch", "socks", "dress_shoes", - "two_way_radio", "cig", "ref_lighter" ], "entries": [ { "group": "charged_cell_phone" }, + { "group": "charged_two_way_radio" }, { "item": "sw_619", "ammo-item": "357mag_fmj", "charges": 6, "container-item": "sholster" }, { "item": "357mag_fmj", "charges": 24 } ] @@ -1089,10 +1095,10 @@ "boots_combat", "gloves_tactical", "badge_swat", - "two_way_radio", "wristwatch" ], "entries": [ + { "group": "charged_two_way_radio" }, { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] }, { "item": "chestrig", "contents-group": [ "army_mags_mp5", "army_mags_usp9" ] }, { "item": "grenadebandolier", "contents-item": [ "flashbang", "flashbang" ] }, @@ -1132,10 +1138,10 @@ "boots_combat", "gloves_tactical", "badge_swat", - "two_way_radio", "wristwatch" ], "entries": [ + { "group": "charged_two_way_radio" }, { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] }, { "item": "shot_00", "charges": 12, "container-item": "bandolier_shotgun" }, { "item": "shot_slug", "charges": 12, "container-item": "bandolier_shotgun" }, @@ -1159,7 +1165,6 @@ "traits": [ "PROF_POLICE" ], "items": { "both": { - "ammo": 100, "items": [ "socks", "pants_army", @@ -1172,10 +1177,10 @@ "hat_ball", "badge_deputy", "wristwatch", - "two_way_radio", "powered_earmuffs" ], "entries": [ + { "group": "charged_two_way_radio" }, { "item": "usp_45", "ammo-item": "45_acp", "charges": 12, "container-item": "holster" }, { "item": "legpouch_large", "contents-group": "army_mags_usp45" }, { "item": "m14mag", "ammo-item": "762_51", "charges": 20, "container-item": "chestrig" }, @@ -1213,15 +1218,15 @@ "armguard_hard", "legguard_hard", "badge_deputy", - "two_way_radio", "wristwatch", "gasbomb" ], "entries": [ + { "group": "charged_two_way_radio" }, { "item": "usp_45", "ammo-item": "45_acp", "charges": 12, "container-item": "holster" }, { "item": "legpouch_large", "contents-group": "army_mags_usp45" }, { "item": "tonfa", "container-item": "police_belt" }, - { "item": "tazer", "charges": 100 } + { "item": "medium_disposable_cell", "ammo-item": "battery", "charges": 1200, "container-item": "tazer" } ] }, "male": [ "boxer_shorts" ], @@ -1412,18 +1417,14 @@ "skills": [ { "level": 3, "name": "electronics" } ], "items": { "both": { - "ammo": 100, - "magazine": 100, "items": [ "jumpsuit", "socks", "boots", "tool_belt", - "flashlight", - "wristwatch", - { "item": "light_battery_cell", "charges": 100 } + "wristwatch" ], - "entries": [ { "group": "charged_cell_phone" } ] + "entries": [ { "group": "charged_cell_phone" }, { "group": "charged_flashlight" } ] }, "male": [ "boxer_briefs" ], "female": [ "bra", "panties" ] @@ -1437,17 +1438,19 @@ "points": 1, "skills": [ { "level": 4, "name": "computer" } ], "items": { - "both": [ - "pants", - [ "tshirt_text", "allyourbase" ], - "socks", - "sneakers", - "portable_game", - "mbag", - "laptop", - "smart_phone", - "caffeine" - ], + "both": { + "items": [ + "pants", + "tshirt_text", + "socks", + "sneakers", + "mbag", + "laptop", + "smart_phone", + "caffeine" + ], + "entries": [ { "item": "light_plus_battery_cell", "ammo-item": "battery", "charges": 150, "container-item": "portable_game" } ] + }, "male": [ "briefs" ], "female": [ "panties" ] } @@ -1720,7 +1723,6 @@ "skills": [ { "level": 1, "name": "gun" }, { "level": 1, "name": "pistol" } ], "items": { "both": { - "ammo": 100, "items": [ "tac_fullhelmet", "pants_cargo", @@ -1729,10 +1731,10 @@ "boots", "badge_cybercop", "smart_phone", - "wristwatch", - "two_way_radio" + "wristwatch" ], "entries": [ + { "group": "charged_two_way_radio" }, { "item": "glock_18c", "ammo-item": "9mmP", "container-item": "holster" }, { "item": "magbandolier", "contents-group": "army_mags_glock17" } ] @@ -3587,8 +3589,8 @@ "points": 0, "items": { "both": { - "items": [ "pants", "dress_shirt", "blazer", "socks", "dress_shoes", "camera_pro", "wristwatch" ], - "entries": [ { "group": "charged_cell_phone" } ] + "items": [ "pants", "dress_shirt", "blazer", "socks", "dress_shoes", "wristwatch" ], + "entries": [ { "group": "charged_cell_phone" }, { "item": "light_disposable_cell", "ammo-item": "battery", "charges": 300, "container-item": "camera_pro" } ] }, "male": [ "boxer_shorts" ], "female": [ "boy_shorts", "bra" ] From 39b1c2327fe24dc9d6f6af6696ca680c99eeae5f Mon Sep 17 00:00:00 2001 From: LaVeyanFiend Date: Sun, 8 Sep 2019 16:31:11 -0400 Subject: [PATCH 04/13] Create consistent charged_X item groups --- data/json/professions.json | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/data/json/professions.json b/data/json/professions.json index 1cc70d7aa1109..4afe3af80b04b 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -15,33 +15,25 @@ "type": "item_group", "subtype": "collection", "id": "charged_cell_phone", - "ammo": 100, - "magazine": 100, - "entries": [ { "item": "cell_phone" } ] + "entries": [ { "item": "light_plus_battery_cell", "ammo-item": "battery", "charges": 150, "container-item": "cell_phone" } ] }, { "type": "item_group", "subtype": "collection", "id": "charged_flashlight", - "ammo": 100, - "magazine": 100, - "entries": [ { "item": "flashlight" } ] + "entries": [ { "item": "light_disposable_cell", "ammo-item": "battery", "charges": 300, "container-item": "flashlight" } ] }, { "type": "item_group", "subtype": "collection", "id": "charged_mp3", - "ammo": 100, - "magazine": 100, - "entries": [ { "item": "mp3" } ] + "entries": [ { "item": "light_plus_battery_cell", "ammo-item": "battery", "charges": 150, "container-item": "mp3" } ] }, { "type": "item_group", "subtype": "collection", "id": "charged_two_way_radio", - "ammo": 100, - "magazine": 100, - "entries": [ { "item": "two_way_radio" } ] + "entries": [ { "item": "light_disposable_cell", "ammo-item": "battery", "charges": 300, "container-item": "two_way_radio" } ] }, { "type": "item_group", From e7ca739e0ef02b17097a8179a3099d500722d8c8 Mon Sep 17 00:00:00 2001 From: LaVeyanFiend Date: Sun, 8 Sep 2019 17:00:50 -0400 Subject: [PATCH 05/13] Mainline Prof battery check 2 --- data/json/professions.json | 44 +++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/data/json/professions.json b/data/json/professions.json index 4afe3af80b04b..b699a48f995df 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -433,18 +433,20 @@ { "level": 2, "name": "mechanics" } ], "items": { - "both": [ - "dress_shirt", - "pants", - "socks", - "boots", - "coat_lab", - "gloves_rubber", - "glasses_safety", - "chemistry_set", - "smart_phone", - "wristwatch" - ], + "both": { + "items": [ + "dress_shirt", + "pants", + "socks", + "boots", + "coat_lab", + "gloves_rubber", + "glasses_safety", + "smart_phone", + "wristwatch" + ], + "entries": [ { "item": "medium_battery_cell", "ammo-item": "battery", "charges": 500, "container-item": "chemistry_set" } ] + }, "male": [ "briefs" ], "female": [ "bra", "panties" ] } @@ -458,23 +460,18 @@ "skills": [ { "level": 3, "name": "mechanics" } ], "items": { "both": { - "ammo": 100, - "magazine": 100, "items": [ "slingpack", "tank_top", "jeans", "socks", "boots_steel", - "tool_belt", - "wrench", "duct_tape", "screwdriver", "wristwatch", - "mag_cars", - "welder" + "mag_cars" ], - "entries": [ { "item": "goggles_welding", "custom-flags": [ "no_auto_equip" ] }, { "group": "charged_cell_phone" } ] + "entries": [ { "item": "goggles_welding", "custom-flags": [ "no_auto_equip" ] }, { "group": "charged_cell_phone" }, { "item": "wrench", "container-item": "tool_belt" }, { "item": "medium_battery_cell", "ammo-item": "battery", "charges": 500, "container-item": "welder" } ] }, "male": [ "boxer_shorts" ], "female": [ "bra", "boy_shorts" ] @@ -3241,8 +3238,6 @@ "fishing_waders", "knit_scarf", "fishing_rod_professional", - "fish_bait", - "fish_trap", "vest", "hat_boonie", "wristwatch", @@ -3250,6 +3245,8 @@ ], "entries": [ { "group": "charged_cell_phone" }, + { "item": "fish_trap", "ammo-item": "fish_bait", "charges": 5 }, + { "item": "fish_bait", "charges": 15 }, { "item": "lighter", "charges": 100 }, { "item": "knife_hunting", "container-item": "sheath" } ] @@ -3657,7 +3654,6 @@ "boots_steel", "gloves_work", "knee_pads", - "miner_hat", "jumpsuit", "mask_gas", "jackhammer", @@ -3670,8 +3666,8 @@ ], "entries": [ { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] }, - { "item": "light_disposable_cell", "charges": 100 }, - { "item": "light_disposable_cell", "charges": 100 } + { "item": "light_minus_disposable_cell", "charges": 100 }, + { "item": "light_minus_disposable_cell", "charges": 100, "container-item": "miner_hat" } ] }, "male": [ "boxer_shorts" ], From d8564ec24f9ae0fbd0061012991bf7b5c455e7d1 Mon Sep 17 00:00:00 2001 From: LaVeyanFiend Date: Sun, 8 Sep 2019 17:18:25 -0400 Subject: [PATCH 06/13] Return Archaelo's missing 7 rounds --- data/json/professions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/professions.json b/data/json/professions.json index b699a48f995df..666bb69066af6 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -2774,7 +2774,7 @@ ], "entries": [ { "group": "charged_cell_phone" }, - { "item": "sw_619", "ammo-item": "38_special", "container-item": "holster" }, + { "item": "sw_619", "ammo-item": "38_special", "charges": 7, "container-item": "holster" }, { "item": "38_special", "charges": 33 } ] }, From 8f3b865c4d19b605d6110e7835c4195f7cac5174 Mon Sep 17 00:00:00 2001 From: LaVeyanFiend Date: Sun, 8 Sep 2019 20:53:35 -0400 Subject: [PATCH 07/13] Mainline Profession holstering/battery 3 --- data/json/professions.json | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/data/json/professions.json b/data/json/professions.json index 666bb69066af6..3acce0d908184 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -340,10 +340,10 @@ "knife_folding", "water_clean", "matches", - "two_way_radio", "wristwatch" ], "entries": [ + { "group": "charged_two_way_radio" }, { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] }, { "item": "m1911", "ammo-item": "45_acp", "charges": 7, "container-item": "holster" }, { "item": "45_acp", "charges": 23 }, @@ -633,11 +633,11 @@ "gloves_tactical", "socks", "boots_combat", - "two_way_radio", "wristwatch", "molle_pack" ], "entries": [ + { "group": "charged_two_way_radio" }, { "item": "modularvest", "contents-group": "army_mags_m4" }, { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] }, { "item": "knife_combat", "container-item": "sheath" }, @@ -1714,6 +1714,7 @@ "both": { "items": [ "tac_fullhelmet", + "police_belt", "pants_cargo", "under_armor", "socks", @@ -1805,7 +1806,6 @@ ], "items": { "both": { - "ammo": 100, "items": [ "winter_pants_army", "winter_jacket_army", @@ -1815,9 +1815,9 @@ "socks", "boots_combat", "wristwatch", - "two_way_radio" ], "entries": [ + { "group": "charged_two_way_radio" }, { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] }, { "item": "sheath", "contents-item": "knife_combat" }, { "item": "h&k416a5", "ammo-item": "556", "contents-item": [ "shoulder_strap", "acog_scope" ] }, @@ -1854,8 +1854,6 @@ ], "items": { "both": { - "ammo": 100, - "magazine": 100, "items": [ "winter_pants_army", "army_top", @@ -1867,16 +1865,16 @@ "socks", "boots_combat", "canteen", - "two_way_radio", "wristwatch", "tent_kit", "rollmat", - "mil_mess_kit", "e_tool", "binoculars", "knife_hunting" ], "entries": [ + { "item": "medium_plus_battery_cell", "ammo-item": "battery", "charges": 600, "container-item": "mil_mess_kit" }, + { "group": "charged_two_way_radio" }, { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] }, { "item": "hat_boonie", "custom-flags": [ "no_auto_equip" ] }, { @@ -2907,7 +2905,6 @@ ], "items": { "both": { - "ammo": 100, "items": [ "survivor_vest", "wsurvivor_suit", @@ -2915,10 +2912,10 @@ "boots_wsurvivor", "hood_wsurvivor", "gloves_wsurvivor", - "mess_kit", "wristwatch" ], "entries": [ + { "item": "medium_battery_cell", "ammo-item": "battery", "charges": 500, "container-item": "mess_kit" }, { "item": "kukri", "container-item": "sheath" }, { "item": "crossbow", "ammo-item": "bolt_wood", "contents-item": "shoulder_strap" }, { "item": "bolt_wood", "charges": 29, "container-item": "quiver_large" } @@ -2989,19 +2986,18 @@ "balclava", "boots_combat", "gloves_tactical", - "chestrig", "tac_helmet", "canteen", - "mil_mess_kit", "wristwatch", - "two_way_radio", "quikclot" ], "entries": [ { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] }, { "item": "knife_combat", "container-item": "sheath" }, { "item": "m4a1", "ammo-item": "556", "contents-item": "shoulder_strap" }, - { "item": "stanag30", "ammo-item": "556", "count": 2 } + { "item": "medium_plus_battery_cell", "ammo-item": "battery", "charges": 600, "container-item": "mil_mess_kit" }, + { "group": "charged_two_way_radio" }, + { "item": "chestrig", "contents-group": "army_mags_m4" }, ] }, "male": [ "boxer_shorts" ], @@ -3027,7 +3023,6 @@ ], "items": { "both": { - "ammo": 100, "items": [ "tank_top", "pants_leather", @@ -3042,16 +3037,16 @@ "canteen", "whistle", "binoculars", - "wearable_light", "duct_tape", "ref_lighter", - "wristwatch", - "gasoline_cooker" + "wristwatch" ], "entries": [ { "item": "knife_combat", "container-item": "sheath" }, + { "item": "gasoline_cooker", "ammo_item": "gasoline", "charges": 500 }, { "item": "XL_holster", "contents-group": "shotgun_d_roadwarrior" }, { "item": "reloaded_shot_00", "charges": 18, "container-item": "bandolier_shotgun" } + { "item": "light_battery_cell", "charges": 100, "container-item": "wearable_light" } ] }, "male": [ "boxer_shorts" ], From 3d1d13216295570245d14b56709097d9aaad2d5b Mon Sep 17 00:00:00 2001 From: LaVeyanFiend Date: Sun, 8 Sep 2019 21:11:42 -0400 Subject: [PATCH 08/13] Mod professions battery/holster check --- .../Aftershock/player/afs_professions.json | 1 + .../more_classes_scenarios/cs_classes.json | 32 ++++++++++--------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/data/mods/Aftershock/player/afs_professions.json b/data/mods/Aftershock/player/afs_professions.json index 4a88d7f55a72f..5fcee5211564c 100644 --- a/data/mods/Aftershock/player/afs_professions.json +++ b/data/mods/Aftershock/player/afs_professions.json @@ -43,6 +43,7 @@ "sneakers", "smart_phone" ], + "entries": [ { "item": "light_plus_battery_cell", "ammo-item": "battery", "charges": 150, "container-item": "eink_tablet_pc"} ], "male": [ "briefs" ], "female": [ "bra", "panties" ] } diff --git a/data/mods/more_classes_scenarios/cs_classes.json b/data/mods/more_classes_scenarios/cs_classes.json index c01f27016f533..55a9c64e7bd6c 100644 --- a/data/mods/more_classes_scenarios/cs_classes.json +++ b/data/mods/more_classes_scenarios/cs_classes.json @@ -147,14 +147,13 @@ "roadmap", "restaurantmap", "shavingkit", - "mess_kit", "aluminum_foil", "can_chowder", "apple_cider", "fruit_leather", "suitcase_m" ], - "entries": [ { "group": "charged_cell_phone" } ] + "entries": [ { "group": "charged_cell_phone" }, { "item": "medium_battery_cell", "ammo-item": "battery", "charges": 500, "container-item": "mess_kit" } ] }, "male": [ "boxer_shorts" ], "female": [ "bra", "panties" ] @@ -312,7 +311,7 @@ "description": "You were awoken in the middle of the night by a noise. Armed only with a flashlight you went to investigate, now you face the cataclysm.", "points": 0, "items": { - "both": [ "slippers", "flashlight" ], + "both": { "items": [ "slippers" ], "entries": [ { "group": "charged_flashlight" } ] }, "male": [ "boxer_shorts", "socks", "house_coat" ], "female": [ "bra", "panties", "stockings", "gown" ] } @@ -349,18 +348,21 @@ "points": 4, "skills": [ { "level": 1, "name": "mechanics" } ], "items": { - "both": [ - "socks", - "wearable_light", - "goggles_welding", - "jumpsuit", - "gloves_work", - "boots_steel", - "tool_belt", - "apron_leather", - "oxy_torch", - "tinyweldtank" - ], + "both": { + "items": [ + "socks", + "goggles_welding", + "jumpsuit", + "gloves_work", + "boots_steel", + "tool_belt", + "apron_leather" + ], + "entries": [ + { "item": "tinyweldtank", "ammo-item": "oxyacetylene", "charges": 60, "container-item": "oxy_torch" }, + { "item": "light_battery_cell", "ammo-item": "battery", "charges": 100, "container-item": "wearable_light" } + ] + }, "male": [ "boxer_shorts" ], "female": [ "bra", "boxer_shorts" ] } From d728a2d3db60cef9ce3ab8db70ba090c8c90f4ed Mon Sep 17 00:00:00 2001 From: LaVeyanFiend Date: Sun, 8 Sep 2019 22:13:13 -0400 Subject: [PATCH 09/13] Reenactors holster rifle & ammo + typos --- data/json/professions.json | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/data/json/professions.json b/data/json/professions.json index 3acce0d908184..243dce45d8f6f 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -1814,7 +1814,7 @@ "tac_helmet", "socks", "boots_combat", - "wristwatch", + "wristwatch" ], "entries": [ { "group": "charged_two_way_radio" }, @@ -2997,7 +2997,7 @@ { "item": "m4a1", "ammo-item": "556", "contents-item": "shoulder_strap" }, { "item": "medium_plus_battery_cell", "ammo-item": "battery", "charges": 600, "container-item": "mil_mess_kit" }, { "group": "charged_two_way_radio" }, - { "item": "chestrig", "contents-group": "army_mags_m4" }, + { "item": "chestrig", "contents-group": "army_mags_m4" } ] }, "male": [ "boxer_shorts" ], @@ -3045,7 +3045,7 @@ { "item": "knife_combat", "container-item": "sheath" }, { "item": "gasoline_cooker", "ammo_item": "gasoline", "charges": 500 }, { "item": "XL_holster", "contents-group": "shotgun_d_roadwarrior" }, - { "item": "reloaded_shot_00", "charges": 18, "container-item": "bandolier_shotgun" } + { "item": "reloaded_shot_00", "charges": 18, "container-item": "bandolier_shotgun" }, { "item": "light_battery_cell", "charges": 100, "container-item": "wearable_light" } ] }, @@ -3267,7 +3267,8 @@ "items": [ "stockings", "pockknife", "matches", "pipe_tobacco", "tobacco" ], "entries": [ { "group": "charged_cell_phone" } ] }, - "male": [ + "male": { + "items": [ "knee_high_boots", "breeches", "waistcoat", @@ -3275,13 +3276,11 @@ "leather_belt", "knit_scarf", "tricorne", - "shoulder_strap", - "flintlock_pouch", - "rifle_flintlock", - "flintlock_ammo", "hatchet", "hardtack" - ], + ], + "entries": [ { "item": "rifle_flintlock", "ammo-item": "flintlock_ammo", "charges": 1, "contents-item": "shoulder_strap" }, { "item": "flintlock_ammo", "charges": 14, "container-item": "flintlock_pouch" }, { "item": "flintlock_ammo", "charges": 15 } ] + }, "female": [ "dress", "apron_leather", @@ -3329,7 +3328,8 @@ "cornmeal", "salt" ], - "female": [ + "female": { + "items": [ "knee_high_boots", "breeches", "waistcoat", @@ -3337,13 +3337,11 @@ "leather_belt", "knit_scarf", "tricorne", - "shoulder_strap", - "flintlock_pouch", - "rifle_flintlock", - "flintlock_ammo", "hatchet", "hardtack" - ] + ], + "entries": [ { "item": "rifle_flintlock", "ammo-item": "flintlock_ammo", "charges": 1, "contents-item": "shoulder_strap" }, { "item": "flintlock_ammo", "charges": 14, "container-item": "flintlock_pouch" }, { "item": "flintlock_ammo", "charges": 15 } ] + } } }, { From 49ab0e3d507f8d1d1e3855f2eef09c2eb4b024dd Mon Sep 17 00:00:00 2001 From: LaVeyanFiend Date: Mon, 9 Sep 2019 08:56:20 -0400 Subject: [PATCH 10/13] Revert Foodperson panties Fris0uman wants it consistent across both genders due to Foodperson NPC --- data/json/professions.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/data/json/professions.json b/data/json/professions.json index 243dce45d8f6f..3716a441c32d3 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -566,6 +566,7 @@ "both": { "items": [ "pants_cargo", + "briefs", "cape_fp", "dress_shirt", "armguard_hard", @@ -576,9 +577,7 @@ "boots_rubber" ], "entries": [ { "item": "medium_disposable_cell", "ammo-item": "battery", "charges": 1200, "container-item": "foodperson_mask" }, { "group": "snacks_fancy" }, { "group": "snacks" }, { "item": "bat" } ] - }, - "male": [ "briefs" ], - "female": [ "panties" ] + } } }, { From 43bc37d11c201a2df81cce4f121f2d7ff62c5483 Mon Sep 17 00:00:00 2001 From: LaVeyanFiend Date: Mon, 9 Sep 2019 23:37:31 -0400 Subject: [PATCH 11/13] Linting --- data/json/professions.json | 202 ++++++------------ .../Aftershock/player/afs_professions.json | 2 +- .../more_classes_scenarios/cs_classes.json | 15 +- 3 files changed, 74 insertions(+), 145 deletions(-) diff --git a/data/json/professions.json b/data/json/professions.json index 3716a441c32d3..c2c0d508912d2 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -367,16 +367,7 @@ "skills": [ { "level": 4, "name": "tailor" } ], "items": { "both": { - "items": [ - "polo_shirt", - "blazer", - "pants", - "socks", - "dress_shoes", - "knit_scarf", - "scissors", - "wristwatch" - ], + "items": [ "polo_shirt", "blazer", "pants", "socks", "dress_shoes", "knit_scarf", "scissors", "wristwatch" ], "entries": [ { "group": "charged_cell_phone" }, { "item": "tailors_kit", "ammo-item": "thread", "charges": 100 } ] }, "male": [ "briefs" ], @@ -434,17 +425,7 @@ ], "items": { "both": { - "items": [ - "dress_shirt", - "pants", - "socks", - "boots", - "coat_lab", - "gloves_rubber", - "glasses_safety", - "smart_phone", - "wristwatch" - ], + "items": [ "dress_shirt", "pants", "socks", "boots", "coat_lab", "gloves_rubber", "glasses_safety", "smart_phone", "wristwatch" ], "entries": [ { "item": "medium_battery_cell", "ammo-item": "battery", "charges": 500, "container-item": "chemistry_set" } ] }, "male": [ "briefs" ], @@ -460,18 +441,13 @@ "skills": [ { "level": 3, "name": "mechanics" } ], "items": { "both": { - "items": [ - "slingpack", - "tank_top", - "jeans", - "socks", - "boots_steel", - "duct_tape", - "screwdriver", - "wristwatch", - "mag_cars" - ], - "entries": [ { "item": "goggles_welding", "custom-flags": [ "no_auto_equip" ] }, { "group": "charged_cell_phone" }, { "item": "wrench", "container-item": "tool_belt" }, { "item": "medium_battery_cell", "ammo-item": "battery", "charges": 500, "container-item": "welder" } ] + "items": [ "slingpack", "tank_top", "jeans", "socks", "boots_steel", "duct_tape", "screwdriver", "wristwatch", "mag_cars" ], + "entries": [ + { "item": "goggles_welding", "custom-flags": [ "no_auto_equip" ] }, + { "group": "charged_cell_phone" }, + { "item": "wrench", "container-item": "tool_belt" }, + { "item": "medium_battery_cell", "ammo-item": "battery", "charges": 500, "container-item": "welder" } + ] }, "male": [ "boxer_shorts" ], "female": [ "bra", "boy_shorts" ] @@ -576,7 +552,12 @@ "chestguard_hard", "boots_rubber" ], - "entries": [ { "item": "medium_disposable_cell", "ammo-item": "battery", "charges": 1200, "container-item": "foodperson_mask" }, { "group": "snacks_fancy" }, { "group": "snacks" }, { "item": "bat" } ] + "entries": [ + { "item": "medium_disposable_cell", "ammo-item": "battery", "charges": 1200, "container-item": "foodperson_mask" }, + { "group": "snacks_fancy" }, + { "group": "snacks" }, + { "item": "bat" } + ] } } }, @@ -945,16 +926,7 @@ "pets": [ { "name": "mon_dog_gshepherd", "amount": 1 } ], "items": { "both": { - "items": [ - "pants_army", - "socks", - "badge_deputy", - "sheriffshirt", - "police_belt", - "boots", - "dog_whistle", - "wristwatch" - ], + "items": [ "pants_army", "socks", "badge_deputy", "sheriffshirt", "police_belt", "boots", "dog_whistle", "wristwatch" ], "entries": [ { "group": "charged_cell_phone" }, { "group": "charged_two_way_radio" }, @@ -1004,16 +976,7 @@ "traits": [ "PROF_POLICE" ], "items": { "both": { - "items": [ - "pants_army", - "socks", - "badge_deputy", - "sheriffshirt", - "police_belt", - "boots", - "whistle", - "wristwatch" - ], + "items": [ "pants_army", "socks", "badge_deputy", "sheriffshirt", "police_belt", "boots", "whistle", "wristwatch" ], "entries": [ { "group": "charged_cell_phone" }, { "group": "charged_two_way_radio" }, @@ -1075,16 +1038,7 @@ "traits": [ "PROF_SWAT" ], "items": { "both": { - "items": [ - "socks", - "swat_armor", - "police_belt", - "tac_helmet", - "boots_combat", - "gloves_tactical", - "badge_swat", - "wristwatch" - ], + "items": [ "socks", "swat_armor", "police_belt", "tac_helmet", "boots_combat", "gloves_tactical", "badge_swat", "wristwatch" ], "entries": [ { "group": "charged_two_way_radio" }, { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] }, @@ -1119,15 +1073,7 @@ "traits": [ "PROF_SWAT" ], "items": { "both": { - "items": [ - "socks", - "swat_armor", - "tac_fullhelmet", - "boots_combat", - "gloves_tactical", - "badge_swat", - "wristwatch" - ], + "items": [ "socks", "swat_armor", "tac_fullhelmet", "boots_combat", "gloves_tactical", "badge_swat", "wristwatch" ], "entries": [ { "group": "charged_two_way_radio" }, { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] }, @@ -1405,13 +1351,7 @@ "skills": [ { "level": 3, "name": "electronics" } ], "items": { "both": { - "items": [ - "jumpsuit", - "socks", - "boots", - "tool_belt", - "wristwatch" - ], + "items": [ "jumpsuit", "socks", "boots", "tool_belt", "wristwatch" ], "entries": [ { "group": "charged_cell_phone" }, { "group": "charged_flashlight" } ] }, "male": [ "boxer_briefs" ], @@ -1427,16 +1367,7 @@ "skills": [ { "level": 4, "name": "computer" } ], "items": { "both": { - "items": [ - "pants", - "tshirt_text", - "socks", - "sneakers", - "mbag", - "laptop", - "smart_phone", - "caffeine" - ], + "items": [ "pants", "tshirt_text", "socks", "sneakers", "mbag", "laptop", "smart_phone", "caffeine" ], "entries": [ { "item": "light_plus_battery_cell", "ammo-item": "battery", "charges": 150, "container-item": "portable_game" } ] }, "male": [ "briefs" ], @@ -2904,15 +2835,7 @@ ], "items": { "both": { - "items": [ - "survivor_vest", - "wsurvivor_suit", - "socks", - "boots_wsurvivor", - "hood_wsurvivor", - "gloves_wsurvivor", - "wristwatch" - ], + "items": [ "survivor_vest", "wsurvivor_suit", "socks", "boots_wsurvivor", "hood_wsurvivor", "gloves_wsurvivor", "wristwatch" ], "entries": [ { "item": "medium_battery_cell", "ammo-item": "battery", "charges": 500, "container-item": "mess_kit" }, { "item": "kukri", "container-item": "sheath" }, @@ -2994,7 +2917,12 @@ { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] }, { "item": "knife_combat", "container-item": "sheath" }, { "item": "m4a1", "ammo-item": "556", "contents-item": "shoulder_strap" }, - { "item": "medium_plus_battery_cell", "ammo-item": "battery", "charges": 600, "container-item": "mil_mess_kit" }, + { + "item": "medium_plus_battery_cell", + "ammo-item": "battery", + "charges": 600, + "container-item": "mil_mess_kit" + }, { "group": "charged_two_way_radio" }, { "item": "chestrig", "contents-group": "army_mags_m4" } ] @@ -3155,17 +3083,12 @@ "points": 0, "items": { "both": { - "items": [ - "pants", - "socks", - "boots", - "longshirt", - "jacket_light", - "baton", - "pockknife", - "wristwatch" - ], - "entries": [ { "group": "charged_cell_phone" }, { "group": "charged_flashlight" }, { "item": "medium_disposable_cell", "ammo-item": "battery", "charges": 1200, "container-item": "tazer" } ] + "items": [ "pants", "socks", "boots", "longshirt", "jacket_light", "baton", "pockknife", "wristwatch" ], + "entries": [ + { "group": "charged_cell_phone" }, + { "group": "charged_flashlight" }, + { "item": "medium_disposable_cell", "ammo-item": "battery", "charges": 1200, "container-item": "tazer" } + ] }, "male": [ "boxer_shorts" ], "female": [ "bra", "boy_shorts" ] @@ -3268,18 +3191,22 @@ }, "male": { "items": [ - "knee_high_boots", - "breeches", - "waistcoat", - "peacoat", - "leather_belt", - "knit_scarf", - "tricorne", - "hatchet", - "hardtack" + "knee_high_boots", + "breeches", + "waistcoat", + "peacoat", + "leather_belt", + "knit_scarf", + "tricorne", + "hatchet", + "hardtack" ], - "entries": [ { "item": "rifle_flintlock", "ammo-item": "flintlock_ammo", "charges": 1, "contents-item": "shoulder_strap" }, { "item": "flintlock_ammo", "charges": 14, "container-item": "flintlock_pouch" }, { "item": "flintlock_ammo", "charges": 15 } ] - }, + "entries": [ + { "item": "rifle_flintlock", "ammo-item": "flintlock_ammo", "charges": 1, "contents-item": "shoulder_strap" }, + { "item": "flintlock_ammo", "charges": 14, "container-item": "flintlock_pouch" }, + { "item": "flintlock_ammo", "charges": 15 } + ] + }, "female": [ "dress", "apron_leather", @@ -3329,18 +3256,22 @@ ], "female": { "items": [ - "knee_high_boots", - "breeches", - "waistcoat", - "peacoat", - "leather_belt", - "knit_scarf", - "tricorne", - "hatchet", - "hardtack" + "knee_high_boots", + "breeches", + "waistcoat", + "peacoat", + "leather_belt", + "knit_scarf", + "tricorne", + "hatchet", + "hardtack" ], - "entries": [ { "item": "rifle_flintlock", "ammo-item": "flintlock_ammo", "charges": 1, "contents-item": "shoulder_strap" }, { "item": "flintlock_ammo", "charges": 14, "container-item": "flintlock_pouch" }, { "item": "flintlock_ammo", "charges": 15 } ] - } + "entries": [ + { "item": "rifle_flintlock", "ammo-item": "flintlock_ammo", "charges": 1, "contents-item": "shoulder_strap" }, + { "item": "flintlock_ammo", "charges": 14, "container-item": "flintlock_pouch" }, + { "item": "flintlock_ammo", "charges": 15 } + ] + } } }, { @@ -3571,7 +3502,10 @@ "items": { "both": { "items": [ "pants", "dress_shirt", "blazer", "socks", "dress_shoes", "wristwatch" ], - "entries": [ { "group": "charged_cell_phone" }, { "item": "light_disposable_cell", "ammo-item": "battery", "charges": 300, "container-item": "camera_pro" } ] + "entries": [ + { "group": "charged_cell_phone" }, + { "item": "light_disposable_cell", "ammo-item": "battery", "charges": 300, "container-item": "camera_pro" } + ] }, "male": [ "boxer_shorts" ], "female": [ "boy_shorts", "bra" ] diff --git a/data/mods/Aftershock/player/afs_professions.json b/data/mods/Aftershock/player/afs_professions.json index 5fcee5211564c..cafb48ea69dd8 100644 --- a/data/mods/Aftershock/player/afs_professions.json +++ b/data/mods/Aftershock/player/afs_professions.json @@ -43,7 +43,7 @@ "sneakers", "smart_phone" ], - "entries": [ { "item": "light_plus_battery_cell", "ammo-item": "battery", "charges": 150, "container-item": "eink_tablet_pc"} ], + "entries": [ { "item": "light_plus_battery_cell", "ammo-item": "battery", "charges": 150, "container-item": "eink_tablet_pc" } ], "male": [ "briefs" ], "female": [ "bra", "panties" ] } diff --git a/data/mods/more_classes_scenarios/cs_classes.json b/data/mods/more_classes_scenarios/cs_classes.json index 55a9c64e7bd6c..37e9a15a3a98b 100644 --- a/data/mods/more_classes_scenarios/cs_classes.json +++ b/data/mods/more_classes_scenarios/cs_classes.json @@ -153,7 +153,10 @@ "fruit_leather", "suitcase_m" ], - "entries": [ { "group": "charged_cell_phone" }, { "item": "medium_battery_cell", "ammo-item": "battery", "charges": 500, "container-item": "mess_kit" } ] + "entries": [ + { "group": "charged_cell_phone" }, + { "item": "medium_battery_cell", "ammo-item": "battery", "charges": 500, "container-item": "mess_kit" } + ] }, "male": [ "boxer_shorts" ], "female": [ "bra", "panties" ] @@ -349,15 +352,7 @@ "skills": [ { "level": 1, "name": "mechanics" } ], "items": { "both": { - "items": [ - "socks", - "goggles_welding", - "jumpsuit", - "gloves_work", - "boots_steel", - "tool_belt", - "apron_leather" - ], + "items": [ "socks", "goggles_welding", "jumpsuit", "gloves_work", "boots_steel", "tool_belt", "apron_leather" ], "entries": [ { "item": "tinyweldtank", "ammo-item": "oxyacetylene", "charges": 60, "container-item": "oxy_torch" }, { "item": "light_battery_cell", "ammo-item": "battery", "charges": 100, "container-item": "wearable_light" } From 92d5b4f0b05284856743fad3df6352afa8282300 Mon Sep 17 00:00:00 2001 From: LaVeyanFiend Date: Mon, 9 Sep 2019 23:50:17 -0400 Subject: [PATCH 12/13] charged_tazer item group --- data/json/professions.json | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/data/json/professions.json b/data/json/professions.json index c2c0d508912d2..a08ff6f57435b 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -35,6 +35,12 @@ "id": "charged_two_way_radio", "entries": [ { "item": "light_disposable_cell", "ammo-item": "battery", "charges": 300, "container-item": "two_way_radio" } ] }, + { + "type": "item_group", + "subtype": "collection", + "id": "charged_tazer", + "entries": [ { "item": "medium_disposable_cell", "ammo-item": "battery", "charges": 1200, "container-item": "tazer" } ] + }, { "type": "item_group", "subtype": "collection", @@ -1160,7 +1166,7 @@ { "item": "usp_45", "ammo-item": "45_acp", "charges": 12, "container-item": "holster" }, { "item": "legpouch_large", "contents-group": "army_mags_usp45" }, { "item": "tonfa", "container-item": "police_belt" }, - { "item": "medium_disposable_cell", "ammo-item": "battery", "charges": 1200, "container-item": "tazer" } + { "group": "charged_tazer" } ] }, "male": [ "boxer_shorts" ], @@ -3084,11 +3090,7 @@ "items": { "both": { "items": [ "pants", "socks", "boots", "longshirt", "jacket_light", "baton", "pockknife", "wristwatch" ], - "entries": [ - { "group": "charged_cell_phone" }, - { "group": "charged_flashlight" }, - { "item": "medium_disposable_cell", "ammo-item": "battery", "charges": 1200, "container-item": "tazer" } - ] + "entries": [ { "group": "charged_cell_phone" }, { "group": "charged_flashlight" }, { "group": "charged_tazer" } ] }, "male": [ "boxer_shorts" ], "female": [ "bra", "boy_shorts" ] From caa0ba0abdb5482c6d6caa19442c68cdef8a8b3e Mon Sep 17 00:00:00 2001 From: LaVeyanFiend Date: Tue, 10 Sep 2019 01:56:19 -0400 Subject: [PATCH 13/13] Remove extra tablet --- data/mods/Aftershock/player/afs_professions.json | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/data/mods/Aftershock/player/afs_professions.json b/data/mods/Aftershock/player/afs_professions.json index cafb48ea69dd8..a42b13cf739a2 100644 --- a/data/mods/Aftershock/player/afs_professions.json +++ b/data/mods/Aftershock/player/afs_professions.json @@ -32,17 +32,7 @@ "points": 2, "skills": [ { "level": 5, "name": "computer" } ], "items": { - "both": [ - "laptop", - "software_useless", - "eink_tablet_pc", - "linuxtshirt", - "pants_cargo", - "socks", - "slingpack", - "sneakers", - "smart_phone" - ], + "both": [ "laptop", "software_useless", "linuxtshirt", "pants_cargo", "socks", "slingpack", "sneakers", "smart_phone" ], "entries": [ { "item": "light_plus_battery_cell", "ammo-item": "battery", "charges": 150, "container-item": "eink_tablet_pc" } ], "male": [ "briefs" ], "female": [ "bra", "panties" ]