- Removed security check since source level patch is applied. Reverted select(), created prompt().

modified   Changelog-Trunk.txt
modified   npc/airports/airships.txt
modified   npc/cities/amatsu.txt
modified   npc/cities/gonryun.txt
modified   npc/cities/hugel.txt
modified   npc/cities/lighthalzen.txt
modified   npc/cities/niflheim.txt
modified   npc/cities/valkyrie.txt
modified   npc/custom/eAAC_Scripts/disguiser.txt
modified   npc/custom/eAAC_Scripts/quest_warper.txt
modified   npc/custom/jobs/jobmaster.txt
modified   npc/events/idul_fitri.txt
modified   npc/jobs/1-1e/gunslinger.txt
modified   npc/jobs/1-1e/ninja.txt
modified   npc/jobs/novice/novice.txt
modified   npc/merchants/kunai_maker.txt
modified   npc/merchants/novice_exchange.txt
modified   npc/merchants/refine.txt
modified   npc/other/comodo_gambling.txt
modified   npc/other/dts_warper.txt
modified   npc/other/marriage.txt
modified   npc/other/powernpc.txt
modified   npc/quests/Lvl4_weapon_quest.txt
modified   npc/quests/gunslinger_quests.txt
modified   npc/quests/quests_ein.txt
modified   npc/quests/quests_umbala.txt
modified   npc/sample/monster_controller.cpp
modified   src/map/script.c



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

1 files changed, 1 insertions, 7 deletions

diff --git a/npc/other/powernpc.txt b/npc/other/powernpc.txt
index 5785d1201..94539780e 100644
--- a/npc/other/powernpc.txt
+++ b/npc/other/powernpc.txt
@@ -110,7 +110,6 @@ gonryun.gat,180,118,4	script	Iron man#gnp	85,{
 			mes "something new. Wanna try??";

 			break;

 		case 3:

-		case 255:

 			mes "[Songmoodoo]";

 			mes "I guess not..";

 			mes "....";

@@ -165,7 +164,7 @@ gon_test.gat,50,14,4	script	Administrator#gnp	780,{
 	mes "Remember, you have to pay";

 	mes "500z to fight.";

 	next;

-	if (select("Yes, let me fight!:One moment, please.") != 1) {

+	if (select("Yes, let me fight!:One moment, please.") == 2) {

 		mes "[Administrator]";

 		mes "Ok, see you later.";

 		close;

@@ -200,15 +199,11 @@ gon_test.gat,42,89,4	script	Summoner#gnp	774,{
 	mes "Which monster would you recall?";

 	next;

 	set @gnpGroup,select("Group 1:Group 2:Group 3:Group 4:Group 5:Group 6:Group 7:Group 8:Group 9:Group 10:Group 11");

-	if(@gnpGroup > 11 || @gnpGroup < 1)

-		end;

 	set @gnpGroupMob$,.gnpMobsName$[(@gnpGroup-1)*6];

 	for (set @i,1; @i < 6; set @i, @i+1) {

 		set @gnpGroupMob$, @gnpGroupMob$ + ":" + .gnpMobsName$[(@gnpGroup-1)*6 + @i];

 	}

 	set @gnpMob,select(@gnpGroupMob$);

-	if(@gnpMob > 6 || @gnpMob < 1)

-		end;

 	mes "[SongYeunWoo]";

 	mes "Let the fight begin!";

 	close2;

@@ -310,7 +305,6 @@ gon_test.gat,46,14,3	script	Guide of field of fight#gnp	770,{
 		warp "gonryun.gat",177,112;

 		end;

 	case 5:

-	case 255:

 		mes "[SongHeeYeon]";

 		mes "........";

 		mes "Good bye..";