Add Zogre Flesh Eaters

data/area/kandarin/feldip_hills/feldip_hills.npc-spawns.toml

@@ -228,5 +228,4 @@ spawns = [
   { id = "mound_feldip_hills", x = 2465, y = 2911, members = true },
   { id = "mound_feldip_hills", x = 2466, y = 2921, members = true },
   { id = "wolf", x = 2470, y = 2865 },
-  { id = "rantz", x = 2630, y = 2981 },
 ]

data/area/kandarin/feldip_hills/feldip_hills.npcs.toml

@@ -80,6 +80,7 @@ examine = "A large and contentious lady ogre."
 
 [rantz_feldip_hills_2]
 id = 8659
+dialogue = "ogre"
 
 [mound_feldip_hills]
 id = 9466
@@ -115,11 +116,6 @@ id = 13174
 id = 5073
 examine = "This bird obviously doesn't believe in subtlety."
 
-[rantz]
-id = 3587
-wander_range = 4
-examine = "A large dim looking humanoid."
-
 [ogre_boat_feldip_hills_2]
 id = 3472
 
@@ -128,6 +124,7 @@ id = 3467
 
 [rantz_feldip_hills_2_2]
 id = 1010
+dialogue = "ogre"
 
 [fishing_spot_big_net_harpoon_feldip_hills]
 id = 7044

data/area/kandarin/feldip_hills/jiggig/dungeon/jiggig_dungeon.areas.toml

@@ -0,0 +1,5 @@
+[zogre_blackened_area]
+x = [2447, 2448]
+y = [9459, 9467]
+level = 2
+tags = ["dark"]

data/area/kandarin/feldip_hills/jiggig/dungeon/jiggig_dungeon.combat.toml

@@ -0,0 +1,31 @@
+[zogre_jiggig_dungeon]
+attack_speed = 6
+defend_anim = "ogre_defend"
+defend_sound = "zogre_hit"
+death_anim = "ogre_death"
+death_sound = "zogre_death"
+
+[zogre_jiggig_dungeon.melee]
+range = 1
+anim = "ogre_attack"
+target_sound = "zogre_attack"
+target_hit = { offense = "crush", max = 50 }
+impact_disease = 10
+
+[zogre_jiggig_dungeon_2]
+clone = "zogre_jiggig_dungeon"
+
+[zogre_jiggig_dungeon_2.melee]
+clone = "zogre_jiggig_dungeon.melee"
+
+[zogre_jiggig_dungeon_3]
+clone = "zogre_jiggig_dungeon"
+
+[zogre_jiggig_dungeon_3.melee]
+clone = "zogre_jiggig_dungeon.melee"
+
+[zogre_jiggig_dungeon_4]
+clone = "zogre_jiggig_dungeon"
+
+[zogre_jiggig_dungeon_4.melee]
+clone = "zogre_jiggig_dungeon.melee"

data/area/kandarin/feldip_hills/jiggig/jiggig.combat.toml

@@ -0,0 +1,75 @@
+[zogre_jiggig]
+attack_speed = 6
+defend_anim = "ogre_defend"
+defend_sound = "zogre_hit"
+death_anim = "ogre_death"
+death_sound = "zogre_death"
+
+[zogre_jiggig.melee]
+range = 1
+anim = "ogre_attack"
+target_sound = "zogre_attack"
+target_hit = { offense = "crush", max = 50 }
+impact_disease = 10
+
+[zogre_jiggig_2]
+clone = "zogre_jiggig"
+
+[zogre_jiggig_2.melee]
+clone = "zogre_jiggig.melee"
+
+[zogre_jiggig_3]
+clone = "zogre_jiggig"
+
+[zogre_jiggig_3.melee]
+clone = "zogre_jiggig.melee"
+
+[zogre_jiggig_4]
+clone = "zogre_jiggig"
+
+[zogre_jiggig_4.melee]
+clone = "zogre_jiggig.melee"
+
+[zogre_jiggig_5]
+clone = "zogre_jiggig"
+
+[zogre_jiggig_5.melee]
+clone = "zogre_jiggig.melee"
+
+[zogre_jiggig_6]
+clone = "zogre_jiggig"
+
+[zogre_jiggig_6.melee]
+clone = "zogre_jiggig.melee"
+
+[zogre_jiggig_7]
+clone = "zogre_jiggig"
+
+[zogre_jiggig_7.melee]
+clone = "zogre_jiggig.melee"
+
+[skogre_jiggig]
+attack_speed = 6
+defend_anim = "ogre_defend"
+defend_sound = "skelly_hit"
+death_anim = "ogre_death"
+death_sound = "zogre_death"
+
+[skogre_jiggig.melee]
+range = 1
+anim = "ogre_attack"
+target_sound = "giant_attack"
+target_hit = { offense = "crush", max = 50 }
+impact_disease = 10
+
+[skogre_jiggig_2]
+clone = "skogre_jiggig"
+
+[skogre_jiggig_2.melee]
+clone = "skogre_jiggig.melee"
+
+[skogre_jiggig_3]
+clone = "skogre_jiggig"
+
+[skogre_jiggig_3.melee]
+clone = "skogre_jiggig.melee"

data/area/kandarin/feldip_hills/jiggig/jiggig.npc-spawns.toml

@@ -3,7 +3,7 @@ spawns = [
   { id = "uglug_nar", x = 2442, y = 3049, members = true },
   { id = "pilg", x = 2443, y = 3046, members = true },
   { id = "grug", x = 2446, y = 3049, members = true },
-  { id = "ogre_guard_jiggig", x = 2454, y = 3047, members = true },
+  { id = "zogre_ogre_guard", x = 2454, y = 3047, members = true },
   { id = "ogre_guard_jiggig_2", x = 2443, y = 3038, members = true },
   { id = "ogre_guard_jiggig_2", x = 2452, y = 3030, members = true },
   { id = "zogre_jiggig", x = 2486, y = 3048, members = true },

data/area/kandarin/feldip_hills/jiggig/jiggig.npcs.toml

@@ -1,24 +1,30 @@
 [grish]
 id = 2038
+dialogue = "ogre"
 examine = "An ogre shaman"
 
 [uglug_nar]
 id = 2039
+dialogue = "ogre"
 examine = "An ogre shaman"
 
 [pilg]
 id = 2040
+dialogue = "ogre"
 examine = "They're done for!"
 
 [grug]
 id = 2041
+dialogue = "ogre"
 examine = "They're done for!"
 
-[ogre_guard_jiggig]
+[zogre_ogre_guard]
 id = 2042
+dialogue = "ogre"
 
 [ogre_guard_jiggig_2]
 id = 2043
+dialogue = "ogre"
 
 [zogre_jiggig]
 id = 2044
@@ -58,6 +64,7 @@ examine = "An undead skeletal ogre."
 
 [skogre_jiggig_2]
 id = 2056
+retaliates = false
 clone = "skogre_jiggig"
 
 [skogre_jiggig_3]
@@ -66,20 +73,24 @@ clone = "skogre_jiggig"
 
 [zogre_jiggig_3]
 id = 2051
+clone = "zogre_jiggig"
 
 [zogre_jiggig_4]
 id = 2052
+clone = "zogre_jiggig"
 
 [zogre_jiggig_5]
 id = 2053
+clone = "zogre_jiggig"
 
 [zogre_jiggig_6]
 id = 2054
+clone = "zogre_jiggig"
 
 [zogre_jiggig_7]
 id = 2055
-categories = ["ogres"]
-examine = "A partially decomposing zombie ogre."
+retaliates = false
+clone = "zogre_jiggig"
 
 [ogre_cook_jiggig]
 id = 791

data/area/kandarin/yanille/yanille.objs.toml

@@ -2,6 +2,10 @@
 id = 9302
 examine = "A rather strategically placed hole, which appears to be in the ground."
 
+[zogre_outdoor_bell]
+id = 6847
+examine = "A bell to attract the attention of the secretary."
+
 [yanille_underwall_tunnel_castle_wall]
 id = 9301
 examine = "A well constructed castle wall."

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

@@ -19,7 +19,7 @@ range = 1
 anim = "spider_large_attack"
 target_sound = "insect_attack"
 impact_regardless = true
-impact_disease = 80
+impact_disease = 8
 
 [zombie_pirate]
 attack_speed = 4

data/entity/npc/humanoid/jogre/jogre.combat.toml

@@ -10,5 +10,5 @@ death_sound = "giant_death"
 chance = 75
 range = 1
 anim = "ogre_attack"
-target_sound = "giant_attack"
+target_sound = "moss_giant_attack"
 target_hit = { offense = "crush", max = 80 }

data/entity/player/human.anims.toml

@@ -22,6 +22,9 @@ id = 422
 [unarmed_kick]
 id = 423
 
+[human_dancing]
+id = 818
+
 [unarmed_block]
 id = 422
 

data/quest/members/big_chompy_bird_hunting/big_chompy_bird_hunting.anims.toml

@@ -5,4 +5,41 @@ id = 6800
 id = 6802
 
 [chompy_bird_death]
-id = 6823
+id = 6823
+
+# Cache-canonical names from D:/Names. Some collide on id with existing aliases; that's allowed.
+[chompy_update_attack]
+id = 6761
+
+[chompy_update_death]
+id = 6762
+
+[chompy_update_fly_down]
+id = 6766
+
+[jubbly_update_attack]
+id = 6800
+
+[jubbly_update_death]
+id = 6801
+
+[jubbly_update_fly_down]
+id = 6805
+
+[human_cooking]
+id = 896
+
+[chompy_toad_inflate]
+id = 1019
+
+[human_chompybird_ogrebellows]
+id = 1026
+
+[human_ogre_fletching]
+id = 4433
+
+[human_castcurse_walkmerge]
+id = 11428
+
+[human_openchest]
+id = 536

data/quest/members/big_chompy_bird_hunting/big_chompy_bird_hunting.gfx.toml

@@ -1,2 +1,8 @@
 [ogre_bellows]
 id = 241
+
+[chompy_toad_exploding]
+id = 240
+
+[ogre_arrow_travel]
+id = 242

data/quest/members/big_chompy_bird_hunting/big_chompy_bird_hunting.npcs.toml

@@ -8,5 +8,29 @@ combat_def = "chompy_bird"
 slayer_xp = 10.0
 categories = ["birds"]
 immune_poison = true
-drop_table = "chompy_bird"
+# No drop_table — Java intercepts death and transforms into a pluckable carcass instead.
 examine = "A large boisterous bird, a delicacy for ogres."
+
+[jubbly_bird_chompy]
+id = 3476
+hitpoints = 100
+att = 5
+str = 5
+def = 3
+combat_def = "chompy_bird"
+slayer_xp = 10.0
+categories = ["birds"]
+immune_poison = true
+examine = "A large boisterous bird, a delicacy for ogres."
+
+[plucked_chompy]
+id = 1016
+examine = "A large boisterous bird, a delicacy for ogres."
+
+[plucked_jubbly]
+id = 3477
+examine = "A large boisterous bird, a delicacy for ogres."
+
+[bloated_toad_placed]
+id = 1014
+examine = "A bloated toad."

data/quest/members/big_chompy_bird_hunting/big_chompy_bird_hunting.sounds.toml

@@ -12,3 +12,18 @@ id = 1451
 
 [chompy_bird_squak]
 id = 1453
+
+[ogre_bow]
+id = 1452
+
+[ogre_bellows_suck]
+id = 1454
+
+[ogre_bellows]
+id = 1455
+
+[spit_roast]
+id = 1456
+
+[toad_croak]
+id = 1458