Skip to content

Commit

Permalink
5
Browse files Browse the repository at this point in the history
  • Loading branch information
John-Candlebury committed Feb 7, 2025
1 parent f2eddd7 commit 6e7e17e
Show file tree
Hide file tree
Showing 5 changed files with 166 additions and 105 deletions.
4 changes: 2 additions & 2 deletions data/mods/Aftershock/items/armor/cyberpunk.json
Original file line number Diff line number Diff line change
Expand Up @@ -185,14 +185,14 @@
"material": [ "kevlar_layered" ],
"armor": [
{
"material": [ { "type": "kevlar_layered", "covered_by_mat": 100, "thickness": 1.0 } ],
"material": [ { "type": "kevlar", "covered_by_mat": 100, "thickness": 1 } ],
"encumbrance": [ 3, 6 ],
"coverage": 80,
"covers": [ "torso" ],
"specifically_covers": [ "torso_upper" ]
},
{
"material": [ { "type": "kevlar_layered", "covered_by_mat": 100, "thickness": 1.5 } ],
"material": [ { "type": "kevlar", "covered_by_mat": 100, "thickness": 3 } ],
"encumbrance": 5,
"coverage": 90,
"cover_vitals": 90,
Expand Down
3 changes: 2 additions & 1 deletion data/mods/Aftershock/items/armor/headsets.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,13 @@
"armor": [ { "encumbrance": 5, "coverage": 100, "covers": [ "eyes" ] } ],
"material_thickness": 1,
"environmental_protection": 15,
"flags": [ "MUNDANE", "BLIND", "OUTER", "FLASH_PROTECTION", "SUN_GLASSES", "PADDED" ]
"flags": [ "MUNDANE", "OUTER", "PADDED" ]
},
{
"id": "afs_combat_headset",
"type": "TOOL_ARMOR",
"category": "clothing",
"copy-from": "afs_combat_headset_off",
"name": { "str": "tactical infovisor" },
"description": "An armored black headset that coalesces the feeds of several sensors into a single screen display. It provides generalized assistance in combat, including targeting assistance for thrown and ranged weaponry, threat identification, conditional NV and thermal vision and protection against high intensity light sources.",
"relic_data": { "passive_effects": [ { "id": "nvg_great" }, { "id": "THERMAL_VISION_GOOD" }, { "id": "THERMAL_VISION_GOOD" } ] },
Expand Down
219 changes: 121 additions & 98 deletions data/mods/Aftershock/npcs/Independents/GENERIC/nc_solo.json
Original file line number Diff line number Diff line change
@@ -1,100 +1,123 @@
[
[
{
"type": "npc_class",
"id": "NC_SOLO",
"//": "Independent mercenaries with high quality combat gear and augments.",
"name": { "str": "Mercenary" },
"job_description": "Just fighting for the almighty dollar.",
"common": false,
"traits": [ { "group": "NPC_starting_traits" }, { "group": "Appearance_demographics" } ],
"bonus_str": { "rng": [ 8, 12 ] },
"bonus_dex": { "rng": [ 2, 6 ] },
"bonus_int": { "rng": [ -2, 2 ] },
"bonus_per": { "rng": [ 2, 6 ] },
"bionics": [
{ "id": "bio_armor_head", "chance": 3 },
{ "id": "bio_armor_torso", "chance": 15 },
{ "id": "bio_armor_arms", "chance": 30 },
{ "id": "bio_armor_legs", "chance": 25 },
{ "id": "bio_ears", "chance": 10 },
{ "id": "bio_dex_enhancer", "chance": 10 },
{ "id": "bio_tattoo_led", "chance": 10 },
{ "id": "bio_nanobots", "chance": 5 },
{ "id": "bio_power_storage_mkII", "chance": 5 },
{ "id": "bio_razors", "chance": 15 },
{ "id": "bio_painkiller", "chance": 15 },
{ "id": "bio_shield_medium", "chance": 10 },
{ "id": "bio_shield_weak", "chance": 10 },
{ "id": "afs_bio_deck", "chance": 5 },
{ "id": "afs_bio_blood_plus", "chance": 1 },
{ "id": "afs_bio_blood_brain", "chance": 1 }
],
"bonus_aggression": 100,
"bonus_bravery": 100,
"bonus_altruism": -10,
"worn_override": "NC_SOLO_worn",
"carry_override": "NC_SOLO_carry",
"weapon_override": "NC_SOLO_wield",
"skills": [
{ "skill": "ALL", "level": { "sum": [ { "dice": [ 3, 2 ] }, { "constant": -1 } ] } },
{ "skill": "fabrication", "bonus": { "rng": [ 4, 6 ] } },
{ "skill": "electronics", "bonus": { "rng": [ 4, 6 ] } },
{ "skill": "mechanics", "bonus": { "rng": [ 4, 6 ] } },
{ "skill": "gun", "bonus": { "rng": [ 4, 6 ] } },
{ "skill": "pistol", "bonus": { "rng": [ 4, 6 ] } },
{ "skill": "smg", "bonus": { "rng": [ 4, 6 ] } },
{ "skill": "rifle", "bonus": { "rng": [ 4, 6 ] } }
]
},
{
"type": "item_group",
"id": "NC_SOLO_worn",
"subtype": "collection",
"ammo": 100,
"magazine": 100,
"//": "Too cool to wear helmets (or much armor while at that). They make armor bionics for that.",
"items": [
{ "item": "afs_bolero", "prob": 20, "contents-group": "solo_bolero" },
{ "item": "afs_combat_cryo" },
{ "item": "afs_military_cloak", "prob": 20 },
{ "item": "boots_combat" },
{ "item": "gloves_tactical" },
{ "item": "under_armor" },
{ "item": "under_armor_shorts" }
]
},
{
"type": "item_group",
"id": "NC_UICA_GROUND_ENGINEER_carry",
"subtype": "collection",
"items": [
{ "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] },
{ "item": "afs_marsec_4", "charges": 14, "ammo-item": "afs_10mm_caseless_JHP" },
{ "item": "afs_10mm_caseless_JHP", "count": [ 1, 2 ] },
{ "item": "afs_sr77_45mag", "charges": 45, "ammo-item": "afs_7.50mm_caseless", "count": 2 },
{ "item": "afs_plasma_torch" }
]
},
{
"type": "item_group",
"id": "NC_UICA_GROUND_ENGINEER_wield",
"subtype": "collection",
"items": [
{
"item": "afs_sr77",
"variant": "branded",
"ammo-item": "afs_7.50mm_caseless",
"charges": 45,
"contents-item": [ "shoulder_strap", "recoil_stock", "compensator" ]
},
{
"item": "afs_marsec_t72",
"ammo-item": "afs_7.50mm_caseless",
"charges": 9,
"contents-item": [ "barrel_ported" ]
}
]
}
]
{
"type": "npc_class",
"id": "NC_AFS_SOLO",
"//": "Independent mercenaries with high quality combat gear and augments.",
"name": { "str": "Mercenary" },
"job_description": "Just fighting for the almighty dollar.",
"common": false,
"traits": [ { "group": "NPC_starting_traits" }, { "group": "Appearance_demographics" } ],
"bonus_str": { "rng": [ 8, 12 ] },
"bonus_dex": { "rng": [ 2, 6 ] },
"bonus_int": { "rng": [ -2, 2 ] },
"bonus_per": { "rng": [ 2, 6 ] },
"bionics": [
{ "id": "bio_armor_head", "chance": 70 },
{ "id": "bio_armor_torso", "chance": 55 },
{ "id": "bio_armor_arms", "chance": 70 },
{ "id": "bio_armor_legs", "chance": 55 },
{ "id": "bio_ears", "chance": 100 },
{ "id": "bio_dex_enhancer", "chance": 33 },
{ "id": "bio_tattoo_led", "chance": 80 },
{ "id": "bio_nanobots", "chance": 5 },
{ "id": "bio_torsionratchet", "chance": 100 },
{ "id": "bio_power_storage_mkII", "chance": 100 },
{ "id": "bio_power_storage_mkII", "chance": 100 },
{ "id": "bio_power_storage_mkII", "chance": 100 },
{ "id": "bio_razors", "chance": 15 },
{ "id": "bio_painkiller", "chance": 15 },
{ "id": "bio_shield_medium", "chance": 10 },
{ "id": "bio_microgen", "chance": 33 },
{ "id": "bio_shield_weak", "chance": 10 },
{ "id": "afs_bio_deck", "chance": 5 },
{ "id": "afs_bio_blood_plus", "chance": 1 },
{ "id": "afs_bio_blood_brain", "chance": 1 }
],
"bonus_aggression": 100,
"bonus_bravery": 100,
"bonus_altruism": -10,
"worn_override": "NC_SOLO_worn",
"carry_override": "NC_SOLO_carry",
"weapon_override": "NC_SOLO_wield",
"skills": [
{ "skill": "ALL", "level": { "sum": [ { "dice": [ 3, 2 ] } ] } },
{ "skill": "gun", "bonus": { "rng": [ 6, 8 ] } },
{ "skill": "pistol", "bonus": { "rng": [ 6, 8 ] } },
{ "skill": "smg", "bonus": { "rng": [ 6, 8 ] } },
{ "skill": "rifle", "bonus": { "rng": [ 6, 8 ] } }
]
},
{
"type": "item_group",
"id": "NC_SOLO_worn",
"subtype": "collection",
"ammo": 100,
"magazine": 100,
"//": "Too cool to wear helmets (or much armor while at that). They make armor bionics for that.",
"items": [
{ "item": "afs_combat_cryo" },
{ "group": "solo_jacket" },
{ "item": "boots_combat" },
{ "item": "under_armor" },
{ "item": "afs_combat_headset_off" },
{ "item": "afs_military_cloak", "prob": 20 },
{ "item": "under_armor_shorts" }
]
},
{
"type": "item_group",
"id": "solo_jacket",
"subtype": "distribution",
"items": [
{ "item": "afs_bolero", "prob": 20, "contents-group": "solo_bolero" },
{ "item": "afs_cyberpunk_bomber", "prob": 20 },
{ "item": "afs_leather_jacket", "prob": 20 },
{ "item": "afs_ilbe", "prob": 10, "contents-group": "solo_ilbe" }
]
},
{
"type": "item_group",
"id": "solo_bolero",
"subtype": "collection",
"items": [ { "item": "XL_holster" }, { "item": "gadget_pouch" } ]
},
{
"type": "item_group",
"id": "solo_ilbe",
"subtype": "collection",
"items": [ { "item": "XL_holster" }, { "item": "afs_grenade_pouch" }, { "item": "afs_triple_stacker_pouch" } ]
},
{
"type": "item_group",
"id": "NC_SOLO_carry",
"subtype": "collection",
"items": [
{ "item": "afs_UICASTA30", "charges": 30, "ammo-item": "afs_7.50mm_caseless", "count": 2 },
{ "item": "knife_folding" },
{ "group": "misc_smoking_legal", "prob": 33 },
{
"item": "afs_marsec_t72",
"ammo-item": "afs_7.50mm_caseless",
"charges": 9,
"contents-item": [ "barrel_ported" ],
"prob": 33
},
{ "item": "afs_HE_grenade", "count": 2, "prob": 40 },
{ "item": "afs_stimpack", "count": 3, "prob": 80 }
]
},
{
"type": "item_group",
"id": "NC_SOLO_wield",
"subtype": "collection",
"items": [
{
"item": "afs_gibrifle",
"variant": "branded",
"ammo-item": "afs_7.50mm_caseless",
"charges": 30,
"contents-item": [ "shoulder_strap", "recoil_stock", "compensator" ]
}
]
}
]
29 changes: 29 additions & 0 deletions data/mods/Aftershock/npcs/Independents/salvor_camp_solo.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
[
{
"type": "npc",
"id": "salvor_camp_solo",
"//": "A generic mercenary for decorative purposes.",
"name_suffix": "mercenary",
"class": "NC_AFS_SOLO",
"attitude": 0,
"mission": 8,
"chat": "TALK_SALVOR_CAMP_SOLO",
"faction": "independents"
},
{
"id": "TALK_SALVOR_CAMP_SOLO",
"type": "talk_topic",
"dynamic_line": [
"&<mypronoun> looks you up and down, sizing you up.",
"What do you want?",
"You lost or something?",
"Like what you see?",
"&<mypronoun> simply ignores you as they flick a spent cigarette into the snow.",
"Mind your own business.",
"&<mypronoun> gives you a dismissive look.",
"Piss off.",
"I'm not here to chat. What do you want?"

Check failure on line 25 in data/mods/Aftershock/npcs/Independents/salvor_camp_solo.json

View workflow job for this annotation

GitHub Actions / Basic Build and Test (Clang 10, Ubuntu, Curses)

(all_mods)=> insufficient spaces at this location. 2 required, but only 1 found. Suggested fix: insert " " At the following position (marked with caret) "&<mypronoun> gives you a dismissive look.", "Piss off.", "I'm not here to chat. What do you want?" ▲▲▲ ], "responses": [ { "text": "…", "topic": "TALK_DONE" } ]
],
"responses": [ { "text": "", "topic": "TALK_DONE" } ]
}
]
16 changes: 12 additions & 4 deletions data/mods/Aftershock/npcs/factions.json
Original file line number Diff line number Diff line change
Expand Up @@ -373,9 +373,18 @@
"known_by_u": true,
"size": 100,
"power": 100,
"currency": "",
"fac_food_supply": { "calories": 0, "vitamins": { } },
"wealth": 75000,
"currency": "money",
"price_rules": [
{ "item": "cash_card", "fixed_adj": 0 },
{ "item": "UICA_1d", "fixed_adj": 0 },
{ "item": "UICA_50d", "fixed_adj": 0 },
{ "item": "UICA_10d", "fixed_adj": 0 },
{ "item": "UICA_100d", "fixed_adj": 0 },
{ "item": "UICA_1000d", "fixed_adj": 0 },
{ "item": "UICA_10000d", "fixed_adj": 0 }
],
"fac_food_supply": { "calories": 62500000000000, "vitamins": { "iron": 2000000000, "calcium": 2000000000, "vitC": 2000000000 } },
"wealth": 62500000000000,
"relations": {
"free_merchants": {
"kill on sight": false,
Expand Down Expand Up @@ -457,7 +466,6 @@
"knows your voice": true
},
"hells_raiders": { "kill on sight": true },
"Prepnet_Phyle": { "kill on sight": true },
"marloss": { "kill on sight": true }
},
"description": "A loose group of salvors, mercenaries and frontiersmen working as free agents or in representation of interest groups too small or remote to have official presence in the system. Equally likely to cooperate among themselves as they are to fight each other."
Expand Down

0 comments on commit 6e7e17e

Please sign in to comment.