From c52b3b784a7f958050e4f3186b001382151bd648 Mon Sep 17 00:00:00 2001 From: Aleos Date: Wed, 1 Jan 2020 22:53:40 -0500 Subject: [PATCH] Expanded a couple baby job names (#4500) * Expanded Job_Baby_Rune -> Job_Baby_Rune_Knight, Job_Baby_Bishop -> Job_Baby_Arch_Bishop, Job_Baby_Cross -> Job_Baby_Guillotine_Cross, Job_Baby_Guard -> Job_Baby_Royal_Guard, and Job_Baby_Chaser -> Job_Baby_Shadow_Chaser. * Expanded related MAPID/EAJ constants as well. * Added deprecation notice for old constants. * Updated database and NPC scripts to use new constants. --- db/re/job_noenter_map.txt | 14 +++++----- npc/re/jobs/3-1/archbishop.txt | 4 +-- npc/re/jobs/3-1/guillotine_cross.txt | 4 +-- npc/re/jobs/3-1/rune_knight.txt | 20 +++++++------- npc/re/jobs/3-2/royal_guard.txt | 2 +- npc/re/jobs/3-2/shadow_chaser.txt | 14 +++++----- npc/re/merchants/3rd_trader.txt | 2 +- npc/re/merchants/eden_market.txt | 4 +-- npc/re/merchants/enchan_mora.txt | 4 +-- npc/re/merchants/renters.txt | 6 ++--- src/char/inter.cpp | 16 ++++++------ src/common/mmo.hpp | 14 +++++----- src/map/atcommand.cpp | 2 +- src/map/map.hpp | 10 +++---- src/map/pc.cpp | 36 ++++++++++++------------- src/map/pc.hpp | 18 ++++++------- src/map/script_constants.hpp | 39 +++++++++++++++++++--------- src/map/skill.cpp | 2 +- 18 files changed, 113 insertions(+), 98 deletions(-) diff --git a/db/re/job_noenter_map.txt b/db/re/job_noenter_map.txt index 239d957d7b..11d98b6fa8 100644 --- a/db/re/job_noenter_map.txt +++ b/db/re/job_noenter_map.txt @@ -66,22 +66,22 @@ JOB_RANGER_T2,4112,100 JOB_MECHANIC2,4112,100 JOB_MECHANIC_T2,4112,100 -JOB_BABY_RUNE,4112,100 +JOB_BABY_RUNE_KNIGHT,4112,100 JOB_BABY_WARLOCK,4112,100 JOB_BABY_RANGER,4112,100 -JOB_BABY_BISHOP,4112,100 +JOB_BABY_ARCH_BISHOP,4112,100 JOB_BABY_MECHANIC,4112,100 -JOB_BABY_CROSS,4112,100 -JOB_BABY_GUARD,4112,100 +JOB_BABY_GUILLOTINE_CROSS,4112,100 +JOB_BABY_ROYAL_GUARD,4112,100 JOB_BABY_SORCERER,4112,100 JOB_BABY_MINSTREL,4112,100 JOB_BABY_WANDERER,4112,100 JOB_BABY_SURA,4112,100 JOB_BABY_GENETIC,4112,100 -JOB_BABY_CHASER,4112,100 +JOB_BABY_SHADOW_CHASER,4112,100 -JOB_BABY_RUNE2,4112,100 -JOB_BABY_GUARD2,4112,100 +JOB_BABY_RUNE_KNIGHT2,4112,100 +JOB_BABY_ROYAL_GUARD2,4112,100 JOB_BABY_RANGER2,4112,100 JOB_BABY_MECHANIC2,4112,100 diff --git a/npc/re/jobs/3-1/archbishop.txt b/npc/re/jobs/3-1/archbishop.txt index eb5794ba31..5095767040 100644 --- a/npc/re/jobs/3-1/archbishop.txt +++ b/npc/re/jobs/3-1/archbishop.txt @@ -29,7 +29,7 @@ prt_church,103,88,3 script Praying Minister#arch 60,{ if (BaseJob != Job_Priest) { - if (Class == Job_Arch_Bishop || Class == Job_Arch_Bishop_T || Class == Job_Baby_Bishop) { + if (Class == Job_Arch_Bishop || Class == Job_Arch_Bishop_T || Class == Job_Baby_Arch_Bishop) { mes "[Praying Minister]"; mes "Ah! An Archbishop."; mes "You have reached the state of light."; @@ -788,7 +788,7 @@ job3_arch01,29,34,3 script Valkyrie#arch 403,{ if (Class != Job_Priest && Class != Job_High_Priest && Class != Job_Baby_Priest) { warp "odin_tem02",282,263; end; - } else if (Class != Job_Arch_Bishop && Class != Job_Arch_Bishop_T && Class != Job_Baby_Bishop) { + } else if (Class != Job_Arch_Bishop && Class != Job_Arch_Bishop_T && Class != Job_Baby_Arch_Bishop) { if (job_arch < 5) { warp "odin_tem02",282,263; end; diff --git a/npc/re/jobs/3-1/guillotine_cross.txt b/npc/re/jobs/3-1/guillotine_cross.txt index 37e124716a..8521f2448c 100644 --- a/npc/re/jobs/3-1/guillotine_cross.txt +++ b/npc/re/jobs/3-1/guillotine_cross.txt @@ -738,7 +738,7 @@ job3_guil01,82,95,3 script Daora#3rdgc02 940,{ mes "Everyone is waiting for you."; close; } - } else if (Class == Job_Guillotine_Cross || Class == Job_Guillotine_Cross_T || Class == Job_Baby_Cross) { + } else if (Class == Job_Guillotine_Cross || Class == Job_Guillotine_Cross_T || Class == Job_Baby_Guillotine_Cross) { if (Sex == SEX_MALE) { mes "Oh~ you're good-looking~!"; mes "It's worthwhile to open a pub~"; @@ -3755,7 +3755,7 @@ job3_guil01,148,53,3 script Bercasell#3rdgc16 467,{ mes "Get out of here now!!!"; close; } - } else if (Class == Job_Guillotine_Cross || Class == Job_Guillotine_Cross_T || Class == Job_Baby_Cross) { + } else if (Class == Job_Guillotine_Cross || Class == Job_Guillotine_Cross_T || Class == Job_Baby_Guillotine_Cross) { mes "Don't pursue only strength."; mes "You'll get tired."; mes "It's no better than living."; diff --git a/npc/re/jobs/3-1/rune_knight.txt b/npc/re/jobs/3-1/rune_knight.txt index 0ef1228892..72788fee18 100644 --- a/npc/re/jobs/3-1/rune_knight.txt +++ b/npc/re/jobs/3-1/rune_knight.txt @@ -22,7 +22,7 @@ prt_in,162,24,3 script Splendid-Looking Knight 470,2,2,{ mes "[Rune Knight Manuel]"; - if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) { + if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune_Knight) { mes "You are now a member of our select brethren. I can still remember when I first met you."; next; mes "[Rune Knight Manuel]"; @@ -136,7 +136,7 @@ prt_in,162,24,3 script Splendid-Looking Knight 470,2,2,{ glast_01,44,363,3 script Rune Leader Jungberg 468,2,2,{ mes "[Rune Leader Jungberg]"; - if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) { + if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune_Knight) { mes "Oh, you must be "+strcharinfo(0)+"."; mes "Welcome."; next; @@ -260,7 +260,7 @@ glast_01,44,363,3 script Rune Leader Jungberg 468,2,2,{ gl_knt02,150,55,3 script Rune Knight Staff 83,2,2,{ mes "[Rune Knight Staff]"; - if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) { + if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune_Knight) { mes "Welcome, "+strcharinfo(0)+". Are you going to the gathering place?"; next; switch(select("Yes, take me there.:I'm on other business.:Cancel.")) { @@ -310,7 +310,7 @@ job3_rune01,80,60,3 script Rune Knight Captain 470,2,2,{ mes "You've got too many things. You cannot proceed anymore. Please try again after losing some weight."; close; } - if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) { + if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune_Knight) { mes "[Captain Tigris]"; if (job_rune_edq == 23) { mes "Oh, I see... Please wait a moment."; @@ -584,7 +584,7 @@ L_Warning: } job3_rune01,90,50,3 script Rune Knight Lunarea 469,2,2,{ - if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) { + if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune_Knight) { mes "She holds up her chin quietly, nods lightly and notices me."; next; mes "Then after a moment she puts her face down and seems absorbed with other thoughts."; @@ -699,7 +699,7 @@ L_Test: job3_rune01,55,50,3 script Rune Knight, Renoa 469,2,2,{ mes "[Rune Knight, Renoa]"; - if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) { + if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune_Knight) { mes "Congratulations for becoming one of us. Junior Rune Knight, "+strcharinfo(0)+"."; next; mes "[Rune Knight, Renoa]"; @@ -1192,7 +1192,7 @@ job3_rune01,50,36,1 script Runes, Make & Use 844,{ mid_camp,238,250,3 script Rune Knight Sage Guard 468,2,2,{ mes "[Rune Knight Sage Guard]"; - if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) { + if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune_Knight) { mes "The sage Serpeone is the one who has been with us since the beginning of the Rune Knights."; next; mes "[Rune Knight Sage Guard]"; @@ -1219,7 +1219,7 @@ mid_camp,238,250,3 script Rune Knight Sage Guard 468,2,2,{ mid_camp,13,138,3 script Dispatched Rune Knight#1 83,2,2,{ mes "[Dispatched Rune Knight]"; - if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) { + if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune_Knight) { mes "Thanks for your work. We will continue our mission for the Rune Knight testers."; close; } @@ -1267,7 +1267,7 @@ OnTouch: mid_camp,235,250,3 script Sage Serpeone 435,2,2,{ mes "[Sage Serpeone]"; - if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) { + if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune_Knight) { mes "Finally you are an honorable Rune Knight. I'm happy to help you."; next; mes "[Sage Serpeone]"; @@ -1430,7 +1430,7 @@ mid_camp,235,250,3 script Sage Serpeone 435,2,2,{ } job3_rune01,114,50,3 script Rune Knight Velpino 468,{ - if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune) { + if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune_Knight) { mes "[Rune Knight Velpino]"; mes "You still smell like a fledging. Bring honor to the Rune Knights and raise your power..."; close; diff --git a/npc/re/jobs/3-2/royal_guard.txt b/npc/re/jobs/3-2/royal_guard.txt index 22ff06436a..010c6daf1a 100644 --- a/npc/re/jobs/3-2/royal_guard.txt +++ b/npc/re/jobs/3-2/royal_guard.txt @@ -25,7 +25,7 @@ prt_cas,172,275,5 script Middle-aged Gentleman#rg 1_M_LIBRARYMASTER,{ mes "- and please try again. -"; close; } - if (Class == Job_Royal_Guard || Class == Job_Royal_Guard_T || Class == Job_Baby_Guard) { + if (Class == Job_Royal_Guard || Class == Job_Royal_Guard_T || Class == Job_Baby_Royal_Guard) { mes "[Middle-aged Gentleman]"; mes "Uh? What am I doing? I came here for an errand..."; next; diff --git a/npc/re/jobs/3-2/shadow_chaser.txt b/npc/re/jobs/3-2/shadow_chaser.txt index 4bb1830d67..8bf924a30f 100644 --- a/npc/re/jobs/3-2/shadow_chaser.txt +++ b/npc/re/jobs/3-2/shadow_chaser.txt @@ -128,7 +128,7 @@ in_rogue,376,100,5 script Guild Member#sc01 828,{ mes "Sooner or later I'll solve it myself if I dare to get the map...!"; close; } - } else if (Class == Job_Shadow_Chaser || Class == Job_Shadow_Chaser_T || Class == Job_Baby_Chaser) { + } else if (Class == Job_Shadow_Chaser || Class == Job_Shadow_Chaser_T || Class == Job_Baby_Shadow_Chaser) { mes "[Vin]"; mes "Huh! This is a Shadow Chaser!"; mes "How unbelievable!"; @@ -160,7 +160,7 @@ in_rogue,379,99,1 script Guild Member#sc02 747,{ mes "[Lotte]"; mes "I just hate numbers!"; close; - } else if (Class == Job_Shadow_Chaser || Class == Job_Shadow_Chaser_T || Class == Job_Baby_Chaser) { + } else if (Class == Job_Shadow_Chaser || Class == Job_Shadow_Chaser_T || Class == Job_Baby_Shadow_Chaser) { mes "[Lotte]"; mes "Wow!"; mes "You are the one!"; @@ -1348,7 +1348,7 @@ s_atelier,73,65,3 script Vicente#sc12_lgt 899,{ } s_atelier,70,66,4 script Dumk#sc13_lgh 481,{ - if (Class == Job_Shadow_Chaser || Class == Job_Shadow_Chaser_T || Class == Job_Baby_Chaser) { + if (Class == Job_Shadow_Chaser || Class == Job_Shadow_Chaser_T || Class == Job_Baby_Shadow_Chaser) { mes "[Dumk]"; mes "What is it?"; mes "Have you been enjoying your new skills?"; @@ -2277,7 +2277,7 @@ job3_sha01,71,27,0 script ????#keybox04 844,{ s_atelier,29,119,3 script Max#sc05_prt 97,{ mes "[Max]"; mes "Welcome~"; - if (Class == Job_Shadow_Chaser || Class == Job_Shadow_Chaser_T || Class == Job_Baby_Chaser) { + if (Class == Job_Shadow_Chaser || Class == Job_Shadow_Chaser_T || Class == Job_Baby_Shadow_Chaser) { mes "You are a member of the Rogue guild!"; mes "What can I help you with?"; next; @@ -2342,7 +2342,7 @@ s_atelier,29,119,3 script Max#sc05_prt 97,{ s_atelier,136,70,3 script Titika#sc09_ra 914,{ mes "[Titika]"; mes "Welcome."; - if (Class == Job_Shadow_Chaser || Class == Job_Shadow_Chaser_T || Class == Job_Baby_Chaser) { + if (Class == Job_Shadow_Chaser || Class == Job_Shadow_Chaser_T || Class == Job_Baby_Shadow_Chaser) { mes "You are in a guild."; mes "What can I help you with?"; next; @@ -2393,7 +2393,7 @@ s_atelier,136,70,3 script Titika#sc09_ra 914,{ s_atelier,124,128,3 script RimiGX#sc07_yuno 862,{ mes "[RimiGX]"; mes "Welcome."; - if (Class == Job_Shadow_Chaser || Class == Job_Shadow_Chaser_T || Class == Job_Baby_Chaser) { + if (Class == Job_Shadow_Chaser || Class == Job_Shadow_Chaser_T || Class == Job_Baby_Shadow_Chaser) { mes "What are you looking for?"; next; set .@i, select("Make a new blush for make-up.:Make a new blush for painting.:Nothing."); @@ -2442,7 +2442,7 @@ s_atelier,124,128,3 script RimiGX#sc07_yuno 862,{ s_atelier,26,68,3 script Vito#sc11_lgt 904,{ mes "[Vito]"; mes "Welcome."; - if (Class == Job_Shadow_Chaser || Class == Job_Shadow_Chaser_T || Class == Job_Baby_Chaser) { + if (Class == Job_Shadow_Chaser || Class == Job_Shadow_Chaser_T || Class == Job_Baby_Shadow_Chaser) { mes "What are you looking for?"; next; set .@i, select("Make a new blush for make-up.:Make a new blush for painting.:Nothing."); diff --git a/npc/re/merchants/3rd_trader.txt b/npc/re/merchants/3rd_trader.txt index 0c9fbcf3bf..0d572a886d 100644 --- a/npc/re/merchants/3rd_trader.txt +++ b/npc/re/merchants/3rd_trader.txt @@ -162,7 +162,7 @@ job3_guil01,91,93,3 script Rare Herb Collector 1_M_03,{ mes "- after you lose some weight. -"; close; } - if (Class == Job_Guillotine_Cross || Class == Job_Guillotine_Cross_T || Class == Job_Baby_Cross) { + if (Class == Job_Guillotine_Cross || Class == Job_Guillotine_Cross_T || Class == Job_Baby_Guillotine_Cross) { mes "[Rare Poison Herb Collector]"; mes "I wander around the world and collect rare poison herbs. Recently, I started dealing in the herb called Izidor. If you are interested, you can buy them."; next; diff --git a/npc/re/merchants/eden_market.txt b/npc/re/merchants/eden_market.txt index f81971f776..7c33bf5a95 100644 --- a/npc/re/merchants/eden_market.txt +++ b/npc/re/merchants/eden_market.txt @@ -1739,7 +1739,7 @@ paramk,124,97,3 script Gecko the Trainer#unm01 4_M_DESERT,{ switch( Class ) { case Job_Rune_Knight: case Job_Rune_Knight_T: - case Job_Baby_Rune: + case Job_Baby_Rune_Knight: mes "Welcome. Would you like to rent a Dragon?"; next; if (select("Yes:No") == 2) { @@ -1766,7 +1766,7 @@ paramk,124,97,3 script Gecko the Trainer#unm01 4_M_DESERT,{ case Job_Royal_Guard: case Job_Royal_Guard_T: - case Job_Baby_Guard: + case Job_Baby_Royal_Guard: mes "Welcome. Would you like to rent a Gryphon?"; next; if (select("Yes:No") == 2) { diff --git a/npc/re/merchants/enchan_mora.txt b/npc/re/merchants/enchan_mora.txt index 85bc04e577..8795786eae 100644 --- a/npc/re/merchants/enchan_mora.txt +++ b/npc/re/merchants/enchan_mora.txt @@ -75,7 +75,7 @@ mora,88,89,5 script Keeper of Secrets#pa082 495,{ mes "You are already allowed access to our relics by your possession of a Ring!"; close; } - if (Class == Job_Arch_Bishop || Class == Job_Arch_Bishop_T || Class == Job_Baby_Bishop) { + if (Class == Job_Arch_Bishop || Class == Job_Arch_Bishop_T || Class == Job_Baby_Arch_Bishop) { setarray .@items[0],2864,2865,2866; //Light_Of_Cure,Seal_Of_Cathedral,Ring_Of_Archbishop break; } else { @@ -106,7 +106,7 @@ mora,88,89,5 script Keeper of Secrets#pa082 495,{ mes "You have obtained ^aa00aa"+getitemname(.@item)+"^000000. May the Blessing of the Light be with you."; close; case 3: - if (Class == Job_Arch_Bishop || Class == Job_Arch_Bishop_T || Class == Job_Baby_Bishop) { + if (Class == Job_Arch_Bishop || Class == Job_Arch_Bishop_T || Class == Job_Baby_Arch_Bishop) { mes "[Artifice]"; mes "We exchange rings into coins for those who cannot control the ring."; next; diff --git a/npc/re/merchants/renters.txt b/npc/re/merchants/renters.txt index d59e21dbdb..c57e3dbb9e 100644 --- a/npc/re/merchants/renters.txt +++ b/npc/re/merchants/renters.txt @@ -18,7 +18,7 @@ //============================================================ 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) { + if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune_Knight) { mes "Welcome. Would you like to rent a Dragon?"; next; switch(select("Yes:No")) { @@ -56,7 +56,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) { + if (Class == Job_Rune_Knight || Class == Job_Rune_Knight_T || Class == Job_Baby_Rune_Knight) { mes "Welcome. Would you like to rent a Dragon?"; next; switch(select("Yes:No")) { @@ -85,7 +85,7 @@ prontera,130,213,5 script Riding Creature Master 105,{ close; } } - if (Class == Job_Royal_Guard || Class == Job_Royal_Guard_T || Class == Job_Baby_Guard) { + if (Class == Job_Royal_Guard || Class == Job_Royal_Guard_T || Class == Job_Baby_Royal_Guard) { mes "Welcome. Would you like to rent a Gryphon?"; next; switch(select("Yes:No")) { diff --git a/src/char/inter.cpp b/src/char/inter.cpp index cac1f99587..a0e96602a7 100644 --- a/src/char/inter.cpp +++ b/src/char/inter.cpp @@ -255,25 +255,25 @@ const char* job_name(int class_) { case JOB_MECHANIC_T2: return msg_txt(79); - case JOB_BABY_RUNE: + case JOB_BABY_RUNE_KNIGHT: case JOB_BABY_WARLOCK: case JOB_BABY_RANGER: - case JOB_BABY_BISHOP: + case JOB_BABY_ARCH_BISHOP: case JOB_BABY_MECHANIC: - case JOB_BABY_CROSS: - case JOB_BABY_GUARD: + case JOB_BABY_GUILLOTINE_CROSS: + case JOB_BABY_ROYAL_GUARD: case JOB_BABY_SORCERER: case JOB_BABY_MINSTREL: case JOB_BABY_WANDERER: case JOB_BABY_SURA: case JOB_BABY_GENETIC: - case JOB_BABY_CHASER: - return msg_txt(88 - JOB_BABY_RUNE+class_); + case JOB_BABY_SHADOW_CHASER: + return msg_txt(88 - JOB_BABY_RUNE_KNIGHT+class_); - case JOB_BABY_RUNE2: + case JOB_BABY_RUNE_KNIGHT2: return msg_txt(88); - case JOB_BABY_GUARD2: + case JOB_BABY_ROYAL_GUARD2: return msg_txt(94); case JOB_BABY_RANGER2: diff --git a/src/common/mmo.hpp b/src/common/mmo.hpp index 83aa7d60c7..c44f22555c 100644 --- a/src/common/mmo.hpp +++ b/src/common/mmo.hpp @@ -911,22 +911,22 @@ enum e_job { JOB_MECHANIC2, JOB_MECHANIC_T2, - JOB_BABY_RUNE = 4096, + JOB_BABY_RUNE_KNIGHT = 4096, JOB_BABY_WARLOCK, JOB_BABY_RANGER, - JOB_BABY_BISHOP, + JOB_BABY_ARCH_BISHOP, JOB_BABY_MECHANIC, - JOB_BABY_CROSS, - JOB_BABY_GUARD, + JOB_BABY_GUILLOTINE_CROSS, + JOB_BABY_ROYAL_GUARD, JOB_BABY_SORCERER, JOB_BABY_MINSTREL, JOB_BABY_WANDERER, JOB_BABY_SURA, JOB_BABY_GENETIC, - JOB_BABY_CHASER, + JOB_BABY_SHADOW_CHASER, - JOB_BABY_RUNE2, - JOB_BABY_GUARD2, + JOB_BABY_RUNE_KNIGHT2, + JOB_BABY_ROYAL_GUARD2, JOB_BABY_RANGER2, JOB_BABY_MECHANIC2, diff --git a/src/map/atcommand.cpp b/src/map/atcommand.cpp index 1f70d389c3..0adad2095d 100644 --- a/src/map/atcommand.cpp +++ b/src/map/atcommand.cpp @@ -1188,7 +1188,7 @@ ACMD_FUNC(jobchange) if (job == JOB_KNIGHT2 || job == JOB_CRUSADER2 || job == JOB_WEDDING || job == JOB_XMAS || job == JOB_SUMMER || job == JOB_HANBOK || job == JOB_OKTOBERFEST || job == JOB_LORD_KNIGHT2 || job == JOB_PALADIN2 || job == JOB_BABY_KNIGHT2 || job == JOB_BABY_CRUSADER2 || job == JOB_STAR_GLADIATOR2 - || (job >= JOB_RUNE_KNIGHT2 && job <= JOB_MECHANIC_T2) || (job >= JOB_BABY_RUNE2 && job <= JOB_BABY_MECHANIC2) || job == JOB_BABY_STAR_GLADIATOR2 + || (job >= JOB_RUNE_KNIGHT2 && job <= JOB_MECHANIC_T2) || (job >= JOB_BABY_RUNE_KNIGHT2 && job <= JOB_BABY_MECHANIC2) || job == JOB_BABY_STAR_GLADIATOR2 || job == JOB_STAR_EMPEROR2 || job == JOB_BABY_STAR_EMPEROR2 || job == JOB_SUMMER2) { // Deny direct transformation into dummy jobs clif_displaymessage(fd, msg_txt(sd,923)); //"You can not change to this job by command." diff --git a/src/map/map.hpp b/src/map/map.hpp index 2c2befab06..ebffc524fe 100644 --- a/src/map/map.hpp +++ b/src/map/map.hpp @@ -204,20 +204,20 @@ enum e_mapid { MAPID_SHADOW_CHASER_T, //Baby 3-1 Jobs MAPID_SUPER_BABY_E = JOBL_THIRD|MAPID_SUPER_BABY, - MAPID_BABY_RUNE, + MAPID_BABY_RUNE_KNIGHT, MAPID_BABY_WARLOCK, MAPID_BABY_RANGER, - MAPID_BABY_BISHOP, + MAPID_BABY_ARCH_BISHOP, MAPID_BABY_MECHANIC, - MAPID_BABY_CROSS, + MAPID_BABY_GUILLOTINE_CROSS, MAPID_BABY_STAR_EMPEROR, //Baby 3-2 Jobs - MAPID_BABY_GUARD = JOBL_THIRD|MAPID_BABY_CRUSADER, + MAPID_BABY_ROYAL_GUARD = JOBL_THIRD|MAPID_BABY_CRUSADER, MAPID_BABY_SORCERER, MAPID_BABY_MINSTRELWANDERER, MAPID_BABY_SURA, MAPID_BABY_GENETIC, - MAPID_BABY_CHASER, + MAPID_BABY_SHADOW_CHASER, MAPID_BABY_SOUL_REAPER, }; diff --git a/src/map/pc.cpp b/src/map/pc.cpp index f555975150..d3e2643343 100755 --- a/src/map/pc.cpp +++ b/src/map/pc.cpp @@ -6290,21 +6290,21 @@ int pc_jobid2mapid(unsigned short b_class) case JOB_SHADOW_CHASER_T: return MAPID_SHADOW_CHASER_T; //Baby 3-1 Jobs case JOB_SUPER_BABY_E: return MAPID_SUPER_BABY_E; - case JOB_BABY_RUNE: return MAPID_BABY_RUNE; + case JOB_BABY_RUNE_KNIGHT: return MAPID_BABY_RUNE_KNIGHT; case JOB_BABY_WARLOCK: return MAPID_BABY_WARLOCK; case JOB_BABY_RANGER: return MAPID_BABY_RANGER; - case JOB_BABY_BISHOP: return MAPID_BABY_BISHOP; + case JOB_BABY_ARCH_BISHOP: return MAPID_BABY_ARCH_BISHOP; case JOB_BABY_MECHANIC: return MAPID_BABY_MECHANIC; - case JOB_BABY_CROSS: return MAPID_BABY_CROSS; + case JOB_BABY_GUILLOTINE_CROSS: return MAPID_BABY_GUILLOTINE_CROSS; case JOB_BABY_STAR_EMPEROR: return MAPID_BABY_STAR_EMPEROR; //Baby 3-2 Jobs - case JOB_BABY_GUARD: return MAPID_BABY_GUARD; + case JOB_BABY_ROYAL_GUARD: return MAPID_BABY_ROYAL_GUARD; case JOB_BABY_SORCERER: return MAPID_BABY_SORCERER; case JOB_BABY_MINSTREL: case JOB_BABY_WANDERER: return MAPID_BABY_MINSTRELWANDERER; case JOB_BABY_SURA: return MAPID_BABY_SURA; case JOB_BABY_GENETIC: return MAPID_BABY_GENETIC; - case JOB_BABY_CHASER: return MAPID_BABY_CHASER; + case JOB_BABY_SHADOW_CHASER: return MAPID_BABY_SHADOW_CHASER; case JOB_BABY_SOUL_REAPER: return MAPID_BABY_SOUL_REAPER; //Doram Jobs case JOB_SUMMONER: return MAPID_SUMMONER; @@ -6442,20 +6442,20 @@ int pc_mapid2jobid(unsigned short class_, int sex) case MAPID_SHADOW_CHASER_T: return JOB_SHADOW_CHASER_T; //Baby 3-1 Jobs case MAPID_SUPER_BABY_E: return JOB_SUPER_BABY_E; - case MAPID_BABY_RUNE: return JOB_BABY_RUNE; + case MAPID_BABY_RUNE_KNIGHT: return JOB_BABY_RUNE_KNIGHT; case MAPID_BABY_WARLOCK: return JOB_BABY_WARLOCK; case MAPID_BABY_RANGER: return JOB_BABY_RANGER; - case MAPID_BABY_BISHOP: return JOB_BABY_BISHOP; + case MAPID_BABY_ARCH_BISHOP: return JOB_BABY_ARCH_BISHOP; case MAPID_BABY_MECHANIC: return JOB_BABY_MECHANIC; - case MAPID_BABY_CROSS: return JOB_BABY_CROSS; + case MAPID_BABY_GUILLOTINE_CROSS: return JOB_BABY_GUILLOTINE_CROSS; case MAPID_BABY_STAR_EMPEROR: return JOB_BABY_STAR_EMPEROR; //Baby 3-2 Jobs - case MAPID_BABY_GUARD: return JOB_BABY_GUARD; + case MAPID_BABY_ROYAL_GUARD: return JOB_BABY_ROYAL_GUARD; case MAPID_BABY_SORCERER: return JOB_BABY_SORCERER; case MAPID_BABY_MINSTRELWANDERER: return sex?JOB_BABY_MINSTREL:JOB_BABY_WANDERER; case MAPID_BABY_SURA: return JOB_BABY_SURA; case MAPID_BABY_GENETIC: return JOB_BABY_GENETIC; - case MAPID_BABY_CHASER: return JOB_BABY_CHASER; + case MAPID_BABY_SHADOW_CHASER: return JOB_BABY_SHADOW_CHASER; case MAPID_BABY_SOUL_REAPER: return JOB_BABY_SOUL_REAPER; //Doram Jobs case MAPID_SUMMONER: return JOB_SUMMONER; @@ -6649,25 +6649,25 @@ const char* job_name(int class_) case JOB_MECHANIC_T2: return msg_txt(NULL,629); - case JOB_BABY_RUNE: + case JOB_BABY_RUNE_KNIGHT: case JOB_BABY_WARLOCK: case JOB_BABY_RANGER: - case JOB_BABY_BISHOP: + case JOB_BABY_ARCH_BISHOP: case JOB_BABY_MECHANIC: - case JOB_BABY_CROSS: - case JOB_BABY_GUARD: + case JOB_BABY_GUILLOTINE_CROSS: + case JOB_BABY_ROYAL_GUARD: case JOB_BABY_SORCERER: case JOB_BABY_MINSTREL: case JOB_BABY_WANDERER: case JOB_BABY_SURA: case JOB_BABY_GENETIC: - case JOB_BABY_CHASER: - return msg_txt(NULL,638 - JOB_BABY_RUNE+class_); + case JOB_BABY_SHADOW_CHASER: + return msg_txt(NULL,638 - JOB_BABY_RUNE_KNIGHT+class_); - case JOB_BABY_RUNE2: + case JOB_BABY_RUNE_KNIGHT2: return msg_txt(NULL,638); - case JOB_BABY_GUARD2: + case JOB_BABY_ROYAL_GUARD2: return msg_txt(NULL,644); case JOB_BABY_RANGER2: diff --git a/src/map/pc.hpp b/src/map/pc.hpp index fb95bba093..2932ae9269 100644 --- a/src/map/pc.hpp +++ b/src/map/pc.hpp @@ -961,15 +961,15 @@ short pc_maxaspd(struct map_session_data *sd); //JOB_NOVICE isn't checked for class_ is supposed to be unsigned #define pcdb_checkid_sub(class_) ( \ ( (class_) < JOB_MAX_BASIC ) || \ - ( (class_) >= JOB_NOVICE_HIGH && (class_) <= JOB_DARK_COLLECTOR ) || \ - ( (class_) >= JOB_RUNE_KNIGHT && (class_) <= JOB_MECHANIC_T2 ) || \ - ( (class_) >= JOB_BABY_RUNE && (class_) <= JOB_BABY_MECHANIC2 ) || \ - ( (class_) >= JOB_SUPER_NOVICE_E && (class_) <= JOB_SUPER_BABY_E ) || \ - ( (class_) >= JOB_KAGEROU && (class_) <= JOB_OBORO ) || \ - (class_) == JOB_REBELLION || (class_) == JOB_SUMMONER || \ - (class_) == JOB_BABY_SUMMONER || \ - ( (class_) >= JOB_BABY_NINJA && (class_) <= JOB_BABY_REBELLION ) || \ - ( (class_) >= JOB_BABY_STAR_GLADIATOR2 && (class_) <= JOB_BABY_STAR_EMPEROR2 ) \ + ( (class_) >= JOB_NOVICE_HIGH && (class_) <= JOB_DARK_COLLECTOR ) || \ + ( (class_) >= JOB_RUNE_KNIGHT && (class_) <= JOB_MECHANIC_T2 ) || \ + ( (class_) >= JOB_BABY_RUNE_KNIGHT && (class_) <= JOB_BABY_MECHANIC2 ) || \ + ( (class_) >= JOB_SUPER_NOVICE_E && (class_) <= JOB_SUPER_BABY_E ) || \ + ( (class_) >= JOB_KAGEROU && (class_) <= JOB_OBORO ) || \ + (class_) == JOB_REBELLION || (class_) == JOB_SUMMONER || \ + (class_) == JOB_BABY_SUMMONER || \ + ( (class_) >= JOB_BABY_NINJA && (class_) <= JOB_BABY_REBELLION ) || \ + ( (class_) >= JOB_BABY_STAR_GLADIATOR2 && (class_) <= JOB_BABY_STAR_EMPEROR2 ) \ ) #define pcdb_checkid(class_) pcdb_checkid_sub((unsigned int)class_) diff --git a/src/map/script_constants.hpp b/src/map/script_constants.hpp index 5d44a3b335..40fa6288ba 100644 --- a/src/map/script_constants.hpp +++ b/src/map/script_constants.hpp @@ -171,22 +171,31 @@ export_constant(JOB_MECHANIC2); export_constant(JOB_MECHANIC_T2); - export_constant(JOB_BABY_RUNE); + export_deprecated_constant3("JOB_BABY_RUNE", JOB_BABY_RUNE_KNIGHT, "JOB_BABY_RUNE_KNIGHT"); + export_deprecated_constant3("JOB_BABY_BISHOP", JOB_BABY_ARCH_BISHOP, "JOB_BABY_ARCH_BISHOP"); + export_deprecated_constant3("JOB_BABY_CROSS", JOB_BABY_GUILLOTINE_CROSS, "JOB_BABY_GUILLOTINE_CROSS"); + export_deprecated_constant3("JOB_BABY_GUARD", JOB_BABY_ROYAL_GUARD, "JOB_BABY_ROYAL_GUARD"); + export_deprecated_constant3("JOB_BABY_CHASER", JOB_BABY_SHADOW_CHASER, "JOB_BABY_SHADOW_CHASER"); + + export_deprecated_constant3("JOB_BABY_RUNE2", JOB_BABY_RUNE_KNIGHT2, "JOB_BABY_RUNE_KNIGHT2"); + export_deprecated_constant3("JOB_BABY_GUARD2", JOB_BABY_ROYAL_GUARD2, "JOB_BABY_ROYAL_GUARD2"); + + export_constant(JOB_BABY_RUNE_KNIGHT); export_constant(JOB_BABY_WARLOCK); export_constant(JOB_BABY_RANGER); - export_constant(JOB_BABY_BISHOP); + export_constant(JOB_BABY_ARCH_BISHOP); export_constant(JOB_BABY_MECHANIC); - export_constant(JOB_BABY_CROSS); - export_constant(JOB_BABY_GUARD); + export_constant(JOB_BABY_GUILLOTINE_CROSS); + export_constant(JOB_BABY_ROYAL_GUARD); export_constant(JOB_BABY_SORCERER); export_constant(JOB_BABY_MINSTREL); export_constant(JOB_BABY_WANDERER); export_constant(JOB_BABY_SURA); export_constant(JOB_BABY_GENETIC); - export_constant(JOB_BABY_CHASER); + export_constant(JOB_BABY_SHADOW_CHASER); - export_constant(JOB_BABY_RUNE2); - export_constant(JOB_BABY_GUARD2); + export_constant(JOB_BABY_RUNE_KNIGHT2); + export_constant(JOB_BABY_ROYAL_GUARD2); export_constant(JOB_BABY_RANGER2); export_constant(JOB_BABY_MECHANIC2); @@ -346,20 +355,26 @@ export_constant2("EAJ_GENETIC_T",MAPID_GENETIC_T); export_constant2("EAJ_SHADOW_CHASER_T",MAPID_SHADOW_CHASER_T); - export_constant2("EAJ_BABY_RUNE",MAPID_BABY_RUNE); + export_deprecated_constant3("EAJ_BABY_RUNE", MAPID_BABY_RUNE_KNIGHT, "EAJ_BABY_RUNE_KNIGHT"); + export_deprecated_constant3("EAJ_BABY_CROSS", MAPID_BABY_GUILLOTINE_CROSS, "EAJ_BABY_GUILLOTINE_CROSS"); + export_deprecated_constant3("EAJ_BABY_BISHOP", MAPID_BABY_ARCH_BISHOP, "EAJ_BABY_ARCH_BISHOP"); + export_deprecated_constant3("EAJ_BABY_GUARD", MAPID_BABY_ROYAL_GUARD, "EAJ_BABY_ROYAL_GUARD"); + export_deprecated_constant3("EAJ_BABY_CHASER", MAPID_BABY_SHADOW_CHASER, "EAJ_BABY_SHADOW_CHASER"); + + export_constant2("EAJ_BABY_RUNE_KNIGHT",MAPID_BABY_RUNE_KNIGHT); export_constant2("EAJ_BABY_WARLOCK",MAPID_BABY_WARLOCK); export_constant2("EAJ_BABY_RANGER",MAPID_BABY_RANGER); - export_constant2("EAJ_BABY_BISHOP",MAPID_BABY_BISHOP); + export_constant2("EAJ_BABY_ARCH_BISHOP",MAPID_BABY_ARCH_BISHOP); export_constant2("EAJ_BABY_MECHANIC",MAPID_BABY_MECHANIC); - export_constant2("EAJ_BABY_CROSS",MAPID_BABY_CROSS); + export_constant2("EAJ_BABY_GUILLOTINE_CROSS",MAPID_BABY_GUILLOTINE_CROSS); export_constant2("EAJ_BABY_STAR_EMPEROR",MAPID_BABY_STAR_EMPEROR); - export_constant2("EAJ_BABY_GUARD",MAPID_BABY_GUARD); + export_constant2("EAJ_BABY_ROYAL_GUARD",MAPID_BABY_ROYAL_GUARD); export_constant2("EAJ_BABY_SORCERER",MAPID_BABY_SORCERER); export_constant2("EAJ_BABY_MINSTRELWANDERER",MAPID_BABY_MINSTRELWANDERER); export_constant2("EAJ_BABY_SURA",MAPID_BABY_SURA); export_constant2("EAJ_BABY_GENETIC",MAPID_BABY_GENETIC); - export_constant2("EAJ_BABY_CHASER",MAPID_BABY_CHASER); + export_constant2("EAJ_BABY_SHADOW_CHASER",MAPID_BABY_SHADOW_CHASER); export_constant2("EAJ_BABY_SOUL_REAPER",MAPID_BABY_SOUL_REAPER); export_constant2("EAJ_SUPER_NOVICE",MAPID_SUPER_NOVICE); diff --git a/src/map/skill.cpp b/src/map/skill.cpp index 108c066540..836f78654c 100755 --- a/src/map/skill.cpp +++ b/src/map/skill.cpp @@ -734,7 +734,7 @@ static int8 skill_isCopyable(struct map_session_data *sd, uint16 skill_idx) { if (job_allowed&0x04 && sd->status.class_ == JOB_SHADOW_CHASER) break; if (job_allowed&0x08 && sd->status.class_ == JOB_SHADOW_CHASER_T) break; if (job_allowed&0x10 && sd->status.class_ == JOB_BABY_ROGUE) break; - if (job_allowed&0x20 && sd->status.class_ == JOB_BABY_CHASER) break; + if (job_allowed&0x20 && sd->status.class_ == JOB_BABY_SHADOW_CHASER) break; return 0; } }