fixed weight check. added tabs

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

4 files changed, 13 insertions, 14 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 726bc453a..aba5a16bb 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -33,6 +33,9 @@ KarLaeda
 

 Date		Added

 ======

+11/04

+	* Fixed Weight check in 1st class quests [Lupus]

+	- Added missing tabs to airship

 11/03

 	* Small Kiel Quest update [Playtester]

 	* Updated Hunter Job Quest: 7 official item sets of Demon Hunter [Lupus]

diff --git a/npc/airports/airships.txt b/npc/airports/airships.txt
index 5da2f8ec1..ab5826fac 100644
--- a/npc/airports/airships.txt
+++ b/npc/airports/airships.txt
@@ -360,7 +360,7 @@ s_Material:
 }

 

 

-airplane.gat,33,69,4 script Kaci 73,{

+airplane.gat,33,69,4	script	Kaci	73,{

 	callfunc "applegamble","Kaci";

 	end;

 

diff --git a/npc/quests/first_class/tu_archer.txt b/npc/quests/first_class/tu_archer.txt
index 7bf52a185..3ae39b8fc 100644
--- a/npc/quests/first_class/tu_archer.txt
+++ b/npc/quests/first_class/tu_archer.txt
@@ -3,14 +3,14 @@
 //===== By: ================================================== 
 //= Fix up by Jukka
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= eAthena SVN (Testet in Trunk 88xx)
 //===== Description: ========================================= 
 //=
 //===== Additional Comments: ================================= 
 //= 1.0 Fully working
-//= 1.1 optimized [Lupus]
+//= 1.1 optimized [Lupus] 1.2 fixed Weight check
 //=	TODO: Test, Add correct misceffects numbers
 //============================================================ 
 
@@ -413,8 +413,7 @@ payon_in02.gat,54,13,3	script	Master Kavaruk	55,{
 pay_arche.gat,103,165,5	script	Reidin Corse#tu	832,{
 
 	mes "[Reidin Corse]";
-	set @now_weight, MaxWeight - Weight;
-	if(@now_weight < 2000){
+	if(MaxWeight - Weight < 2000){
 		mes "Hey, you're carrying an";
 		mes "awful lot of stuff. You ought";
 		mes "to put some of your things";
@@ -722,8 +721,7 @@ pay_arche.gat,103,165,5	script	Reidin Corse#tu	832,{
 				mes "[Reidin Corse]";
 				mes "Remember, the most";
 				mes "important thing is to level the Vulture's Eye skill and test the distance of your attack range.";
-				set @f_arrow,MaxWeight - Weight;
-				if(@f_arrow < 1000){
+				if(MaxWeight - Weight < 1000){
 					mes "You've got plenty of arrows";
 					mes "for that, so go for it!";
 					set tu_archer01, 8;
@@ -890,8 +888,7 @@ pay_arche.gat,103,165,5	script	Reidin Corse#tu	832,{
 			close;
 		} else if(tu_archer01 == 11){
 			if((countitem(962) > 9) && (countitem(991) > 0)){
-				set @bow_muge,MaxWeight - Weight;
-				if(@bow_muge < 1000){
+				if(MaxWeight - Weight < 1000){
 					mes "Why are you carrying";
 					mes "so much stuff? You better put everything you don't need into Kafra Storage.";
 					close;
@@ -970,8 +967,7 @@ pay_arche.gat,103,165,5	script	Reidin Corse#tu	832,{
 			mes "Take some of these.";
 			next;
 			mes "[Reidin Corse]";
-			set @trip_gift,MaxWeight - Weight;
-			if(@trip_gift < 2100){
+			if(MaxWeight - Weight < 2100){
 				mes "H-hey!";
 				mes "Why are you carrying";
 				mes "so much stuff? You better put everything you don't need into Kafra Storage.";
diff --git a/npc/quests/first_class/tu_merchant.txt b/npc/quests/first_class/tu_merchant.txt
index fb02993d2..e03084461 100644
--- a/npc/quests/first_class/tu_merchant.txt
+++ b/npc/quests/first_class/tu_merchant.txt
@@ -3,14 +3,14 @@
 //===== By: ================================================== 
 //= Fix up by Jukka
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= eAthena SVN (Testet in Trunk 88xx)
 //===== Description: ========================================= 
 //=
 //===== Additional Comments: ================================= 
 //= 1.0 Fully working
-//= 1.1 Fixed bugs, optimized [Lupus]
+//= 1.1 Fixed bugs, optimized [Lupus] 1.2 fixed Weight check
 //=	TODO: Test, add missing misceffects
 //============================================================ 
 
@@ -1050,7 +1050,7 @@ prt_in.gat,169,11,3	script	Aigie	92,{
 				mes "I am sorry, but you don't have enough money. Would you please get some more Zeny before coming back?";
 				close;
 			}
-			if(Čnow_weight < 71){
+			if(MaxWeight - Weight < 71){
 				next;
 				mes "[Aigie]";
 				mes "Wait, wait!";