* Updated 2006 headgear quests to semi-official dialog.

* Various updates to the various guild Castle scripts.
- Added Guild Master Room protection. Further security so only the master of the current castle can enter the treasure room.
- Updated Guild Castle Flags  again. Updated remaining dialogs to official.
- Updated a couple announces for when the Emperium breaks. Both are now up to par with iRO.
- Moved nguild to the events folder and commented it out, as it was a kRO event that was used twice. Updated .confs to reflect this change.
* Added the first class skill resetter into Prontera. She resets players under base level 40 who are first or expanded class.


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

npc/Changelog.txt

@@ -1,5 +1,13 @@
 Date		Added
 ======
+2007/06/03
+	* Rev. 10669 Updated 2006 headgear quests to semi-official dialog. [L0ne_W0lf]
+	* Various updates to the various guild Castle scripts. [L0ne_W0lf[
+	- Added Guild Master Room protection. Further security so only the master of the current castle can enter the treasure room.
+	- Updated Guild Castle Flags  again. Updated remaining dialogs to official.
+	- Updated a couple announces for when the Emperium breaks. Both are now up to par with iRO.
+	- Moved nguild to the events folder and commented it out, as it was a kRO event that was used twice. Updated .confs to reflect this change.
+	* Added the first class skill resetter into Prontera. She resets players under base level 40 who are first or expanded class. [L0ne_W0lf[
 2007/06/01
 	* Rev. 10666 Updated Knight Peco, Crusader Peco, and Falcon breeders to Aegis 10.3 standards. [L0ne_W0lf]
 	* Rev. 10664 Removed Ktullanux spawn, since the quest is implemented now. [L0ne_W0lf]

npc/guild/aldeg/aldeg_treas.txt

@@ -40,6 +40,13 @@ aldeg_cas01,123,223,0	script	Switch#TresA01	111,{
 	end;
 }
 
+// Treasure Room Protection ------------------------------------------------
+aldeg_cas01,118,223,0	script	ban_warp#11	-1,8,8,{
+OnTouch:
+	callfunc "F_TreasProtect", "aldeg_cas01", "aldebaran",143,112;
+	end;
+}
+
 //<================================ Castle 2 ================================>\\
 
 // Treasure Spawn ----------------------------
@@ -63,6 +70,15 @@ OnDied:
 // Treasure Room Switch ----------------------
 aldeg_cas02,139,235,0	script	Switch#TresA02	111,{
 	callfunc "F_GldTreasSw", "aldeg_cas02",78,75;
+	end;
+}
+
+
+// Treasure Room Protection ------------------------------------------------
+aldeg_cas02,135,230,0	script	ban_warp#12	-1,8,8,{
+OnTouch:
+	callfunc "F_TreasProtect", "aldeg_cas02", "aldebaran",143,112;
+	end;
 }
 
 //<================================ Castle 3 ================================>\\
@@ -88,6 +104,14 @@ OnDied:
 // Treasure Room Switch -----------------------
 aldeg_cas03,229,267,0	script	Switch#TresA03	111,{
 	callfunc "F_GldTreasSw", "aldeg_cas03",110,119;
+	end;
+}
+
+// Treasure Room Protection ------------------------------------------------
+aldeg_cas03,225,269,0	script	ban_warp#13	-1,8,8,{
+OnTouch:
+	callfunc "F_TreasProtect", "aldeg_cas03", "aldebaran",143,112;
+	end;
 }
 
 //<================================ Castle 4 ================================>\\
@@ -113,6 +137,14 @@ OnDied:
 // Treasure Room Switch -------------------------
 aldeg_cas04,83,17,0	script	Switch#TresA04	111,{
 	callfunc "F_GldTreasSw", "aldeg_cas04",67,117;
+	end;
+}
+
+// Treasure Room Protection ------------------------------------------------
+aldeg_cas04,84,13,0	script	ban_warp#14	-1,8,8,{
+OnTouch:
+	callfunc "F_TreasProtect", "aldeg_cas04", "aldebaran",143,112;
+	end;
 }
 
 //<================================ Castle 5 ================================>\\
@@ -138,4 +170,13 @@ OnDied:
 // Treasure Room Switch ---------------------------------
 aldeg_cas05,64,8,0	script	Switch#TresA05	111,{
 	callfunc "F_GldTreasSw", "aldeg_cas05",51,179;
+	end;
+}
+
+
+// Treasure Room Protection ------------------------------------------------
+aldeg_cas05,62,12,0	script	ban_warp#15	-1,8,8,{
+OnTouch:
+	callfunc "F_TreasProtect", "aldeg_cas05", "aldebaran",143,112;
+	end;
 }

npc/guild/gefg/gefg_treas.txt

@@ -40,6 +40,12 @@ gefg_cas01,152,117,0	script	Switch#TresG01	111,{
 	end;
 }
 
+// Treasure Room Protection ------------------------------------------------
+gefg_cas01,154,112,0	script	ban_warp#16	-1,6,6,{
+OnTouch:
+	callfunc "F_TreasProtect", "gefg_cas01", "geffen",120,38;
+	end;
+}
 
 //<================================ Castle 2 ================================>\\
 
@@ -66,6 +72,12 @@ gefg_cas02,145,115,0	script	Switch#TresG02	111,{
 	callfunc "F_GldTreasSw", "gefg_cas02",12,67;
 }
 
+// Treasure Room Protection ------------------------------------------------
+gefg_cas02,140,116,0	script	ban_warp#17	-1,6,6,{
+OnTouch:
+	callfunc "F_TreasProtect", "gefg_cas02", "geffen",120,38;
+	end;
+}
 
 //<================================= Castle 3 ===============================>\\
 
@@ -93,6 +105,12 @@ gefg_cas03,275,289,0	script	Switch#TresG03	111,{
 	end;
 }
 
+// Treasure Room Protection ------------------------------------------------
+gefg_cas03,271,290,0	script	ban_warp#18	-1,6,6,{
+OnTouch:
+	callfunc "F_TreasProtect", "gefg_cas03", "geffen",120,38;
+	end;
+}
 
 //<=============================== Castle 4 ================================>\\
 
@@ -120,6 +138,12 @@ gefg_cas04,117,123,0	script	Switch#TresG04	111,{
 	end;
 }
 
+// Treasure Room Protection ------------------------------------------------
+gefg_cas04,116,119,0	script	ban_warp#19	-1,6,6,{
+OnTouch:
+	callfunc "F_TreasProtect", "gefg_cas04", "geffen",120,38;
+	end;
+}
 
 //<================================ Castle 5 ================================>\\
 
@@ -146,3 +170,10 @@ gefg_cas05,149,107,0	script	Switch#TresG05	111,{
 	callfunc "F_GldTreasSw", "gefg_cas05",70,53;
 	close;
 }
+
+// Treasure Room Protection ------------------------------------------------
+gefg_cas05,144,110,0	script	ban_warp#20	-1,6,6,{
+OnTouch:
+	callfunc "F_TreasProtect", "gefg_cas05", "geffen",120,38;
+	end;
+}

npc/guild/gldfunc_ev_agit.txt

@@ -4,7 +4,7 @@
 //= jAthena - kalen (1.0)
 //= 1.1 by Akaru, ho|yAnge|X, and Valaris
 //===== Current Version: =====================================
-//= 1.3a
+//= 1.4
 //===== Compatible With: =====================================
 //= eAthena 0.1+; RO Episode 4+
 //===== Description: =========================================
@@ -26,6 +26,7 @@
 //= v1.2a: Added OnAgitEnd function.[kobra_k88]
 //= 1.3 Added code for abandoning captured castles on /breakguild [Lupus]
 //= 1.3a fixed Defence / Economy underflow [Lupus] thanks2 kyoki
+//= 1.4 updated a couple mapannounces in OnAgitBreak. [L0ne_W0lf]
 //============================================================
 
 
@@ -138,8 +139,8 @@ function	script	F_AgitBreak	{
 	SetCastleData getarg(0),3, @Defence;
 
 	SetCastleData getarg(0),1, @GID;
-	MapAnnounce getarg(0),"The emperium has been destroyed.",17;
+	MapAnnounce getarg(0),"The emperium has been destroyed.",bc_map,0x00CCFF;
-	Announce "Guild Base [" + GetCastleName(getarg(0)) + "] has been taken by the [" + GetGuildName(@GID) + "] guild.",0;
+	Announce "The [" + GetCastleName(getarg(0)) + "] castle has been conquered by the [" + GetGuildName(@GID) + "] guild.",bc_map;
 	GetCastleData getarg(0),0,"::OnRecvCastle"+getarg(1);
 
 	disablenpc "Kafra Service#"+getarg(1);

npc/guild/gldfunc_flag.txt

@@ -4,7 +4,7 @@
 //= jAthena - kalen (1.0)
 //= 1.1 by Akaru, ho|yAnge|X, and Valaris
 //===== Current Version: =====================================
-//= 1.4
+//= 1.5
 //===== Compatible With: =====================================
 //= eAthena 0.1+; RO Episode 4+
 //===== Description: =========================================
@@ -23,6 +23,7 @@
 //= v1.3: Can now only flag in from outside the castle [Kayla]
 //= v1.3a: Implemented k3dt's exploit fix [Vicious]
 //= v1.4: By default town flags are set to no longer show text. [L0ne_W0lf]
+//= v1.5: Updated remaining dialog to iRO standards. [L0ne_W0lf]
 //============================================================
 
 function	script	F_Flags	{
@@ -32,11 +33,17 @@ function	script	F_Flags	{
 	set @GID, GetCastleData(getarg(1),1);
 	if (@GID != 0) goto L_Startg;
 
-	mes "[ Edict of the Divine Rune Midgard Kingdom of ]";
+	mes " [ Edict of the Divine Rune Midgard Kingdom ]";
 	mes " ";
-	mes "1. Honoring the ordinance of the Divine Rune Midgard Kingdom of " + getarg(0) + ", this guild base has not been taken by any guild yet";
+	mes "1. Follow the ordinance of The Divine Rune Midgard Kingdom, ";
+	mes "We declare that";
+	mes "there is no formal master of this castle.";
 	mes " ";
-	mes "2. In order to take this guild base, you must defeat all the guardians that are protecting the guild base and eliminate the Emperium.";
+	mes "2. To the one who can ";
+	mes "overcome all trials";
+	mes "and destroy the Emperium,";
+	mes "the king will endow the one with";
+	mes "ownership of this castle.";
 	return;
 L_Startg:
 	if ((getcharid(2) == @GID) && (getarg(4) == 1)) goto L_Startg2;
@@ -45,18 +52,18 @@ L_Startg:
 	mes "1. Following the ordinance of the";
 	mes "Divine Rune Midgard Kingdom,";
 	mes "we approve that this place is in";
-	mes "private possession of ^ff0000" + GetGuildName(@GID) + "^000000 Guild.";
+	mes "the private possession of ^ff0000" + GetGuildName(@GID) + "^000000 Guild.";
 	mes " ";
 	mes "2. The guild Master of ^ff0000"+ GetGuildName(@GID) + "^000000 Guild is";
-	mes "^0000FF" + GetGuildMaster(@GID) + "^000000";
+	mes "^FF0000" + GetGuildMaster(@GID) + "^000000";
 	mes "If there is anyone who objects to this,";
 	mes " prove your strength and honor with a steel blade in your hand.";
 	return;
 L_Startg2:
-	mes "[ Ringing Voice ]";
+	mes "Brave ones...";
-	mes "Brave one... would you return to your honorable be?";
+	mes "Do you wish to return to your honorable place?";
 	next;
-	menu "Return.",M_Enter,"Cancel.",-;
+	menu "Return to the guild castle.",M_Enter,"Quit.",-;
 	return;
 
 	M_Enter:

npc/guild/gldfunc_treasure.txt

@@ -3,12 +3,13 @@
 //===== By: ==================================================
 //= holyAngelX (1.0) Akaru and ho|yAnge|X (1.1)
 //===== Current Version: =====================================
-//= 1.8
+//= 1.9
 //===== Compatible With: =====================================
 //= eAthena 1+; RO Episode 4+
 //===== Description: =========================================
 //= F_GldTreas spawns treasure chests used by the guild master.
 //= F_GldTreasSw allows the player to get out of the treasure room.
+//= F_TreasProtect removes non-guild master players from treasure room.
 //==============================================
 //= Break down of arguments used in the F_GldTreas:
 //=   arg(0): name of guild castle
@@ -26,6 +27,12 @@
 //=   arg(0): name of guild castle.
 //=   arg(1): x1 coordinate for warp back to guild castle
 //=   arg(2): y1 coordinate for warp back to guild castle
+//
+//= Break down of arguments used in the F_TreasProtect:
+//=   arg(0): name of guild castle.
+//=   arg(1): name of warp-to city 
+//=   arg(2): x1 coordinate for warp-to city
+//=   arg(3): y1 coordinate for warp-to city
 //===== Additional Comments: =================================
 //= 1.2 Treasure room Spawn, and Treasure room Switch scripts now use these functions.[kobra_k88]
 //= 1.2a Function now returns to script that called it.  Removed TreasureSpawn2.
@@ -38,6 +45,7 @@
 //= 1.6 to Aegis X.2 formula 4..24 Treasure Chests [Lupus]
 //= 1.7 Box Count fix by Zoc. Now it spawns 1st/2nd Treasure Chest 50%/50% [Lupus]
 //= 1.8 Official Treasure Spawn in Novice Castles. Had to add +1 in odd/even formula to leave correct ID of NG Treasure Box 8) [Lupus]
+//= 1.9 Added F_TreasProtect to remove players who are not guild master from treasure room. [L0ne_W0lf]
 //============================================================
 
 
@@ -83,3 +91,11 @@ function	script	F_GldTreasSw	{
 		warp getarg(0),getarg(1),getarg(2);
 		return;
 }
+
+//==============================================================
+//  Treasure Room Protrection
+//===============================================================
+function	script	F_TreasProtect	{
+	set @GID, GetCastleData(getarg(0),1);
+	if (strcharinfo(0) != getguildmaster(@GID)) warp getarg(1),getarg(2),getarg(3);
+}

npc/guild/payg/payg_treas.txt

@@ -39,6 +39,12 @@ payg_cas01,295,8,0	script	Switch#TresPy01	111,{
 	end;
 }
 
+// Treasure Room Protection ------------------------------------------------
+payg_cas01,291,8,0	script	ban_warp#6	-1,6,6,{
+OnTouch:
+	callfunc "F_TreasProtect", "payg_cas01", "payon",100,100;
+	end;
+}
 
 //<================================ Castle 2 ================================>\\
 // Treasure Spawn ----------------------------------------------------------
@@ -64,6 +70,12 @@ payg_cas02,149,148,0	script	Switch#TresPy02	111,{
 	end;
 }
 
+// Treasure Room Protection ------------------------------------------------
+payg_cas02,145,144,0	script	ban_warp#7	-1,6,6,{
+OnTouch:
+	callfunc "F_TreasProtect", "payg_cas02", "payon",100,100;
+	end;
+}
 
 //<================================ Castle 3 ================================>\\
 // Treasure Spawn ----------------------------------------------------------
@@ -89,6 +101,12 @@ payg_cas03,163,167,0	script	Switch#TresPy03	111,{
 	end;
 }
 
+// Treasure Room Protection ------------------------------------------------
+payg_cas03,159,168,0	script	ban_warp#8	-1,6,6,{
+OnTouch:
+	callfunc "F_TreasProtect", "payg_cas03", "payon",100,100;
+	end;
+}
 
 //<================================ Castle 4 ================================>\\
 // Treasure Spawn ----------------------------------------------------------
@@ -114,6 +132,12 @@ payg_cas04,151,47,0	script	Switch#TresPy04	111,{
 	end;
 }
 
+// Treasure Room Protection ------------------------------------------------
+payg_cas04,147,48,0	script	ban_warp#9	-1,6,6,{
+OnTouch:
+	callfunc "F_TreasProtect", "payg_cas04", "payon",100,100;
+	end;
+}
 
 //<================================ Castle 5 ================================>\\
 // Treasure Spawn ----------------------------------------------------------
@@ -138,3 +162,10 @@ payg_cas05,161,136,0	script	Switch#TresPy05	111,{
 	callfunc "F_GldTreasSw", "payg_cas05",277,250;
 	end;
 }
+
+// Treasure Room Protection ------------------------------------------------
+payg_cas05,157,132,0	script	ban_warp#10	-1,6,6,{
+OnTouch:
+	callfunc "F_TreasProtect", "payg_cas05", "payon",100,100;
+	end;
+}

npc/guild/prtg/prtg_treas.txt

@@ -39,6 +39,12 @@ prtg_cas01,15,209,0	script	Switch#TresPt01	111,{
 	end;
 }
 
+// Treasure Room Protection ------------------------------------------------
+prtg_cas01,11,208,0	script	ban_warp#1	-1,6,6,{
+OnTouch:
+	callfunc "F_TreasProtect", "prtg_cas01", "prontera",109,179;
+	end;
+}
 
 //<================================= Castle 2 ===============================>\\
 
@@ -65,6 +71,12 @@ prtg_cas02,207,228,0	script	Switch#TresPt02	111,{
 	end;
 }
 
+// Treasure Room Protection ------------------------------------------------
+prtg_cas02,202,228,0	script	ban_warp#2	-1,6,6,{
+OnTouch:
+	callfunc "F_TreasProtect", "prtg_cas02", "prontera",109,179;
+	end;
+}
 
 //<================================ Castle 3 ================================>\\
 
@@ -91,6 +103,11 @@ prtg_cas03,193,130,0	script	Switch#TresPt03	111,{
 	end;
 }
 
+// Treasure Room Protection ------------------------------------------------
+prtg_cas03,189,132,0	script	ban_warp#3	-1,6,6,{
+	callfunc "F_TreasProtect", "prtg_cas03", "prontera",109,179;
+	end;
+}
 
 //<================================ Castle 4 ================================>\\
 
@@ -117,6 +134,12 @@ prtg_cas04,275,160,0	script	Switch#TresPt04	111,{
 	end;
 }
 
+// Treasure Room Protection ------------------------------------------------
+prtg_cas04,271,162,0	script	ban_warp#4	-1,6,6,{
+OnTouch:
+	callfunc "F_TreasProtect", "prtg_cas04", "prontera",109,179;
+	end;
+}
 
 //<================================ Castle 5 ================================>\\
 
@@ -142,3 +165,10 @@ prtg_cas05,281,176,0	script	Switch#TresPt05	111,{
 	callfunc "F_GldTreasSw", "prtg_cas05",34,30;
 	end;
 }
+
+// Treasure Room Protection ------------------------------------------------
+prtg_cas05,276,178,0	script	ban_warp#5	-1,6,6,{
+OnTouch:
+	callfunc "F_TreasProtect", "prtg_cas05", "prontera",109,179;
+	end;
+}

npc/other/resetskill.txt

@@ -0,0 +1,143 @@
+//===== Freya Script =========================================
+//= Hypnotist
+//===== By: ==================================================
+//= L0ne_W0lf
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= eAthena SVN
+//===== Description: =========================================
+//= [Aegis conversion]
+//= Permenent first class, base level 40 and under skill resetter.
+//= First Class characters and expanded classes only.
+//= Baby Classes and First Class trans can't use this service.
+//===== Additional Comments: =================================
+//= 1.0 First version. [L0ne_W0lf]
+//============================================================
+prontera,146,232,4	script	Hypnotist#2	124,{
+	mes "[Hypnotist]";
+	mes "Greetings, adventurer.";
+	mes "I'm a member of the Hypnotist";
+	mes "Academy sent here to Prontera";
+	mes "to provide Skill Reset services";
+	mes "to certain First Class characters for a really good price: free!";
+	next;
+	mes "[Hypnotist]";
+	mes "Although I offer unlimited";
+	mes "skill resets for now, I have";
+	mes "two conditions that must be";
+	mes "fulfilled. First, you must be";
+	mes "lower than ^FF0000Base Level 40^000000.";
+	next;
+	mes "[Hypnotist]";
+	mes "Second, you must be a";
+	mes "^FF0000Swordman, Acolyte, Mage,";
+	mes "Thief, Archer, Merchant,";
+	mes "Taekwon Boy, Taekwon Girl, Gunslinger and Ninja^000000";
+	mes "Job character to qualify.";
+	mes "Now, do you have any questions?";
+	next;
+	switch(select("Skill Reset?:I want a Skill Reset:Nothing")) {
+
+	case 1:
+		mes "[Hypnotist]";
+		mes "Skill Resets allow adventuers";
+		mes "to redistribute their Skill";
+		mes "Points if they are unhappy";
+		mes "with their current skills.";
+		next;
+		mes "[Hypnotist]";
+		mes "Before proceeding with";
+		mes "a Skill Reset, you must";
+		mes "reduce all of the weight";
+		mes "of all carried items on your";
+		mes "character to 0. You can put";
+		mes "extra items in Kafra Storage.";
+		next;
+		mes "[Hypnotist]";
+		mes "Ah, it's also important";
+		mes "to remove your ^FF0000Pushcart^000000";
+		mes "if you have one equipped.";
+		mes "Otherwise, hypnosis won't";
+		mes "work, or will backfire...";
+		close;
+
+	case 2:
+		mes "[Hypnotist]";
+		mes "Are you sure that you";
+		mes "want to proceed with";
+		mes "my ^FF0000Skill Reset^000000 service?";
+		next;
+		if (select("Yes:Cancel") == 1) {
+			if (BaseLevel > 40) {
+				mes "[Hypnotist]";
+				mes "I'm sorry, but characters";
+				mes "with Base Levels higher";
+				mes "than 40 are ineligible for the";
+				mes "Skill Reset service I provide.";
+				close;
+			}
+			if ((Class > 0 && Class < 7 && Upper == 0) || (Class == Job_Gunslinger) || (Class == Job_Ninja) || (Class == Job_Taekwon)) {
+				if (checkcart()) {
+					mes "[Hypnotist]";
+					mes "Oh! Please remove your";
+					mes "Pushcart before proceeding";
+					mes "with the Skill Reset service.";
+					mes "Thanks for cooperating~";
+					close;
+				}
+				if (Weight) {
+					mes "[Hypnotist]";
+					mes "If you're here for my Skill";
+					mes "Reset service, please";
+					mes "remember that you can't";
+					mes "reset your skills until the";
+					mes "^FF0000weight of your carried items in";
+					mes "your Inventory is reduced to 0^000000.";
+					next;
+					mes "[Hypnotist]";
+					mes "Why don't you place your";
+					mes "things into the Kafra Storage";
+					mes "for now? That way, you can";
+					mes "safely keep all of your goods.";
+					close;
+				}
+				mes "[Hypnotist]";
+				mes "Thank you for using";
+				mes "my Skill Redistribution";
+				mes "services. Oh, and best";
+				mes "of luck to you on your";
+				mes "travels, adventurer.";
+				ResetSkill;
+				close;
+			}
+			mes "[Hypnotist]";
+			mes "I'm sorry, but your";
+			mes "Job Class doesn't qualify";
+			mes "for the Skill Reset service";
+			mes "that I provide. I can only";
+			mes "offer Skill Resets to the";
+			mes "following Jobs...";
+			next;
+			mes "[Hypnotist]";
+			mes "^FF0000Swordman, Acolyte,";
+			mes "Mage, Thief, Archer,";
+			mes "Merchant, Taekwon";
+			mes "Boy, Taekwon Girl, Gunslinger and Ninja^000000.";
+			close;
+		}
+		mes "[Hypnotist]";
+		mes "Thank you, and good";
+		mes "luck on your adventures.";
+		mes "Please travel in safety~";
+		close;
+
+	case 3:
+		mes "[Hypnotist]";
+		mes "Thank you, and good";
+		mes "luck on your adventures.";
+		mes "Please travel in safety~";
+		close;
+	}
+
+}

npc/scripts_athena.conf

@@ -175,6 +175,18 @@ npc: npc/kafras/dts_warper.txt
 
 //npc: npc/events/whiteday.txt
 //npc: npc/events/twintowers.txt
+
+//Novice WoE is a kRO Event, after the event, the scripts were disabled.
+//Novice Castles doesn't have real dungeons. They're connected to the common ones.
+//So it's better not to uncomment this line.
+//npc: npc/events/nguild/nguild_dunsw.txt
+//npc: npc/events/nguild/nguild_treas.txt
+//npc: npc/events/nguild/nguild_guardians.txt
+//npc: npc/events/nguild/nguild_warper.txt
+//npc: npc/events/nguild/nguild_ev_agit.txt
+//npc: npc/events/nguild/nguild_flags.txt
+//npc: npc/events/nguild/nguild_managers.txt
+//npc: npc/events/nguild/nguild_kafras.txt
 // --------------------------------------------------------------
 // --------------------------- Others ---------------------------
 npc: npc/other/pvp.txt
@@ -186,4 +198,5 @@ npc: npc/other/marriage.txt
 npc: npc/other/divorce.txt
 npc: npc/other/comodo_gambling.txt
 npc: npc/other/powernpc.txt
+npc: npc/other/resetskill.txt
 // --------------------------------------------------------------

npc/scripts_guild.conf

@@ -53,15 +53,4 @@ npc: npc/guild/prtg/prtg_kafras.txt
 npc: npc/guild/prtg/prtg_dunsw.txt
 npc: npc/guild/prtg/prtg_treas.txt
 npc: npc/guild/prtg/prtg_guardians.txt
-// -- Guild Wars: NGuild
-npc: npc/guild/nguild/nguild_ev_agit.txt
-npc: npc/guild/nguild/nguild_flags.txt
-npc: npc/guild/nguild/nguild_managers.txt
-npc: npc/guild/nguild/nguild_kafras.txt
-//N Guild doesn't have REAL dungeons. They are connected to the common ones.
-//So better don't uncomment this line.
-//npc: npc/guild/nguild/nguild_dunsw.txt
-npc: npc/guild/nguild/nguild_treas.txt
-npc: npc/guild/nguild/nguild_guardians.txt
-npc: npc/guild/nguild/nguild_warper.txt
 // --------------------------------------------------------------