Resolve "Merge the best from 7.40 branch"

This commit is contained in:
Erikas Kontenis
2022-04-06 14:58:52 +00:00
parent 3bd1a6f07e
commit 155da3573c
928 changed files with 43723 additions and 1221 deletions

View File

@@ -1,3 +1,108 @@
local monsterOfTheDay = {
[8430] = { monster = 'Crocodile' },
[8431] = { monster = 'Tarantula' },
[8432] = { monster = 'Carniphila' },
[8433] = { monster = 'Merlkin' },
[8434] = { monster = 'Kongra' },
[8435] = { monster = 'Sibang' },
[8436] = { monster = 'Thornback Tortoise' },
[8437] = { monster = 'Gargoyle' },
[8438] = { monster = 'Quara Constrictor Scout' },
[8439] = { monster = 'Quara Hydromancer Scout' },
[8440] = { monster = 'Quara Mantassin Scout' },
[8441] = { monster = 'Quara Pincher Scout' },
[8442] = { monster = 'Quara Predator Scout' },
[8443] = { monster = 'Ancient Scarab' },
[8444] = { monster = 'Wyvern' },
[8445] = { monster = 'Bonebeast' },
[8446] = { monster = 'Dragon' },
[8447] = { monster = 'Quara Constrictor' },
[8448] = { monster = 'Quara Hydromancer' },
[8449] = { monster = 'Quara Mantassin' },
[8450] = { monster = 'Quara Pincher' },
[8451] = { monster = 'Quara Predator' },
[8452] = { monster = 'Giant Spider' },
[8453] = { monster = 'Banshee' },
[8454] = { monster = 'Lich' },
[8455] = { monster = 'Acolyte of The Cult' },
[8456] = { monster = 'Adept of The Cult' },
[8457] = { monster = 'Enlightened of The Cult' },
[8458] = { monster = 'Novice of The Cult' },
[8459] = { monster = 'Hydra' },
[8460] = { monster = 'Serpent Spawn' },
[8461] = { monster = 'Behemoth' },
[8462] = { monster = 'Dragon Lord' },
[8463] = { monster = 'Hand of Cursed Fate' },
[8464] = { monster = 'Juggernaut' },
[8465] = { monster = 'Frost Troll' },
[8466] = { monster = 'Swamp Troll' },
[8467] = { monster = 'Rat' },
[8468] = { monster = 'Cave Rat' },
[8469] = { monster = 'Wolf' },
[8470] = { monster = 'Winter Wolf' },
[8471] = { monster = 'Wasp' },
[8472] = { monster = 'Larva' },
[8473] = { monster = 'Dwarf' },
[8474] = { monster = 'Skeleton' },
[8475] = { monster = 'Ghoul' },
[8476] = { monster = 'Elf' },
[8477] = { monster = 'Elf Scout' },
[8478] = { monster = 'Elf Arcanist' },
[8479] = { monster = 'Bug' },
[8480] = { monster = 'Smuggler' },
[8481] = { monster = 'Wild Warrior' },
[8482] = { monster = 'Bandit' },
[8483] = { monster = 'Hyaena' },
[8484] = { monster = 'Lion' },
[8485] = { monster = 'Bear' },
[8486] = { monster = 'Slime' },
[8487] = { monster = 'Beholder' },
[8488] = { monster = 'Elder Beholder' },
[8489] = { monster = 'Green Djinn' },
[8490] = { monster = 'Blue Djinn' },
[8491] = { monster = 'Marid' },
[8492] = { monster = 'Efreet' },
[8493] = { monster = 'Pirate Skeleton' },
[8494] = { monster = 'Pirate Marauder' },
[8495] = { monster = 'Pirate Cutthroat' },
[8496] = { monster = 'Pirate Ghost' },
[8497] = { monster = 'Pirate Buccaneer' },
[8498] = { monster = 'Pirate Corsair' },
[8499] = { monster = 'Orc Spearman' },
[8500] = { monster = 'Orc Shaman' },
[8501] = { monster = 'Orc Rider' },
[8502] = { monster = 'Orc Warrior' },
[8503] = { monster = 'Orc Berserker' },
[8504] = { monster = 'Minotaur Archer' },
[8505] = { monster = 'Minotaur Guard' },
[8506] = { monster = 'Minotaur Mage' },
[8507] = { monster = 'Lizard Templar' },
[8508] = { monster = 'Lizard Sentinel' },
[8509] = { monster = 'Lizard Snakecharmer' },
[8510] = { monster = 'Dwarf Soldier' },
[8511] = { monster = 'Dwarf Guard' },
[8512] = { monster = 'Dwarf Geomancer' },
[8513] = { monster = 'Ghost' },
[8514] = { monster = 'Demon Skeleton' },
[8515] = { monster = 'Vampire' },
[8516] = { monster = 'Orc Leader' },
[8517] = { monster = 'Orc Warlord' },
[8518] = { monster = 'Hero' },
[8519] = { monster = 'Necromancer' },
[8520] = { monster = 'Priestess' },
[8521] = { monster = 'Nightmare' },
[8522] = { monster = 'Warlock' },
[8523] = { monster = 'Demon' },
[8524] = { monster = 'Troll' },
[8525] = { monster = 'Goblin' },
[8526] = { monster = 'Rotworm' },
[8527] = { monster = 'Carrion Worm' },
[8528] = { monster = 'Cyclops' },
[8529] = { monster = 'Amazon' },
[8530] = { monster = 'Minotaur' },
[8531] = { monster = 'Orc' }
}
local trainingStatues = {17724, 17725, 17726, 17727, 17728}
function Player:onLook(thing, position, distance)
@@ -230,6 +335,18 @@ function Player:onGainExperience(source, exp, rawExp)
exp = exp * (1 + getGlobalStorageValue(17585) / 100)
end
if source:isMonster() and not source:getMaster() then
if getGlobalStorageValue(8420) > 0 then
if source:getName():lower() == monsterOfTheDay[getGlobalStorageValue(8420)].monster:lower() then
exp = exp * (1 + getGlobalStorageValue(8421) / 100)
end
end
end
if self:isPremium() then
exp = exp * (1 + 10 / 100)
end
return exp
end