Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New profession and misc #552

Merged
merged 2 commits into from
Sep 16, 2023
+108 −16
Merged

New profession and misc #552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e0d13d
Commit for remote
chaosvolt Sep 16, 2023
4b17e2a
And do the thing
chaosvolt Sep 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 31 additions & 1 deletion nocts_cata_mod_BN/Char_creation/c_classes_r.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
"boots_plate_surv",
"helmet_plate_surv",
"gloves_plate_surv",
"shield_leather_large",
"shield_riot_surv",
"backpack_leather",
"waterskin",
"flint_steel",
Expand All @@ -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" ],
"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",
Expand Down
25 changes: 20 additions & 5 deletions nocts_cata_mod_BN/Char_creation/c_scenarios.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
},
{
Expand Down Expand Up @@ -136,7 +149,8 @@
"bio_knight",
"bio_tool",
"surv_drifter",
"surv_knight_errant"
"surv_knight_errant",
"surv_techno_barbarian"
]
}
},
Expand All @@ -156,7 +170,8 @@
"bio_knight",
"bio_tool",
"surv_drifter",
"surv_knight_errant"
"surv_knight_errant",
"surv_techno_barbarian"
]
}
},
Expand All @@ -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"
},
{
Expand Down Expand Up @@ -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"
},
{
Expand Down
2 changes: 1 addition & 1 deletion nocts_cata_mod_BN/Surv_help/c_armor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
Expand Down
1 change: 1 addition & 0 deletions nocts_cata_mod_BN/Weapons/c_mods.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@
[ "FLAMETHROWERS" ]
],
"volume": "250 ml",
"integral_volume": "125 ml",
"price": "850 USD",
"price_postapoc": "850 cent",
"install_time": "30 m",
Expand Down
31 changes: 31 additions & 0 deletions nocts_cata_mod_DDA/Char_creation/c_classes_r.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
24 changes: 19 additions & 5 deletions nocts_cata_mod_DDA/Char_creation/c_scenarios.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
},
{
Expand Down Expand Up @@ -151,7 +163,8 @@
"bio_knight",
"bio_tool",
"surv_drifter",
"surv_knight_errant"
"surv_knight_errant",
"surv_techno_barbarian"
]
}
},
Expand All @@ -171,15 +184,16 @@
"bio_knight",
"bio_tool",
"surv_drifter",
"surv_knight_errant"
"surv_knight_errant",
"surv_techno_barbarian"
]
}
},
{
"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"
},
{
Expand Down Expand Up @@ -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"
},
{
Expand Down
8 changes: 4 additions & 4 deletions nocts_cata_mod_DDA/Surv_help/c_armor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ],
Expand All @@ -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" ],
Expand All @@ -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,
Expand All @@ -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,
Expand Down
1 change: 1 addition & 0 deletions nocts_cata_mod_DDA/Weapons/c_mods.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down