fixed pollution quest

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8767 54d463be-8e91-2dee-dedb-b68131a5f0ec

npc/Changelog.txt

@@ -32,6 +32,8 @@ Playtester
 
 Date		Added
 ======
+09/15
+	* Ein.Town Pollution fix [Lupus]
 09/14
 	* Fixed Payon city. Bugs, missing text, etc [Lupus]
 	* Massive Einbroch & Einbech bugfix. WIP [Lupus]

npc/cities/payon.txt

@@ -961,7 +961,7 @@ L_AskFuture:
 	mes "[Lhimetorra]";
 	mes "Future... the card that sees the future is beginning to speak...... Prepare yourself...";
 	next;
-	set @TEMP,,rand(2);
+	set @TEMP,rand(2);
 	mes "[Lhimetorra]";
 	if(@TEMP == 0) mes "Jack says you may be frustrated in the future.";
 	if(@TEMP == 1) mes "He says to overcome the frustration, it is necessary to think of happy thoughts.";

npc/quests/quests_ein.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Evera and The eAthena Dev Team
 //===== Current Version: ===================================== 
-//= 1.4
+//= 1.4.1
 //===== Compatible With: ===================================== 
 //= eAthena 7.15 +
 //===== Description: ========================================= 
@@ -15,7 +15,7 @@
 //= 1.2 Added quest bits from Einbech and renamed file to
 //=	quests_ein.txt [Evera]
 //= 1.3 Implemented the polution quest. [MasterOfMuppets]
-//= 1.4 Massive bugfix [Lupus]
+//= 1.4.1 Massive bugfix. Fixed Pollution exploit [Lupus]
 //============================================================ 
 
 
@@ -761,7 +761,7 @@ ein_in01.gat,254,35,1	script	Scientist	749,{
 	mes "..............";
 	mes "*Grumble grumble*";
 	next;
-	if(select("What's wrong?:Catch you later.")==2)
+	if(select("What's wrong?:Catch you later.")==2){
 		 mes "[Scientist]";
 		 mes "Right.";
 		 mes "Yeah.";
@@ -889,19 +889,16 @@ L_Apples:
 	set @kaci,rand(2,12);
 	set @man,rand(2,12);
 	if(@man == @kaci){
-	switch(rand(1,2))
+	if(rand(2)){
-		{
+		if(@man != 12)
-		case 1:
+			set @man,@man+1;
-			if(@man != 12)set @man,@man+1;
+		else
-			else set @man,@man-1;
+			set @man,@man-1;
-		break;
+	}else{
-
+		if(@man != 2)
-		case 2:
+			set @man,@man-1;
-			if(@man != 2)set @man,@man-1;
+		else
-			else set @man,@man+1;
+			set @man,@man+1;
-		break;
-
-		}
 	}
 	mes "[Kaci]";
 	mes "Oooh...";
@@ -2702,6 +2699,7 @@ s_Giveclothes:
 einbroch.gat,1,1,0	script	#PolutionNPC	-1,{
 
 OnPolution:
+	set @AlrdEinPoll,1;
 	donpcevent "Liotzburg::OnHide";
 	donpcevent "Morei::OnHide";
 	donpcevent "Mark::OnHide";
@@ -2849,6 +2847,7 @@ OnTimer600000:
 	enablenpc "Paddler";
 	enablenpc "Head Gear Dealer";
 	set $EinPolution,0;
+	set @AlrdEinPoll,0;
 	end;
 
 }
@@ -2865,10 +2864,12 @@ sec_in02.gat,127,86,3	script	Einbroch Polution	851,{
 	s_0:
 		mes "[Einbroch Polution Variable Management]";
 		mes "$EinPolution has been reset to 0.";
+		set $EinPolution,0;
+		set @AlrdEinPoll,0;
 		close;
 	s_Input:
 		mes "[Einbroch Polution Variable Management]";
-		mes "Insert a number you want $EinFactory";
+		mes "Insert a number you want $EinPollution";
 		mes "to be replaced with. Type '0' to cancel.";
 		input @temppol;
 		if(@temppol == 0)close;
@@ -2904,7 +2905,7 @@ einbroch.gat,132,84,3	script	Liotzburg	853,{
 		mes "fix this! I gotta hide and find";
 		mes "someplace safe!";
 		close2;
-		donpcevent "#PolutionNPC::OnPolution";
+		if(!@AlrdEinPoll)donpcevent "#PolutionNPC::OnPolution";
 		end;
 	}
 	if(EinFactory >= 13){
@@ -3485,8 +3486,8 @@ s_Switches:
 		break;
 
 	case 15:
-	if(countitem(7325) > 19 && countitem(7317) > 9 && countitem(7319) > 9)goto s_Again;
 		mes "[Zelmeto]";
+		if(countitem(7325) < 20 || countitem(7317) < 10 || countitem(7319) < 10){
 			mes "We need";
 			mes "at least";
 			mes "20 ^FF0000Flexible Tube^000000,";
@@ -3501,8 +3502,7 @@ s_Switches:
 			mes "things. Our budget isn't";
 			mes "big enough to cover it.";
 			close;
-	s_Again:
+		}
-		mes "[Zelmeto]";
 		mes "Ah, it's you again.";
 		mes "It's shameful letting";
 		mes "other people know about";
@@ -3922,24 +3922,24 @@ s_Cont:
 	menu "Talk about Einbroch",s_Ein,"Ask him to forge a Weapon.",s_Weap,"Give him the Materials.",s_Material,"Cancel.",-;
 
 s_Material:
-	if(countitem(7126) > 5)goto s_EnoughItems;
 	mes "[Uwe]";
+	if(countitem(7126) < 6){
 		mes "Huh...?";
 		mes "You brought";
-	if(countitem(7126))mes "only " + countitem(7126) + " of them?";
+		if(countitem(7126))
-	if(!countitem(7126))mes "none at all...?";
+			mes "only " + countitem(7126) + " of them?";
+		else
+			mes "none at all...?";
 		mes "Next time, be sure";
 		mes "to bring 6 Large Jellopies,";
 		mes "okay? Don't forget, cutie~";
 		close;
-
+	}
-s_EnoughItems:
-	mes "[Uwe]";
-	mes "Thank you ^EFAEBDso^000000 much!";
-	mes "Here's the Coal I promised~";
 	delitem 7126,6;
 	getitem 1003,1;
 	set EinUwe,2;
+	mes "Thank you ^EFAEBDso^000000 much!";
+	mes "Here's the Coal I promised~";
 	next;
 	mes "[Uwe]";
 	mes "Now, I can't teach you everything";