diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2008-11-12 09:07:20 +0000 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2008-11-12 09:07:20 +0000 |
| commit | 57e98ad83c240ad585aeaa47f05c9ca9dfcb9e26 (patch) | |
| tree | c70c6a801b4b47cac7c7ccb2150f20ea81ced13e /conf | |
| parent | fa302a780f1873bcab253bf469b8be23fe4a43e0 (diff) | |
| parent | 92edc7656445e89c7ce1d229970f03ff55708e5b (diff) | |
| download | serverdata-57e98ad83c240ad585aeaa47f05c9ca9dfcb9e26.tar.gz serverdata-57e98ad83c240ad585aeaa47f05c9ca9dfcb9e26.tar.bz2 serverdata-57e98ad83c240ad585aeaa47f05c9ca9dfcb9e26.tar.xz serverdata-57e98ad83c240ad585aeaa47f05c9ca9dfcb9e26.zip | |
Merge branch 'master' of git@gitorious.org:tmw-eathena-data/mainline
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/magic.conf | 84 |
1 files changed, 43 insertions, 41 deletions
diff --git a/conf/magic.conf b/conf/magic.conf index 220c8566..7d3918b5 100644 --- a/conf/magic.conf +++ b/conf/magic.conf @@ -536,30 +536,49 @@ SILENT SPELL marriage (target : PC) : "marry" = IF not (is_married(caster)) THEN message(caster, name_of(target) + " turned down your marriage offer."); -SPELL change-hair-colour (colour : STRING) : "trapa" = - (MANA 20) => EFFECT IF colour = "nworbl" - THEN x = 0; # light brown - ELSE IF colour = "der" - THEN x = 1; # red - ELSE IF colour = "neerg" - THEN x = 2; # green - ELSE IF colour = "elprup" - THEN x = 3; # purple - ELSE IF colour = "yerg" - THEN x = 4; # grey - ELSE IF colour = "wolley" - THEN x = 5; # yellow - ELSE IF colour = "eulb" - THEN x = 6; # blue - ELSE IF colour = "nwrob" - THEN x = 7; # brown - ELSE IF colour = "elpropl" - THEN x = 8; # light purple - ELSE IF colour = "elpropd" - THEN x = 9; # dark purple - ELSE x = random(10); - sfx(caster, 2, 0); - set_hair_colour(caster, x); +# SPELL change-hair-colour (colour : STRING) : "trapa" = +# (MANA 20) => EFFECT IF colour = "nworbl" +# THEN x = 0; # light brown +# ELSE IF colour = "der" +# THEN x = 1; # red +# ELSE IF colour = "neerg" +# THEN x = 2; # green +# ELSE IF colour = "elprup" +# THEN x = 3; # purple +# ELSE IF colour = "yerg" +# THEN x = 4; # grey +# ELSE IF colour = "wolley" +# THEN x = 5; # yellow +# ELSE IF colour = "eulb" +# THEN x = 6; # blue +# ELSE IF colour = "nwrob" +# THEN x = 7; # brown +# ELSE IF colour = "elpropl" +# THEN x = 8; # light purple +# ELSE IF colour = "elpropd" +# THEN x = 9; # dark purple +# ELSE x = random(10); +# sfx(caster, 2, 0); +# set_hair_colour(caster, x); + + +# SPELL trick-or-treat : "trick-or-treat" = +# (CASTTIME 30000, MANA 20, +# COMPONENTS [ "BugLeg" ]) => EFFECT IF (random(2)) +# THEN (sfx(caster, 2, 0); +# FOR i = 0 TO random(10) DO +# drop_item_for (random_location(rbox(location(caster), 5)), +# "Candy", 1, 10000 + random(10000), caster, 3000); +# FOR i = 0 TO random(10) DO +# drop_item_for (random_location(rbox(location(caster), 5)), +# "ChocolateBar", 1, 10000 + random(10000), caster, 3000); +# ) +# ELSE (sfx(caster, 5, 0); +# message(caster, "No treat for you!"); +# spawn(rbox(location(caster), 3), caster, 1010, 0, 1 + random(3), 10000 + random(20000)); +# FOREACH MOB target IN rbox(location(caster), 5) DO +# (sfx(target, 5, 0); +# aggravate(target, 0, caster);)) LOCAL SPELL mouboo-groan : "#g" = @@ -582,20 +601,3 @@ LOCAL SPELL mouboo-smell : "#s" = message(p, "You notice a strange smell all around you."); -SPELL trick-or-treat : "trick-or-treat" = - (CASTTIME 30000, MANA 20, - COMPONENTS [ "BugLeg" ]) => EFFECT IF (random(2)) - THEN (sfx(caster, 2, 0); - FOR i = 0 TO random(10) DO - drop_item_for (random_location(rbox(location(caster), 5)), - "Candy", 1, 10000 + random(10000), caster, 3000); - FOR i = 0 TO random(10) DO - drop_item_for (random_location(rbox(location(caster), 5)), - "ChocolateBar", 1, 10000 + random(10000), caster, 3000); - ) - ELSE (sfx(caster, 5, 0); - message(caster, "No treat for you!"); - spawn(rbox(location(caster), 3), caster, 1010, 0, 1 + random(3), 10000 + random(20000)); - FOREACH MOB target IN rbox(location(caster), 5) DO - (sfx(target, 5, 0); - aggravate(target, 0, caster);)) |