summaryrefslogtreecommitdiff
path: root/world/map/npc/013-1/sagatha.txt
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2013-07-05 12:25:49 -0700
committerBen Longbons <b.r.longbons@gmail.com>2013-07-05 12:30:10 -0700
commit89e2ac5687d698f0843ac46612ee33b6692bbc93 (patch)
tree8ea32e1691381e9d4db72b54c4ebed0ce809c3d2 /world/map/npc/013-1/sagatha.txt
parent27ad0933834fb488c6deac76d660cda338bb5da8 (diff)
downloadserverdata-89e2ac5687d698f0843ac46612ee33b6692bbc93.tar.gz
serverdata-89e2ac5687d698f0843ac46612ee33b6692bbc93.tar.bz2
serverdata-89e2ac5687d698f0843ac46612ee33b6692bbc93.tar.xz
serverdata-89e2ac5687d698f0843ac46612ee33b6692bbc93.zip
Move starting brace to new line
Diffstat (limited to 'world/map/npc/013-1/sagatha.txt')
-rw-r--r--world/map/npc/013-1/sagatha.txt12
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..e7d6a1a0 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;