From 8b13cd9fe12afe61b72f072046556e40c2d33a7a Mon Sep 17 00:00:00 2001 From: mekolat Date: Sat, 25 Apr 2015 10:07:41 -0400 Subject: make magic less ambiguous --- world/map/conf/magic-anchors.sex | 118 ++++++----- world/map/conf/magic-debug.sex | 408 ------------------------------------ world/map/conf/magic-level0.sex | 39 ++++ world/map/conf/magic-level1.sex | 92 +++----- world/map/conf/magic-level2.sex | 190 ++++++++--------- world/map/conf/magic-level3.sex | 345 +++++++++++++++--------------- world/map/conf/magic-level4.sex | 2 +- world/map/conf/magic-level5.sex | 102 ++++----- world/map/conf/magic-misc.sex | 79 ++++--- world/map/conf/magic-quickdebug.sex | 2 +- world/map/conf/tmwa-map.conf | 2 +- 11 files changed, 493 insertions(+), 886 deletions(-) delete mode 100644 world/map/conf/magic-debug.sex create mode 100644 world/map/conf/magic-level0.sex (limited to 'world') diff --git a/world/map/conf/magic-anchors.sex b/world/map/conf/magic-anchors.sex index 40bd7de5..3bb16f75 100644 --- a/world/map/conf/magic-anchors.sex +++ b/world/map/conf/magic-anchors.sex @@ -1,56 +1,66 @@ "--------------------------------------------------------------------------------" -"Teleport anchors" +" Teleport anchors(disabled) " +" As of now, only the #vorp spell(disabled) uses them " "--------------------------------------------------------------------------------" -(TELEPORT-ANCHOR tulimshar "tulimshar" - (@+ - (@ "001-1" 43 66) - 3 - 3)) - -(TELEPORT-ANCHOR hurnscald "hurnscald" - (@+ - (@ "009-1" 55 37) - 3 - 3)) - -(TELEPORT-ANCHOR nivalis "nivalis" - (@+ - (@ "020-1" 75 63) - 19 - 12)) - -(TELEPORT-ANCHOR wizardhut "##00" - (@+ - (@ "013-1" 41 92) - 3 - 3)) - -(TELEPORT-ANCHOR pachua "##01" - (@+ - (@ "006-1" 22 101) - 3 - 3)) - -(TELEPORT-ANCHOR desert "##02" - (@+ - (@ "005-1" 160 64) - 5 - 5)) - -(TELEPORT-ANCHOR forest "##03" - (@+ - (@ "015-1" 35 35) - 40 - 40)) - -(TELEPORT-ANCHOR snakecave "##04" - (@+ - (@ "011-4" 50 75) - 3 - 3)) - -(TELEPORT-ANCHOR dimondscove "##05" - (@+ - (@ "010-2" 23 79) - 3 - 3)) +(DISABLED + (TELEPORT-ANCHOR tulimshar "tulimshar" + (@+ + (@ "001-1" 43 66) + 3 + 3))) + +(DISABLED + (TELEPORT-ANCHOR hurnscald "hurnscald" + (@+ + (@ "009-1" 55 37) + 3 + 3))) + +(DISABLED + (TELEPORT-ANCHOR nivalis "nivalis" + (@+ + (@ "020-1" 75 63) + 19 + 12))) + +(DISABLED + (TELEPORT-ANCHOR wizardhut "##00" + (@+ + (@ "013-1" 41 92) + 3 + 3))) + +(DISABLED + (TELEPORT-ANCHOR pachua "##01" + (@+ + (@ "006-1" 22 101) + 3 + 3))) + +(DISABLED + (TELEPORT-ANCHOR desert "##02" + (@+ + (@ "005-1" 160 64) + 5 + 5))) + +(DISABLED + (TELEPORT-ANCHOR forest "##03" + (@+ + (@ "015-1" 35 35) + 40 + 40))) + +(DISABLED + (TELEPORT-ANCHOR snakecave "##04" + (@+ + (@ "011-4" 50 75) + 3 + 3))) + +(DISABLED + (TELEPORT-ANCHOR dimondscove "##05" + (@+ + (@ "010-2" 23 79) + 3 + 3))) diff --git a/world/map/conf/magic-debug.sex b/world/map/conf/magic-debug.sex deleted file mode 100644 index 3cefd3b9..00000000 --- a/world/map/conf/magic-debug.sex +++ /dev/null @@ -1,408 +0,0 @@ -"--------------------------------------------------------------------------------" -"Debug keywords" -"--------------------------------------------------------------------------------" -(SPELL () debug "debug" () - (=> - (REQUIRE DEBUG) - (EFFECT - (message caster - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ "FLAGS: " "drank=") - (> - (& - (script_int caster "MAGIC_FLAGS") - 1) - 0)) - ", ") - "Kmseed=") - (> - (& - (script_int caster "MAGIC_FLAGS") - 2) - 0)) - ", ") - "touched-mseed=") - (> - (& - (script_int caster "MAGIC_FLAGS") - 4) - 0)) - ", ") - "mseed-max=") - (> - (& - (script_int caster "MAGIC_FLAGS") - 8) - 0)) - ", ") - "Kauldsbel=") - (> - (& - (script_int caster "MAGIC_FLAGS") - 16) - 0)) - ", ") - "Kwyara=") - (> - (& - (script_int caster "MAGIC_FLAGS") - 32) - 0)) - ", ") - "Ksagatha=") - (> - (& - (script_int caster "MAGIC_FLAGS") - 64) - 0)) - ", ") - "Kmpotion=") - (> - (& - (script_int caster "MAGIC_FLAGS") - 128) - 0)) - ", ") - "mseed-rumour=") - (> - (& - (script_int caster "MAGIC_FLAGS") - 256) - 0)) - ", ") - "Kcuttree=") - (> - (& - (script_int caster "MAGIC_FLAGS") - 512) - 0)) - ", ") - "cut=") - (> - (& - (script_int caster "MAGIC_FLAGS") - 1024) - 0)) - ", ") - "Kdruidtree=") - (> - (& - (script_int caster "MAGIC_FLAGS") - 2048) - 0)) - ", ") - "Kimp=") - (> - (& - (script_int caster "MAGIC_FLAGS") - 4096) - 0)) - ", ") - "Koldwiz=") - (> - (& - (script_int caster "MAGIC_FLAGS") - 8192) - 0)) - ", ") - "made-conc=") - (> - (& - (script_int caster "MAGIC_FLAGS") - 16384) - 0)) - ", ") - "elanore-omar=") - (> - (& - (script_int caster "MAGIC_FLAGS") - 32768) - 0))) - (message caster - (+ - (+ - (+ - (+ - (+ "EXP: " - (& - (script_int caster "MAGIC_EXPERIENCE") - 0xffff)) - ", lastspell=") - (& - (>> - (script_int caster "MAGIC_EXPERIENCE") - 16) - 0xff)) - ", healexp=") - (& - (>> - (script_int caster "MAGIC_EXPERIENCE") - 24) - 0xff))) - (message caster - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ - (+ "STATUS: " "auldsbel:") - (& - (script_int caster "QUEST_MAGIC") - 0x1f)) - ",") - (& - (>> - (script_int caster "QUEST_MAGIC") - 5) - 0x7)) - ", ") - "dt/mb:") - (& - (>> - (script_int caster "QUEST_MAGIC") - 8) - 0xf)) - ", ") - "s-unhappy:") - (& - (>> - (script_int caster "QUEST_MAGIC") - 12) - 0xf)) - ", ") - "sagatha:") - (& - (>> - (script_int caster "QUEST_MAGIC") - 16) - 0xff)) - ", ") - "swords:") - (& - (>> - (script_int caster "QUEST_MAGIC") - 24) - 0xff)) - ", ") - "imp:") - (& - (>> - (script_int caster "QUEST_MAGIC2") - 0) - 0xf)) - ", ") - "elanore:") - (& - (>> - (script_int caster "QUEST_MAGIC2") - 4) - 0xf)) - ", ") - "elanore-sub:") - (& - (>> - (script_int caster "QUEST_MAGIC2") - 12) - 0xf)) - ", ") - "wyara:") - (& - (>> - (script_int caster "QUEST_MAGIC2") - 8) - 0xf)))))) -(PROCEDURE debug_xmod (name mask shift gain) - (SET value - (+ - (& - (>> - (script_int caster name) - shift) - mask) - gain)) - (IF (< value 0) - (SET value 0)) - (IF (> value mask) - (SET value mask)) - (CALL set_var name mask shift value)) -(PROCEDURE debug_mod (name delta) - (IF (== name "mexp") - (CALL debug_xmod "MAGIC_EXPERIENCE" 0xffff 0 delta) - (IF (== name "lastspell") - (CALL debug_xmod "MAGIC_EXPERIENCE" 0xff 16 delta) - (IF (== name "healexp") - (CALL debug_xmod "MAGIC_EXPERIENCE" 0xff 24 delta) - (IF (== name "drank") - (CALL debug_xmod "MAGIC_FLAGS" 0x1 0 delta) - (IF (== name "Kmseed") - (CALL debug_xmod "MAGIC_FLAGS" 0x1 1 delta) - (IF (== name "touched-mseed") - (CALL debug_xmod "MAGIC_FLAGS" 0x1 2 delta) - (IF (== name "mseed-max") - (CALL debug_xmod "MAGIC_FLAGS" 0x1 3 delta) - (IF (== name "Kauldsbel") - (CALL debug_xmod "MAGIC_FLAGS" 0x1 4 delta) - (IF (== name "Kwyara") - (CALL debug_xmod "MAGIC_FLAGS" 0x1 5 delta) - (IF (== name "Ksagatha") - (CALL debug_xmod "MAGIC_FLAGS" 0x1 6 delta) - (IF (== name "Kmpotion") - (CALL debug_xmod "MAGIC_FLAGS" 0x1 7 delta) - (IF (== name "mseed-rumour") - (CALL debug_xmod "MAGIC_FLAGS" 0x1 8 delta) - (IF (== name "Kcuttree") - (CALL debug_xmod "MAGIC_FLAGS" 0x1 9 delta) - (IF (== name "cut") - (CALL debug_xmod "MAGIC_FLAGS" 0x1 10 delta) - (IF (== name "Kdruidtree") - (CALL debug_xmod "MAGIC_FLAGS" 0x1 11 delta) - (IF (== name "Kimp") - (CALL debug_xmod "MAGIC_FLAGS" 0x1 12 delta) - (IF (== name "oldwiz") - (CALL debug_xmod "MAGIC_FLAGS" 0x1 13 delta) - (IF (== name "made-conc") - (CALL debug_xmod "MAGIC_FLAGS" 0x1 14 delta) - (IF (== name "elanore-omar") - (CALL debug_xmod "MAGIC_FLAGS" 0x1 15 delta) - (IF (== name "auldsbel") - (CALL debug_xmod "QUEST_MAGIC" 0x1f 0 delta) - (IF (== name "Qauldsbel") - (CALL debug_xmod "QUEST_MAGIC" 0x7 5 delta) - (IF (== name "dt") - (CALL debug_xmod "QUEST_MAGIC" 0x3 10 delta) - (IF (== name "mb") - (CALL debug_xmod "QUEST_MAGIC" 0x3 8 delta) - (IF (== name "s-unhappy") - (CALL debug_xmod "QUEST_MAGIC" 0xff 12 delta) - (IF (== name "sagatha") - (CALL debug_xmod "QUEST_MAGIC" 0xff 16 delta) - (IF (== name "swords") - (CALL debug_xmod "QUEST_MAGIC" 0xff 24 delta) - (IF (== name "imp") - (CALL debug_xmod "QUEST_MAGIC2" 0xf 0 delta) - (IF (== name "elanore") - (CALL debug_xmod "QUEST_MAGIC2" 0xf 4 delta) - (IF (== name "wyara") - (CALL debug_xmod "QUEST_MAGIC2" 0xf 8 delta) - (IF (== name "elanore-sub") - (CALL debug_xmod "QUEST_MAGIC2" 0xf 12 delta) - (message caster "Unknown")))))))))))))))))))))))))))))))) - -(SPELL () debug-up1 "debug+1" (STRING name) - (=> - (REQUIRE DEBUG) - (EFFECT - (CALL debug_mod name 1)))) - -(SPELL () debug-down1 "debug-1" (STRING name) - (=> - (REQUIRE DEBUG) - (EFFECT - (CALL debug_mod name - (- 0 1))))) - -(SPELL () debug-up16 "debug+16" (STRING name) - (=> - (REQUIRE DEBUG) - (EFFECT - (CALL debug_mod name 16)))) - -(SPELL () debug-down16 "debug-16" (STRING name) - (=> - (REQUIRE DEBUG) - (EFFECT - (CALL debug_mod name - (- 0 16))))) - -(SPELL () debug-up256 "debug+256" (STRING name) - (=> - (REQUIRE DEBUG) - (EFFECT - - (CALL debug_mod name 256)))) -(SPELL () debug-down256 "debug-256" (STRING name) - (=> - (REQUIRE DEBUG) - (EFFECT - (CALL debug_mod name - (- 0 256))))) - -(SPELL () debug-reset "debug-reset" () - (=> - (REQUIRE DEBUG) - (EFFECT - (set_script_variable caster "QUEST_MAGIC" - 0) - (set_script_variable caster "QUEST_MAGIC2" - 0) - (set_script_variable caster "MAGIC_FLAGS" - 0) - (set_script_variable caster "MAGIC_EXP" - 0)))) diff --git a/world/map/conf/magic-level0.sex b/world/map/conf/magic-level0.sex new file mode 100644 index 00000000..f376b2cd --- /dev/null +++ b/world/map/conf/magic-level0.sex @@ -0,0 +1,39 @@ +"--------------------------------------------------------------------------------" +" Level 0 spells " +"--------------------------------------------------------------------------------" +(SPELL () wand "#confringo" () + (LET school MAGIC) + (=> + (GUARD + (CASTTIME 500)) + (EFFECT + (SCRIPT "{callfunc \"CheckWand\";}") + (IF (== + (script_int caster "@Wand") + 0) + (ABORT)) + (CALL adjust_spellpower school) + (CALL default_effect) + (CALL install_attack_spell + (+ (script_int caster "@Wand") + (/ spellpower 10)) + 1200 + 3 + (script_int caster "@WandID")) + (CALL gain_xp 1 3) + (ATTRIGGER + (CALL attack_check target) + (SCRIPT "{callfunc \"WandMana\";}") + (IF (== + (script_int caster "@WandAttack") + 0) + (ABORT)) + (SET damage + (* (script_int caster "@Wand") + (/ spellpower + 3))) + (SET damage_bonus + (* (script_int caster "@Wand") + (/ spellpower + 3))) + (CALL elt_damage target damage damage_bonus ELT_NEUTRAL ELT_NEUTRAL 5))))) diff --git a/world/map/conf/magic-level1.sex b/world/map/conf/magic-level1.sex index 671ec309..9ca79f3b 100644 --- a/world/map/conf/magic-level1.sex +++ b/world/map/conf/magic-level1.sex @@ -1,53 +1,15 @@ "--------------------------------------------------------------------------------" -"Level 0 spells" +" Level 1 spells " "--------------------------------------------------------------------------------" -(SPELL () wand "#confringo" () - (LET school MAGIC) - (=> - (GUARD - (CASTTIME 500)) - (EFFECT - (SCRIPT "{callfunc \"CheckWand\";}") - (IF (== - (script_int caster "@Wand") - 0) - (ABORT)) - (CALL adjust_spellpower school) - (CALL default_effect) - (CALL install_attack_spell - (+ (script_int caster "@Wand") - (/ spellpower 10)) - 1200 - 3 - (script_int caster "@WandID")) - (CALL gain_xp 1 3) - (ATTRIGGER - (CALL attack_check target) - (SCRIPT "{callfunc \"WandMana\";}") - (IF (== - (script_int caster "@WandAttack") - 0) - (ABORT)) - (SET damage - (* (script_int caster "@Wand") - (/ spellpower - 3))) - (SET damage_bonus - (* (script_int caster "@Wand") - (/ spellpower - 3))) - (CALL elt_damage target damage damage_bonus ELT_NEUTRAL ELT_NEUTRAL 5)) -))) - (SPELL () ask-magic-exp "#abizit" () - (LET level 0) + (LET level 1) (LET school MAGIC) (=> (GUARD (MANA 1) (CASTTIME 1000) (REQUIRE - (> + (>= (skill caster MAGIC) level))) (EFFECT @@ -119,14 +81,14 @@ (message caster "You feel completely overwhelmed by your magic.")))))))))))))))))) (SPELL () transmute-wood-to-figurine "#parum" (STRING name) - (LET level 0) + (LET level 1) (LET school TRANSMUTE) (=> (GUARD (MANA 5) (CASTTIME 4000) (REQUIRE - (> + (>= (skill caster MAGIC) level)) (COMPONENTS "RawLog")) @@ -149,14 +111,14 @@ (message caster "You have no idea what a Skrytlurk looks like.")))))) (SPELL () make-sulphur "#gole" () - (LET level 0) + (LET level 1) (LET school TRANSMUTE) (=> (GUARD (MANA 4) (CASTTIME 4000) (REQUIRE - (> + (>= (skill caster MAGIC) level)) (COMPONENTS "PileOfAsh")) @@ -177,14 +139,14 @@ (CALL gain_xp 1 1)))) (SPELL () lesser-heal "#lum" (STRING target) - (LET level 0) + (LET level 1) (LET school LIFE) (=> (GUARD (MANA 6) (CASTTIME 500) (REQUIRE - (> + (>= (skill caster MAGIC) level)) (REQUIRE @@ -244,14 +206,14 @@ (CALL gain_xp 1 2)))) (SPELL () flare-dart "#flar" () - (LET level 0) + (LET level 1) (LET school WAR) (=> (GUARD (MANA 10) (CASTTIME 500) (REQUIRE - (> + (>= (skill caster MAGIC) level)) (GUARD @@ -284,14 +246,14 @@ (CALL elt_damage target damage damage_bonus ELT_WATER ELT_FIRE 15))))) (SPELL () magic-blade "#chiza" () - (LET level 0) + (LET level 1) (LET school WAR) (=> (GUARD (MANA 9) (CASTTIME 500) (REQUIRE - (> + (>= (skill caster MAGIC) level))) (| @@ -327,14 +289,14 @@ (str caster))))))))) (SPELL () aggravate "#itenplz" () - (LET level 0) + (LET level 1) (LET school NATURE) (=> (GUARD (MANA 3) (CASTTIME 1000) (REQUIRE - (> + (>= (skill caster MAGIC) level))) (EFFECT @@ -353,14 +315,14 @@ (aggravate target 0 caster))))))) (SPELL () grow-mauve "#modrilax" () - (LET level 0) + (LET level 1) (LET school NATURE) (=> (GUARD (MANA 4) (CASTTIME 2000) (REQUIRE - (> + (>= (skill caster MAGIC) level)) (COMPONENTS "MauveHerb" "Root")) @@ -382,14 +344,14 @@ school)))) (SPELL () grow-alizarin "#modriphoo" () - (LET level 0) + (LET level 1) (LET school NATURE) (=> (GUARD (MANA 4) (CASTTIME 2000) (REQUIRE - (> + (>= (skill caster MAGIC) level)) (COMPONENTS "AlizarinHerb" "Root")) @@ -411,14 +373,14 @@ school)))) (SPELL () grow-gamboge "#modriyikam" () - (LET level 0) + (LET level 1) (LET school NATURE) (=> (GUARD (MANA 4) (CASTTIME 2000) (REQUIRE - (> + (>= (skill caster MAGIC) level)) (COMPONENTS "GambogeHerb" "Root")) @@ -440,14 +402,14 @@ school)))) (SPELL () grow-cobalt "#modrisump" () - (LET level 0) + (LET level 1) (LET school NATURE) (=> (GUARD (MANA 4) (CASTTIME 2000) (REQUIRE - (> + (>= (skill caster MAGIC) level)) (COMPONENTS "CobaltHerb" "Root")) @@ -469,14 +431,14 @@ school)))) (SPELL (LOCAL) summon-maggots "#kalmurk" () - (LET level 0) + (LET level 1) (LET school ASTRAL) (=> (GUARD (MANA 21) (CASTTIME 20000) (REQUIRE - (> + (>= (skill caster MAGIC) level)) (COMPONENTS "MaggotSlime" "Root")) @@ -498,14 +460,14 @@ school)))) (SPELL () detect-magic "#miteyo" () - (LET level 0) + (LET level 1) (LET school MAGIC) (=> (GUARD (MANA 3) (CASTTIME 6000) (REQUIRE - (> + (>= (skill caster MAGIC) level))) (EFFECT diff --git a/world/map/conf/magic-level2.sex b/world/map/conf/magic-level2.sex index 993f2a89..e12a58b8 100644 --- a/world/map/conf/magic-level2.sex +++ b/world/map/conf/magic-level2.sex @@ -1,19 +1,19 @@ "--------------------------------------------------------------------------------" -"Level 1 spells" +" Level 2 spells " "--------------------------------------------------------------------------------" (SPELL () make-arrows "#kularzufrill" () - (LET level 1) + (LET level 2) (LET school TRANSMUTE) (=> (GUARD (MANA 8) (CASTTIME 5000) (REQUIRE - (> + (>= (skill caster MAGIC) level)) (REQUIRE - (> + (>= (skill caster school) level)) (COMPONENTS "RawLog")) @@ -34,18 +34,18 @@ (CALL gain_xp 1 11)))) (SPELL () make-shirt "#patmuploo" () - (LET level 1) + (LET level 2) (LET school TRANSMUTE) (=> (GUARD (MANA 25) (CASTTIME 5000) (REQUIRE - (> + (>= (skill caster MAGIC) level)) (REQUIRE - (> + (>= (skill caster school) level)) (COMPONENTS @@ -57,18 +57,18 @@ (CALL gain_xp 2 12)))) (SPELL () make-tanktop "#patloree" () - (LET level 1) + (LET level 2) (LET school TRANSMUTE) (=> (GUARD (MANA 25) (CASTTIME 5000) (REQUIRE - (> + (>= (skill caster MAGIC) level)) (REQUIRE - (> + (>= (skill caster school) level)) (COMPONENTS @@ -80,18 +80,18 @@ (CALL gain_xp 2 13)))) (SPELL () make-short-tanktop "#patviloree" () - (LET level 1) + (LET level 2) (LET school TRANSMUTE) (=> (GUARD (MANA 25) (CASTTIME 5000) (REQUIRE - (> + (>= (skill caster MAGIC) level)) (REQUIRE - (> + (>= (skill caster school) level)) (COMPONENTS @@ -103,18 +103,18 @@ (CALL gain_xp 2 14)))) (SPELL () make-iron-powder "#zukminbirf" () - (LET level 1) + (LET level 2) (LET school TRANSMUTE) (=> (GUARD (MANA 8) (CASTTIME 5000) (REQUIRE - (> + (>= (skill caster MAGIC) level)) (REQUIRE - (> + (>= (skill caster school) level)) (COMPONENTS "IronOre")) @@ -135,18 +135,18 @@ (CALL gain_xp 3 15)))) (SPELL () make-concentration-potion "#loshira" () - (LET level 1) + (LET level 2) (LET school TRANSMUTE) (=> (GUARD (MANA 8) (CASTTIME 5000) (REQUIRE - (> + (>= (skill caster MAGIC) level)) (REQUIRE - (> + (>= (skill caster school) level)) (COMPONENTS "BottleOfWater" @@ -174,18 +174,18 @@ (CALL gain_xp 4 16)))) (SPELL () merge-concentration-potions "#skrimp" () - (LET level 1) + (LET level 2) (LET school TRANSMUTE) (=> (GUARD (MANA 8) (CASTTIME 5000) (REQUIRE - (> + (>= (skill caster MAGIC) level)) (REQUIRE - (> + (>= (skill caster school) level)) (COMPONENTS "DarkConcentrationPotion" "DilutedConcentrationPot")) @@ -200,7 +200,7 @@ (CALL gain_xp 4 17)))) (SPELL () lay-on-hands "#inma" (STRING target) - (LET level 1) + (LET level 2) (LET school LIFE) (=> (GUARD @@ -213,11 +213,11 @@ (max_hp caster) 20))) (REQUIRE - (> + (>= (skill caster MAGIC) level)) (REQUIRE - (> + (>= (skill caster school) level)) (REQUIRE @@ -317,11 +317,11 @@ (max_hp caster) 20) -1)) - (IF (> + (IF (>= (skill caster school) level) (itemheal caster h 0)) - (IF (> + (IF (>= (skill caster school) level) (SET t 10000)) @@ -332,26 +332,26 @@ 18)))) (SPELL () lightning-strike "#ingrav" () - (LET level 1) + (LET level 2) (LET school WAR) (=> (GUARD (MANA 20) (CASTTIME 1000) (REQUIRE - (> + (>= (skill caster MAGIC) level)) (REQUIRE - (> + (>= (skill caster school) level)) (GUARD (OR (REQUIRE - (> - (skill caster school) - 3)) + (>= + (skill caster school) "The spell is free at magic lv 4" + 4)) (COMPONENTS "IronPowder")))) (EFFECT (CALL adjust_spellpower school) @@ -433,18 +433,18 @@ (random 3)))))))) (SPELL (LOCAL) arrow-hail "#frillyar" () - (LET level 1) + (LET level 2) (LET school WAR) (=> (GUARD (MANA 25) (CASTTIME 5000) (REQUIRE - (> + (>= (skill caster MAGIC) level)) (REQUIRE - (> + (>= (skill caster school) level)) (REQUIRE @@ -534,18 +534,18 @@ (random 50)))))))) (SPELL () magic-knuckles "#upmarmu" () - (LET level 1) + (LET level 2) (LET school WAR) (=> (GUARD (MANA 20) (CASTTIME 500) (REQUIRE - (> + (>= (skill caster MAGIC) level)) (REQUIRE - (> + (>= (skill caster school) level)) (GUARD @@ -570,18 +570,18 @@ (* str 2))))))) (SPELL (LOCAL) summon-snakes "#halhiss" () - (LET level 1) + (LET level 2) (LET school DARK) (=> (GUARD (MANA 40) (CASTTIME 15000) (REQUIRE - (> + (>= (skill caster MAGIC) level)) (REQUIRE - (> + (>= (skill caster school) level)) (REQUIRE @@ -603,7 +603,7 @@ school)))) (SPELL () toxic-dart "#phlex" () - (LET level 1) + (LET level 2) (LET school DARK) (=> (GUARD @@ -614,15 +614,15 @@ (script_int caster "OrumQuest") 37)) (REQUIRE - (> + (>= (skill caster MAGIC) level)) (GUARD (OR (REQUIRE - (> + (>= (skill caster school) - 2)) + 3)) (COMPONENTS (2 "Root"))))) (EFFECT @@ -660,14 +660,14 @@ (* spellpower 1200)))))))) (SPELL (LOCAL) summon-wickedmushroom "#helorp" () - (LET level 1) + (LET level 2) (LET school DARK) (=> (GUARD (MANA 35) (CASTTIME 15000) (REQUIRE - (> + (>= (skill caster MAGIC) level)) (REQUIRE @@ -675,7 +675,7 @@ (script_int caster "OrumQuest") 36)) (REQUIRE - (> + (>= (skill caster school) level)) (COMPONENTS "SmallMushroom" "DarkCrystal")) @@ -693,18 +693,18 @@ school)))) (SPELL () flying-backpack "#plugh" (PC target) - (LET level 1) + (LET level 2) (LET school NATURE) (=> (GUARD (MANA 12) (CASTTIME 1000) (REQUIRE - (> + (>= (skill caster MAGIC) level)) (REQUIRE - (> + (>= (skill caster school) level)) (GUARD @@ -736,18 +736,18 @@ (sfx target 2 0))))) (SPELL () protect "#betsanc" (PC target) - (LET level 1) + (LET level 2) (LET school NATURE) (=> (GUARD (MANA 14) (CASTTIME 1500) (REQUIRE - (> + (>= (skill caster MAGIC) level)) (REQUIRE - (> + (>= (skill caster school) level)) (REQUIRE @@ -758,9 +758,9 @@ (GUARD (OR (REQUIRE - (> + (>= (skill caster school) - 3)) + 4)) (COMPONENTS "HardSpike"))) (REQUIRE (< @@ -790,18 +790,18 @@ (sfx target 111 0))))) (SPELL () happy-curse "#joyplim" (PC target) - (LET level 1) + (LET level 2) (LET school NATURE) (=> (GUARD (MANA 13) (CASTTIME 1000) (REQUIRE - (> + (>= (skill caster MAGIC) level)) (REQUIRE - (> + (>= (skill caster school) level)) (GUARD @@ -837,18 +837,18 @@ (CALL gain_xp 1 23)))) (SPELL (LOCAL) rain "#kaflosh" () - (LET level 1) + (LET level 2) (LET school NATURE) (=> (GUARD (MANA 17) (CASTTIME 3000) (REQUIRE - (> + (>= (skill caster MAGIC) level)) (REQUIRE - (> + (>= (skill caster school) level)) (REQUIRE @@ -857,9 +857,9 @@ (GUARD (OR (REQUIRE - (> + (>= (skill caster school) - 3)) + 4)) (COMPONENTS "BottleOfWater")))) (EFFECT (CALL adjust_spellpower school) @@ -968,18 +968,18 @@ (+ prob3 prob)))))) (SPELL () shear "#chipchip" () - (LET level 1) + (LET level 2) (LET school NATURE) (=> (GUARD (MANA 23) (CASTTIME 1000) (REQUIRE - (> + (>= (skill caster MAGIC) level)) (REQUIRE - (> + (>= (skill caster school) level))) (EFFECT @@ -1027,18 +1027,18 @@ }")))))))) (SPELL () barrier "#asorm" (PC target) - (LET level 1) + (LET level 2) (LET school ASTRAL) (=> (GUARD (MANA 16) (CASTTIME 1000) (REQUIRE - (> + (>= (skill caster MAGIC) level)) (REQUIRE - (> + (>= (skill caster school) level)) (REQUIRE @@ -1081,18 +1081,18 @@ (sfx target SFX_UNBARRIER 0))))) (SPELL (LOCAL) summon-spiky-mushrooms "#kalrenk" () - (LET level 1) + (LET level 2) (LET school ASTRAL) (=> (GUARD (MANA 33) (CASTTIME 20000) (REQUIRE - (> + (>= (skill caster MAGIC) level)) (REQUIRE - (> + (>= (skill caster school) level)) (COMPONENTS "HardSpike" "Root")) @@ -1110,18 +1110,18 @@ school)))) (SPELL (LOCAL) summon-fluffies "#kalakarenk" () - (LET level 1) + (LET level 2) (LET school ASTRAL) (=> (GUARD (MANA 39) (CASTTIME 20000) (REQUIRE - (> + (>= (skill caster MAGIC) level)) (REQUIRE - (> + (>= (skill caster school) level)) (COMPONENTS "WhiteFur" "Root")) @@ -1141,18 +1141,18 @@ school)))) (SPELL (LOCAL) summon-mouboo "#kalboo" () - (LET level 1) + (LET level 2) (LET school ASTRAL) (=> (GUARD (MANA 35) (CASTTIME 20000) (REQUIRE - (> + (>= (skill caster MAGIC) level)) (REQUIRE - (> + (>= (skill caster school) level)) (COMPONENTS "MoubooFigurine" "Root")) @@ -1170,18 +1170,18 @@ school)))) (SPELL (LOCAL) summon-pinkie "#kalgina" () - (LET level 1) + (LET level 2) (LET school ASTRAL) (=> (GUARD (MANA 35) (CASTTIME 20000) (REQUIRE - (> + (>= (skill caster MAGIC) level)) (REQUIRE - (> + (>= (skill caster school) level)) (COMPONENTS "PinkAntenna" "Root")) @@ -1199,18 +1199,18 @@ school)))) (SPELL () detect-players "#inwilt" () - (LET level 1) + (LET level 2) (LET school MAGIC) (=> (GUARD (MANA 7) (CASTTIME 300) (REQUIRE - (> + (>= (skill caster MAGIC) level)) (REQUIRE - (> + (>= (skill caster school) level))) (EFFECT @@ -1250,18 +1250,18 @@ (+ "You sense the following: " message)))))) (SPELL () enchant-lifestone "#manpahil" () - (LET level 1) + (LET level 2) (LET school MAGIC) (=> (GUARD (MANA 15) (CASTTIME 4000) (REQUIRE - (> + (>= (skill caster MAGIC) level)) (REQUIRE - (> + (>= (skill caster school) level)) (GUARD @@ -1277,18 +1277,18 @@ (CALL gain_xp 1 28)))) (SPELL () sense-spouse "#inzuwilt" () - (LET level 1) + (LET level 2) (LET school MAGIC) (=> (GUARD (MANA 7) (CASTTIME 400) (REQUIRE - (> + (>= (skill caster MAGIC) level)) (REQUIRE - (> + (>= (skill caster school) level)) (REQUIRE @@ -1409,18 +1409,18 @@ ".")))))))))) (SPELL () hide "#anwiltyp" (PC target) - (LET level 1) + (LET level 2) (LET school ASTRAL) (=> (GUARD (MANA 11) (CASTTIME 1000) (REQUIRE - (> + (>= (skill caster MAGIC) level)) (REQUIRE - (> + (>= (skill caster school) level)) (GUARD diff --git a/world/map/conf/magic-level3.sex b/world/map/conf/magic-level3.sex index 2550da3e..5d4d7374 100644 --- a/world/map/conf/magic-level3.sex +++ b/world/map/conf/magic-level3.sex @@ -1,176 +1,179 @@ "--------------------------------------------------------------------------------" -"Level 2 spells" +" Level 3 spells " "--------------------------------------------------------------------------------" -(SPELL () cure-poison "#anju" (PC target) - (LET level 2) - (LET school LIFE) - (=> - (GUARD - (MANA 15) - (CASTTIME 1000) - (REQUIRE - (> - (skill caster MAGIC) - level)) - (REQUIRE - (> - (skill caster school) - level)) - (REQUIRE - (< - (rdistance - (location caster) - (location - (pc target))) - (+ 1 - (/ spellpower 60)))) - (COMPONENTS "GambogeHerb")) - (EFFECT - (CALL adjust_spellpower school) - (CALL default_effect) - (IF (running_status_update target SC_POISON) - (BLOCK - (CALL gain_heal_xp 40 1 2 2) - (stop_status_change target SC_POISON) - (CALL gain_xp 2 30) - (IF (!= caster target) - (sfx target SFX_HEAL 0))))))) +(DISABLED + (SPELL () cure-poison "#anju" (PC target) + (LET level 3) + (LET school LIFE) + (=> + (GUARD + (MANA 15) + (CASTTIME 1000) + (REQUIRE + (>= + (skill caster MAGIC) + level)) + (REQUIRE + (>= + (skill caster school) + level)) + (REQUIRE + (< + (rdistance + (location caster) + (location + (pc target))) + (+ 1 + (/ spellpower 60)))) + (COMPONENTS "GambogeHerb")) + (EFFECT + (CALL adjust_spellpower school) + (CALL default_effect) + (IF (running_status_update target SC_POISON) + (BLOCK + (CALL gain_heal_xp 40 1 2 2) + (stop_status_change target SC_POISON) + (CALL gain_xp 2 30) + (IF (!= caster target) + (sfx target SFX_HEAL 0)))))))) -(SPELL () fire-ball "#flarfol" () - (LET level 2) - (LET school WAR) - (=> - (GUARD - (MANA 30) - (CASTTIME 1000) - (REQUIRE - (> - (skill caster MAGIC) - level)) - (REQUIRE - (> - (skill caster school) - level)) - (COMPONENTS "PileOfAsh")) - (EFFECT - (CALL adjust_spellpower school) - (SET damage - (min - (+ 50 - (* - (skill caster school) - 40)) - (+ 30 - (/ - (* spellpower 3) - 2)))) - (SET damage_bonus - (+ - (level caster) - (* spellpower 2))) - (SET radius - (+ 2 - (/ spellpower 50))) - (CALL install_attack_spell - (+ 1 - (/ spellpower 60)) - 5000 - 10 - 31) - (ATTRIGGER - (CALL attack_check target) - (SET loc - (location target)) - (DISABLED (WAIT 500)) - (sfx loc 16 0) - (FOREACH TARGET target - (rbox loc radius) - (IF (line_of_sight loc - (location target)) - (BLOCK - (SET divisor - (+ 3 - (rdistance loc - (location target)))) - (CALL elt_damage target - (/ - (* damage 3) - divisor) - (/ - (* damage_bonus 3) - divisor) - ELT_WATER - ELT_FIRE - 15)))))))) +(DISABLED + (SPELL () fire-ball "#flarfol" () + (LET level 3) + (LET school WAR) + (=> + (GUARD + (MANA 30) + (CASTTIME 1000) + (REQUIRE + (>= + (skill caster MAGIC) + level)) + (REQUIRE + (>= + (skill caster school) + level)) + (COMPONENTS "PileOfAsh")) + (EFFECT + (CALL adjust_spellpower school) + (SET damage + (min + (+ 50 + (* + (skill caster school) + 40)) + (+ 30 + (/ + (* spellpower 3) + 2)))) + (SET damage_bonus + (+ + (level caster) + (* spellpower 2))) + (SET radius + (+ 2 + (/ spellpower 50))) + (CALL install_attack_spell + (+ 1 + (/ spellpower 60)) + 5000 + 10 + 31) + (ATTRIGGER + (CALL attack_check target) + (SET loc + (location target)) + (DISABLED (WAIT 500)) + (sfx loc 16 0) + (FOREACH TARGET target + (rbox loc radius) + (IF (line_of_sight loc + (location target)) + (BLOCK + (SET divisor + (+ 3 + (rdistance loc + (location target)))) + (CALL elt_damage target + (/ + (* damage 3) + divisor) + (/ + (* damage_bonus 3) + divisor) + ELT_WATER + ELT_FIRE + 15))))))))) -(SPELL () summon-partner "#kalzumin" () - (LET level 2) - (LET school ASTRAL) - (=> - (GUARD - (MANA 30) - (CASTTIME 2000) - (REQUIRE - (> - (skill caster MAGIC) - level)) - (REQUIRE - (> - (skill caster school) - level)) - (REQUIRE - (is_married caster)) - (REQUIRE - (is_equipped caster "WeddingRing"))) - (EFFECT - (CALL adjust_spellpower school) - (CALL default_effect) - (IF (failed - (partner caster)) - (message caster "You call out for your partner, but there is no response.") - (BLOCK - (message caster - (+ - (+ "You call out for " - (name_of - (partner caster))) - ".")) - (message - (partner caster) - (+ - (name_of caster) - " is calling for your aid!")) - (sfx - (partner caster) - 2 - 0) - (WAIT - (max 5000 - (- 30000 - (* spellpower 60)))) - (IF (failed - (partner caster)) - (message caster "Your partner has abandoned you.") - (IF (is_dead +(DISABLED + (SPELL () summon-partner "#kalzumin" () + (LET level 3) + (LET school ASTRAL) + (=> + (GUARD + (MANA 30) + (CASTTIME 2000) + (REQUIRE + (>= + (skill caster MAGIC) + level)) + (REQUIRE + (>= + (skill caster school) + level)) + (REQUIRE + (is_married caster)) + (REQUIRE + (is_equipped caster "WeddingRing"))) + (EFFECT + (CALL adjust_spellpower school) + (CALL default_effect) + (IF (failed + (partner caster)) + (message caster "You call out for your partner, but there is no response.") + (BLOCK + (message caster + (+ + (+ "You call out for " + (name_of + (partner caster))) + ".")) + (message + (partner caster) + (+ + (name_of caster) + " is calling for your aid!")) + (sfx + (partner caster) + 2 + 0) + (WAIT + (max 5000 + (- 30000 + (* spellpower 60)))) + (IF (failed (partner caster)) - (message caster - (+ - (+ "Something seems to have happened to " - (name_of - (partner caster))) - ".")) - (BLOCK - (sfx - (location - (partner caster)) - SFX_TELEPORT - 0) - (SET dest - (awayfrom - (location caster) - (random_dir 1) - 1)) - (warp - (partner caster) - dest) - (sfx dest SFX_TELEPORT 0))))))))) + (message caster "Your partner has abandoned you.") + (IF (is_dead + (partner caster)) + (message caster + (+ + (+ "Something seems to have happened to " + (name_of + (partner caster))) + ".")) + (BLOCK + (sfx + (location + (partner caster)) + SFX_TELEPORT + 0) + (SET dest + (awayfrom + (location caster) + (random_dir 1) + 1)) + (warp + (partner caster) + dest) + (sfx dest SFX_TELEPORT 0)))))))))) diff --git a/world/map/conf/magic-level4.sex b/world/map/conf/magic-level4.sex index f46e7454..f04092f4 100644 --- a/world/map/conf/magic-level4.sex +++ b/world/map/conf/magic-level4.sex @@ -1,3 +1,3 @@ "--------------------------------------------------------------------------------" -"Level 3 spells" +" Level 4 spells " "--------------------------------------------------------------------------------" diff --git a/world/map/conf/magic-level5.sex b/world/map/conf/magic-level5.sex index 6a7093e5..056c9e50 100644 --- a/world/map/conf/magic-level5.sex +++ b/world/map/conf/magic-level5.sex @@ -1,53 +1,55 @@ "--------------------------------------------------------------------------------" -"Level 4 spells" +" Level 5 spells " "--------------------------------------------------------------------------------" -(SPELL () shroud "#anwilvimar" () - (LET level 4) - (LET school NATURE) - (=> - (GUARD - (MANA 40) - (CASTTIME 400) - (REQUIRE - (> - (skill caster MAGIC) - level)) - (REQUIRE - (> - (skill caster school) - level))) - (EFFECT - (CALL default_effect) - (shroud caster 0x04)))) +(DISABLED + (SPELL () shroud "#anwilvimar" () + (LET level 5) + (LET school NATURE) + (=> + (GUARD + (MANA 40) + (CASTTIME 400) + (REQUIRE + (>= + (skill caster MAGIC) + level)) + (REQUIRE + (>= + (skill caster school) + level))) + (EFFECT + (CALL default_effect) + (shroud caster 0x04))))) -(SPELL () teleport "#vorp" (STRING destination) - (LET level 4) - (LET school ASTRAL) - (=> - (GUARD - (MANA 80) - (CASTTIME 400) - (DISABLED (COMPONENT "EtherEssence")) - (DISABLED (CATALYST "TeleportCrystal")) - (REQUIRE - (> - (skill caster MAGIC) - level)) - (REQUIRE - (> - (skill caster school) - level))) - (EFFECT - (CALL default_effect) - (WAIT - (+ 1000 - (/ 200000 - (+ spellpower 10)))) - (sfx - (location caster) - SFX_TELEPORT - 200) - (warp caster - (random_location - (anchor destination))) - (sfx caster SFX_TELEPORT 200)))) +(DISABLED + (SPELL () teleport "#vorp" (STRING destination) + (LET level 5) + (LET school ASTRAL) + (=> + (GUARD + (MANA 80) + (CASTTIME 400) + (COMPONENT "EtherEssence") + (CATALYSTS "TeleportCrystal") + (REQUIRE + (>= + (skill caster MAGIC) + level)) + (REQUIRE + (>= + (skill caster school) + level))) + (EFFECT + (CALL default_effect) + (WAIT + (+ 1000 + (/ 200000 + (+ spellpower 10)))) + (sfx + (location caster) + SFX_TELEPORT + 200) + (warp caster + (random_location + (anchor destination))) + (sfx caster SFX_TELEPORT 200))))) diff --git a/world/map/conf/magic-misc.sex b/world/map/conf/magic-misc.sex index 2e4942b7..15672f4c 100644 --- a/world/map/conf/magic-misc.sex +++ b/world/map/conf/magic-misc.sex @@ -1,5 +1,5 @@ "--------------------------------------------------------------------------------" -"Special-purpose quasispells" +" Special-purpose quasispells " "--------------------------------------------------------------------------------" (SPELL (NONMAGIC) dueloff "#dueloff" () (=> @@ -166,48 +166,47 @@ (name_of target) " turned down your marriage offer.")))))) -(SPELL (LOCAL) mouboo-groan "#g" () - (=> - (GUARD - (MANA 1) - (REQUIRE - (== - (name_of caster) - "MOUBOOTAUR"))) - (EFFECT - (FOREACH PC p - (rbox - (location caster) - 200) - (SET distance - (rdistance +(DISABLED + (SPELL (LOCAL) mouboo-groan "#g" () + (=> + (GUARD + (MANA 1) + (REQUIRE + (== + (name_of caster) + "MOUBOOTAUR"))) + (EFFECT + (FOREACH PC p + (rbox (location caster) - (location p)))) - (IF (< distance 15) - (message p "The moubootaur's groaning rings in your ears!") - (IF (< distance 70) - (message p "You hear a loud groaning noise, not far away...") - (message p "You hear an odd groaning noise in the distance...")))))) + 200) + (SET distance + (rdistance + (location caster) + (location p)))) + (IF (< distance 15) + (message p "The moubootaur's groaning rings in your ears!") + (IF (< distance 70) + (message p "You hear a loud groaning noise, not far away...") + (message p "You hear an odd groaning noise in the distance..."))))))) -(SPELL (LOCAL) mouboo-smell "#s" () - (=> - (GUARD - (MANA 1) - (REQUIRE - (== - (name_of caster) - "MOUBOOTAUR"))) - (EFFECT - (WAIT 30000) - (FOREACH PC p - (rbox - (location caster) - 30) - (message p "You notice a strange smell all around you."))))) +(DISABLED + (SPELL (LOCAL) mouboo-smell "#s" () + (=> + (GUARD + (MANA 1) + (REQUIRE + (== + (name_of caster) + "MOUBOOTAUR"))) + (EFFECT + (WAIT 30000) + (FOREACH PC p + (rbox + (location caster) + 30) + (message p "You notice a strange smell all around you.")))))) -"--------------------------------------------------------------------------------" -"Kill the GM event spell" -"--------------------------------------------------------------------------------" (SPELL (NONMAGIC) killgm0 "#pullrabbit" () (=> (REQUIRE diff --git a/world/map/conf/magic-quickdebug.sex b/world/map/conf/magic-quickdebug.sex index 63ff5ada..c1d4ff72 100644 --- a/world/map/conf/magic-quickdebug.sex +++ b/world/map/conf/magic-quickdebug.sex @@ -3,4 +3,4 @@ "--------------------------------------------------------------------------------" (SPELL (NONMAGIC SILENT) debug0 "#debug" () (EFFECT - (SCRIPT "{if(!debug)end;callfunc \"Debug\";}"))) + (SCRIPT "{if(!debug&&(getgmlevel()<99))end;callfunc \"Debug\";}"))) diff --git a/world/map/conf/tmwa-map.conf b/world/map/conf/tmwa-map.conf index 10dd615e..230d4638 100644 --- a/world/map/conf/tmwa-map.conf +++ b/world/map/conf/tmwa-map.conf @@ -35,12 +35,12 @@ skill_db: db/skill_db.txt magic_conf: conf/magic-config.sex magic_conf: conf/magic-procedures.sex +magic_conf: conf/magic-level0.sex magic_conf: conf/magic-level1.sex magic_conf: conf/magic-level2.sex magic_conf: conf/magic-level3.sex magic_conf: conf/magic-level4.sex magic_conf: conf/magic-level5.sex -magic_conf: conf/magic-debug.sex magic_conf: conf/magic-misc.sex magic_conf: conf/magic-quests.sex magic_conf: conf/magic-anchors.sex -- cgit v1.2.3-60-g2f50