Updated the Enlarge Weight Limit NPC. It is now a conversion of an aegis script, with iRO dialog.

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

2 files changed, 56 insertions, 48 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 03f429196..97c4e481b 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,7 @@
 Date		Added
 ======
+2010/01/22
+	* Rev. 14224 Updated the Enlarge Weight Limit NPC. It is now a conversion of an aegis script, with iRO dialog. [L0ne_W0lf]
 2009/12/24
 	* Rev. 14124 Applied Kazukin's fix for the dancing portion of The Sign Quest. (bugreport:3966) [L0ne_W0lf]
 2009/12/20
diff --git a/npc/other/gympass.txt b/npc/other/gympass.txt
index a4fa17d08..7131b23e7 100644
--- a/npc/other/gympass.txt
+++ b/npc/other/gympass.txt
@@ -3,16 +3,18 @@
 //===== By: ================================================== 
 //= Kisuka
 //===== Current Version: ===================================== 
-//= 1.2
+//= 1.3
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
+//= [Aegis Conversion]
 //= Exchange Gym Passes to learn "Enlarge Weight Limit"
 //= iRO NPC situated in Payon beside Kafra Shop.
 //===== Additional Comments: ================================= 
 //= 1.0 First version [L0ne_W0lf]
 //= 1.1 Fixed the NPC saying you "00" [L0ne_W0lf]
 //= 1.2 Replaced effect numerics with constants. [Samuray22]
+//= 1.3 Updated script, and fixed potential errors. [L0ne_W0lf]
 //============================================================ 
 
 payon,173,141,4	script	Ripped Cabus#GymPass	899,{
@@ -49,16 +51,48 @@ payon,173,141,4	script	Ripped Cabus#GymPass	899,{
 	next;
 	switch(select("Yes:No:Um, my workouts wore off.")) {
 	case 1:
-		if (countitem(7776) == 0) {
-			mes "[Ripped]";
-			mes "Dude, what'd I tell you?";
-			mes "You gotta bring me your";
-			mes "^FF0000Gym Pass^000000 if you wanna";
-			mes "work out, and build up your";
-			mes "item carrying muscles.";
-			close;
+		if (gympassmemory < 10) {
+			set .@add_carry,gympassmemory + 1;
+			set .@remain_carry,10 - .@add_carry;
+			if (countitem(7776) > 0) {
+				mes "[Ripped]";
+				mes "Oh, awesome, I see you";
+				mes "brought your Gym Pass.";
+				mes "Alright, just do what I do,";
+				mes "and try to feel the burn.";
+				mes "Ready? Let's do this.";
+				next;
+				specialeffect2 EF_EARTHSPIKE;
+				next;
+				specialeffect2 EF_DEVIL;
+				next;
+				specialeffect2 EF_COIN;
+				next;
+				specialeffect2 EF_SIGHTRASHER;
+				next;
+				mes "[Ripped]";
+				mes "There, you should be able";
+				mes "to carry more stuff with you.";
+				mes "Let's see, we can increase";
+				mes "your item carrying capacity";
+				mes "^FF00000" + .@remain_carry + "^000000 more times if we continue";
+				mes "training together like this.";
+				delitem 7776,1; //Max_Weight_Up_Scroll
+				set gympassmemory,.@add_carry;
+				skill "ALL_INCCARRY",.@add_carry,0;
+				close;
+			}
+			else {
+				mes "[Ripped]";
+				mes "Dude, what'd I tell you?";
+				mes "You gotta bring me your";
+				mes "^FF0000Gym Pass^000000 if you wanna";
+				mes "work out, and build up your";
+				mes "item carrying muscles.";
+				close;
+			}
 		}
-		else if (getskilllv("ALL_INCCARRY") >= 10) {
+		else {
 			mes "[Ripped]";
 			mes "Dude, I don't think we can";
 			mes "build up your item carrying";
@@ -68,34 +102,6 @@ payon,173,141,4	script	Ripped Cabus#GymPass	899,{
 			mes "I told you about the limits.";
 			close;
 		}
-		else {
-			mes "[Ripped]";
-			mes "Oh, awesome, I see you";
-			mes "brought your Gym Pass.";
-			mes "Alright, just do what I do,";
-			mes "and try to feel the burn.";
-			mes "Ready? Let's do this.";
-			next;
-			specialeffect2 EF_EARTHSPIKE;
-			next;
-			specialeffect2 EF_DEVIL;
-			next;
-			specialeffect2 EF_COIN;
-			next;
-			specialeffect2 EF_SIGHTRASHER;
-			next;
-			delitem 7776,1;
-			skill "ALL_INCCARRY",getskilllv("ALL_INCCARRY")+1,0;
-			set gympassmemory,gympassmemory+1;
-			mes "[Ripped]";
-			mes "There, you should be able";
-			mes "to carry more stuff with you.";
-			mes "Let's see, we can increase";
-			mes "your item carrying capacity";
-			mes "^FF00000" + (10-getskilllv(681)) + "^000000 more times if we continue";
-			mes "training together like this.";
-			close;
-		}
 	case 2:
 		mes "[Ripped]";
 		mes "Aw, that's too bad.";
@@ -106,15 +112,7 @@ payon,173,141,4	script	Ripped Cabus#GymPass	899,{
 		mes "get them in shape.";
 		close;
 	case 3:
-		if (getskilllv("ALL_INCCARRY") == 0) {
-			mes "[Ripped]";
-			mes "Uhh...";
-			mes "We didn't work out";
-			mes "together before.";
-			mes "I'm sure about that.";
-			close;
-		}
-		else {
+		if (gympassmemory > 0) {
 			mes "[Ripped]";
 			mes "What happened?";
 			mes "You let your item carrying";
@@ -131,13 +129,21 @@ payon,173,141,4	script	Ripped Cabus#GymPass	899,{
 			next;
 			specialeffect2 EF_SIGHTRASHER;
 			next;
-			skill 681,gympassmemory,0;
 			mes "[Ripped]";
 			mes "How about that?";
 			mes "Your item carrying";
 			mes "muscles grew back,";
 			mes "just like that! Try not to";
 			mes "wimp out again, okay?";
+			skill "ALL_INCCARRY",gympassmemory,0;
+			close;
+		}
+		else {
+			mes "[Ripped]";
+			mes "Uhh...";
+			mes "We didn't work out";
+			mes "together before.";
+			mes "I'm sure about that.";
 			close;
 		}
 	}