Browse Source

Update RE Renter NPC (#6750)

Include 4th job classes
Adjusted header and added changelog

Co-authored-by: Lemongrass3110 <lemongrass@kstp.at>
HAO YAN 3 years ago
parent
commit
a2a614198a
1 changed files with 9 additions and 14 deletions
  1. 9 14
      npc/re/merchants/renters.txt

+ 9 - 14
npc/re/merchants/renters.txt

@@ -1,24 +1,19 @@
-//===== rAthena Script ======================================= 
+//===== rAthena Script =======================================
 //= Renters
-//===== By: ================================================== 
-//= rAthena Dev Team
-//===== Current Version: ===================================== 
-//= 2.2
-//===== Compatible With: ===================================== 
-//= rAthena Project
-//===== Description: ========================================= 
+//===== Description: =========================================
 //= [Official Conversion]
 //= Renewal-specific breeder NPCs.
-//===== Additional Comments: ================================= 
+//===== Changelogs: ==========================================
 //= 2.1 Moved some renters to a separate renewal file. [Daegaladh]
 //= 2.2 Updated to match the official scripts. [Euphy]
-//============================================================ 
+//= 2.3 Added fourth class support. [Emistry]
+//============================================================
 
 // Dragon Breeder :: dragon
 //============================================================
 job3_rune01,88,62,5	script	Dragon Breeder	105,{
 	mes "[Dragon Breeder]";
-	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune_Knight) {
+	if ((eaclass()&EAJ_THIRDMASK)==EAJ_RUNE_KNIGHT) {
 		mes "Welcome. Would you like to rent a Dragon?";
 		next;
 		switch(select("Yes:No")) {
@@ -56,7 +51,7 @@ job3_rune01,88,62,5	script	Dragon Breeder	105,{
 //============================================================
 prontera,130,213,5	script	Riding Creature Master	105,{
 	mes "[Riding Creature Master]";
-	if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune_Knight) {
+	if ((eaclass()&EAJ_THIRDMASK)==EAJ_RUNE_KNIGHT) {
 		mes "Welcome. Would you like to rent a Dragon?";
 		next;
 		switch(select("Yes:No")) {
@@ -85,7 +80,7 @@ prontera,130,213,5	script	Riding Creature Master	105,{
 			close;
 		}
 	}
-	if (Class == Job_Royal_Guard || Class == Job_Royal_Guard_T || Class == Job_Baby_Royal_Guard) {
+	if ((eaclass()&EAJ_THIRDMASK)==EAJ_ROYAL_GUARD) {
 		mes "Welcome. Would you like to rent a Gryphon?";
 		next;
 		switch(select("Yes:No")) {
@@ -157,7 +152,7 @@ prontera,125,208,5	script	Peco Peco Remover	105,{
 //============================================================
 -	script	::mgm	-1,{
 	mes "[Mado Gear Armorer]";
-	if (Class == Job_Mechanic || Class == Job_Mechanic_T || Class == Job_Baby_Mechanic) {
+	if ((eaclass()&EAJ_THIRDMASK)==EAJ_MECHANIC) {
 		mes "Welcome, Mechanic.";
 		mes "Would you like to rent a Pushcart or";
 		mes "ride a Mado Gear?";