summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-11-13 18:38:15 -0300
committerJesusaves <cpntb1@ymail.com>2020-11-13 18:38:15 -0300
commit833e446248a47c1731ecab3dbe763653d4bd1c49 (patch)
tree3a7d2bd746f3070923ffb5f280ba4a8a083d2869
parent3122b610b6b6689125ae0089392edf810e083038 (diff)
downloadserverdata-833e446248a47c1731ecab3dbe763653d4bd1c49.tar.gz
serverdata-833e446248a47c1731ecab3dbe763653d4bd1c49.tar.bz2
serverdata-833e446248a47c1731ecab3dbe763653d4bd1c49.tar.xz
serverdata-833e446248a47c1731ecab3dbe763653d4bd1c49.zip
Followup for clientdata!196 - Register the NPCs on Constant Database
-rw-r--r--db/constants.conf38
-rw-r--r--npc/functions/fishing.txt2
2 files changed, 33 insertions, 7 deletions
diff --git a/db/constants.conf b/db/constants.conf
index 51ff9967..895d575f 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -704,7 +704,7 @@ more than one separator can be used in a row (so 12_3___456 is illegal).
Ele_Holy: 6
Ele_Dark: 7
- // Kept for Compatibility
+ // Kept for Compatibility
Ele_Earth: 2
Ele_Wind: 2 // 4
Ele_Poison: 2 // 5
@@ -4971,6 +4971,20 @@ more than one separator can be used in a row (so 12_3___456 is illegal).
NPC_JUKEBOX: 228
NPC_LA_MARINE: 229
NPC_TIKI: 230
+ NPC_GOLBENEZ: 231
+ NPC_REIDCHEF: 232
+ NPC_ARCHIBALD: 233
+ NPC_LEOFWIN: 234
+ NPC_UMFREY: 235
+ NPC_LOVERS: 236
+ NPC_BARBARA: 237
+ NPC_WOLFGANG: 238
+ NPC_BENNET: 239
+ NPC_EDWIN: 240
+ NPC_DARNEL: 241
+ NPC_ESTRILDA: 242
+ NPC_CARETAKER: 243
+ NPC_CARETAKER_WIFE: 244
NPC_CONFUSED_TREE: 400
NPC_ALIGE: 401
@@ -5049,6 +5063,18 @@ more than one separator can be used in a row (so 12_3___456 is illegal).
NPC_MAGE_BLUE: 476
NPC_HAL: 477
NPC_SUMMONING_CIRC: 478
+ NPC_MOUBOOMASTER: 479
+ NPC_UNDEAD_RECPTION: 480
+ NPC_UNDEAD_GUARD: 481
+ NPC_JPMORBID: 482
+ NPC_HAMOND: 483
+ NPC_THURSTAN: 484
+ NPC_SAVARIC: 485
+ NPC_REID: 486
+ NPC_NIGEL: 487
+ NPC_EURNI: 488
+ NPC_CHRONOS: 489
+ NPC_UNDEAD_WEPPER: 490
NPC_TEST1: 800
NPC_PLAYER: 801
@@ -5065,7 +5091,7 @@ more than one separator can be used in a row (so 12_3___456 is illegal).
NPC_DAN_NOTE: 912
NPC_OFFSET_NO_SPRITE: 998
- // Avatars (1000+)
+ // Avatars (1000+)
AVATAR_CARDA: 1000
AVATAR_CARD2: 1001
AVATAR_CARD3: 1002
@@ -5197,10 +5223,10 @@ more than one separator can be used in a row (so 12_3___456 is illegal).
comment__: "Daily Constants"
DAILY_LOWLEVEL: 0
- DAILY_IGNORED: 1
- DAILY_NOPTS: 2
- DAILY_NOITEMS: 3
- DAILY_OK: 4
+ DAILY_IGNORED: 1
+ DAILY_NOPTS: 2
+ DAILY_NOITEMS: 3
+ DAILY_OK: 4
comment__: "Misc settings"
CHEST_WAITTIME: 900 // 15 minutes
diff --git a/npc/functions/fishing.txt b/npc/functions/fishing.txt
index 0e9e791d..4dcb4882 100644
--- a/npc/functions/fishing.txt
+++ b/npc/functions/fishing.txt
@@ -380,7 +380,7 @@ OnInit:
// #fish_frozen - A fishing spot with cold waters (for Nivalis)
-- script #fish_river2 NPC_WATER_SPLASH,{
+- script #fish_frozen NPC_WATER_SPLASH,{
fishing(); // begin or continue fishing
close;