summaryrefslogtreecommitdiff
path: root/world/map/npc/013-1
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc/013-1')
-rw-r--r--world/map/npc/013-1/_mobs.txt3
-rw-r--r--world/map/npc/013-1/sagatha.txt12
2 files changed, 10 insertions, 5 deletions
diff --git a/world/map/npc/013-1/_mobs.txt b/world/map/npc/013-1/_mobs.txt
index 07a4df90..c1d0453f 100644
--- a/world/map/npc/013-1/_mobs.txt
+++ b/world/map/npc/013-1/_mobs.txt
@@ -18,7 +18,8 @@
013-1.gat,0,0,0,0|monster|Butterfly|1055,10,30,20,Mob013-1::On1055
-013-1.gat,0,0,0|script|Mob013-1|-1,{
+013-1.gat,0,0,0|script|Mob013-1|-1,
+{
On1014:
set @mobID, 1014;
callfunc "MobPoints";
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;