Update to last rAthena npc.

Fix some typos
change sc_bleeding to -> sc_blooding
Updated RE EXP for quests_brasilis.txt

6 files changed, 234 insertions, 10 deletions

diff --git a/npc/pre-re/other/bulletin_boards.txt b/npc/pre-re/other/bulletin_boards.txt
new file mode 100644
index 000000000..d4a50491f
--- /dev/null
+++ b/npc/pre-re/other/bulletin_boards.txt
@@ -0,0 +1,27 @@
+//===== Hercules Script ======================================
+//= Bulletin Boards
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= Bulletin Boards for beginners.
+//===== Additional Comments: =================================
+//= 1.0 Moved Izlude NPCs to Pre-RE/RE paths.
+//============================================================
+
+izlude,131,116,4	script	Bulletin Board#5	837,{
+	mes "[Izlude: The Satellite City]";
+	mes "Welcome to Izlude, the satellite of Prontera. Izlude was built to support Prontera's defense and to accommodate its burgeoning population.";
+	next;
+	mes "[Izlude: The Satellite City]";
+	mes "Points of interest include the Swordsman Association building which allows adventurers to change their job to Swordsman, and the Battle Area that is North of Izlude.";
+	next;
+	mes "[Izlude: The Satellite City]";
+	mes "At the docks, you may take a ship and travel to ^123972Alberta^000000 or ^2F0400Byalan Island^000000.";
+	next;
+	mes "[Izlude: The Satellite City]";
+	mes "From Izlude, ^6D6FE0Prontera^000000 is located to the Northwest, and ^1F3A11Payon^000000 is located to the South.";
+	mes "Enjoy your travels in the Rune-Midgarts Kingdom.";
+	close;
+}
diff --git a/npc/pre-re/other/mercenary_rent.txt b/npc/pre-re/other/mercenary_rent.txt
index 26520994b..938c3dfa7 100644
--- a/npc/pre-re/other/mercenary_rent.txt
+++ b/npc/pre-re/other/mercenary_rent.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
 //= Mercenary related NPCs
 //===== By: ==================================================
 //= Daegaladh
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
 //===== Description: =========================================
 //= Sells Lancer, Sword, and Archer mercenaries,
 //= along with related mercenary items.
diff --git a/npc/pre-re/other/msg_boards.txt b/npc/pre-re/other/msg_boards.txt
new file mode 100644
index 000000000..01c10e265
--- /dev/null
+++ b/npc/pre-re/other/msg_boards.txt
@@ -0,0 +1,26 @@
+//===== Hercules Script ======================================
+//= Misc. Message Boards
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= Misc. Message Boards for:
+//=  - Izlude
+//===== Additional Comments: =================================
+//= 1.0 Moved Izlude NPCs to Pre-RE path.
+//============================================================
+
+// Izlude
+//============================================================
+izlude,54,139,1	script	Sign#Iz1	111,{
+	mes "^993300- The Sign Reads -^000000";
+	mes "Welcome to the Swordsman Academy.";
+	close;
+}
+
+izlude,144,148,1	script	Sign#Iz2	111,{
+	mes "^993300- The Sign Reads -^000000";
+	mes "Welcome.";
+	close;
+}
diff --git a/npc/pre-re/other/pvp.txt b/npc/pre-re/other/pvp.txt
new file mode 100644
index 000000000..de49cfdc3
--- /dev/null
+++ b/npc/pre-re/other/pvp.txt
@@ -0,0 +1,32 @@
+//===== Hercules Script ======================================
+//= PvP NPCs
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= PvP NPCs that are found in the Inns in major cities.
+//= Includes Yoyo Mode, Nightmare Mode, and Event Mode.
+//===== Additional Comments: =================================
+//= 1.0 First version, Pre-Renewal.
+//============================================================
+
+// PVP Warpers
+//============================================================
+pvp_y_room,86,85,4	script	Fight Square Reception#8	105,{
+	callfunc "F_PVP_FSRS";
+	end;
+
+OnInit:
+	waitingroom "Free for all",0;
+	end;
+}
+
+pvp_n_room,30,85,4	script	Fight Square Reception#n	105,{
+	callfunc "F_PVP_FSRS";
+	end;
+
+OnInit:
+	waitingroom "Free for all",0;
+	end;
+}
diff --git a/npc/pre-re/other/resetskill.txt b/npc/pre-re/other/resetskill.txt
new file mode 100644
index 000000000..698b89e51
--- /dev/null
+++ b/npc/pre-re/other/resetskill.txt
@@ -0,0 +1,142 @@
+//===== Hercules Script ======================================
+//= Hypnotist
+//===== By: ==================================================
+//= L0ne_W0lf
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= [Official 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;
+	}
+
+}
diff --git a/npc/pre-re/other/arena.txt b/npc/pre-re/other/turbo_track.txt
index e8fd938c6..24ebea721 100644
--- a/npc/pre-re/other/arena.txt
+++ b/npc/pre-re/other/turbo_track.txt
@@ -1,15 +1,14 @@
 //===== Hercules Script ======================================
-//= Arena Warps
+//= Turbo Track
 //===== By: ==================================================
-//= Streusel
+//= Euphy
 //===== Current Version: =====================================
 //= 1.0
 //===== Description: =========================================
-//= Warp Points related to Izlude Arena && Control Panel
+//= [Official Conversion]
+//= Pre-Renewal duplicates.
 //===== Additional Comments: =================================
-//= 1.0 First version.
-//= Moved welcome_arena & bye_arena from main folder
+//= 1.0 Split Peco Peco Manager NPC.
 //============================================================
 
-izlude,128,226,0	warp	welcome_arena	1,1,arena_room,100,30
-arena_room,99,24,0	warp	bye_arena	2,2,izlude,128,220
+alde_gld,181,199,5	duplicate(MountManager_turbo)	Peco Peco Manager	845