From 4e0d13d5d026230b5f8edd6d58addcf64d28fc32 Mon Sep 17 00:00:00 2001 From: Chaosvolt Date: Sat, 16 Sep 2023 11:35:00 -0500 Subject: [PATCH 1/2] Commit for remote I'll do the DDA version in a bit weh --- .../Char_creation/c_classes_r.json | 32 ++++++++++++++++++- .../Char_creation/c_scenarios.json | 25 ++++++++++++--- nocts_cata_mod_BN/Surv_help/c_armor.json | 2 +- nocts_cata_mod_BN/Weapons/c_mods.json | 1 + 4 files changed, 53 insertions(+), 7 deletions(-) diff --git a/nocts_cata_mod_BN/Char_creation/c_classes_r.json b/nocts_cata_mod_BN/Char_creation/c_classes_r.json index 50287480..c17b36e4 100644 --- a/nocts_cata_mod_BN/Char_creation/c_classes_r.json +++ b/nocts_cata_mod_BN/Char_creation/c_classes_r.json @@ -131,7 +131,7 @@ "boots_plate_surv", "helmet_plate_surv", "gloves_plate_surv", - "shield_leather_large", + "shield_riot_surv", "backpack_leather", "waterskin", "flint_steel", @@ -146,6 +146,36 @@ }, "flags": [ "SCEN_ONLY" ] }, + { + "type": "profession", + "id": "surv_techno_barbarian", + "name": "Wasteland Techno-Barbarian", + "description": "The end of the world brings out the best and worst in everyone. For you, it was a chance to channel your pre-Cataclysm expertise into something more primal. Whether you have the might to use such armament remains to be seen.", + "points": 12, + "skills": [ + { "level": 6, "name": "fabrication" }, + { "level": 4, "name": "mechanics" }, + { "level": 2, "name": "electronics" }, + { "level": 2, "name": "cooking" }, + { "level": 3, "name": "survival" }, + { "level": 1, "name": "melee" }, + { "level": 1, "name": "bashing" }, + { "level": 1, "name": "cutting" } + ], + "items": { + "both": { + "ammo": 100, + "items": [ "loincloth", "footrags", "backpack", "waterskin", "flint_steel", "clay_pot", "press_dowel", "puller" ], + "entries": [ + { "item": "c_power_armor_surv", "ammo-item": "lamp_oil", "charges": 2000 }, + { "item": "greatsword_makeshift", "custom-flags": [ "auto_wield" ] }, + { "item": "makeshift_knife", "container-item": "sheath" } + ] + }, + "female": [ "chestwrap" ] + }, + "flags": [ "SCEN_ONLY" ] + }, { "type": "profession", "id": "bionic_silencer", diff --git a/nocts_cata_mod_BN/Char_creation/c_scenarios.json b/nocts_cata_mod_BN/Char_creation/c_scenarios.json index ea9eb332..884b24d3 100644 --- a/nocts_cata_mod_BN/Char_creation/c_scenarios.json +++ b/nocts_cata_mod_BN/Char_creation/c_scenarios.json @@ -44,7 +44,20 @@ "points": 2, "start_name": "Boarded Up House", "allowed_locs": [ "sloc_house_boarded" ], - "professions": [ "survivalist", "jr_survivalist", "bionic_prepper", "prepper", "fisher", "camper", "groundskeeper", "blacksmith" ], + "professions": [ + "survivalist", + "jr_survivalist", + "bionic_prepper", + "prepper", + "fisher", + "camper", + "groundskeeper", + "blacksmith", + "bionic_silencer", + "surv_drifter", + "surv_knight_errant", + "surv_techno_barbarian" + ], "traits": [ "MARTIAL_ARTS_SURV_COM" ] }, { @@ -136,7 +149,8 @@ "bio_knight", "bio_tool", "surv_drifter", - "surv_knight_errant" + "surv_knight_errant", + "surv_techno_barbarian" ] } }, @@ -156,7 +170,8 @@ "bio_knight", "bio_tool", "surv_drifter", - "surv_knight_errant" + "surv_knight_errant", + "surv_techno_barbarian" ] } }, @@ -170,7 +185,7 @@ "copy-from": "wilderness", "type": "scenario", "add_professions": true, - "extend": { "allowed_locs": [ "surv_camp_l" ], "professions": [ "surv_drifter", "surv_knight_errant" ] }, + "extend": { "allowed_locs": [ "surv_camp_l" ], "professions": [ "surv_drifter", "surv_knight_errant", "surv_techno_barbarian" ] }, "id": "wilderness" }, { @@ -219,7 +234,7 @@ "copy-from": "surrounded", "type": "scenario", "add_professions": true, - "extend": { "allowed_locs": [ "sloc_mansion" ], "professions": [ "surv_drifter", "surv_knight_errant" ] }, + "extend": { "allowed_locs": [ "sloc_mansion" ], "professions": [ "surv_drifter", "surv_knight_errant", "surv_techno_barbarian" ] }, "id": "surrounded" }, { diff --git a/nocts_cata_mod_BN/Surv_help/c_armor.json b/nocts_cata_mod_BN/Surv_help/c_armor.json index 422f3946..08b05e7b 100644 --- a/nocts_cata_mod_BN/Surv_help/c_armor.json +++ b/nocts_cata_mod_BN/Surv_help/c_armor.json @@ -893,7 +893,7 @@ "holster_msg": "You stash your %s.", "multi": 4, "min_volume": "50 ml", - "max_volume": "1750 ml", + "max_volume": "2 L", "skills": [ "pistol", "smg", "shotgun", "rifle" ], "draw_cost": 75, "flags": [ "SHEATH_KNIFE", "BELT_CLIP", "SHEATH_SWORD", "MAG_COMPACT", "MAG_BULKY", "SPEEDLOADER" ] diff --git a/nocts_cata_mod_BN/Weapons/c_mods.json b/nocts_cata_mod_BN/Weapons/c_mods.json index 13c14aa1..d8b4d530 100644 --- a/nocts_cata_mod_BN/Weapons/c_mods.json +++ b/nocts_cata_mod_BN/Weapons/c_mods.json @@ -191,6 +191,7 @@ [ "FLAMETHROWERS" ] ], "volume": "250 ml", + "integral_volume": "125 ml", "price": "850 USD", "price_postapoc": "850 cent", "install_time": "30 m", From 4b17e2acfffeccd143125e40160195c15733eb6c Mon Sep 17 00:00:00 2001 From: Chaosvolt Date: Sat, 16 Sep 2023 12:11:48 -0500 Subject: [PATCH 2/2] And do the thing --- .../Char_creation/c_classes_r.json | 2 +- .../Char_creation/c_classes_r.json | 31 +++++++++++++++++++ .../Char_creation/c_scenarios.json | 24 +++++++++++--- nocts_cata_mod_DDA/Surv_help/c_armor.json | 8 ++--- nocts_cata_mod_DDA/Weapons/c_mods.json | 1 + 5 files changed, 56 insertions(+), 10 deletions(-) diff --git a/nocts_cata_mod_BN/Char_creation/c_classes_r.json b/nocts_cata_mod_BN/Char_creation/c_classes_r.json index c17b36e4..7845f96d 100644 --- a/nocts_cata_mod_BN/Char_creation/c_classes_r.json +++ b/nocts_cata_mod_BN/Char_creation/c_classes_r.json @@ -165,7 +165,7 @@ "items": { "both": { "ammo": 100, - "items": [ "loincloth", "footrags", "backpack", "waterskin", "flint_steel", "clay_pot", "press_dowel", "puller" ], + "items": [ "loincloth", "footrags", "backpack", "waterskin", "flint_steel", "clay_pot" ], "entries": [ { "item": "c_power_armor_surv", "ammo-item": "lamp_oil", "charges": 2000 }, { "item": "greatsword_makeshift", "custom-flags": [ "auto_wield" ] }, diff --git a/nocts_cata_mod_DDA/Char_creation/c_classes_r.json b/nocts_cata_mod_DDA/Char_creation/c_classes_r.json index 9eeda82f..27db5700 100644 --- a/nocts_cata_mod_DDA/Char_creation/c_classes_r.json +++ b/nocts_cata_mod_DDA/Char_creation/c_classes_r.json @@ -163,6 +163,37 @@ }, "flags": [ "SCEN_ONLY" ] }, + { + "type": "profession", + "id": "surv_techno_barbarian", + "name": "Wasteland Techno-Barbarian", + "description": "The end of the world brings out the best and worst in everyone. For you, it was a chance to channel your pre-Cataclysm expertise into something more primal. Whether you have the might to use such armament remains to be seen.", + "points": 12, + "skills": [ + { "level": 6, "name": "fabrication" }, + { "level": 4, "name": "mechanics" }, + { "level": 2, "name": "electronics" }, + { "level": 2, "name": "cooking" }, + { "level": 3, "name": "survival" }, + { "level": 1, "name": "melee" }, + { "level": 1, "name": "bashing" }, + { "level": 1, "name": "cutting" } + ], + "proficiencies": [ "prof_metalworking", "prof_intro_chemistry" ], + "items": { + "both": { + "ammo": 100, + "items": [ "loincloth", "footrags", "backpack", "waterskin", "flint_steel", "clay_pot" ], + "entries": [ + { "item": "c_power_armor_surv", "ammo-item": "lamp_oil", "charges": 2000 }, + { "item": "greatsword_makeshift", "custom-flags": [ "auto_wield" ] }, + { "item": "makeshift_knife", "container-item": "sheath" } + ] + }, + "female": [ "chestwrap" ] + }, + "flags": [ "SCEN_ONLY" ] + }, { "type": "profession", "id": "bionic_silencer", diff --git a/nocts_cata_mod_DDA/Char_creation/c_scenarios.json b/nocts_cata_mod_DDA/Char_creation/c_scenarios.json index a80a806c..07596736 100644 --- a/nocts_cata_mod_DDA/Char_creation/c_scenarios.json +++ b/nocts_cata_mod_DDA/Char_creation/c_scenarios.json @@ -59,7 +59,19 @@ "points": 2, "start_name": "Boarded Up House", "allowed_locs": [ "sloc_house_boarded" ], - "professions": [ "survivalist", "jr_survivalist", "prepper", "fisher", "birder", "groundskeeper", "blacksmith" ], + "professions": [ + "survivalist", + "jr_survivalist", + "prepper", + "fisher", + "birder", + "groundskeeper", + "blacksmith", + "bionic_silencer", + "surv_drifter", + "surv_knight_errant", + "surv_techno_barbarian" + ], "traits": [ "MARTIAL_ARTS_SURV_COM" ] }, { @@ -151,7 +163,8 @@ "bio_knight", "bio_tool", "surv_drifter", - "surv_knight_errant" + "surv_knight_errant", + "surv_techno_barbarian" ] } }, @@ -171,7 +184,8 @@ "bio_knight", "bio_tool", "surv_drifter", - "surv_knight_errant" + "surv_knight_errant", + "surv_techno_barbarian" ] } }, @@ -179,7 +193,7 @@ "copy-from": "wilderness", "type": "scenario", "add_professions": true, - "extend": { "allowed_locs": [ "surv_camp_l" ], "professions": [ "surv_drifter", "surv_knight_errant" ] }, + "extend": { "allowed_locs": [ "surv_camp_l" ], "professions": [ "surv_drifter", "surv_knight_errant", "surv_techno_barbarian" ] }, "id": "wilderness" }, { @@ -219,7 +233,7 @@ "copy-from": "surrounded", "type": "scenario", "add_professions": true, - "extend": { "allowed_locs": [ "sloc_mansion" ], "professions": [ "surv_drifter", "surv_knight_errant" ] }, + "extend": { "allowed_locs": [ "sloc_mansion" ], "professions": [ "surv_drifter", "surv_knight_errant", "surv_techno_barbarian" ] }, "id": "surrounded" }, { diff --git a/nocts_cata_mod_DDA/Surv_help/c_armor.json b/nocts_cata_mod_DDA/Surv_help/c_armor.json index 1d25ce65..2781c5bc 100644 --- a/nocts_cata_mod_DDA/Surv_help/c_armor.json +++ b/nocts_cata_mod_DDA/Surv_help/c_armor.json @@ -966,7 +966,7 @@ { "moves": 75, "min_volume": "50 ml", - "max_contains_volume": "1500 ml", + "max_contains_volume": "2 L", "max_contains_weight": "5 kg", "max_item_length": "762 mm", "skills": [ "pistol", "smg", "shotgun", "rifle" ], @@ -975,7 +975,7 @@ { "moves": 75, "min_volume": "50 ml", - "max_contains_volume": "1500 ml", + "max_contains_volume": "2 L", "max_contains_weight": "5 kg", "max_item_length": "762 mm", "skills": [ "pistol", "smg", "shotgun", "rifle" ], @@ -984,7 +984,7 @@ { "moves": 75, "min_volume": "50 ml", - "max_contains_volume": "1500 ml", + "max_contains_volume": "2 L", "max_contains_weight": "5 kg", "max_item_length": "762 mm", "holster": true, @@ -993,7 +993,7 @@ { "moves": 75, "min_volume": "50 ml", - "max_contains_volume": "1500 ml", + "max_contains_volume": "2 L", "max_contains_weight": "5 kg", "max_item_length": "762 mm", "holster": true, diff --git a/nocts_cata_mod_DDA/Weapons/c_mods.json b/nocts_cata_mod_DDA/Weapons/c_mods.json index 974d6b48..65cbbdc8 100644 --- a/nocts_cata_mod_DDA/Weapons/c_mods.json +++ b/nocts_cata_mod_DDA/Weapons/c_mods.json @@ -180,6 +180,7 @@ "material": [ "plastic", "steel" ], "mod_targets": [ "smg", "rifle", "pistol", "shotgun", "crossbow", "bow", "launcher" ], "volume": "250 ml", + "integral_volume": "125 ml", "price": "850 USD", "price_postapoc": "850 cent", "install_time": "30 m",