From 3a74385ae4b25b49d0bc045039e347bff8e4562e Mon Sep 17 00:00:00 2001 From: Colby Klein Date: Fri, 6 Jan 2012 23:48:04 -0800 Subject: [PATCH] sillybear's life meter battery patch. --- .../LifeMeterBattery lives/_lives 1x10.png | Bin 0 -> 8174 bytes .../LifeMeterBattery lives/default.lua | 35 +++++++++++++++--- 2 files changed, 29 insertions(+), 6 deletions(-) create mode 100755 Themes/default/Graphics/LifeMeterBattery lives/_lives 1x10.png mode change 100644 => 100755 Themes/default/Graphics/LifeMeterBattery lives/default.lua diff --git a/Themes/default/Graphics/LifeMeterBattery lives/_lives 1x10.png b/Themes/default/Graphics/LifeMeterBattery lives/_lives 1x10.png new file mode 100755 index 0000000000000000000000000000000000000000..53e6a0ace50f5e03de5374684a7163e590bdaf34 GIT binary patch literal 8174 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 I-y`<^AL%4NQUCw| literal 0 HcmV?d00001 diff --git a/Themes/default/Graphics/LifeMeterBattery lives/default.lua b/Themes/default/Graphics/LifeMeterBattery lives/default.lua old mode 100644 new mode 100755 index 8a5f507f38..16cd3a5963 --- a/Themes/default/Graphics/LifeMeterBattery lives/default.lua +++ b/Themes/default/Graphics/LifeMeterBattery lives/default.lua @@ -1,24 +1,47 @@ local player = Var "Player" local blinkTime = 1.2 +local barWidth = 256; +local barHeight = 32; local t = Def.ActorFrame{ + Def.Quad{ + InitCommand=cmd(diffuse,color("#666666");zoomto,barWidth,barHeight); + }; + Def.Quad{ + InitCommand=cmd(diffuse,color("#000000");zoomto,barWidth,barHeight;fadetop,1); + }; LoadActor("_lives")..{ - -- xxx: assumes course is 4lives (or more) - InitCommand=cmd(pause;setstate,3); + InitCommand=cmd(pause;horizalign,left;x,-(barWidth/2)); + BeginCommand=function(self,param) + local screen = SCREENMAN:GetTopScreen(); + local glifemeter = screen:GetLifeMeter(player); + self:setstate(glifemeter:GetTotalLives()-1); + + if glifemeter:GetTotalLives() <= 4 then + self:zoomx(barWidth/(4*64)); + else + self:zoomx(barWidth/((glifemeter:GetTotalLives())*64)); + end + self:cropright((640-(((glifemeter:GetTotalLives())*64)))/640); + end; LifeChangedMessageCommand=function(self,param) if param.Player == player then if param.LivesLeft == 0 then self:visible(false) - elseif param.LivesLeft <= 4 then - self:setstate( math.max(param.LivesLeft-1,0) ) - self:visible(true) else - self:setstate(3) + self:setstate( math.max(param.LivesLeft-1,0) ) self:visible(true) end end end; + StartCommand=function(self,param) + if param.Player == player then + self:setstate( math.max(param.LivesLeft-1,0) ); + end + end; + FinishCommand=cmd(playcommand,"Start"); }; + }; return t; \ No newline at end of file