Aftershock: Port Augustmoon Start Scenario

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." } }
+      }
+    ]
+  }
+]

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" },

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 ]
+    ]
   }
 ]

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",

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": "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": [  ]
   }
 ]

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 ] ],

data/mods/Aftershock/items/tools.json

@@ -658,6 +658,53 @@
     "flags": [ "ALLOWS_REMOTE_USE" ],
     "melee_damage": { "bash": 9 }
   },
+  {
+    "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" },
+    "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": "military_mess_kit",
     "type": "TOOL",

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",

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",

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",

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"
+    }
+  ]
+}

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 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
+  },
+  {
+    "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" ]
   }
 ]