diff options
| author | Jessica Tölke <jtoelke@mail.upb.de> | 2013-07-07 12:51:32 +0200 |
|---|---|---|
| committer | Jessica Tölke <jtoelke@mail.upb.de> | 2013-07-07 12:51:32 +0200 |
| commit | 0dd134db3f6f67bb5e4401f1ba7bf3e97f201505 (patch) | |
| tree | 4a200c1eeb684039390959107a6f413e065384fd /world/map/npc/013-1/sagatha.txt | |
| parent | a89882b69d9f12499404ca9d471d5a735bc63988 (diff) | |
| parent | 135f0fe12564decad0d3e2ff8af8f798b0a7f4cf (diff) | |
| download | serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.gz serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.bz2 serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.tar.xz serverdata-0dd134db3f6f67bb5e4401f1ba7bf3e97f201505.zip | |
Merge remote-tracking branch 'origin/master' into waric
Conflicts:
world/map/db/mob_db.txt
Diffstat (limited to 'world/map/npc/013-1/sagatha.txt')
| -rw-r--r-- | world/map/npc/013-1/sagatha.txt | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/world/map/npc/013-1/sagatha.txt b/world/map/npc/013-1/sagatha.txt index e157139d..a25db145 100644 --- a/world/map/npc/013-1/sagatha.txt +++ b/world/map/npc/013-1/sagatha.txt @@ -1,7 +1,8 @@ // Sagatha the witch, expert for nature and astral magic //---------------------------------------- -function|script|QuestSagathaHappy|{ +function|script|QuestSagathaHappy|, +{ set @unhappiness, (QUEST_MAGIC & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT; if (@unhappiness < @value) goto L_zero; @@ -18,7 +19,8 @@ L_write: } //---------------------------------------- -function|script|QuestSagathaAnnoy|{ +function|script|QuestSagathaAnnoy|, +{ set @unhappiness, (QUEST_MAGIC & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT; if ((@unhappiness + @value) > 15) goto L_max; @@ -35,7 +37,8 @@ L_write: } //---------------------------------------- -function|script|SagathaStatus|{ +function|script|SagathaStatus|, +{ if (getequipid(equip_head) != 1216 && getequipid(equip_head) != 752) goto L_next; set @value, 15; @@ -66,7 +69,8 @@ L_next: } //---------------------------------------- -013-1.gat,131,24,0|script|Sagatha#_M|167,{ +013-1.gat,131,24,0|script|Sagatha#_M|167, +{ callfunc "SagathaStatus"; set @Q_MASK, NIBBLE_4_MASK | NIBBLE_5_MASK; |