From e3afdc2af4c5e50c79237ee092e25f39b7428e47 Mon Sep 17 00:00:00 2001
From: Michieru <michieru@0-mail.com>
Date: Thu, 24 Oct 2013 12:10:43 +0200
Subject: Update to last rAthena npc. Fix some typos change sc_bleeding to ->
 sc_blooding Updated RE EXP for quests_brasilis.txt

---
 npc/re/merchants/renters.txt | 58 ++++++++++++++++++++++++++++++++------------
 1 file changed, 42 insertions(+), 16 deletions(-)

(limited to 'npc/re/merchants/renters.txt')

diff --git a/npc/re/merchants/renters.txt b/npc/re/merchants/renters.txt
index e4f1a02c7..c721af536 100644
--- a/npc/re/merchants/renters.txt
+++ b/npc/re/merchants/renters.txt
@@ -1,16 +1,18 @@
 //===== Hercules Script ======================================
 //= Renters
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Hercules Dev Team
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 2.1
-//===== Description: ========================================= 
+//===== Description: =========================================
+//= [Official Conversion]
 //= Renewal-specific breeder NPCs.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 2.1 Moved some renters to a separate renewal file. [Daegaladh]
-//============================================================ 
+//= 2.2 Updated to match the official scripts. [Euphy]
+//============================================================
 
-// Dragon Breeder on the Rune Knight job change map, couldn't find NPC on iRO.
+// Dragon Breeder
 //============================================================
 job3_rune01,88,62,5	script	Dragon Breeder	105,{
 	mes "[Dragon Breeder]";
@@ -146,21 +148,35 @@ prontera,125,208,5	script	Peco Peco Remover	105,{
 
 // Magic Gear Renter
 //============================================================
-prontera,163,178,3	script	Magic Gear Master	105,{
+-	script	::mgm	-1,{
 	mes "[Magic Gear Master]";
 	if (Class == Job_Mechanic || Class == Job_Mechanic_T || Class == Job_Baby_Mechanic) {
-		mes "Welcome. Would you like to rent a Magic Gear?";
+		mes "Welcome, Mechanic.";
+		mes "Would you like to rent a Pushcart or";
+		mes "ride a Magic Gear?";
 		next;
-		switch(select("Yes:No")) {
+		switch(select("Rent a Pushcart:Ride a Magic Gear:Cancel")) {
 		case 1:
-			if (!getskilllv("NC_MADOLICENCE")) {
+			if (checkcart()) {
+				mes "[Magic Gear Master]";
+				mes "I'm sorry, but you already";
+				mes "have a Pushcart.";
+				close;
+			}
+			setcart;
+			mes "[Magic Gear Master]";
+			mes "There you go!";
+			close;
+		case 2:
+			if (checkmadogear()) {
 				mes "[Magic Gear Master]";
-				mes "Please learn how to use a Magic Gear first.";
+				mes "I'm sorry, but you're already";
+				mes "riding a Magic Gear.";
 				close;
 			}
-			else if (checkmadogear()) {
+			else if (!getskilllv("NC_MADOLICENCE")) {
 				mes "[Magic Gear Master]";
-				mes "You already have a Magic Gear.";
+				mes "Please learn the skill to get the Magic Gear License first.";
 				close;
 			}
 			else if(ismounting()) {
@@ -169,10 +185,10 @@ prontera,163,178,3	script	Magic Gear Master	105,{
 				close;
 			}
 			setmadogear;
-			close;
-		case 2:
 			mes "[Magic Gear Master]";
-			mes "I see. Then have a great day.";
+			mes "Have fun, and please come again!";
+			close;
+		case 3:
 			close;
 		}
 	}
@@ -180,3 +196,13 @@ prontera,163,178,3	script	Magic Gear Master	105,{
 	mes "Magic Gears are only available for Mechanics.";
 	close;
 }
+prontera,163,178,3	duplicate(mgm)	Magic Gear Master#prt	105
+geffen,103,55,5	duplicate(mgm)	Magic Gear Master#gef	105
+payon,166,106,5	duplicate(mgm)	Magic Gear Master#pay	105
+aldebaran,133,112,5	duplicate(mgm)	Magic Gear Master#alde	105
+yuno,167,187,3	duplicate(mgm)	Magic Gear Master#yuno	105
+rachel,106,134,5	duplicate(mgm)	Magic Gear Master#ra	105
+dicastes01,187,207,3	duplicate(mgm)	Magic Gear Master#dic	105
+manuk,273,212,5	duplicate(mgm)	Magic Gear Master#man	105
+splendide,180,174,5	duplicate(mgm)	Magic Gear Master#spl	105
+mid_camp,242,243,3	duplicate(mgm)	Magic Gear Master#mid	105
-- 
cgit v1.2.3-70-g09d2