added official Gonryn Power Arena

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

5 files changed, 343 insertions, 9 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 5ed624f8b..cc21cd73f 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -33,6 +33,10 @@ KarLaeda
 

 Date		Added

 ======

+10/24

+	* Added official Gonryun Power Arena [KarLaeda]

+	* Removed 2nd entrance warp to Novice Geffen Castle [Lupus]

+	- minor fixes in Novice Exchanger

 10/23

 	* Fixed small typo in the Priest job quest [Playtester]

 10/22

diff --git a/npc/merchants/novice_exchange.txt b/npc/merchants/novice_exchange.txt
index 750d88606..3a675c4aa 100644
--- a/npc/merchants/novice_exchange.txt
+++ b/npc/merchants/novice_exchange.txt
@@ -71,7 +71,7 @@ function	script	F_NMerch	{
 		mes "What do you say? Deal?";

 		next;

 		if(select("Deal.:No deal.")==2) {

-			mes "[Merchant]";

+			mes "["+getarg(0)+"]";

 			mes "Bah~ whatever.";

 			mes "Bah!";

 			close;

@@ -109,8 +109,8 @@ function	script	F_NMerch	{
 		if(@val > @max) {

 			mes "Uh oh, the number you entered";

 			mes "seemed incorrect.";

-			mes "You'd better check how many red";

-			mes "potions you can get.";

+			mes "You'd better check how many Red";

+			mes "Potions you can get.";

 			close;

 		}

 		delitem @item,@amount*@val;

diff --git a/npc/other/powernpc.txt b/npc/other/powernpc.txt
new file mode 100644
index 000000000..63bdd1f13
--- /dev/null
+++ b/npc/other/powernpc.txt
@@ -0,0 +1,332 @@
+//===== eAthena Script =======================================

+//= Official Gonryun Power Arena

+//===== By: ==================================================

+//= KarLaeda (Aegis script cnversion)

+//===== Current Version: =====================================

+//= 1.0

+//===== Compatible With: =====================================

+//= Athena SVN 9000+

+//===== Additional Comments: =================================

+//= 

+//============================================================

+

+

+gonryun.gat,180,118,4	script	Iron man#gnp	85,{

+	if (countitem(1201) > 0) {

+		mes "- Wait a minute !! -";

+		mes "- Currently you're carrying -";

+		mes "- too many items with you. -";

+		mes "- Please try again -";

+		mes "- after you loose some weight. -";

+		close;

+	}

+	if (BaseJob == Job_Novice) {

+		mes "[Songmoodoo]";

+		mes "Children are not allowed in here.";

+		close;

+	}

+	if (in_battle == 3) set in_battle,1;

+	if (in_battle < 1) {

+		mes "[Songmoodoo]";

+		mes "Hey hey~ This is not something";

+		mes "You can see everyday.";

+		mes "Oh~ you look strong!";

+		mes "Wanna try?";

+		next;

+		switch(select("Why not?:?????:No thanks.")){

+		case 1:

+			mes "[Songmoodoo]";

+			mes "Haha~ I knew you would try.";

+			mes "If you could lift this up,";

+			mes "I'll tell you something interesting.";

+			mes "Ready?";

+			next;

+			mes "^0000FFSongmoodoo pointed to a rock";

+			mes "and asked you to lift.";

+			if (BaseJob < Job_Knight) {

+				if (checkweight(7049,690)) {

+					mes "^0000FFYou lifted the Stone lightly.^000000";

+					set in_battle,1;

+					getitem 7049,690; // Stone

+					next;

+					emotion e_no1;

+					mes "[Songmoodoo]";

+					mes "Wow~ Excellent~";

+					mes "I'll take you to someplace nice";

+					mes "next time I see you.";

+					mes "See ya~";

+				} else {

+					mes "Looks too heavy for you.^000000";

+					next;

+					mes "[Songmoodoo]";

+					mes "You are yet lack of training.";

+					mes "Come after more practice.";

+				}

+			} else if (BaseClass == Job_Swordman || BaseClass == Job_Thief || BaseClass == Job_Merchant || BaseJob == Job_Monk) {

+				if (checkweight(7049,1100)) {

+					mes "^0000FFYou lifted the Stone lightly.^000000";

+					set in_battle,1;

+					getitem 7049,1100; // Stone

+					next;

+					emotion e_no1;

+					mes "[Songmoodoo]";

+					mes "Wow~ Excellent~";

+					mes "I'll take you to someplace nice";

+					mes "next time I see you.";

+					mes "See ya~";

+				} else {

+					mes "Seemed too heavy to lift.^000000";

+					next;

+					mes "[Songmoodoo]";

+					mes "You are yet lack of training.";

+					mes "come after more practice.";

+				}

+			} else {

+				if (checkweight(7049,730)) {

+					mes "^0000FFYou lifted the Stone lightly.^000000";

+					set in_battle,1;

+					getitem 7049,730; // Stone

+					next;

+					emotion e_no1;

+					mes "[Songmoodoo]";

+					mes "Wow~ Excellent~";

+					mes "I'll take you to someplace nice";

+					mes "next time I see you.";

+					mes "See ya~";

+				} else {

+					mes "Seemed too heavy to lift.^000000";

+					next;

+					mes "[Songmoodoo]";

+					mes "You are yet lack of training.";

+					mes "come after more practice.";

+				}

+			}

+			break;

+		case 2:

+			mes "[Songmoodoo]";

+			mes "That's not a big deal.";

+			mes "If you believe you're strong,";

+			mes "This might be a good chance to experience";

+			mes "something new. Wanna try??";

+			break;

+		case 3:

+			mes "[Songmoodoo]";

+			mes "I guess not..";

+			mes "....";

+			emotion e_pif;

+			break;

+		}

+	} else if (in_battle == 1) {

+		mes "[Songmoodoo]";

+		mes "Good to see you again!";

+		mes "Wanna go??";

+		next;

+		if (select("Sure:Maybe next time") == 1) {

+			mes "[Songmoodoo]";

+			mes "Good! Haha.";

+			mes "I like your confidence.";

+			mes "Good luck on you~";

+			close2;

+			warp "gon_test.gat",53,6;

+			end;

+		} else {

+			mes "[Songmoodoo]";

+			mes "well..";

+			mes "alright.";

+			mes "I'll see you next time then.";

+		}

+	} else {

+		mes "[Songmoodoo]";

+		mes "You ran away from there?";

+		mes "Guess you're not strong enough?";

+		mes "I'll give you another chance.";

+		mes "See you again.";

+		emotion e_pif;

+		set in_battle,1;

+	}

+	close;

+}

+

+gon_test.gat,50,14,4	script	Administrator#gnp	780,{

+	mes "[Administrator]";

+	if (BaseJob == Job_Novice) {

+		mes "Children are not allowed in here.";

+		close;

+	}

+	if ($@in_battle) {

+		mes "Sorry, a field of fight";

+		mes "is occupied right now.";

+		mes "Try again later.";

+		close;

+	}

+	mes "Are you ready?";

+	mes "";

+	mes "Remember, you have to pay";

+	mes "500z to fight.";

+	next;

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

+		mes "[Administrator]";

+		mes "Ok, see you later.";

+		close;

+	}

+	if (Zeny < 500) {

+		mes "[Administrator]";

+		mes "I'm sorry but you don't have enough zeny.";

+		close;

+	}

+	set Zeny,Zeny - 500;

+	set in_battle,1;

+	warp "gon_test.gat",42,86;

+	set $@in_battle,1;

+	setnpctimer 0,"Summoner#gnp";

+	startnpctimer "Summoner#gnp";

+	end;

+}

+

+gon_test.gat,42,89,4	script	Summoner#gnp	774,{

+	mes "[SongYeunWoo]";

+	if (in_battle == 3) {

+		mes "Please come back after registration.";

+		close;

+	} else if (in_battle == 2) {

+		mes "You had a single match already.";

+		mes "You can have a match once at a time.";

+		mes "Please re-enter if you want a match";

+		mes "with other monsters.";

+		close;

+	}

+	mes "Welcome.";

+	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");

+	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$);

+	mes "[SongYeunWoo]";

+	mes "Let the fight begin!";

+	close2;

+	set in_battle,2;

+	if (getnpctimer(0) < 180000) monster "gon_test.gat",56,86,.gnpMobsName$[(@gnpGroup-1)*6 + @gnpMob - 1],.gnpMobsId[(@gnpGroup-1)*6 + @gnpMob - 1],1,"Summoner#gnp::OnGnpMobDead";

+//  do init timer on mob select ?

+//	setnpctimer 0;

+	end;

+

+	OnInit:

+		initnpctimer;

+		stopnpctimer;

+		setarray .gnpMobsName$[0],"Leather ribbon","Sitotoxism","Certificate of blood donation","Tarantulla","DangRangKwon","Molar of Desert";

+		setarray .gnpMobsId[0],1419,1428,1434,1430,1457,1432;

+		setarray .gnpMobsName$[6],"Hog Skeleton","Cannibal Bear","Miner","Fighting Dog","Mermaid Princess","Only Son";

+		setarray .gnpMobsId[6],1462,1442,1469,1460,1425,1472;

+		setarray .gnpMobsName$[12],"SamYeupchoom","Hunting Dog","Nutcracker","Sea Horse","JAKK","Corpse";

+		setarray .gnpMobsId[12],1454,1455,1443,1426,1436,1423;

+		setarray .gnpMobsName$[18],"Marduk","Onion Stem","Worm","Autodoll","Girl with Matches","Red Evil";

+		setarray .gnpMobsId[18],1458,1440,1429,1459,1444,1422;

+		setarray .gnpMobsName$[24],"Naga","Mold","Tracing Missiles","Aryong","Abiryong","Bacterium";

+		setarray .gnpMobsId[24],1421,1481,1424,1465,1466,1433;

+		setarray .gnpMobsName$[30],"Winning System","Fat Archer","Little black goat","Perverted","Treasure Box","Greenhorn";

+		setarray .gnpMobsId[30],1427,1473,1431,1446,1474,1471;

+		setarray .gnpMobsName$[36],"Hurricane","External Hog","Landlord of Maze","Knight of grudge","Archer of grudge","Papillon";

+		setarray .gnpMobsId[36],1450,1439,1461,1467,1453,1479;

+		setarray .gnpMobsName$[42],"Lip","Wendigo","E Card","Tentacle Monster","Muscular Alarm","Devil Cross";

+		setarray .gnpMobsId[42],1451,1475,1437,1441,1476,1435;

+		setarray .gnpMobsName$[48],"Maggot","Large Frame","Season of reading","Shining Fingers","Handbag","Major knight of grudge";

+		setarray .gnpMobsId[48],1477,1448,1478,1489,1488,1438;

+		setarray .gnpMobsName$[54],"Queen","Man of Fire","Sword of Executor","Mutant Dragon","Mixed Soup","Great Sword";

+		setarray .gnpMobsId[54],1482,1464,1487,1449,1456,1486;

+		setarray .gnpMobsName$[60],"Monster Bird","Torturer","Warrior","Vice-Torturer","Huge Sword";

+		setarray .gnpMobsId[60],1447,1483,1490,1484,1485;

+	end;

+

+	OnTimer120000:

+		areaannounce "gon_test.gat",41,81,74,92,"1 min. left",0;

+	end;

+

+	OnTimer180000:

+		killmonster "gon_test.gat","Summoner#gnp::OnGnpMobDead";

+	end;

+

+	OnTimer182000:

+		areaannounce "gon_test.gat",41,81,74,92,"Time Over.",0;

+	end;

+

+	OnGnpMobDead:

+		setnpctimer 0;

+		set in_battle,1;

+		areaannounce "gon_test.gat",41,81,74,92,"Thank you. Please, come again.",0;

+		sleep 4000;

+	OnTimer184000:

+		stopnpctimer;

+		areawarp "gon_test.gat",41,81,74,92,"gon_test.gat",44,4;

+		set $@in_battle,0;

+	end;

+}

+

+gon_test.gat,46,14,3	script	Guide of field of fight#gnp	770,{

+	mes "[SongHeeYeon]";

+	mes ".....";

+	mes "Hi, there~";

+	mes "This is a field of fight.";

+	mes "Got any questions?";

+	next;

+	switch(select("A field of fight?:You got a minute lady?:Get in.:Out.:Nope.")){

+	case 1:

+		mes "[SongHeeYeon]";

+		mes "Just like the name of this place,";

+		mes "it is a field for matches.";

+		mes "We have various monsters";

+		mes "in different levels.";

+		next;

+		mes "[SongHeeYeon]";

+		mes "1st Class Boss Monsters are in middle of preparation yet.";

+		mes "We charge you a small fee to enter here.";

+		break;

+	case 2:

+		mes "[SongHeeYeon]";

+		mes "eh.... excuse me?";

+		mes "ah..I'm afraid I have to work right now...";

+		mes "I am sorry..";

+		break;

+	case 3:

+		mes "[SongHeeYeon]";

+		mes "Yes, Thank you.";

+		mes "Have a good time.";

+		close2;

+		set in_battle,3;

+		warp "gon_test.gat",25,98;

+		end;

+	case 4:

+		mes "[SongHeeYeon]";

+		mes "Thank you.";

+		mes "Please come again.";

+		close2;

+		warp "gonryun.gat",177,112;

+		end;

+	case 5:

+		mes "[SongHeeYeon]";

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

+		mes "Good bye..";

+		break;

+	}

+	close;

+}

+

+gon_test,70,103,3	script	ChowAnAn#gnp	773,{

+	mes "[ChowAnAn]";

+	mes "Want to go back?";

+	next;

+	if (select("Yes.:No.") == 1) {

+		mes "[ChowAnAn]";

+		mes "Thank you.";

+		mes "Please come again.";

+		close2;

+		set in_battle,1;

+		warp "gon_test.gat",44,4;

+		end;

+	}

+	mes "[ChowAnAn]";

+	mes "Thank you.";

+	close;

+}
\ No newline at end of file
diff --git a/npc/scripts_athena.conf b/npc/scripts_athena.conf
index dc05590ce..5abff6595 100644
--- a/npc/scripts_athena.conf
+++ b/npc/scripts_athena.conf
@@ -184,4 +184,5 @@ npc: npc/other/comodo_gambling.txt
 npc: npc/other/lighthalzen_bank.txt

 npc: npc/other/lighthalzen_prison.txt

 npc: npc/other/lighthalzen_auction.txt

+npc: npc/other/powernpc.txt

 // --------------------------------------------------------------

diff --git a/npc/warps/guild/guildcastles.txt b/npc/warps/guild/guildcastles.txt
index bb99fa579..0accb146e 100644
--- a/npc/warps/guild/guildcastles.txt
+++ b/npc/warps/guild/guildcastles.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================

 //= Athena (1.0)

 //===== Current Version: =====================================

-//= 2.2

+//= 2.3

 //===== Compatible With: =====================================

 //= Any Athena Version

 //===== Description: =========================================

@@ -15,6 +15,7 @@
 //= 2.0 Added Novice Guilds warps, optimized aldg408r warp [Lupus]

 //= 2.1 Fixed some warps positions [Yor]

 //= 2.2 Changed all breaks to end as per the new script engine. [Skotlex]

+//= 2.3 Removed 2nd entrance to Novice Castle Geffen [Lupus]

 //============================================================

 

 

@@ -419,11 +420,7 @@ nguild_alde.gat,171,175,0	warp	naldg108	1,1,nguild_alde.gat,35,197
 nguild_alde.gat,31,197,0	warp	naldg108-1	1,1,nguild_alde.gat,175,175

 

 //Novices Guild: Geffen Castles Map		

-n_castle.gat,183,183,0	script	ngefg01	45,1,1,{

-	if(rand(2)) goto w2;

-	warp "nguild_gef.gat",34,140; end;

-w2:	warp "nguild_gef.gat",95,178; end;

-}

+n_castle.gat,183,183,0	warp	ngefg01	1,1,nguild_gef.gat,34,140

 nguild_gef.gat,34,136,0	warp	ngefg01-1	1,1,n_castle.gat,183,180

 nguild_gef.gat,99,178,0	warp	ngefg02-1	1,1,n_castle.gat,183,180