Digitalstack/otclient
2
0
Fork 0
mirror of https://github.com/edubart/otclient.git synced 2025-10-14 11:34:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixes on battle and buff condition tooltip

Browse Source
This commit is contained in:
AndreFaramir
2012-03-30 01:10:55 -03:00
parent 959d9a87b0
commit 20e32ad2a0
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
modules/game_battle/battle.lua
View File

@@ -57,7 +57,8 @@ function Battle.init()
onEmblemChange = Battle.checkCreatureEmblem } )
connect(g_game, { onAttackingCreatureChange = Battle.onAttack,
onFollowingCreatureChange = Battle.onFollow } )
onFollowingCreatureChange = Battle.onFollow,
onGameEnd = Battle.removeAllCreatures } )
addEvent(Battle.addAllCreatures)
checkCreaturesEvent = scheduleEvent(Battle.checkCreatures, 200)
@@ -132,7 +133,7 @@ function Battle.doCreatureFitFilters(creature)
return true
end
function Battle.checkCreatures()
function Battle.checkCreatures(forceRecheck)
local player = g_game.getLocalPlayer()
if player then
local spectators = {}
@@ -169,7 +170,9 @@ function Battle.checkCreatures()
Battle.removeCreature(v)
end
end
checkCreaturesEvent = scheduleEvent(Battle.checkCreatures, 500)
if not forceRecheck then
checkCreaturesEvent = scheduleEvent(Battle.checkCreatures, 500)
end
end
function Battle.addCreature(creature)
@@ -263,6 +266,12 @@ function Battle.onMouseRelease(self, mousePosition, mouseButton)
end
end
function Battle.removeAllCreatures()
for i, v in pairs(battleButtonsByCreaturesList) do
Battle.removeCreature(v.creature)
end
end
function Battle.removeCreature(creature)
local creatureId = creature:getId()
@@ -303,6 +312,7 @@ function Battle.onbattleButtonHoverChange(widget, hovered)
end
function Battle.onAttack(creature)
Battle.checkCreatures(true) --Force recheck
local battleButton = creature and battleButtonsByCreaturesList[creature:getId()] or lastBattleButtonSwitched
if battleButton then
battleButton.isTarget = creature and true or false
@@ -311,6 +321,7 @@ function Battle.onAttack(creature)
end
function Battle.onFollow(creature)
Battle.checkCreatures(true) --Force recheck
local battleButton = creature and battleButtonsByCreaturesList[creature:getId()] or lastBattleButtonSwitched
if battleButton then
battleButton.isFollowed = creature and true or false