Skip to content

Commit

Permalink
Winter Update No.1
Browse files Browse the repository at this point in the history
Minor Changes. Not ready for full release yet.
  • Loading branch information
aozora-tori committed Dec 18, 2022
1 parent 34f3579 commit 45e4c59
Show file tree
Hide file tree
Showing 5 changed files with 80 additions and 83 deletions.
52 changes: 0 additions & 52 deletions alpha-kbx/Global Ovceptor.lua

This file was deleted.

93 changes: 69 additions & 24 deletions alpha-kbx/Global Receptor.lua
Original file line number Diff line number Diff line change
@@ -1,41 +1,86 @@
-- In KBX, ReverseOn is the default state.
-- [01.] Button Overlay
-- This is taken directly from default-kbx's Ovceptor Code and modified to fit into the noteskin.

local sButton = Var "Button"
local sGameButton = INPUTFILTER:GameButtonToKeyMapped(Var "GameButton", Var "Player")
sGameButton = string.gsub(sGameButton, "Key", "")

local Buttons = {}

if not PREFSMAN:GetPreference("UseOldJoystickMapping") and string.find(sGameButton, "Joy") then
sGameButton = string.gsub(sGameButton, "Joy.+_", "")
Buttons = Def.Sprite {
Texture=NOTESKIN:GetPath("Key","Buttons/"..sGameButton),
Text=sGameButton,
OnCommand=function(self) self:x(0):zoom(1) end,
ReverseOnCommand=function(self) self:y(28):valign(0) end,
ReverseOffCommand=function(self) self:y(-28):valign(1) end
}
else
sGameButton = string.gsub(sGameButton, "Joy.+ ", "B")
Buttons = Def.BitmapText {
Font="_open sans semibold 24px",
Text=sGameButton,
OnCommand=function(self) self:LoadFromFont(NOTESKIN:GetPath("Key","Font/".."_league spartan Bold 24px.ini")) self:x(0):zoom(0.75) end,
ReverseOnCommand=function(self) self:y(32):valign(0) end,
ReverseOffCommand=function(self) self:y(-32):valign(1) end
}
end

-- [02.] Receptor Body
-- Code for building the Receptor through Def.Quads are here.
-- To-do: Subtle Beat Flashes

return Def.ActorFrame {
-- Background Gradient
Def.Quad {
InitCommand=function(self) self:x(0):diffuse(0,0,0,0.75):scaletoclipped(64,192) end,
ReverseOnCommand=function(self) self:fadetop(0.25) end,
ReverseOffCommand=function(self) self:fadebottom(0.25) end
ReverseOnCommand=function(self) self:fadetop(0.25):fadebottom(0.0625) end,
ReverseOffCommand=function(self) self:fadebottom(0.25)fadetop(0.0625) end
},

-- Receptor Body
-- Background Left Line
Def.Quad {
InitCommand=function(self) self:y(0):scaletoclipped(64,24) end,
ReverseOnCommand=function(self) self:diffuse(color("#800000")):diffusebottomedge(color("#FF0000")) end,
ReverseOffCommand=function(self) self:diffuse(color("#FF0000")):diffusebottomedge(color("#800000")) end,
InitCommand=function(self) self:x(-32):scaletoclipped(1,480):diffuse(1,1,1,0.125) end,
ReverseOnCommand=function(self) self:y(96):valign(1):fadetop(0.25):fadebottom(0.0625) end,
ReverseOffCommand=function(self) self:y(-96):valign(0):fadebottom(0.25):fadetop(0.0625) end
},
-- Top Border Line
-- Background Right Line
Def.Quad {
InitCommand=function(self) self:y(11):scaletoclipped(64,2):diffuse(1,1,1,0.25) end
InitCommand=function(self) self:x(32):scaletoclipped(1,480):diffuse(1,1,1,0.125) end,
ReverseOnCommand=function(self) self:y(96):valign(1):fadetop(0.25):fadebottom(0.0625) end,
ReverseOffCommand=function(self) self:y(-96):valign(0):fadebottom(0.25):fadetop(0.0625) end
},
-- Bottom Border Line
-- Outer Receptor Body
Def.Quad {
InitCommand=function(self) self:y(-11):scaletoclipped(64,2):diffuse(1,1,1,0.25) end
InitCommand=function(self) self:scaletoclipped(64,24):diffuse(0,1,1,1) end
},

-- Upper Gradient Flash
Def.Quad {
InitCommand=function(self) self:scaletoclipped(64,24):diffuse(1,1,1,1):effectclock("beat"):queuecommand("Flash") end,
FlashCommand=function(self) self:diffuseramp():effectcolor1(0,0.75,1,0.625):effectcolor2(0,0.75,1,1):effecttiming(0.2,0,0.8,0) end,
ReverseOnCommand=function(self) self:y(-24):fadetop(0.875) end,
ReverseOffCommand=function(self) self:y(24):fadebottom(0.875) end
-- Inner Receptor Body
Def. Quad {
InitCommand=function(self) self:scaletoclipped(64,18):diffuse(0,0,0,0.875):effectclock("beat"):queuecommand("Flash") end,
FlashCommand=function(self) self:diffuseramp():effectcolor1(0,0,0,0.875):effectcolor2(0,0,0,0.81375):effecttiming(0.2,0,0.8,0) end,
},
-- Lower Inner Receptor Flash
Def. Quad {
InitCommand=function(self) self:y(9):scaletoclipped(64,2):diffuse(0,1,1,0.5) end
},
-- Upper Inner Receptor Flash
Def. Quad {
InitCommand=function(self) self:y(-9):scaletoclipped(64,2):diffuse(0,1,1,0.5) end
},

-- Lane Flash
Def.Quad {
InitCommand=function(self) self:diffuse(color("#00C0FF")):scaletoclipped(64,768):diffusealpha(0) end,
PressCommand=function(self) self:diffusealpha(0.375) end,
InitCommand=function(self) self:diffuse(color("#00C0FF")):scaletoclipped(64,480):diffusealpha(0) end,
PressCommand=function(self) self:diffusealpha(0.5) end,
LiftCommand=function(self) self:stoptweening():linear(0.2):diffusealpha(0) end,
ReverseOnCommand=function(self) self:y(32):valign(1):fadetop(1) end,
ReverseOffCommand=function(self) self:y(-32):valign(0):fadebottom(1) end
}
ReverseOnCommand=function(self) self:y(96):valign(1):fadetop(1):fadebottom(0.0625) end,
ReverseOffCommand=function(self) self:y(-96):valign(0):fadetop(0.0625):fadebottom(1) end
},
-- Lane Inner FLASH
Def.Quad {
InitCommand=function(self) self:diffuse(0,1,1,0.25):scaletoclipped(64,18):diffusealpha(0) end,
PressCommand=function(self) self:diffusealpha(0.5) end,
LiftCommand=function(self) self:stoptweening():linear(0.2):diffusealpha(0) end,
},
Buttons
}
4 changes: 2 additions & 2 deletions alpha-kbx/NoteSkin.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ local Nskin = {}
-- Do remember this will redirect all the files of that direction to the direction its pointed to
Nskin.ButtonRedir =
{
-- Still wondering how I can optimise this for even-numbered layouts. Will fix later.
-- Still wondering how I can optimize this for even-numbered layouts. Will fix later.
Key1 = "White";
Key2 = "Blue";
Key3 = "White";
Expand Down Expand Up @@ -93,9 +93,9 @@ function Nskin.Load()


-- Elements shared across all buttons must fall back to one direction.
-- If you'll use Ovceptor Elements, don't forget to add the string below to make sure it's rendered.
if string.find(Element, "Tap Explosion") or
string.find(Element, "Receptor") or
string.find(Element, "Ovceptor") or
string.find(Element, "Tap Lift") or
string.find(Element, "Mine") then
Button = "Global"
Expand Down
12 changes: 8 additions & 4 deletions alpha-kbx/[Readme].txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,17 @@
<- Alpha-KBX ->
A simple, sharp, geometric noteskin specifically designed for KBX.

[Updates]
- 1.0.1.1e, 12/18/2022
--- Receptor Change yet again
--- Styling changes

- 1.0.1 ??/06/2022
--- Receptor Style updated.

[Notes]
- Certain Themes may mask the parts of the receptor when scroll direction is set upwards.

[Version History]
- 1.0.0
> Initial Release.

[Software]
- Made with GIMP, Inkscape, and love. FOSS FTW.

Expand Down
2 changes: 1 addition & 1 deletion alpha-kbx/metrics.ini
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,4 @@ NoneCommand=finishtweening;zoom,.85;diffusealpha,1;linear,.11;diffusealpha,1;zoo
[ReceptorOverlay]
InitCommand=diffusealpha,0
PressCommand=finishtweening;zoom,1;blend,"BlendMode_Add";diffusealpha,.8;decelerate,0.2;diffusealpha,0.4
LiftCommand=stoptweening;decelerate,.2;diffusealpha,0;zoom,1.2
LiftCommand=stoptweening;decelerate,.2;diffusealpha,0;zoom,1

0 comments on commit 45e4c59

Please sign in to comment.