diff --git a/config.lua b/config.lua index 19cca05..8b6e3fa 100644 --- a/config.lua +++ b/config.lua @@ -84,7 +84,7 @@ newbieLevelThreshold = 5 -- NOTE: rateExp is not used if you have enabled stages in data/XML/stages.xml rateExp = 1 rateSkill = 5 -rateLoot = 1 +rateLoot = 2 rateMagic = 2 rateSpawn = 0 diff --git a/config.prod.lua b/config.prod.lua index 34550de..1e200c1 100644 --- a/config.prod.lua +++ b/config.prod.lua @@ -84,7 +84,7 @@ newbieLevelThreshold = 5 -- NOTE: rateExp is not used if you have enabled stages in data/XML/stages.xml rateExp = 1 rateSkill = 5 -rateLoot = 1 +rateLoot = 2 rateMagic = 2 rateSpawn = 0 diff --git a/data/talkactions/scripts/remove_house.lua b/data/talkactions/scripts/remove_house.lua new file mode 100644 index 0000000..c7f4f86 --- /dev/null +++ b/data/talkactions/scripts/remove_house.lua @@ -0,0 +1,22 @@ +function onSay(player, words, param) + if not player:getGroup():getAccess() then + return true + end + + if player:getAccountType() < ACCOUNT_TYPE_GOD then + return false + end + + local position = player:getPosition() + local tile = Tile(position) + local house = tile and tile:getHouse() + if house == nil then + player:sendCancelMessage("You are not inside a house.") + position:sendMagicEffect(CONST_ME_POFF) + return false + end + + house:setOwnerGuid(0) + player:sendTextMessage(MESSAGE_INFO_DESCR, "You have successfully removed this house.") + return false +end diff --git a/data/talkactions/talkactions.xml b/data/talkactions/talkactions.xml index 99e591d..a0c7fa5 100644 --- a/data/talkactions/talkactions.xml +++ b/data/talkactions/talkactions.xml @@ -37,6 +37,7 @@ + diff --git a/src/spawn.cpp b/src/spawn.cpp index 8b08492..4a39128 100644 --- a/src/spawn.cpp +++ b/src/spawn.cpp @@ -89,7 +89,7 @@ bool Spawns::loadFromXml(const std::string& filename) spawnList.emplace_front(pos, radius); Spawn& spawn = spawnList.front(); - uint32_t interval = pugi::cast(childNode.attribute("spawntime").value()) * 1000; + uint32_t interval = pugi::cast(childNode.attribute("spawntime").value()) * 500; if (interval > MINSPAWN_INTERVAL) { uint32_t exInterval = g_config.getNumber(ConfigManager::RATE_SPAWN); if (exInterval) {