summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWushin <pasekei@gmail.com>2014-10-06 19:25:54 -0500
committerWushin <pasekei@gmail.com>2014-10-06 19:25:54 -0500
commit3f2414ab7eaa8edf2960e330a9318e69f116173b (patch)
treeca6a1caf91cb5523c704c1ffd27f911c4d6211dc
parent97982f8210a36a92f82fc30dbcb0b19d789446b1 (diff)
parent0b204ef03504772735d2de83e7fdea2c20e6be4a (diff)
downloadserverdata-3f2414ab7eaa8edf2960e330a9318e69f116173b.tar.gz
serverdata-3f2414ab7eaa8edf2960e330a9318e69f116173b.tar.bz2
serverdata-3f2414ab7eaa8edf2960e330a9318e69f116173b.tar.xz
serverdata-3f2414ab7eaa8edf2960e330a9318e69f116173b.zip
Merge pull request #160 from mekolat/tiny-staff
make the staff use its own sprite with confringo
-rw-r--r--world/map/conf/magic-level1.sex2
-rw-r--r--world/map/npc/items/check_wand.txt2
2 files changed, 3 insertions, 1 deletions
diff --git a/world/map/conf/magic-level1.sex b/world/map/conf/magic-level1.sex
index 88478c82..3e673170 100644
--- a/world/map/conf/magic-level1.sex
+++ b/world/map/conf/magic-level1.sex
@@ -19,7 +19,7 @@
(/ spellpower 10))
1200
3
- 33)
+ (script_int caster "@WandID"))
(CALL gain_xp 1 3)
(ATTRIGGER
(CALL attack_check target)
diff --git a/world/map/npc/items/check_wand.txt b/world/map/npc/items/check_wand.txt
index 1b11dfc2..4d8016bb 100644
--- a/world/map/npc/items/check_wand.txt
+++ b/world/map/npc/items/check_wand.txt
@@ -33,6 +33,7 @@ function|script|CheckWand|,
{
setarray $@Wands, 758, 1171;
setarray $@WandsPwr, 2, 1;
+ setarray $@WandsAnim, 35, 33;
set @Wand, 0;
set @wand_loop, 0;
goto L_Loop;
@@ -44,6 +45,7 @@ L_Loop:
L_SetWand:
set @Wand, $@WandsPwr[@wand_loop];
+ set @WandID, $@WandsAnim[@wand_loop];
callfunc "MorganState";
if (@morgan == 2)
goto L_SetCastOnce;