summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2013-11-08 03:10:37 +0100
committerHaru <haru@dotalux.com>2013-11-08 03:12:33 +0100
commit63d5893206ba2c6574744fea6dcc4e37b1126c8a (patch)
tree30f47108a338a72f5fff054a49d726a66dca4b16
parent0b7b3796ec987cbb1c263722b841cfa5795aa6d3 (diff)
downloadhercules-63d5893206ba2c6574744fea6dcc4e37b1126c8a.tar.gz
hercules-63d5893206ba2c6574744fea6dcc4e37b1126c8a.tar.bz2
hercules-63d5893206ba2c6574744fea6dcc4e37b1126c8a.tar.xz
hercules-63d5893206ba2c6574744fea6dcc4e37b1126c8a.zip
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 <haru@dotalux.com>
-rw-r--r--db/const.txt47
-rw-r--r--npc/re/quests/homun_s.txt2
2 files changed, 48 insertions, 1 deletions
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;
}