Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
7afddca
Add box trap and deadfall trap hunting
HarleyGilpin Aug 31, 2026
bd2f792
Fix box trap not being returned when checking a caught creature
HarleyGilpin Aug 31, 2026
6543222
Add imp catching with magic boxes
HarleyGilpin Aug 31, 2026
a6fd97e
Add falconry kebbit hunting
HarleyGilpin Aug 31, 2026
b91c958
Add polar and common kebbit tracking
HarleyGilpin Aug 31, 2026
90097b6
Add hint arrow over caught falcon
HarleyGilpin Aug 31, 2026
f0df674
Fix hint arrow removal packet including bytes the client never reads
HarleyGilpin Aug 31, 2026
ffdc298
Pad hint arrow packet to the fixed size the client reads
HarleyGilpin Aug 31, 2026
6995e08
Add imp-in-a-box Talk-to dialogue and Bank interface
HarleyGilpin Aug 31, 2026
0d77a82
Add desert devil tracking
HarleyGilpin Aug 31, 2026
11a4cf0
Fix trail not advancing at the end of inverted tracking segments
HarleyGilpin Aug 31, 2026
3ee6b2e
Fix desert trail segments that could dead-end before disturbed sand
HarleyGilpin Aug 31, 2026
9985c8d
Add feldip weasel tracking
HarleyGilpin Aug 31, 2026
e7b2860
Fix tracking step advancing past the final trail segment
HarleyGilpin Aug 31, 2026
6415c81
Add razor-backed kebbit tracking and north common kebbit trails
HarleyGilpin Aug 31, 2026
bc32aaa
Remove temporary Piscatoris cache dump tool
HarleyGilpin Aug 31, 2026
bd7199e
Merge branch 'main' into feat/skill/hunter-traps
HarleyGilpin Aug 31, 2026
a6878bd
Fix trap cleanup on logout, stacked loot space checks and tracking ed…
HarleyGilpin Aug 31, 2026
f7db488
Merge branch 'feat/skill/hunter-traps' of github.com:HarleyGilpin/voi…
HarleyGilpin Aug 31, 2026
08921fe
Fix trap race conditions and consolidate shared trap lifecycle into T…
HarleyGilpin Aug 31, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions data/area/kandarin/feldip_hills/feldip_hills.npc-spawns.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand Down
2 changes: 1 addition & 1 deletion data/area/kandarin/feldip_hills/feldip_hills.npcs.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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."

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,15 @@ examine = "He's wearing a single glove; how strange."
[spotted_kebbit]
id = 5098
examine = "It seems to be on a permanent sugar rush."

[spotted_kebbit_caught]
id = 5094
examine = "It looks like it has caught something."

[dark_kebbit_caught]
id = 5095
examine = "It looks like it has caught something."

[dashing_kebbit_caught]
id = 5096
examine = "It looks like it has caught something."
4 changes: 4 additions & 0 deletions data/area/kandarin/piscatoris/piscatoris.areas.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,7 @@ hint = "where eagles fly."
[ppiscatoris_fishing_area]
x = [2340, 2349]
y = [3702, 3702]

[piscatoris_falconry_area]
x = [2363, 2395]
y = [3579, 3612]
21 changes: 21 additions & 0 deletions data/entity/npc/hunt_modes.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
43 changes: 41 additions & 2 deletions data/skill/hunter/hunter.anims.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -74,3 +101,15 @@ id = 5227
[big_cat_death]
id = 5234
ticks = 2

[noose_catch_polar]
id = 5256

[noose_catch_common]
id = 5259

[noose_fail]
id = 5255

[noose_catch_desert]
id = 5257
19 changes: 19 additions & 0 deletions data/skill/hunter/hunter.ifaces.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[imp_box]
id = 478
type = "main_screen"

[.title]
id = 12

[.text]
id = 13

[.inventory]
id = 14
inventory = "inventory"
width = 7
height = 4
options = { Deposit = 0, Examine = 9 }

[.close]
id = 15
8 changes: 4 additions & 4 deletions data/skill/hunter/hunter.npcs.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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]
Expand Down
Loading