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

feat(content,mods/fuji_mpp): mainline a few more professions, add combat engineer #3783

Merged
merged 3 commits into from
Dec 2, 2023
Merged

feat(content,mods/fuji_mpp): mainline a few more professions, add combat engineer #3783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
754fd8b
Commit for remote
chaosvolt Nov 30, 2023
0b19b69
finish the thing
chaosvolt Nov 30, 2023
3ea516c
Merge remote-tracking branch 'upstream/upload' into profession-mainli…
chaosvolt Dec 1, 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
236 changes: 231 additions & 5 deletions data/json/professions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,32 @@
[
{
"type": "item_group",
"subtype": "collection",
"id": "army_grenadier_mods",
"entries": [
{ "item": "holo_sight" },
{ "item": "shoulder_strap" },
{ "item": "m203", "ammo-item": "40x46mm_m433", "charges": 1 }
]
},
{
"type": "item_group",
"subtype": "collection",
"id": "army_mags_m14",
"entries": [
{ "item": "m14mag", "ammo-item": "762_51", "charges": 20 },
{ "item": "m14mag", "ammo-item": "762_51", "charges": 20 }
]
},
{
"type": "item_group",
"subtype": "collection",
"id": "army_mags_m17",
"entries": [
{ "item": "p320mag_17rd_9x19mm", "ammo-item": "9mm", "charges": 17 },
{ "item": "p320mag_17rd_9x19mm", "ammo-item": "9mm", "charges": 17 }
]
},
{
"type": "item_group",
"subtype": "collection",
Expand Down Expand Up @@ -133,6 +161,12 @@
"id": "quiver_crossbow_hunter",
"entries": [ { "item": "bolt_metal", "charges": 9 } ]
},
{
"type": "item_group",
"subtype": "collection",
"id": "bandolier_grenadier",
"entries": [ { "item": "40x46mm_m433", "charges": 6 } ]
},
{
"type": "item_group",
"subtype": "collection",
Expand Down Expand Up @@ -831,7 +865,201 @@
]
},
"male": [ "boxer_shorts" ],
"female": [ "sports_bra", "boxer_shorts" ]
"female": [ "boy_shorts", "sports_bra" ]
}
},
{
"type": "profession",
"id": "mil_auto_rifleman",
"name": "Military Automatic Rifleman",
"description": "You were trained to lay down suppressing fire, and are armed accordingly. But they just seem to keep coming without end, you're not sure you have the firepower for this.",
"points": 5,
"traits": [ "PROF_MILITARY" ],
"skills": [
{ "level": 2, "name": "gun" },
{ "level": 2, "name": "rifle" },
{ "level": 2, "name": "melee" },
{ "level": 1, "name": "stabbing" },
{ "level": 1, "name": "dodge" }
],
"items": {
"both": {
"items": [
"pants_army",
"tshirt",
"jacket_army",
"helmet_liner",
"helmet_army",
"gloves_liner",
"gloves_tactical",
"socks",
"boots_combat",
"wristwatch",
"canteen",
"molle_pack"
],
"entries": [
{ "group": "charged_two_way_radio" },
{ "item": "modularvestceramic", "contents-group": "army_mags_m17" },
{ "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
{ "item": "e_tool", "container-item": "webbing_belt" },
{ "item": "knife_combat", "container-item": "sheath" },
{ "item": "grenadebandolier", "contents-item": [ "grenade", "grenade" ] },
{ "item": "m249", "ammo-item": "556", "charges": 200, "contents-item": [ "shoulder_strap", "acog_scope" ] },
{ "item": "m17", "ammo-item": "9mm", "charges": 17, "container-item": "holster" }
]
},
"male": [ "boxer_shorts" ],
"female": [ "boy_shorts", "sports_bra" ]
}
},
{
"type": "profession",
"id": "mil_grenadier",
"name": "Military Grenadier",
"description": "You were the one assigned the team's grenade launcher, something you thought was overkill for a stateside deployment at first. Now you're starting to wish you joined the Field Artillery Branch.",
"points": 5,
"traits": [ "PROF_MILITARY" ],
"skills": [
{ "level": 2, "name": "gun" },
{ "level": 1, "name": "rifle" },
{ "level": 1, "name": "launcher" },
{ "level": 2, "name": "melee" },
{ "level": 1, "name": "stabbing" },
{ "level": 1, "name": "dodge" }
],
"items": {
"both": {
"items": [
"pants_army",
"tshirt",
"jacket_army",
"helmet_liner",
"helmet_army",
"gloves_liner",
"gloves_tactical",
"socks",
"boots_combat",
"wristwatch",
"canteen",
"molle_pack"
],
"entries": [
{ "group": "charged_two_way_radio" },
{ "item": "modularvestceramic", "contents-group": "army_mags_m4" },
{ "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
{ "item": "e_tool", "container-item": "webbing_belt" },
{ "item": "knife_combat", "container-item": "sheath" },
{ "item": "grenade_pouch", "contents-group": "bandolier_grenadier" },
{ "item": "grenadebandolier", "contents-item": [ "grenade", "grenade" ] },
{ "item": "m4a1", "ammo-item": "556", "charges": 30, "contents-group": "army_grenadier_mods" }
]
},
"male": [ "boxer_shorts" ],
"female": [ "boy_shorts", "sports_bra" ]
}
},
{
"type": "profession",
"id": "mil_marksman",
"name": "Military Designated Marksman",
"description": "You aren't a dedicated sniper, but every squad needs someone who can handle targets beyond their effective range. Without the rest of your squad, things are getting too close quarters for your liking.",
"points": 5,
"traits": [ "PROF_MILITARY" ],
"skills": [
{ "level": 3, "name": "gun" },
{ "level": 2, "name": "rifle" },
{ "level": 2, "name": "melee" },
{ "level": 1, "name": "stabbing" },
{ "level": 1, "name": "dodge" }
],
"items": {
"both": {
"items": [
"pants_army",
"tshirt",
"jacket_army",
"helmet_liner",
"helmet_army",
"gloves_liner",
"gloves_tactical",
"socks",
"boots_combat",
"wristwatch",
"canteen",
"molle_pack"
],
"entries": [
{ "group": "charged_two_way_radio" },
{ "item": "modularvestceramic", "contents-group": "army_mags_m14" },
{ "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
{ "item": "e_tool", "container-item": "webbing_belt" },
{ "item": "knife_combat", "container-item": "sheath" },
{ "item": "grenadebandolier", "contents-item": [ "grenade", "grenade" ] },
{ "item": "legpouch_large", "contents-group": "army_mags_m17" },
{
"item": "m14ebr",
"ammo-item": "762_51",
"charges": 20,
"contents-item": [ "rifle_scope", "shoulder_strap", "bipod" ]
},
{ "item": "m17", "ammo-item": "9mm", "charges": 17, "container-item": "holster" }
]
},
"male": [ "boxer_shorts" ],
"female": [ "boy_shorts", "sports_bra" ]
}
},
{
"type": "profession",
"id": "prof_combat_engineer",
"name": "Combat Engineer",
"description": "Your military training focused on field fortifications and demolitions, along with the basics on modern autonomous defenses. You never expected to need that training on the home front, not that it's helped so far given the bots are all on free-fire mode.",
"points": 6,
"traits": [ "PROF_MILITARY" ],
"skills": [
{ "level": 2, "name": "fabrication" },
{ "level": 2, "name": "mechanics" },
{ "level": 2, "name": "electronics" },
{ "level": 2, "name": "computer" },
{ "level": 2, "name": "traps" },
{ "level": 2, "name": "gun" },
{ "level": 1, "name": "rifle" },
{ "level": 1, "name": "dodge" }
],
"items": {
"both": {
"items": [
"pants_army",
"tshirt",
"jacket_army",
"helmet_liner",
"helmet_army",
"gloves_liner",
"gloves_tactical",
"socks",
"boots_combat",
"wristwatch",
"canteen",
"molle_pack",
"hatchet",
"boltcutters",
"multitool"
],
"entries": [
{ "group": "charged_two_way_radio" },
{ "item": "webbing_belt", "contents-item": "e_tool" },
{ "item": "tinyweldtank", "ammo-item": "oxyacetylene", "charges": 60, "container-item": "oxy_torch" },
{ "item": "modularvestceramic", "contents-group": "army_mags_m4" },
{ "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
{ "item": "goggles_welding", "custom-flags": [ "no_auto_equip" ] },
{ "item": "knife_combat", "container-item": "sheath" },
{ "item": "m4a1", "ammo-item": "556", "charges": 30, "contents-item": [ "shoulder_strap", "holo_sight" ] },
{ "item": "c4", "count": 4 }
]
},
"male": [ "boxer_shorts" ],
"female": [ "boy_shorts", "sports_bra" ]
}
},
{
Expand Down Expand Up @@ -4559,15 +4787,13 @@
"gloves_tactical",
"helmet_army",
"jacket_army",
"webbing_belt",
"legpouch_large"
"webbing_belt"
],
"entries": [
{ "group": "charged_two_way_radio" },
{ "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
{ "item": "m17", "ammo-item": "9mm", "container-item": "holster", "charges": 17 },
{ "item": "p320mag_17rd_9x19mm", "ammo-item": "9mm", "charges": 17 },
{ "item": "p320mag_17rd_9x19mm", "ammo-item": "9mm", "charges": 17 }
{ "item": "legpouch_large", "contents-group": "army_mags_m17" }
]
},
"male": [ "boxer_shorts" ],
Expand Down
8 changes: 8 additions & 0 deletions data/json/scenarios.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,6 +579,10 @@
"allowed_locs": [ "sloc_field", "sloc_forest" ],
"professions": [
"soldier",
"mil_auto_rifleman",
"mil_grenadier",
"mil_marksman",
"prof_combat_engineer",
"specops",
"power_armor_soldier",
"bio_soldier",
Expand Down Expand Up @@ -664,6 +668,10 @@
"professions": [
"unemployed",
"soldier",
"mil_auto_rifleman",
"mil_grenadier",
"mil_marksman",
"prof_combat_engineer",
"specops",
"power_armor_soldier",
"bio_soldier",
Expand Down
Loading
Loading