Biohazard

cache/src/main/kotlin/world/gregs/voidps/cache/definition/Params.kt

@@ -137,6 +137,15 @@ object Params {
     const val REGION = 5136
     const val REQ_COMBAT = 5137
     const val REQ_ITEMS = 5138
+
+    /** Item ids a quest expects the player to bring; used by the questprep command. */
+    const val REQ_ITEM_IDS = 5267
+
+    /** Variables a quest keeps outside of its own name; used by the questreset command. */
+    const val RESET_VARS = 5268
+
+    const val PREP_VARS = 5269
+
     const val REQ_QUEST_POINTS = 5139
     const val REQ_QUESTS = 5140
     const val REQ_SKILLS = 5141
@@ -472,6 +481,9 @@ object Params {
         "regen_rate_ticks" -> REGEN_RATE_TICKS
         "region" -> REGION
         "req_combat" -> REQ_COMBAT
+        "prep_vars" -> PREP_VARS
+        "req_item_ids" -> REQ_ITEM_IDS
+        "reset_vars" -> RESET_VARS
         "req_items" -> REQ_ITEMS
         "req_quest_points" -> REQ_QUEST_POINTS
         "req_quests" -> REQ_QUESTS

data/area/kandarin/ardougne/west/west_ardougne.anims.toml

@@ -0,0 +1,8 @@
+[mourner_attack]
+id = 422
+
+[mourner_defend]
+id = 424
+
+[mourner_death]
+id = 836

data/area/kandarin/ardougne/west/west_ardougne.combat.toml

@@ -0,0 +1,10 @@
+[mourner]
+defend_anim = "mourner_defend"
+defend_sound = "mourner_defend"
+death_anim = "mourner_death"
+death_sound = "mourner_death"
+
+[mourner.melee]
+range = 1
+anim = "mourner_attack"
+target_hit = { offense = "crush", max = 20 }

data/area/kandarin/ardougne/west/west_ardougne.npcs.toml

@@ -34,8 +34,8 @@ examine = "A mourner, or plague healer."
 [mourner_1]
 id = 369
 examine = "A mourner, or plague healer."
-drop_table = "mourner"
-combat_def = "guard"
+combat_def = "mourner"
+respawn_delay = 20
 hitpoints = 190
 att = 8
 str = 8
@@ -46,8 +46,9 @@ max_hit_crush = 20
 [mourner_2]
 id = 370
 examine = "A mourner, or plague healer."
-drop_table = "mourner"
-combat_def = "guard"
+drop_table = "mourner_2"
+combat_def = "mourner"
+respawn_delay = 20
 hitpoints = 190
 att = 8
 str = 8
@@ -58,8 +59,8 @@ max_hit_crush = 20
 [mourner_3]
 id = 371
 examine = "A mourner, or plague healer."
-drop_table = "mourner"
-combat_def = "guard"
+combat_def = "mourner"
+respawn_delay = 20
 hitpoints = 190
 att = 8
 str = 8
@@ -81,8 +82,8 @@ style = "crush"
 max_hit_melee = 20
 attack_bonus = 6
 examine = "A mourner, or plague healer."
-drop_table = "mourner"
-combat_def = "guard"
+combat_def = "mourner"
+respawn_delay = 20
 max_hit_crush = 20
 
 [mourner_5]
@@ -94,8 +95,8 @@ def = 12
 style = "crush"
 max_hit_melee = 30
 examine = "A mourner, or plague healer."
-drop_table = "mourner"
-combat_def = "guard"
+combat_def = "mourner"
+respawn_delay = 20
 attack_bonus = 6
 max_hit_crush = 20
 
@@ -107,8 +108,8 @@ str = 10
 def = 10
 max_hit_melee = 20
 categories = ["human"]
-drop_table = "mourner"
-combat_def = "guard"
+combat_def = "mourner"
+respawn_delay = 20
 attack_bonus = 6
 max_hit_crush = 20
 examine = "A mourner, or plague healer."
@@ -121,8 +122,8 @@ str = 95
 def = 80
 style = "stab"
 max_hit_melee = 100
-drop_table = "mourner"
 combat_def = "guard"
+respawn_delay = 20
 max_hit_stab = 100
 examine = "A mourner, or plague healer."
 

data/area/kandarin/ardougne/west/west_ardougne.sounds.toml

@@ -0,0 +1,5 @@
+[mourner_defend]
+id = 513
+
+[mourner_death]
+id = 512

data/area/morytania/braindeath_island/braindeath_island.anims.toml

@@ -14,4 +14,28 @@ id = 5653
 id = 5651
 
 [zombie_pirate_death]
-id = 5654
+id = 5654
+
+[deal_press_press]
+id = 2808
+
+[deal_smite_control]
+id = 2810
+
+[deal_wrench_flourish]
+id = 2811
+
+[deal_bowl_fish]
+id = 2813
+
+[spirit_attack]
+id = 2804
+
+[spirit_death]
+id = 2805
+
+[spirit_parry]
+id = 2806
+
+[swab_panic]
+id = 9560

data/area/morytania/braindeath_island/braindeath_island.combat.toml

@@ -30,3 +30,15 @@ range = 1
 anim = "zombie_pirate_attack"
 target_sound = "zombie_pirate_attack"
 target_hit = { offense = "crush", max = 60 }
+
+[evil_spirit]
+defend_anim = "spirit_parry"
+defend_sound = "deal_spirit_attack"
+death_anim = "spirit_death"
+death_sound = "rumdeal_spirit_depart"
+
+[evil_spirit.melee]
+range = 1
+anim = "spirit_attack"
+target_sound = "deal_spirit_hit"
+target_hit = { offense = "slash", max = 280 }

data/area/morytania/braindeath_island/braindeath_island.npcs.toml

@@ -7,40 +7,49 @@ examine = "A shabby-looking leader."
 
 [50_luke]
 id = 2828
+dialogue = "old"
 
 [davey]
 id = 2829
 examine = "Looks like he's taking a break."
 
 [captain_donnie]
 id = 2830
+dialogue = "old"
 
 [zombie_protester]
 id = 2831
+dialogue = "old"
 hunt_mode = "spotted"
 
 [zombie_protester_2]
 id = 2832
+dialogue = "old"
 hunt_mode = "spotted"
 
 [zombie_protester_3]
 id = 2833
+dialogue = "old"
 hunt_mode = "spotted"
 
 [zombie_protester_4]
 id = 2834
+dialogue = "old"
 hunt_mode = "spotted"
 
 [zombie_protester_5]
 id = 2835
+dialogue = "old"
 hunt_mode = "spotted"
 
 [zombie_protester_6]
 id = 2836
+dialogue = "old"
 hunt_mode = "spotted"
 
 [zombie_pirate]
 id = 2837
+dialogue = "old"
 hitpoints = 520
 att = 49
 str = 50
@@ -75,6 +84,7 @@ clone = "zombie_pirate"
 
 [zombie_swab]
 id = 2843
+dialogue = "old"
 hitpoints = 500
 att = 45
 str = 50
@@ -85,32 +95,32 @@ categories = ["zombies"]
 respawn_delay = 37
 drop_table = "pirate"
 examine = "He talks a good fight."
-hunt_mode = "cowardly"
+hunt_mode = "zombie_swab"
 
 [zombie_swab_2]
 id = 2844
 clone = "zombie_swab"
-hunt_mode = "cowardly"
+hunt_mode = "zombie_swab"
 
 [zombie_swab_3]
 id = 2845
 clone = "zombie_swab"
-hunt_mode = "cowardly"
+hunt_mode = "zombie_swab"
 
 [zombie_swab_4]
 id = 2846
 clone = "zombie_swab"
-hunt_mode = "cowardly"
+hunt_mode = "zombie_swab"
 
 [zombie_swab_5]
 id = 2847
 clone = "zombie_swab"
-hunt_mode = "cowardly"
+hunt_mode = "zombie_swab"
 
 [zombie_swab_6]
 id = 2848
 clone = "zombie_swab"
-hunt_mode = "cowardly"
+hunt_mode = "zombie_swab"
 
 [fever_spider]
 id = 2850

data/area/morytania/braindeath_island/braindeath_island.objs.toml

@@ -12,4 +12,43 @@ examine = "It leads up."
 
 [braindeath_island_ladder_down]
 id = 10168
+
+[braindeath_island_stagnant_lake]
+id = 10105
+
+[braindeath_island_brewing_controls_multi]
+id = 10104
+
+[braindeath_island_brewing_controls]
+id = 10142
+
+[braindeath_island_brewing_controls_possessed]
+id = 10143
+
+[braindeath_island_brewing_controls_working]
+id = 10144
+
+[braindeath_island_output_tap]
+id = 10148
+
+[braindeath_island_tool_cupboard]
+id = 10162
+
+[braindeath_island_tool_cupboard_open]
+id = 10163
+
+[braindeath_island_pressure_lever_multi]
+id = 10164
+
+[braindeath_island_pressure_lever_up]
+id = 10165
+
+[braindeath_island_pressure_lever_down]
+id = 10166
+
+[braindeath_island_intake_hopper]
+id = 10170
+
+[braindeath_island_pressure_barrel]
+id = 10171
 examine = "I can climb down this."

data/area/morytania/braindeath_island/braindeath_island.sounds.toml

@@ -6,3 +6,32 @@ id = 924
 
 [zombie_pirate_death]
 id = 925
+
+
+[rumdeal_hopper_1]
+id = 1762
+
+[rumdeal_pressurize]
+id = 1763
+
+[rumdeal_stuff_other]
+id = 1764
+
+[rumdeal_stuff_slugling]
+id = 1765
+
+[wrench_crush]
+id = 1766
+
+# Not present in the 474 synth list; the reference plays it at the fishing spot.
+[rumdeal_bowl_fish]
+id = 2600
+
+[deal_spirit_attack]
+id = 1756
+
+[deal_spirit_hit]
+id = 1757
+
+[rumdeal_spirit_depart]
+id = 1755

data/area/morytania/canifis/canifis.teles.toml

@@ -23,12 +23,3 @@ option = "Climb-down"
 tile = { x = 3422, y = 3484 }
 to = { x = 3440, y = 9888 }
 
-[canifis_tavern_trapdoor]
-option = "Open"
-tile = { x = 3495, y = 3465 }
-to = { x = 3477, y = 9845 }
-
-[canifis_tavern_ladder]
-option = "Climb-up"
-tile = { x = 3477, y = 9846 }
-to = { x = 3495, y = 3466 }

data/area/morytania/meiyerditch/tunnels/meiyerditch_tunnels.npcs.toml

@@ -4,10 +4,12 @@ examine = "Looks like the leader of the Myreque."
 
 [sani_piliu_meiyerditch_tunnels]
 id = 1570
+hitpoints = 300
 examine = "A pretty young rogue."
 
 [harold_evans_meiyerditch_tunnels]
 id = 1571
+hitpoints = 300
 examine = "Hot headed, big built youth, who trained in the militia."
 
 [ivan_strom_meiyerditch_tunnels]

data/area/morytania/mort_myre_swamp/mort_myre_swamp.areas.toml

@@ -23,3 +23,8 @@ tags = ["no_cannon", "no_cannon_damp"]
 [filliman_grotto]
 x = [3433, 3447]
 y = [3331, 3343]
+
+# The rope bridge over the Hollows, from the tile the southern tree lands on up to the top rung
+[mort_myre_rope_bridge]
+x = [3502, 3502]
+y = [3427, 3430]