Skip to content

Commit

Permalink
Add the wilderness agility course (#581)
Browse files Browse the repository at this point in the history
* Fix lumbridge npc aggression

* Start wildy course

* Remove excess whitespace

* Add course failing

* Add course tests

* Remove npc formatting

* Add wilderness skeletons

* Add intolerant hunt mode

* Separate attacker from attackers to fix single combat targets closes #564
  • Loading branch information
GregHib authored Jan 16, 2025
1 parent a41dd53 commit a898bcf
Show file tree
Hide file tree
Showing 19 changed files with 761 additions and 79 deletions.
7 changes: 6 additions & 1 deletion data/definitions/animations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1836,4 +1836,9 @@ rope_walk_fall_right: 771
fall_off_log_left: 2581
fall_off_log_right: 2582
fall_on_floor: 767
stepping_stone: 769
stepping_stone_step: 769
stepping_stone_jump: 741
skeleton_hit: 5489
skeleton_death: 5491
skeleton_crush: 5485
skeleton_slash: 5487
3 changes: 3 additions & 0 deletions data/definitions/hunt-modes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ aggressive:
aggressive_npcs:
<<: *aggressive
type: npc
aggressive_intolerant:
<<: *aggressive
check_afk: false
not_busy:
<<: *aggressive
check_not_busy: true
Expand Down
112 changes: 96 additions & 16 deletions data/definitions/npcs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -824,7 +824,7 @@ banker_canifis:
dororan:
id: 1168
race: dwarf
examine: "A dwarf in anguish."
examine: "A dwarf in anguish."
yrsa:
id: 1301
race: human
Expand Down Expand Up @@ -963,7 +963,7 @@ ellis:
examine: "Manufacturer of fine leathers."
dororan_cutscene:
id: 2863
examine: "A dwarf in suspense."
examine: "A dwarf in suspense."
gudrun:
&gudrun
id: 2864
Expand All @@ -978,7 +978,7 @@ gudrun_after_cutscene:
id: 2866
gudrun_after_cutscene2:
<<: *gudrun
id: 2867
id: 2867
gudrun_after_quest:
<<: *gudrun
id: 2869
Expand Down Expand Up @@ -1379,7 +1379,7 @@ fishing_spot_small_net_bait_lumbridge:
lil_lamb:
<<: *sheep
id: 5146
examine: "How cute!"
examine: "How cute!"
sheep_light:
<<: *sheep
id: 5157
Expand Down Expand Up @@ -1527,7 +1527,7 @@ jeffery2:
bob_barter_herbs:
id: 6524
race: human
examine: "He's probably seen better days."
examine: "He's probably seen better days."
pikkupstix:
id: 6970
race: human
Expand Down Expand Up @@ -1710,29 +1710,29 @@ bat_swept_away:
rat_swept_away:
id: 8209
examine: "Cheese-eater."
Lizard_swept_away:
lizard_swept_away:
id: 8210
examine: "Desert-dweller."
Blackbird_swept_away:
blackbird_swept_away:
id: 8211
examine: "Bleak and beaky."
Spider_swept_away:
spider_swept_away:
id: 8212
examine: "Isn't eight legs rather excessive?"
Snail_swept_away:
snail_swept_away:
id: 8213
examine: "Rather quick, considering."
holding_pen_swept_away:
id: 8219
bat_pen_swept_away:
id: 8220
Blackbird_pen_swept_away:
blackbird_pen_swept_away:
id: 8221
rat_pen_swept_away:
id: 8222
Snail_pen_swept_away:
snail_pen_swept_away:
id: 8223
Spider_pen_swept_away:
spider_pen_swept_away:
id: 8224
reptile_pen_swept_away:
id: 8225
Expand Down Expand Up @@ -2042,7 +2042,7 @@ leela:
id: 13172
race: human
wander_radius: 4
examine: "She comes from Al Kharid."
examine: "She comes from Al Kharid."
seal:
id: 13255
wander_radius: 2
Expand Down Expand Up @@ -2109,7 +2109,7 @@ al_the_camel:
race: camel
large_head: true
wander_radius: 4
examine: "A camel who has the soul of a poet."
examine: "A camel who has the soul of a poet."
dark_mage:
id: 2262
faces: false
Expand Down Expand Up @@ -2211,7 +2211,8 @@ zamorak_warrior_square:
<<: *zamorak_warrior
id: 6364
style: crush
zamorak_mage_fancy: &zamorak_mage
zamorak_mage_fancy:
&zamorak_mage
id: 6367
hitpoints: 500
att: 75
Expand All @@ -2231,7 +2232,8 @@ zamorak_mage_fancy: &zamorak_mage
zamorak_mage:
<<: *zamorak_mage
id: 6368
zamorak_ranger: &zamorak_ranger
zamorak_ranger:
&zamorak_ranger
id: 6365
hitpoints: 500
att: 75
Expand Down Expand Up @@ -2504,3 +2506,81 @@ bartender_foresters_arms:
race: human
wander_radius: 5
examine: "I could get a beer from him."
skeleton_mace_shield:
&skeleton_25
id: 92
hitpoints: 170
att: 24
str: 24
def: 24
wander_radius: 8
attack_radius: 4
max_hit_melee: 40
hunt_mode: aggressive_intolerant
style: slash
height: 30
respawn_delay: 60
race: skeleton
examine: "Could do with gaining a few pounds."
skeleton_flail:
<<: *skeleton_25
id: 5340
skeleton_sword_shield:
<<: *skeleton_25
id: 5338
skeleton_helmet:
<<: *skeleton_25
id: 5332
skeleton_unarmed:
&skeleton_22
id: 5333
hitpoints: 290
att: 15
str: 18
def: 17
wander_radius: 8
attack_radius: 4
max_hit_melee: 30
hunt_mode: aggressive
style: crush
height: 30
respawn_delay: 70
race: skeleton
examine: "Could do with gaining a few pounds."
skeleton_shield_helmet:
<<: *skeleton_22
id: 90
skeleton_shield:
<<: *skeleton_22
id: 5334
skeleton_builder:
<<: *skeleton_22
id: 3291
skeleton_axe_shield:
<<: *skeleton_25
id: 5337
skeleton_longsword:
<<: *skeleton_25
id: 5339
skeleton_axe_shield_85:
&skeleton_85
id: 5367
hitpoints: 590
att: 32
str: 35
def: 36
wander_radius: 8
attack_radius: 4
max_hit_melee: 50
hunt_mode: aggressive
style: slash
height: 30
respawn_delay: 60
race: skeleton
examine: "Could do with gaining a few pounds."
skeleton_sword_shield_85:
<<: *skeleton_85
id: 5368
skeleton_hammer_shield:
<<: *skeleton_85
id: 4386
35 changes: 29 additions & 6 deletions data/definitions/objects.yml
Original file line number Diff line number Diff line change
Expand Up @@ -851,10 +851,10 @@ gate_33_opened:
gate_33_closed:
id: 1991
examine: "Solid bars of iron."
door_44_opened:
wilderness_agility_door_opened:
id: 1543
examine: "Solid bars of iron."
door_44_closed:
wilderness_agility_door_closed:
id: 2309
door_68_opened:
id: 1543
Expand Down Expand Up @@ -1077,10 +1077,11 @@ metal_gate_opened:
metal_gate_closed:
id: 2259
examine: "The gate is closed."
gate_45_opened:
wilderness_agility_gate_east_opened:
id: 2040
gate_45_closed:
wilderness_agility_gate_east_closed:
id: 2307
gate: false
gate_53_opened:
id: 2040
gate_53_closed:
Expand Down Expand Up @@ -1133,10 +1134,11 @@ metal_gate_2_opened:
metal_gate_2_closed:
id: 2260
examine: "The gate is closed."
gate_46_opened:
wilderness_agility_gate_west_opened:
id: 2042
gate_46_closed:
wilderness_agility_gate_west_closed:
id: 2308
gate: false
gate_65_opened:
id: 2042
gate_65_closed:
Expand Down Expand Up @@ -11990,3 +11992,24 @@ basic_ladder_second:
basic_ladder_top:
id: 1746
examine: "I can climb down this."
basic_ladder_up:
id: 32015
examine: "I can climb this."
wilderness_obstacle_pipe:
id: 2288
examine: "A pipe I can squeeze through."
wilderness_rope_swing:
id: 2283
examine: "Use this to swing over crevices."
wilderness_agility_ladder_down:
id: 14758
examine: "I can climb down this."
wilderness_stepping_stone:
id: 37704
examine: "Hop, hop, hoppity hop, and then you fall in molten lava."
wilderness_log_balance:
id: 2297
examine: "A slippery log I can walk across."
wilderness_agility_rocks:
id: 2328
examine: "A rocky outcrop."
1 change: 1 addition & 0 deletions data/definitions/render-emotes.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
climbing: 0
human_stand: 1426
dororan_stand: 1880
rope_balance: 155
Expand Down
4 changes: 3 additions & 1 deletion data/definitions/sounds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -211,4 +211,6 @@ wolves_hit: 912
wolves_attack: 909
wolves_death: 911
bigghost_appear: 1595
rg_ghost_approach: 1743
rg_ghost_approach: 1743
jump: 2461
2h_stab: 2504
8 changes: 7 additions & 1 deletion data/definitions/variables-custom.yml
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ agility_course_rewards_claimed:
agility_course:
format: list
persist: true
values: [ gnome, barbarian ]
values: [ gnome, barbarian, wilderness ]
barbarian_course_stage:
persist: true
format: int
Expand All @@ -507,6 +507,12 @@ alfred_grimhands_barcrawl:
persist: true
format: list
values: [ unstarted, signatures, completed ]
wilderness_course_stage:
persist: true
format: int
wilderness_course_laps:
persist: true
format: int
barcrawl_signatures:
persist: true
format: bitwise
Expand Down
Loading

0 comments on commit a898bcf

Please sign in to comment.