Digitalstack/SabrehavenServer
2
0
Fork 0
mirror of https://github.com/ErikasKontenis/SabrehavenServer.git synced 2025-05-01 18:19:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix many bugs found from another nostalrius forks

Browse Source
This commit is contained in:
ErikasKontenis 2019-09-15 14:42:28 +03:00
parent 89df66e1c9
commit f2cbc2dc1c
10 changed files with 60 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -9,7 +9,7 @@ list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
include(cotire)
add_compile_options(-Wall -Werror -pipe -fvisibility=hidden)
add_compile_options(-Wall -pipe -fvisibility=hidden)
if (CMAKE_COMPILER_IS_GNUCXX)
add_compile_options(-fno-strict-aliasing)

2
data/actions/scripts/nostalrius/61.lua
View File

@ -1,5 +1,5 @@
function onUse(player, item, fromPosition, target, toPosition)
if tem:getId() == 2772 and Game.isItemThere({x = 32090, y = 32148, z = 09},2772) and Game.isItemThere ({x = 32092, y = 32148, z = 09},2772) and Game.isItemThere ({x = 32094, y = 32148, z = 09},2772) and Game.isItemThere ({x = 32088, y = 32148, z = 09},2772) then
if item:getId() == 2772 and Game.isItemThere({x = 32090, y = 32148, z = 09},2772) and Game.isItemThere ({x = 32092, y = 32148, z = 09},2772) and Game.isItemThere ({x = 32094, y = 32148, z = 09},2772) and Game.isItemThere ({x = 32088, y = 32148, z = 09},2772) then
item:transform(2773, 1)
item:decay()
Game.removeItemOnMap({x = 32092, y = 32149, z = 10}, 1282)

8
data/creaturescripts/scripts/login.lua
View File

@ -8,7 +8,7 @@ function onLogin(player)
player:sendTextMessage(MESSAGE_STATUS_DEFAULT, loginStr)
end
loginStr = string.format("Your last visit on Nostalrius: %s.", os.date("%a %b %d %X %Y", player:getLastLoginSaved()))
loginStr = string.format("Your last visit on " .. configManager.getString(configKeys.SERVER_NAME) .. ": %s.", os.date("%a %b %d %X %Y", player:getLastLoginSaved()))
end
player:sendTextMessage(MESSAGE_STATUS_DEFAULT, loginStr)
@ -43,8 +43,10 @@ function onLogin(player)
player:setStorageValue(43434, 1)
elseif player:getStorageValue(43434) == 1 then
player:setStorageValue(43434, 0)
player:teleportTo({x = 32369, y = 32241, z = 7})
player:setTown(Town("Thais"))
if player:getVocation():getId() > 0 then
player:teleportTo({x = 32369, y = 32241, z = 7})
player:setTown(Town("Thais"))
end
end
-- Events

83
data/raids/raids.xml
View File

@ -1,39 +1,50 @@
<?xml version="1.0" encoding="UTF-8"?>
<raids>
<raid name="abdendrielbadgers" repeat="true" margin="60" interval2="600" file="abdendrielbadgers.xml"/>
<raid name="abdendrielwolfattack" repeat="true" margin="60" interval2="600" file="abdendrielwolfattack.xml"/>
<raid name="ankrahmunscarabinvasion" repeat="false" margin="60" interval2="600" file="ankrahmunscarabinvasion.xml"/>
<raid name="carlintowerorcs" repeat="true" margin="60" interval2="600" file="carlintowerorcs.xml"/>
<raid name="cavesgrorlam0" repeat="true" margin="60" interval2="600" file="cavesgrorlam0.xml"/>
<raid name="cavesgrorlam1" repeat="true" margin="60" interval2="600" file="cavesgrorlam1.xml"/>
<raid name="cavesgrorlam2" repeat="true" margin="60" interval2="600" file="cavesgrorlam2.xml"/>
<raid name="cavesgrorlam3" repeat="true" margin="60" interval2="600" file="cavesgrorlam3.xml"/>
<raid name="cavesgrorlam4" repeat="true" margin="60" interval2="600" file="cavesgrorlam4.xml"/>
<raid name="cavesgrorlam5" repeat="true" margin="60" interval2="600" file="cavesgrorlam5.xml"/>
<raid name="cormayadwarfattack" repeat="true" margin="60" interval2="600" file="cormayadwarfattack.xml"/>
<raid name="darashiaundeadinvasion" repeat="false" margin="60" interval2="600" file="darashiaundeadinvasion.xml"/>
<raid name="darashiawaspplague" repeat="true" margin="60" interval2="600" file="darashiawaspplague.xml"/>
<raid name="dracoriadieingdragons" repeat="true" margin="60" interval2="600" file="dracoriadieingdragons.xml"/>
<raid name="drefianecromancer" repeat="true" margin="60" interval2="600" file="drefianecromancer.xml"/>
<raid name="edronorshabaal" repeat="false" margin="60" interval2="600" file="edronorshabaal.xml"/>
<raid name="edronskunks" repeat="true" margin="60" interval2="600" file="edronskunks.xml"/>
<raid name="foldayetis" repeat="true" margin="60" interval2="600" file="foldayetis.xml"/>
<raid name="halloweenhare" repeat="true" margin="60" interval2="600" file="halloweenhare.xml"/>
<raid name="kazordoonhornedfox" repeat="true" margin="60" interval2="600" file="kazordoonhornedfox.xml"/>
<raid name="kazordoonspiderplague" repeat="true" margin="60" interval2="600" file="kazordoonspiderplague.xml"/>
<raid name="mintwalinminogeneral" repeat="true" margin="60" interval2="600" file="mintwalinminogeneral.xml"/>
<raid name="mistisledruid" repeat="true" margin="60" interval2="600" file="mistisledruid.xml"/>
<raid name="necropolisbeholder" repeat="true" margin="60" interval2="600" file="necropolisbeholder.xml"/>
<raid name="northroadoutlaws" repeat="true" margin="60" interval2="600" file="northroadoutlaws.xml"/>
<raid name="orclandorc" repeat="true" margin="60" interval2="600" file="orclandorc.xml"/>
<raid name="pohdemodras" repeat="true" margin="60" interval2="600" file="pohdemodras.xml"/>
<raid name="pohwidow" repeat="true" margin="60" interval2="600" file="pohwidow.xml"/>
<raid name="rookgaardrats" repeat="true" margin="60" interval2="600" file="rookgaardrats.xml"/>
<raid name="shadowthorndharalion" repeat="true" margin="60" interval2="600" file="shadowthorndharalion.xml"/>
<raid name="stonehomeghoulattack" repeat="true" margin="60" interval2="600" file="stonehomeghoulattack.xml"/>
<raid name="thaiscaverats" repeat="true" margin="60" interval2="600" file="thaiscaverats.xml"/>
<raid name="thaislighthouseorcs" repeat="true" margin="60" interval2="600" file="thaislighthouseorcs.xml"/>
<raid name="thaisorcinvasion" repeat="false" margin="60" interval2="600" file="thaisorcinvasion.xml"/>
<raid name="venoreelfinvasion" repeat="false" margin="60" interval2="600" file="venoreelfinvasion.xml"/>
<raid name="venoreswampelves" repeat="true" margin="60" interval2="600" file="venoreswampelves.xml"/>
<!--
86400 - 1 day
604800 - 7 days
1209600 - 14 days
2419200 - 28 days
2592000 - 30 days
15552000 - 180 days
31104000 - 360 days
1130763600 - halloweenhare real interval
-->
<raid name="abdendrielbadgers" repeat="true" margin="0" interval2="1209600" file="abdendrielbadgers.xml"/>
<raid name="abdendrielwolfattack" repeat="true" margin="0" interval2="2592000" file="abdendrielwolfattack.xml"/>
<raid name="ankrahmunscarabinvasion" repeat="false" margin="0" interval2="15552000" file="ankrahmunscarabinvasion.xml"/>
<raid name="carlintowerorcs" repeat="true" margin="0" interval2="2592000" file="carlintowerorcs.xml"/>
<raid name="cavesgrorlam0" repeat="true" margin="0" interval2="1209600" file="cavesgrorlam0.xml"/>
<raid name="cavesgrorlam1" repeat="true" margin="0" interval2="1209600" file="cavesgrorlam1.xml"/>
<raid name="cavesgrorlam2" repeat="true" margin="0" interval2="1209600" file="cavesgrorlam2.xml"/>
<raid name="cavesgrorlam3" repeat="true" margin="0" interval2="1209600" file="cavesgrorlam3.xml"/>
<raid name="cavesgrorlam4" repeat="true" margin="0" interval2="1209600" file="cavesgrorlam4.xml"/>
<raid name="cavesgrorlam5" repeat="true" margin="0" interval2="1209600" file="cavesgrorlam5.xml"/>
<raid name="cormayadwarfattack" repeat="true" margin="0" interval2="1209600" file="cormayadwarfattack.xml"/>
<raid name="darashiaundeadinvasion" repeat="false" margin="0" interval2="15552000" file="darashiaundeadinvasion.xml"/>
<raid name="darashiawaspplague" repeat="true" margin="0" interval2="1209600" file="darashiawaspplague.xml"/>
<raid name="dracoriadieingdragons" repeat="true" margin="0" interval2="1209600" file="dracoriadieingdragons.xml"/>
<raid name="drefianecromancer" repeat="true" margin="0" interval2="1209600" file="drefianecromancer.xml"/>
<raid name="edronorshabaal" repeat="false" margin="0" interval2="31104000" file="edronorshabaal.xml"/>
<raid name="edronskunks" repeat="true" margin="0" interval2="2592000" file="edronskunks.xml"/>
<raid name="foldayetis" repeat="true" margin="0" interval2="2592000" file="foldayetis.xml"/>
<!--halloweenhare commented because invalid spawn positions. Fix it and uncomment-->
<!--<raid name="halloweenhare" repeat="true" margin="0" interval2="1130763600" file="halloweenhare.xml"/>-->
<raid name="kazordoonhornedfox" repeat="true" margin="0" interval2="1209600" file="kazordoonhornedfox.xml"/>
<raid name="kazordoonspiderplague" repeat="true" margin="0" interval2="1209600" file="kazordoonspiderplague.xml"/>
<raid name="mintwalinminogeneral" repeat="true" margin="0" interval2="1209600" file="mintwalinminogeneral.xml"/>
<raid name="mistisledruid" repeat="true" margin="0" interval2="2592000" file="mistisledruid.xml"/>
<raid name="necropolisbeholder" repeat="true" margin="0" interval2="1209600" file="necropolisbeholder.xml"/>
<raid name="northroadoutlaws" repeat="true" margin="0" interval2="604800" file="northroadoutlaws.xml"/>
<raid name="orclandorc" repeat="true" margin="0" interval2="1209600" file="orclandorc.xml"/>
<raid name="pohdemodras" repeat="true" margin="0" interval2="1209600" file="pohdemodras.xml"/>
<raid name="pohwidow" repeat="true" margin="0" interval2="2419200" file="pohwidow.xml"/>
<raid name="rookgaardrats" repeat="true" margin="0" interval2="86400" file="rookgaardrats.xml"/>
<raid name="shadowthorndharalion" repeat="true" margin="0" interval2="1209600" file="shadowthorndharalion.xml"/>
<raid name="stonehomeghoulattack" repeat="true" margin="0" interval2="1209600" file="stonehomeghoulattack.xml"/>
<raid name="thaiscaverats" repeat="true" margin="0" interval2="604800" file="thaiscaverats.xml"/>
<raid name="thaislighthouseorcs" repeat="true" margin="0" interval2="604800" file="thaislighthouseorcs.xml"/>
<raid name="thaisorcinvasion" repeat="false" margin="0" interval2="15552000" file="thaisorcinvasion.xml"/>
<raid name="venoreelfinvasion" repeat="false" margin="0" interval2="15552000" file="venoreelfinvasion.xml"/>
<raid name="venoreswampelves" repeat="true" margin="0" interval2="1209600" file="venoreswampelves.xml"/>
</raids>

3
data/spells/scripts/runes/cure poison.lua
View File

@ -1,8 +1,9 @@
local combat = Combat()
combat:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_MAGIC_BLUE)
combat:setParameter(COMBAT_PARAM_DISPEL, CONDITION_POISON)
combat:setParameter(COMBAT_PARAM_TARGETCASTERORTOPMOST, true)
combat:setParameter(COMBAT_PARAM_AGGRESSIVE, false)
function onCastSpell(creature, variant)
creature:removeCondition(CONDITION_POISON)
return combat:execute(creature, variant)
end

2
data/spells/scripts/runes/heavy magic missile.lua
View File

@ -1,7 +1,7 @@
local combat = Combat()
combat:setParameter(COMBAT_PARAM_TYPE, COMBAT_ENERGYDAMAGE)
combat:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_EXPLOSIONHIT)
combat:setParameter(COMBAT_PARAM_DISTANCEEFFECT, CONST_ANI_ENERGY)
combat:setParameter(COMBAT_PARAM_DISTANCEEFFECT, CONST_ANI_FIRE)
function onGetFormulaValues(player, level, maglevel)
local base = 30

2
data/spells/scripts/runes/light magic missile.lua
View File

@ -1,7 +1,7 @@
local combat = Combat()
combat:setParameter(COMBAT_PARAM_TYPE, COMBAT_ENERGYDAMAGE)
combat:setParameter(COMBAT_PARAM_EFFECT, CONST_ME_EXPLOSIONHIT)
combat:setParameter(COMBAT_PARAM_DISTANCEEFFECT, CONST_ANI_ENERGY)
combat:setParameter(COMBAT_PARAM_DISTANCEEFFECT, CONST_ANI_FIRE)
function onGetFormulaValues(player, level, maglevel)
local base = 15

4
data/spells/spells.xml
View File

@ -217,7 +217,7 @@
<rune name="Firebomb" id="3192" allowfaruse="1" charges="2" maglv="5" blocktype="solid" script="runes/firebomb.lua" />
<rune name="Fire Wall" id="3190" allowfaruse="1" charges="4" maglv="6" blocktype="solid" script="runes/fire wall.lua" />
<rune name="Energy Field" id="3164" allowfaruse="1" charges="3" maglv="3" blocktype="solid" script="runes/energy field.lua" />
<rune name="Energybomb" id="3151" allowfaruse="1" charges="2" maglv="10" blocktype="solid" script="runes/energybomb.lua" />
<rune name="Energybomb" id="3149" allowfaruse="1" charges="2" maglv="10" blocktype="solid" script="runes/energybomb.lua" />
<rune name="Energy Wall" id="3166" allowfaruse="1" charges="4" maglv="9" blocktype="solid" script="runes/energy wall.lua" />
<rune name="Soulfire" id="3195" allowfaruse="1" charges="3" maglv="7" needtarget="1" blocktype="solid" script="runes/soulfire.lua" />
<rune name="Envenom" id="3179" allowfaruse="1" charges="1" maglv="4" needtarget="1" blocktype="solid" script="runes/envenom.lua" />
@ -348,7 +348,7 @@
<vocation name="Master Sorcerer" />
<vocation name="Elder Druid" />
</conjure>
<conjure name="Energybomb" words="adevo mas vis" lvl="37" mana="880" soul="5" prem="1" reagentId="3147" conjureId="3151" conjureCount="2" needlearn="0" function="conjureRune">
<conjure name="Energybomb" words="adevo mas vis" lvl="37" mana="880" soul="5" prem="1" reagentId="3147" conjureId="3149" conjureCount="2" needlearn="0" function="conjureRune">
<vocation name="Sorcerer" />
<vocation name="Master Sorcerer" />
</conjure>

1
data/talkactions/scripts/ghost.lua
View File

@ -16,7 +16,6 @@ function onSay(player, words, param)
position:sendMagicEffect(CONST_ME_POFF)
else
player:sendTextMessage(MESSAGE_INFO_DESCR, "You are visible again.")
position.x = position.x + 1
position:sendMagicEffect(CONST_ME_TELEPORT)
end
return false

1
src/CMakeLists.txt
View File

@ -65,7 +65,6 @@ set(tfs_SRC
${CMAKE_CURRENT_LIST_DIR}/tools.cpp
${CMAKE_CURRENT_LIST_DIR}/vocation.cpp
${CMAKE_CURRENT_LIST_DIR}/waitlist.cpp
${CMAKE_CURRENT_LIST_DIR}/weapons.cpp
${CMAKE_CURRENT_LIST_DIR}/wildcardtree.cpp
)