Skip to content

Commit bacbfe9

Browse files
authored
Add ourania zmi runecrafting altar (#537)
* 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
1 parent 20c0c90 commit bacbfe9

58 files changed

Lines changed: 1433 additions & 105 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

data/definitions/animations.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1690,4 +1690,7 @@ abyssal_guardian_attack: 2186
16901690
abyssal_guardian_death: 2189
16911691
abyssal_walker_hit: 2192
16921692
abyssal_walker_attack: 2193
1693-
abyssal_walker_death: 2194
1693+
abyssal_walker_death: 2194
1694+
gecko_hit: 7208
1695+
gecko_attack: 7207
1696+
gecko_death: 7205

data/definitions/hunt-modes.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ aggressive:
66
check_not_combat: true
77
check_not_combat_self: true
88
check_not_busy: false
9+
aggressive_npcs:
10+
<<: *aggressive
11+
type: npc
912
not_busy:
1013
<<: *aggressive
1114
check_not_busy: true

data/definitions/interfaces.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1804,6 +1804,39 @@ report_abuse_select: 594
18041804
godwars_killcount: 598
18051805
warning_wilderness2: 600
18061806
unknown_side1: 602
1807+
ourania_bank_charge:
1808+
id: 619
1809+
type: main_screen
1810+
components:
1811+
air_rune: 28
1812+
mind_rune: 29
1813+
water_rune: 30
1814+
earth_rune: 31
1815+
fire_rune: 32
1816+
body_rune: 33
1817+
cosmic_rune: 34
1818+
chaos_rune: 35
1819+
astral_rune: 36
1820+
law_rune: 37
1821+
death_rune: 38
1822+
blood_rune: 39
1823+
nature_rune: 40
1824+
soul_rune: 41
1825+
text: 44
1826+
mind_rune_hide: 45
1827+
air_rune_hide: 46
1828+
water_rune_hide: 47
1829+
earth_rune_hide: 48
1830+
fire_rune_hide: 49
1831+
body_rune_hide: 50
1832+
cosmic_rune_hide: 51
1833+
chaos_rune_hide: 52
1834+
astral_rune_hide: 53
1835+
law_rune_hide: 54
1836+
death_rune_hide: 55
1837+
blood_rune_hide: 56
1838+
nature_rune_hide: 57
1839+
soul_rune_hide: 58
18071840
shop:
18081841
id: 620
18091842
type: main_screen

data/definitions/item-on-item.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6285,9 +6285,9 @@ sapphire_bullseye_lantern_make:
62856285
ticks: 1
62866286
remove:
62876287
- item: bullseye_lantern_frame
6288-
- item: sapphire_lens
6288+
- item: sapphire
62896289
add:
6290-
- item: sapphire_lantern
6290+
- item: sapphire_lantern_empty
62916291
message: "You add the lens to the bullseye lantern frame."
62926292
default_bullseye_lantern_oiled_make:
62936293
skill: crafting

data/definitions/items.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2774,6 +2774,7 @@ fire_rune:
27742774
air: [ smoke, 8.5 ]
27752775
water: [ steam, 9.3 ]
27762776
earth: [ lava, 10.0 ]
2777+
ourania_chance: 25.0
27772778
aka: [ fires, fire_runes ]
27782779
examine: "One of the four basic elemental runes."
27792780
kept: "Wilderness"
@@ -2788,6 +2789,7 @@ water_rune:
27882789
air: [ mist, 8.0 ]
27892790
earth: [ mud, 9.5 ]
27902791
fire: [ steam, 10.0 ]
2792+
ourania_chance: 25.0
27912793
aka: [ waters, water_runes ]
27922794
examine: "One of the four basic elemental runes."
27932795
kept: "Wilderness"
@@ -2802,6 +2804,7 @@ air_rune:
28022804
water: [ mist, 8.5 ]
28032805
earth: [ dust, 9.0 ]
28042806
fire: [ smoke, 9.5 ]
2807+
ourania_chance: 25.0
28052808
aka: [ airs, air_runes ]
28062809
examine: "One of the four basic elemental runes."
28072810
kept: "Wilderness"
@@ -2816,6 +2819,7 @@ earth_rune:
28162819
air: [ dust, 8.3 ]
28172820
water: [ mud, 9.3 ]
28182821
fire: [ lava, 10.5 ]
2822+
ourania_chance: 25.0
28192823
aka: [ earths, earth_runes ]
28202824
examine: "One of the four basic elemental runes."
28212825
kept: "Wilderness"
@@ -2826,6 +2830,7 @@ mind_rune:
28262830
runecrafting:
28272831
xp: 5.5
28282832
levels: [ 2, 14, 28, 42, 56, 84, 98 ]
2833+
ourania_chance: 25.0
28292834
aka: [ minds, mind_runes ]
28302835
examine: "Used for basic level missile spells."
28312836
kept: "Wilderness"
@@ -2836,6 +2841,7 @@ body_rune:
28362841
runecrafting:
28372842
xp: 7.5
28382843
levels: [ 20, 46, 92 ]
2844+
ourania_chance: 25.0
28392845
aka: [ bodies, bodys, body_runes ]
28402846
examine: "Used for Curse spells"
28412847
kept: "Wilderness"
@@ -2847,6 +2853,7 @@ death_rune:
28472853
xp: 10.0
28482854
levels: [ 65 ]
28492855
pure: true
2856+
ourania_chance: 17.5
28502857
aka: [ deaths, death_runes ]
28512858
examine: "Used for medium level missile spells."
28522859
nature_rune:
@@ -2857,6 +2864,7 @@ nature_rune:
28572864
xp: 9.0
28582865
levels: [ 44, 91 ]
28592866
pure: true
2867+
ourania_chance: 22.5
28602868
aka: [ nat, nats, natures, nature_runes ]
28612869
examine: "Used for alchemy spells."
28622870
chaos_rune:
@@ -2867,6 +2875,7 @@ chaos_rune:
28672875
xp: 8.5
28682876
levels: [ 35, 74 ]
28692877
pure: true
2878+
ourania_chance: 25.0
28702879
aka: [ chaoss, chaoses, chaos_runes ]
28712880
examine: "Used for low level missile spells."
28722881
law_rune:
@@ -2877,6 +2886,7 @@ law_rune:
28772886
xp: 9.5
28782887
levels: [ 54 ]
28792888
pure: true
2889+
ourania_chance: 20.0
28802890
aka: [ laws, law_runes ]
28812891
examine: "Used for teleport spells."
28822892
cosmic_rune:
@@ -2887,6 +2897,7 @@ cosmic_rune:
28872897
xp: 8.0
28882898
levels: [ 27, 59 ]
28892899
pure: true
2900+
ourania_chance: 25.0
28902901
aka: [ cosmics, cosmic_runes ]
28912902
examine: "Used for enchant spells."
28922903
blood_rune:
@@ -2897,6 +2908,7 @@ blood_rune:
28972908
xp: 10.5
28982909
levels: [ 77 ]
28992910
pure: true
2911+
ourania_chance: 15.0
29002912
aka: [ bloods, blood_runes ]
29012913
examine: "Used for high level missile spells."
29022914
soul_rune:
@@ -2907,6 +2919,7 @@ soul_rune:
29072919
xp: 29.7
29082920
levels: [ 90 ]
29092921
pure: true
2922+
ourania_chance: 10.0
29102923
aka: [ souls, soul_runes ]
29112924
examine: "Used for high level curse spells."
29122925
unpowered_orb:
@@ -24148,27 +24161,31 @@ medium_pouch:
2414824161
tradeable: false
2414924162
charges: 45
2415024163
degrade: medium_pouch_damaged
24164+
degrade_message: "Your pouch has decayed through use."
2415124165
weight: 1.0
2415224166
examine: "A medium-sized pouch used for storing essence."
2415324167
medium_pouch_damaged:
2415424168
id: 5511
2415524169
tradeable: false
2415624170
charges: 20
2415724171
degrade: destroy
24172+
degrade_message: "Your pouch has decayed through use."
2415824173
weight: 1.0
2415924174
examine: "A damaged medium-sized pouch used for storing essence."
2416024175
large_pouch:
2416124176
id: 5512
2416224177
tradeable: false
2416324178
charges: 29
2416424179
degrade: large_pouch_damaged
24180+
degrade_message: "Your pouch has decayed through use."
2416524181
weight: 1.0
2416624182
examine: "A large pouch used for storing essence."
2416724183
large_pouch_damaged:
2416824184
id: 5513
2416924185
tradeable: false
2417024186
charges: 20
2417124187
degrade: destroy
24188+
degrade_message: "Your pouch has decayed through use."
2417224189
weight: 1.0
2417324190
examine: "A large damaged pouch used for storing essence."
2417424191
giant_pouch:

data/definitions/npcs.yml

Lines changed: 132 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1918,4 +1918,135 @@ wizard_cromperty:
19181918
brimstail:
19191919
id: 171
19201920
old_model: true
1921-
examine: "Small but wise, he is."
1921+
examine: "Small but wise, he is."
1922+
mage_of_zamorak_ourania:
1923+
id: 6370
1924+
wander_radius: 4
1925+
examine: "A representative of the Z.M.I."
1926+
eniola:
1927+
id: 6362
1928+
examine: "A roving banker."
1929+
zamorak_warrior_kite:
1930+
&zamorak_warrior
1931+
id: 6363
1932+
hitpoints: 450
1933+
att: 85
1934+
str: 70
1935+
def: 90
1936+
style: slash
1937+
max_hit_melee: 80
1938+
wander_radius: 5
1939+
attack_radius: 11
1940+
respawn_delay: 50
1941+
hunt_mode: aggressive
1942+
weapon_style: sword
1943+
drop_table: zamorak_warrior
1944+
race: human
1945+
examine: "A warrior of Zamorak."
1946+
zamorak_warrior_square:
1947+
<<: *zamorak_warrior
1948+
id: 6364
1949+
style: crush
1950+
zamorak_mage_fancy: &zamorak_mage
1951+
id: 6367
1952+
hitpoints: 500
1953+
att: 75
1954+
str: 80
1955+
def: 80
1956+
mage: 85
1957+
spell: fire_bolt
1958+
max_hit_magic: 90
1959+
respawn_delay: 50
1960+
hunt_mode: aggressive
1961+
attack_range: 3
1962+
attack_radius: 10
1963+
wander_radius: 5
1964+
race: human
1965+
drop_table: zamorak_mage
1966+
examine: "A mage of Zamorak."
1967+
zamorak_mage:
1968+
<<: *zamorak_mage
1969+
id: 6368
1970+
zamorak_ranger: &zamorak_ranger
1971+
id: 6365
1972+
hitpoints: 500
1973+
att: 75
1974+
str: 80
1975+
def: 80
1976+
range: 80
1977+
max_hit_range: 90
1978+
respawn_delay: 50
1979+
hunt_mode: aggressive
1980+
attack_range: 5
1981+
attack_radius: 10
1982+
wander_radius: 5
1983+
race: human
1984+
style: accurate
1985+
weapon_style: bow
1986+
ammo: mithril_arrow
1987+
drop_table: zamorak_ranger
1988+
height: 40
1989+
examine: "A ranger of Zamorak."
1990+
zamorak_ranger_coat:
1991+
<<: *zamorak_ranger
1992+
id: 6366
1993+
cave_lizard:
1994+
id: 6369
1995+
hitpoints: 200
1996+
att: 38
1997+
str: 36
1998+
def: 35
1999+
race: gecko
2000+
style: crush
2001+
height: 15
2002+
hunt_range: 2
2003+
attack_range: 1
2004+
attack_radius: 11
2005+
wander_radius: 5
2006+
max_hit_melee: 50
2007+
hunt_mode: aggressive
2008+
drop_table: empty
2009+
respawn_delay: 50
2010+
examine: "A cave dweller."
2011+
zamorak_crafter_start:
2012+
&zamorak_crafter
2013+
id: 6371
2014+
solid: false
2015+
hitpoints: 250
2016+
att: 15
2017+
str: 15
2018+
def: 12
2019+
mage: 20
2020+
race: human
2021+
style: crush
2022+
height: 40
2023+
hunt_range: 2
2024+
attack_range: 1
2025+
attack_radius: 11
2026+
wander_radius: 5
2027+
max_hit_melee: 20
2028+
drop_table: zamorak_crafter
2029+
respawn_delay: 50
2030+
examine: "A Z.M.I. runecrafter."
2031+
zamorak_crafter_end:
2032+
<<: *zamorak_crafter
2033+
id: 6372
2034+
monk_of_zamorak_ourania:
2035+
id: 189
2036+
hitpoints: 100
2037+
att: 8
2038+
str: 8
2039+
def: 12
2040+
mage: 25
2041+
race: human
2042+
style: crush
2043+
height: 40
2044+
hunt_range: 2
2045+
attack_range: 1
2046+
attack_radius: 11
2047+
wander_radius: 5
2048+
max_hit_melee: 50
2049+
hunt_mode: aggressive
2050+
drop_table: monk_of_zamorak
2051+
respawn_delay: 50
2052+
examine: "An evil human cleric."

data/definitions/objects.yml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11820,4 +11820,19 @@ brimstails_cave_exit_right:
1182011820
examine: "The way out!"
1182111821
rune_essence_exit_portal:
1182211822
id: 2492
11823-
examine: "A portal from this mystical place."
11823+
examine: "A portal from this mystical place."
11824+
ourania_cave_ladder_down:
11825+
id: 26849
11826+
examine: "Into the darkness..."
11827+
ourania_cave_ladder_up:
11828+
id: 26850
11829+
examine: "Into the light!"
11830+
ourania_crack_enter:
11831+
id: 26844
11832+
examine: "I might be able to squeeze through."
11833+
ourania_crack_exit:
11834+
id: 26845
11835+
examine: "I might be able to squeeze through."
11836+
ourania_altar:
11837+
id: 26847
11838+
examine: "An altar upon which to craft runes."

data/definitions/patrols.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
zamorak_crafter_to_altar:
2+
points:
3+
- { x: 3270, y: 4841 }
4+
- { x: 3266, y: 4837 }
5+
- { x: 3266, y: 4835 }
6+
- { x: 3269, y: 4832 }
7+
- { x: 3269, y: 4819 }
8+
- { x: 3278, y: 4810 }
9+
- { x: 3286, y: 4810 }
10+
- { x: 3288, y: 4813 }
11+
- { x: 3301, y: 4813 }
12+
- { x: 3303, y: 4811 }
13+
- { x: 3314, y: 4811, delay: 10 }
14+
zamorak_crafter_to_bank:
15+
points:
16+
- { x: 3303, y: 4811 }
17+
- { x: 3301, y: 4813 }
18+
- { x: 3288, y: 4813 }
19+
- { x: 3286, y: 4810 }
20+
- { x: 3278, y: 4810 }
21+
- { x: 3269, y: 4819 }
22+
- { x: 3269, y: 4832 }
23+
- { x: 3266, y: 4835 }
24+
- { x: 3266, y: 4837 }
25+
- { x: 3270, y: 4856, delay: 10 }

0 commit comments

Comments
 (0)