diff options
28 files changed, 567 insertions, 976 deletions
diff --git a/login/conf/login_local.conf.example b/login/conf/login_local.conf.example index f0ab0bc4..635f22ee 100644 --- a/login/conf/login_local.conf.example +++ b/login/conf/login_local.conf.example @@ -22,16 +22,6 @@ admin_pass: admin //ladminallowip: clear ladminallowip: 127.0.0.1 -// Gamemaster password, used with the @gm command to obtain GM commands -// NOTICE: You should also change this one. -gm_pass: gm - -// GM level granted to people using @gm (with the correct password). -// Builtin default is 60; setting it to 0 will disable the command. -// To work, @gm also needs to be level 0 in atcommand_local.conf, -// and atcommand_gm_only needs to be off in battle_local.conf -level_new_gm: 0 - // Update host // If not empty, send address for client to download data. // This must contain news.txt and resources.xml diff --git a/world/map/conf/atcommand_athena.conf b/world/map/conf/atcommand_athena.conf index fc6b71fe..343d7472 100644 --- a/world/map/conf/atcommand_athena.conf +++ b/world/map/conf/atcommand_athena.conf @@ -46,6 +46,7 @@ summon: 50 charpvp: 60 charstatsall: 60 pvpoff: 60 +exprate: 60 pvpon: 60 speed: 60 killmonster: 60 diff --git a/world/map/conf/atcommand_local.conf.example b/world/map/conf/atcommand_local.conf.example index 3935db1b..916a092c 100644 --- a/world/map/conf/atcommand_local.conf.example +++ b/world/map/conf/atcommand_local.conf.example @@ -1,8 +1 @@ // Athena atcommand Local Configuration file. - -// Command to become a GM. Only players who are not a GM can use this. -// In addition to changing this to 0, you must also: -// - set level_new_gm in login_athena.conf to something other than 0 -// - set atcommand_gm_only to false in battle_athena.conf -// - give the correct password (gm_pass in login_athena.conf) -gm: 100 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 diff --git a/world/map/npc/001-1/constable.txt b/world/map/npc/001-1/constable.txt index 73a74a2f..ecc8a0d4 100644 --- a/world/map/npc/001-1/constable.txt +++ b/world/map/npc/001-1/constable.txt @@ -3,7 +3,7 @@ 001-1,50,74,0|script|Constable Perry Graf|150 { mes "[Constable Perry Graf]"; - mes "\"Hello, make sure the rules are followed.\""; + mes "\"Hello. Make sure to follow the rules!\""; callfunc "GameRules"; close; } diff --git a/world/map/npc/001-1/eomie.txt b/world/map/npc/001-1/eomie.txt index 6528ddbe..99085bcf 100644 --- a/world/map/npc/001-1/eomie.txt +++ b/world/map/npc/001-1/eomie.txt @@ -33,20 +33,20 @@ if (@state == 8) goto L_GetStuff; mes "[Eomie]"; - mes "\"I maintain this little spot of grass in the desert.\""; + mes "\"I maintain this little oasis in the desert.\""; if (@state != 7) goto L_Close; menu - "I have this magic fertilizer from Tinris and need a spell cast on it.",L_Next; + "I need to learn a spell to use Tinris' magic fertilizer. Can you help me out?",L_Next; L_Next: mes "[Eomie]"; - mes "\"Oh? I see, that's a difficult task."; - mes "I'd be glad to help you, but unfortunately I can't interrupt the magic I use to keep this spot of grass alive.\""; + mes "\"Oh? Well, that's a rather difficult task."; + mes "I'd be glad to help you, but unfortunately, I can't. If I were to interrupt the magic I use to keep this alive, it would die.\""; next; - mes "\"It's unusually hot at the moment, even for this desert area. It might have something to do with the aftereffects of the earthquake.\""; + mes "\"It's unusually hot at the moment – even for this desert area – so it's really out of the question.\""; menu - "Isn't there any possibility?",L_Continue; + "Is there any chance you could help me?",L_Continue; L_Continue: mes "She hesitates."; @@ -57,13 +57,13 @@ L_Continue: L_GetStuff: // @state == 8 mes "[Eomie]"; - mes "\"I could try to interrupt my spells to be able to cast the spell on the fertilizer, but then I need to prepare the grass for this."; - mes "Bring me " + @grass_amount + " Grass Seeds, " + @water_amount + " Bottles of Water and " + @ice_amount + " Ice Cubes.\""; + mes "\"I could try to briefly interrupt my magic and then cast the spell on the fertilizer, but I would need to prepare the grass beforehand."; + mes "Bring me " + @grass_amount + " " + getitemlink("GrassSeed") + ", " + @water_amount + " " + getitemlink("BottleOfWater") + ", and " + @ice_amount + " " + getitemlink("IceCube") + ".\""; menu - "I have it.",L_More, + "I've got everything.",L_More, "Where can I get Grass Seeds?",L_Hurnscald, - "How can I get Ice Cubes? We're in the desert!",L_Mine, - "Ok, I'll go and get it.",L_Close; + "How can I get Ice Cubes? We're in the middle of the desert!",L_Mine, + "Ok. I'll go and get them.",L_Close; L_More: if ((countitem("GrassSeed") < @grass_amount) || (countitem("BottleOfWater") < @water_amount) || (countitem("IceCube") < @ice_amount)) goto L_NoItem; @@ -74,38 +74,37 @@ L_More: set @state, 9; callsub S_Update_Mask; mes "[Eomie]"; - mes "\"Very good.\""; - mes "She takes the things you brought her and uses them to create a bubble of coolness around the spot of grass."; + mes "\"Very good!\""; + mes "She takes the ingredients you brought her and uses them to cast a cool mist into the air."; misceffect sfx_magic_nature; next; mes "[Eomie]"; - mes "\"This should last long enough to keep the spot of grass alive until I cast the spell on the fertilizer. And if some of it shrivels I still have the seeds you brought me which I can use to recover it.\""; + mes "\"That should last long enough to keep the plants alive while I cast the spell on the fertilizer. Besides, I can replant anything that dies with the seeds you brought me.\""; next; - mes "She takes the fertilizer and casts some invocations. After a while she's done and gives it back to you with a smile."; - misceffect sfx_magic_nature; + mes "She takes the fertilizer and casts some invocations. After a minute, she hands the now-glowing substance back to you."; mes "[Eomie]"; - mes "\"This should help you. I'm glad you're taking care of the plants. Not enough people do that nowadays.\""; + mes "\"That should work now. I'm glad you're taking care of the plants! Not enough people do that nowadays.\" %%1"; goto L_Close; L_Hurnscald: // player asked how to get Grass Seeds mes "[Eomie]"; - mes "\"Squirrels tend to pick up Grass Seeds as they gather food. You can find them around Hurnscald. To get there you will have to take the ferry in the harbor district.\""; + mes "\"Squirrels tend to pick up " + getitemlink("GrassSeed") + " as they gather food. You can find them around Hurnscald if you ride the ferry over.\""; goto L_Close; L_Mine: // player asked how to get Ice Cubes mes "[Eomie]"; - mes "\"Hm, that's a difficult task, indeed. Naturally you will find them on the continent of Kaizei, which is high up in the north and covered with snow most time of the year. But it might be difficult to get there.\""; + mes "\"Quite the quandary – isn't it? Naturally, you can easily find them on the continent of Kaizei, which is far up north and covered with snow most time of the year. But it might be a bit difficult to get there.\""; next; - mes "\"I heard that Ice Goblins were seen in the caves that are around Nivalis. Maybe you can find Ice Cubes in there.\""; + mes "\"I heard that Ice Goblins were seen in the caves surrounding Nivalis. Maybe you can find " + getitemlink("IceCube") + " there.\""; goto L_Close; L_CastedSpell: // @state >= 9 but below 14 mes "[Eomie]"; - mes "\"The grass wasn't damaged due to the interruption. I hope the magic fertilizer is useful for Anwar.\""; + mes "\"Thankfully, the grass wasn't damaged. I hope Anwar finds the magic fertilizer to be useful.\""; if (@state != 13) goto L_Close; menu - "It was and he created this Silk Headband as a present for you.",L_Present, + "It was. He even created this Silk Headband as a present for you!",L_Present, "(Mumble something and leave)",L_Close; L_Present: @@ -116,18 +115,18 @@ L_Present: set @state, 14; callsub S_Update_Mask; mes "[Eomie]"; - mes "\"Oh, this is very friendly! Please tell him I'm very happy about it.\""; + mes "\"Oh, that's so nice of him! Please tell him that I really like it!\""; mes "She smiles."; goto L_Close; L_Done: // @state >= 14 mes "[Eomie]"; - mes "\"Hello. I'm happy to see someone like you being dedicated to the needs of plants and people.\""; + mes "\"Hello! I'm happy to see someone like you so dedicated to the environment.\" %%8"; goto L_Close; L_NoItem: mes "[Eomie]"; - mes "\"Where is it?\""; + mes "\"Where is it?\" %%3"; goto L_Close; L_Close: diff --git a/world/map/npc/001-1/ferry_master.txt b/world/map/npc/001-1/ferry_master.txt index 9cfb1e74..c1e6cbb6 100644 --- a/world/map/npc/001-1/ferry_master.txt +++ b/world/map/npc/001-1/ferry_master.txt @@ -9,7 +9,7 @@ L_Main: menu "How do I use the ferry?", L_Explain, - "Nothing I guess", L_Close; + "Nothing, I guess.", L_Close; L_Explain: mes "[Ferry Master]"; diff --git a/world/map/npc/001-1/gossip.txt b/world/map/npc/001-1/gossip.txt index 283de9d7..a2266498 100644 --- a/world/map/npc/001-1/gossip.txt +++ b/world/map/npc/001-1/gossip.txt @@ -2,53 +2,56 @@ 001-1,66,104,0|script|Gladys|154 { - mes "[Gladys, Town Gossip]"; - mes "\"Hello deary! I hear some of the most fascinating rumors and bits of news. I just heard a bit more today!\""; + mes "[Gladys]"; + mes "\"Hello deary! I hear some of the most fascinating rumors!\""; + next; mes "\"Would you like me to let you in on the good stuff?\""; menu - "Lt. Dausen", L_Intro, - "Fieri", L_Cook, - "Sarah", L_Sarah, - "Sandra", L_Sandra, - "Desert Mine", L_Desert, - "Ferry", L_Ferry, + "Tell me about Lt. Dausen.", L_Intro, + "Tell me about Fieri.", L_Cook, + "Tell me about Sarah.", L_Sarah, + "Tell me about Sandra.", L_Sandra, + "Tell me about the Desert Mine.", L_Desert, + "Tell me about the Ferry.", L_Ferry, "No thanks.", L_No; L_No: - mes "[Gladys, Town Gossip]"; - mes "\"Very well. Come back whenever you like. I am always getting juicy bits of news!\""; + mes "[Gladys]"; + mes "\"Very well. Come back later if you want to hear some juicy news!\""; goto L_Close; L_Intro: - mes "[Gladys, Town Gossip]"; - mes "\"Have you met our lovely guard captain yet? He usually keeps a post just outside the gates where he can keep an eye on things. He likes to talk to new adventurers too.\""; + mes "[Gladys]"; + mes "\"Have you met our lovely guard captain yet? He usually keeps post just outside the gates to keep an eye on things. He likes to talk to new adventurers too.\""; goto L_Close; L_Cook: - mes "[Gladys, Town Gossip]"; - mes "\"I hear the kitchen at the Magic Insitute of Tulimshar needs help.\""; + mes "[Gladys]"; + mes "\"I hear the kitchen at the Magic Institute of Tulimshar is in need of some help.\""; next; - mes "\"The only thing bigger then a wizard's ego is their waistline. Hehe.\""; + mes "\"The only thing bigger then a wizard's ego is their waistline. Hehe.\" %%8"; goto L_Close; L_Sarah: - mes "[Gladys, Town Gossip]"; - mes "\"Do you believe what parents will let their kids do these days?! I heard about this girl in the south east side of town who does nothing but eat sweets all day! Honestly, what is the world coming to?\""; + mes "[Gladys]"; + mes "\"Do you believe what parents will let their kids do these days?! I heard about this girl in the southeast side of town who does nothing but eat sweets all day! Honestly, what is this world coming to?\""; goto L_Close; L_Sandra: - mes "[Gladys, Town Gossip]"; - mes "\"The students and wizards at the Magic Institute of Tulimshar are always looking for people to gather reagents for spells as they are far too busy studing.\""; + mes "[Gladys]"; + mes "\"The students and wizards at the Magic Institute of Tulimshar are always looking for people to gather the reagents they need for spells as they are far too busy studying to gather the materials themselves.\""; goto L_Close; L_Desert: - mes "[Gladys, Town Gossip]"; - mes "\"If you're still looking for adventure, I would suggest talking to some of the guards. I hear there is a monster threat outside the city walls!\""; + mes "[Gladys]"; + mes "\"If you're still looking for adventure, I would suggest talking to some of the guards. I hear there's a sizable monster threat outside the city walls!\""; goto L_Close; L_Ferry: - mes "[Gladys, Town Gossip]"; - mes "I heard that there is a ferry in the north of town that will take people to exotic new places!\""; + mes "[Gladys]"; + mes "\"There's a ferry in the northern part of town that takes travelers to exotic new places!\""; + next; + mes "\"I haven't been on it myself, but I hear it travels all over the world!\""; goto L_Close; L_Close: diff --git a/world/map/npc/001-1/weellos.txt b/world/map/npc/001-1/weellos.txt index ae5604f5..e49c6814 100644 --- a/world/map/npc/001-1/weellos.txt +++ b/world/map/npc/001-1/weellos.txt @@ -12,26 +12,24 @@ if (isin("001-1", 48, 20, 61, 28)) goto L_In; mes "[Weellos]"; - mes "\"This is a very historic building. One of the oldest in the area.\""; + mes "\"This is a very historic building – in fact, it's one of the oldest in the area.\""; next; - mes "\"It's the current seat of the council of wizards.\""; + mes "\"It's also the current seat of both the Council of Wizards and the Magic Institute of Tulimshar.\""; next; - mes "\"It's also holds the Magic Institute of Tulimshar.\""; - next; - mes "\"Part of It's been turned into a museum as well\""; + mes "\"Due to its historical significance, part of it has been turned into a museum.\""; goto L_BeforeClose; // If the player is inside the fence with Weellos L_In: mes "[Weellos]"; - mes "\"What did you think of the historic building?\""; + mes "\"What did you think? Isn't the building intriguing?\""; goto L_BeforeClose; L_BeforeClose: if (@kylian != 4) goto L_Close; next; - mes "You wonder if Kylian would be interested to see this building."; + mes "You wonder if Kylian would be interested in seeing this historic landmark..."; goto L_Close; L_Close: diff --git a/world/map/npc/002-2/bleacher.txt b/world/map/npc/002-2/bleacher.txt index 36c71f98..3935fe24 100644 --- a/world/map/npc/002-2/bleacher.txt +++ b/world/map/npc/002-2/bleacher.txt @@ -94,7 +94,7 @@ L_MenuItems: if (Zeny < 5000) goto L_no_money; set @m, @menu - 2; set @it$, $@DYE_colors$[@CANDIDE_color[@m]] + $@DYE_items$[@CANDIDE_items[@m]]; - if(getitemname(@it$) == "Unknown Item") mapexit; + if(getitemlink(@it$) == "Unknown Item") mapexit; delitem @it$, 1; delitem "PileOfAsh", 3; set Zeny, Zeny - 5000; diff --git a/world/map/npc/006-1/miriam.txt b/world/map/npc/006-1/miriam.txt index 6580664f..f513955b 100644 --- a/world/map/npc/006-1/miriam.txt +++ b/world/map/npc/006-1/miriam.txt @@ -162,7 +162,7 @@ L_teach: L_Prepared: set @agi, readparam(bAgi); - set @torso$, getitemname(getequipid(equip_torso)); + set @torso$, getitemlink(getequipid(equip_torso)); set @weight, MaxWeight/Weight; if (@weight < 3) goto L_heavyweight; diff --git a/world/map/npc/009-2/airlia.txt b/world/map/npc/009-2/airlia.txt index 62c76e38..6f4be2bd 100644 --- a/world/map/npc/009-2/airlia.txt +++ b/world/map/npc/009-2/airlia.txt @@ -163,7 +163,7 @@ L_Next2: L_intro_proof: mes "[Airlia]"; - mes "\"Let's say " + @FETCH_AMOUNT_INITIAL + " " + getitemname(@FETCH_LABEL_INITIAL$) + "s. You don't know how much this means to me, thank you.\""; + mes "\"Let's say " + @FETCH_AMOUNT_INITIAL + " " + getitemlink(@FETCH_LABEL_INITIAL$) + "s. You don't know how much this means to me, thank you.\""; set QUEST_Airlia, @Q_STATUS_HELP_AIRLIA; close; @@ -180,12 +180,12 @@ L_Fetch: if (QUEST_Graveyard_Caretaker < @Q_STATUS_HAS_NEW_LETTER) menu "You are welcome.", L_Close, - "I have collected the " + @FETCH_AMOUNT_INITIAL + " " + getitemname(@FETCH_LABEL_INITIAL$) + "s.", L_Fetch_initial_reward; + "I have collected the " + @FETCH_AMOUNT_INITIAL + " " + getitemlink(@FETCH_LABEL_INITIAL$) + "s.", L_Fetch_initial_reward; if (QUEST_Graveyard_Caretaker == @Q_STATUS_HAS_NEW_LETTER) menu "You are welcome.", L_Close, "I have another letter from your father.", L_later_rewards, - "I have collected the " + @FETCH_AMOUNT_INITIAL + " " + getitemname(@FETCH_LABEL_INITIAL$) + "s.", L_Fetch_initial_reward; + "I have collected the " + @FETCH_AMOUNT_INITIAL + " " + getitemlink(@FETCH_LABEL_INITIAL$) + "s.", L_Fetch_initial_reward; goto L_Close; L_Fetch_initial_reward: @@ -233,12 +233,12 @@ L_Rewarded: if (QUEST_Graveyard_Caretaker < @Q_STATUS_HAS_NEW_LETTER) menu "You are welcome.", L_Close, - "I have collected the " + @FETCH_AMOUNT + " " + getitemname(@FETCH_LABEL$) + "s.", L_Fetch_later_rewards; + "I have collected the " + @FETCH_AMOUNT + " " + getitemlink(@FETCH_LABEL$) + "s.", L_Fetch_later_rewards; if (QUEST_Graveyard_Caretaker == @Q_STATUS_HAS_NEW_LETTER) menu "You are welcome.", L_Close, "I have another letter from your father.", L_later_rewards, - "I have collected the " + @FETCH_AMOUNT + " " + getitemname(@FETCH_LABEL$) + "s.", L_Fetch_later_rewards; + "I have collected the " + @FETCH_AMOUNT + " " + getitemlink(@FETCH_LABEL$) + "s.", L_Fetch_later_rewards; goto L_Close; L_Close: diff --git a/world/map/npc/009-2/selim.txt b/world/map/npc/009-2/selim.txt index 2a558bbb..474dec3c 100644 --- a/world/map/npc/009-2/selim.txt +++ b/world/map/npc/009-2/selim.txt @@ -140,7 +140,7 @@ L_explain_dye: goto L_Close; L_finish: - if(getitemname($@DYE_colors$[@colour] + @item_del$) == "Unknown Item") mapexit; + if(getitemlink($@DYE_colors$[@colour] + @item_del$) == "Unknown Item") mapexit; if(countitem(@item_del$) < 1) goto L_havenone; delitem @item$, 1; delitem @item_del$, 1; diff --git a/world/map/npc/012-1/injured-mouboo.txt b/world/map/npc/012-1/injured-mouboo.txt index 09e27c80..63eb2996 100644 --- a/world/map/npc/012-1/injured-mouboo.txt +++ b/world/map/npc/012-1/injured-mouboo.txt @@ -113,7 +113,7 @@ L_nloop: if (countitem(@k$) == 0) goto L_nloop_skip; - set @name$, getitemname(@k$); + set @name$, getitemlink(@k$); set @menuItems$[@ct], @name$; set @menuNames$[@ct], @k$; set @choice_eat[@ct], @itemeat[@n]; @@ -156,7 +156,7 @@ L_MenuItems: L_consume: mes "[Injured Mouboo]"; - mes "The mouboo " + @verb$ + " your " + getitemname(@choice$) + "."; + mes "The mouboo " + @verb$ + " your " + getitemlink(@choice$) + "."; delitem @choice$, 1; next; if (@choice$ == "LargeHealingPotion") diff --git a/world/map/npc/029-1/rewards_master.txt b/world/map/npc/029-1/rewards_master.txt index acfafc58..1ed99ac2 100644 --- a/world/map/npc/029-1/rewards_master.txt +++ b/world/map/npc/029-1/rewards_master.txt @@ -136,7 +136,7 @@ S_give_item: getitem @item$, 1; - mes "You received one " + getitemname(@item$) + "!"; + mes "You received one " + getitemlink(@item$) + "!"; return; S_give_noinv: diff --git a/world/map/npc/annuals/halloween/trick_or_treat.txt b/world/map/npc/annuals/halloween/trick_or_treat.txt index 24a359d2..10265382 100644 --- a/world/map/npc/annuals/halloween/trick_or_treat.txt +++ b/world/map/npc/annuals/halloween/trick_or_treat.txt @@ -71,7 +71,7 @@ L_MaskMemoryCheck: L_MaskMemoryYes: // not necessarily true - mes "\"I remember you, " + getequipname(equip_head) + " person. No more treats for you!\""; + mes "\"I remember you, " + getitemlink(getequipid(equip_head)) + " person. No more treats for you!\""; goto L_Close; L_MaskMemoryNo: @@ -285,7 +285,7 @@ L_Explain: next; set @npc_check_loop, 0; goto L_NpcCheckLoop; - + L_NpcCheckLoop: mes $@halloween_npc_names$[@npc_check_loop]; next; diff --git a/world/map/npc/functions/DyeConfig.txt b/world/map/npc/functions/DyeConfig.txt index 1da1e734..0072dd26 100644 --- a/world/map/npc/functions/DyeConfig.txt +++ b/world/map/npc/functions/DyeConfig.txt @@ -23,7 +23,7 @@ OnInit: end; S_Array: - if(getitemname($@DYE_items$[$@w]) == "Unknown Item") goto L_Fail; + if(getitemlink($@DYE_items$[$@w]) == "Unknown Item") goto L_Fail; set $@c, 0; callsub S_Color; set $@w, $@w + 1; @@ -35,7 +35,7 @@ L_Fail: mapexit; S_Color: - if(getitemname($@DYE_colors$[$@c] + $@DYE_items$[$@w]) == "Unknown Item") goto L_Fail; + if(getitemlink($@DYE_colors$[$@c] + $@DYE_items$[$@w]) == "Unknown Item") goto L_Fail; set $@c, $@c + 1; if($@c < getarraysize($@DYE_colors$)) goto S_Color; return; diff --git a/world/map/npc/functions/default_npc_checks.txt b/world/map/npc/functions/default_npc_checks.txt index 446cf961..deb3ba64 100644 --- a/world/map/npc/functions/default_npc_checks.txt +++ b/world/map/npc/functions/default_npc_checks.txt @@ -109,7 +109,7 @@ L_ReturnMissing: goto L_MissingMsg; L_MissingMsg: - mes "[@@"+@delitem_ids[@msg_loop]+"|"+getitemname(@delitem_ids[@msg_loop])+"@@] "+countitem(getitemname(@delitem_ids[@msg_loop]))+"/"+@delitem_counts[@msg_loop]; + mes "[@@"+@delitem_ids[@msg_loop]+"|"+getitemlink(@delitem_ids[@msg_loop])+"@@] "+countitem(getitemlink(@delitem_ids[@msg_loop]))+"/"+@delitem_counts[@msg_loop]; goto L_NextMsgCheck; L_NextMsgCheck: |