Merge git://gitorious.org/~wombat/tmw-eathena-data/cache-serverdata

5 files changed, 17 insertions, 14 deletions

diff --git a/npc/005-1_Snake_desert/npcs.txt b/npc/005-1_Snake_desert/npcs.txt
index 1a9a8853..12f37ca1 100644
--- a/npc/005-1_Snake_desert/npcs.txt
+++ b/npc/005-1_Snake_desert/npcs.txt
@@ -1,6 +1,6 @@
 //
 
-005-1.gat,69,76,0	shop	George	115,530:3000,1199:3,529:5,539:175,562:500
+005-1.gat,69,76,0	shop	George	115,530:3000,1199:1,529:-1,539:175,562:500
 
 005-1.gat,66,75,0	script	Kieron	132,{
     mes "[Kieron]";
diff --git a/npc/009-2_Hurnscald/shops.txt b/npc/009-2_Hurnscald/shops.txt
index 9c85c845..df100d36 100644
--- a/npc/009-2_Hurnscald/shops.txt
+++ b/npc/009-2_Hurnscald/shops.txt
@@ -18,7 +18,7 @@
 
 // Archer Shop
 // sells bow, short bow, arrows and iron arrows
-009-2.gat,97,24,0	shop	Apprentice	120,1199:3,529:5,1200:1000,530:3000
+009-2.gat,97,24,0	shop	Apprentice	120,1199:-1,529:-1,1200:1000,530:3000
 
 // Potion Shop
 // sells cactus drink, cactus potion, iron potion, concentration potion, and slow poison potion
diff --git a/npc/009-4/torches.txt b/npc/009-4/torches.txt
index 1b17dac6..bff94f0d 100644
--- a/npc/009-4/torches.txt
+++ b/npc/009-4/torches.txt
@@ -219,6 +219,7 @@ L_Use_Red:
 	if (@TorchColor > 6 && @TorchColor < 12) set @Color, @TorchColor + 1;

 	if (@TorchColor < 6 && @TorchColor > 1) set @Color, @TorchColor - 1;

 	if (@TorchColor == 12) set @Color, 1;

+       if (@TorchColor == 0) set @Color, 1;
 	callfunc("SetTorchColor");

 	delitem "RedPowder", 1;

 	goto L_Show_Color;

@@ -227,6 +228,7 @@ L_Use_Yellow:
 	if (countitem("YellowPowder") < 1) goto L_No_Powder;

 	if (@TorchColor < 10 && @TorchColor > 5) set @Color, @TorchColor - 1;

 	if (@TorchColor >= 1 && @TorchColor < 5) set @Color, @TorchColor + 1;

+       if (@TorchColor == 0) set @Color, 5;
 	callfunc("SetTorchColor");

 	delitem "YellowPowder", 1;

 	goto L_Show_Color;

@@ -236,6 +238,7 @@ L_Use_Blue:
 	if (@TorchColor > 4 && @TorchColor < 9) set @Color, @TorchColor + 1;

 	if (@TorchColor <= 12 && @TorchColor > 9) set @Color, @TorchColor - 1;

 	if (@TorchColor == 1) set @Color, 12;

+       if (@TorchColor == 0) set @Color, 9;
 	callfunc("SetTorchColor");

 	delitem "BluePowder", 1;

 	goto L_Show_Color;

diff --git a/npc/010-2_Dimonds_Cove/dimonds.txt b/npc/010-2_Dimonds_Cove/dimonds.txt
index 123e6faf..e1096ded 100644
--- a/npc/010-2_Dimonds_Cove/dimonds.txt
+++ b/npc/010-2_Dimonds_Cove/dimonds.txt
@@ -42,15 +42,15 @@
 	set @month, 1;
 	set @start_day, 24;
 	set @end_day, 26;
-	if (gettime(6) != @month) goto no_event; 
-	if (gettime(5) < @start_day) goto no_event; 
-	if (gettime(5) > @end_day) goto no_event; 
+	if (gettime(6) != @month) goto no_event;
+	if (gettime(5) < @start_day) goto no_event;
+	if (gettime(5) > @end_day) goto no_event;
 	if (gettimetick(2)-TUT_var < 2*7*86400 ) //player must be created at least 2 weeks ago
 		goto no_event;
 	if (FLAGS & FLAG_HAS_BOWLER_BURNSDAY ) goto event_done;
 	getinventorylist;
 	if (@inventorylist_count == 100) goto L_Full_Inv;
-	
+
 	mes "[Shanon]";
 	mes "\"Welcome to Dimond's Cove.  We are celebrating Robert Burns with supper and poems.  You provide the supper and I'll provide a poem by Robert Burns.  He was otherwise known as 'The Bard' and wrote many poems.  The music of language is what I love most.  The language of poetry.  While his accent is thick, his poems tell stories that stir the soul.  I'll read a poem by him and you can tell me what you think.\"";
 	next;
@@ -206,7 +206,7 @@
 	mes "\"Well, that was the poem.  What do you think of it?\"";
 	menu
 		"It was a bit long and kind of hard to understand, but thanks for reading.", -;
-	
+
 	mes "[Shanon]";
 	mes "\"Well, thanks for coming to the supper.  Also, thanks for helping me make it through the poem.  Here, take this hat.  When you wear it, wear it with the class you showed me today.  Happy Burns' Supper!\"";
 	getinventorylist;
@@ -214,12 +214,12 @@
 	getitem "bowlerhat", 1;
 	set FLAGS, FLAGS | FLAG_HAS_BOWLER_BURNSDAY;
 	close;
-	
+
 no_event:
 	mes "[Shanon]";
 	mes "\"I'm a traveling poet and admirer of Robert Burns.\"";
 	close;
-	
+
 event_done:
 	mes "[Shanon]";
 	mes "\"Ah, my dear friend. Good to see you again in this remarkable time of the year.\"";
@@ -384,7 +384,7 @@ L_Full_Inv:
 	next;
 	mes "\"Maybe you should turn away from the mundane world and get rid of this burden to change your view to the beauty of poetry.\"";
 	close;
-	
+
 food_menu:
 	setarray @choice_idx, 0,0,0,0,0,0;
         setarray @choice$, "","","","","","";
@@ -438,7 +438,7 @@ L_nobeer:
             @choice$[8],-,
             @choice$[9],-,
             @choice$[10],-;
-            
+
 	set @choose, @menu - 1;
         if (@choice_idx[@choose] == 0)
             goto leave;
@@ -449,7 +449,7 @@ L_nobeer:
 	if ((countitem("Beer") != 0) && (@choice_idx[@choose] == @C_beer)) goto rem_item;
 
         // fallthrough only when player remove the items while in menu, trying to cheat
-        // the quest will need to be started again 
+        // the quest will need to be started again
         mes "\"What you are offering, you do not have.  Do not try to betray me. Come back when you have better morals.\"";
         close;
 
@@ -536,7 +536,7 @@ leave:
 
 010-2.gat,32,34,0	shop	Waitress	139,519:100,533:150,534:90,562:500,676:200
 
-010-2.gat,85,41,0	shop	Blacksmith	146,545:20000,529:5,603:-1
+010-2.gat,85,41,0	shop	Blacksmith	146,545:20000,529:-1,603:-1
 
 010-2.gat,65,41,0	shop	General Store	137,586:1000,524:1600,544:10000,632:10000,528:1000,735:-1
 
diff --git a/npc/020-2_Nivalis/shops.txt b/npc/020-2_Nivalis/shops.txt
index 1d863a00..7132870c 100644
--- a/npc/020-2_Nivalis/shops.txt
+++ b/npc/020-2_Nivalis/shops.txt
@@ -3,7 +3,7 @@
 // Clothes shop
 020-2.gat,27,26,0	shop	Taylor	137,523:2000,524:1600,543:800,544:5000,546:10000,586:1000,741:-1
 // Weapons shop
-020-2.gat,25,65,0	shop	Bracco	135,1201:50,521:1000,522:100,529:5,530:-1
+020-2.gat,25,65,0	shop	Bracco	135,1201:50,521:1000,522:100,529:3,530:-1
 // Potions shop
 020-2.gat,75,26,0	shop	Mede	103,501:50,502:70,567:500,568:500