From 5b0140ea759600eba364d4d1535d80f84ecb1d09 Mon Sep 17 00:00:00 2001 From: John Candlebury Date: Tue, 12 Mar 2024 07:41:00 -0600 Subject: [PATCH 1/9] Port Augustmoon Start --- data/mods/Aftershock/EOC/game_eoc.json | 30 +++++ .../itemgroups/spaceship_groups.json | 7 +- .../itemgroups/weapons/armories.json | 34 +++++- .../weapons/balistic_gun_groups.json | 10 ++ .../Aftershock/items/armor/cyberpunk.json | 12 ++ data/mods/Aftershock/items/gun/voltaic.json | 3 + data/mods/Aftershock/items/tools.json | 48 +++++++- .../Aftershock/maps/overmap_locations.json | 6 + data/mods/Aftershock/mutations/mutations.json | 10 ++ .../augustmoon_gun_trader.json | 21 +++- .../npcs/TALK_COMMON_OVERRIDES.json | 27 +++++ data/mods/Aftershock/player/hobbies.json | 36 ++++++ data/mods/Aftershock/player/professions.json | 110 +++++++++++++----- .../mods/Aftershock/player/proficiencies.json | 16 +++ data/mods/Aftershock/scenarios.json | 13 +++ .../scenario_blacklist.json | 2 +- 16 files changed, 349 insertions(+), 36 deletions(-) create mode 100644 data/mods/Aftershock/EOC/game_eoc.json create mode 100644 data/mods/Aftershock/npcs/TALK_COMMON_OVERRIDES.json create mode 100644 data/mods/Aftershock/player/proficiencies.json diff --git a/data/mods/Aftershock/EOC/game_eoc.json b/data/mods/Aftershock/EOC/game_eoc.json new file mode 100644 index 0000000000000..d3995f6877be2 --- /dev/null +++ b/data/mods/Aftershock/EOC/game_eoc.json @@ -0,0 +1,30 @@ +[ + { + "id": "EOC_AFS_LEADERSHIP_SWITCH", + "type": "effect_on_condition", + "eoc_type": "AVATAR_DEATH", + "condition": { + "and": [ + { "npc_allies_global": 1 }, + { "math": [ "afs_leadership_act", "==", "1" ] }, + { "u_query": "You have died. Continue as one of your followers?", "default": false } + ] + }, + "effect": [ "take_control_menu" ] + }, + { + "type": "effect_on_condition", + "id": "EOC_return_to_partyleader", + "effect": [ + { + "run_eoc_with": { + "id": "_EOC_return_to_partyleader_do", + "effect": [ "follow", { "math": [ "afs_leadership_act", "=", "0" ] }, "take_control" ] + }, + "alpha_talker": "avatar", + "beta_talker": { "global_val": "party_leader_id" }, + "false_eocs": { "id": "_EOC_return_to_partyleader_fail_msg", "effect": { "message": "Unable to locate the party leader." } } + } + ] + } +] diff --git a/data/mods/Aftershock/itemgroups/spaceship_groups.json b/data/mods/Aftershock/itemgroups/spaceship_groups.json index d2b3b495374fc..89ab0eeff8401 100644 --- a/data/mods/Aftershock/itemgroups/spaceship_groups.json +++ b/data/mods/Aftershock/itemgroups/spaceship_groups.json @@ -15,12 +15,7 @@ { "item": "cream_prot_cold", "count": 3 }, { "item": "light_plus_battery_cell", "charges": 150, "container-item": "flashlight" }, { "item": "light_plus_battery_cell", "charges": 150, "container-item": "water_purifier" }, - { - "item": "medium_plus_battery_cell", - "ammo-item": "battery", - "charges": 600, - "container-item": "military_mess_kit" - }, + { "item": "medium_plus_battery_cell", "ammo-item": "battery", "charges": 600, "container-item": "multi_cooker" }, { "item": "rope_6" }, { "item": "emer_blanket", "count": 2 }, { "item": "afs_radiobeacon" }, diff --git a/data/mods/Aftershock/itemgroups/weapons/armories.json b/data/mods/Aftershock/itemgroups/weapons/armories.json index fd1a596dea009..97512e937d83a 100644 --- a/data/mods/Aftershock/itemgroups/weapons/armories.json +++ b/data/mods/Aftershock/itemgroups/weapons/armories.json @@ -59,10 +59,42 @@ "type": "item_group", "subtype": "distribution", "items": [ - { "group": "afs_any_ballistic_gun", "prob": 6 }, + { "group": "afs_civilian_ballistic_gun", "prob": 6 }, { "group": "afs_any_ballistic_mag", "prob": 2 }, { "group": "afs_any_ballistic_ammo", "prob": 4 }, { "group": "afs_shotgun_gunmod", "prob": 1 } ] + }, + { + "id": "afs_augustmoon_guntrader_military_ammo", + "type": "item_group", + "subtype": "distribution", + "ammo": 100, + "magazine": 100, + "items": [ + [ "afs_25mm_apfsds", 10 ], + [ "afs_25mm_frag", 10 ], + [ "shot_flechette", 20 ], + [ "shot_he", 20 ], + [ "afs_4g_plasma", 20 ], + [ "afs_20g_plasma", 10 ], + [ "afs_cartridge", 10 ] + ] + }, + { + "id": "afs_augustmoon_guntrader_military_gun", + "type": "item_group", + "subtype": "distribution", + "ammo": 100, + "magazine": 100, + "items": [ + [ "afs_Accipitermg", 20 ], + [ "afs_gibrifle", 40 ], + [ "afs_heavy_tactical_laser", 5 ], + [ "afs_pam-41", 10 ], + [ "afs_magnadrive_230k", 5 ], + [ "afs_gibs_shotgun", 20 ], + [ "afs_raketa_shotgun", 20 ] + ] } ] diff --git a/data/mods/Aftershock/itemgroups/weapons/balistic_gun_groups.json b/data/mods/Aftershock/itemgroups/weapons/balistic_gun_groups.json index d67b4d9ff1852..cde418d88384d 100644 --- a/data/mods/Aftershock/itemgroups/weapons/balistic_gun_groups.json +++ b/data/mods/Aftershock/itemgroups/weapons/balistic_gun_groups.json @@ -86,6 +86,16 @@ { "group": "afs_any_ballistic_h_ammo", "prob": 2 } ] }, + { + "id": "afs_any_ballistic_ammo", + "type": "item_group", + "subtype": "distribution", + "items": [ + { "group": "afs_civilian_ballistic_s_ammo", "prob": 10 }, + { "group": "afs_civilian_ballistic_m_ammo", "prob": 10 }, + { "group": "afs_civilian_ballistic_h_ammo", "prob": 2 } + ] + }, { "id": "afs_any_ballistic_s_ammo", "type": "item_group", diff --git a/data/mods/Aftershock/items/armor/cyberpunk.json b/data/mods/Aftershock/items/armor/cyberpunk.json index 2b34e97b3ace6..63b72c7c2531f 100644 --- a/data/mods/Aftershock/items/armor/cyberpunk.json +++ b/data/mods/Aftershock/items/armor/cyberpunk.json @@ -10,5 +10,17 @@ "color": "white", "material_thickness": 0.3, "pocket_data": [ ] + }, + { + "id": "afs_academy_cloak", + "repairs_like": "cloak", + "type": "ARMOR", + "copy-from": "cloak", + "looks_like": "cloak", + "name": { "str": "academy cloak" }, + "description": "An short ochre cloak given to traveling faculty, still tailored in styles that echo down from previous millennia.", + "color": "red", + "material_thickness": 0.3, + "pocket_data": [ ] } ] diff --git a/data/mods/Aftershock/items/gun/voltaic.json b/data/mods/Aftershock/items/gun/voltaic.json index ecacd4a58bcfa..51a7333c6f0d1 100644 --- a/data/mods/Aftershock/items/gun/voltaic.json +++ b/data/mods/Aftershock/items/gun/voltaic.json @@ -36,6 +36,9 @@ "ammo": [ "battery" ], "ammo_to_fire": 0, "energy_drain": "15 kJ", + "weight": "780 g", + "volume": "480 ml", + "longest_side": "205 mm", "modes": [ [ "DEFAULT", "Pulse ", 1 ] ], "ranged_damage": [ { "damage_type": "electric", "amount": 7 } ], "valid_mod_locations": [ [ "grip", 1 ], [ "rail", 1 ], [ "sights", 1 ], [ "stock", 1 ], [ "underbarrel", 1 ] ], diff --git a/data/mods/Aftershock/items/tools.json b/data/mods/Aftershock/items/tools.json index 286dd5720e852..585b626cb440a 100644 --- a/data/mods/Aftershock/items/tools.json +++ b/data/mods/Aftershock/items/tools.json @@ -659,7 +659,53 @@ "melee_damage": { "bash": 9 } }, { - "id": "military_mess_kit", + "id": "multi_cooker", + "type": "TOOL", + "//": "Makes it look more sci-fi so it isnt out of place, not many actual changes otherwise.", + "name": { "str": "micro-cooker" }, + "description": "A rugged kitchen in one tool, made for use within small spaceships or in the wilderness. It can automatically prepare a variety of dishes while its owner focuses on other tasks.", + "weight": "5 kg", + "volume": "3 L", + "price": "1500 USD", + "price_postapoc": "1500 USD", + "to_hit": -3, + "material": [ "steel", "plastic" ], + "symbol": ";", + "color": "red", + "ammo": [ "battery" ], + "flags": [ "ELECTRONIC", "ALLOWS_REMOTE_USE" ], + "power_draw": "100 W", + "qualities": [ [ "CONTAIN", 1 ] ], + "tick_action": "MULTICOOKER_TICK", + "use_action": [ "MULTICOOKER", { "type": "link_up", "cable_length": 2, "charge_rate": "1000 W" } ], + "pocket_data": [ + { + "pocket_type": "MAGAZINE_WELL", + "rigid": true, + "flag_restriction": [ "BATTERY_MEDIUM" ], + "default_magazine": "medium_battery_cell" + }, + { + "pocket_type": "CONTAINER", + "watertight": true, + "rigid": true, + "max_contains_volume": "2 L", + "max_contains_weight": "4 kg", + "max_item_length": "35 cm", + "moves": 50 + } + ] + }, + { + "id": "multi_cooker_filled", + "type": "TOOL", + "copy-from": "multi_cooker", + "name": { "str": "micro-cooker - cooking", "str_pl": "micro-cookers - cooking" }, + "description": "This micro-cooker is currently cooking a dish.", + "delete": { "qualities": [ "CONTAIN" ] } + }, + { + "id": "mil_mess_kit", "type": "TOOL", "name": { "str": "military mess kit" }, "description": "A military mess kit designed for long-range reconnaissance patrols deployed behind enemy lines. All of its parts are made from thin sheets of aluminum-superalloy composite and are insulated with ceramic coating. Relies on a battery-operated hotplate, rather than the smoke-producing chemical-fueled hexamine stove. Compact, durable and lightweight.", diff --git a/data/mods/Aftershock/maps/overmap_locations.json b/data/mods/Aftershock/maps/overmap_locations.json index 1695bba75fa56..f1916ee807ad0 100644 --- a/data/mods/Aftershock/maps/overmap_locations.json +++ b/data/mods/Aftershock/maps/overmap_locations.json @@ -1,4 +1,10 @@ [ + { + "type": "start_location", + "id": "sloc_augustmoon_docking", + "name": "Port Augustmoon", + "terrain": [ "augustmoon_docking_arm" ] + }, { "type": "start_location", "id": "sloc_escape_pod", diff --git a/data/mods/Aftershock/mutations/mutations.json b/data/mods/Aftershock/mutations/mutations.json index 58b7a775fa020..d5f07f1a762db 100644 --- a/data/mods/Aftershock/mutations/mutations.json +++ b/data/mods/Aftershock/mutations/mutations.json @@ -797,6 +797,16 @@ "purifiable": false, "profession": true }, + { + "type": "mutation", + "id": "AFS_LEADERSHIP", + "name": "Empathic Leadership", + "description": "You have a natural talent for leadership and can easily see yourself in others. Quite literally. In fact, you can swap control to any other character that follows you.", + "points": 5, + "valid": false, + "purifiable": false, + "profession": true + }, { "type": "mutation", "id": "LEG_TENTACLES", diff --git a/data/mods/Aftershock/npcs/Augustmoon_Salvors/augustmoon_gun_trader.json b/data/mods/Aftershock/npcs/Augustmoon_Salvors/augustmoon_gun_trader.json index 7535388ef7f8e..f82ed5a28c015 100644 --- a/data/mods/Aftershock/npcs/Augustmoon_Salvors/augustmoon_gun_trader.json +++ b/data/mods/Aftershock/npcs/Augustmoon_Salvors/augustmoon_gun_trader.json @@ -20,7 +20,16 @@ { "skill": "rifle", "bonus": { "rng": [ 2, 4 ] } } ], "//": "All guns are more expensive here.", - "shopkeeper_item_group": [ { "group": "afs_augustmoon_guntrader", "rigid": true }, { "group": "augustmoon_shop_money", "rigid": true } ], + "shopkeeper_item_group": [ + { "group": "afs_augustmoon_guntrader", "rigid": true }, + { "group": "augustmoon_shop_money", "rigid": true }, + { + "group": "afs_augustmoon_guntrader_military", + "rigid": true, + "condition": { "u_has_proficiency": "prof_armament_license" }, + "refusal": "You need an armament license to buy this." + } + ], "shopkeeper_price_rules": [ { "group": "afs_general_armory", "fixed_adj": 0 } ] }, { @@ -29,6 +38,16 @@ "subtype": "collection", "items": [ { "group": "afs_civilian_armory", "count": [ 14, 28 ] } ] }, + { + "type": "item_group", + "id": "afs_augustmoon_guntrader_military", + "subtype": "collection", + "items": [ + { "group": "afs_augustmoon_guntrader_military_gun", "count": [ 0, 2 ] }, + { "group": "afs_augustmoon_guntrader_military_ammo", "count": [ 0, 2 ] }, + { "group": "afs_any_hand_grenade", "count": [ 4, 8 ] } + ] + }, { "type": "item_group", "id": "AUGUSTMOON_GUNTRADER_worn", diff --git a/data/mods/Aftershock/npcs/TALK_COMMON_OVERRIDES.json b/data/mods/Aftershock/npcs/TALK_COMMON_OVERRIDES.json new file mode 100644 index 0000000000000..9dd8773c1b7a8 --- /dev/null +++ b/data/mods/Aftershock/npcs/TALK_COMMON_OVERRIDES.json @@ -0,0 +1,27 @@ +{ + "id": [ + "TALK_FRIEND", + "TALK_GIVE_ITEM", + "TALK_USE_ITEM", + "TALK_RADIO" + ], + "type": "talk_topic", + "dynamic_line": { + "is_by_radio": " *pshhhttt* I'm reading you boss, over.", + "no": { "has_reason": { "use_reason": true }, "no": "What is it, friend?" } + }, + "responses": [ + { + "text": "Switch to controlling this follower", + "condition": { "u_has_trait": "AFS_LEADERSHIP" }, + "effect": [ { "math": [ "afs_leadership_act", "=", "1" ] }, "take_control" ], + "topic": "TALK_DONE" + }, + { + "text": "Switch to controlling your party leader.", + "condition": { "npc_has_trait": "AFS_LEADERSHIP" }, + "effect": [ { "math": [ "afs_leadership_act", "=", "0" ] }, "take_control" ], + "topic": "TALK_DONE" + } + ] +} diff --git a/data/mods/Aftershock/player/hobbies.json b/data/mods/Aftershock/player/hobbies.json index b44632892717a..627bb4151d64f 100644 --- a/data/mods/Aftershock/player/hobbies.json +++ b/data/mods/Aftershock/player/hobbies.json @@ -8,5 +8,41 @@ "points": 3, "CBMs": [ "afs_bio_chemical_enhancement_rig", "bio_adrenaline", "bio_metabolics", "bio_power_storage_mkII" ], "skills": [ { "level": 1, "name": "dodge" } ] + }, + { + "type": "profession", + "subtype": "hobby", + "id": "afs_earthling", + "name": "Earth born", + "description": "Your mannerisms and accent are a dead giveaway that you where raised on Earth. Whatever your thoughts about the homeworld might be, the simple fact that you can call it home is likely to affect relationships with people liable to care about such things.", + "points": -1 + }, + { + "type": "profession", + "subtype": "hobby", + "id": "afs_armament_license", + "name": "Armament License", + "description": "You have a license to own and operate military grade weaponry and can legally purchase such items without any difficulty. A privilege usually reserved for the politically or economically favored.", + "points": 3, + "proficiencies": [ "prof_armament_license" ] + }, + { + "type": "profession", + "subtype": "hobby", + "id": "afs_spacer", + "name": "Space Operations", + "description": "You have ample experience working in space, either on a station or on a ship. You are familiar with safety protocols, capable of piloting small shuttlecraft and can operate and perform maintenance on a variety of space equipment and colony systems.", + "points": 2, + "skills": [ { "level": 2, "name": "electronics" }, { "level": 2, "name": "mechanics" } ], + "proficiencies": [ "prof_helicopter_pilot" ] + }, + { + "type": "profession", + "subtype": "hobby", + "id": "afs_leadership", + "name": "Empathic Leadership", + "description": "You have a natural talent for leadership and can easily see yourself in others. Quite literally. In fact, you can swap control to any other character that follows you.", + "points": 3, + "traits": [ "AFS_LEADERSHIP" ] } ] diff --git a/data/mods/Aftershock/player/professions.json b/data/mods/Aftershock/player/professions.json index d4130c290b4bf..beefbd928ce36 100644 --- a/data/mods/Aftershock/player/professions.json +++ b/data/mods/Aftershock/player/professions.json @@ -2,21 +2,21 @@ { "type": "profession", "id": "afs_radio_technician", - "name": "Radio Tower Technician", - "description": "From your spot at the top of the tower you were working on, you had a good view of the end of the world; of streaks of light falling from the sky, blossoming into mushroom clouds, barely a flicker on the horizon before your optical dampers flicked down. You rushed to safety before the shockwaves could blast you from your perch. The bionic implants included with your contract might come in handy now…", + "name": "Deck Engineer", + "description": "A skilled ship technician, turned to independent salvage work. .", "points": 4, "CBMs": [ "bio_weight", "bn_bio_solar", "bio_power_storage_mkII", "bio_flashlight", "bio_tools", "bio_sunglasses" ], "skills": [ { "level": 4, "name": "electronics" }, { "level": 2, "name": "launcher" } ], "items": { "both": { "entries": [ - { "item": "jumpsuit" }, + { "item": "spacer_jumpsuit" }, { "item": "socks" }, { "item": "rope_30" }, { "item": "boots" }, { "item": "afs_herc_rig" }, - { "item": "hat_hard", "variant": "blue_hat_hard" }, { "item": "afs_foamgun", "ammo-item": "afs_foamcrete", "charges": 30 }, + { "item": "cash_card", "charges": 1120000 }, { "item": "afs_foam_tank", "ammo-item": "afs_foamcrete", "charges": 30 } ] }, @@ -251,7 +251,7 @@ { "item": "boots" }, { "item": "backpack" }, { "item": "jeans" }, - { "item": "cash_card", "charges": 50000 }, + { "item": "cash_card", "charges": 1120000 }, { "item": "mask_dust", "variant": "white_mask_dust" } ] }, @@ -263,10 +263,7 @@ "type": "profession", "id": "afs_wraitheon_executive", "name": "Wraitheon Executive", - "description": { - "str": "You were one of the chief executives of the Megacorporation Wraitheon Robotics ltd. and consistently ranked among the most powerful and influential persons of the world. Still, the apocalypse has caught you unprepared, and now after the dissolution of your company and the crumbling of your network of influence, you are left powerless and destitute, and must rely on your two robotic bodyguards to survive.", - "//NOLINT(cata-text-style)": "not a period" - }, + "description": "The exiled scion of an unfavorable seat within the Wraitheon board of directors, wealthy beyond measure even in their estrangement. Sent to the frontier in a last-ditch effort to salvage their reputation, or more likely, to find a silent and politically convenient death.", "points": 8, "CBMs": [ "bio_batteries", "bio_power_storage_mkII", "bio_eye_enhancer", "bio_int_enhancer", "bio_memory", "bio_cable" ], "traits": [ "FLIMSY3", "SLOWHEALER3" ], @@ -280,7 +277,6 @@ { "item": "socks" }, { "item": "gold_watch" }, { "item": "undershirt" }, - { "item": "gasdiscount_platinum" }, { "item": "afs_10mm_smart_template" }, { "item": "cash_card", "charges": 200000000 }, { "item": "cash_card", "charges": 200000000 }, @@ -302,7 +298,7 @@ "type": "profession", "id": "afs_holo_fighter", "name": "Corporate Infiltrator", - "description": "Before all this, you were an 'independent contractor', a spy and mercenary at the service of megacorporations. Using highly experimental holographic technology, you once took on impossible jobs one after the other.", + "description": "A spy and mercenary at the direct service of the Solar Corporations. Touring the frontier in search of intelligence gathering and sabotage contracts. Equipped with a set of irreplacable holographic technology that borders on the miraculous.", "points": 8, "skills": [ { "level": 4, "name": "gun" }, @@ -324,11 +320,8 @@ "entries": [ { "item": "under_armor" }, { "item": "under_armor_shorts" }, - { "item": "gloves_leather" }, - { "item": "pants_cargo" }, - { "item": "socks" }, + { "item": "afs_combat_cryo" }, { "item": "boots_combat" }, - { "item": "gloves_leather" }, { "item": "webbing_belt" }, { "item": "sweater" }, { "item": "powered_earmuffs" }, @@ -338,6 +331,7 @@ { "item": "afs_holo_flare_caster" }, { "item": "afs_holo_cloak_mk2" }, { "item": "kukri", "container-item": "sheath" }, + { "item": "cash_card", "charges": 2600000 }, { "item": "afs_cam_spy", "ammo-item": "light_minus_atomic_battery_cell", "charges": 500 }, { "item": "radiocontrol", "ammo-item": "light_atomic_battery_cell", "charges": 1000 }, { "item": "afs_eidolon_derringer", "ammo-item": "afs_5x50heavy", "charges": 4, "container-item": "holster" }, @@ -414,7 +408,7 @@ { "type": "profession", "id": "afs_bio_operator", - "name": "Bionic Operator", + "name": "Rogue Operator", "description": "You worked as a mercenary across six continents for a dozen corps. A VP at the last corp decided he wanted to put you on retainer and you agreed to a three month gig in return for some additional bionics. You woke up with an extra bionic, a cranial bomb that needed to be reset every month or so or it blows up. Now you have days until the bomb goes off. Maybe you'll find someone who can remove it. Can you even sleep, for fear of death?", "points": 2, "CBMs": [ @@ -441,17 +435,14 @@ "items": { "both": { "entries": [ - { "item": "winter_pants_army" }, - { "item": "winter_jacket_army" }, { "item": "gloves_tactical" }, - { "item": "rucksack" }, + { "item": "afs_jumpsuit_military" }, { "item": "cloak" }, { "item": "mask_ski" }, { "item": "socks" }, { "item": "boots_combat" }, { "item": "canteen" }, { "item": "wristwatch" }, - { "item": "tent_kit" }, { "item": "rollmat" }, { "item": "e_tool" }, { "item": "knife_hunting" }, @@ -459,11 +450,8 @@ "item": "medium_plus_battery_cell", "ammo-item": "battery", "charges": 600, - "container-item": "military_mess_kit" + "container-item": "multi_cooker" }, - { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] }, - { "item": "hat_boonie", "custom-flags": [ "no_auto_equip" ] }, - { "item": "tank_top", "variant": "tank_top_camo" }, { "item": "m2010", "ammo-item": "300_winmag", @@ -500,7 +488,7 @@ { "type": "profession", "id": "robot_scavenger", - "name": "Robot Scavenger", + "name": "Roboticist", "description": "Scavenging and reselling abandoned robotics is what you call your \"job.\" It certainly isn't official in any means of the word, but it rakes in the dough and that is all that matters to you, even if it involves dangerous activities, be it cracking old Wraitheon security cyphers or crossing well-worn wires on ancient mining drones.", "points": 4, "skills": [ @@ -520,6 +508,7 @@ { "item": "wristwatch" }, { "item": "bot_manhack", "count": 2 }, { "group": "charged_smart_phone" }, + { "item": "cash_card", "charges": 1120000 }, { "item": "afs_cartridge", "ammo-item": "battery", "charges": 1500 }, { "item": "afs_cartridge", @@ -533,11 +522,79 @@ "female": { "entries": [ { "item": "bra" }, { "item": "panties" } ] } } }, + { + "type": "profession", + "id": "afs_academic", + "name": "Academy Technologist", + "description": "A senior technologist from the Planetary Academy of Khorat, sent to Salus IV to oversee the procurement of valuable technological artifacts. Although generously equipped, you are neither a fighter nor a good fit for life in the frontier. You'd feel far more comfortable and capable commanding this salvage operation from the faraway safety of your office.", + "points": 4, + "traits": [ "PACIFIST", "AFS_LEADERSHIP" ], + "skills": [ + { "level": 1, "name": "gun" }, + { "level": 1, "name": "pistol" }, + { "level": 5, "name": "fabrication" }, + { "level": 5, "name": "chemistry" }, + { "level": 8, "name": "mechanics" }, + { "level": 8, "name": "electronics" } + ], + "items": { + "both": { + "entries": [ + { "item": "afs_academy_cloak" }, + { "item": "socks" }, + { "item": "pants" }, + { "item": "dress_shoes" }, + { "item": "dress_shirt" }, + { "item": "wristwatch" }, + { "item": "cash_card", "charges": 1120000 }, + { + "item": "afs_voltaic_cartridge", + "ammo-item": "battery", + "charges": 1500, + "container-item": "afs_voltaic_pistol" + }, + { "item": "holster" }, + { "group": "charged_smart_phone" } + ] + }, + "male": { "entries": [ { "item": "boxer_shorts" } ] }, + "female": { "entries": [ { "item": "sports_bra" }, { "item": "panties" } ] } + } + }, + { + "type": "profession", + "id": "afs_salvor", + "name": "Salvor", + "description": "A scavenger by necessity, born and raised in between ruins and slums. Some might be lured to your profession by romantic notions of wealth, adventure or scientific discovery. You know better.", + "points": 4, + "skills": [ + { "level": 1, "name": "dodge" }, + { "level": 1, "name": "gun" }, + { "level": 1, "name": "pistol" }, + { "level": 3, "name": "mechanics" }, + { "level": 3, "name": "fabrication" }, + { "level": 3, "name": "electronics" } + ], + "items": { + "both": { + "entries": [ + { "item": "spacer_jumpsuit" }, + { "item": "socks" }, + { "item": "boots_combat" }, + { "item": "wristwatch" }, + { "item": "cash_card", "charges": 1120000 }, + { "group": "charged_smart_phone" } + ] + }, + "male": { "entries": [ { "item": "boxer_shorts" } ] }, + "female": { "entries": [ { "item": "sports_bra" }, { "item": "panties" } ] } + } + }, { "type": "profession", "id": "rocket_jumper", "name": "Rocket Jumper", - "description": "A skilled airborne scout and salvager equipped with a rocket pack, eking out a living on the edge of legality. Confident that your ability to find opportunity in the skies will be your edge towards success.", + "description": "A skilled airborne scout and salvager equipped with a rocket pack, eking out a living on the edge of legality.", "points": 4, "skills": [ { "level": 3, "name": "dodge" }, @@ -564,6 +621,7 @@ { "item": "ammonia_liquid" }, { "item": "afs_cartridge", "ammo-item": "battery", "charges": 1500 }, { "item": "afs_cartridge", "ammo-item": "battery", "charges": 1500, "container-item": "afs_v29" }, + { "item": "cash_card", "charges": 1120000 }, { "item": "afs_40g_plasma_civ", "ammo-item": "afs_shydrogen", diff --git a/data/mods/Aftershock/player/proficiencies.json b/data/mods/Aftershock/player/proficiencies.json new file mode 100644 index 0000000000000..3d43dd1e80c41 --- /dev/null +++ b/data/mods/Aftershock/player/proficiencies.json @@ -0,0 +1,16 @@ +[ + { + "type": "proficiency_category", + "id": "prof_afs_social", + "name": "Social Standing", + "description": "Proficiencies related to your status within spacefaring culture in all its forms." + }, + { + "type": "proficiency", + "id": "prof_armament_license", + "category": "prof_afs_social", + "name": { "str": "Armament License" }, + "can_learn": false, + "description": "You have a license to own and operate military grade weaponry and can legally purchase such items without any difficulty." + } +] diff --git a/data/mods/Aftershock/scenarios.json b/data/mods/Aftershock/scenarios.json index 9e5692b110c57..3af1f5b461721 100644 --- a/data/mods/Aftershock/scenarios.json +++ b/data/mods/Aftershock/scenarios.json @@ -85,6 +85,19 @@ "flags": [ "CITY_START" ], "start_name": "Robot Dispatch" }, + { + "type": "scenario", + "id": "augustmoon", + "name": "Scavenger's Frontier", + "points": 1, + "description": "The Cryosleeper slow approach allows the display of Salus IV through all its forms: a fiery marble against interstellar darkness, a silver-white mirror, and a final world of glaciers split by the thin ruins of an equatorial metroplex. Before long, Port Augustmoon's ancient hull comes to obstruct most the viewport, and the ship's computer announces that it is time to disembark.", + "allowed_locs": [ "sloc_augustmoon_docking" ], + "professions": [ "afs_salvor", "afs_academic", "afs_holo_fighter", "afs_wraitheon_executive", "rocket_jumper", "robot_scavenger" ], + "whitelist_hobbies": true, + "hobbies": [ "afs_speed_freak", "afs_armament_license", "afs_spacer", "afs_leadership", "afs_minor_fortune", "afs_earthling" ], + "flags": [ "LONE_START" ], + "start_name": "Port Augustmoon" + }, { "type": "scenario", "id": "escape_pod", diff --git a/data/mods/aftershock_exoplanet/setting_blacklists/scenario_blacklist.json b/data/mods/aftershock_exoplanet/setting_blacklists/scenario_blacklist.json index 7bffee8349cc8..e42c00912f830 100644 --- a/data/mods/aftershock_exoplanet/setting_blacklists/scenario_blacklist.json +++ b/data/mods/aftershock_exoplanet/setting_blacklists/scenario_blacklist.json @@ -2,6 +2,6 @@ { "type": "SCENARIO_BLACKLIST", "subtype": "whitelist", - "scenarios": [ "escape_pod", "crashing_ship" ] + "scenarios": [ "escape_pod", "crashing_ship", "augustmoon" ] } ] From 1866de642e36de4b5e9a5cf67f0fcb4fc7d640d5 Mon Sep 17 00:00:00 2001 From: John Candlebury Date: Tue, 12 Mar 2024 12:59:05 -0600 Subject: [PATCH 2/9] Text spacing --- data/mods/Aftershock/items/tools.json | 2 +- data/mods/Aftershock/player/professions.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/mods/Aftershock/items/tools.json b/data/mods/Aftershock/items/tools.json index 585b626cb440a..1d9ef97e6f360 100644 --- a/data/mods/Aftershock/items/tools.json +++ b/data/mods/Aftershock/items/tools.json @@ -663,7 +663,7 @@ "type": "TOOL", "//": "Makes it look more sci-fi so it isnt out of place, not many actual changes otherwise.", "name": { "str": "micro-cooker" }, - "description": "A rugged kitchen in one tool, made for use within small spaceships or in the wilderness. It can automatically prepare a variety of dishes while its owner focuses on other tasks.", + "description": "A rugged kitchen in one tool, made for use within small spaceships or in the wilderness. It can automatically prepare a variety of dishes while its owner focuses on other tasks.", "weight": "5 kg", "volume": "3 L", "price": "1500 USD", diff --git a/data/mods/Aftershock/player/professions.json b/data/mods/Aftershock/player/professions.json index beefbd928ce36..992c8b1a7337d 100644 --- a/data/mods/Aftershock/player/professions.json +++ b/data/mods/Aftershock/player/professions.json @@ -526,7 +526,7 @@ "type": "profession", "id": "afs_academic", "name": "Academy Technologist", - "description": "A senior technologist from the Planetary Academy of Khorat, sent to Salus IV to oversee the procurement of valuable technological artifacts. Although generously equipped, you are neither a fighter nor a good fit for life in the frontier. You'd feel far more comfortable and capable commanding this salvage operation from the faraway safety of your office.", + "description": "A senior technologist from the Planetary Academy of Khorat, sent to Salus IV to oversee the procurement of valuable technological artifacts. Although generously equipped, you are neither a fighter nor a good fit for life in the frontier. You'd feel far more comfortable and capable commanding this salvage operation from the faraway safety of your office.", "points": 4, "traits": [ "PACIFIST", "AFS_LEADERSHIP" ], "skills": [ @@ -565,7 +565,7 @@ "type": "profession", "id": "afs_salvor", "name": "Salvor", - "description": "A scavenger by necessity, born and raised in between ruins and slums. Some might be lured to your profession by romantic notions of wealth, adventure or scientific discovery. You know better.", + "description": "A scavenger by necessity, born and raised in between ruins and slums. Some might be lured to your profession by romantic notions of wealth, adventure or scientific discovery. You know better.", "points": 4, "skills": [ { "level": 1, "name": "dodge" }, From 378abf3db20bf955fb20e3f7be98546dbd61b967 Mon Sep 17 00:00:00 2001 From: John Candlebury Date: Tue, 12 Mar 2024 16:39:38 -0600 Subject: [PATCH 3/9] Fix load error --- data/mods/Aftershock/scenarios.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/scenarios.json b/data/mods/Aftershock/scenarios.json index 3af1f5b461721..b1a5d1ddfa199 100644 --- a/data/mods/Aftershock/scenarios.json +++ b/data/mods/Aftershock/scenarios.json @@ -94,7 +94,7 @@ "allowed_locs": [ "sloc_augustmoon_docking" ], "professions": [ "afs_salvor", "afs_academic", "afs_holo_fighter", "afs_wraitheon_executive", "rocket_jumper", "robot_scavenger" ], "whitelist_hobbies": true, - "hobbies": [ "afs_speed_freak", "afs_armament_license", "afs_spacer", "afs_leadership", "afs_minor_fortune", "afs_earthling" ], + "hobbies": [ "afs_speed_freak", "afs_armament_license", "afs_spacer", "afs_leadership", "afs_earthling" ], "flags": [ "LONE_START" ], "start_name": "Port Augustmoon" }, From cf939ab4048b3bb266b4f639fbee40cfb59fba32 Mon Sep 17 00:00:00 2001 From: John Candlebury Date: Wed, 13 Mar 2024 07:01:13 -0600 Subject: [PATCH 4/9] Hobbie spelling Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> --- data/mods/Aftershock/player/hobbies.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/player/hobbies.json b/data/mods/Aftershock/player/hobbies.json index 627bb4151d64f..78017149fc752 100644 --- a/data/mods/Aftershock/player/hobbies.json +++ b/data/mods/Aftershock/player/hobbies.json @@ -14,7 +14,7 @@ "subtype": "hobby", "id": "afs_earthling", "name": "Earth born", - "description": "Your mannerisms and accent are a dead giveaway that you where raised on Earth. Whatever your thoughts about the homeworld might be, the simple fact that you can call it home is likely to affect relationships with people liable to care about such things.", + "description": "Your mannerisms and accent are a dead giveaway that you were raised on Earth. Whatever your thoughts about the homeworld might be, the simple fact that you can call it home is likely to affect relationships with people liable to care about such things.", "points": -1 }, { From 8decb326823806cf59b16d16fcdf1c1febed02d6 Mon Sep 17 00:00:00 2001 From: John Candlebury Date: Wed, 13 Mar 2024 14:08:00 -0600 Subject: [PATCH 5/9] Update professions.json --- data/mods/Aftershock/player/professions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/player/professions.json b/data/mods/Aftershock/player/professions.json index 992c8b1a7337d..354c650d938b9 100644 --- a/data/mods/Aftershock/player/professions.json +++ b/data/mods/Aftershock/player/professions.json @@ -3,7 +3,7 @@ "type": "profession", "id": "afs_radio_technician", "name": "Deck Engineer", - "description": "A skilled ship technician, turned to independent salvage work. .", + "description": "A skilled ship technician, turned to independent salvage work.", "points": 4, "CBMs": [ "bio_weight", "bn_bio_solar", "bio_power_storage_mkII", "bio_flashlight", "bio_tools", "bio_sunglasses" ], "skills": [ { "level": 4, "name": "electronics" }, { "level": 2, "name": "launcher" } ], From 5f4aa7c8bc8be1a51777f0dcb6f7368d389ff500 Mon Sep 17 00:00:00 2001 From: John Candlebury Date: Mon, 18 Mar 2024 20:32:15 -0600 Subject: [PATCH 6/9] Update data/mods/Aftershock/items/armor/cyberpunk.json Co-authored-by: Fris0uman <41293484+Fris0uman@users.noreply.github.com> --- data/mods/Aftershock/items/armor/cyberpunk.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/items/armor/cyberpunk.json b/data/mods/Aftershock/items/armor/cyberpunk.json index 63b72c7c2531f..ae19b860f18cd 100644 --- a/data/mods/Aftershock/items/armor/cyberpunk.json +++ b/data/mods/Aftershock/items/armor/cyberpunk.json @@ -18,7 +18,7 @@ "copy-from": "cloak", "looks_like": "cloak", "name": { "str": "academy cloak" }, - "description": "An short ochre cloak given to traveling faculty, still tailored in styles that echo down from previous millennia.", + "description": "A short ochre cloak given to traveling faculty, still tailored in styles that echo down from previous millennia.", "color": "red", "material_thickness": 0.3, "pocket_data": [ ] From cd2797b28f22912ea54ff63c9f57d1371b6e4dd0 Mon Sep 17 00:00:00 2001 From: John-Candlebury Date: Mon, 18 Mar 2024 20:36:29 -0600 Subject: [PATCH 7/9] Revert ID change --- data/mods/Aftershock/items/tools.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/items/tools.json b/data/mods/Aftershock/items/tools.json index 1d9ef97e6f360..159db7fec19e8 100644 --- a/data/mods/Aftershock/items/tools.json +++ b/data/mods/Aftershock/items/tools.json @@ -705,7 +705,7 @@ "delete": { "qualities": [ "CONTAIN" ] } }, { - "id": "mil_mess_kit", + "id": "military_mess_kit", "type": "TOOL", "name": { "str": "military mess kit" }, "description": "A military mess kit designed for long-range reconnaissance patrols deployed behind enemy lines. All of its parts are made from thin sheets of aluminum-superalloy composite and are insulated with ceramic coating. Relies on a battery-operated hotplate, rather than the smoke-producing chemical-fueled hexamine stove. Compact, durable and lightweight.", From d5751c5c7661381461896bcbff7203e2a2d5fef5 Mon Sep 17 00:00:00 2001 From: John Candlebury Date: Tue, 19 Mar 2024 07:20:48 -0600 Subject: [PATCH 8/9] Update data/mods/Aftershock/items/tools.json --- data/mods/Aftershock/items/tools.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/mods/Aftershock/items/tools.json b/data/mods/Aftershock/items/tools.json index 159db7fec19e8..3d2f399b846d1 100644 --- a/data/mods/Aftershock/items/tools.json +++ b/data/mods/Aftershock/items/tools.json @@ -660,6 +660,7 @@ }, { "id": "multi_cooker", + "copy-from": "multi_cooker" "type": "TOOL", "//": "Makes it look more sci-fi so it isnt out of place, not many actual changes otherwise.", "name": { "str": "micro-cooker" }, From 73d123d13f8868354e600bb60b85027d316a8005 Mon Sep 17 00:00:00 2001 From: Fris0uman Date: Tue, 19 Mar 2024 14:33:33 +0100 Subject: [PATCH 9/9] fix missing comma --- data/mods/Aftershock/items/tools.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/items/tools.json b/data/mods/Aftershock/items/tools.json index 3d2f399b846d1..98076258876ca 100644 --- a/data/mods/Aftershock/items/tools.json +++ b/data/mods/Aftershock/items/tools.json @@ -660,7 +660,7 @@ }, { "id": "multi_cooker", - "copy-from": "multi_cooker" + "copy-from": "multi_cooker", "type": "TOOL", "//": "Makes it look more sci-fi so it isnt out of place, not many actual changes otherwise.", "name": { "str": "micro-cooker" },