Skip to content

Add pitfall traps #1062

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GregHib merged 11 commits into from
Jul 8, 2026
Merged

Add pitfall traps #1062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c55f7d7
Start on pitfall traps
GregHib Jul 5, 2026
82907eb
Update pitfall messages
GregHib Jul 5, 2026
6a7e131
Fix bank withdraw full inventory message happening when all items wer…
GregHib Jul 5, 2026
bb9e897
Add pitfall level checks
GregHib Jul 5, 2026
51b947b
Add pitfall collapse
GregHib Jul 5, 2026
524ad1e
Add pitfall logic and tests
GregHib Jul 6, 2026
d07262d
Remove hunter class
GregHib Jul 6, 2026
b4f08d9
Fix teasing, add tests for larupia and kyatts
GregHib Jul 6, 2026
4e43c12
Remove duplicate mazchna
GregHib Jul 6, 2026
b3eef97
Fix barbarian course advanced laps reward collection
GregHib Jul 6, 2026
db918be
Remove unused hunter data
GregHib Jul 8, 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
2 changes: 2 additions & 0 deletions data/area/fremennik_province/rellekka/hunter_area/rellekka_hunter_area.npcs.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ examine = "A sapphire glacialis. It doesn't look as pretentious as its name soun

[sabre_toothed_kyatt]
id = 5103
combat_def = "panther"
respawn_delay = 50
examine = "It's just like a big, white, furry, deadly can opener."

[hunting_expert_rellekka]
Expand Down
10 changes: 5 additions & 5 deletions data/area/kandarin/feldip_hills/feldip_hills.npc-spawns.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,11 +174,11 @@ spawns = [
{ 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 = "spined_larupia_feldip_hills", x = 2544, y = 2910, members = true },
{ id = "spined_larupia_feldip_hills", x = 2550, y = 2904, members = true },
{ id = "spined_larupia_feldip_hills", x = 2556, y = 2895, members = true },
{ id = "spined_larupia_feldip_hills", x = 2563, y = 2888, members = true },
{ id = "spined_larupia_feldip_hills", x = 2573, y = 2883, members = true },
{ 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 },
{ id = "spined_larupia", x = 2563, y = 2888, members = true },
{ id = "spined_larupia", x = 2573, y = 2883, members = true },
{ id = "hunting_expert_feldip_hills", x = 2525, y = 2917, members = true },
{ id = "giant_spider_mid", x = 2517, y = 2976, members = true },
{ id = "ogress_champion", x = 2451, y = 2857 },
Expand Down
5 changes: 4 additions & 1 deletion data/area/kandarin/feldip_hills/feldip_hills.npcs.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,11 @@ examine = "A black warlock. The air seems to distort wherever it passes."
id = 5088
examine = "It uses its tail to hunt and skewer fish."

[spined_larupia_feldip_hills]
[spined_larupia]
id = 5104
combat_def = "panther"
respawn_delay = 50
max_hit_slash = 50
examine = "If you tried to ride that, you'd just impale yourself!"

[hunting_expert_feldip_hills]
Expand Down
2 changes: 2 additions & 0 deletions data/area/karamja/karamja.npcs.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ examine = "A warrior from Shilo Village."

[horned_graahk]
id = 5105
combat_def = "panther"
respawn_delay = 50
examine = "Get in a graahk's way and you're going to know about it...however briefly."

[captain_shanks]
Expand Down
1 change: 0 additions & 1 deletion data/area/morytania/canifis/canifis.npc-spawns.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ spawns = [
{ id = "zoja", x = 3505, y = 3491 },
{ id = "liliya", x = 3479, y = 3498, level = 1 },
{ id = "achtryn", x = 3511, y = 3509, members = true },
{ id = "mazchna", x = 3512, y = 3509, members = true },
# North of Mort Myre Swamp
{ id = "ghoul", x = 3423, y = 3461, members = true },
{ id = "ghoul", x = 3426, y = 3465, members = true },
Expand Down
16 changes: 16 additions & 0 deletions data/skill/hunter/hunter.anims.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,19 @@ id = 3067

[lay_net_trap]
id = 5215

[tease]
id = 5236

[scythe_slash]
id = 2524

[big_cat_attack]
id = 5229

[big_cat_defend]
id = 5227

[big_cat_death]
id = 5234
ticks = 2
13 changes: 13 additions & 0 deletions data/skill/hunter/hunter.combat.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[panther]
attack_speed = 4
retreat_range = 20
defend_anim = "big_cat_defend"
defend_sound = "dog_defend"
death_anim = "big_cat_death"
death_sound = "big_cat_death"

[panther.melee]
range = 1
anim = "big_cat_attack"
target_sound = "big_cat_attack"
target_hit = { offense = "slash", max = 70 }
50 changes: 31 additions & 19 deletions data/skill/hunter/hunter.objs.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,55 +144,55 @@ id = 28906
[boulder_trap_barb_tailed_kebbit]
id = 19207

[pitfall_0]
[pitfall_sabre_toothed_kyatt_0]
id = 19253

[pitfall_1]
[pitfall_sabre_toothed_kyatt_1]
id = 19254

[pitfall_2]
[pitfall_sabre_toothed_kyatt_2]
id = 19255

[pitfall_3]
[pitfall_sabre_toothed_kyatt_3]
id = 19256

[pitfall_4]
[pitfall_sabre_toothed_kyatt_4]
id = 19257

[pitfall_5]
[pitfall_sabre_toothed_kyatt_5]
id = 19258

[pitfall_6]
[pitfall_spined_larupia_6]
id = 19259

[pitfall_7]
[pitfall_spined_larupia_7]
id = 19260

[pitfall_8]
[pitfall_spined_larupia_8]
id = 19261

[pitfall_9]
[pitfall_spined_larupia_9]
id = 19262

[pitfall_10]
[pitfall_spined_larupia_10]
id = 19263

[pitfall_11]
[pitfall_horned_graahk_11]
id = 19264

[pitfall_12]
[pitfall_horned_graahk_12]
id = 19265

[pitfall_13]
[pitfall_horned_graahk_13]
id = 19266

[pitfall_14]
[pitfall_horned_graahk_14]
id = 19267

[pitfall_15]
[pitfall_horned_graahk_15]
id = 19268

[pitfall_16]
[pitfall_spined_larupia_16]
id = 43614

[pitfall]
Expand All @@ -204,8 +204,20 @@ id = 19228
[pitfall_collapsed]
id = 19229

[pitfall_caught]
[pitfall_caught_spined_larupia]
id = 19232

[pitfall_inverse_spined_larupia]
id = 19235

[pitfall_caught_horned_graahk]
id = 19231

[pitfall_inverse]
[pitfall_inverse_horned_graahk]
id = 19234

[pitfall_caught_sabre_toothed_kyatt]
id = 19233

[pitfall_inverse_sabre_toothed_kyatt]
id = 19236
14 changes: 13 additions & 1 deletion data/skill/hunter/hunter.sounds.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ id = 2632
id = 2654

[pitfall_collapse]
id = 2638 # radius 5
id = 2638

[panther_death]
id = 667 # radius 5
Expand All @@ -33,3 +33,15 @@ id = 739

[twitch_net]
id = 2652

[place_branches]
id = 2639

[take_branches]
id = 2649

[big_cat_attack]
id = 666

[big_cat_death]
id = 667
Loading
Loading