2009Scape/Server
1
0
Fork 1
mirror of https://gitlab.com/2009scape/2009scape.git synced 2026-08-22 19:05:11 -06:00
Code Issues Projects Releases Packages Wiki Activity

Revert "ELEMENTAL_RUNE and CATALYTIC_RUNE useable for standard spells"

Browse source 
This reverts commit d37b7437e0.
This commit is contained in:
Tooze 2026-02-20 13:58:12 -05:00
parent 32e08837dc
commit a185935221
5 changed files with 1 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Server/src/main/content/global/skill/magic/modern/AirSpell.java
View file

@ -122,11 +122,6 @@ public final class AirSpell extends CombatSpell {
SpellBook.MODERN.register(10, new AirSpell(SpellType.BOLT, 17, 13.5, Sounds.WINDBOLT_CAST_AND_FIRE_218, BOLT_START, BOLT_PROJECTILE, BOLT_END, Runes.CHAOS_RUNE.getItem(1), Runes.AIR_RUNE.getItem(2)));
SpellBook.MODERN.register(24, new AirSpell(SpellType.BLAST, 41, 25.5, Sounds.WINDBLAST_CAST_AND_FIRE_216, BLAST_START, BLAST_PROJECTILE, BLAST_END, Runes.DEATH_RUNE.getItem(1), Runes.AIR_RUNE.getItem(3)));
SpellBook.MODERN.register(45, new AirSpell(SpellType.WAVE, 62, 36.0, Sounds.WINDWAVE_CAST_AND_FIRE_222, WAVE_START, WAVE_PROJECTILE, WAVE_END, Runes.BLOOD_RUNE.getItem(1), Runes.AIR_RUNE.getItem(5)));
//CATALYTIC_RUNE and ELEMENTAL_RUNE ( Mini Games)
SpellBook.MODERN.register(1, new AirSpell(SpellType.STRIKE, 1, 5.5, Sounds.WINDSTRIKE_CAST_AND_FIRE_220, STRIKE_START, STRIKE_PROJECTILE, STRIKE_END, Runes.CATALYTIC_RUNE.getItem(1), Runes.ELEMENTAL_RUNE.getItem(1)));
SpellBook.MODERN.register(10, new AirSpell(SpellType.BOLT, 17, 13.5, Sounds.WINDBOLT_CAST_AND_FIRE_218, BOLT_START, BOLT_PROJECTILE, BOLT_END, Runes.CATALYTIC_RUNE.getItem(1), Runes.ELEMENTAL_RUNE.getItem(2)));
SpellBook.MODERN.register(24, new AirSpell(SpellType.BLAST, 41, 25.5, Sounds.WINDBLAST_CAST_AND_FIRE_216, BLAST_START, BLAST_PROJECTILE, BLAST_END, Runes.CATALYTIC_RUNE.getItem(1), Runes.ELEMENTAL_RUNE.getItem(3)));
SpellBook.MODERN.register(45, new AirSpell(SpellType.WAVE, 62, 36.0, Sounds.WINDWAVE_CAST_AND_FIRE_222, WAVE_START, WAVE_PROJECTILE, WAVE_END, Runes.CATALYTIC_RUNE.getItem(1), Runes.ELEMENTAL_RUNE.getItem(5)));
return this;
}
}

5
Server/src/main/content/global/skill/magic/modern/EarthSpell.java
View file

@ -122,11 +122,6 @@ public final class EarthSpell extends CombatSpell {
SpellBook.MODERN.register(17, new EarthSpell(SpellType.BOLT, 29, 19.5, Sounds.EARTHBOLT_CAST_AND_FIRE_130, BOLT_START, BOLT_PROJECTILE, BOLT_END, Runes.CHAOS_RUNE.getItem(1), Runes.EARTH_RUNE.getItem(3), Runes.AIR_RUNE.getItem(2)));
SpellBook.MODERN.register(33, new EarthSpell(SpellType.BLAST, 53, 31.5, Sounds.EARTHBLAST_CAST_AND_FIRE_128, BLAST_START, BLAST_PROJECTILE, BLAST_END, Runes.DEATH_RUNE.getItem(1), Runes.EARTH_RUNE.getItem(4), Runes.AIR_RUNE.getItem(3)));
SpellBook.MODERN.register(52, new EarthSpell(SpellType.WAVE, 70, 40.0, Sounds.EARTHWAVE_CAST_AND_FIRE_134, WAVE_START, WAVE_PROJECTILE, WAVE_END, Runes.BLOOD_RUNE.getItem(1), Runes.EARTH_RUNE.getItem(7), Runes.AIR_RUNE.getItem(5)));
//CATALYTIC_RUNE and ELEMENTAL_RUNE ( Mini Games)
SpellBook.MODERN.register(6, new EarthSpell(SpellType.STRIKE, 9, 9.5, Sounds.EARTHSTRIKE_CAST_AND_FIRE_132, STRIKE_START, STRIKE_PROJECTILE, STRIKE_END, Runes.CATALYTIC_RUNE.getItem(1), Runes.ELEMENTAL_RUNE.getItem(2), Runes.ELEMENTAL_RUNE.getItem(1)));
SpellBook.MODERN.register(17, new EarthSpell(SpellType.BOLT, 29, 19.5, Sounds.EARTHBOLT_CAST_AND_FIRE_130, BOLT_START, BOLT_PROJECTILE, BOLT_END, Runes.CATALYTIC_RUNE.getItem(1), Runes.ELEMENTAL_RUNE.getItem(3), Runes.ELEMENTAL_RUNE.getItem(2)));
SpellBook.MODERN.register(33, new EarthSpell(SpellType.BLAST, 53, 31.5, Sounds.EARTHBLAST_CAST_AND_FIRE_128, BLAST_START, BLAST_PROJECTILE, BLAST_END, Runes.CATALYTIC_RUNE.getItem(1), Runes.ELEMENTAL_RUNE.getItem(4), Runes.ELEMENTAL_RUNE.getItem(3)));
SpellBook.MODERN.register(52, new EarthSpell(SpellType.WAVE, 70, 40.0, Sounds.EARTHWAVE_CAST_AND_FIRE_134, WAVE_START, WAVE_PROJECTILE, WAVE_END, Runes.CATALYTIC_RUNE.getItem(1), Runes.ELEMENTAL_RUNE.getItem(7), Runes.ELEMENTAL_RUNE.getItem(5)));
return this;
}

5
Server/src/main/content/global/skill/magic/modern/FireSpell.java
View file

@ -123,11 +123,6 @@ public final class FireSpell extends CombatSpell {
SpellBook.MODERN.register(20, new FireSpell(SpellType.BOLT, 35, 22.5, Sounds.FIREBOLT_CAST_AND_FIRE_157, BOLT_START, BOLT_PROJECTILE, BOLT_END, Runes.CHAOS_RUNE.getItem(1), Runes.FIRE_RUNE.getItem(4), Runes.AIR_RUNE.getItem(3)));
SpellBook.MODERN.register(38, new FireSpell(SpellType.BLAST, 59, 34.5, Sounds.FIREBLAST_CAST_AND_FIRE_155, BLAST_START, BLAST_PROJECTILE, BLAST_END, Runes.DEATH_RUNE.getItem(1), Runes.FIRE_RUNE.getItem(5), Runes.AIR_RUNE.getItem(4)));
SpellBook.MODERN.register(55, new FireSpell(SpellType.WAVE, 75, 42.5, Sounds.FIREWAVE_CAST_AND_FIRE_162, WAVE_START, WAVE_PROJECTILE, WAVE_END, Runes.BLOOD_RUNE.getItem(1), Runes.FIRE_RUNE.getItem(7), Runes.AIR_RUNE.getItem(5)));
//CATALYTIC_RUNE and ELEMENTAL_RUNE ( Mini Games)
SpellBook.MODERN.register(8, new FireSpell(SpellType.STRIKE, 13, 11.5, Sounds.FIRESTRIKE_CAST_AND_FIRE_160, STRIKE_START, STRIKE_PROJECTILE, STRIKE_END, Runes.CATALYTIC_RUNE.getItem(1), Runes.ELEMENTAL_RUNE.getItem(3), Runes.ELEMENTAL_RUNE.getItem(2)));
SpellBook.MODERN.register(20, new FireSpell(SpellType.BOLT, 35, 22.5, Sounds.FIREBOLT_CAST_AND_FIRE_157, BOLT_START, BOLT_PROJECTILE, BOLT_END, Runes.CATALYTIC_RUNE.getItem(1), Runes.ELEMENTAL_RUNE.getItem(4), Runes.ELEMENTAL_RUNE.getItem(3)));
SpellBook.MODERN.register(38, new FireSpell(SpellType.BLAST, 59, 34.5, Sounds.FIREBLAST_CAST_AND_FIRE_155, BLAST_START, BLAST_PROJECTILE, BLAST_END, Runes.CATALYTIC_RUNE.getItem(1), Runes.ELEMENTAL_RUNE.getItem(5), Runes.ELEMENTAL_RUNE.getItem(4)));
SpellBook.MODERN.register(55, new FireSpell(SpellType.WAVE, 75, 42.5, Sounds.FIREWAVE_CAST_AND_FIRE_162, WAVE_START, WAVE_PROJECTILE, WAVE_END, Runes.CATALYTIC_RUNE.getItem(1), Runes.ELEMENTAL_RUNE.getItem(7), Runes.ELEMENTAL_RUNE.getItem(5)));
return this;
}

5
Server/src/main/content/global/skill/magic/modern/WaterSpell.java
View file

@ -122,11 +122,6 @@ public final class WaterSpell extends CombatSpell {
SpellBook.MODERN.register(14, new WaterSpell(SpellType.BOLT, 23, 16.5, Sounds.WATERBOLT_CAST_AND_FIRE_209, BOLT_START, BOLT_PROJECTILE, BOLT_END, Runes.CHAOS_RUNE.getItem(1), Runes.WATER_RUNE.getItem(2), Runes.AIR_RUNE.getItem(2)));
SpellBook.MODERN.register(27, new WaterSpell(SpellType.BLAST, 47, 28.5, Sounds.WATERBLAST_CAST_AND_FIRE_207, BLAST_START, BLAST_PROJECTILE, BLAST_END, Runes.DEATH_RUNE.getItem(1), Runes.WATER_RUNE.getItem(3), Runes.AIR_RUNE.getItem(3)));
SpellBook.MODERN.register(48, new WaterSpell(SpellType.WAVE, 65, 37.5, Sounds.WATERWAVE_CAST_AND_FIRE_213, WAVE_START, WAVE_PROJECTILE, WAVE_END, Runes.BLOOD_RUNE.getItem(1), Runes.WATER_RUNE.getItem(7), Runes.AIR_RUNE.getItem(5)));
//CATALYTIC_RUNE and ELEMENTAL_RUNE ( Mini Games)
SpellBook.MODERN.register(4, new WaterSpell(SpellType.STRIKE, 5, 7.5, Sounds.WATERSTRIKE_CAST_AND_FIRE_211, STRIKE_START, STRIKE_PROJECTILE, STRIKE_END, Runes.CATALYTIC_RUNE.getItem(1), Runes.ELEMENTAL_RUNE.getItem(1), Runes.ELEMENTAL_RUNE.getItem(1)));
SpellBook.MODERN.register(14, new WaterSpell(SpellType.BOLT, 23, 16.5, Sounds.WATERBOLT_CAST_AND_FIRE_209, BOLT_START, BOLT_PROJECTILE, BOLT_END, Runes.CATALYTIC_RUNE.getItem(1), Runes.ELEMENTAL_RUNE.getItem(2), Runes.ELEMENTAL_RUNE.getItem(2)));
SpellBook.MODERN.register(27, new WaterSpell(SpellType.BLAST, 47, 28.5, Sounds.WATERBLAST_CAST_AND_FIRE_207, BLAST_START, BLAST_PROJECTILE, BLAST_END, Runes.CATALYTIC_RUNE.getItem(1), Runes.ELEMENTAL_RUNE.getItem(3), Runes.ELEMENTAL_RUNE.getItem(3)));
SpellBook.MODERN.register(48, new WaterSpell(SpellType.WAVE, 65, 37.5, Sounds.WATERWAVE_CAST_AND_FIRE_213, WAVE_START, WAVE_PROJECTILE, WAVE_END, Runes.CATALYTIC_RUNE.getItem(1), Runes.ELEMENTAL_RUNE.getItem(7), Runes.ELEMENTAL_RUNE.getItem(5)));
return this;
}

2
Server/src/main/core/game/node/entity/combat/spell/Runes.java
View file

@ -8,7 +8,7 @@ import org.rs09.consts.Items;
* @author 'Vexia
*/
public enum Runes {
AIR_RUNE(556), WATER_RUNE(555), EARTH_RUNE(557), FIRE_RUNE(554), MIND_RUNE(558), NATURE_RUNE(561), CHAOS_RUNE(562), DEATH_RUNE(560), COSMIC_RUNE(564), BLOOD_RUNE(565), SOUL_RUNE(566), ASTRAL_RUNE(9075), LAW_RUNE(563), BODY_RUNE(559), SARADOMIN_STAFF(2415), GUTHIX_STAFF(2416), ZAMORAK_STAFF(2417), ZURIELS_STAFF(13867),ELEMENTAL_RUNE(12850),CATALYTIC_RUNE(12851);
AIR_RUNE(556), WATER_RUNE(555), EARTH_RUNE(557), FIRE_RUNE(554), MIND_RUNE(558), NATURE_RUNE(561), CHAOS_RUNE(562), DEATH_RUNE(560), COSMIC_RUNE(564), BLOOD_RUNE(565), SOUL_RUNE(566), ASTRAL_RUNE(9075), LAW_RUNE(563), BODY_RUNE(559), SARADOMIN_STAFF(2415), GUTHIX_STAFF(2416), ZAMORAK_STAFF(2417), ZURIELS_STAFF(13867);
/**
* Constructs a new {@code Runes} {@code Object}.