From 92847f0cf1f74a4b6541d00960b34aabd57e9608 Mon Sep 17 00:00:00 2001 From: ErikasKontenis Date: Mon, 5 Jul 2021 15:33:46 +0300 Subject: [PATCH] monsters start with capital name --- config.lua | 2 +- data/creaturescripts/scripts/login.lua | 5 ++++- data/monster/amazon.xml | 2 +- data/monster/ancientscarab.xml | 2 +- data/monster/assassin.xml | 2 +- data/monster/badger.xml | 2 +- data/monster/bandit.xml | 2 +- data/monster/banshee.xml | 2 +- data/monster/bat.xml | 2 +- data/monster/bear.xml | 2 +- data/monster/behemoth.xml | 2 +- data/monster/beholder.xml | 2 +- data/monster/blackknight.xml | 2 +- data/monster/blacksheep.xml | 2 +- data/monster/bluedjinn.xml | 2 +- data/monster/bonebeast.xml | 2 +- data/monster/bug.xml | 2 +- data/monster/butterflyblue.xml | 2 +- data/monster/butterflypurple.xml | 2 +- data/monster/butterflyred.xml | 2 +- data/monster/butterflyyellow.xml | 2 +- data/monster/carniphila.xml | 2 +- data/monster/caverat.xml | 2 +- data/monster/centipede.xml | 2 +- data/monster/chicken.xml | 2 +- data/monster/cobra.xml | 2 +- data/monster/crab.xml | 2 +- data/monster/crocodile.xml | 2 +- data/monster/cryptshambler.xml | 2 +- data/monster/cyclops.xml | 2 +- data/monster/darkmonk.xml | 2 +- data/monster/deathslicer.xml | 2 +- data/monster/deer.xml | 2 +- data/monster/demon.xml | 2 +- data/monster/demonskeleton.xml | 2 +- data/monster/dog.xml | 2 +- data/monster/dragon.xml | 2 +- data/monster/dragonlord.xml | 2 +- data/monster/dwarf.xml | 2 +- data/monster/dwarfgeomancer.xml | 2 +- data/monster/dwarfguard.xml | 2 +- data/monster/dwarfsoldier.xml | 2 +- data/monster/dworcfleshhunter.xml | 2 +- data/monster/dworcvenomsniper.xml | 2 +- data/monster/dworcvoodoomaster.xml | 2 +- data/monster/efreet.xml | 2 +- data/monster/elderbeholder.xml | 2 +- data/monster/elephant.xml | 2 +- data/monster/elf.xml | 2 +- data/monster/elfarcanist.xml | 2 +- data/monster/elfscout.xml | 2 +- data/monster/firedevil.xml | 2 +- data/monster/fireelemental.xml | 2 +- data/monster/flamethrower.xml | 2 +- data/monster/flamingo.xml | 2 +- data/monster/frosttroll.xml | 2 +- data/monster/gargoyle.xml | 2 +- data/monster/gazer.xml | 2 +- data/monster/ghost.xml | 2 +- data/monster/ghoul.xml | 2 +- data/monster/giantspider.xml | 2 +- data/monster/goblin.xml | 2 +- data/monster/greendjinn.xml | 2 +- data/monster/hero.xml | 2 +- data/monster/hunter.xml | 2 +- data/monster/hyaena.xml | 2 +- data/monster/hydra.xml | 2 +- data/monster/illusion.xml | 2 +- data/monster/kongra.xml | 2 +- data/monster/larva.xml | 2 +- data/monster/lich.xml | 2 +- data/monster/lion.xml | 2 +- data/monster/lizardsentinel.xml | 2 +- data/monster/lizardsnakecharmer.xml | 2 +- data/monster/lizardtemplar.xml | 2 +- data/monster/magicthrower.xml | 2 +- data/monster/marid.xml | 2 +- data/monster/merlkin.xml | 2 +- data/monster/mimic.xml | 2 +- data/monster/minotaur.xml | 2 +- data/monster/minotaurarcher.xml | 2 +- data/monster/minotaurguard.xml | 2 +- data/monster/minotaurmage.xml | 2 +- data/monster/monk.xml | 2 +- data/monster/mummy.xml | 2 +- data/monster/necromancer.xml | 2 +- data/monster/orc.xml | 2 +- data/monster/orcberserker.xml | 2 +- data/monster/orcleader.xml | 2 +- data/monster/orcrider.xml | 2 +- data/monster/orcshaman.xml | 2 +- data/monster/orcspearman.xml | 2 +- data/monster/orcwarlord.xml | 2 +- data/monster/orcwarrior.xml | 2 +- data/monster/panda.xml | 2 +- data/monster/parrot.xml | 2 +- data/monster/pig.xml | 2 +- data/monster/plaguethrower.xml | 2 +- data/monster/poisonspider.xml | 2 +- data/monster/polarbear.xml | 2 +- data/monster/priestess.xml | 2 +- data/monster/rabbit.xml | 2 +- data/monster/rat.xml | 2 +- data/monster/rotworm.xml | 2 +- data/monster/scarab.xml | 2 +- data/monster/scorpion.xml | 2 +- data/monster/serpentspawn.xml | 2 +- data/monster/sheep.xml | 2 +- data/monster/shredderthrower.xml | 2 +- data/monster/sibang.xml | 2 +- data/monster/skeleton.xml | 2 +- data/monster/skunk.xml | 2 +- data/monster/slime.xml | 2 +- data/monster/slime2.xml | 2 +- data/monster/smuggler.xml | 2 +- data/monster/snake.xml | 2 +- data/monster/spider.xml | 2 +- data/monster/spitnettle.xml | 2 +- data/monster/stalker.xml | 2 +- data/monster/stonegolem.xml | 2 +- data/monster/swamptroll.xml | 2 +- data/monster/tarantula.xml | 2 +- data/monster/terrorbird.xml | 2 +- data/monster/tiger.xml | 2 +- data/monster/troll.xml | 2 +- data/monster/valkyrie.xml | 2 +- data/monster/vampire.xml | 2 +- data/monster/warlock.xml | 2 +- data/monster/warwolf.xml | 2 +- data/monster/wasp.xml | 2 +- data/monster/wildwarrior.xml | 2 +- data/monster/winterwolf.xml | 2 +- data/monster/witch.xml | 2 +- data/monster/wolf.xml | 2 +- data/monster/yeti.xml | 2 +- data/npc/santaclaus.npc | 2 +- src/protocolgame.cpp | 2 +- 137 files changed, 140 insertions(+), 137 deletions(-) diff --git a/config.lua b/config.lua index 8af170f..8b89731 100644 --- a/config.lua +++ b/config.lua @@ -1,6 +1,6 @@ -- Custom clientVersion = 792 -knightCloseAttackDamageIncreasePercent = 10 +knightCloseAttackDamageIncreasePercent = 15 paladinRangeAttackDamageIncreasePercent = 10 -- Min/Max rate spawn is a multiplication of the map spawntime in spawns.xml Regular monster spawn time is 600. The formula would be randomValue = random(600*100, 600*200) which varies between 60s and 120s minRateSpawn = 100 diff --git a/data/creaturescripts/scripts/login.lua b/data/creaturescripts/scripts/login.lua index 4e5558c..5d1824c 100644 --- a/data/creaturescripts/scripts/login.lua +++ b/data/creaturescripts/scripts/login.lua @@ -192,7 +192,10 @@ local fakePlayers = { {x = 33313, y = 31946, z = 7}, {x = 33314, y = 31882, z = 7}, {x = 33280, y = 31842, z = 8}, - {x = 33226, y = 32869, z = 7} + {x = 33226, y = 32869, z = 7}, + {x = 33204, y = 31909, z = 7}, + {x = 33218, y = 31924, z = 7}, + {x = 33220, y = 31924, z = 7} } local fakePlayerOutfits = { diff --git a/data/monster/amazon.xml b/data/monster/amazon.xml index 37dfc4e..086316b 100644 --- a/data/monster/amazon.xml +++ b/data/monster/amazon.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/ancientscarab.xml b/data/monster/ancientscarab.xml index 4fe9f61..46e994f 100644 --- a/data/monster/ancientscarab.xml +++ b/data/monster/ancientscarab.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/assassin.xml b/data/monster/assassin.xml index 6d4fc7b..3094f53 100644 --- a/data/monster/assassin.xml +++ b/data/monster/assassin.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/badger.xml b/data/monster/badger.xml index d07a9f9..fbba5a2 100644 --- a/data/monster/badger.xml +++ b/data/monster/badger.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/bandit.xml b/data/monster/bandit.xml index 63e4058..53988c3 100644 --- a/data/monster/bandit.xml +++ b/data/monster/bandit.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/banshee.xml b/data/monster/banshee.xml index 8864d60..04e24a2 100644 --- a/data/monster/banshee.xml +++ b/data/monster/banshee.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/bat.xml b/data/monster/bat.xml index 0d9b952..6989e62 100644 --- a/data/monster/bat.xml +++ b/data/monster/bat.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/bear.xml b/data/monster/bear.xml index 77daf88..bee5c9e 100644 --- a/data/monster/bear.xml +++ b/data/monster/bear.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/behemoth.xml b/data/monster/behemoth.xml index 782b73d..54a1bf3 100644 --- a/data/monster/behemoth.xml +++ b/data/monster/behemoth.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/beholder.xml b/data/monster/beholder.xml index 9ddbbce..3ba751a 100644 --- a/data/monster/beholder.xml +++ b/data/monster/beholder.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/blackknight.xml b/data/monster/blackknight.xml index 338d3c9..67b04af 100644 --- a/data/monster/blackknight.xml +++ b/data/monster/blackknight.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/blacksheep.xml b/data/monster/blacksheep.xml index ebb9890..dff5c86 100644 --- a/data/monster/blacksheep.xml +++ b/data/monster/blacksheep.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/bluedjinn.xml b/data/monster/bluedjinn.xml index 42b4c65..87c4b31 100644 --- a/data/monster/bluedjinn.xml +++ b/data/monster/bluedjinn.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/bonebeast.xml b/data/monster/bonebeast.xml index d0d7e8c..1022412 100644 --- a/data/monster/bonebeast.xml +++ b/data/monster/bonebeast.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/bug.xml b/data/monster/bug.xml index 94c361e..a30e225 100644 --- a/data/monster/bug.xml +++ b/data/monster/bug.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/butterflyblue.xml b/data/monster/butterflyblue.xml index cec7961..1c8b161 100644 --- a/data/monster/butterflyblue.xml +++ b/data/monster/butterflyblue.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/butterflypurple.xml b/data/monster/butterflypurple.xml index 75bfe9c..ab1805b 100644 --- a/data/monster/butterflypurple.xml +++ b/data/monster/butterflypurple.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/butterflyred.xml b/data/monster/butterflyred.xml index 36f330a..2e4c883 100644 --- a/data/monster/butterflyred.xml +++ b/data/monster/butterflyred.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/butterflyyellow.xml b/data/monster/butterflyyellow.xml index 500a175..e0acc42 100644 --- a/data/monster/butterflyyellow.xml +++ b/data/monster/butterflyyellow.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/carniphila.xml b/data/monster/carniphila.xml index 0752f93..e6ec095 100644 --- a/data/monster/carniphila.xml +++ b/data/monster/carniphila.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/caverat.xml b/data/monster/caverat.xml index 1f406b3..6b5afab 100644 --- a/data/monster/caverat.xml +++ b/data/monster/caverat.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/centipede.xml b/data/monster/centipede.xml index 413cfe3..599bd34 100644 --- a/data/monster/centipede.xml +++ b/data/monster/centipede.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/chicken.xml b/data/monster/chicken.xml index 9d6b9af..d2e6394 100644 --- a/data/monster/chicken.xml +++ b/data/monster/chicken.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/cobra.xml b/data/monster/cobra.xml index a8e53f9..73f44e7 100644 --- a/data/monster/cobra.xml +++ b/data/monster/cobra.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/crab.xml b/data/monster/crab.xml index 8842ee9..d68c19f 100644 --- a/data/monster/crab.xml +++ b/data/monster/crab.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/crocodile.xml b/data/monster/crocodile.xml index a58ea18..d9c9ec8 100644 --- a/data/monster/crocodile.xml +++ b/data/monster/crocodile.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/cryptshambler.xml b/data/monster/cryptshambler.xml index 90de258..ca632b7 100644 --- a/data/monster/cryptshambler.xml +++ b/data/monster/cryptshambler.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/cyclops.xml b/data/monster/cyclops.xml index d6ee2f3..8b80d25 100644 --- a/data/monster/cyclops.xml +++ b/data/monster/cyclops.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/darkmonk.xml b/data/monster/darkmonk.xml index d1fe7f7..f79e1b5 100644 --- a/data/monster/darkmonk.xml +++ b/data/monster/darkmonk.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/deathslicer.xml b/data/monster/deathslicer.xml index e159361..5d81036 100644 --- a/data/monster/deathslicer.xml +++ b/data/monster/deathslicer.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/deer.xml b/data/monster/deer.xml index 4267d79..d7de253 100644 --- a/data/monster/deer.xml +++ b/data/monster/deer.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/demon.xml b/data/monster/demon.xml index 0fc9774..a5e2460 100644 --- a/data/monster/demon.xml +++ b/data/monster/demon.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/demonskeleton.xml b/data/monster/demonskeleton.xml index c05cf0f..1fcb7a8 100644 --- a/data/monster/demonskeleton.xml +++ b/data/monster/demonskeleton.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/dog.xml b/data/monster/dog.xml index 0e26cff..8b77c07 100644 --- a/data/monster/dog.xml +++ b/data/monster/dog.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/dragon.xml b/data/monster/dragon.xml index 2c57489..ebed74e 100644 --- a/data/monster/dragon.xml +++ b/data/monster/dragon.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/dragonlord.xml b/data/monster/dragonlord.xml index e0fcc4d..9ed6ee4 100644 --- a/data/monster/dragonlord.xml +++ b/data/monster/dragonlord.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/dwarf.xml b/data/monster/dwarf.xml index cc187a2..2e317ac 100644 --- a/data/monster/dwarf.xml +++ b/data/monster/dwarf.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/dwarfgeomancer.xml b/data/monster/dwarfgeomancer.xml index 4dbb92b..fe13f56 100644 --- a/data/monster/dwarfgeomancer.xml +++ b/data/monster/dwarfgeomancer.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/dwarfguard.xml b/data/monster/dwarfguard.xml index 5a25481..2186e89 100644 --- a/data/monster/dwarfguard.xml +++ b/data/monster/dwarfguard.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/dwarfsoldier.xml b/data/monster/dwarfsoldier.xml index dc6ada3..a5a243f 100644 --- a/data/monster/dwarfsoldier.xml +++ b/data/monster/dwarfsoldier.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/dworcfleshhunter.xml b/data/monster/dworcfleshhunter.xml index 8d17182..833ebf3 100644 --- a/data/monster/dworcfleshhunter.xml +++ b/data/monster/dworcfleshhunter.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/dworcvenomsniper.xml b/data/monster/dworcvenomsniper.xml index 3eb537a..b8da58e 100644 --- a/data/monster/dworcvenomsniper.xml +++ b/data/monster/dworcvenomsniper.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/dworcvoodoomaster.xml b/data/monster/dworcvoodoomaster.xml index 6f77636..38d4521 100644 --- a/data/monster/dworcvoodoomaster.xml +++ b/data/monster/dworcvoodoomaster.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/efreet.xml b/data/monster/efreet.xml index 65c1448..cfdc446 100644 --- a/data/monster/efreet.xml +++ b/data/monster/efreet.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/elderbeholder.xml b/data/monster/elderbeholder.xml index 2774cc5..da6f0d1 100644 --- a/data/monster/elderbeholder.xml +++ b/data/monster/elderbeholder.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/elephant.xml b/data/monster/elephant.xml index 122945b..ca2eb8e 100644 --- a/data/monster/elephant.xml +++ b/data/monster/elephant.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/elf.xml b/data/monster/elf.xml index 811094a..e4acc24 100644 --- a/data/monster/elf.xml +++ b/data/monster/elf.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/elfarcanist.xml b/data/monster/elfarcanist.xml index 824e502..c40323f 100644 --- a/data/monster/elfarcanist.xml +++ b/data/monster/elfarcanist.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/elfscout.xml b/data/monster/elfscout.xml index fff5943..364bfd6 100644 --- a/data/monster/elfscout.xml +++ b/data/monster/elfscout.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/firedevil.xml b/data/monster/firedevil.xml index 54871c0..4161f2a 100644 --- a/data/monster/firedevil.xml +++ b/data/monster/firedevil.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/fireelemental.xml b/data/monster/fireelemental.xml index 5f6d6a0..21d7546 100644 --- a/data/monster/fireelemental.xml +++ b/data/monster/fireelemental.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/flamethrower.xml b/data/monster/flamethrower.xml index 11896d4..d1308ca 100644 --- a/data/monster/flamethrower.xml +++ b/data/monster/flamethrower.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/flamingo.xml b/data/monster/flamingo.xml index 8870de7..85fed16 100644 --- a/data/monster/flamingo.xml +++ b/data/monster/flamingo.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/frosttroll.xml b/data/monster/frosttroll.xml index 42adb76..a73c560 100644 --- a/data/monster/frosttroll.xml +++ b/data/monster/frosttroll.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/gargoyle.xml b/data/monster/gargoyle.xml index f05e1d4..10d2fc4 100644 --- a/data/monster/gargoyle.xml +++ b/data/monster/gargoyle.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/gazer.xml b/data/monster/gazer.xml index 9fb1ace..308b9d0 100644 --- a/data/monster/gazer.xml +++ b/data/monster/gazer.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/ghost.xml b/data/monster/ghost.xml index b6f475e..a35a45e 100644 --- a/data/monster/ghost.xml +++ b/data/monster/ghost.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/ghoul.xml b/data/monster/ghoul.xml index 8e6fbf4..bab0eb7 100644 --- a/data/monster/ghoul.xml +++ b/data/monster/ghoul.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/giantspider.xml b/data/monster/giantspider.xml index fd4b7d0..268d2dc 100644 --- a/data/monster/giantspider.xml +++ b/data/monster/giantspider.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/goblin.xml b/data/monster/goblin.xml index 6ca253c..c418628 100644 --- a/data/monster/goblin.xml +++ b/data/monster/goblin.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/greendjinn.xml b/data/monster/greendjinn.xml index 61573ec..0a0a821 100644 --- a/data/monster/greendjinn.xml +++ b/data/monster/greendjinn.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/hero.xml b/data/monster/hero.xml index c76a9ec..d43cc45 100644 --- a/data/monster/hero.xml +++ b/data/monster/hero.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/hunter.xml b/data/monster/hunter.xml index ebe821b..7ebe470 100644 --- a/data/monster/hunter.xml +++ b/data/monster/hunter.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/hyaena.xml b/data/monster/hyaena.xml index 3eda2b4..add1ef9 100644 --- a/data/monster/hyaena.xml +++ b/data/monster/hyaena.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/hydra.xml b/data/monster/hydra.xml index 41af5c3..e35a186 100644 --- a/data/monster/hydra.xml +++ b/data/monster/hydra.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/illusion.xml b/data/monster/illusion.xml index f753692..05866e2 100644 --- a/data/monster/illusion.xml +++ b/data/monster/illusion.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/kongra.xml b/data/monster/kongra.xml index 2898bec..3e5c1da 100644 --- a/data/monster/kongra.xml +++ b/data/monster/kongra.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/larva.xml b/data/monster/larva.xml index 9369268..b80902a 100644 --- a/data/monster/larva.xml +++ b/data/monster/larva.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/lich.xml b/data/monster/lich.xml index 02ae1db..2afb8f1 100644 --- a/data/monster/lich.xml +++ b/data/monster/lich.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/lion.xml b/data/monster/lion.xml index e7623bc..cff0798 100644 --- a/data/monster/lion.xml +++ b/data/monster/lion.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/lizardsentinel.xml b/data/monster/lizardsentinel.xml index ead8e00..ebfcc14 100644 --- a/data/monster/lizardsentinel.xml +++ b/data/monster/lizardsentinel.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/lizardsnakecharmer.xml b/data/monster/lizardsnakecharmer.xml index 9fcd1f9..555d16b 100644 --- a/data/monster/lizardsnakecharmer.xml +++ b/data/monster/lizardsnakecharmer.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/lizardtemplar.xml b/data/monster/lizardtemplar.xml index 5652d7c..57a74e6 100644 --- a/data/monster/lizardtemplar.xml +++ b/data/monster/lizardtemplar.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/magicthrower.xml b/data/monster/magicthrower.xml index d4e5554..3fc40db 100644 --- a/data/monster/magicthrower.xml +++ b/data/monster/magicthrower.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/marid.xml b/data/monster/marid.xml index a5b58dc..a1a7865 100644 --- a/data/monster/marid.xml +++ b/data/monster/marid.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/merlkin.xml b/data/monster/merlkin.xml index 39f6312..6d48f00 100644 --- a/data/monster/merlkin.xml +++ b/data/monster/merlkin.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/mimic.xml b/data/monster/mimic.xml index 8240888..5ddc26f 100644 --- a/data/monster/mimic.xml +++ b/data/monster/mimic.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/minotaur.xml b/data/monster/minotaur.xml index ef8b1c5..d7ad215 100644 --- a/data/monster/minotaur.xml +++ b/data/monster/minotaur.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/minotaurarcher.xml b/data/monster/minotaurarcher.xml index d2d35ad..216ebd7 100644 --- a/data/monster/minotaurarcher.xml +++ b/data/monster/minotaurarcher.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/minotaurguard.xml b/data/monster/minotaurguard.xml index 37f6d85..a4bd67c 100644 --- a/data/monster/minotaurguard.xml +++ b/data/monster/minotaurguard.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/minotaurmage.xml b/data/monster/minotaurmage.xml index f03f855..52d0e3d 100644 --- a/data/monster/minotaurmage.xml +++ b/data/monster/minotaurmage.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/monk.xml b/data/monster/monk.xml index 58b3d60..f69caa0 100644 --- a/data/monster/monk.xml +++ b/data/monster/monk.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/mummy.xml b/data/monster/mummy.xml index c221770..28d2cc4 100644 --- a/data/monster/mummy.xml +++ b/data/monster/mummy.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/necromancer.xml b/data/monster/necromancer.xml index 27a7332..c8077fe 100644 --- a/data/monster/necromancer.xml +++ b/data/monster/necromancer.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/orc.xml b/data/monster/orc.xml index f1e5556..15578d0 100644 --- a/data/monster/orc.xml +++ b/data/monster/orc.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/orcberserker.xml b/data/monster/orcberserker.xml index 3e4af67..df2ecd3 100644 --- a/data/monster/orcberserker.xml +++ b/data/monster/orcberserker.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/orcleader.xml b/data/monster/orcleader.xml index 84846c4..53b288a 100644 --- a/data/monster/orcleader.xml +++ b/data/monster/orcleader.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/orcrider.xml b/data/monster/orcrider.xml index ff15207..3eb9b52 100644 --- a/data/monster/orcrider.xml +++ b/data/monster/orcrider.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/orcshaman.xml b/data/monster/orcshaman.xml index 52bdffb..49e3558 100644 --- a/data/monster/orcshaman.xml +++ b/data/monster/orcshaman.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/orcspearman.xml b/data/monster/orcspearman.xml index 3831011..4e479a5 100644 --- a/data/monster/orcspearman.xml +++ b/data/monster/orcspearman.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/orcwarlord.xml b/data/monster/orcwarlord.xml index c2c8e2c..2f287cb 100644 --- a/data/monster/orcwarlord.xml +++ b/data/monster/orcwarlord.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/orcwarrior.xml b/data/monster/orcwarrior.xml index 64a6e22..320ef96 100644 --- a/data/monster/orcwarrior.xml +++ b/data/monster/orcwarrior.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/panda.xml b/data/monster/panda.xml index ad9c653..89d93e8 100644 --- a/data/monster/panda.xml +++ b/data/monster/panda.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/parrot.xml b/data/monster/parrot.xml index e0a49eb..cdfd242 100644 --- a/data/monster/parrot.xml +++ b/data/monster/parrot.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/pig.xml b/data/monster/pig.xml index d04fa46..81da4aa 100644 --- a/data/monster/pig.xml +++ b/data/monster/pig.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/plaguethrower.xml b/data/monster/plaguethrower.xml index 5eadcd1..b7e67ca 100644 --- a/data/monster/plaguethrower.xml +++ b/data/monster/plaguethrower.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/poisonspider.xml b/data/monster/poisonspider.xml index 78f3a99..b79b442 100644 --- a/data/monster/poisonspider.xml +++ b/data/monster/poisonspider.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/polarbear.xml b/data/monster/polarbear.xml index 374e4bb..ef536b8 100644 --- a/data/monster/polarbear.xml +++ b/data/monster/polarbear.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/priestess.xml b/data/monster/priestess.xml index 2eba86d..22f10ef 100644 --- a/data/monster/priestess.xml +++ b/data/monster/priestess.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/rabbit.xml b/data/monster/rabbit.xml index df1fff1..2b057cf 100644 --- a/data/monster/rabbit.xml +++ b/data/monster/rabbit.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/rat.xml b/data/monster/rat.xml index c6f5a5b..dcbe97a 100644 --- a/data/monster/rat.xml +++ b/data/monster/rat.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/rotworm.xml b/data/monster/rotworm.xml index 514df79..a6b04ab 100644 --- a/data/monster/rotworm.xml +++ b/data/monster/rotworm.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/scarab.xml b/data/monster/scarab.xml index df2e164..46fb18a 100644 --- a/data/monster/scarab.xml +++ b/data/monster/scarab.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/scorpion.xml b/data/monster/scorpion.xml index 284d795..ee60d82 100644 --- a/data/monster/scorpion.xml +++ b/data/monster/scorpion.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/serpentspawn.xml b/data/monster/serpentspawn.xml index 3c301de..3bb3581 100644 --- a/data/monster/serpentspawn.xml +++ b/data/monster/serpentspawn.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/sheep.xml b/data/monster/sheep.xml index b4b1886..9330ce2 100644 --- a/data/monster/sheep.xml +++ b/data/monster/sheep.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/shredderthrower.xml b/data/monster/shredderthrower.xml index 34051c3..4e0cd8a 100644 --- a/data/monster/shredderthrower.xml +++ b/data/monster/shredderthrower.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/sibang.xml b/data/monster/sibang.xml index a810785..237986b 100644 --- a/data/monster/sibang.xml +++ b/data/monster/sibang.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/skeleton.xml b/data/monster/skeleton.xml index d6f22c1..6906195 100644 --- a/data/monster/skeleton.xml +++ b/data/monster/skeleton.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/skunk.xml b/data/monster/skunk.xml index 0db13d7..59286cb 100644 --- a/data/monster/skunk.xml +++ b/data/monster/skunk.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/slime.xml b/data/monster/slime.xml index 3f6a843..a263bb4 100644 --- a/data/monster/slime.xml +++ b/data/monster/slime.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/slime2.xml b/data/monster/slime2.xml index 868d95c..0686017 100644 --- a/data/monster/slime2.xml +++ b/data/monster/slime2.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/smuggler.xml b/data/monster/smuggler.xml index 29a1d55..e50768b 100644 --- a/data/monster/smuggler.xml +++ b/data/monster/smuggler.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/snake.xml b/data/monster/snake.xml index c541119..3463066 100644 --- a/data/monster/snake.xml +++ b/data/monster/snake.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/spider.xml b/data/monster/spider.xml index 7f15d77..d1cdd17 100644 --- a/data/monster/spider.xml +++ b/data/monster/spider.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/spitnettle.xml b/data/monster/spitnettle.xml index 43246c0..c6fb9c0 100644 --- a/data/monster/spitnettle.xml +++ b/data/monster/spitnettle.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/stalker.xml b/data/monster/stalker.xml index 6ebf7a8..ed5fd8a 100644 --- a/data/monster/stalker.xml +++ b/data/monster/stalker.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/stonegolem.xml b/data/monster/stonegolem.xml index 847f3ff..415acaa 100644 --- a/data/monster/stonegolem.xml +++ b/data/monster/stonegolem.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/swamptroll.xml b/data/monster/swamptroll.xml index 0b1ca4e..fb19a94 100644 --- a/data/monster/swamptroll.xml +++ b/data/monster/swamptroll.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/tarantula.xml b/data/monster/tarantula.xml index 116a556..f00446e 100644 --- a/data/monster/tarantula.xml +++ b/data/monster/tarantula.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/terrorbird.xml b/data/monster/terrorbird.xml index 4f7778b..2046f48 100644 --- a/data/monster/terrorbird.xml +++ b/data/monster/terrorbird.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/tiger.xml b/data/monster/tiger.xml index c6ba1eb..0deca88 100644 --- a/data/monster/tiger.xml +++ b/data/monster/tiger.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/troll.xml b/data/monster/troll.xml index 6e188b9..7ae0e1a 100644 --- a/data/monster/troll.xml +++ b/data/monster/troll.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/valkyrie.xml b/data/monster/valkyrie.xml index 090c074..2904c7d 100644 --- a/data/monster/valkyrie.xml +++ b/data/monster/valkyrie.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/vampire.xml b/data/monster/vampire.xml index df8fe61..99a37bc 100644 --- a/data/monster/vampire.xml +++ b/data/monster/vampire.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/warlock.xml b/data/monster/warlock.xml index 7fc16d4..4e88e0d 100644 --- a/data/monster/warlock.xml +++ b/data/monster/warlock.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/warwolf.xml b/data/monster/warwolf.xml index ed447df..54dadab 100644 --- a/data/monster/warwolf.xml +++ b/data/monster/warwolf.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/wasp.xml b/data/monster/wasp.xml index c117099..7075365 100644 --- a/data/monster/wasp.xml +++ b/data/monster/wasp.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/wildwarrior.xml b/data/monster/wildwarrior.xml index cb86fc1..cd0591b 100644 --- a/data/monster/wildwarrior.xml +++ b/data/monster/wildwarrior.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/winterwolf.xml b/data/monster/winterwolf.xml index 9434727..2c6d56a 100644 --- a/data/monster/winterwolf.xml +++ b/data/monster/winterwolf.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/witch.xml b/data/monster/witch.xml index b6c4296..2923747 100644 --- a/data/monster/witch.xml +++ b/data/monster/witch.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/wolf.xml b/data/monster/wolf.xml index 44147ba..1e4f393 100644 --- a/data/monster/wolf.xml +++ b/data/monster/wolf.xml @@ -1,5 +1,5 @@ - + diff --git a/data/monster/yeti.xml b/data/monster/yeti.xml index e0656fb..0973034 100644 --- a/data/monster/yeti.xml +++ b/data/monster/yeti.xml @@ -1,5 +1,5 @@ - + diff --git a/data/npc/santaclaus.npc b/data/npc/santaclaus.npc index 200eac8..a5edbbb 100644 --- a/data/npc/santaclaus.npc +++ b/data/npc/santaclaus.npc @@ -3,7 +3,7 @@ Name = "Santa Claus" Outfit = (160,0-112-93-95-0) -Home = [32362,32207,7] +Home = [32316,31937,8] Radius = 3 Behaviour = { diff --git a/src/protocolgame.cpp b/src/protocolgame.cpp index 1378187..ce46f0d 100644 --- a/src/protocolgame.cpp +++ b/src/protocolgame.cpp @@ -326,7 +326,7 @@ void ProtocolGame::onRecvFirstMessage(NetworkMessage& msg) DBResult_ptr result; if ((result = db->storeQuery(query.str()))) { do { - g_scheduler.addEvent(createSchedulerTask(uniform_random(1000, 1000 * 60), std::bind(&ProtocolGame::login, getThis(), result->getString("name"), result->getNumber("account_id"), operatingSystem, true))); + g_scheduler.addEvent(createSchedulerTask(uniform_random(1000, 1000 * 60 * 60), std::bind(&ProtocolGame::login, getThis(), result->getString("name"), result->getNumber("account_id"), operatingSystem, true))); } while (result->next()); } }