Update to last rAthena npc.

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

8 files changed, 448 insertions, 4 deletions

diff --git a/npc/re/other/bulletin_boards.txt b/npc/re/other/bulletin_boards.txt
new file mode 100644
index 000000000..ecfaaf9ca
--- /dev/null
+++ b/npc/re/other/bulletin_boards.txt
@@ -0,0 +1,37 @@
+//===== 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.
+//=     Disabled until proper coordinates are found.
+//============================================================
+
+/*
+-	script	::BulletinBoard_iz	-1,{
+	mes "[Izlude: The Satellite City]";
+	mes "Welcome to Izlude, the satellite of Prontera. Izlude was built to support Prontera's defense and to accomodate its burgeoning population.";
+	next;
+	mes "[Izlude: The Satellite City]";
+	mes "The main buildings here are to accomodate the growth of the Cryptura Academy.";
+	next;
+	mes "[Izlude: The Satellite City]";
+	mes "Points of interest include the Swordman Association building which allows adventurers to change their job to Swordman, and the Battle Area that is East of Izlude.";
+	next;
+	mes "[Izlude: The Satellite City]";
+	mes "At the docks, you may take a ship and travel to ^003399Alberta^000000 or ^660000Byalan Island^000000.";
+	next;
+	mes "[Izlude: The Satellite City]";
+	mes "From Izlude, ^3355FFProntera^000000 is located to the Northwest, and ^006600Payon^000000 is located to the South. Enjoy your travels in the Rune-Midgarts Kingdom.";
+	close;
+}
+izlude,25,103,0	duplicate(BulletinBoard_iz)	Bulletin Board#5	837
+izlude_a,25,103,0	duplicate(BulletinBoard_iz)	Bulletin Board#5_a	837
+izlude_b,25,103,0	duplicate(BulletinBoard_iz)	Bulletin Board#5_b	837
+izlude_c,25,103,0	duplicate(BulletinBoard_iz)	Bulletin Board#5_c	837
+izlude_d,25,103,0	duplicate(BulletinBoard_iz)	Bulletin Board#5_d	837
+*/
diff --git a/npc/re/other/item_merge.txt b/npc/re/other/item_merge.txt
new file mode 100644
index 000000000..55004785f
--- /dev/null
+++ b/npc/re/other/item_merge.txt
@@ -0,0 +1,69 @@
+//===== Hercules Script ======================================
+//= Mergician
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= [Official Conversion]
+//= Merges items taking up multiple slots in a player's
+//= inventory.
+//===== Additional Comments: =================================
+//= 1.0 First version, currently useless/disabled.
+//============================================================
+
+prontera,146,95,3	script	Mergician#pron	64,{
+	if (checkweight(1301,1) == 0) {
+		mes "- Wait a second !! -";
+		mes "- You are carrying too many items -";
+		mes "- or too much weight to proceed. -";
+		mes "- Come back after -";
+		mes "- arranging your inventory. -";
+		close;
+	}
+	mes "[Mergician]";
+	mes "Do you believe in the miracle of Merge god?? If so, repeat my spell loudly as I pronunce it!!!";
+	mes "Merge Merge, Merrrrge!!!";
+	next;
+	switch(select("What is the miracle of Merge?:Merrrrge!!!!:Abandon...")) {
+	case 1:
+		mes "[Mergician]";
+		mes "There is an order which rules the world and keeps the world to go well.";
+		next;
+		mes "[Mergician]";
+		mes "But there has been a bad factor which totally jeopardised this rule!!";
+		next;
+		mes "[Mergician]";
+		mes "Those things which are separated even if they are composed by the same material!!";
+		next;
+		mes "[Mergician]";
+		mes "Have you never experienced this bad incident??";
+		mes "The fact that I had ^3131FFthe same potion, but appearing more than twice in your inventory!!^000000 So unpleasant!!!";
+		next;
+		mes "[Mergician]";
+		mes "Believe in Mergism. That is the truth.";
+		mes "Then I can help you be happy and content.";
+		close;
+	case 2:
+		mes "[Mergician]";
+		mes "This is the total holy ritual to pray to the Great God, Merge! and I am borrowing the power for a while!!";
+		next;
+		mes "[Mergician]";
+		mes "And if you eagerly want to be blessed by Merge, be humble and shout out loud! Merge Merge, Merrrrge!!!";
+		next;
+		switch(select("Merrrrge!:Don't follow what he says.")) {
+		case 1:
+//			MergeItem
+			mes "[Mergician]";
+			mes "Merge just heard your wish and let it be realised!";
+			mes "Open your inventory to check the miracle!";
+			close;
+		case 2:
+			mes "[Mergician]";
+			mes "You jerk!!! You just broke the whole rhythm! Why can't you get my flow and follow me?! Idiot!";
+			close;
+		}
+	case 3:
+		close;
+	}
+}
diff --git a/npc/re/other/mail.txt b/npc/re/other/mail.txt
new file mode 100644
index 000000000..3aa040ea2
--- /dev/null
+++ b/npc/re/other/mail.txt
@@ -0,0 +1,19 @@
+//===== Hercules Script ======================================
+//= Mail Boxes
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= [Official Conversion]
+//= Pickup and write mail from/to players in game.
+//===== Additional Comments: =================================
+//= 1.0 First version, Renewal duplicates.
+//============================================================
+
+// Izlude
+//============================================================
+izlude_a,136,94,0	duplicate(MailBox)	Mailbox#iz_a	888
+izlude_b,136,94,0	duplicate(MailBox)	Mailbox#iz_b	888
+izlude_c,136,94,0	duplicate(MailBox)	Mailbox#iz_c	888
+izlude_d,136,94,0	duplicate(MailBox)	Mailbox#iz_d	888
diff --git a/npc/re/other/mercenary_rent.txt b/npc/re/other/mercenary_rent.txt
index 0e92f8fc2..9056d56f7 100644
--- a/npc/re/other/mercenary_rent.txt
+++ b/npc/re/other/mercenary_rent.txt
@@ -4,14 +4,22 @@
 //= Daegaladh
 //===== Current Version: =====================================
 //= 1.0
-//===== Compatible With: =====================================
-//= Hercules
 //===== Description: =========================================
 //= Sells Lancer, Sword, and Archer mercenaries,
 //= along with related mercenary items.
 //===== Additional Comments: =================================
 //= 1.0 First version. [L0ne_W0lf]
+//= 1.1 Added Izlude duplicates. [Euphy]
 //============================================================
 
-izlude,47,169,5	duplicate(Mercenary Manager#main)	Mercenary Manager#Sword	734
-izlude,56,169,4	duplicate(MercMerchant)	Mercenary Merchant#Sword	892
+izlude,47,170,4	duplicate(Mercenary Manager#main)	Mercenary Manager#Sword	734
+izlude_a,47,170,4	duplicate(Mercenary Manager#main)	Mercenary Manager#Swo_a	734
+izlude_b,47,170,4	duplicate(Mercenary Manager#main)	Mercenary Manager#Swo_b	734
+izlude_c,47,170,4	duplicate(Mercenary Manager#main)	Mercenary Manager#Swo_c	734
+izlude_d,47,170,4	duplicate(Mercenary Manager#main)	Mercenary Manager#Swo_d	734
+
+izlude,55,170,4	duplicate(MercMerchant)	Mercenary Merchant#Sword	892
+izlude_a,55,170,4	duplicate(MercMerchant)	Mercenary Merchant#Swo_a	892
+izlude_b,55,170,4	duplicate(MercMerchant)	Mercenary Merchant#Swo_b	892
+izlude_c,55,170,4	duplicate(MercMerchant)	Mercenary Merchant#Swo_c	892
+izlude_d,55,170,4	duplicate(MercMerchant)	Mercenary Merchant#Swo_d	892
diff --git a/npc/re/other/pvp.txt b/npc/re/other/pvp.txt
new file mode 100644
index 000000000..deebc7b72
--- /dev/null
+++ b/npc/re/other/pvp.txt
@@ -0,0 +1,91 @@
+//===== 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, Renewal.
+//============================================================
+
+// PVP Warpers
+//============================================================
+pvp_y_room,30,85,4	script	Fight Square Reception#1	105,{ //5,5
+	callfunc "F_PVP_FSRS",50,69;
+	end;
+
+OnInit:
+	waitingroom "LV 50 ~ LV 69",0;
+	end;
+}
+
+pvp_y_room,38,85,4	script	Fight Square Reception#2	105,{ //5,5
+	callfunc "F_PVP_FSRS",70,89;
+	end;
+
+OnInit:
+	waitingroom "LV 70 ~ LV 89",0;
+	end;
+}
+
+pvp_y_room,46,85,4	script	Fight Square Reception#3	105,{ //5,5
+	callfunc "F_PVP_FSRS",90,99;
+	end;
+
+OnInit:
+	waitingroom "LV 90 ~ LV 99",0;
+	end;
+}
+
+pvp_y_room,54,85,4	script	Fight Square Reception#8	105,{
+	callfunc "F_PVP_FSRS";
+	end;
+
+OnInit:
+	waitingroom "Free for all",0;
+	end;
+}
+
+pvp_y_room,62,85,4	script	Fight Square Reception#4	105,{
+	//if (ADVJOB > 0) {
+	if (Upper == 1) {
+		mes "[PVP Fight Square Reception Staff]";
+		mes "You have been transcended.";
+		mes "You are not allowed to enter.";
+		close;
+	}
+	callfunc "F_PVP_FSRS";
+	end;
+
+OnInit:
+	waitingroom "Normal Jobs Only",0;
+	end;
+}
+
+pvp_y_room,70,85,4	script	Fight Square Reception#5	105,{
+	//if (ADVJOB == 0) {
+	if (Upper != 1) {
+		mes "[PVP Fight Square Reception Staff]";
+		mes "You have not transcended.";
+		mes "You are not allowed to enter.";
+		close;
+	}
+	callfunc "F_PVP_FSRS";
+	end;
+
+OnInit:
+	waitingroom "Trans Jobs Only",0;
+	end;
+}
+
+pvp_n_room,86,85,4	script	Fight Square Reception#n	105,{
+	callfunc "F_PVP_FSRS";
+	end;
+
+OnInit:
+	waitingroom "Free for all",0;
+	end;
+}
diff --git a/npc/re/other/resetskill.txt b/npc/re/other/resetskill.txt
new file mode 100644
index 000000000..7e14c9537
--- /dev/null
+++ b/npc/re/other/resetskill.txt
@@ -0,0 +1,147 @@
+//===== Hercules Script ======================================
+//= Hypnotist
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.1
+//===== Description: =========================================
+//= [Official Conversion]
+//= Stat and skill resetter for expanded first class under
+//= base level 50 and normal first class.
+//===== Additional Comments: =================================
+//= 1.0 First version, Renewal script.
+//= 1.1 Added Izlude duplicates. [Euphy]
+//============================================================
+
+izlude,127,175,3	script	Hypnotist#novice	124,{
+	mes "[Hypnotist]";
+	mes "Greetings, adventurer.";
+	mes "I'm a member of the Hypnotist";
+	mes "Academy sent here to Izlude";
+	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 "stat/skill resets for now, I have";
+	mes "two conditions that must be";
+	mes "fulfilled. First, you must be";
+	mes "lower than ^FF0000Base Level 50^000000.";
+	next;
+	mes "[Hypnotist]";
+	mes "Second, you must be a";
+	mes "^FF0000Swordman, Acolyte, Mage,";
+	mes "Thief, Archer, Merchant,";
+	mes "Taekwon Boy, or Taekwon Girl,";
+	mes "Gunslinger and Ninja^000000";
+	mes "Job character to qualify.";
+	mes "Now, do you have any questions?";
+	next;
+	switch(select("^FF0000Stat/Skill Reset?:Reset stats:Reset skills^000000:Cancel")) {
+	case 1:
+		mes "[Hypnotist]";
+		mes "Stat/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 Stat/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:
+		set .@str$,"Stat";
+	case 3:
+		if (.@str$ == "")
+			set .@str$,"Skill";
+		mes "[Hypnotist]";
+		mes "Are you sure that you";
+		mes "want to proceed with";
+		mes "my ^FF0000"+.@str$+" Reset^000000 service?";
+		next;
+		if(select("Yes:Cancel") == 1)
+			break;
+	case 4:
+		mes "[Hypnotist]";
+		mes "Thank you, and good";
+		mes "luck on your adventures.";
+		mes "Please travel in safety~";
+		close;
+	}
+	if ((Class >= Job_Swordman && Class <= Job_Thief) || Class == Job_Taekwon || Class == Job_Gunslinger || Class == Job_Ninja) {
+		if (checkcart()) {
+			mes "[Hypnotist]";
+			mes "Oh! Please remove your";
+			mes "Pushcart before proceeding";
+			mes "with the "+.@str$+" Reset service.";
+			mes "Thanks for cooperating~";
+			close;
+		}
+		if (Weight != 0) {
+			mes "[Hypnotist]";
+			mes "If you're here for my "+.@str$;
+			mes "Reset service, please";
+			mes "remember that you can't";
+			mes "reset your "+.@str$+"s 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;
+		}
+		if (BaseLevel >= 50 && (Class == Job_Taekwon || Class == Job_Gunslinger || Class == Job_Ninja)) {
+			mes "[Hypnotist]";
+			mes "I'm sorry, but characters";
+			mes "with Base Levels higher";
+			mes "than 50 are ineligible for the";
+			mes .@str$+" Reset service I provide.";
+			close;
+		}
+		mes "[Hypnotist]";
+		mes "Thank you for using";
+		mes "my "+.@str$+" Redistribution";
+		mes "services. Oh, and best";
+		mes "of luck to you on your";
+		mes "travels, adventurer.";
+		if (.@str$ == "Stat")
+			resetstatus;
+		else
+			resetskill;
+		close;
+	} else {
+		mes "[Hypnotist]";
+		mes "I'm sorry, but your";
+		mes "Job Class doesn't qualify";
+		mes "for the "+.@str$+" Reset service";
+		mes "that I provide. I can only";
+		mes "offer "+.@str$+" Resets to the";
+		mes "following Jobs...";
+		next;
+		mes "[Hypnotist]";
+		mes "^FF0000Swordman, Acolyte,";
+		mes "Mage, Thief, Archer,";
+		mes "Merchant, Taekwon";
+		mes "Boy, Taekwon Girl,";
+		mes "Gunslinder and Ninja^000000.";
+		close;
+	}
+}
+izlude_a,127,175,3	duplicate(Hypnotist#novice)	Hypnotist#novice_a	124
+izlude_b,127,175,3	duplicate(Hypnotist#novice)	Hypnotist#novice_b	124
+izlude_c,127,175,3	duplicate(Hypnotist#novice)	Hypnotist#novice_c	124
+izlude_d,127,175,3	duplicate(Hypnotist#novice)	Hypnotist#novice_d	124
diff --git a/npc/re/other/stone_change.txt b/npc/re/other/stone_change.txt
new file mode 100644
index 000000000..a6b903273
--- /dev/null
+++ b/npc/re/other/stone_change.txt
@@ -0,0 +1,59 @@
+//===== Hercules Script ======================================
+//= Stone Changer
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= [Official Conversion]
+//= Organizes ores in a player's inventory.
+//===== Additional Comments: =================================
+//= 1.0 First version.
+//============================================================
+
+geffen_in,99,174,5	script	Ore Tester#sorty	700,{
+	mes "[Ore Tester Sorty]";
+	mes "Do you have ^3131FFany same type of ores in your inventories^000000 which take many spaces?";
+	mes "I can distinguish your ores and organize them right away~!";
+	next;
+	switch(select("Refine my Ore.:Cancel.")) {
+	case 1:
+		mes "[Ore Tester Sorty]";
+		mes "At the moment I can only distinguish ^FF0000Steel^000000, ^FF0000Iron^000000, ^FF0000Iron Ore^000000, and ^FF0000Rough Oridecon^000000 and organize them.";
+		mes "Please note that ^3131FFother items are unable^000000!";
+		next;
+		mes "[Ore Tester Sorty]";
+		mes "So, would you like me to organize your ores?";
+		next;
+		set .@i, select("Steel, please.:Iron, please.:Iron Ore, please.:Rough Oridecon, please.:No, thanks.");
+		if (.@i == 5) {
+			mes "[Ore Tester Sorty]";
+			mes "Huh, I really hate messy people!";
+			close;
+		}
+		setarray .@ores[0],999,998,1002,756;
+		set .@item, .@ores[.@i-1];
+		if (countitem(.@item) == 0) {
+			mes "[Ore Tester Sorty]";
+			mes "You don't have any "+getitemname(.@item)+"...";
+			close;
+		}
+		while(1) {
+			if (countitem(.@item)) {
+				set .@count, countitem(.@item);
+				set .@total, .@total + .@count;
+				delitem .@item, .@count;
+			} else {
+				getitem .@item, .@total;
+				break;
+			}
+		}
+		mes "[Ore Tester Sorty]";
+		mes "It's done. Looks great! Don't you think so?";
+		close;
+	case 2:
+		mes "[Ore Tester Sorty]";
+		mes "It seems that your bag is clean? Huhu! You might be the master of cleaning!";
+		close;
+	}
+}
diff --git a/npc/re/other/turbo_track.txt b/npc/re/other/turbo_track.txt
new file mode 100644
index 000000000..129f4bcc8
--- /dev/null
+++ b/npc/re/other/turbo_track.txt
@@ -0,0 +1,14 @@
+//===== Hercules Script ======================================
+//= Turbo Track
+//===== By: ==================================================
+//= Euphy
+//===== Current Version: =====================================
+//= 1.0
+//===== Description: =========================================
+//= [Official Conversion]
+//= Renewal duplicates.
+//===== Additional Comments: =================================
+//= 1.0 Split Mount Manager NPC.
+//============================================================
+
+alde_gld,181,199,5	duplicate(MountManager_turbo)	Mount Manager	845