Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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 @@ -6,3 +6,15 @@ examine = "He's wearing a single glove; how strange."
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
40 changes: 38 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,12 @@ id = 5227
[big_cat_death]
id = 5234
ticks = 2

[noose_catch_polar]
id = 5256

[noose_catch_common]
id = 5259

[noose_fail]
id = 5255
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
151 changes: 147 additions & 4 deletions data/skill/hunter/hunter.objs.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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

Expand Down Expand Up @@ -221,3 +261,106 @@ id = 19233

[pitfall_inverse_sabre_toothed_kyatt]
id = 19236

# Kebbit tracking
[kebbit_tracks_plant_0]
id = 19356

[kebbit_tracks_plant_1]
id = 19357

[kebbit_tracks_plant_2]
id = 19358

[kebbit_tracks_plant_3]
id = 19359

[kebbit_tracks_plant_4]
id = 19360

[kebbit_tracks_plant_5]
id = 19361

[kebbit_tracks_plant_6]
id = 19362

[kebbit_tracks_plant_7]
id = 19363

[kebbit_tracks_plant_8]
id = 19364

[kebbit_tracks_plant_9]
id = 19365

[kebbit_tracks_plant_10]
id = 19372

[kebbit_tracks_plant_11]
id = 19373

[kebbit_tracks_plant_12]
id = 19374

[kebbit_tracks_plant_13]
id = 19375

[kebbit_tracks_plant_14]
id = 19376

[kebbit_tracks_plant_15]
id = 19377

[kebbit_tracks_plant_16]
id = 19378

[kebbit_tracks_plant_17]
id = 19379

[kebbit_tracks_plant_18]
id = 19380

[kebbit_tunnel_0]
id = 19419

[kebbit_tunnel_1]
id = 19420

[kebbit_tunnel_2]
id = 19421

[kebbit_tunnel_3]
id = 19423

[kebbit_tunnel_4]
id = 19424

[kebbit_tunnel_5]
id = 19426

[kebbit_hollow_log_0]
id = 36688

[kebbit_hollow_log_1]
id = 36689

[kebbit_hollow_log_2]
id = 36690

[kebbit_bush]
id = 19428

[kebbit_snow_drift]
id = 19435

[common_kebbit_burrow]
id = 19439

[common_kebbit_burrow_2]
id = 19440

[polar_kebbit_hole]
id = 19640

[polar_kebbit_hole_2]
id = 19641
21 changes: 21 additions & 0 deletions data/skill/hunter/hunter.sounds.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,24 @@ 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

[falcon_swoop]
id = 2634

[falcon_return]
id = 2633

[hunting_noose]
id = 2637
Loading