Browse Source

Small fixes in Eclage scripts and code style changes.
- Fixed some minor bugs.
- Added GM NPC function.

Signed-off-by: Euphy <euphy.raliel@rathena.org>

Euphy 10 năm trước cách đây
mục cha
commit
df6fb01739

+ 3 - 0
npc/other/gm_npcs.txt

@@ -118,6 +118,9 @@ List of GM Management NPCs (incomplete)
 - Field Bush Switch
 - Bakonawa Intro Helper
 - Pintados Manager#pin
+- #pa0829Reactor11
+- New Oz Image#1
+- Professor Aide#worm
 --------------------------
 - Allied Manager#gm
 - #timer_alba01

+ 37 - 39
npc/re/cities/eclage.txt

@@ -1,4 +1,4 @@
-//===== rAthena Script ====================================== 
+//===== rAthena Script ======================================= 
 //= General Eclage NPC.
 //===== By: ================================================== 
 //= Dastgir
@@ -30,49 +30,48 @@ ecl_in02,164,56,3	script	Receptionist#Laphine	835,{
 	mes "Welcome to Eclage Clinic.";
 	next;
 	switch (select("Save Location:Rest:Finish the conversation")) {
+	case 1:
+		mes "[Receptionist}";
+		mes "Clinic has been set as your save point. Be careful though~";
+		savepoint "ecl_in02",162,50;
+		close;
+	case 2:
+		mes "[Receptionist}";
+		mes "Restore your mind and body at our clinic. It's filled with Eclage's clean energy.";
+		mes "We charge 1 Splendide Coin normally, but we offer a special discount for travelers. Your total is 5,000 zeny. ";
+		next;
+		switch (select("Pay with Splendide Coin:Pay with Zeny:Forget it")) {
 		case 1:
+			if (!countitem(6081)) {
+				mes "[Receptionist}";
+				mes "It seems like you don't have enough coins. Would you check your account again, please?";
+				close;
+			}
 			mes "[Receptionist}";
-			mes "Clinic has been set as your save point. Be careful though~";
-			savepoint "ecl_in02",162,50;
-			close;
+			mes "Make yourself at home~";
+			close2;
+			delitem 6081,1; //6081
+			percentheal 100,100;
+			warp "ecl_in02",167,49;
+			end;
 		case 2:
-			mes "[Receptionist}";
-			mes "Restore your mind and body at our clinic. It's filled with Eclage's clean energy.";
-			mes "We charge 1 Splendide Coin normally, but we offer a special discount for travelers. Your total is 5,000 zeny. ";
-			next;
-			switch (select("Pay with Splendide Coin:Pay with Zeny:Forget it")) {
-				case 1:
-					if (!countitem(6081)) {
-						mes "[Receptionist}";
-						mes "It seems like you don't have enough coins. Would you check your account again, please?";
-						close;
-					}
-					mes "[Receptionist}";
-					mes "Make yourself at home~";
-					close2;
-					delitem 6081,1; //6081
-					percentheal 100,100;
-					warp "ecl_in02",167,49;
-					end;
-					
-				case 2:
-					if (Zeny < 5000) {
-						mes "[Receptionist]";
-						mes "Looks like you don't have enough resources to proceed. Do you mind checking your account again?";
-						close;
-					}
-					mes "[Receptionist}";
-					mes "Make yourself at home~";
-					close2;
-					Zeny = Zeny - 5000;
-					percentheal 100,100;
-					warp "ecl_in02",167,49;
-					end;
-				case 3:
-					close;
+			if (Zeny < 5000) {
+				mes "[Receptionist]";
+				mes "Looks like you don't have enough resources to proceed. Do you mind checking your account again?";
+				close;
 			}
+			mes "[Receptionist}";
+			mes "Make yourself at home~";
+			close2;
+			Zeny = Zeny - 5000;
+			percentheal 100,100;
+			warp "ecl_in02",167,49;
+			end;
 		case 3:
 			close;
+		}
+	case 3:
+		close;
 	}
 }
 
@@ -104,5 +103,4 @@ ecl_in02,135,45,5	script	Injured Laphine	442,{
 	mes "What? No way...please...doctor!! No!!";
 	close;
 }
-
 ecl_in02,137,44,3	duplicate(Injured Laphine)	Doctor Laphine#doctor	441

+ 37 - 42
npc/re/instances/EclageInterior.txt

@@ -1,4 +1,4 @@
-//===== rAthena Script ====================================== 
+//===== rAthena Script ======================================= 
 //= Eclage Instance Script
 //===== By: ================================================== 
 //= Dastgir
@@ -7,6 +7,7 @@
 //===== Compatible With: ===================================== 
 //= rAthena Project
 //===== Description: ========================================= 
+//= [Official Conversion]
 //= Eclage Interior Instance
 //===== Additional Comments: ================================= 
 //= 1.0 Converted from the official Aegis script. [Dastgir]
@@ -16,7 +17,7 @@
 ecl_hub01,132,12,3	script	Chief of Staff#tl02	435,{
 	.@party_id = getcharid(1);
 	.@md_name$ = "Eclage Interior";
-	
+
 	if (.@party_id == 0 || getpartyleader(.@party_id,2) != getcharid(0)){
 		mes "-! Warning !-";
 		mes "This current quest will be held at Memorial dungeon.";
@@ -29,23 +30,22 @@ ecl_hub01,132,12,3	script	Chief of Staff#tl02	435,{
 		mes "If you favor Mayor, you should be cautious here.";
 		next;
 		switch (select("Enter it.:Forget it.")) {
-			case 1:
-				if (instance_create(.@md_name$) < 0) {
-					mes "[Shenime]";
-					mes "There are some soldiers dispatched by Mayor not too long ago.";
-					mes "I should sure hope that you aren't the disturbance they're looking for, right?";
-					close;
-				}
-				ecl_interior_time = gettimetick(2)+20*60;
-				mes "[Shenime]";
-				mes "Given the tight internal security, you should prepare yourself.";
-				mes "Wait here for a minute.";
-				close;
-				
-			case 2:
+		case 1:
+			if (instance_create(.@md_name$) < 0) {
 				mes "[Shenime]";
-				mes "It's not an easy task.";
+				mes "There are some soldiers dispatched by Mayor not too long ago.";
+				mes "I should sure hope that you aren't the disturbance they're looking for, right?";
 				close;
+			}
+			ecl_interior_time = gettimetick(2) + 20 * 60;
+			mes "[Shenime]";
+			mes "Given the tight internal security, you should prepare yourself.";
+			mes "Wait here for a minute.";
+			close;
+		case 2:
+			mes "[Shenime]";
+			mes "It's not an easy task.";
+			close;
 		}
 	}
 	mes "[High-level Laphine's]";
@@ -74,17 +74,17 @@ ecl_hub01,130,15,0	script	It is closed shut.	844,{
 				mes "It is pretty difficult to guide an outsider like you.";
 				close;
 			}
-			switch ( instance_enter(.@md_name$) ) {
-				case 3:
-					mes "An unknown error has occurred.";
-					close;
-				case 2:
-					mes "It is closed shut.";
-					close;
-				case 0:
-					mapannounce "ecl_hub01",getpartyname(.@party_id) + " Party leader " + strcharinfo(0) + " is entering " + .@md_name$,bc_map,"0x00ff99";
-					end;
-				default:
+			switch (instance_enter(.@md_name$)) {
+			case 3:
+				mes "An unknown error has occurred.";
+				close;
+			case 2:
+				mes "It is closed shut.";
+				close;
+			case 0:
+				mapannounce "ecl_hub01",getpartyname(.@party_id) + " Party leader " + strcharinfo(0) + " is entering " + .@md_name$,bc_map,"0x00ff99";
+				end;
+			default:
 			}
 		} else
 			close;
@@ -95,7 +95,6 @@ ecl_hub01,130,15,0	script	It is closed shut.	844,{
 	close;
 }
 
-
 1@ecl,58,69,3	script	Shenime#ecl01	435,{
 	mes "[Shenime]";
 	mes "Oh, what's going on here?";
@@ -131,7 +130,6 @@ OnEnable:
 1@ecl,51,64,1	script	Suspicious Creature#1	2375,{
 	end;
 }
-
 1@ecl,43,67,3	duplicate(Suspicious Creature#1)	Suspicious Creature#2	2375,0,0
 1@ecl,55,80,3	duplicate(Suspicious Creature#1)	Suspicious Creature#3	2375,0,0
 1@ecl,60,75,3	duplicate(Suspicious Creature#1)	Suspicious Creature#4	2375,0,0
@@ -142,18 +140,18 @@ OnInstanceInit:
 	hideonnpc instance_npcname(strnpcinfo(0));
 	end;
 }
-
 1@ecl,48,86,3	duplicate(Suspicious Creature#5)	Suspicious Creature#6	2376,0,0
 1@ecl,58,82,3	duplicate(Suspicious Creature#5)	Suspicious Creature#7	2376,0,0
 1@ecl,56,88,3	duplicate(Suspicious Creature#5)	Suspicious Creature#8	2376,0,0
 
 1@ecl,53,83,0	script	#sndmaster	HIDDEN_WARP_NPC,10,10,{
 	end;
-	
+
 OnInstanceInit:
+	'mob_summoned = 0;
 	disablenpc instance_npcname(strnpcinfo(0));
 	end;
-	
+
 OnEnable:
 	sleep 1000;
     mapannounce instance_mapname("1@ecl"),"Warning: Abnormal occurrence in the lighting room. Abnormal occurrence in the lighting room.",bc_map,"0xffff00"; //FW_NORMAL 12 0 0
@@ -166,16 +164,16 @@ OnEnable:
 	sleep 3000;
 	hideonnpc instance_npcname("#sndmaster");
 	end;
-	
+
 OnMyMobDead:
 	if (mobcount(instance_mapname("1@ecl"),instance_npcname("#sndmaster")+"::OnMyMobDead") == 0) {
 		donpcevent instance_npcname("Shenime#ecl01")+"::OnEnable";
 		mapannounce instance_mapname("1@ecl"),"Shenime: Good, I got here just in time.",bc_map,"0xffff00"; //FW_NORMAL 12 0 0
 	}
 	end;
-	
+
 OnTouch:
-	if ( 'mob_summoned > 1 ) end;
+	if ('mob_summoned > 1) end;
     mes "Upon eliminating the intruders near the Orb, another strange-looking creatures appeared.";
     next;
     mes "We couldn't communicate with them either, and one of them seemed furious after looking around and finding out that its fellows are defeated.";
@@ -212,15 +210,12 @@ OnTouch:
 	monster .@eclmap$,50,60,"Subordinate of the King of Demons",2376,1,.@sndmaster$+"::OnMyMobDead";
 	'mob_summoned = 2;
     end;
-OnInstanceInit:
-	'mob_summoned = 0;
-	end;
 }
 
 1@ecl,57,65,0	script	#event	139,5,5,{
 	end;
 OnTouch:
-	if ( 'mob_summoned > 0 ) end;
+	if ('mob_summoned > 0) end;
 	.@eclmap$ = instance_mapname("1@ecl");
 	.@eventname$ = instance_npcname("#event");
 	mes "An empty room with nothing inside.";
@@ -252,7 +247,7 @@ OnTouch:
 	monster .@eclmap$,60,75,"Suspicious Creature",2375,1,.@eventname$+"::OnMyMobDead";
 	'mob_summoned = 1;
 	end;
-	
+
 OnMyMobDead:
 	if (mobcount(instance_mapname("1@ecl"),instance_npcname("#event")+"::OnMyMobDead") == 0) {
 		enablenpc instance_npcname("#sndmaster");
@@ -475,4 +470,4 @@ OnMyMobDead:
 	warp "ecl_in03",57,76;
 	instance_destroy;
 	end;
-}
+}

+ 134 - 135
npc/re/merchants/coin_exchange.txt

@@ -1,4 +1,4 @@
-//===== rAthena Script ======================================
+//===== rAthena Script =======================================
 //= Coin Merchants
 //===== By: ==================================================
 //= rAthena Dev Team
@@ -846,42 +846,42 @@ ecl_in01,66,95,3	script	Armor Merchant Naphara#e	436,{
 	.@choice = select("Str Glove:Int Glove:Agi Glove:Vit Glove:Dex Glove:Luk Glove") -1;
 	mes "[Armor Merchant]";
 	switch(.@choice) {
-		case 0: // Str Glove
-			mes "^3131FFStr Glove^000000";
-			mes "^3131FFMHP + 100, MSP + 20^000000";
-			mes "^3131FFATK+1 increases for every STR+10^000000";
-			mes "^3131FFATK +1% added above STR 110^000000";
-			break;
-		case 1:
-			mes "^3131FFInt Glove^000000";
-			mes "^3131FFMHP + 100, MSP + 20^000000";
-			mes "^3131FFMATK+1 increases for every INT+10^000000";
-			mes "^3131FFMATK +1% added above INT 110^000000";
-			break;
-		case 2:
-			mes "^3131FFAgi Glove^000000";
-			mes "^3131FFMHP + 100, MSP + 20^000000";
-			mes "^3131FFFLEE+1 increases for every AGI+10^000000";
-			mes "^3131FFComplete Flee +1 added above AGI 110^000000";
-			break;
-		case 3:
-			mes "^3131FFVit Glove^000000";
-			mes "^3131FFMHP + 100, MSP + 20^000000";
-			mes "^3131FFMHP+50 for every VIT+10^000000";
-			mes "^3131FFMHP+1% added above VIT 110^000000";
-			break;
-		case 4:
-			mes "^3131FFDex Glove^000000";
-			mes "^3131FFMHP + 100, MSP + 20^000000";
-			mes "^3131FFHIT+1 increases for every DEX+10^000000";
-			mes "^3131FFRanged attack power +1% added above DEX 110^000000";
-			break;
-		case 5:
-			mes "^3131FFLuk Glove^000000";
-			mes "^3131FFMHP + 100, MSP + 20^000000";
-			mes "^3131FFCRI+1 increases for every LUK+10^000000";
-			mes "^3131FFCritical damage +1% added above LUK 110^000000";
-			break;
+	case 0: // Str Glove
+		mes "^3131FFStr Glove^000000";
+		mes "^3131FFMHP + 100, MSP + 20^000000";
+		mes "^3131FFATK+1 increases for every STR+10^000000";
+		mes "^3131FFATK +1% added above STR 110^000000";
+		break;
+	case 1:
+		mes "^3131FFInt Glove^000000";
+		mes "^3131FFMHP + 100, MSP + 20^000000";
+		mes "^3131FFMATK+1 increases for every INT+10^000000";
+		mes "^3131FFMATK +1% added above INT 110^000000";
+		break;
+	case 2:
+		mes "^3131FFAgi Glove^000000";
+		mes "^3131FFMHP + 100, MSP + 20^000000";
+		mes "^3131FFFLEE+1 increases for every AGI+10^000000";
+		mes "^3131FFComplete Flee +1 added above AGI 110^000000";
+		break;
+	case 3:
+		mes "^3131FFVit Glove^000000";
+		mes "^3131FFMHP + 100, MSP + 20^000000";
+		mes "^3131FFMHP+50 for every VIT+10^000000";
+		mes "^3131FFMHP+1% added above VIT 110^000000";
+		break;
+	case 4:
+		mes "^3131FFDex Glove^000000";
+		mes "^3131FFMHP + 100, MSP + 20^000000";
+		mes "^3131FFHIT+1 increases for every DEX+10^000000";
+		mes "^3131FFRanged attack power +1% added above DEX 110^000000";
+		break;
+	case 5:
+		mes "^3131FFLuk Glove^000000";
+		mes "^3131FFMHP + 100, MSP + 20^000000";
+		mes "^3131FFCRI+1 increases for every LUK+10^000000";
+		mes "^3131FFCritical damage +1% added above LUK 110^000000";
+		break;
 	}
 	mes "^3131FFRequired Level: 100^000000";
 	mes "^3131FFSlot: 0^000000";
@@ -898,7 +898,7 @@ ecl_in01,66,95,3	script	Armor Merchant Naphara#e	436,{
 			mes "It seems like you don't have enough coins.";
 			close;
 		}
-		delitem 6081,10; //6081
+		delitem 6081,10; //Splendide_Coin
 		getitem (.@choice+2917),1;
 		mes "[Armor Merchant]";
 		mes "Great, it's yours. Thank you.";
@@ -912,7 +912,7 @@ ecl_in01,64,97,5	script	Slot Expert Nattuer#ecl	436,{
 	mes "I am Slot Expert Nattuer.";
 	mes "If you bring me an item from my little brother Naphara along with 5 Splendide Coins, I will open up one Slot for you.";
 	next;
-	if (select("Activate a Slot.:Forget it.")==2){
+	if (select("Activate a Slot.:Forget it.") == 2){
 		close;
 	}
 	mes "[Slot Expert]";
@@ -921,7 +921,7 @@ ecl_in01,64,97,5	script	Slot Expert Nattuer#ecl	436,{
 	mes "[Slot Expert]";
 	mes "Of course, if your heart were as big as that flower-filled land, you wouldn't mind. Right? Should I go for it?";
 	next;
-	if (select("Continue.:Forget it.")==2) {
+	if (select("Continue.:Forget it.") == 2) {
 		close;
 	}
 	mes "[Slot Expert]";
@@ -949,9 +949,9 @@ ecl_in01,64,97,5	script	Slot Expert Nattuer#ecl	436,{
 	}
 	progressbar "0xFFFF00",3;
 	mes "[Slot Expert]";
-	delitem 6081,5; //6081
+	delitem 6081,5; //Splendide_Coin
 	.@luckyday = rand(1,99);
-	if ( .@luckyday%20 ){
+	if (.@luckyday % 20){
 		emotion e_dots;
 		delitem .@choice,1;
 		mes "Shoot, I'm sorry. It failed.";
@@ -979,40 +979,40 @@ ecl_in01,33,98,5	script	Armor Merchant Naphara#a	443,{ // Armor Merchant Naphara
 	mes "Welcome, this is Plafina's Herb Store where only the freshest herbs are provided~!";
 	next;
 	.@item = select("Snow Flip:Peony Mommy:Slapping Herb:Yggdrasil Dust:End conversation")-1;
-	if (.@item==4){
+	if (.@item == 4){
 		mes "[Herb Merchant]";
 		mes "Come back anytime.";
 		close;
 	}
 	mes "[Herb Merchant]";
 	switch (.@item){
-		case 0:
-			mes "Snow Flip has special effects on ^3131FFBurning, Bleeding, Deep Sleep, Sleep^000000.";
-			break;
-		case 1:
-			mes "Peony Mamy has special effects on ^3131FFFrost, Frozen, Freezing^000000";
-			break;
-		case 2:
-			mes "Slapping Herb has special effects on ^3131FFStun, Fear, Chaos, Hallucination^000000";
-			break;
-		case 3:
-			mes "Yggdrasil Dust has special effects on ^3131FFBlind, Curse, Decrease Agility, Reverse Orcish^000000.";
-			break;
+	case 0:
+		mes "Snow Flip has special effects on ^3131FFBurning, Bleeding, Deep Sleep, Sleep^000000.";
+		break;
+	case 1:
+		mes "Peony Mamy has special effects on ^3131FFFrost, Frozen, Freezing^000000";
+		break;
+	case 2:
+		mes "Slapping Herb has special effects on ^3131FFStun, Fear, Chaos, Hallucination^000000";
+		break;
+	case 3:
+		mes "Yggdrasil Dust has special effects on ^3131FFBlind, Curse, Decrease Agility, Reverse Orcish^000000.";
+		break;
 	}
 	mes "Requires 5 seconds between uses.";
 	mes "It costs "+ .cost[.@item] +" Splendide Coins for each.";
 	next;
 	.@buy = select("Buy 1.:Buy 10.:Don't buy.");
-	if (.@buy==3){
+	if (.@buy == 3){
 		close;
 	}
-	if (.@buy==2){
+	if (.@buy == 2){
 		.@buy = 10;
 	}
 	mes "[Herb Merchant]";
 	mes "Would you like to buy "+ .@buy +" "+ getitemname(.items[.@item]) +"?";
 	next;
-	if (select("Buy.:Don't buy.")==2){
+	if (select("Buy.:Don't buy.") == 2){
 		close;
 	}
 	if (countitem(6081) < (.cost[.@item]*.@buy) ) {
@@ -1022,8 +1022,8 @@ ecl_in01,33,98,5	script	Armor Merchant Naphara#a	443,{ // Armor Merchant Naphara
 	}
 	mes "[Herb Merchant]";
 	mes "Thank you for your business.";
-	delitem 6081,.cost[.@item]*.@buy; //6081
-	getitem 12812,.@buy;
+	delitem 6081,.cost[.@item]*.@buy; //Splendide_Coin
+	getitem .items[.@item],.@buy;
 	close;
 	
 OnInit:
@@ -1033,7 +1033,7 @@ OnInit:
 }
 
 ecl_in01,67,39,4	script	Replication Expert Paltu	445,{
-	if (checkweight(1301,3)==0) {
+	if (checkweight(1301,3) == 0) {
 		mes "You have too many items to continue.";
 		close;
 	}
@@ -1042,72 +1042,71 @@ ecl_in01,67,39,4	script	Replication Expert Paltu	445,{
 	mes "Woohoo- Greetings. What are you looking for? Lots of goods here.";
 	next;
 	switch (select("No thanks.:Replication?:I know you got lots up your sleeve!")) {
-		case 1:
-			emotion e_an;
+	case 1:
+		emotion e_an;
+		mes "[Paltu]";
+		mes "Really? Hmm?";
+		close;
+	case 2:
+		mes "[Paltu]";
+		mes "One can say that there's no one better in Eclage than I at utilizing magic resistance.";
+		next;
+		mes "[Paltu]";
+		mes "I'll give you a good price whatever it is. Just trust me.";
+		next;
+		select("Could you do something for me?");
+		emotion e_no1;
+		mes "[Paltu]";
+		mes "Hey, I like your attitude.";
+		next;
+		mes "[Paltu]";
+		mes "Ah- you know the hat you're wearing?";
+		next;
+		emotion e_what;
+		mes "[Paltu]";
+		mes "Don't you have any of those hats lying around in storage that are solid but too ugly to wear? You do, right?";
+		next;
+		select(".........");
+		emotion e_dots,1;
+		emotion e_heh;
+		mes "[Paltu]";
+		mes "See! I knew it. I knew it from the first minute.";
+		next;
+		mes "[Paltu]";
+		mes "If you bring me ^ff0000 50 Splendide Coins and the ingredients^000000, I'll make you a new hat in the same shape but worn as a ^ff0000Costume^000000.";
+		next;
+		mes "[Paltu]";
+		mes "Hmm, what was it...?";
+		mes "I think you adventurers call them ^0571B0Costumes^000000? right?";
+		next;
+		select("Yes~ What do you need?");
+		mes "[Paltu]";
+		mes "I need 1 ^0571B0hat to replicate^000000 and";
+		mes "I need ^E1281E 4 Crystal Mirrors^000000 for magic resistance, ^E1281E 1 Fairy Magic Powder^000000 as the catalyst, and ^E1281E Emerald, Ruby, Sapphire, Topaz, and Zircon, 10 of each^000000, to be used for amplifying the magic power.";
+		next;
+		emotion e_no;
+		mes "[Paltu]";
+		mes "There's quite a lot of ingredients, right? Well, I can't do anything about that. Dealing with magic power is not a joke.";
+		next;
+		select("Which hats can be replicated?");
+		mes "[Paltu]";
+		mes "Oh! You're pretty sharp!";
+		mes "Almost forgot the most important thing.";
+		next;
+		mes "[Paltu]";
+		mes "Hats that I can replicate are:";
+		mes "^0571B0Frog Hat, Romantic Flower, Magestic Goat, Blush, Valkyrie Helm, Deviruchi Hat, Assassin Mask, Elven Ears, Hahoe Mask, and Boys Cap^000000 a total of 10 types.";
+		next;
+		mes "[Paltu]";
+		mes "What do you think? I'll make it happen as long as I have the ingredients and the compensation.";
+		next;
+		if (select("I'll do it later.:Show me what you got!") == 1) {
+			emotion e_dots;
 			mes "[Paltu]";
-			mes "Really? Hmm?";
+			mes "What? Are you kidding me? Please tell me you are!";
 			close;
-			
-		case 2:
-			mes "[Paltu]";
-			mes "One can say that there's no one better in Eclage than I at utilizing magic resistance.";
-			next;
-			mes "[Paltu]";
-			mes "I'll give you a good price whatever it is. Just trust me.";
-			next;
-			select("Could you do something for me?");
-			emotion e_no1;
-			mes "[Paltu]";
-			mes "Hey, I like your attitude.";
-			next;
-			mes "[Paltu]";
-			mes "Ah- you know the hat you're wearing?";
-			next;
-			emotion e_what;
-			mes "[Paltu]";
-			mes "Don't you have any of those hats lying around in storage that are solid but too ugly to wear? You do, right?";
-			next;
-			select(".........");
-			emotion e_dots,1;
-			emotion e_heh;
-			mes "[Paltu]";
-			mes "See! I knew it. I knew it from the first minute.";
-			next;
-			mes "[Paltu]";
-			mes "If you bring me ^ff0000 50 Splendide Coins and the ingredients^000000, I'll make you a new hat in the same shape but worn as a ^ff0000Costume^000000.";
-			next;
-			mes "[Paltu]";
-			mes "Hmm, what was it...?";
-			mes "I think you adventurers call them ^0571B0Costumes^000000? right?";
-			next;
-			select("Yes~ What do you need?");
-			mes "[Paltu]";
-			mes "I need 1 ^0571B0hat to replicate^000000 and";
-			mes "I need ^E1281E 4 Crystal Mirrors^000000 for magic resistance, ^E1281E 1 Fairy Magic Powder^000000 as the catalyst, and ^E1281E Emerald, Ruby, Sapphire, Topaz, and Zircon, 10 of each^000000, to be used for amplifying the magic power.";
-			next;
-			emotion e_no;
-			mes "[Paltu]";
-			mes "There's quite a lot of ingredients, right? Well, I can't do anything about that. Dealing with magic power is not a joke.";
-			next;
-			select("Which hats can be replicated?");
-			mes "[Paltu]";
-			mes "Oh! You're pretty sharp!";
-			mes "Almost forgot the most important thing.";
-			next;
-			mes "[Paltu]";
-			mes "Hats that I can replicate are:";
-			mes "^0571B0Frog Hat, Romantic Flower, Magestic Goat, Blush, Valkyrie Helm, Deviruchi Hat, Assassin Mask, Elven Ears, Hahoe Mask, and Boys Cap^000000 a total of 10 types.";
-			next;
-			mes "[Paltu]";
-			mes "What do you think? I'll make it happen as long as I have the ingredients and the compensation.";
-			next;
-			if (select("I'll do it later.:Show me what you got!") == 1) {
-				emotion e_dots;
-				mes "[Paltu]";
-				mes "What? Are you kidding me? Please tell me you are!";
-				close;
-			}
-			break;
+		}
+		break;
 	}
 	disable_items;
 	emotion e_lv2;
@@ -1171,7 +1170,7 @@ ecl_in01,67,39,4	script	Replication Expert Paltu	445,{
 	mes "[Paltu]";
 	mes "So any problems with that?";
 	next;
-	if (select("Let me go check.:Start the replication process.")==1) {
+	if (select("Let me go check.:Start the replication process.") == 1) {
 		mes "[Paltu]";
 		mes "Yeah, please make sure!";
 		close;
@@ -1199,18 +1198,18 @@ ecl_in01,67,39,4	script	Replication Expert Paltu	445,{
 	progressbar "0xFFFF00",1;
 	specialeffect EF_MVP;
 	next;
-	delitem 6081,50;
-	delitem 747,4;
-	delitem 6395,1;
-	delitem 721,10;
-	delitem 723,10;
-	delitem 726,10;
-	delitem 728,10;
-	delitem 729,10;
+	delitem 6081,50; //Splendide_Coin
+	delitem 747,4; //Crystal_Mirror
+	delitem 6395,1; //Angel_Magic_Power
+	delitem 721,10; //Azure_Jewel
+	delitem 723,10; //Cardinal_Jewel
+	delitem 726,10; //Blue_Jewel
+	delitem 728,10; //Golden_Jewel
+	delitem 729,10; //Bluish_Green_Jewel
 	delitem .@items[.@i],1;
 	getitem .@costumes[.@i],1;
 	mes "[Paltu]";
 	mes "Good. This is a satisfying result.";
 	mes "I'll do even a better job next time. Please tell others about my work. Have a good day~";
 	close;
-}
+}

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 350 - 353
npc/re/quests/quests_eclage.txt


+ 7 - 11
npc/re/warps/cities/eclage.txt

@@ -1,4 +1,4 @@
-//===== rAthena Script ======================================
+//===== rAthena Script =======================================
 //= Eclage Warp Script
 //===== By: ==================================================
 //= Chilly
@@ -31,26 +31,22 @@ ecl_in02,157,68,0	warp	in02-3_in02-2	1,1,ecl_in02,83,18
 ecl_in01,84,68,0	script	in01e_hub2-1	45,1,1,{
 	end;
 OnTouch:
-	if (ep14_2_mylord == 29) {
+	if (ep14_2_mylord == 29)
 		warp "ecl_hub01",106,31;
-	}
-	else {
+	else
 		warp "ecl_hub01",107,107;
-	}
-end;
+	end;
 }
 ecl_hub01,107,110,0	warp	hub2-1_in01e	1,1,ecl_in01,82,68
 ecl_hub01,127,95,0	warp	hub2-2_hub3-1	1,1,ecl_hub01,18,32
 ecl_hub01,18,34,0	script	hub3-1_hub2-2	45,1,1,{
 	end;
 OnTouch:
-	if (ep14_2_mylord == 29) {
+	if (ep14_2_mylord == 29)
 		warp "ecl_hub01",135,14;
-	}
-	else {
+	else
 		warp "ecl_hub01",125,94;
-	}
-end;
+	end;
 }
 ecl_hub01,40,14,0	warp	hub3-2_in03	1,1,ecl_in03,144,17
 ecl_in03,144,14,0	warp	in03_hub3-2	1,1,ecl_hub01,40,11

+ 1 - 1
npc/re/warps/dungeons/ecl_dun.txt

@@ -1,4 +1,4 @@
-//===== rAthena Script ======================================
+//===== rAthena Script =======================================
 //= Eclage Dungeon Warp Script
 //===== By: ==================================================
 //= Chilly

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác