Few minor fixes:
* Fix to tab margins when a tab is closed * Changed the life bar colors of UICreatureButtons * Added onDeath to Creatures class
This commit is contained in:
parent
1b6be92cad
commit
913cc801b6
|
@ -163,6 +163,7 @@ function UITabBar:removeTab(tab)
|
||||||
removeEvent(tab.blinkEvent)
|
removeEvent(tab.blinkEvent)
|
||||||
end
|
end
|
||||||
tab:destroy()
|
tab:destroy()
|
||||||
|
updateMargins(self)
|
||||||
end
|
end
|
||||||
|
|
||||||
function UITabBar:getTab(text)
|
function UITabBar:getTab(text)
|
||||||
|
|
|
@ -11,9 +11,9 @@ local LifeBarColors = {} -- Must be sorted by percentAbove
|
||||||
table.insert(LifeBarColors, {percentAbove = 92, color = '#00BC00' } )
|
table.insert(LifeBarColors, {percentAbove = 92, color = '#00BC00' } )
|
||||||
table.insert(LifeBarColors, {percentAbove = 60, color = '#50A150' } )
|
table.insert(LifeBarColors, {percentAbove = 60, color = '#50A150' } )
|
||||||
table.insert(LifeBarColors, {percentAbove = 30, color = '#A1A100' } )
|
table.insert(LifeBarColors, {percentAbove = 30, color = '#A1A100' } )
|
||||||
table.insert(LifeBarColors, {percentAbove = 8, color = '#3C2727' } )
|
table.insert(LifeBarColors, {percentAbove = 8, color = '#BF0A0A' } )
|
||||||
table.insert(LifeBarColors, {percentAbove = 3, color = '#3C0000' } )
|
table.insert(LifeBarColors, {percentAbove = 3, color = '#910F0F' } )
|
||||||
table.insert(LifeBarColors, {percentAbove = -1, color = '#4F0000' } )
|
table.insert(LifeBarColors, {percentAbove = -1, color = '#850C0C' } )
|
||||||
|
|
||||||
function UICreatureButton.create()
|
function UICreatureButton.create()
|
||||||
local button = UICreatureButton.internalCreate()
|
local button = UICreatureButton.internalCreate()
|
||||||
|
|
|
@ -440,6 +440,11 @@ void Creature::onDisappear()
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Creature::onDeath()
|
||||||
|
{
|
||||||
|
callLuaField("onDeath");
|
||||||
|
}
|
||||||
|
|
||||||
void Creature::updateWalkAnimation(int totalPixelsWalked)
|
void Creature::updateWalkAnimation(int totalPixelsWalked)
|
||||||
{
|
{
|
||||||
// update outfit animation
|
// update outfit animation
|
||||||
|
@ -599,6 +604,9 @@ void Creature::setHealthPercent(uint8 healthPercent)
|
||||||
|
|
||||||
m_healthPercent = healthPercent;
|
m_healthPercent = healthPercent;
|
||||||
callLuaField("onHealthPercentChange", healthPercent);
|
callLuaField("onHealthPercentChange", healthPercent);
|
||||||
|
|
||||||
|
if(healthPercent < 1)
|
||||||
|
onDeath();
|
||||||
}
|
}
|
||||||
|
|
||||||
void Creature::setDirection(Otc::Direction direction)
|
void Creature::setDirection(Otc::Direction direction)
|
||||||
|
|
|
@ -123,6 +123,7 @@ public:
|
||||||
virtual void onPositionChange(const Position& newPos, const Position& oldPos);
|
virtual void onPositionChange(const Position& newPos, const Position& oldPos);
|
||||||
virtual void onAppear();
|
virtual void onAppear();
|
||||||
virtual void onDisappear();
|
virtual void onDisappear();
|
||||||
|
virtual void onDeath();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual void updateWalkAnimation(int totalPixelsWalked);
|
virtual void updateWalkAnimation(int totalPixelsWalked);
|
||||||
|
|
Loading…
Reference in New Issue