Dark Skies: New Order Remaster

data/mods/Dark-Skies-Above/factions.json

@@ -2,20 +2,15 @@
   {
     "type": "MONSTER_FACTION",
     "name": "neworder",
-    "neutral": [ "small_animal", "fish" ],
-    "friendly": [ "neworder_civ", "neworder_bot" ]
+    "neutral": [ "small_animal", "fish", "animal" ],
+    "friendly": [ "neworder_bot" ]
   },
   {
     "type": "MONSTER_FACTION",
     "name": "neworder_bot",
     "base_faction": "neworder",
-    "friendly": [ "neworder", "neworder_civ" ]
-  },
-  {
-    "type": "MONSTER_FACTION",
-    "//": "human civilians belonging to the new order",
-    "name": "neworder_civ",
-    "neutral": [ "human", "animal", "fish", "neworder" ]
+    "neutral": [ "stray" ],
+    "friendly": [ "neworder" ]
   },
   {
     "type": "MONSTER_FACTION",
@@ -31,7 +26,7 @@
   {
     "type": "MONSTER_FACTION",
     "name": "stray",
-    "//": "largely neutral to non-humans and things that don't belong to the order",
-    "neutral": [ "small_animal", "fish", "animal", "fox", "cat", "dog", "spiderant" ]
+    "//": "largely neutral to animals and things that don't live",
+    "neutral": [ "small_animal", "fish", "animal", "fox", "cat", "dog", "neworder_bot" ]
   }
 ]

data/mods/Dark-Skies-Above/items/electronics.json

@@ -40,5 +40,19 @@
     "volume": "875000 ml",
     "weight": "200 kg",
     "flags": [ "TRADER_AVOID", "NO_REPAIR" ]
+  },
+  {
+    "type": "GENERIC",
+    "id": "broken_dks_glowdrone",
+    "copy-from": "broken_eyebot",
+    "name": { "str": "broken surveillance drone" },
+    "description": "A broken drone.  Much less threatening now that it isn't shining its light everywhere.  Could be gutted for parts."
+  },
+  {
+    "type": "GENERIC",
+    "id": "broken_dks_scidrone",
+    "copy-from": "broken_eyebot",
+    "name": { "str": "broken seeker drone" },
+    "description": "A broken drone.  Much less threatening now that it isn't prodding you with its tools.  Could be gutted for parts."
   }
 ]

data/mods/Dark-Skies-Above/monsters/mon_groups/neworder_spawns.json

@@ -1,25 +1,14 @@
 [
   {
-    "name": "GROUP_PARK_SCENIC",
     "type": "monstergroup",
-    "default": "mon_null",
-    "monsters": [
-      { "monster": "dks_neworder_knight", "freq": 50, "cost_multiplier": 5, "pack_size": [ 2, 5 ] },
-      { "monster": "dks_neworder_pyro", "freq": 25, "cost_multiplier": 15, "pack_size": [ 1, 2 ] },
-      { "monster": "dks_neworder_cop", "freq": 5, "cost_multiplier": 10, "pack_size": [ 1, 2 ] },
-      { "monster": "mon_dks_emissary", "freq": 1, "starts": 24, "cost_multiplier": 20 },
-      { "monster": "mon_dks_emissary_plague", "freq": 1, "starts": 36, "cost_multiplier": 25 },
-      { "monster": "mon_dks_emissary_flame", "freq": 1, "starts": 48, "cost_multiplier": 30 }
-    ]
-  },
-  {
-    "type": "monstergroup",
-    "name": "GROUP_POLICE",
-    "default": "mon_null",
+    "name": "GROUP_ZOMBIE",
+    "default": "dks_mon_stray_burnt",
     "monsters": [
-      { "monster": "dks_neworder_knight", "freq": 40, "cost_multiplier": 10, "pack_size": [ 2, 5 ] },
-      { "monster": "dks_neworder_cop", "freq": 10, "cost_multiplier": 10, "pack_size": [ 1, 2 ] },
-      { "monster": "mon_dks_emissary", "freq": 1, "cost_multiplier": 40 }
+      { "monster": "mon_dks_glowdrone", "freq": 20, "cost_multiplier": 5, "starts": 360 },
+      { "monster": "mon_dks_scidrone", "freq": 20, "cost_multiplier": 10, "starts": 1080 },
+      { "monster": "mon_dks_scidrone", "freq": 20, "cost_multiplier": 15, "pack_size": [ 1, 3 ], "starts": 1440 },
+      { "monster": "mon_dks_emissary", "freq": 10, "cost_multiplier": 20, "starts": 1440 },
+      { "monster": "mon_dks_emissary_flame", "freq": 10, "cost_multiplier": 30, "starts": 2880 }
     ]
   },
   {
@@ -28,8 +17,11 @@
     "default": "mon_null",
     "is_animal": true,
     "monsters": [
-      { "monster": "dks_neworder_scout", "freq": 1, "cost_multiplier": 10, "pack_size": [ 1, 3 ] },
-      { "monster": "mon_dks_emissary", "freq": 1, "starts": 24, "cost_multiplier": 20 }
+      { "monster": "mon_dks_glowdrone", "freq": 1, "cost_multiplier": 10, "starts": 360 },
+      { "monster": "mon_dks_scidrone", "freq": 1, "cost_multiplier": 15, "starts": 1080 },
+      { "monster": "mon_dks_emissary", "freq": 1, "cost_multiplier": 20, "starts": 1440 },
+      { "monster": "mon_dks_emissary", "freq": 1, "cost_multiplier": 15, "starts": 2160 },
+      { "monster": "mon_dks_emissary_plague", "freq": 1, "cost_multiplier": 20, "starts": 2160 }
     ]
   },
   {
@@ -38,45 +30,43 @@
     "//": "50% chance military zombie or robot",
     "default": "mon_null",
     "monsters": [
-      { "monster": "dks_neworder_knight", "freq": 35, "cost_multiplier": 1 },
-      { "monster": "dks_neworder_cop", "freq": 10, "cost_multiplier": 50 },
-      { "monster": "mon_dks_emissary", "freq": 5, "cost_multiplier": 50 },
+      { "monster": "mon_dks_glowdrone", "freq": 10, "cost_multiplier": 10 },
+      { "monster": "mon_dks_emissary", "freq": 5, "cost_multiplier": 20 },
       { "monster": "mon_dks_emissary_plague", "freq": 5, "cost_multiplier": 50 }
     ]
   },
   {
     "name": "GROUP_MIL_WEAK",
     "type": "monstergroup",
-    "default": "dks_neworder_knight",
+    "default": "mon_null",
     "monsters": [
-      { "monster": "dks_neworder_knight", "freq": 150, "cost_multiplier": 2, "pack_size": [ 1, 4 ] },
-      { "monster": "dks_neworder_cop", "freq": 200, "cost_multiplier": 30 },
+      { "monster": "mon_dks_glowdrone", "freq": 50, "cost_multiplier": 10 },
+      { "monster": "mon_dks_scidrone", "freq": 20, "cost_multiplier": 10 },
       { "monster": "mon_dks_emissary", "freq": 5, "cost_multiplier": 20 }
     ]
   },
   {
     "name": "GROUP_MIL_STRONG",
     "type": "monstergroup",
-    "default": "dks_neworder_knight",
+    "default": "mon_null",
     "monsters": [
-      { "monster": "dks_neworder_knight", "freq": 100, "cost_multiplier": 2, "pack_size": [ 1, 4 ] },
-      { "monster": "dks_neworder_knight", "freq": 150, "cost_multiplier": 2, "pack_size": [ 2, 6 ] },
-      { "monster": "dks_neworder_cop", "freq": 100, "cost_multiplier": 30 },
-      { "monster": "mon_dks_emissary", "freq": 5, "cost_multiplier": 1 },
-      { "monster": "mon_dks_emissary_plague", "freq": 5, "cost_multiplier": 5 },
-      { "monster": "mon_dks_emissary_flame", "freq": 5, "cost_multiplier": 20 }
+      { "monster": "mon_dks_glowdrone", "freq": 50, "cost_multiplier": 10 },
+      { "monster": "mon_dks_scidrone", "freq": 20, "cost_multiplier": 10 },
+      { "monster": "mon_dks_emissary", "freq": 10, "cost_multiplier": 1 },
+      { "monster": "mon_dks_emissary_plague", "freq": 10, "cost_multiplier": 5 },
+      { "monster": "mon_dks_emissary_flame", "freq": 10, "cost_multiplier": 20 }
     ]
   },
   {
     "name": "GROUP_MIL_BASE",
     "type": "monstergroup",
-    "default": "dks_neworder_knight",
+    "default": "mon_null",
     "monsters": [
-      { "monster": "dks_neworder_knight", "freq": 100, "cost_multiplier": 2 },
-      { "monster": "dks_neworder_cop", "freq": 15, "cost_multiplier": 5 },
-      { "monster": "mon_dks_emissary", "freq": 1, "cost_multiplier": 1 },
-      { "monster": "mon_dks_emissary_plague", "freq": 1, "cost_multiplier": 5 },
-      { "monster": "mon_dks_emissary_flame", "freq": 1, "cost_multiplier": 20 }
+      { "monster": "mon_dks_glowdrone", "freq": 50, "cost_multiplier": 10 },
+      { "monster": "mon_dks_scidrone", "freq": 20, "cost_multiplier": 10 },
+      { "monster": "mon_dks_emissary", "freq": 5, "cost_multiplier": 1 },
+      { "monster": "mon_dks_emissary_plague", "freq": 5, "cost_multiplier": 5 },
+      { "monster": "mon_dks_emissary_flame", "freq": 5, "cost_multiplier": 20 }
     ]
   }
 ]

data/mods/Dark-Skies-Above/monsters/monattack.json

@@ -20,7 +20,7 @@
   {
     "type": "monster_attack",
     "attack_type": "melee",
-    "id": "slash",
+    "id": "tool_slash",
     "cooldown": 20,
     "move_cost": 150,
     "damage_max_instance": [ { "damage_type": "cut", "amount": 8 } ],
@@ -38,7 +38,7 @@
       [ "ARM_R", 3 ],
       [ "TORSO", 4 ]
     ],
-    "hit_dmg_u": "The %1$s slashes you!",
+    "hit_dmg_u": "The %1$s slashes you with an integrated tool!",
     "hit_dmg_npc": "The %1$s slashes <npcname>!",
     "no_dmg_msg_u": "The %1$s attempts to cut you, but fails to penetrate your armor.",
     "no_dmg_msg_npc": "The %1$s tries to cut <npcname>, but fails to penetrate your armor."

data/mods/Dark-Skies-Above/monsters/mongun.json

@@ -17,12 +17,12 @@
     "symbol": "/",
     "color": "red",
     "name": { "str": "fake firecannon" },
+    "ranged_damage": { "damage_type": "heat", "amount": 20, "armor_penetration": 30 },
     "description": "Fires an explosive bolt of firey energy.  If you're seeing this, it's a bug.",
     "skill": "launcher",
     "range": 15,
-    "ranged_damage": 5,
     "flags": [ "NEVER_JAMS" ],
-    "ammo_effects": [ "NAPALM", "PLASMA", "STREAM_BIG", "INCENDIARY" ]
+    "ammo_effects": [ "NAPALM", "PLASMA", "INCENDIARY" ]
   },
   {
     "id": "dks_mon_radgun",
@@ -31,6 +31,7 @@
     "symbol": "/",
     "color": "red",
     "name": { "str": "fake smokegun" },
+    "ranged_damage": { "damage_type": "bash", "amount": 1 },
     "description": "Shoots dangerous radioactive gas.  If you're seeing this, it's a bug.",
     "skill": "launcher",
     "range": 10,
@@ -44,6 +45,7 @@
     "symbol": "/",
     "color": "red",
     "name": { "str": "fake riotgun" },
+    "ranged_damage": { "damage_type": "bash", "amount": 1 },
     "description": "Shoots pacification gas.  If you're seeing this, it's a bug.",
     "skill": "launcher",
     "range": 25,

data/mods/Dark-Skies-Above/monsters/monspell.json

@@ -68,7 +68,7 @@
     "id": "dks_spell_mindblast",
     "name": "psi mindblast",
     "description": "blasts a target with a wave of disorienting psionic energy.  has random effects",
-    "valid_targets": [ "hostile" ],
+    "valid_targets": [ "hostile", "ground" ],
     "message": "",
     "effect": "none",
     "min_damage": 1,
@@ -85,5 +85,20 @@
       { "id": "dks_monspell_psighost" }
     ],
     "flags": [ "SILENT", "WONDER" ]
+  },
+  {
+    "type": "SPELL",
+    "id": "dks_cameraflash",
+    "name": "camera",
+    "description": "an attack that blinds the target for a few turns",
+    "valid_targets": [ "hostile" ],
+    "effect": "target_attack",
+    "effect_str": "blind",
+    "message": "",
+    "min_range": 1,
+    "max_range": 1,
+    "min_duration": 425,
+    "max_duration": 425,
+    "flags": [ "SILENT" ]
   }
 ]