diff --git a/CMakeLists.txt b/CMakeLists.txt
index 65d1daa..3150690 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
diff --git a/data/actions/scripts/nostalrius/61.lua b/data/actions/scripts/nostalrius/61.lua
index b09bfce..2ad1717 100644
--- a/data/actions/scripts/nostalrius/61.lua
+++ b/data/actions/scripts/nostalrius/61.lua
@@ -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)
diff --git a/data/creaturescripts/scripts/login.lua b/data/creaturescripts/scripts/login.lua
index 0525a96..61ee762 100644
--- a/data/creaturescripts/scripts/login.lua
+++ b/data/creaturescripts/scripts/login.lua
@@ -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
diff --git a/data/raids/raids.xml b/data/raids/raids.xml
index a19c02d..7f96c95 100644
--- a/data/raids/raids.xml
+++ b/data/raids/raids.xml
@@ -1,39 +1,50 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/spells/scripts/runes/cure poison.lua b/data/spells/scripts/runes/cure poison.lua
index b248b41..444d92d 100644
--- a/data/spells/scripts/runes/cure poison.lua
+++ b/data/spells/scripts/runes/cure poison.lua
@@ -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
\ No newline at end of file
diff --git a/data/spells/scripts/runes/heavy magic missile.lua b/data/spells/scripts/runes/heavy magic missile.lua
index 9af1280..107cd40 100644
--- a/data/spells/scripts/runes/heavy magic missile.lua
+++ b/data/spells/scripts/runes/heavy magic missile.lua
@@ -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
diff --git a/data/spells/scripts/runes/light magic missile.lua b/data/spells/scripts/runes/light magic missile.lua
index 3a83c2f..65fb7bb 100644
--- a/data/spells/scripts/runes/light magic missile.lua
+++ b/data/spells/scripts/runes/light magic missile.lua
@@ -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
diff --git a/data/spells/spells.xml b/data/spells/spells.xml
index a2e5756..2a94ea2 100644
--- a/data/spells/spells.xml
+++ b/data/spells/spells.xml
@@ -217,7 +217,7 @@
-
+
@@ -348,7 +348,7 @@
-
+
diff --git a/data/talkactions/scripts/ghost.lua b/data/talkactions/scripts/ghost.lua
index e314c73..30f06b2 100644
--- a/data/talkactions/scripts/ghost.lua
+++ b/data/talkactions/scripts/ghost.lua
@@ -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
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ee3ba35..6ccc19f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -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
)