Skip to content

Commit

Permalink
Merge branch 'MovableGameplayElements'
Browse files Browse the repository at this point in the history
  • Loading branch information
@MinaciousGrace
MinaciousGrace committed Mar 19, 2017
2 parents d8b0517 + a6e4f83 commit abb768a
Show file tree
Hide file tree
Showing 9 changed files with 1,531 additions and 95 deletions.
1,087 changes: 1,031 additions & 56 deletions Themes/Til Death/BGAnimations/ScreenGameplay overlay/WifeJudgmentSpotting.lua
View file

Large diffs are not rendered by default.

193 changes: 178 additions & 15 deletions Themes/Til Death/BGAnimations/ScreenGameplay overlay/npscalc.lua
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,170 @@
-- A moving average NPS calculator

-- movable stuff

--still kept this here because idk man
local enabled = {
NPSDisplay = {
PlayerNumber_P1 = GAMESTATE:IsPlayerEnabled(PLAYER_1) and playerConfig:get_data(pn_to_profile_slot(PLAYER_1)).NPSDisplay,
PlayerNumber_P2 = GAMESTATE:IsPlayerEnabled(PLAYER_2) and playerConfig:get_data(pn_to_profile_slot(PLAYER_2)).NPSDisplay
},
NPSGraph = {
PlayerNumber_P1 = GAMESTATE:IsPlayerEnabled(PLAYER_1) and playerConfig:get_data(pn_to_profile_slot(PLAYER_1)).NPSGraph,
PlayerNumber_P2 = GAMESTATE:IsPlayerEnabled(PLAYER_2) and playerConfig:get_data(pn_to_profile_slot(PLAYER_2)).NPSGraph
}
}

local npsGraphActor
local npsDisplayActor
local npsGraphX = playerConfig:get_data(pn_to_profile_slot(PLAYER_1)).GameplayXYCoordinates.NPSGraphX
local npsGraphY = playerConfig:get_data(pn_to_profile_slot(PLAYER_1)).GameplayXYCoordinates.NPSGraphY
local npsGraphWidth = playerConfig:get_data(pn_to_profile_slot(PLAYER_1)).GameplaySizes.NPSGraphWidth
local npsGraphHeight = playerConfig:get_data(pn_to_profile_slot(PLAYER_1)).GameplaySizes.NPSGraphHeight
local npsDisplayX = playerConfig:get_data(pn_to_profile_slot(PLAYER_1)).GameplayXYCoordinates.NPSDisplayX
local npsDisplayY = playerConfig:get_data(pn_to_profile_slot(PLAYER_1)).GameplayXYCoordinates.NPSDisplayY
local npsDisplayZoom = playerConfig:get_data(pn_to_profile_slot(PLAYER_1)).GameplaySizes.NPSDisplayZoom

local yPressed = false
local uPressed = false
local iPressed = false
local oPressed = false

local function displayInput(event)
if getAutoplay() ~= 0 then
if event.DeviceInput.button == "DeviceButton_y" then
yPressed = not (event.type == "InputEventType_Release")
end
if event.DeviceInput.button == "DeviceButton_u" then
uPressed = not (event.type == "InputEventType_Release")
end
if yPressed and event.type ~= "InputEventType_Release" then
if event.DeviceInput.button == "DeviceButton_up" then
npsDisplayY = npsDisplayY - 5
npsDisplayActor:y(npsDisplayY)
playerConfig:get_data(pn_to_profile_slot(PLAYER_1)).GameplayXYCoordinates.NPSDisplayY = npsDisplayY
changed = true
end
if event.DeviceInput.button == "DeviceButton_down" then
npsDisplayY = npsDisplayY + 5
npsDisplayActor:y(npsDisplayY)
playerConfig:get_data(pn_to_profile_slot(PLAYER_1)).GameplayXYCoordinates.NPSDisplayY = npsDisplayY
changed = true
end
if event.DeviceInput.button == "DeviceButton_left" then
npsDisplayX = npsDisplayX - 5
npsDisplayActor:x(npsDisplayX)
playerConfig:get_data(pn_to_profile_slot(PLAYER_1)).GameplayXYCoordinates.NPSDisplayX = npsDisplayX
changed = true
end
if event.DeviceInput.button == "DeviceButton_right" then
npsDisplayX = npsDisplayX + 5
npsDisplayActor:x(npsDisplayX)
playerConfig:get_data(pn_to_profile_slot(PLAYER_1)).GameplayXYCoordinates.NPSDisplayX = npsDisplayX
changed = true
end
if changed then
playerConfig:set_dirty(pn_to_profile_slot(PLAYER_1))
playerConfig:save(pn_to_profile_slot(PLAYER_1))
changed = false
end
end
if uPressed and event.type ~= "InputEventType_Release" then
if event.DeviceInput.button == "DeviceButton_up" then
npsDisplayZoom = npsDisplayZoom + 0.01
npsDisplayActor:zoom(npsDisplayZoom)
playerConfig:get_data(pn_to_profile_slot(PLAYER_1)).GameplaySizes.NPSDisplayZoom = npsDisplayZoom
changed = true
end
if event.DeviceInput.button == "DeviceButton_down" then
npsDisplayZoom = npsDisplayZoom - 0.01
npsDisplayActor:zoom(npsDisplayZoom)
playerConfig:get_data(pn_to_profile_slot(PLAYER_1)).GameplaySizes.NPSDisplayZoom = npsDisplayZoom
changed = true
end
if changed then
playerConfig:set_dirty(pn_to_profile_slot(PLAYER_1))
playerConfig:save(pn_to_profile_slot(PLAYER_1))
changed = false
end
end
end
return false
end

local function graphInput(event)
if getAutoplay() ~= 0 then
if event.DeviceInput.button == "DeviceButton_i" then
iPressed = not (event.type == "InputEventType_Release")
end
if event.DeviceInput.button == "DeviceButton_o" then
oPressed = not (event.type == "InputEventType_Release")
end
if iPressed and event.type ~= "InputEventType_Release" then
if event.DeviceInput.button == "DeviceButton_up" then
npsGraphY = npsGraphY - 5
npsGraphActor:y(npsGraphY)
playerConfig:get_data(pn_to_profile_slot(PLAYER_1)).GameplayXYCoordinates.NPSGraphY = npsGraphY
changed = true
end
if event.DeviceInput.button == "DeviceButton_down" then
npsGraphY = npsGraphY + 5
npsGraphActor:y(npsGraphY)
playerConfig:get_data(pn_to_profile_slot(PLAYER_1)).GameplayXYCoordinates.NPSGraphY = npsGraphY
changed = true
end
if event.DeviceInput.button == "DeviceButton_left" then
npsGraphX = npsGraphX - 5
npsGraphActor:x(npsGraphX)
playerConfig:get_data(pn_to_profile_slot(PLAYER_1)).GameplayXYCoordinates.NPSGraphX = npsGraphX
changed = true
end
if event.DeviceInput.button == "DeviceButton_right" then
npsGraphX = npsGraphX + 5
npsGraphActor:x(npsGraphX)
playerConfig:get_data(pn_to_profile_slot(PLAYER_1)).GameplayXYCoordinates.NPSGraphX = npsGraphX
changed = true
end
if changed then
playerConfig:set_dirty(pn_to_profile_slot(PLAYER_1))
playerConfig:save(pn_to_profile_slot(PLAYER_1))
changed = false
end
end
if oPressed and event.type ~= "InputEventType_Release" then
if event.DeviceInput.button == "DeviceButton_up" then
npsGraphHeight = npsGraphHeight + 0.01
npsGraphActor:zoomtoheight(npsGraphHeight)
playerConfig:get_data(pn_to_profile_slot(PLAYER_1)).GameplaySizes.NPSGraphHeight = npsGraphHeight
changed = true
end
if event.DeviceInput.button == "DeviceButton_down" then
npsGraphHeight = npsGraphHeight - 0.01
npsGraphActor:zoomtoheight(npsGraphHeight)
playerConfig:get_data(pn_to_profile_slot(PLAYER_1)).GameplaySizes.NPSGraphHeight = npsGraphHeight
changed = true
end
if event.DeviceInput.button == "DeviceButton_left" then
npsGraphWidth = npsGraphWidth - 0.01
npsGraphActor:zoomtowidth(npsGraphWidth)
playerConfig:get_data(pn_to_profile_slot(PLAYER_1)).GameplaySizes.NPSGraphWidth = npsGraphWidth
changed = true
end
if event.DeviceInput.button == "DeviceButton_right" then
npsGraphWidth = npsGraphWidth + 0.01
npsGraphActor:zoomtowidth(npsGraphWidth)
playerConfig:get_data(pn_to_profile_slot(PLAYER_1)).GameplaySizes.NPSGraphWidth = npsGraphWidth
changed = true
end
if changed then
playerConfig:set_dirty(pn_to_profile_slot(PLAYER_1))
playerConfig:save(pn_to_profile_slot(PLAYER_1))
changed = false
end
end
end
return false
end

local debug = false
local countNotesSeparately = GAMESTATE:CountNotesSeparately();
-- Generally, a smaller window will adapt faster, but a larger window will have a more stable value.
Expand All @@ -15,7 +180,6 @@ if not isCentered then
mpOffset = SCREEN_CENTER_X + 60
end


--Graph related stuff
local initialPeak = 10 -- Initial height of the NPS graph.
local graphWidth = 140
Expand Down Expand Up @@ -61,17 +225,6 @@ local judgeColor = { -- Colors of each Judgment types
}


local enabled = {
NPSDisplay = {
PlayerNumber_P1 = GAMESTATE:IsPlayerEnabled(PLAYER_1) and playerConfig:get_data(pn_to_profile_slot(PLAYER_1)).NPSDisplay,
PlayerNumber_P2 = GAMESTATE:IsPlayerEnabled(PLAYER_2) and playerConfig:get_data(pn_to_profile_slot(PLAYER_2)).NPSDisplay
},
NPSGraph = {
PlayerNumber_P1 = GAMESTATE:IsPlayerEnabled(PLAYER_1) and playerConfig:get_data(pn_to_profile_slot(PLAYER_1)).NPSGraph,
PlayerNumber_P2 = GAMESTATE:IsPlayerEnabled(PLAYER_2) and playerConfig:get_data(pn_to_profile_slot(PLAYER_2)).NPSGraph
}
}

local npsWindow = {
PlayerNumber_P1 = maxWindow,
PlayerNumber_P2 = maxWindow,
Expand Down Expand Up @@ -194,7 +347,13 @@ end

local function npsDisplay(pn)
local t = Def.ActorFrame{
Name = "npsDisplay"..pn;
Name = "npsDisplay"..pn,
InitCommand = function(self)
npsDisplayActor = self:GetChild("Text")
end,
OnCommand=function(self)
SCREENMAN:GetTopScreen():AddInputCallback(displayInput)
end,
-- Whenever a MessageCommand is broadcasted,
-- a table contanining parameters can also be passed along.
JudgmentMessageCommand=function(self,params)
Expand Down Expand Up @@ -234,7 +393,7 @@ local function npsDisplay(pn)
if enabled.NPSDisplay[pn] then
t[#t+1] = LoadFont("Common Normal")..{
Name="Text"; -- sets the name of this actor as "Text". this is a child of the actor "t".
InitCommand=cmd(x,textPos[pn].X;y,textPos[pn].Y;halign,0;zoom,0.40;halign,0;valign,0;shadowlength,1;settext,"0.0 NPS");
InitCommand=cmd(x,npsDisplayX;y,npsDisplayY;halign,0;zoom,npsDisplayZoom;halign,0;valign,0;shadowlength,1;settext,"0.0 NPS");
BeginCommand=function(self)
if pn == PLAYER_2 then
self:x(SCREEN_WIDTH-5)
Expand All @@ -254,7 +413,11 @@ end;
local function npsGraph(pn)
local t = Def.ActorFrame{
InitCommand=function(self)
self:xy(graphPos[pn].X,graphPos[pn].Y)
self:xy(npsGraphX,npsGraphY):zoomtoheight(npsGraphHeight):zoomtowidth(npsGraphWidth)
npsGraphActor = self
end,
OnCommand=function(self)
SCREENMAN:GetTopScreen():AddInputCallback(graphInput)
end
}
local verts= {
Expand Down
57 changes: 55 additions & 2 deletions Themes/Til Death/BGAnimations/ScreenGameplay underlay/ScreenFilter.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,48 @@ local filterAlphas = {
Default = 1,
}

local t = Def.ActorFrame{};
--moving notefield shenanigans
local rPressed = false
local tPressed = false
local noteFieldWidth = playerConfig:get_data(pn_to_profile_slot(PLAYER_1)).GameplaySizes.NotefieldWidth
local notefieldX = playerConfig:get_data(pn_to_profile_slot(PLAYER_1)).GameplayXYCoordinates.NotefieldX
local filter

local function input(event)
if getAutoplay() ~= 0 then
if event.DeviceInput.button == "DeviceButton_r" then
rPressed = not (event.type == "InputEventType_Release")
end
if event.DeviceInput.button == "DeviceButton_t" then
tPressed = not (event.type == "InputEventType_Release")
end
if rPressed and event.type ~= "InputEventType_Release" then
if event.DeviceInput.button == "DeviceButton_left" then
filter:addx(-3)
end
if event.DeviceInput.button == "DeviceButton_right" then
filter:addx(3)
end
end
if tPressed and event.type ~= "InputEventType_Release" then
if event.DeviceInput.button == "DeviceButton_left" then
noteFieldWidth = noteFieldWidth - 0.01
filter:playcommand("Update")
end
if event.DeviceInput.button == "DeviceButton_right" then
noteFieldWidth = noteFieldWidth + 0.01
filter:playcommand("Update")
end
end
end
return false
end

local t = Def.ActorFrame{
OnCommand=function()
SCREENMAN:GetTopScreen():AddInputCallback(input)
end
};

local style = GAMESTATE:GetCurrentStyle()
local cols = style:ColumnsPerPlayer()
Expand Down Expand Up @@ -43,7 +84,19 @@ if numPlayers == 1 then
end
t[#t+1] = Def.Quad{
Name="SinglePlayerFilter";
InitCommand=cmd(x,pos;CenterY;zoomto,filterWidth*getNoteFieldScale(player),SCREEN_HEIGHT;diffusecolor,filterColor;diffusealpha,filterAlphas[player]);
InitCommand=function(self)
self:x(pos)
self:CenterY()
self:zoomto(filterWidth*getNoteFieldScale(player)*noteFieldWidth,SCREEN_HEIGHT)
self:diffusecolor(filterColor)
self:diffusealpha(filterAlphas[player])
self:addx(notefieldX)
filter = self
end,
UpdateCommand=function(self)
local player = GAMESTATE:GetMasterPlayerNumber()
self:zoomto(filterWidth*getNoteFieldScale(player)*noteFieldWidth,SCREEN_HEIGHT)
end,
};
else
-- two players... a bit more complex.
Expand Down
Loading

0 comments on commit abb768a

Please sign in to comment.