Add imp catching with magic boxes

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

@@ -159,21 +159,21 @@ spawns = [
   { id = "black_warlock_feldip_hills", x = 2558, y = 2914 },
   { id = "black_warlock_feldip_hills", x = 2563, y = 2920 },
   { id = "black_warlock_feldip_hills", x = 2566, y = 2886 },
-  { id = "barb_tailed_kebbit_feldip_hills", x = 2565, y = 2903 },
-  { id = "barb_tailed_kebbit_feldip_hills", x = 2567, y = 2903 },
-  { id = "barb_tailed_kebbit_feldip_hills", x = 2572, y = 2929 },
-  { id = "barb_tailed_kebbit_feldip_hills", x = 2572, y = 2931 },
-  { id = "barb_tailed_kebbit_feldip_hills", x = 2573, y = 2896 },
-  { id = "barb_tailed_kebbit_feldip_hills", x = 2573, y = 2898 },
-  { id = "barb_tailed_kebbit_feldip_hills", x = 2574, y = 2909 },
-  { id = "barb_tailed_kebbit_feldip_hills", x = 2574, y = 2911 },
-  { id = "barb_tailed_kebbit_feldip_hills", x = 2575, y = 2916 },
-  { id = "barb_tailed_kebbit_feldip_hills", x = 2575, y = 2926 },
-  { id = "barb_tailed_kebbit_feldip_hills", x = 2577, y = 2926 },
-  { id = "barb_tailed_kebbit_feldip_hills", x = 2581, y = 2884 },
-  { id = "barb_tailed_kebbit_feldip_hills", x = 2581, y = 2886 },
-  { id = "barb_tailed_kebbit_feldip_hills", x = 2584, y = 2912 },
-  { id = "barb_tailed_kebbit_feldip_hills", x = 2584, y = 2914 },
+  { id = "barb_tailed_kebbit", x = 2565, y = 2903 },
+  { id = "barb_tailed_kebbit", x = 2567, y = 2903 },
+  { id = "barb_tailed_kebbit", x = 2572, y = 2929 },
+  { id = "barb_tailed_kebbit", x = 2572, y = 2931 },
+  { id = "barb_tailed_kebbit", x = 2573, y = 2896 },
+  { id = "barb_tailed_kebbit", x = 2573, y = 2898 },
+  { id = "barb_tailed_kebbit", x = 2574, y = 2909 },
+  { id = "barb_tailed_kebbit", x = 2574, y = 2911 },
+  { id = "barb_tailed_kebbit", x = 2575, y = 2916 },
+  { id = "barb_tailed_kebbit", x = 2575, y = 2926 },
+  { id = "barb_tailed_kebbit", x = 2577, y = 2926 },
+  { id = "barb_tailed_kebbit", x = 2581, y = 2884 },
+  { id = "barb_tailed_kebbit", x = 2581, y = 2886 },
+  { id = "barb_tailed_kebbit", x = 2584, y = 2912 },
+  { id = "barb_tailed_kebbit", x = 2584, y = 2914 },
   { id = "spined_larupia", x = 2544, y = 2910, members = true },
   { id = "spined_larupia", x = 2550, y = 2904, members = true },
   { id = "spined_larupia", x = 2556, y = 2895, members = true },

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

@@ -55,7 +55,7 @@ respawn_delay = 10
 collision = "sky"
 examine = "A black warlock. The air seems to distort wherever it passes."
 
-[barb_tailed_kebbit_feldip_hills]
+[barb_tailed_kebbit]
 id = 5088
 examine = "It uses its tail to hunt and skewer fish."
 

data/entity/npc/hunt_modes.toml

@@ -148,3 +148,24 @@ id = "swamp_lizard,orange_salamander,red_salamander,black_salamander"
 check_visual = "line_of_sight"
 check_not_busy = true
 find_keep_hunting = true
+
+[box_trap]
+type = "npc"
+id = "chinchompa,carnivorous_chinchompa,ferret,pawya,grenwall"
+check_visual = "line_of_sight"
+check_not_busy = true
+find_keep_hunting = true
+
+[deadfall]
+type = "npc"
+id = "wild_kebbit,barb_tailed_kebbit,prickly_kebbit,sabre_toothed_kebbit"
+check_visual = "line_of_sight"
+check_not_busy = true
+find_keep_hunting = true
+
+[magic_box]
+type = "npc"
+id = "imp"
+check_visual = "line_of_sight"
+check_not_busy = true
+find_keep_hunting = true

data/skill/hunter/hunter.anims.toml

@@ -35,11 +35,38 @@ id = 5172
 [chinchompa_catch]
 id = 5184
 
+[chinchompa_fail]
+id = 5185
+
+[ferret_catch]
+id = 5191
+
+[ferret_fail]
+id = 5192
+
+[pawya_catch]
+id = 8615
+
+[pawya_fail]
+id = 8611
+
+[grenwall_catch]
+id = 8602
+
+[grenwall_fail]
+id = 8602
+
+[imp_catch]
+id = 5218
+
+[imp_fail]
+id = 5285
+
 [kebbit_catch]
-id = 5208
+id = 5275
 
 [kebbit_fail]
-id = 5208
+id = 5277
 
 [net_catch]
 id = 827

data/skill/hunter/hunter.npcs.toml

@@ -8,23 +8,23 @@ id = 5071
 
 [hunting_box_trap_npc]
 id = 5077
-hunt_mode = "hunter_trap"
+hunt_mode = "box_trap"
 hunt_range = 2
 
 [hunting_box_trap_npc_off]
 id = 5078
 
 [hunting_deadfall_trap_npc]
 id = 5090
-hunt_mode = "hunter_trap"
+hunt_mode = "deadfall"
 hunt_range = 3
 
 [hunting_deadfall_trap_npc_off]
 id = 5091
 
 [hunting_imptrap_npc]
 id = 5101
-hunt_mode = "hunter_trap"
+hunt_mode = "magic_box"
 hunt_range = 2
 
 [hunting_imptrap_npc_off]
@@ -48,7 +48,7 @@ id = 5119
 
 [afr_hunting_deadfall_trap_npc] # As a first resort
 id = 7037
-hunt_mode = "hunter_trap"
+hunt_mode = "deadfall"
 hunt_range = 3
 
 [afr_hunting_deadfall_trap_npc_off]

data/skill/hunter/hunter.objs.toml

@@ -127,11 +127,29 @@ id = 19178
 [snare_wimpy_bird]
 id = 28930
 
+[magic_box]
+id = 19223
+
+[magic_box_fail]
+id = 19224
+
+[magic_box_catching]
+id = 19225
+
+[magic_box_caught]
+id = 19226
+
 # Box trap — triggered states
-[box_trap_grey_chinchompa]
+[box_trap_catching]
+id = 19188
+
+[box_trap_ferret]
+id = 19190
+
+[box_trap_chinchompa]
 id = 28557
 
-[box_trap_red_chinchompa]
+[box_trap_carnivorous_chinchompa]
 id = 28558
 
 [box_trap_pawya]
@@ -140,10 +158,32 @@ id = 28567
 [box_trap_grenwall]
 id = 28906
 
-# Boulder trap — triggered state
-[boulder_trap_barb_tailed_kebbit]
+# Boulder trap — falling boulder states (per creature, boulder mid-crush)
+[boulder_trap_wild_kebbit_catching]
+id = 19213
+
+[boulder_trap_barb_tailed_kebbit_catching]
+id = 19211
+
+[boulder_trap_prickly_kebbit_catching]
 id = 19207
 
+[boulder_trap_sabre_toothed_kebbit_catching]
+id = 19209
+
+# Boulder trap — caught states (boulder dropped on creature)
+[boulder_trap_wild_kebbit]
+id = 19215
+
+[boulder_trap_sabre_toothed_kebbit]
+id = 19216
+
+[boulder_trap_barb_tailed_kebbit]
+id = 19217
+
+[boulder_trap_prickly_kebbit]
+id = 19218
+
 [pitfall_sabre_toothed_kyatt_0]
 id = 19253
 

data/skill/hunter/hunter.sounds.toml

@@ -45,3 +45,15 @@ id = 666
 
 [big_cat_death]
 id = 667
+
+[lay_box_trap]
+id = 2636
+
+[box_trap_catch]
+id = 2627
+
+[set_deadfall]
+id = 2645
+
+[deadfall_catch]
+id = 2631

data/skill/hunter/hunter.tables.toml

@@ -33,15 +33,16 @@ npc = "hunting_box_trap_npc"
 
 [.boulder_trap]
 level = 23
-#trap = "boulder_trap_setup"
-#fail = "boulder_trap_fail"
-#setup_anim = "lay_trap"
-#take_down_anim = "lay_trap"
-#requires = ["knife"]
+requires = ["knife"]
 items = ["logs"]
 max = 1
 npc = "hunting_deadfall_trap_npc"
 
+[.magic_box]
+level = 71
+items = ["magic_box"]
+npc = "hunting_imptrap_npc"
+
 [.swamp_net]
 level = 29
 bait = "guam_tar"
@@ -90,6 +91,9 @@ level = "int"          # minimum hunter level to lure
 xp = "int"             # xp * 0.1  (stored as tenths for int precision)
 loot = "list<item>"    # items awarded on catch
 chance = "range"
+bait = "item"          # bait required before the creature will approach the trap
+catch_anim = "anim"    # animation the creature plays on a successful catch
+fail_anim = "anim"     # animation the creature plays on a failed catch
 
 [.crimson_swift]
 trap = "bird_snare"
@@ -139,30 +143,75 @@ xp = 1670
 loot = ["wimpy_feather", "raw_bird_meat", "bones"]
 chance = [65, 350]
 
-[.grey_chinchompa]
+[.ferret]
+trap = "box_trap"
+caught_obj = "box_trap_ferret"
+level = 27
+xp = 1152
+catch_anim = "ferret_catch"
+fail_anim = "ferret_fail"
+loot = ["ferret"]
+chance = [41, 255]
+
+[.chinchompa]
 trap = "box_trap"
-caught_obj = "box_trap_grey_chinchompa"
+caught_obj = "box_trap_chinchompa"
 level = 53
 xp = 1984
-#catch_anim = "chinchompa_catch"
-loot = ["box_trap", "chinchompa"]
+catch_anim = "chinchompa_catch"
+fail_anim = "chinchompa_fail"
+loot = ["chinchompa"]
+chance = [145, 268]
 
-[.red_chinchompa]
+[.carnivorous_chinchompa]
 trap = "box_trap"
-caught_obj = "box_trap_red_chinchompa"
+caught_obj = "box_trap_carnivorous_chinchompa"
 level = 63
 xp = 2650
-#catch_anim = "chinchompa_catch"
-loot = ["box_trap", "red_chinchompa"]
+catch_anim = "chinchompa_catch"
+fail_anim = "chinchompa_fail"
+loot = ["red_chinchompa"]
+chance = [115, 228]
+
+[.wild_kebbit]
+trap = "boulder_trap"
+caught_obj = "boulder_trap_wild_kebbit"
+level = 23
+xp = 1280
+catch_anim = "kebbit_catch"
+fail_anim = "kebbit_fail"
+loot = ["bones", "kebbit_claws"]
+chance = [105, 354]
 
 [.barb_tailed_kebbit]
 trap = "boulder_trap"
 caught_obj = "boulder_trap_barb_tailed_kebbit"
-level = 23
+level = 33
 xp = 1680
-#catch_anim = "kebbit_catch"
-#fail_anim = "kebbit_fail"
+catch_anim = "kebbit_catch"
+fail_anim = "kebbit_fail"
 loot = ["bones", "barb_tail_harpoon"]
+chance = [110, 326]
+
+[.prickly_kebbit]
+trap = "boulder_trap"
+caught_obj = "boulder_trap_prickly_kebbit"
+level = 37
+xp = 2040
+catch_anim = "kebbit_catch"
+fail_anim = "kebbit_fail"
+loot = ["bones", "kebbit_spike"]
+chance = [115, 298]
+
+[.sabre_toothed_kebbit]
+trap = "boulder_trap"
+caught_obj = "boulder_trap_sabre_toothed_kebbit"
+level = 51
+xp = 2000
+catch_anim = "kebbit_catch"
+fail_anim = "kebbit_fail"
+loot = ["bones", "kebbit_teeth"]
+chance = [120, 268]
 
 [.swamp_lizard]
 trap = "swamp_net"
@@ -197,17 +246,33 @@ trap = "box_trap"
 caught_obj = "box_trap_pawya"
 level = 66
 xp = 4000
-#catch_anim = "chinchompa_catch"
+catch_anim = "pawya_catch"
+fail_anim = "pawya_fail"
 loot = ["bones", "raw_pawya_meat"]
+chance = [100, 215]
+bait = "papaya_fruit"
 
 [.grenwall]
 trap = "box_trap"
 caught_obj = "box_trap_grenwall"
 level = 77
 xp = 11000
-#catch_anim = "chinchompa_catch"
+catch_anim = "grenwall_catch"
+fail_anim = "grenwall_fail"
+chance = [15, 130]
+bait = "raw_pawya_meat"
 loot = ["grenwall_spikes", "grenwall_spikes", "grenwall_spikes", "grenwall_spikes", "grenwall_spikes", "grenwall_spikes", "grenwall_spikes", "grenwall_spikes", "grenwall_spikes", "grenwall_spikes", "grenwall_spikes", "grenwall_spikes", "grenwall_spikes", "grenwall_spikes", "grenwall_spikes", "grenwall_spikes", "grenwall_spikes", "grenwall_spikes"]
 
+[.imp]
+trap = "magic_box"
+caught_obj = "magic_box_caught"
+level = 71
+xp = 4500
+catch_anim = "imp_catch"
+fail_anim = "imp_fail"
+loot = ["imp_in_a_box_2"]
+chance = [15, 130]
+
 [.rabbit]
 trap = "rabbit_snare"
 caught_obj = "rabbit_snare_caught"