diff --git a/data/mods/Dark-Skies-Above/factions.json b/data/mods/Dark-Skies-Above/factions.json index 4be1100d941b3..8be12b6220d6d 100644 --- a/data/mods/Dark-Skies-Above/factions.json +++ b/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" ] } ] diff --git a/data/mods/Dark-Skies-Above/items/electronics.json b/data/mods/Dark-Skies-Above/items/electronics.json index 477d94a92abc4..ec07c8ac5ca45 100644 --- a/data/mods/Dark-Skies-Above/items/electronics.json +++ b/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." } ] diff --git a/data/mods/Dark-Skies-Above/items/weapons.json b/data/mods/Dark-Skies-Above/items/weapons.json deleted file mode 100644 index cb8eee3ac4ef9..0000000000000 --- a/data/mods/Dark-Skies-Above/items/weapons.json +++ /dev/null @@ -1,43 +0,0 @@ -[ - { - "id": "dks_flamesword_salvaged", - "type": "TOOL", - "category": "weapons", - "looks_like": "zweihander", - "name": { "str": "salvaged consecrator's sword" }, - "description": "A well built and decorated sword forged from dense alien metal. Its ability to conjure fireballs does not seem to respond to your will, but the cutting edge is perfectly servicable.", - "weight": "5400 g", - "volume": "3750 ml", - "price": 310000, - "bashing": 17, - "cutting": 40, - "material": "superalloy", - "symbol": "/", - "color": "light_gray", - "charges_per_use": 1, - "max_charges": 50, - "techniques": [ "WBLOCK_1", "WIDE", "BRUTAL", "SWEEP" ], - "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 1 ] ], - "flags": [ "DURABLE_MELEE", "SHEATH_SWORD", "ALWAYS_TWOHAND" ] - }, - { - "id": "dks_knightsword_salvaged", - "type": "TOOL", - "symbol": "/", - "color": "light_gray", - "looks_like": "arming_sword", - "name": { "str": "salvaged knight's sword" }, - "description": "A well built sword made from dense alien metal, in service of the knights of the New Order. The runes that adorn it no longer glow, but its cutting edge is perfectly servicable.", - "price": 100000, - "material": "superalloy", - "techniques": [ "WBLOCK_2" ], - "weight": "3360 g", - "volume": "2 L", - "bashing": 14, - "cutting": 31, - "to_hit": 1, - "category": "weapons", - "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 8 ] ], - "flags": [ "DURABLE_MELEE", "SHEATH_SWORD" ] - } -] diff --git a/data/mods/Dark-Skies-Above/monsters/mon_groups/neworder_spawns.json b/data/mods/Dark-Skies-Above/monsters/mon_groups/neworder_spawns.json index 4fbeffa7346aa..7047ed29ed493 100644 --- a/data/mods/Dark-Skies-Above/monsters/mon_groups/neworder_spawns.json +++ b/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 } ] } ] diff --git a/data/mods/Dark-Skies-Above/monsters/monattack.json b/data/mods/Dark-Skies-Above/monsters/monattack.json index 425507a90641b..65bdeff64b1ba 100644 --- a/data/mods/Dark-Skies-Above/monsters/monattack.json +++ b/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 !", "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 , but fails to penetrate your armor." diff --git a/data/mods/Dark-Skies-Above/monsters/mongun.json b/data/mods/Dark-Skies-Above/monsters/mongun.json index 4a5c1a59c0c57..907ddb1f678c4 100644 --- a/data/mods/Dark-Skies-Above/monsters/mongun.json +++ b/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, diff --git a/data/mods/Dark-Skies-Above/monsters/monspell.json b/data/mods/Dark-Skies-Above/monsters/monspell.json index 216e94c4ca33c..4a220ef885d17 100644 --- a/data/mods/Dark-Skies-Above/monsters/monspell.json +++ b/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" ] } ] diff --git a/data/mods/Dark-Skies-Above/monsters/new_order/neworder_highorder.json b/data/mods/Dark-Skies-Above/monsters/new_order/neworder_highorder.json index 74e743f43a808..dab5c417a4459 100644 --- a/data/mods/Dark-Skies-Above/monsters/new_order/neworder_highorder.json +++ b/data/mods/Dark-Skies-Above/monsters/new_order/neworder_highorder.json @@ -1,71 +1,206 @@ [ { - "//": "'high order' refers particularly to alien-derived units", - "id": "dks_neworder_pyro", + "id": "mon_dks_emissary", "type": "MONSTER", - "name": { "str": "new order consecrator" }, - "description": "Dressed from head to toe in stylized heavy armor, this holy warrior of the New Order wields an ornate greatsword. With chanted incantation, it can conjure bolts of flame from the hilt, scorching enemies before it. It has a strangely musical voice, marking it as something more than human.", - "default_faction": "neworder", - "bodytype": "human", + "name": { "str": "emissary", "str_pl": "emissaries" }, + "description": "A towering, metallic creature with a stunningly beautiful design and brilliantly shining etchings, standing atop three segmented legs. The tentacles that drift off of its central chassis are tipped with strange looking devices as it strides slowly across the shatterd landscape. This one seems less aggressive than those seen on the frontlines of the Arrival, studying its surroundings and probing things in the environment with a variety of internal tools. A sickeningly sweet gas hangs around it.", + "default_faction": "neworder_bot", + "species": [ "ROBOT", "ALIEN" ], "categories": [ "ALIEN" ], - "species": [ "ALIEN" ], - "diff": 10, - "volume": "62500 ml", - "weight": "81500 g", - "hp": 80, - "speed": 80, - "material": [ "flesh" ], - "symbol": "@", - "color": "red", - "aggression": 15, - "morale": 100, - "vision_day": 30, - "melee_skill": 5, - "melee_dice": 3, - "melee_dice_sides": 6, - "melee_cut": 6, - "armor_bash": 16, - "armor_cut": 16, - "harvest": "zombie_leather", + "diff": 20, + "volume": "875000 ml", + "weight": "200 kg", + "hp": 250, + "speed": 75, + "material": [ "superalloy" ], + "symbol": "W", + "luminance": 60, + "color": "white", + "aggression": 5, + "morale": 10, + "melee_skill": 6, + "melee_dice": 5, + "melee_dice_sides": 5, + "melee_cut": 2, + "armor_bash": 90, + "armor_cut": 90, + "armor_acid": 10, + "path_settings": { "max_dist": 30 }, + "death_drops": { "groups": [ [ "robots", 4 ], [ "eyebot", 1 ], [ "turret_searchlight", 1 ] ] }, + "anger_triggers": [ "HURT", "PLAYER_WEAK", "STALK" ], + "fear_triggers": [ "HURT" ], "special_attacks": [ + [ "PARROT", 20 ], + [ "TAZER", 20 ], + [ "RANGED_PULL", 20 ], + [ "GRAB_DRAG", 10 ], { "type": "gun", - "cooldown": 1, - "move_cost": 400, - "gun_type": "dks_mon_flamesword", - "ammo_type": "generic_no_ammo", - "fake_skills": [ [ "gun", 5 ], [ "pistol", 4 ] ], - "fake_dex": 9, - "ranges": [ [ 0, 10, "DEFAULT" ] ], + "cooldown": 2, + "move_cost": 700, + "gun_type": "dks_mon_gasgun", + "max_ammo": 1000, + "ranges": [ [ 0, 30, "DEFAULT" ] ], "require_targeting_npc": true, "require_targeting_monster": true, "laser_lock": false, - "targeting_cost": 400, - "targeting_sound": "a sharp hymn in a strange language.", - "description": "The consecrator gestures with its sword, and all before it erupts in flame!!", - "targeting_volume": 20, - "no_ammo_sound": "a battlecry!" - }, - [ "PARROT", 20 ], - { "id": "heavyslash" } + "targeting_cost": 500, + "targeting_sound": "the sound of pressurized gas hissing loudly.", + "targeting_volume": 40, + "description": "The emissary emits a stream of sedative gas!", + "no_ammo_sound": "a roar!" + } ], - "death_drops": "dks_mon_neworder_pyro", - "path_settings": { "max_dist": 10 }, - "death_function": [ "FIREBALL", "NORMAL" ], + "death_function": [ "BROKEN" ], "flags": [ "SEES", "HEARS", + "FIREPROOF", + "GOODHEARING", + "BASHES", + "DESTROYS", "NO_BREATHE", - "WARM", - "PACIFIST", - "SWARMS", + "ELECTRONIC", + "CLIMBS", + "GROUP_MORALE", + "PUSH_MON", + "PUSH_VEH", + "PRIORITIZE_TARGETS" + ] + }, + { + "id": "mon_dks_emissary_plague", + "type": "MONSTER", + "name": { "str": "emissary of pestilence", "str_pl": "emissaries of pestilence" }, + "description": "A towering, stories-tall metallic creature standing atop three long legs connected to a central chassis. It would be stunningly beautiful with its glowing golden inlays and celestial design, were it not for the gas that pours from its tentacle-mounted guns that despoils the landscape and makes your skin prickle just looking at its toxic, likely radioactive, glory. Its hums hauntingly as it moves and booming footsteps often heralded trouble to come during the Arrival, now is no different.", + "default_faction": "neworder_bot", + "species": [ "ROBOT", "ALIEN" ], + "categories": [ "ALIEN" ], + "diff": 20, + "volume": "875000 ml", + "weight": "200 kg", + "hp": 250, + "speed": 75, + "material": [ "superalloy" ], + "symbol": "W", + "luminance": 60, + "color": "green", + "aggression": 40, + "morale": 10, + "melee_skill": 6, + "melee_dice": 5, + "melee_dice_sides": 5, + "melee_cut": 2, + "armor_bash": 90, + "armor_cut": 90, + "armor_acid": 10, + "path_settings": { "max_dist": 30 }, + "emit_fields": [ { "emit_id": "emit_toxic_leak", "delay": "1 s" } ], + "death_drops": { "groups": [ [ "robots", 4 ], [ "eyebot", 1 ], [ "turret_searchlight", 1 ] ] }, + "fear_triggers": [ "HURT" ], + "special_attacks": [ + [ "PARROT", 20 ], + [ "SMASH", 30 ], + [ "LONGSWIPE", 20 ], + { + "type": "gun", + "cooldown": 2, + "move_cost": 700, + "gun_type": "dks_mon_radgun", + "max_ammo": 1000, + "ranges": [ [ 0, 20, "DEFAULT" ] ], + "require_targeting_npc": true, + "require_targeting_monster": true, + "laser_lock": false, + "targeting_cost": 500, + "targeting_sound": "an ominous rumble and hiss of gas.", + "targeting_volume": 40, + "description": "Putrid gas rolls across the landscape!", + "no_ammo_sound": "a roar!" + } + ], + "death_function": [ "BROKEN" ], + "flags": [ + "SEES", + "HEARS", + "FIREPROOF", + "GOODHEARING", "BASHES", - "GROUP_BASH", + "DESTROYS", + "NO_BREATHE", + "ELECTRONIC", + "CLIMBS", + "GROUP_MORALE", + "PUSH_MON", + "PUSH_VEH", + "PRIORITIZE_TARGETS" + ] + }, + { + "id": "mon_dks_emissary_flame", + "type": "MONSTER", + "name": { "str": "emissary of flame", "str_pl": "emissaries of flame" }, + "description": "Like all emissaries, this breathtaking metallic creature stands atop three long legs, with many more segmented tentacles eminating from its central chassis and a glowing halo about its head. This one is far more terrifying though, its claim to fame being some sort of high-intensity energy cannon, capable of rending whatever it touches asunder in an explosive burst of plasma and flame. Its unique chirping and booming footsteps often heralded trouble to come during the Arrival, and now is no different.", + "default_faction": "neworder_bot", + "species": [ "ROBOT", "ALIEN" ], + "categories": [ "ALIEN" ], + "diff": 30, + "volume": "875000 ml", + "weight": "200 kg", + "hp": 250, + "speed": 75, + "material": [ "superalloy" ], + "symbol": "W", + "luminance": 60, + "color": "dark_gray", + "aggression": 40, + "morale": 10, + "melee_skill": 6, + "melee_dice": 5, + "melee_dice_sides": 5, + "melee_cut": 2, + "armor_bash": 90, + "armor_cut": 90, + "armor_acid": 10, + "path_settings": { "max_dist": 30 }, + "death_drops": { "groups": [ [ "robots", 4 ], [ "eyebot", 1 ], [ "turret_searchlight", 1 ] ] }, + "fear_triggers": [ "HURT" ], + "special_attacks": [ + [ "PARROT", 20 ], + [ "SMASH", 30 ], + [ "LONGSWIPE", 20 ], + { + "type": "gun", + "cooldown": 2, + "move_cost": 700, + "gun_type": "dks_mon_devastator", + "max_ammo": 1000, + "ranges": [ [ 0, 30, "DEFAULT" ] ], + "require_targeting_npc": true, + "require_targeting_monster": true, + "laser_lock": false, + "targeting_cost": 600, + "targeting_sound": "the air pressure suddenly drop as the emissary charges its cannon!", + "targeting_volume": 40, + "description": "Sound returns as the emissary's cannon roars to life!!", + "no_ammo_sound": "a roar!" + } + ], + "death_function": [ "BROKEN" ], + "flags": [ + "SEES", + "HEARS", "FIREPROOF", - "ACIDPROOF", - "PATH_AVOID_DANGER_2", - "PRIORITIZE_TARGETS", - "CAN_OPEN_DOORS" + "GOODHEARING", + "BASHES", + "DESTROYS", + "NO_BREATHE", + "ELECTRONIC", + "CLIMBS", + "GROUP_MORALE", + "PUSH_MON", + "PUSH_VEH", + "PRIORITIZE_TARGETS" ] } ] diff --git a/data/mods/Dark-Skies-Above/monsters/new_order/neworder_loworder.json b/data/mods/Dark-Skies-Above/monsters/new_order/neworder_loworder.json index ecc4636791d99..9bff2da17e8ee 100644 --- a/data/mods/Dark-Skies-Above/monsters/new_order/neworder_loworder.json +++ b/data/mods/Dark-Skies-Above/monsters/new_order/neworder_loworder.json @@ -1,139 +1,78 @@ [ { - "//": "'low order' refers particularly to human-derived, humanoid units", - "id": "dks_neworder_scout", + "id": "mon_dks_glowdrone", "type": "MONSTER", - "name": { "str": "new order scout" }, - "description": "A soldier dressed in extremely light armor and a cloak that shifts subtly to camoflauge them against their surroundings. Armed with a fine blade and quite quick on their feet, they are often found in uncivilized locations, keeping tabs on the ever shifting Frontier.", - "default_faction": "neworder", - "bodytype": "human", + "name": { "str": "order surveillance drone" }, + "description": "A small, sleek, white-plated robot with the golden insignia of the Order stamped on it. Capable of limited flight, it hovers about the ruins of the former world, onboard cameras and spotlights impartial witness to the chaos around it. Who knows might be watching on the other side…", + "default_faction": "neworder_bot", + "looks_like": "mon_eyebot", "categories": [ "ALIEN" ], - "species": [ "ALIEN", "HUMAN" ], - "volume": "62500 ml", - "weight": "81500 g", - "hp": 80, - "speed": 120, - "material": [ "flesh" ], - "symbol": "@", - "color": "green", - "aggression": 5, - "morale": 100, - "melee_skill": 6, - "melee_dice": 3, - "melee_dice_sides": 4, - "melee_cut": 5, + "species": [ "ROBOT" ], + "volume": "30000 ml", + "weight": "40750 g", + "hp": 40, + "speed": 100, + "material": [ "steel" ], + "symbol": "d", + "color": "white", "dodge": 3, - "armor_bash": 6, - "armor_cut": 6, - "harvest": "dks_mhuman_chipped", - "special_attacks": [ [ "PARROT", 20 ], { "id": "knockdown" }, { "id": "slash" } ], - "death_drops": "dks_mon_neworder_scout", - "path_settings": { "max_dist": 20 }, - "anger_triggers": [ "PLAYER_CLOSE", "PLAYER_WEAK", "STALK" ], - "death_function": [ "NORMAL" ], - "flags": [ - "SEES", - "HEARS", - "NO_BREATHE", - "WARM", - "BASHES", - "GROUP_BASH", - "BLEED", - "HUMAN", - "PATH_AVOID_DANGER_2", - "PRIORITIZE_TARGETS", - "CLIMBS" - ] - }, - { - "id": "dks_neworder_cop", - "type": "MONSTER", - "name": { "str": "new order vigilant" }, - "description": "A low ranking warpriest, a gendarmerie by any other name, assigned to the Frontier to supplement more conventional forces. They are in light armor to preserve both their agility and ability to channel psionics, which they use in conjunction with a small shield and shock baton.", - "default_faction": "neworder", - "bodytype": "human", - "categories": [ "ALIEN" ], - "species": [ "ALIEN", "HUMAN" ], - "volume": "62500 ml", - "weight": "81500 g", - "hp": 90, - "speed": 110, - "material": [ "flesh" ], - "symbol": "@", - "color": "blue", - "aggression": 15, - "morale": 100, - "vision_day": 30, - "melee_skill": 5, - "melee_dice": 2, - "melee_dice_sides": 5, - "melee_damage": [ { "damage_type": "electric", "amount": 4 } ], - "melee_cut": 0, - "dodge": 2, "armor_bash": 8, - "armor_cut": 8, - "harvest": "dks_mhuman_chipped", - "special_attacks": [ [ "PARROT", 20 ], { "type": "spell", "spell_data": { "id": "dks_monspell_panic" }, "cooldown": 10 } ], - "death_drops": "dks_mon_neworder_cop", + "armor_cut": 10, + "luminance": 5, + "special_attacks": [ [ "SEARCHLIGHT", 1 ] ], "path_settings": { "max_dist": 5 }, - "death_function": [ "NORMAL" ], - "flags": [ - "SEES", - "HEARS", - "NO_BREATHE", - "WARM", - "SWARMS", - "BASHES", - "GROUP_BASH", - "FIREPROOF", - "HUMAN", - "PATH_AVOID_DANGER_1", - "PRIORITIZE_TARGETS", - "CLIMBS" - ] + "death_drops": { "groups": [ [ "robots", 4 ], [ "eyebot", 1 ], [ "turret_searchlight", 1 ] ] }, + "death_function": [ "BROKEN" ], + "flags": [ "SEES", "FLIES", "ELECTRONIC", "COLDPROOF", "NO_BREATHE", "NOHEAD", "PRIORITIZE_TARGETS" ] }, { - "id": "dks_neworder_knight", + "id": "mon_dks_scidrone", "type": "MONSTER", - "name": { "str": "new order knight" }, - "description": "A human clad in strange plate armor at that pulses with laser etched runes, mixed with more 'modern' looking combat gear. Armed with a runed sword that can cut through many materials with ease, a shield emblazed with the symbol of a sun being pierced by a sword, and unshakable faith in whatever otherworldy god they venerate, they stride forward to put down enemies of the Order wherever they may be.", - "default_faction": "neworder", - "bodytype": "human", + "name": { "str": "order seeker drone" }, + "description": "A small, sleek, white-plated robot with the golden insignia of the Order stamped on it. Capable of limited flight, it hovers about the ruins of the former world, using a suite of rather sharp looking retractable tools, a bright camera flash, and integrated 'arms' to manipulate the world around it with surprising dexterity and procure samples. It seems to watch you closely…", + "default_faction": "neworder_bot", + "looks_like": "mon_eyebot", "categories": [ "ALIEN" ], - "species": [ "ALIEN" ], - "volume": "62500 ml", - "weight": "81500 g", - "hp": 90, - "speed": 90, - "material": [ "flesh" ], - "symbol": "@", - "color": "light_gray", - "aggression": 15, + "species": [ "ROBOT" ], + "volume": "30000 ml", + "weight": "40750 g", + "hp": 50, + "speed": 100, + "material": [ "steel" ], + "symbol": "d", + "aggression": -5, "morale": 100, - "vision_day": 30, - "melee_skill": 6, - "melee_dice": 3, - "melee_dice_sides": 4, - "melee_cut": 4, - "armor_bash": 16, - "armor_cut": 16, - "harvest": "dks_mhuman_chipped", - "special_attacks": [ [ "PARROT", 20 ], { "id": "slash" } ], - "death_drops": "dks_mon_neworder_knight", - "path_settings": { "max_dist": 10 }, - "death_function": [ "NORMAL" ], + "color": "light_gray", + "dodge": 3, + "armor_bash": 10, + "armor_cut": 12, + "luminance": 10, + "vision_night": 5, + "special_attacks": [ + [ "TAZER", 12 ], + { "id": "tool_slash" }, + { + "type": "spell", + "spell_data": { "id": "dks_cameraflash" }, + "cooldown": 40, + "monster_message": "%1$s blinds %3$s with its integrated camera!" + } + ], + "path_settings": { "max_dist": 5 }, + "anger_triggers": [ "HURT", "PLAYER_WEAK", "STALK" ], + "death_drops": { "groups": [ [ "robots", 4 ], [ "skitterbot", 1 ] ] }, + "death_function": [ "BROKEN" ], "flags": [ "SEES", - "HEARS", + "FLIES", + "ELECTRONIC", + "COLDPROOF", "NO_BREATHE", - "WARM", - "SWARMS", - "BASHES", - "GROUP_BASH", - "FIREPROOF", - "ACIDPROOF", + "NOHEAD", + "HIT_AND_RUN", + "PRIORITIZE_TARGETS", "PATH_AVOID_DANGER_1", - "PRIORITIZE_TARGETS" + "CAN_OPEN_DOORS" ] } ] diff --git a/data/mods/Dark-Skies-Above/monsters/new_order/neworder_misc.json b/data/mods/Dark-Skies-Above/monsters/new_order/neworder_misc.json deleted file mode 100644 index 704a1f09fc71d..0000000000000 --- a/data/mods/Dark-Skies-Above/monsters/new_order/neworder_misc.json +++ /dev/null @@ -1,205 +0,0 @@ -[ - { - "id": "mon_dks_emissary", - "type": "MONSTER", - "name": { "str": "emissary", "str_pl": "emissaries" }, - "description": "A towering, metallic creature with a stunningly beautiful design and brilliantly shining etchings, standing atop three segmented legs. The tentacles that drift off of its central chassis are tipped with strange looking devices as it strides slowly across the shatterd landscape. This one seems less aggressive than those seen on the frontlines of the Arrival, studying its surroundings and probing things in the environment with a variety of internal tools. A sickeningly sweet gas hangs around it.", - "default_faction": "neworder", - "species": [ "ROBOT", "ALIEN" ], - "categories": [ "ALIEN" ], - "diff": 20, - "volume": "875000 ml", - "weight": "200 kg", - "hp": 250, - "speed": 75, - "material": [ "superalloy" ], - "symbol": "W", - "luminance": 60, - "color": "white", - "aggression": 40, - "morale": 10, - "melee_skill": 6, - "melee_dice": 5, - "melee_dice_sides": 5, - "melee_cut": 2, - "armor_bash": 90, - "armor_cut": 90, - "path_settings": { "max_dist": 30 }, - "death_drops": { "groups": [ [ "robots", 4 ], [ "eyebot", 1 ], [ "turret_searchlight", 1 ] ] }, - "fear_triggers": [ "HURT" ], - "special_attacks": [ - [ "PARROT", 20 ], - [ "TAZER", 20 ], - [ "RANGED_PULL", 20 ], - [ "GRAB_DRAG", 10 ], - { - "type": "gun", - "cooldown": 2, - "move_cost": 700, - "gun_type": "dks_mon_gasgun", - "max_ammo": 1000, - "ranges": [ [ 0, 30, "DEFAULT" ] ], - "require_targeting_npc": true, - "require_targeting_monster": true, - "laser_lock": false, - "targeting_cost": 500, - "targeting_sound": "the sound of pressurized gas hissing loudly.", - "targeting_volume": 40, - "description": "The emissary emits a stream of sedative gas!", - "no_ammo_sound": "a roar!" - } - ], - "death_function": [ "BROKEN" ], - "flags": [ - "SEES", - "HEARS", - "FIREPROOF", - "ACIDPROOF", - "GOODHEARING", - "BASHES", - "DESTROYS", - "NO_BREATHE", - "ELECTRONIC", - "CLIMBS", - "GROUP_MORALE", - "PUSH_MON", - "PUSH_VEH", - "PRIORITIZE_TARGETS" - ] - }, - { - "id": "mon_dks_emissary_plague", - "type": "MONSTER", - "name": { "str": "emissary of pestilence", "str_pl": "emissaries of pestilence" }, - "description": "A towering, stories-tall metallic creature standing atop three long legs connected to a central chassis. It would be stunningly beautiful with its glowing golden inlays and celestial design, were it not for the gas that pours from its tentacle-mounted guns that despoils the landscape and makes your skin prickle just looking at its toxic, likely radioactive, glory. Its hums hauntingly as it moves and booming footsteps often heralded trouble to come during the Arrival, now is no different.", - "default_faction": "neworder", - "species": [ "ROBOT", "ALIEN" ], - "categories": [ "ALIEN" ], - "diff": 20, - "volume": "875000 ml", - "weight": "200 kg", - "hp": 250, - "speed": 75, - "material": [ "superalloy" ], - "symbol": "W", - "luminance": 60, - "color": "green", - "aggression": 40, - "morale": 10, - "melee_skill": 6, - "melee_dice": 5, - "melee_dice_sides": 5, - "melee_cut": 2, - "armor_bash": 90, - "armor_cut": 90, - "path_settings": { "max_dist": 30 }, - "emit_fields": [ { "emit_id": "emit_toxic_leak", "delay": "1 s" } ], - "death_drops": { "groups": [ [ "robots", 4 ], [ "eyebot", 1 ], [ "turret_searchlight", 1 ] ] }, - "fear_triggers": [ "HURT" ], - "special_attacks": [ - [ "PARROT", 20 ], - [ "SMASH", 30 ], - [ "LONGSWIPE", 20 ], - { - "type": "gun", - "cooldown": 2, - "move_cost": 700, - "gun_type": "dks_mon_radgun", - "max_ammo": 1000, - "ranges": [ [ 0, 20, "DEFAULT" ] ], - "require_targeting_npc": true, - "require_targeting_monster": true, - "laser_lock": false, - "targeting_cost": 500, - "targeting_sound": "an ominous rumble and hiss of gas.", - "targeting_volume": 40, - "description": "Putrid gas rolls across the landscape!", - "no_ammo_sound": "a roar!" - } - ], - "death_function": [ "BROKEN" ], - "flags": [ - "SEES", - "HEARS", - "FIREPROOF", - "ACIDPROOF", - "GOODHEARING", - "BASHES", - "DESTROYS", - "NO_BREATHE", - "ELECTRONIC", - "CLIMBS", - "GROUP_MORALE", - "PUSH_MON", - "PUSH_VEH", - "PRIORITIZE_TARGETS" - ] - }, - { - "id": "mon_dks_emissary_flame", - "type": "MONSTER", - "name": { "str": "emissary of flame", "str_pl": "emissaries of flame" }, - "description": "Like all emissaries, this breathtaking metallic creature stands atop three long legs, with many more segmented tentacles eminating from its central chassis and a glowing halo about its head. This one is far more terrifying though, its claim to fame being some sort of high-intensity energy cannon, capable of rending whatever it touches asunder in an explosive burst of plasma and flame. Its unique chirping and booming footsteps often heralded trouble to come during the Arrival, and now is no different.", - "default_faction": "neworder", - "species": [ "ROBOT", "ALIEN" ], - "categories": [ "ALIEN" ], - "diff": 30, - "volume": "875000 ml", - "weight": "200 kg", - "hp": 250, - "speed": 75, - "material": [ "superalloy" ], - "symbol": "W", - "luminance": 60, - "color": "dark_gray", - "aggression": 40, - "morale": 10, - "melee_skill": 6, - "melee_dice": 5, - "melee_dice_sides": 5, - "melee_cut": 2, - "armor_bash": 90, - "armor_cut": 90, - "path_settings": { "max_dist": 30 }, - "death_drops": { "groups": [ [ "robots", 4 ], [ "eyebot", 1 ], [ "turret_searchlight", 1 ] ] }, - "fear_triggers": [ "HURT" ], - "special_attacks": [ - [ "PARROT", 20 ], - [ "SMASH", 30 ], - [ "LONGSWIPE", 20 ], - { - "type": "gun", - "cooldown": 2, - "move_cost": 700, - "gun_type": "dks_mon_devastator", - "max_ammo": 1000, - "ranges": [ [ 0, 30, "DEFAULT" ] ], - "require_targeting_npc": true, - "require_targeting_monster": true, - "laser_lock": false, - "targeting_cost": 600, - "targeting_sound": "the air pressure suddenly drop as the emissary charges its cannon!", - "targeting_volume": 40, - "description": "Sound returns as the emissary's cannon roars to life!!", - "no_ammo_sound": "a roar!" - } - ], - "death_function": [ "BROKEN" ], - "flags": [ - "SEES", - "HEARS", - "FIREPROOF", - "ACIDPROOF", - "GOODHEARING", - "BASHES", - "DESTROYS", - "NO_BREATHE", - "ELECTRONIC", - "CLIMBS", - "GROUP_MORALE", - "PUSH_MON", - "PUSH_VEH", - "PRIORITIZE_TARGETS" - ] - } -] diff --git a/data/mods/Dark-Skies-Above/items/clothing+armor.json b/data/mods/Dark-Skies-Above/obsolete.json similarity index 61% rename from data/mods/Dark-Skies-Above/items/clothing+armor.json rename to data/mods/Dark-Skies-Above/obsolete.json index c7489ff632ae3..371eb68d6db18 100644 --- a/data/mods/Dark-Skies-Above/items/clothing+armor.json +++ b/data/mods/Dark-Skies-Above/obsolete.json @@ -1,4 +1,45 @@ [ + { + "id": "dks_flamesword_salvaged", + "type": "TOOL", + "category": "weapons", + "looks_like": "zweihander", + "name": { "str": "salvaged consecrator's sword" }, + "description": "A well built and decorated sword forged from dense alien metal. Its ability to conjure fireballs does not seem to respond to your will, but the cutting edge is perfectly servicable.", + "weight": "5400 g", + "volume": "3750 ml", + "price": 310000, + "bashing": 17, + "cutting": 40, + "material": "superalloy", + "symbol": "/", + "color": "light_gray", + "charges_per_use": 1, + "max_charges": 50, + "techniques": [ "WBLOCK_1", "WIDE", "BRUTAL", "SWEEP" ], + "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 1 ] ], + "flags": [ "DURABLE_MELEE", "SHEATH_SWORD", "ALWAYS_TWOHAND" ] + }, + { + "id": "dks_knightsword_salvaged", + "type": "TOOL", + "symbol": "/", + "color": "light_gray", + "looks_like": "arming_sword", + "name": { "str": "salvaged knight's sword" }, + "description": "A well built sword made from dense alien metal, in service of the knights of the New Order. The runes that adorn it no longer glow, but its cutting edge is perfectly servicable.", + "price": 100000, + "material": "superalloy", + "techniques": [ "WBLOCK_2" ], + "weight": "3360 g", + "volume": "2 L", + "bashing": 14, + "cutting": 31, + "to_hit": 1, + "category": "weapons", + "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 8 ] ], + "flags": [ "DURABLE_MELEE", "SHEATH_SWORD" ] + }, { "//": "a bit of a placeholder until I work on this more in-depth", "id": "dks_neworder_armor_salvaged",