Fixed bugreport:1337, bugreport:1355, bugreport:1361, and bugreport:1362.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12594 54d463be-8e91-2dee-dedb-b68131a5f0ec

5 files changed, 30 insertions, 26 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index c82962751..5f05954cb 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,7 @@
 Date		Added
 ======
 2008/04/14
+	* Rev. 12594 Fixed bugreport:1337, bugreport:1355, bugreport:1361, and bugreport:1362.  [L0ne_W0lf]
 	* Rev. 12588 Fixed minor dialogue bug at archer.txt [Lupus]
 	* Rev. 12587 Fixed design flaw in card remover script. [L0ne_W0lf]
 2008/04/10
diff --git a/npc/cities/hugel.txt b/npc/cities/hugel.txt
index f87ce02cf..1bcae5f7e 100644
--- a/npc/cities/hugel.txt
+++ b/npc/cities/hugel.txt
@@ -4,7 +4,7 @@
 //= vicious_pucca, Poki#3, erKURITA, Munin, and everybody in the
 //= comments
 //===== Current Version: =====================================
-//= 1.4
+//= 1.5
 //===== Compatible With: =====================================
 //= eAthena 1.0
 //===== Description: =========================================
@@ -24,6 +24,7 @@
 //= 1.2 Added a few NPCs scripted by Munin and fixed up format a little [Playtester]
 //= 1.3 Moved some quests-related NPCs to proper file. [SinSloth]
 //= 1.4 Optimized the Party Supplies Shop [DZeroX]
+//= 1.5 Fixed Party Supplies Shop. [L0ne_W0lf]
 //============================================================
 
 //---------------------------------------------------------------------------
@@ -248,7 +249,6 @@ hu_in01,23,311,4	script	Party Supplies Shop	898,{
 	mes "We can provide you with 5 of them";
 	mes "at 500 zeny.";
 	next;
-	menu "Buy",L_Buy,"Cancel",L_Cancel;
 	switch (select("Buy:Cancel")) {
 		case 1:
 			if (Zeny < 500) { 
diff --git a/npc/guild2/schg_cas02.txt b/npc/guild2/schg_cas02.txt
index d0ce2dcbf..d61d1626b 100644
--- a/npc/guild2/schg_cas02.txt
+++ b/npc/guild2/schg_cas02.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -11,6 +11,7 @@
 //===== Additional Comments: =================================
 //= 1.0 First Version [L0ne_W0lf]
 //= 1.1 Fixed setcell range of first barricade. [L0ne_W0lf]
+//= 1.2 Fixed first Barricade being desotryable. [L0ne_W0lf]
 //============================================================
 
 schg_cas02,1,1,0	script	Manager#sch02_02	111,{
@@ -1162,10 +1163,10 @@ schg_cas02,2,1,0	script	#sch02_RL00	-1,{
 OnEnable:
 	setcell "schg_cas02",290,98,290,105,cell_walkable,0;
 	setcell "schg_cas02",290,98,290,105,cell_shootable,0;
-	guardian "schg_cas02",290,98," ",1905,"#sch02_RL00::OnBarrierDestroyed"; //24;
-	guardian "schg_cas02",290,100," ",1905,"#sch02_RL00::OnBarrierDestroyed"; //25;
-	guardian "schg_cas02",290,102," ",1905,"#sch02_RL00::OnBarrierDestroyed"; //26;
-	guardian "schg_cas02",290,104," ",1905,"#sch02_RL00::OnBarrierDestroyed"; //27;
+	guardian "schg_cas02",289,98," ",1905,"#sch02_RL00::OnBarrierDestroyed"; //24;
+	guardian "schg_cas02",289,100," ",1905,"#sch02_RL00::OnBarrierDestroyed"; //25;
+	guardian "schg_cas02",289,102," ",1905,"#sch02_RL00::OnBarrierDestroyed"; //26;
+	guardian "schg_cas02",289,104," ",1905,"#sch02_RL00::OnBarrierDestroyed"; //27;
 	end;
 
 OnDisable:
diff --git a/npc/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt
index 42f90f480..5ad0066c8 100644
--- a/npc/jobs/2-2/rogue.txt
+++ b/npc/jobs/2-2/rogue.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= kobra_k88
 //===== Current Version: ===================================== 
-//= 2.5
+//= 2.6
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -17,6 +17,7 @@
 //=	impossible get a Gladius [3]. (bugreport:481) [Samuray22]
 //= 2.4c Corrected a Typo error ";;" and a typo error with "rouge". (bugreport:909) [Samuray22]
 //= 2.5 Added dummy "OnMyMobDead" labels. (bugreport:1100) [L0ne_W0lf]
+//= 2.6 Fixed a few bugs in the Rogue Guildsman. [L0ne_W0lf]
 //============================================================ 
 
 morocc,100,104,1	script	Thug#rg	118,{
@@ -644,7 +645,7 @@ in_rogue,376,23,1	script	Mr. Smith#rg	57,{
 		close;
 	}
 	else if (ROGUE_Q > 2) {
-		if (ROGUE_Q == 3) callsub S_CheckItems,510,10,932,10,957,10,958,10;
+		if (ROGUE_Q == 3) callsub S_CheckItems,510,6,932,10,957,10,958,10;
 		else if (ROGUE_Q == 4) callsub S_CheckItems,511,10,910,10,926,10,964,10;
 		else if (ROGUE_Q == 5) callsub S_CheckItems,508,10,948,10,935,10,940,10;
 		else if (ROGUE_Q == 6) {
@@ -928,7 +929,7 @@ S_Req:
 
 
 S_CheckItems:
-	if (Zeny > 99999 && countitem(getarg(0)) >= getarg(1) && countitem(getarg(2)) >= getarg(3) && countitem(getarg(4)) >= getarg(5) && countitem(getarg(6)) >= getarg(7)) {
+	if (Zeny > 9999 && countitem(getarg(0)) >= getarg(1) && countitem(getarg(2)) >= getarg(3) && countitem(getarg(4)) >= getarg(5) && countitem(getarg(6)) >= getarg(7)) {
 		mes "[Mr. Smith]";
 		mes "Okay, we've got the application fee, ^FF000010,000 zeny^000000, "+getarg(1)+" "+getitemname(getarg(0))+", "+getarg(3)+" "+getitemname(getarg(2))+", "+getarg(5)+" "+getitemname(getarg(4))+" and "+getarg(7)+" "+getitemname(getarg(6))+"...";
 		set zeny,zeny-10000;
diff --git a/npc/quests/first_class/tu_ma_th01.txt b/npc/quests/first_class/tu_ma_th01.txt
index 873ffdb8f..ce1b6e4bb 100644
--- a/npc/quests/first_class/tu_ma_th01.txt
+++ b/npc/quests/first_class/tu_ma_th01.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Fix up by Jukka
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= eAthena SVN (Testet in Trunk 88xx)
 //===== Description: ========================================= 
@@ -12,11 +12,12 @@
 //= 1.0 Fully working
 //= 1.1 optimized [Lupus]
 //=	TODO: Test, Add correct misceffects numbers
+//= 1.2 Changed "battle_trace" to "Trace of Battle". [L0ne_W0lf]
 //============================================================ 
 
 
 //=================================================Battle Traces 1====================================================
-moc_fild12,166,369,0	script	battle_traces#1	844,{
+moc_fild12,166,369,0	script	Trace of Battle#1	844,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 5){
 			mes "^3355FFThere are traces of poison used in a battle. You can sense its power and decide that it would be safer not to get too close to it.^000000";
@@ -94,7 +95,7 @@ moc_fild12,173,215,0	script	Battle Traces#2	844,{
 }
 
 //=================================================Battle Traces 3====================================================
-moc_fild12,276,165,0	script	battle_traces#3	844,{
+moc_fild12,276,165,0	script	Trace of Battle#3	844,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 10){
 			mes "There are traces of several who have went by.";
@@ -125,7 +126,7 @@ moc_fild12,276,165,0	script	battle_traces#3	844,{
 }
 
 //=================================================Battle Traces 4====================================================
-moc_fild11,39,163,0	script	battle_traces#4	844,{
+moc_fild11,39,163,0	script	Trace of Battle#4	844,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 11){
 			mes "There are traces of many that have gone by.";
@@ -158,7 +159,7 @@ moc_fild11,39,163,0	script	battle_traces#4	844,{
 }
 
 //=================================================Battle Traces 5====================================================
-moc_fild11,205,52,0	script	battle_traces#5	844,{
+moc_fild11,205,52,0	script	Trace of Battle#5	844,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 12){
 			mes "There are traces of many that have gone by.";
@@ -260,7 +261,7 @@ moc_fild11,205,52,0	script	battle_traces#5	844,{
 }
 
 //=================================================Battle Traces 6====================================================
-moc_fild11,226,235,0	script	battle_traces#6	844,{
+moc_fild11,226,235,0	script	Trace of Battle#6	844,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 13){
 			mes "There are traces of many that have gone by.";
@@ -283,7 +284,7 @@ moc_fild11,226,235,0	script	battle_traces#6	844,{
 }
 
 //=================================================Battle Traces 7====================================================
-moc_fild11,184,342,0	script	battle_traces#7	844,{
+moc_fild11,184,342,0	script	Trace of Battle#7	844,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 13){
 			mes "There are traces of several that have stopped by.";
@@ -306,7 +307,7 @@ moc_fild11,184,342,0	script	battle_traces#7	844,{
 }
 
 //=================================================Battle Traces 8====================================================
-moc_fild17,213,358,0	script	battle_traces#8	844,{
+moc_fild17,213,358,0	script	Trace of Battle#8	844,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 13){
 			mes "There are traces of about two people that stopped by.";
@@ -337,7 +338,7 @@ moc_fild17,213,358,0	script	battle_traces#8	844,{
 }
 
 //=================================================Battle Traces 9====================================================
-moc_fild17,228,274,0	script	battle_traces#9	844,{
+moc_fild17,228,274,0	script	Trace of Battle#9	844,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 14){
 			mes "There are traces of a small battle.";
@@ -396,7 +397,7 @@ moc_fild17,228,274,0	script	battle_traces#9	844,{
 }
 
 //=================================================Battle Traces 10====================================================
-moc_fild17,34,292,0	script	battle_traces#10	844,{
+moc_fild17,34,292,0	script	Trace of Battle#10	844,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 16){
 			mes "A large group of people seem to have gone by.";
@@ -427,7 +428,7 @@ moc_fild17,34,292,0	script	battle_traces#10	844,{
 }
 
 //=================================================Battle Traces 11====================================================
-moc_fild18,346,296,0	script	battle_traces#11	844,{
+moc_fild18,346,296,0	script	Trace of Battle#11	844,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 17){
 			mes "A large group of people seem to have gone by.";
@@ -458,7 +459,7 @@ moc_fild18,346,296,0	script	battle_traces#11	844,{
 }
 
 //=================================================Battle Traces 12====================================================
-moc_fild18,309,257,0	script	battle_traces#12	844,{
+moc_fild18,309,257,0	script	Trace of Battle#12	844,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 18){
 			mes "A large group of people seem to have gone by.";
@@ -489,7 +490,7 @@ moc_fild18,309,257,0	script	battle_traces#12	844,{
 }
 
 //=================================================Battle Traces 13====================================================
-moc_fild18,177,333,0	script	battle_traces#13	844,{
+moc_fild18,177,333,0	script	Trace of Battle#13	844,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 19){
 			mes "A large group of people seem to have gone by.";
@@ -520,7 +521,7 @@ moc_fild18,177,333,0	script	battle_traces#13	844,{
 }
 
 //=================================================Battle Traces 14====================================================
-moc_fild18,111,303,0	script	battle_traces#14	844,{
+moc_fild18,111,303,0	script	Trace of Battle#14	844,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 20){
 			mes "A large group of people seem to have gone by.";
@@ -551,7 +552,7 @@ moc_fild18,111,303,0	script	battle_traces#14	844,{
 }
 
 //=================================================Battle Traces 15====================================================
-moc_fild18,109,197,0	script	battle_traces#15	844,{
+moc_fild18,109,197,0	script	Trace of Battle#15	844,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 21){
 			mes "A large group of people seem to have gone by.";
@@ -713,7 +714,7 @@ moc_fild18,109,197,0	script	battle_traces#15	844,{
 }
 
 //=================================================Battle Traces 16====================================================
-moc_fild18,156,96,0	script	battle_traces#16	844,{
+moc_fild18,156,96,0	script	Trace of Battle#16	844,{
 	if(BaseClass == Job_Thief){
 		if(tu_thief01 < 25){
 			mes "A large group of people seem to have gone by.";