From 0b7b3796ec987cbb1c263722b841cfa5795aa6d3 Mon Sep 17 00:00:00 2001 From: Haru Date: Fri, 8 Nov 2013 03:09:20 +0100 Subject: Added support for monster spritename constants - Follow-up to 124ab2a1cdb344f24170a4d91f7000ebabf39b40 - Replaced numeric IDs in NPC definitions and setnpcdisplay calls with the appropriate constants - Made possible thanks to Ind Signed-off-by: Haru --- npc/re/quests/eden/eden_iro.txt | 2 +- npc/re/quests/quests_brasilis.txt | 10 +++++----- npc/re/quests/quests_malaya.txt | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'npc/re/quests') diff --git a/npc/re/quests/eden/eden_iro.txt b/npc/re/quests/eden/eden_iro.txt index 8b81b5c4f..b4400854f 100644 --- a/npc/re/quests/eden/eden_iro.txt +++ b/npc/re/quests/eden/eden_iro.txt @@ -567,7 +567,7 @@ moc_para01,13,22,4 script Merry Badger#xch 4_F_SITDOWN,{ //switch(select("Redeem Badges:Trade in FOR badges:Exchange Rates:15 Job Manuals - 1 JM Box")) { } -moc_para01,174,33,3 script Bathory#2012spirits 1102,{ +moc_para01,174,33,3 script Bathory#2012spirits BATHORY,{ mes "[Bathory]"; mes "Eheeheeheehee! The spotlight is on Glast Heim this week, so I'm ferrying people there for a mere 1,000z!"; next; diff --git a/npc/re/quests/quests_brasilis.txt b/npc/re/quests/quests_brasilis.txt index 5276fafe5..7c5ccbc7b 100644 --- a/npc/re/quests/quests_brasilis.txt +++ b/npc/re/quests/quests_brasilis.txt @@ -861,7 +861,7 @@ brasilis,59,226,3 script Poring#bra 4_PORING,{ end; } -bra_fild01,75,83,5 script Toucan#bra 2073,2,2,{ +bra_fild01,75,83,5 script Toucan#bra TOUCAN,2,2,{ OnTouch: if (brazil_gua == 6) { mes "[Toucan]"; @@ -921,7 +921,7 @@ OnTouch: end; } -bra_fild01,34,184,5 script Jaguar#bra 2072,2,2,{ +bra_fild01,34,184,5 script Jaguar#bra JAGUAR,2,2,{ OnTouch_: if (brazil_gua == 7) { mes "[Jaguar]"; @@ -983,7 +983,7 @@ OnTouch_: end; } -bra_fild01,245,53,3 script #Monkeybra 1057,{ +bra_fild01,245,53,3 script #Monkeybra YOYO,{ end; } @@ -2661,7 +2661,7 @@ bra_in01,151,180,3 script Mirror#bra CLEAR_NPC,{ } } -bra_in01,136,180,5 script Ghost#bra 1867,{ +bra_in01,136,180,5 script Ghost#bra BANSHEE,{ end; OnInit: @@ -2832,7 +2832,7 @@ bra_fild01,323,136,1 script Pipe#brafild CLEAR_NPC,{ } } -bra_in01,206,190,3 script Ghost#bra_end 1867,{ +bra_in01,206,190,3 script Ghost#bra_end BANSHEE,{ end; OnInit: diff --git a/npc/re/quests/quests_malaya.txt b/npc/re/quests/quests_malaya.txt index 3487871b4..edc964053 100644 --- a/npc/re/quests/quests_malaya.txt +++ b/npc/re/quests/quests_malaya.txt @@ -2472,7 +2472,7 @@ L_SetQuest: close; } -ma_in01,125,107,3 script Ghost Diwata 1761,4,4,{ +ma_in01,125,107,3 script Ghost Diwata G_SKOGUL,4,4,{ end; OnTouch: if (malaya_diwata == 0) { -- cgit v1.2.3-70-g09d2 From 63d5893206ba2c6574744fea6dcc4e37b1126c8a Mon Sep 17 00:00:00 2001 From: Haru Date: Fri, 8 Nov 2013 03:10:37 +0100 Subject: Added mercenary/homunculus constants from Aegis - Follow-up to 124ab2a1cdb344f24170a4d91f7000ebabf39b40 - Replaced last leftover numeric sprite ID with the appropriate constant - Special thanks to Ind Signed-off-by: Haru --- db/const.txt | 47 +++++++++++++++++++++++++++++++++++++++++++++++ npc/re/quests/homun_s.txt | 2 +- 2 files changed, 48 insertions(+), 1 deletion(-) (limited to 'npc/re/quests') diff --git a/db/const.txt b/db/const.txt index a90b87356..fce4f54a9 100644 --- a/db/const.txt +++ b/db/const.txt @@ -3234,6 +3234,53 @@ THANATOS_KEEP 10009 4_GIGANTES_SMALL 10069 4_GARGOYLE_STATUE 10070 +MER_LIF 6001 +MER_AMISTR 6002 +MER_FILIR 6003 +MER_VANILMIRTH 6004 +MER_LIF2 6005 +MER_AMISTR2 6006 +MER_FILIR2 6007 +MER_VANILMIRTH2 6008 +MER_LIF_H 6009 +MER_AMISTR_H 6010 +MER_FILIR_H 6011 +MER_VANILMIRTH_H 6012 +MER_LIF_H2 6013 +MER_AMISTR_H2 6014 +MER_FILIR_H2 6015 +MER_VANILMIRTH_H2 6016 +MER_ARCHER01 6017 +MER_ARCHER02 6018 +MER_ARCHER03 6019 +MER_ARCHER04 6020 +MER_ARCHER05 6021 +MER_ARCHER06 6022 +MER_ARCHER07 6023 +MER_ARCHER08 6024 +MER_ARCHER09 6025 +MER_ARCHER10 6026 +MER_LANCER01 6027 +MER_LANCER02 6028 +MER_LANCER03 6029 +MER_LANCER04 6030 +MER_LANCER05 6031 +MER_LANCER06 6032 +MER_LANCER07 6033 +MER_LANCER08 6034 +MER_LANCER09 6035 +MER_LANCER10 6036 +MER_SWORDMAN01 6037 +MER_SWORDMAN02 6038 +MER_SWORDMAN03 6039 +MER_SWORDMAN04 6040 +MER_SWORDMAN05 6041 +MER_SWORDMAN06 6042 +MER_SWORDMAN07 6043 +MER_SWORDMAN08 6044 +MER_SWORDMAN09 6045 +MER_SWORDMAN10 6046 + HAVEQUEST 0 PLAYTIME 1 HUNTING 2 diff --git a/npc/re/quests/homun_s.txt b/npc/re/quests/homun_s.txt index 4a6adc88d..9ef1a2b6e 100644 --- a/npc/re/quests/homun_s.txt +++ b/npc/re/quests/homun_s.txt @@ -1327,7 +1327,7 @@ que_house_s,14,52,3 script #04homun_s HIDDEN_NPC,{ // Researcher's Pet //============================================================ -que_house_s,24,46,3 script Jonathan#homun_s 6002,{ +que_house_s,24,46,3 script Jonathan#homun_s MER_AMISTR,{ end; } -- cgit v1.2.3-70-g09d2