Skip to content

Commit

Permalink
Remove professions with survivor armor & change Rescuer's armor (#35844)
Browse files Browse the repository at this point in the history 
* Remove professions with survivor armor, change Rescuer to fur armor

* Remove obsoleted profs from scenario options

* Obsolete collections, give rescuer utility vest for magazines
  • Loading branch information
@ZhilkinSerg
LaVeyanFiend authored and ZhilkinSerg committed Dec 4, 2019
1 parent 940cf72 commit b40b704
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 223 deletions.
205 changes: 2 additions & 203 deletions data/json/professions.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,6 @@
{ "item": "glock17_22", "ammo-item": "9mmfmj", "charges": 22 }
]
},
{
"type": "item_group",
"subtype": "collection",
"id": "shotgun_d_roadwarrior",
"entries": [ { "item": "shotgun_d", "ammo-item": "reloaded_shot_00", "contents-item": [ "barrel_small" ] } ]
},
{
"type": "item_group",
"subtype": "collection",
Expand Down Expand Up @@ -148,30 +142,6 @@
"id": "bandolier_ww_gunslinger",
"entries": [ { "item": "45colt_jhp", "charges": 18 } ]
},
{
"type": "item_group",
"subtype": "collection",
"id": "quiver_winter_surivor",
"entries": [ { "item": "bolt_wood", "charges": 29 } ]
},
{
"type": "item_group",
"subtype": "collection",
"id": "bandolier_roadwarrior",
"entries": [ { "item": "reloaded_shot_00", "charges": 18 } ]
},
{
"type": "item_group",
"subtype": "collection",
"id": "bandolier_waste_ranger",
"entries": [ { "item": "reloaded_shot_00", "charges": 19 } ]
},
{
"type": "item_group",
"subtype": "collection",
"id": "quiver_waste_ranger",
"entries": [ { "item": "bolt_steel", "charges": 12 } ]
},
{
"type": "profession_item_substitutions",
"substitutions": [
Expand Down Expand Up @@ -805,10 +775,10 @@
],
"items": {
"both": {
"items": [ "wsurvivor_suit", "socks", "boots_wsurvivor", "hood_wsurvivor", "gloves_wsurvivor", "wristwatch" ],
"items": [ "armor_farmor", "socks", "boots_fur", "hat_fur", "gloves_fur", "vest", "wristwatch" ],
"entries": [
{ "item": "knife_combat", "container-item": "sheath" },
{ "item": "m4a1", "ammo-item": "556", "charges": 30, "container-item": "survivor_vest" },
{ "item": "m4a1", "ammo-item": "556", "charges": 30, "container-item": "back_holster" },
{ "item": "stanag30", "ammo-item": "556", "charges": 30 },
{ "item": "stanag30", "ammo-item": "556", "charges": 30 },
{ "item": "stanag30", "ammo-item": "556", "charges": 30 }
Expand Down Expand Up @@ -2937,34 +2907,6 @@
"female": [ "bra", "panties" ]
}
},
{
"type": "profession",
"ident": "winter_survivor",
"name": "Hardened Survivor",
"description": "One of the lucky few who escaped the cataclysm, you made a life for yourself living off nature's bounties and what you could get outside the death traps of the large city.",
"points": 6,
"skills": [
{ "level": 5, "name": "survival" },
{ "level": 5, "name": "fabrication" },
{ "level": 5, "name": "melee" },
{ "level": 4, "name": "tailor" },
{ "level": 3, "name": "rifle" }
],
"items": {
"both": {
"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" },
{ "item": "crossbow", "ammo-item": "bolt_wood", "charges": 1, "contents-item": "shoulder_strap" },
{ "item": "quiver_large", "contents-group": "quiver_winter_surivor" }
]
},
"male": [ "boxer_shorts" ],
"female": [ "sports_bra", "panties" ]
},
"flags": [ "SCEN_ONLY" ]
},
{
"type": "profession",
"ident": "winter_scavenger",
Expand Down Expand Up @@ -3049,149 +2991,6 @@
},
"flags": [ "SCEN_ONLY" ]
},
{
"type": "profession",
"ident": "road_warrior",
"name": "Road Warrior",
"description": "You lived by your wheels during the first few months of the apocalypse, but now your car is lost to this maelstrom of decay, your ammo is low, and your situation is dire. You've been reduced to a scavenger, living off the corpse of the old world.",
"points": 6,
"skills": [
{ "level": 5, "name": "driving" },
{ "level": 3, "name": "mechanics" },
{ "level": 2, "name": "survival" },
{ "level": 2, "name": "gun" },
{ "level": 1, "name": "shotgun" },
{ "level": 1, "name": "melee" },
{ "level": 1, "name": "unarmed" },
{ "level": 1, "name": "firstaid" }
],
"items": {
"both": {
"items": [
"tank_top",
"pants_leather",
"jacket_leather_mod",
"boots_steel",
"gloves_fingerless_mod",
"hat_cotton",
"survivor_goggles",
"long_patchwork_scarf",
"survivor_belt",
"legrig",
"canteen",
"whistle",
"binoculars",
"duct_tape",
"ref_lighter",
"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": "bandolier_shotgun", "contents-group": "bandolier_roadwarrior" },
{ "item": "light_battery_cell", "charges": 100, "container-item": "wearable_light" }
]
},
"male": [ "boxer_shorts" ],
"female": [ "sports_bra", "boy_shorts" ]
},
"flags": [ "SCEN_ONLY" ]
},
{
"type": "profession",
"ident": "waste_ranger",
"name": "Wasteland Ranger",
"description": "If the human race is to survive, the threats facing its existence must be eliminated, no matter the cost. If it's hostile, you kill it.",
"points": 6,
"skills": [
{ "level": 3, "name": "survival" },
{ "level": 3, "name": "gun" },
{ "level": 2, "name": "rifle" },
{ "level": 1, "name": "dodge" },
{ "level": 1, "name": "melee" },
{ "level": 1, "name": "pistol" },
{ "level": 1, "name": "stabbing" }
],
"items": {
"both": {
"ammo": 100,
"items": [
"lsurvivor_suit",
"boots_lsurvivor",
"gloves_lsurvivor",
"mask_lsurvivor",
"hood_lsurvivor",
"canteen",
"wearable_light",
"throwing_knife",
"wristwatch",
"ref_lighter"
],
"entries": [
{ "item": "knife_trench", "container-item": "sheath" },
{ "item": "ashot", "ammo-item": "reloaded_shot_00", "container-item": "holster" },
{ "item": "bandolier_shotgun", "contents-group": "bandolier_waste_ranger" },
{ "item": "helsing", "ammo-item": "bolt_steel", "contents-item": "shoulder_strap" },
{ "item": "quiver", "contents-group": "quiver_waste_ranger" },
{ "item": "survivor_mess_kit", "charges": [ 20, 30 ] }
]
},
"male": [ "boxer_shorts" ],
"female": [ "sports_bra", "boy_shorts" ]
},
"flags": [ "SCEN_ONLY" ]
},
{
"type": "profession",
"ident": "player_bandit",
"name": "Veteran Bandit",
"description": "After the cities exploded there was a whirlwind of looting; a firestorm of fear. Men began to feed on men. On the roads it was a white line nightmare. Only those mobile enough to scavenge or brutal enough to pillage would survive. You are one of the latter.",
"points": 6,
"skills": [
{ "level": 2, "name": "gun" },
{ "level": 2, "name": "rifle" },
{ "level": 2, "name": "melee" },
{ "level": 2, "name": "cutting" },
{ "level": 2, "name": "unarmed" },
{ "level": 2, "name": "dodge" },
{ "level": 1, "name": "bashing" },
{ "level": 1, "name": "firstaid" },
{ "level": 1, "name": "survival" }
],
"items": {
"both": {
"items": [
"gold_ear",
"pants_survivor",
"motorbike_boots",
"gauntlets_larmor",
"survivor_goggles",
"combatnail",
"waterskin2",
"survivor_scope",
"heavy_flashlight",
"knuckle_steel",
"ref_lighter",
"wristwatch"
],
"entries": [
{
"item": "nailrifle",
"ammo-item": "combatnail",
"charges": 50,
"contents-item": [ "shoulder_strap", "folding_stock" ]
},
{ "item": "medium_battery_cell", "ammo-item": "battery", "charges": 500, "container-item": "mess_kit" },
{ "item": "makeshift_machete", "container-item": "scabbard" },
{ "item": "nailmag", "ammo-item": "combatnail", "charges": 50, "container-item": "chestpouch" }
]
},
"male": [ "football_armor", "elbow_pads", "bandana" ],
"female": [ "leather_collar", "halter_top", "corset", "vambrace_larmor", "long_knit_scarf_loose" ]
},
"flags": [ "SCEN_ONLY" ]
},
{
"type": "profession",
"ident": "mall_cop",
Expand Down
22 changes: 2 additions & 20 deletions data/json/scenarios.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,16 +275,7 @@
"start_name": "Outside Town",
"flags": [ "SUR_START", "WIN_START", "LONE_START" ],
"add_professions": true,
"professions": [
"sheltered_survivor",
"sheltered_militia",
"winter_survivor",
"winter_scavenger",
"winter_army",
"road_warrior",
"player_bandit",
"waste_ranger"
]
"professions": [ "sheltered_survivor", "sheltered_militia", "winter_scavenger", "winter_army" ]
},
{
"type": "scenario",
Expand All @@ -308,16 +299,7 @@
"start_name": "Outside Town",
"flags": [ "SUM_ADV_START", "LONE_START" ],
"add_professions": true,
"professions": [
"sheltered_survivor",
"sheltered_militia",
"winter_survivor",
"winter_scavenger",
"winter_army",
"road_warrior",
"player_bandit",
"waste_ranger"
]
"professions": [ "sheltered_survivor", "sheltered_militia", "winter_scavenger", "winter_army" ]
},
{
"type": "scenario",
Expand Down

0 comments on commit b40b704

Please sign in to comment.