Skip to content

Commit

Permalink
Add ourania zmi runecrafting altar (#537)
Browse files Browse the repository at this point in the history
* Add rune pouch degrade message

* Add ourania cave ladder

* Add eniola banking and mage of zam

* Add ourania shortcut

* Add ourania altar runecrafting

* Add zamorak warriors

* Add zamorak mages

* Add zamorak rangers

* Fix sapphire bullseye lantern

* Add cave lizards

* Add mutable npc hunt_mode and replace checkTolerance with checkAfk

* Add cave lizard aggression which switches between players and npcs

* Fix npc multi-combat areas

* Prevent aggression constantly calling combat stop by not re-interacting with existing targets

* Remove attackers from their target on combat stop

* Add conditions to retaliation to fix flinching overriding player walking

* Allow modes to stop based on their replacements to prevent combat stop events when re-attacking the same npc

* Add target to can attack checks to allow npcs to fight each other

* Fix cave lizard respawn

* Add patrol config files

* Fix patrolling

* Allow some npcs to pass through each other

* Add zamorak crafters

* Fix loot-share status not showing on login

* Add more dark mage messages
  • Loading branch information
GregHib authored May 18, 2024
1 parent 20c0c90 commit bacbfe9
Show file tree
Hide file tree
Showing 58 changed files with 1,433 additions and 105 deletions.
5 changes: 4 additions & 1 deletion data/definitions/animations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1690,4 +1690,7 @@ abyssal_guardian_attack: 2186
abyssal_guardian_death: 2189
abyssal_walker_hit: 2192
abyssal_walker_attack: 2193
abyssal_walker_death: 2194
abyssal_walker_death: 2194
gecko_hit: 7208
gecko_attack: 7207
gecko_death: 7205
3 changes: 3 additions & 0 deletions data/definitions/hunt-modes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ aggressive:
check_not_combat: true
check_not_combat_self: true
check_not_busy: false
aggressive_npcs:
<<: *aggressive
type: npc
not_busy:
<<: *aggressive
check_not_busy: true
Expand Down
33 changes: 33 additions & 0 deletions data/definitions/interfaces.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1804,6 +1804,39 @@ report_abuse_select: 594
godwars_killcount: 598
warning_wilderness2: 600
unknown_side1: 602
ourania_bank_charge:
id: 619
type: main_screen
components:
air_rune: 28
mind_rune: 29
water_rune: 30
earth_rune: 31
fire_rune: 32
body_rune: 33
cosmic_rune: 34
chaos_rune: 35
astral_rune: 36
law_rune: 37
death_rune: 38
blood_rune: 39
nature_rune: 40
soul_rune: 41
text: 44
mind_rune_hide: 45
air_rune_hide: 46
water_rune_hide: 47
earth_rune_hide: 48
fire_rune_hide: 49
body_rune_hide: 50
cosmic_rune_hide: 51
chaos_rune_hide: 52
astral_rune_hide: 53
law_rune_hide: 54
death_rune_hide: 55
blood_rune_hide: 56
nature_rune_hide: 57
soul_rune_hide: 58
shop:
id: 620
type: main_screen
Expand Down
4 changes: 2 additions & 2 deletions data/definitions/item-on-item.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6285,9 +6285,9 @@ sapphire_bullseye_lantern_make:
ticks: 1
remove:
- item: bullseye_lantern_frame
- item: sapphire_lens
- item: sapphire
add:
- item: sapphire_lantern
- item: sapphire_lantern_empty
message: "You add the lens to the bullseye lantern frame."
default_bullseye_lantern_oiled_make:
skill: crafting
Expand Down
17 changes: 17 additions & 0 deletions data/definitions/items.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2774,6 +2774,7 @@ fire_rune:
air: [ smoke, 8.5 ]
water: [ steam, 9.3 ]
earth: [ lava, 10.0 ]
ourania_chance: 25.0
aka: [ fires, fire_runes ]
examine: "One of the four basic elemental runes."
kept: "Wilderness"
Expand All @@ -2788,6 +2789,7 @@ water_rune:
air: [ mist, 8.0 ]
earth: [ mud, 9.5 ]
fire: [ steam, 10.0 ]
ourania_chance: 25.0
aka: [ waters, water_runes ]
examine: "One of the four basic elemental runes."
kept: "Wilderness"
Expand All @@ -2802,6 +2804,7 @@ air_rune:
water: [ mist, 8.5 ]
earth: [ dust, 9.0 ]
fire: [ smoke, 9.5 ]
ourania_chance: 25.0
aka: [ airs, air_runes ]
examine: "One of the four basic elemental runes."
kept: "Wilderness"
Expand All @@ -2816,6 +2819,7 @@ earth_rune:
air: [ dust, 8.3 ]
water: [ mud, 9.3 ]
fire: [ lava, 10.5 ]
ourania_chance: 25.0
aka: [ earths, earth_runes ]
examine: "One of the four basic elemental runes."
kept: "Wilderness"
Expand All @@ -2826,6 +2830,7 @@ mind_rune:
runecrafting:
xp: 5.5
levels: [ 2, 14, 28, 42, 56, 84, 98 ]
ourania_chance: 25.0
aka: [ minds, mind_runes ]
examine: "Used for basic level missile spells."
kept: "Wilderness"
Expand All @@ -2836,6 +2841,7 @@ body_rune:
runecrafting:
xp: 7.5
levels: [ 20, 46, 92 ]
ourania_chance: 25.0
aka: [ bodies, bodys, body_runes ]
examine: "Used for Curse spells"
kept: "Wilderness"
Expand All @@ -2847,6 +2853,7 @@ death_rune:
xp: 10.0
levels: [ 65 ]
pure: true
ourania_chance: 17.5
aka: [ deaths, death_runes ]
examine: "Used for medium level missile spells."
nature_rune:
Expand All @@ -2857,6 +2864,7 @@ nature_rune:
xp: 9.0
levels: [ 44, 91 ]
pure: true
ourania_chance: 22.5
aka: [ nat, nats, natures, nature_runes ]
examine: "Used for alchemy spells."
chaos_rune:
Expand All @@ -2867,6 +2875,7 @@ chaos_rune:
xp: 8.5
levels: [ 35, 74 ]
pure: true
ourania_chance: 25.0
aka: [ chaoss, chaoses, chaos_runes ]
examine: "Used for low level missile spells."
law_rune:
Expand All @@ -2877,6 +2886,7 @@ law_rune:
xp: 9.5
levels: [ 54 ]
pure: true
ourania_chance: 20.0
aka: [ laws, law_runes ]
examine: "Used for teleport spells."
cosmic_rune:
Expand All @@ -2887,6 +2897,7 @@ cosmic_rune:
xp: 8.0
levels: [ 27, 59 ]
pure: true
ourania_chance: 25.0
aka: [ cosmics, cosmic_runes ]
examine: "Used for enchant spells."
blood_rune:
Expand All @@ -2897,6 +2908,7 @@ blood_rune:
xp: 10.5
levels: [ 77 ]
pure: true
ourania_chance: 15.0
aka: [ bloods, blood_runes ]
examine: "Used for high level missile spells."
soul_rune:
Expand All @@ -2907,6 +2919,7 @@ soul_rune:
xp: 29.7
levels: [ 90 ]
pure: true
ourania_chance: 10.0
aka: [ souls, soul_runes ]
examine: "Used for high level curse spells."
unpowered_orb:
Expand Down Expand Up @@ -24148,27 +24161,31 @@ medium_pouch:
tradeable: false
charges: 45
degrade: medium_pouch_damaged
degrade_message: "Your pouch has decayed through use."
weight: 1.0
examine: "A medium-sized pouch used for storing essence."
medium_pouch_damaged:
id: 5511
tradeable: false
charges: 20
degrade: destroy
degrade_message: "Your pouch has decayed through use."
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
degrade_message: "Your pouch has decayed through use."
weight: 1.0
examine: "A large pouch used for storing essence."
large_pouch_damaged:
id: 5513
tradeable: false
charges: 20
degrade: destroy
degrade_message: "Your pouch has decayed through use."
weight: 1.0
examine: "A large damaged pouch used for storing essence."
giant_pouch:
Expand Down
133 changes: 132 additions & 1 deletion data/definitions/npcs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1918,4 +1918,135 @@ wizard_cromperty:
brimstail:
id: 171
old_model: true
examine: "Small but wise, he is."
examine: "Small but wise, he is."
mage_of_zamorak_ourania:
id: 6370
wander_radius: 4
examine: "A representative of the Z.M.I."
eniola:
id: 6362
examine: "A roving banker."
zamorak_warrior_kite:
&zamorak_warrior
id: 6363
hitpoints: 450
att: 85
str: 70
def: 90
style: slash
max_hit_melee: 80
wander_radius: 5
attack_radius: 11
respawn_delay: 50
hunt_mode: aggressive
weapon_style: sword
drop_table: zamorak_warrior
race: human
examine: "A warrior of Zamorak."
zamorak_warrior_square:
<<: *zamorak_warrior
id: 6364
style: crush
zamorak_mage_fancy: &zamorak_mage
id: 6367
hitpoints: 500
att: 75
str: 80
def: 80
mage: 85
spell: fire_bolt
max_hit_magic: 90
respawn_delay: 50
hunt_mode: aggressive
attack_range: 3
attack_radius: 10
wander_radius: 5
race: human
drop_table: zamorak_mage
examine: "A mage of Zamorak."
zamorak_mage:
<<: *zamorak_mage
id: 6368
zamorak_ranger: &zamorak_ranger
id: 6365
hitpoints: 500
att: 75
str: 80
def: 80
range: 80
max_hit_range: 90
respawn_delay: 50
hunt_mode: aggressive
attack_range: 5
attack_radius: 10
wander_radius: 5
race: human
style: accurate
weapon_style: bow
ammo: mithril_arrow
drop_table: zamorak_ranger
height: 40
examine: "A ranger of Zamorak."
zamorak_ranger_coat:
<<: *zamorak_ranger
id: 6366
cave_lizard:
id: 6369
hitpoints: 200
att: 38
str: 36
def: 35
race: gecko
style: crush
height: 15
hunt_range: 2
attack_range: 1
attack_radius: 11
wander_radius: 5
max_hit_melee: 50
hunt_mode: aggressive
drop_table: empty
respawn_delay: 50
examine: "A cave dweller."
zamorak_crafter_start:
&zamorak_crafter
id: 6371
solid: false
hitpoints: 250
att: 15
str: 15
def: 12
mage: 20
race: human
style: crush
height: 40
hunt_range: 2
attack_range: 1
attack_radius: 11
wander_radius: 5
max_hit_melee: 20
drop_table: zamorak_crafter
respawn_delay: 50
examine: "A Z.M.I. runecrafter."
zamorak_crafter_end:
<<: *zamorak_crafter
id: 6372
monk_of_zamorak_ourania:
id: 189
hitpoints: 100
att: 8
str: 8
def: 12
mage: 25
race: human
style: crush
height: 40
hunt_range: 2
attack_range: 1
attack_radius: 11
wander_radius: 5
max_hit_melee: 50
hunt_mode: aggressive
drop_table: monk_of_zamorak
respawn_delay: 50
examine: "An evil human cleric."
17 changes: 16 additions & 1 deletion data/definitions/objects.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11820,4 +11820,19 @@ brimstails_cave_exit_right:
examine: "The way out!"
rune_essence_exit_portal:
id: 2492
examine: "A portal from this mystical place."
examine: "A portal from this mystical place."
ourania_cave_ladder_down:
id: 26849
examine: "Into the darkness..."
ourania_cave_ladder_up:
id: 26850
examine: "Into the light!"
ourania_crack_enter:
id: 26844
examine: "I might be able to squeeze through."
ourania_crack_exit:
id: 26845
examine: "I might be able to squeeze through."
ourania_altar:
id: 26847
examine: "An altar upon which to craft runes."
25 changes: 25 additions & 0 deletions data/definitions/patrols.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
zamorak_crafter_to_altar:
points:
- { x: 3270, y: 4841 }
- { x: 3266, y: 4837 }
- { x: 3266, y: 4835 }
- { x: 3269, y: 4832 }
- { x: 3269, y: 4819 }
- { x: 3278, y: 4810 }
- { x: 3286, y: 4810 }
- { x: 3288, y: 4813 }
- { x: 3301, y: 4813 }
- { x: 3303, y: 4811 }
- { x: 3314, y: 4811, delay: 10 }
zamorak_crafter_to_bank:
points:
- { x: 3303, y: 4811 }
- { x: 3301, y: 4813 }
- { x: 3288, y: 4813 }
- { x: 3286, y: 4810 }
- { x: 3278, y: 4810 }
- { x: 3269, y: 4819 }
- { x: 3269, y: 4832 }
- { x: 3266, y: 4835 }
- { x: 3266, y: 4837 }
- { x: 3270, y: 4856, delay: 10 }
Loading

0 comments on commit bacbfe9

Please sign in to comment.