Skip to content

Commit

Permalink
fallback/Scripts doc comments. Global assets
Browse files Browse the repository at this point in the history
global assets are avatars, toasties and judgements (For now). TODO:
Selector in theme
docs use ldoc
  • Loading branch information
nico-abram committed Sep 14, 2018
1 parent e49c92d commit fa1ca5a
Show file tree
Hide file tree
Showing 35 changed files with 768 additions and 723 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ local t = Def.ActorFrame{
end,
BeginCommand=function(self)
self:finishtweening()
self:Load(THEME:GetPathG("","../"..getAvatarPath(PLAYER_1)))
self:Load(getAvatarPath(PLAYER_1))
self:zoomto(50,50)
end,
},
Expand Down
16 changes: 11 additions & 5 deletions Themes/Til Death/BGAnimations/ScreenGameplay toasty/default.lua
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
local t = Def.ActorFrame{
LoadActor( "toasty.png" )..{
Def.Sprite {
InitCommand=function(self)
self:xy(SCREEN_WIDTH+100,SCREEN_CENTER_Y)
self:Load(getAssetPath("toasty")..".png")
end,
StartTransitioningCommand=function(self)
self:decelerate(0.25):x(SCREEN_WIDTH-100):sleep(1.75):accelerate(0.5):x(SCREEN_WIDTH+100)
end
},
LoadActor ( "toasty.ogg" )..{StartTransitioningCommand=function(self)
self:play()
end}
},
Def.Sound {
InitCommand=function(self)
self:load(getAssetPath("toasty")..".ogg")
end,
StartTransitioningCommand=function(self)
self:play()
end
}
}
return t
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ t[#t+1] = Def.ActorFrame{
end,
ModifyAvatarCommand=function(self)
self:finishtweening()
self:LoadBackground(THEME:GetPathG("","../"..getAvatarPath(PLAYER_1)))
self:Load(getAvatarPath(PLAYER_1))
self:zoomto(30,30)
end
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ function GetLocalProfiles()
end,
ModifyAvatarCommand=function(self)
self:finishtweening()
self:LoadBackground(THEME:GetPathG("","../"..getAvatarPathFromProfileID(profileID)))
self:Load(getAvatarPath(PLAYER_1))
self:zoomto(30,30)
end
}
Expand Down
4 changes: 2 additions & 2 deletions Themes/Til Death/BGAnimations/_PlayerInfo.lua
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ t[#t+1] = Def.ActorFrame{
end,
ModifyAvatarCommand=function(self)
self:finishtweening()
self:Load(THEME:GetPathG("","../"..getAvatarPath(PLAYER_1)))
self:Load(getAvatarPath(PLAYER_1))
self:zoomto(50,50)
end,
},
Expand Down Expand Up @@ -238,7 +238,7 @@ local function Update(self)
t.InitCommand=function(self)
self:SetUpdateFunction(Update)
end;
if getAvatarUpdateStatus(PLAYER_1) then
if getAvatarUpdateStatus() then
self:GetChild("Avatar"..PLAYER_1):GetChild("Image"):queuecommand("ModifyAvatar")
setAvatarUpdateStatus(PLAYER_1,false)
end;
Expand Down
4 changes: 2 additions & 2 deletions Themes/Til Death/BGAnimations/_switchavatar.lua
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ end

--Parameters.
local imgTypes = {".jpg",".png",".gif",".jpeg"}
local rawList = FILEMAN:GetDirListing("Themes/"..THEME:GetCurThemeName().."/Graphics/Player avatar/")
local rawList = FILEMAN:GetDirListing(assetFolders.avatar)
local avatars = filterFileList(rawList,imgTypes)

local maxItems = 7--math.min(7,#avatars)
Expand Down Expand Up @@ -187,7 +187,7 @@ local function avatarSwitch(pn)
end,
ModifyAvatarCommand=function(self)
self:finishtweening()
self:LoadBackground(THEME:GetPathG("","Player avatar/"..v))
self:LoadBackground(assetFolders.avatar..v)
self:zoomto(itemWidth,itemHeight)
end,
AvMouseLeftClickMessageCommand=function(self) -- theoretically this should move the scroller unless to the target, unless the target is already selected in which case this should executre, but, that's work -mina
Expand Down
Binary file removed Themes/Til Death/Graphics/Judgment Normal 1x6.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
3 changes: 2 additions & 1 deletion Themes/Til Death/Graphics/Player judgment/default.lua
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ local function input(event)
end

local t = Def.ActorFrame {
LoadActor(THEME:GetPathG("Judgment","Normal")) .. {
Def.Sprite {
Texture = "../../../../"..getAssetPath("judgement"),
Name="Judgment",
InitCommand=function(self)
self:pause():visible(false):xy(x,y):zoom(zoom)
Expand Down
293 changes: 0 additions & 293 deletions Themes/Til Death/Scripts/00 Utility.lua

This file was deleted.

Loading

0 comments on commit fa1ca5a

Please sign in to comment.