Dr.Evil fixed some parts of his Umbala script

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

2 files changed, 40 insertions, 39 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index c6b19cad7..5a85c470c 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -37,6 +37,7 @@ Musashiden
 Date		Added

 ======

 06/15

+	* Dr.Evil fixed some parts of his Umbala script [Playtester]

 	* Updated the color codes on the Juno Guides mini map illustrations. [Musashiden]

 	* Juno Update Process. 50% complete. [Musashiden]

 	* Fixed an exploit in the Comodo gambling script. [Lupus]

diff --git a/npc/cities/umbala.txt b/npc/cities/umbala.txt
index 4b501e693..c51835b51 100644
--- a/npc/cities/umbala.txt
+++ b/npc/cities/umbala.txt
@@ -982,9 +982,9 @@ um_in.gat,44,71,2	script	Utan Tribe Shaman	782,{
 					mes "^3377FF15x Horn^000000 for the ritual.";

 				}

 				else {

-					set @need,947;

-					set @amount,15;

-					set @gain,993;

+					set .@need,947;

+					set .@amount,15;

+					set .@gain,993;

 				}

 				break;

 			case 2:

@@ -996,9 +996,9 @@ um_in.gat,44,71,2	script	Utan Tribe Shaman	782,{
 					mes "^3377FF20x Snails Shell^000000 for the ritual.";

 				}

 				else {

-					set @need,946;

-					set @amount,20;

-					set @gain,991;

+					set .@need,946;

+					set .@amount,20;

+					set .@gain,991;

 				}

 				break;

 			case 3:

@@ -1011,9 +1011,9 @@ um_in.gat,44,71,2	script	Utan Tribe Shaman	782,{
 					mes "for the ritual.";

 				}

 				else {

-					set @need,904;

-					set @amount,20;

-					set @gain,990;

+					set .@need,904;

+					set .@amount,20;

+					set .@gain,990;

 				}

 				break;

 			case 4:

@@ -1026,13 +1026,13 @@ um_in.gat,44,71,2	script	Utan Tribe Shaman	782,{
 					mes "to complete the ritual.";

 				}

 				else {

-					set @need,1013;

-					set @amount,25;

-					set @gain,992;

+					set .@need,1013;

+					set .@amount,25;

+					set .@gain,992;

 				}

 				break;

 		}

-		if(@need == 0) {

+		if(.@need == 0) {

 			next;

 			mes "[Putsuchiritan]";

 			mes "Once you've prepared these";

@@ -1048,15 +1048,15 @@ um_in.gat,44,71,2	script	Utan Tribe Shaman	782,{
 		mes "after all, choose 0.";

 		while(1) {

 			next;

-			input @num;

-			if(@num<=0) {

+			input .@num;

+			if(.@num<=0) {

 				mes "[Putsuchiritan]";

 				mes "If you don't wish my help at the moment,";

 				mes "that's fine.  When you do, please come";

 				mes "by again.";

 				close;

 			}

-			if(@num>9) {

+			if(.@num>9) {

 				mes "[Putsuchiritan]";

 				mes "You must choose a number between";

 				mes "1 and 9.  It is very important that";

@@ -1067,7 +1067,7 @@ um_in.gat,44,71,2	script	Utan Tribe Shaman	782,{
 			break;

 		}

 		mes "[Putsuchiritan]";

-		switch(@need) {

+		switch(.@need) {

 			case 947: mes "The horn begins to vibrate."; break;

 			case 904: mes "The tail begins to vibrate."; break;

 			default: mes "The shell begins to vibrate."; break;

@@ -1084,8 +1084,8 @@ um_in.gat,44,71,2	script	Utan Tribe Shaman	782,{
 		mes "Damtsuha Ombabaraka! Unba! Shi!";

 		mes "Sukatamba Aburumba! Umba! Shi!";

 		next;

-		delitem @need,@amount;

-		getitem @gain,1;

+		delitem .@need,.@amount;

+		getitem .@gain,1;

 		mes "[Putsuchiritan]";

 		mes "There.  Your inner power has converted";

 		mes "these objects from nature into";

@@ -1108,8 +1108,8 @@ um_in.gat,44,71,2	script	Utan Tribe Shaman	782,{
 					mes "component essence.";

 				}

 				else {

-					set @need,997;

-					set @gain,993;

+					set .@need,997;

+					set .@gain,993;

 				}

 				break;

 			case 2:

@@ -1121,8 +1121,8 @@ um_in.gat,44,71,2	script	Utan Tribe Shaman	782,{
 					mes "component essence.";

 				}

 				else {

-					set @need,995;

-					set @gain,991;

+					set .@need,995;

+					set .@gain,991;

 				}

 				break;

 			case 3:

@@ -1134,8 +1134,8 @@ um_in.gat,44,71,2	script	Utan Tribe Shaman	782,{
 					mes "component essence.";

 				}

 				else {

-					set @need,994;

-					set @gain,990;

+					set .@need,994;

+					set .@gain,990;

 				}

 				break;

 			case 4:

@@ -1147,13 +1147,13 @@ um_in.gat,44,71,2	script	Utan Tribe Shaman	782,{
 					mes "component essence.";

 				}

 				else {

-					set @need,996;

-					set @gain,992;

+					set .@need,996;

+					set .@gain,992;

 				}

 				break;

 		}

 		next;

-		if(@need == 0) {

+		if(.@need == 0) {

 			mes "[Putsuchiritan]";

 			mes "Once you have the necessary stone,";

 			mes "please come back and visit me";

@@ -1161,7 +1161,7 @@ um_in.gat,44,71,2	script	Utan Tribe Shaman	782,{
 			close;

 		}

 		mes "[Putsuchiritan]";

-		switch(@need) {

+		switch(.@need) {

 			case 997: mes "I will dismantle your earth crystal"; 	break;

 			case 995: mes "I will dismantle your frozen crystal"; 	break;

 			case 994: mes "I will dismantle your heart of flame"; 		break;

@@ -1173,15 +1173,15 @@ um_in.gat,44,71,2	script	Utan Tribe Shaman	782,{
 		mes "stone, choose 0.";

 		while(1) {

 			next;

-			input @num;

-			if(@num<=0) {

+			input .@num;

+			if(.@num<=0) {

 				mes "[Putsuchiritan]";

 				mes "If you don't wish my help at the moment,";

 				mes "that's fine.  When you do, please come";

 				mes "by again.";

 				close;

 			}

-			if(@num>9) {

+			if(.@num>9) {

 				mes "[Putsuchiritan]";

 				mes "You must choose a number between";

 				mes "1 and 9.  It is very important that";

@@ -1191,11 +1191,11 @@ um_in.gat,44,71,2	script	Utan Tribe Shaman	782,{
 			}

 			break;

 		}

-		set @num,@num+rand(5);

-		if(@num>10)

-			set @num,@num-10;

-		if(@num<5)

-			set @num,@num+5;

+		set .@num,.@num+rand(5);

+		if(.@num>10)

+			set .@num,.@num-10;

+		if(.@num<5)

+			set .@num,.@num+5;

 		mes "[Putsuchiritan]";

 		mes "Please place the elemental stone";

 		mes "inside this holy circle.  I will chant a";

@@ -1209,8 +1209,8 @@ um_in.gat,44,71,2	script	Utan Tribe Shaman	782,{
 		mes "Anburaka Taburaka Taburakan!  Unba Ra!";

 		mes "Onbaruzu Zan Kata!  Unba Ka!";

 		next;

-		delitem @need,1;

-		getitem @gain,@num;

+		delitem .@need,1;

+		getitem .@gain,.@num;

 		mes "[Putsuchiritan]";

 		mes "The elemental stone has been";

 		mes "dismantled into its natural";