Merge commit 'mainline/master'

6 files changed, 51 insertions, 47 deletions

diff --git a/db/item_db.txt b/db/item_db.txt
index d663b299..db890a5d 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -50,16 +50,16 @@
 548,Halberd,Halberd,4,20,10,10,100,,1,,0,2,2,1,0,0,{},{},,
 549,Axe,Axe,4,20,10,10,100,,1,,0,2,2,1,0,0,{},{},,
 550,BlacksmithsAxe,Blacksmith's Axe,4,20,10,10,100,,1,,0,2,2,1,0,0,{},{},,
-551,Hint1,Hint,3,20,0,10,,,,,,,,,,,{},{},,
-552,Hint2,Hint,3,20,0,10,,,,,,,,,,,{},{},,
-553,Hint3,Hint,3,20,0,10,,,,,,,,,,,{},{},,
-554,Hint4,Hint,3,20,0,10,,,,,,,,,,,{},{},,
-555,Hint5,Hint,3,20,0,10,,,,,,,,,,,{},{},,
-556,Hint6,Hint,3,20,0,10,,,,,,,,,,,{},{},,
-557,Hint7,Hint,3,20,0,10,,,,,,,,,,,{},{},,
-558,Hint8,Hint,3,20,0,10,,,,,,,,,,,{},{},,
-559,Hint9,Hint,3,20,0,10,,,,,,,,,,,{},{},,
-560,Hint10,Hint,3,20,0,10,,,,,,,,,,,{},{},,
+551,AquaHint,Aqua Hint,3,20,0,10,,,,,,,,,,,{},{},,
+552,MagentaHint,Magenta Hint,3,20,0,10,,,,,,,,,,,{},{},,
+553,YellowHint,Yellow Hint,3,20,0,10,,,,,,,,,,,{},{},,
+554,GreenHint,Green Hint,3,20,0,10,,,,,,,,,,,{},{},,
+555,TealHint,Teal Hint,3,20,0,10,,,,,,,,,,,{},{},,
+556,PurpleHint,Purple Hint,3,20,0,10,,,,,,,,,,,{},{},,
+557,RedHint,Red Hint,3,20,0,10,,,,,,,,,,,{},{},,
+558,BlueHint,Blue Hint,3,20,0,10,,,,,,,,,,,{},{},,
+559,OrangeHint,Orange Hint,3,20,0,10,,,,,,,,,,,{},{},,
+560,GrayHint,Gray Hint,3,20,0,10,,,,,,,,,,,{},{},,
 561,Sabre,Sabre,4,10000,5000,100,100,,1,,0,2,2,1,1,1,{},{},,
 562,ChickenLeg,Chicken Leg,0,250,125,10,,,,,,2,,,0,,{ itemheal 500,0; },{},
 563,WinterGloves,Winter Gloves,5,6000,3000,20,,3,,-15,0,2,4,,0,0,{},{},,
@@ -72,15 +72,15 @@
 570,BoneKnife,Bone Knife,4,10000,6000,120,115,,1,,0,2,2,1,1,1,{},{},,
 571,Setzer,Setzer,4,20000,8000,80,110,,1,,0,2,2,1,1,3,{},{},,
 572,Scimitar,Scimitar,4,8000,4000,100,100,,1,,0,2,2,1,1,1,{},{},,
-573,Falcion,Falcion,4,8000,4000,100,100,,1,,0,2,2,1,1,1,{},{},,
+573,Falchion,Falchion,4,8000,4000,100,100,,1,,0,2,2,1,1,1,{},{},,
 574,Scorpion,Scorpion,4,8000,4000,100,100,,1,,0,2,2,1,1,1,{},{},,
 575,DesertBow,Desert Bow,4,8000,4000,100,100,,1,,0,2,34,1,1,11,{},{},,
 576,Beheader,Beheader,4,8000,4000,100,100,,1,,0,2,2,1,1,1,{},{},,
 577,BoneDarts,Bone Darts,4,8000,4000,100,100,,1,,0,2,2,1,1,1,{},{},,
 578,SandCutter,Sand Cutter,4,8000,4000,100,100,,1,,0,2,2,1,1,1,{},{},,
-579,RocKnife,Rock Knife,4,15000,7500,100,300,,1,,0,2,34,1,1,1,{},{},,
+579,RockKnife,Rock Knife,4,15000,7500,100,300,,1,,0,2,34,1,1,1,{},{},,
 580,StaffOfLife,Staff of Life,4,8000,4000,100,100,,1,,0,2,2,1,1,1,{},{},,
-581,SrescentRod,Crescent Rod,4,8000,4000,100,100,,1,,0,2,2,1,1,1,{},{},,
+581,CrescentRod,Crescent Rod,4,8000,4000,100,100,,1,,0,2,2,1,1,1,{},{},,
 582,StaffOfFire,Staff of Fire,4,8000,4000,100,100,,1,,0,2,2,1,1,1,{},{},,
 583,StaffOfIce,Staff of Ice,4,8000,4000,100,100,,1,,0,2,2,1,1,1,{},{},,
 584,Jackal,Jackal,4,8000,4000,100,100,,1,,0,2,2,1,1,1,{},{},,
@@ -124,8 +124,8 @@
 640,IronOre,Iron Ore,3,250,100,40,,,,,,,,,,,{},{},,
 641,SnakeSkin,Snake Skin,3,250,100,20,,,,,,,,,,,{},{},,
 642,JeansChaps,Jeans Chaps,5,2000,1000,40,,6,,-12,0,2,1,,0,0,{},{},,
-643,CowboyWhite,White Cowboy Hat,5,1800,900,30,,6,,-12,0,2,256,,0,0,{},{},,
-644,CowboyBlack,Black Cowboy Hat,5,1800,900,30,,6,,-12,0,2,256,,0,0,{},{},,
+643,WhiteCowboyHat,White Cowboy Hat,5,1800,900,30,,6,,-12,0,2,256,,0,0,{},{},,
+644,BlackCowboyHat,Black Cowboy Hat,5,1800,900,30,,6,,-12,0,2,256,,0,0,{},{},,
 645,GoldenPlatemail,Golden Platemail,5,9999000,3000,240,,25,,-100,0,2,512,,0,0,{},{},,
 646,Crown,Crown,5,5000,1000,50,,4,,0,0,2,256,,0,0,{},{},,
 647,DevelopersCap,Developer's Cap,5,2000,500,10,,5,,5,0,2,256,,0,0,{},{},,
@@ -223,7 +223,7 @@
 739,AppleCake,Apple Cake,0,600,150,10,,,,,,2,,,0,,{ itemheal 12,0; },{},
 740,Root,Root,3,500,200,5,,,,,,,,,,,{},{},,
 741,CottonGloves,Cotton Gloves,5,2000,500,20,,1,,-10,0,2,4,,0,0,{},{},,
-742,FourLeafClover,Four Leaf Clover,5,10000,5000,1,,,,5,0,2,8,,0,0,{},{ bonus bLuk, 1; },
+742,FourLeafClover,Four-Leaf Clover,5,10000,5000,1,,,,5,0,2,8,,0,0,{},{ bonus bLuk, 1; },
 1198,JackOSoul,Jack O Soul,3,100000,1,1,,,,,,,,,,,{},{},,
 1199,Arrow,Arrow,10,3,1,1,25,0,0,,0,2,32768,,,,{},{},,
 1200,Bow,Bow,4,1000,500,200,20,,5,,0,2,34,1,4,11,{},{},,
@@ -264,16 +264,16 @@
 2067,OrangeVNeckSweater,Orange V-Neck Sweater,5,6000,3000,10,,8,,-16,0,2,512,,0,0,{},{},,
 2068,PurpleVNeckSweater,Purple V-Neck Sweater,5,6000,3000,10,,8,,-16,0,2,512,,0,0,{},{},,
 2069,DarkGreenVNeckSweater,Dark Green V-Neck Sweater,5,6000,3000,10,,8,,-16,0,2,512,,0,0,{},{},,
-2070,RedTNeckSweater,Red Turtleneck Sweater,5,2000,1000,10,,6,,-12,0,2,512,,0,0,{},{},,
-2071,GreenTNeckSweater,Green Turtleneck Sweater,5,2000,1000,10,,6,,-12,0,2,512,,0,0,{},{},,
-2072,DarkBlueTNeckSweater,Dark Blue Turtleneck Sweater,5,2000,1000,10,,6,,-12,0,2,512,,0,0,{},{},,
-2073,YellowTNeckSweater,Yellow Turtleneck Sweater,5,2000,1000,10,,6,,-12,0,2,512,,0,0,{},{},,
-2074,LightBlueTNeckSweater,Light Blue Turtleneck Sweater,5,2000,1000,10,,6,,-12,0,2,512,,0,0,{},{},,
-2075,PinkTNeckSweater,Pink Turtleneck Sweater,5,2000,1000,10,,6,,-12,0,2,512,,0,0,{},{},,
-2076,BlackTNeckSweater,Black Turtleneck Sweater,5,2000,1000,10,,6,,-12,0,2,512,,0,0,{},{},,
-2077,OrangeTNeckSweater,Orange Turtleneck Sweater,5,2000,1000,10,,6,,-12,0,2,512,,0,0,{},{},,
-2078,PurpleTNeckSweater,Purple Turtleneck Sweater,5,2000,1000,10,,6,,-12,0,2,512,,0,0,{},{},,
-2079,DarkGreenTNeckSweater,Dark Green Turtleneck Sweater,5,2000,1000,10,,6,,-12,0,2,512,,0,0,{},{},,
+2070,RedTurtleneckSweater,Red Turtleneck Sweater,5,2000,1000,10,,6,,-12,0,2,512,,0,0,{},{},,
+2071,GreenTurtleneckSweater,Green Turtleneck Sweater,5,2000,1000,10,,6,,-12,0,2,512,,0,0,{},{},,
+2072,DarkBlueTurtleneckSweater,Dark Blue Turtleneck Sweater,5,2000,1000,10,,6,,-12,0,2,512,,0,0,{},{},,
+2073,YellowTurtleneckSweater,Yellow Turtleneck Sweater,5,2000,1000,10,,6,,-12,0,2,512,,0,0,{},{},,
+2074,LightBlueTurtleneckSweater,Light Blue Turtleneck Sweater,5,2000,1000,10,,6,,-12,0,2,512,,0,0,{},{},,
+2075,PinkTurtleneckSweater,Pink Turtleneck Sweater,5,2000,1000,10,,6,,-12,0,2,512,,0,0,{},{},,
+2076,BlackTurtleneckSweater,Black Turtleneck Sweater,5,2000,1000,10,,6,,-12,0,2,512,,0,0,{},{},,
+2077,OrangeTurtleneckSweater,Orange Turtleneck Sweater,5,2000,1000,10,,6,,-12,0,2,512,,0,0,{},{},,
+2078,PurpleTurtleneckSweater,Purple Turtleneck Sweater,5,2000,1000,10,,6,,-12,0,2,512,,0,0,{},{},,
+2079,DarkGreenTurtleneckSweater,Dark Green Turtleneck Sweater,5,2000,1000,10,,6,,-12,0,2,512,,0,0,{},{},,
 2080,RedSilkRobe,Red Silk Robe,5,8000,4000,5,,5,,0,0,2,512,,0,0,{},{},,
 2081,GreenSilkRobe,Green Silk Robe,5,8000,4000,5,,5,,0,0,2,512,,0,0,{},{},,
 2082,DarkBlueSilkRobe,Dark Blue Silk Robe,5,8000,4000,5,,5,,0,0,2,512,,0,0,{},{},,
diff --git a/npc/021-1_Tulimshar/eurni.txt b/npc/021-1_Tulimshar/eurni.txt
index 1edfc94e..1a140e81 100644
--- a/npc/021-1_Tulimshar/eurni.txt
+++ b/npc/021-1_Tulimshar/eurni.txt
@@ -2,7 +2,7 @@
 
 021-1.gat,141,113,0	script	Eurni	136,{
 	if (BaseLevel < 10) goto L_TooYoung;
-	if (zeny < 10000) goto L_No_Money;
+	if (zeny < 10000) goto L_NoMoney;
 
 	mes "[Eurni the Surgeon]";
 	mes "\"Are you tired of being what you are?\"";
diff --git a/npc/024-2_Tulimshar_Magic_School/_import.txt b/npc/024-2_Tulimshar_Magic_School/_import.txt
index be56cb29..125b42f3 100644
--- a/npc/024-2_Tulimshar_Magic_School/_import.txt
+++ b/npc/024-2_Tulimshar_Magic_School/_import.txt
@@ -3,3 +3,4 @@ npc: npc/024-2_Tulimshar_Magic_School/_mobs.txt
 npc: npc/024-2_Tulimshar_Magic_School/_warps.txt
 npc: npc/024-2_Tulimshar_Magic_School/barrier.txt
 npc: npc/024-2_Tulimshar_Magic_School/tyer.txt
+npc: npc/024-2_Tulimshar_Magic_School/tyer_trigger.txt
diff --git a/npc/024-2_Tulimshar_Magic_School/barrier.txt b/npc/024-2_Tulimshar_Magic_School/barrier.txt
index 6450d5ad..ffe5a3f3 100644
--- a/npc/024-2_Tulimshar_Magic_School/barrier.txt
+++ b/npc/024-2_Tulimshar_Magic_School/barrier.txt
@@ -5,7 +5,6 @@
 	close;
 
 L_PushBack:
-	doevent "Tyer::OnBarrier";
 	warp "024-2.gat", 34, 24;
 	close;
 }
diff --git a/npc/024-2_Tulimshar_Magic_School/tyer.txt b/npc/024-2_Tulimshar_Magic_School/tyer.txt
index f46190f2..f6b78331 100644
--- a/npc/024-2_Tulimshar_Magic_School/tyer.txt
+++ b/npc/024-2_Tulimshar_Magic_School/tyer.txt
@@ -4,23 +4,4 @@
 	mes "[Tyer]";
 	mes "\"Hello.\"";
 	close;
-
-OnBarrier:
-	mes "[Tyer]";
-	mes "\"You're still too young to go in there.\"";
-	next;
-
-	menu
-		"What do you mean I'm too young to go in there?", L_Explain,
-		"Ah, right.", -;
-	close;
-
-L_Explain:
-	mes "[Tyer]";
-	mes "\"The canyon is a dangerous place, so only more experienced people are allowed there.\"";
-	next;
-
-	mes "[Tyer]";
-	mes "\"That barrier was made to keep those that are too young out.\"";
-	close;
 }
diff --git a/npc/024-2_Tulimshar_Magic_School/tyer_trigger.txt b/npc/024-2_Tulimshar_Magic_School/tyer_trigger.txt
new file mode 100644
index 00000000..2ae884da
--- /dev/null
+++ b/npc/024-2_Tulimshar_Magic_School/tyer_trigger.txt
@@ -0,0 +1,23 @@
+// A man in the magic school
+
+024-2.gat,33,24,0	script	#Tyer_Trigger	127,1,1,{
+	if (BaseLevel >= 40) end;
+
+	mes "[Tyer]";
+	mes "\"You're still too young to go in there.\"";
+	next;
+
+	menu
+		"What do you mean I'm too young to go in there?", L_Explain,
+		"Ah, right.", -;
+	close;
+
+L_Explain:
+	mes "[Tyer]";
+	mes "\"The canyon is a dangerous place, so only more experienced people are allowed there.\"";
+	next;
+
+	mes "[Tyer]";
+	mes "\"That barrier was made to keep those that are too young out.\"";
+	close;
+}