nivalis

5 files changed, 35 insertions, 25 deletions

diff --git a/npc/014-1_Woodland/_import.txt b/npc/014-1_Woodland/_import.txt
index 25cc56c3..3c67f38f 100644
--- a/npc/014-1_Woodland/_import.txt
+++ b/npc/014-1_Woodland/_import.txt
@@ -1,5 +1,5 @@
 map: 014-1.gat
 npc: npc/014-1_Woodland/_mobs.txt
 npc: npc/014-1_Woodland/_warps.txt
-npc: npc/014-1_Woodland/wedding-officiator.txt
 npc: npc/014-1_Woodland/taro.txt
+npc: npc/014-1_Woodland/wedding-officiator.txt
diff --git a/npc/020-1_Nivalis/KrickKrackKrock.txt b/npc/020-1_Nivalis/KrickKrackKrock.txt
index 2feb1d15..722847cd 100755
--- a/npc/020-1_Nivalis/KrickKrackKrock.txt
+++ b/npc/020-1_Nivalis/KrickKrackKrock.txt
@@ -17,7 +17,7 @@ L_Main:
 	mes @NPC_NAME$;
 	mes "\"Hello " + strcharinfo(0) + ", do you want to play Krick-Krack-Krock?\"";
 L_Menu:
-	menu	
+	menu
 		"Let's start!", L_Start,
 		"What's this?", L_info,
 		"Well, not for the moment.", -;
@@ -68,13 +68,13 @@ L_Item:
 getinventorylist;
 	if (@inventorylist_count == 100) goto L_Full_Inv;
 
-if( @BET > 50) getitem @ITEM_RAND[rand(1)], 1;
-if( @BET > 200) getitem @ITEM_RAND[1 + rand(1)], 1;
-if( @BET > 500) getitem @ITEM_RAND[2 + rand(1)], 1;
-if( @BET > 1000) getitem @ITEM_RAND[3 + rand(1)], 1;
-if( @BET > 1200) getitem @ITEM_RAND[4 + rand(1)], 1;
-if( @BET > 1500) getitem @ITEM_RAND[5 + rand(1)], 1;
-if( @BET == 2000) getitem @ITEM_RAND[6 + rand(1)], 1;
+	if( @BET > 50) getitem @ITEM_RAND[rand(1)], 1;
+	if( @BET > 200) getitem @ITEM_RAND[1 + rand(1)], 1;
+	if( @BET > 500) getitem @ITEM_RAND[2 + rand(1)], 1;
+	if( @BET > 1000) getitem @ITEM_RAND[3 + rand(1)], 1;
+	if( @BET > 1200) getitem @ITEM_RAND[4 + rand(1)], 1;
+	if( @BET > 1500) getitem @ITEM_RAND[5 + rand(1)], 1;
+	if( @BET == 2000) getitem @ITEM_RAND[6 + rand(1)], 1;
 	mes @NPC_NAME$;
 	mes "\"Here it is !\"";
 	close;
@@ -82,8 +82,8 @@ if( @BET == 2000) getitem @ITEM_RAND[6 + rand(1)], 1;
 L_Health_item:
 // health item
 getinventorylist;
-	if (@inventorylist_count == 100) goto L_Full_Inv
-	
+	if (@inventorylist_count == 100) goto L_Full_Inv;
+
 if( @BET > 50) getitem @ITEM_HEALTH[rand(1)], 1;
 if( @BET > 200) getitem @ITEM_HEALTH[ 1 +rand(1)], 1 + rand(1);
 if( @BET > 500) getitem @ITEM_HEALTH[2 + rand(1)], 1 + rand(3);
diff --git a/npc/020-2_Nivalis/baktar.txt b/npc/020-2_Nivalis/baktar.txt
index b29b4be1..f62c9bb8 100755
--- a/npc/020-2_Nivalis/baktar.txt
+++ b/npc/020-2_Nivalis/baktar.txt
@@ -6,7 +6,6 @@
 //#
 //# In the first stage you need to bring 7 different items, but only one of each kind.
 //#
-//#
 //# In the second stage he tells you what hard life he is living. He will be very aggressive telling you some stuff.
 //# He will send you to kill Scroticular. That npc will be located in the labyrinth caves.
 //# (its a mob actually, to be spawned only, if the players knows his name and his location)
@@ -48,8 +47,8 @@
         set @Q_status2_bits, ((QUEST_Nivalis_state) & @Q_MASK2_BITS) >> @Q_SHIFT2_BITS;
 
         // if all bits are set, you brought him everything! Now we continue in Phase 2 of this npc.
-        mes @Q_status;
-        if(@Q_status == @Q_MASK) goto L_2_init;
+        // this is not ready yet, so do not enable that stage
+        // if(@Q_status == @Q_MASK) goto L_2_init;
 
         set @BIT_KNOWHIM, 0;
 
diff --git a/npc/031-3/_mobs.txt b/npc/031-3/_mobs.txt
index 356b167c..a724d985 100644
--- a/npc/031-3/_mobs.txt
+++ b/npc/031-3/_mobs.txt
@@ -24,6 +24,12 @@
 031-3.gat,285,216,66,59	monster	Santa Slime	1015,5,100000,30000,Mob031-3::On1015
 031-3.gat,128,272,66,59	monster	Santa Slime	1015,5,100000,30000,Mob031-3::On1015
 031-3.gat,212,279,66,59	monster	Santa Slime	1015,5,100000,30000,Mob031-3::On1015
+031-3.gat,141,229,40,9	monster	yeti	1072,3,100000,30000,Mob031-3::On1072
+031-3.gat,34,288,10,13	monster	yeti	1072,3,100000,30000,Mob031-3::On1072
+031-3.gat,25,166,10,13	monster	yeti	1072,3,100000,30000,Mob031-3::On1072
+031-3.gat,132,160,10,13	monster	yeti	1072,3,100000,30000,Mob031-3::On1072
+031-3.gat,228,37,10,13	monster	yeti	1072,3,100000,30000,Mob031-3::On1072
+031-3.gat,44,73,33,11	monster	yeti	1072,1,100000,30000,Mob031-3::On1072
 
 
 031-3.gat,0,0,0	script	Mob031-3	-1,{
@@ -47,5 +53,10 @@ On1061:
 	callfunc "MobPoints";
 	break;
 
+On1072:
+	set @mobID, 1072;
+	callfunc "MobPoints";
+	break;
+
 	end;
 }
diff --git a/npc/031-3/labyrinth.txt b/npc/031-3/labyrinth.txt
index 9bcae434..e29cc4fb 100644
--- a/npc/031-3/labyrinth.txt
+++ b/npc/031-3/labyrinth.txt
@@ -9,7 +9,7 @@
 //#    This is a labyrinth, having lots of warps in there.
 //#    These warps are activated on different days.
 //#    For each way there are 2 warps: one way and its way back.
-//#    
+//#
 //#################################################################################
 
 
@@ -89,13 +89,13 @@ L_Clean:
 // First Warp
 031-3.gat,142,301,0	script	#ChristmasBarrier	127,1,1,{
     if ($Golbenez_Santa_Free < 18 ) end;
-    warp "031-3.gat", 97, 299;
+    warp "031-3.gat", 97, 298;
     end;
 }
 
 031-3.gat,97,301,0	script	#ChristmasBarrier	127,1,1,{
     if ($Golbenez_Santa_Free < 18 ) end;
-    warp "031-3.gat", 142, 299;
+    warp "031-3.gat", 142, 298;
     end;
 }
 
@@ -144,13 +144,13 @@ L_Clean:
 // First Warp
 031-3.gat,94,254,0	script	#ChristmasBarrier	127,1,1,{
     if ($Golbenez_Santa_Free < 19 ) end;
-    warp "031-3.gat", 54, 252;
+    warp "031-3.gat", 54, 253;
     end;
 }
 
 031-3.gat,54,250,0	script	#ChristmasBarrier	127,1,1,{
     if ($Golbenez_Santa_Free < 19 ) end;
-    warp "031-3.gat", 94, 256;
+    warp "031-3.gat", 94, 257;
     end;
 }
 
@@ -247,12 +247,12 @@ L_Clean:
 # // first warp
 031-3.gat,34,25,0	script	#ChristmasBarrier	127,1,1,{
     if ($Golbenez_Santa_Free < 21 ) end;
-    warp "031-3.gat", 281, 24;
+    warp "031-3.gat", 281, 25;
     end;
 }
 031-3.gat,281,22,0	script	#ChristmasBarrier	127,1,1,{
     if ($Golbenez_Santa_Free < 21 ) end;
-    warp "031-3.gat", 34, 27;
+    warp "031-3.gat", 34, 28;
     end;
 }
 // # second warp
@@ -319,12 +319,12 @@ L_Clean:
 // # second warp
 031-3.gat,232,93,0	script	#ChristmasBarrier	127,1,1,{
     if ($Golbenez_Santa_Free < 23 ) end;
-    warp "031-3.gat", 200, 48;
+    warp "031-3.gat", 200, 47;
     end;
 }
 031-3.gat,200,50,0	script	#ChristmasBarrier	127,1,1,{
     if ($Golbenez_Santa_Free < 23 ) end;
-    warp "031-3.gat", 232, 95;
+    warp "031-3.gat", 232, 90;
     end;
 }
 
@@ -332,11 +332,11 @@ L_Clean:
 # // 1 warp on dec 24
 031-3.gat,120,81,0	script	#ChristmasBarrier	127,1,1,{
     if ($Golbenez_Santa_Free < 24 ) end;
-    warp "031-3.gat", 46, 22;
+    warp "031-3.gat", 46, 27;
     end;
 }
 031-3.gat,46,24,0	script	#ChristmasBarrier	127,1,1,{
     if ($Golbenez_Santa_Free < 24 ) end;
-    warp "031-3.gat", 120, 80;
+    warp "031-3.gat", 120, 79;
     end;
 }