Skip to content

Commit

Permalink
Add runecrafting abyss (#530)
Browse files Browse the repository at this point in the history
* Add abyss dark mage

* Add abyss rifts

* Add mage of zamorak teleporting

* Add abyss obstacles

* Add better point in polygon algorithm

* Store latest 100 messages for unit test checks

* Add abyss obstacle tests

* Fix messages variable crashing client

* Add improved npc attack and hit animation resolving

* Fix multi combat areas

* Add improved death animation resolving

* Add abyssal npcs

* Add abyssal drop tables without configs

* Pass player around drop tables #378

* Add checking owned and lacking items in drop tables #378

* Replace item drop variable usages with owns #378

* Add world action error handling

* Fix drop simulations with charges

* Fix pouch drop chances

* Add support for dropping and picking up charged floor items closes #311

* Add missing obstacle and rifts with correct messages

* Add remaining altar teleports

* Add chaos altar teleports and stairs
  • Loading branch information
GregHib committed May 3, 2024
1 parent 4a9b12d commit f4c7c6f
Show file tree
Hide file tree
Showing 63 changed files with 2,122 additions and 399 deletions.
18 changes: 17 additions & 1 deletion data/definitions/animations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1674,4 +1674,20 @@ giant_mole_attack: 3312
giant_mole_hit: 3311
giant_mole_death: 3310
dirt_projectile: 570
giant_mole_burrow_up: 1664
giant_mole_burrow_up: 1664
tele_other: 1818
lunar_teleport: 1816
distract_eyes: 1835
stomp_eyes: 794
abyss_kneel: 1331
abyss_stand: 1332
crawling_cave: 844
abyssal_leech_hit: 2182
abyssal_leech_attack: 2181
abyssal_leech_death: 2183
abyssal_guardian_hit: 2188
abyssal_guardian_attack: 2186
abyssal_guardian_death: 2189
abyssal_walker_hit: 2192
abyssal_walker_attack: 2193
abyssal_walker_death: 2194
6 changes: 5 additions & 1 deletion data/definitions/graphics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1481,4 +1481,8 @@ dragon_breath_shock:
flight_time: [ 20, 20, 20, 20, 20, 20, 20, 20, 20, 20 ]
teleport_jewellery: 1684
teleport_pharaohs_sceptre: 715
burrow_dust: 571
burrow_dust: 571
tele_other: 343
tele_other_receive:
id: 342
height: 52
6 changes: 6 additions & 0 deletions data/definitions/items.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24145,36 +24145,42 @@ small_pouch:
examine: "A small pouch used for storing essence."
medium_pouch:
id: 5510
tradeable: false
charges: 45
degrade: medium_pouch_damaged
weight: 1.0
examine: "A medium-sized pouch used for storing essence."
medium_pouch_damaged:
id: 5511
tradeable: false
charges: 20
degrade: destroy
weight: 1.0
examine: "A damaged medium-sized pouch used for storing essence."
large_pouch:
id: 5512
tradeable: false
charges: 29
degrade: large_pouch_damaged
weight: 1.0
examine: "A large pouch used for storing essence."
large_pouch_damaged:
id: 5513
tradeable: false
charges: 20
degrade: destroy
weight: 1.0
examine: "A large damaged pouch used for storing essence."
giant_pouch:
id: 5514
tradeable: false
charges: 10
degrade: giant_pouch_damaged
weight: 1.0
examine: "A giant-sized pouch used for storing essence."
giant_pouch_damaged:
id: 5515
tradeable: false
charges: 20
degrade: destroy
weight: 1.0
Expand Down
61 changes: 61 additions & 0 deletions data/definitions/npcs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1846,3 +1846,64 @@ baby_mole:
id: 3341
wander_radius: 6
examine: "I will call him, Mini Mole."
dark_mage:
id: 2262
faces: false
race: human
examine: "An initiate of Zamorak."
mage_of_zamorak_wilderness:
id: 2257
faces: false
race: human
examine: "A disciple of Zamorak."
mage_of_zamorak_varrock:
id: 2260
faces: false
race: human
examine: "A disciple of Zamorak."
abyssal_leech:
id: 2263
hitpoints: 100
att: 95
str: 5
def: 25
attack_bonus: 100
wander_radius: 6
attack_radius: 6
max_hit_melee: 20
hunt_mode: aggressive
style: slash
height: 15
respawn_delay: 5
examine: "A blood-drinking denizen of the Abyss."
abyssal_guardian:
id: 2264
hitpoints: 500
att: 30
str: 90
def: 30
attack_bonus: 15
wander_radius: 8
attack_radius: 4
max_hit_melee: 110
hunt_mode: aggressive
style: stab
height: 30
respawn_delay: 5
examine: "It seems to have eyes in the back of its head..."
abyssal_walker:
id: 2265
hitpoints: 950
att: 5
str: 100
def: 95
attack_bonus: 5
wander_radius: 6
attack_radius: 2
max_hit_melee: 130
hunt_mode: aggressive
style: crush
height: 50
attack_speed: 5
respawn_delay: 5
examine: "Apparently walks the Abyss."
105 changes: 104 additions & 1 deletion data/definitions/objects.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11705,4 +11705,107 @@ prayer_altar_warped_construction:
id: 55667
examine: "A shrine for the faithful to worship at."
giant_mole_lair_escape_rope:
id: 12230
id: 12230
nature_rift:
id: 7133
examine: "A tear in the dimensional weave of the Abyss."
cosmic_rift:
id: 7132
examine: "A tear in the dimensional weave of the Abyss."
blood_rift:
id: 7141
examine: "A tear in the dimensional weave of the Abyss."
fire_rift:
id: 7129
examine: "A tear in the dimensional weave of the Abyss."
earth_rift:
id: 7130
examine: "A tear in the dimensional weave of the Abyss."
body_rift:
id: 7131
examine: "A tear in the dimensional weave of the Abyss."
mind_rift:
id: 7140
examine: "A tear in the dimensional weave of the Abyss."
air_rift:
id: 7139
examine: "A tear in the dimensional weave of the Abyss."
soul_rift:
id: 7138
examine: "A tear in the dimensional weave of the Abyss."
water_rift:
id: 7137
examine: "A tear in the dimensional weave of the Abyss."
death_rift:
id: 7136
examine: "A tear in the dimensional weave of the Abyss."
law_rift:
id: 7135
examine: "A tear in the dimensional weave of the Abyss."
abyss_obstacle:
id: 7142
abyss_obstacle_2:
id: 7143
abyss_obstacle_3:
id: 7144
abyss_obstacle_4:
id: 7145
abyss_obstacle_5:
id: 7146
abyss_obstacle_6:
id: 7147
abyss_obstacle_7:
id: 7148
abyss_obstacle_8:
id: 7153
abyss_passage:
id: 7154
examine: "A tunnel through the Abyss."
abyss_blockage:
id: 7156
examine: "This seems to be blocking the exit..."
abyss_rock:
id: 7158
examine: "I could probably break this up with a pickaxe."
abyss_rock_mined:
id: 7159
examine: "I could probably break this up with a pickaxe. Oh wait, I just did."
broken_rock:
id: 7160
examine: "Pickaxe power!"
abyss_tendrils:
id: 7161
examine: "They don't look that solid, an axe could help me chop them down."
abyss_tendrils_chopped:
id: 7162
examine: "They don't look that solid, an axe could help me chop them down."
chopped_tendrils:
id: 7163
examine: "I cannot tell a lie. I chopped them down."
abyss_gap:
id: 7164
examine: "If I'm agile enough I might be able to squeeze through..."
abyss_boil:
id: 7165
examine: "I could probably burn this away with a tinderbox."
abyss_boil_burned:
id: 7166
examine: "I could probably burn this with fire."
abyss_boil_burst:
id: 7167
examine: "Burnt open."
abyss_eyes:
id: 7168
examine: "I could probably distract these with thievery."
abyss_eyes_looking:
id: 7169
examine: "I could probably distract these with thievery."
abyss_eyes_distracted:
id: 7170
examine: "I could probably distract these with thievery."
chaos_altar_ladder_up:
id: 38221
examine: "I can climb this."
chaos_altar_ladder_down:
id: 38222
examine: "I can climb down this."
6 changes: 5 additions & 1 deletion data/definitions/sounds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -199,4 +199,8 @@ giant_mole_burrow_down: 1641
giant_mole_attack: 1642
giant_mole_hit: 1646
giant_mole_burrow: 1643
giant_mole_death: 1645
giant_mole_death: 1645
tele_other_cast: 199
teleport_all: 200
boil_burst: 2711
abyssal_squeezethrough: 2709
12 changes: 0 additions & 12 deletions data/definitions/variables-custom.yml
Original file line number Diff line number Diff line change
Expand Up @@ -289,18 +289,6 @@ shooting_star_bonus_ore:
al_the_camel:
format: boolean
persist: true
easy_clue:
format: boolean
persist: true
medium_clue:
format: boolean
persist: true
hard_clue:
format: boolean
persist: true
elite_clue:
format: boolean
persist: true
magical_blastbox_mode:
format: boolean
persist: true
Expand Down
5 changes: 4 additions & 1 deletion data/definitions/variables-player-bit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -583,4 +583,7 @@ minigame_type:
none: 0
barbarian_assault: 1
stealing_creation: 2
fist_of_guthix: 3
fist_of_guthix: 3
abyss_obstacles:
id: 625
format: int
5 changes: 5 additions & 0 deletions data/definitions/variables-player.yml
Original file line number Diff line number Diff line change
Expand Up @@ -401,3 +401,8 @@ show_summoning_orb:
values:
true: -1
false: 0
enter_the_abyss:
id: 492
persist: true
format: list
values: [ unstarted, started, stage1, stage2, completed ]
9 changes: 9 additions & 0 deletions data/map/areas.yml
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,11 @@ astral_altar_teleport:
x: [ 2150, 2152 ]
y: [ 3860, 3863 ]
tags: [ teleport ]
chaos_altar_teleport:
area:
x: [ 3057, 3058 ]
y: [ 3588, 3589 ]
tags: [ teleport ]
trollheim_teleport:
area:
x: [ 2886, 2890 ]
Expand Down Expand Up @@ -737,6 +742,10 @@ abyss_multi_area:
x: [ 3008, 3071 ]
y: [ 4800, 4863 ]
tags: [ multi_combat ]
abyss_center:
area:
x: [ 3039, 3052, 3057, 3053, 3042, 3033, 3025, 3021, 3022, 3029 ]
y: [ 4849, 4845, 4832, 4820, 4815, 4816, 4820, 4829, 4838, 4846 ]
jiggig_multi_area:
area:
x: [ 2456, 2495 ]
Expand Down
Loading

0 comments on commit f4c7c6f

Please sign in to comment.