Merge default beat skin replacement #1083

replacing the scuffed lr2-like skin with something more not bad
etternagame · Dec 2, 2021 · dbfa9d0 · dbfa9d0
1 parent 1ca80ad
commit dbfa9d0
Show file tree

Hide file tree

Showing 57 changed files with 88 additions and 27 deletions.
diff --git a/NoteSkins/beat/default/Blue Go Receptor.png b/NoteSkins/beat/default/Blue Go Receptor.png
diff --git a/NoteSkins/beat/default/Blue Hold Body active.png b/NoteSkins/beat/default/Blue Hold Body active.png
diff --git a/NoteSkins/beat/default/Blue Hold Body inactive.png b/NoteSkins/beat/default/Blue Hold Body inactive.png
diff --git a/NoteSkins/beat/default/Blue Hold Body inactive.redir b/NoteSkins/beat/default/Blue Hold Body inactive.redir
@@ -0,0 +1 @@
+Blue Hold Body active
diff --git a/NoteSkins/beat/default/Blue Hold BottomCap active.png b/NoteSkins/beat/default/Blue Hold BottomCap active.png
diff --git a/NoteSkins/beat/default/Blue Hold BottomCap active.redir b/NoteSkins/beat/default/Blue Hold BottomCap active.redir
@@ -0,0 +1 @@
+zBlank
diff --git a/NoteSkins/beat/default/Blue Hold BottomCap inactive.png b/NoteSkins/beat/default/Blue Hold BottomCap inactive.png
diff --git a/NoteSkins/beat/default/Blue Hold BottomCap inactive.redir b/NoteSkins/beat/default/Blue Hold BottomCap inactive.redir
@@ -0,0 +1 @@
+zBlank
diff --git a/NoteSkins/beat/default/Blue Laser.png b/NoteSkins/beat/default/Blue Laser.png
diff --git a/NoteSkins/beat/default/Blue Tap Explosion Bright 9x1.png b/NoteSkins/beat/default/Blue Tap Explosion Bright 9x1.png
diff --git a/NoteSkins/beat/default/Blue Tap Explosion Dim 9x1.png b/NoteSkins/beat/default/Blue Tap Explosion Dim 9x1.png
diff --git a/NoteSkins/beat/default/Blue Tap Explosion Dim.redir b/NoteSkins/beat/default/Blue Tap Explosion Dim.redir
@@ -0,0 +1 @@
+Blue Tap Explosion Bright
diff --git a/NoteSkins/beat/default/Blue Tap Mine 1x1.png b/NoteSkins/beat/default/Blue Tap Mine 1x1.png
diff --git a/NoteSkins/beat/default/Blue Tap Mine.redir b/NoteSkins/beat/default/Blue Tap Mine.redir
@@ -0,0 +1 @@
+_Mine
diff --git a/NoteSkins/beat/default/Blue Tap Note 1x1.png b/NoteSkins/beat/default/Blue Tap Note 1x1.png
diff --git a/NoteSkins/beat/default/Fallback Hold Explosion 9x1.png b/NoteSkins/beat/default/Fallback Hold Explosion 9x1.png
diff --git a/NoteSkins/beat/default/NoteSkin.lua b/NoteSkins/beat/default/NoteSkin.lua
@@ -61,15 +61,22 @@ ret.PartsToRotate = {
 -- ret.Rotate.UpLeft = 0;
 -- ret.Rotate.UpRight = 90;
 --
+
+--This table doesn't seem to do anything and I don't know why
 ret.Blank = {
 	["Hold Topcap Active"] = true,
 	["Hold Topcap Inactive"] = true,
 	["Roll Topcap Active"] = true,
 	["Roll Topcap Inactive"] = true,
+	["Hold BottomCap Active"] = true,
+	["Hold BottomCap Inactive"] = true,
+	["Roll BottomCap Active"] = true,
+	["Roll BottomCap Inactive"] = true,
 	["Hold Tail Active"] = true,
 	["Hold Tail Inactive"] = true,
 	["Roll Tail Active"] = true,
 	["Roll Tail Inactive"] = true
+
 }
 
 return ret
diff --git a/NoteSkins/beat/default/Red Go Receptor.png b/NoteSkins/beat/default/Red Go Receptor.png
diff --git a/NoteSkins/beat/default/Red Hold Body active.png b/NoteSkins/beat/default/Red Hold Body active.png
diff --git a/NoteSkins/beat/default/Red Hold Body inactive.redir b/NoteSkins/beat/default/Red Hold Body inactive.redir
@@ -0,0 +1 @@
+Red Hold Body active
diff --git a/NoteSkins/beat/default/Red Hold BottomCap active.redir b/NoteSkins/beat/default/Red Hold BottomCap active.redir
@@ -0,0 +1 @@
+zBlank
diff --git a/NoteSkins/beat/default/Red Hold BottomCap inactive.redir b/NoteSkins/beat/default/Red Hold BottomCap inactive.redir
@@ -0,0 +1 @@
+zBlank
diff --git a/NoteSkins/beat/default/Red Laser.png b/NoteSkins/beat/default/Red Laser.png
diff --git a/NoteSkins/beat/default/Red Tap Explosion Bright 9x1.png b/NoteSkins/beat/default/Red Tap Explosion Bright 9x1.png
diff --git a/NoteSkins/beat/default/Red Tap Explosion Bright.redir b/NoteSkins/beat/default/Red Tap Explosion Bright.redir
@@ -0,0 +1 @@
+Blue Tap Explosion Bright
diff --git a/NoteSkins/beat/default/Red Tap Explosion Dim 9x1.png b/NoteSkins/beat/default/Red Tap Explosion Dim 9x1.png
diff --git a/NoteSkins/beat/default/Red Tap Explosion Dim.redir b/NoteSkins/beat/default/Red Tap Explosion Dim.redir
@@ -0,0 +1 @@
+Blue Tap Explosion Bright
diff --git a/NoteSkins/beat/default/Red Tap Mine 1x1.png b/NoteSkins/beat/default/Red Tap Mine 1x1.png
diff --git a/NoteSkins/beat/default/Red Tap Mine.redir b/NoteSkins/beat/default/Red Tap Mine.redir
@@ -0,0 +1 @@
+_Mine
diff --git a/NoteSkins/beat/default/Red Tap Note 1x1.png b/NoteSkins/beat/default/Red Tap Note 1x1.png
diff --git a/NoteSkins/beat/default/White Go Receptor.png b/NoteSkins/beat/default/White Go Receptor.png
diff --git a/NoteSkins/beat/default/White Hold Body active.png b/NoteSkins/beat/default/White Hold Body active.png
diff --git a/NoteSkins/beat/default/White Hold Body inactive.png b/NoteSkins/beat/default/White Hold Body inactive.png
diff --git a/NoteSkins/beat/default/White Hold Body inactive.redir b/NoteSkins/beat/default/White Hold Body inactive.redir
@@ -0,0 +1 @@
+White Hold Body active
diff --git a/NoteSkins/beat/default/White Hold BottomCap active.png b/NoteSkins/beat/default/White Hold BottomCap active.png
diff --git a/NoteSkins/beat/default/White Hold BottomCap active.redir b/NoteSkins/beat/default/White Hold BottomCap active.redir
@@ -0,0 +1 @@
+zBlank
diff --git a/NoteSkins/beat/default/White Hold BottomCap inactive.png b/NoteSkins/beat/default/White Hold BottomCap inactive.png
diff --git a/NoteSkins/beat/default/White Hold BottomCap inactive.redir b/NoteSkins/beat/default/White Hold BottomCap inactive.redir
@@ -0,0 +1 @@
+zBlank
diff --git a/NoteSkins/beat/default/White Laser (res 38x240).png b/NoteSkins/beat/default/White Laser (res 38x240).png
diff --git a/NoteSkins/beat/default/White Tap Explosion Bright 9x1.png b/NoteSkins/beat/default/White Tap Explosion Bright 9x1.png
diff --git a/NoteSkins/beat/default/White Tap Explosion Bright.redir b/NoteSkins/beat/default/White Tap Explosion Bright.redir
@@ -0,0 +1 @@
+Blue Tap Explosion Bright
diff --git a/NoteSkins/beat/default/White Tap Explosion Dim 9x1.png b/NoteSkins/beat/default/White Tap Explosion Dim 9x1.png
diff --git a/NoteSkins/beat/default/White Tap Explosion Dim.redir b/NoteSkins/beat/default/White Tap Explosion Dim.redir
@@ -0,0 +1 @@
+Blue Tap Explosion Bright
diff --git a/NoteSkins/beat/default/White Tap Mine 1x1.png b/NoteSkins/beat/default/White Tap Mine 1x1.png
diff --git a/NoteSkins/beat/default/White Tap Mine.redir b/NoteSkins/beat/default/White Tap Mine.redir
@@ -0,0 +1 @@
+_Mine
diff --git a/NoteSkins/beat/default/White Tap Note 1x1.png b/NoteSkins/beat/default/White Tap Note 1x1.png
diff --git a/NoteSkins/beat/default/_Blue Tap Explosion Bright.redir b/NoteSkins/beat/default/_Blue Tap Explosion Bright.redir
diff --git a/NoteSkins/beat/default/_Blue Tap Explosion Dim.png b/NoteSkins/beat/default/_Blue Tap Explosion Dim.png
diff --git a/NoteSkins/beat/default/_Mine.png b/NoteSkins/beat/default/_Mine.png
diff --git a/NoteSkins/beat/default/_Red Tap Explosion Bright.redir b/NoteSkins/beat/default/_Red Tap Explosion Bright.redir
diff --git a/NoteSkins/beat/default/_Red Tap Explosion Dim.png b/NoteSkins/beat/default/_Red Tap Explosion Dim.png
diff --git a/NoteSkins/beat/default/_Tap Lead-in Receptor.lua b/NoteSkins/beat/default/_Tap Lead-in Receptor.lua
@@ -1,19 +1,5 @@
 return Def.ActorFrame {
 	children = {
-		LoadActor("_Tap Receptor", NOTESKIN:LoadActor(Var "Button", "Ready Receptor")) ..
-			{
-				Frame0000 = 0,
-				Delay0000 = 1,
-				InitCommand = function(self)
-					self:playcommand("Set")
-				end,
-				GameplayLeadInChangedMessageCommand = function(self)
-					self:playcommand("Set")
-				end,
-				SetCommand = function(self)
-					self:visible(GAMESTATE:GetGameplayLeadIn())
-				end
-			},
 		LoadActor("_Tap Receptor", NOTESKIN:LoadActor(Var "Button", "Go Receptor")) ..
 			{
 				Frame0000 = 0,

diff --git a/NoteSkins/beat/default/_Tap Receptor.lua b/NoteSkins/beat/default/_Tap Receptor.lua
@@ -1,15 +1,64 @@
-local t = ...
-assert(type(t) == "table")
+local Reverse = string.find(GAMESTATE:GetPlayerState(pn):GetPlayerOptionsString("ModsLevel_Preferred"), "Reverse");
+local sButton = Var "Button"
 
-return t ..
-	{
+if sButton == "scratch"
+	then column = "Red"
+
+elseif sButton == "Key2"
+	or sButton == "Key4"
+	or sButton == "Key6"
+	then column = "Blue"
+else
+	column = "White"
+end
+
+local t =
+	Def.ActorFrame {
+	--Judgeline
+	Def.Sprite {
+		Texture = column .. " Go Receptor",
+		Frames=Sprite.LinearFrames(1,1),
 		InitCommand = NOTESKIN:GetMetricA("ReceptorArrow", "InitCommand"),
-		MissCommand = NOTESKIN:GetMetricA("ReceptorArrow", "MissCommand"),
 		NoneCommand = NOTESKIN:GetMetricA("ReceptorArrow", "NoneCommand"),
-		HitMineCommand = NOTESKIN:GetMetricA("ReceptorArrow", "HitMineCommand"),
+		PressCommand = NOTESKIN:GetMetricA("ReceptorArrow", "PressCommand"),
+		LiftCommand = NOTESKIN:GetMetricA("ReceptorArrow", "LiftCommand"),
 		W5Command = NOTESKIN:GetMetricA("ReceptorArrow", "W5Command"),
 		W4Command = NOTESKIN:GetMetricA("ReceptorArrow", "W4Command"),
 		W3Command = NOTESKIN:GetMetricA("ReceptorArrow", "W3Command"),
 		W2Command = NOTESKIN:GetMetricA("ReceptorArrow", "W2Command"),
 		W1Command = NOTESKIN:GetMetricA("ReceptorArrow", "W1Command")
+	},
+	--Laser
+	Def.Sprite {
+		Texture = column .. " Laser",
+		Frames=Sprite.LinearFrames(1,1),
+		InitCommand = function(self)
+			if not Reverse then
+				self:addrotationz(180)
+				self:addy(4)
+			else
+				self:addy(-4)
+			end
+
+			self:valign(1)
+			self:diffusealpha(0)
+			self:zoom(1)
+			self:blend("BlendMode_Add")
+		end,
+		NoneCommand = NOTESKIN:GetMetricA("ReceptorArrow", "NoneCommand"),
+		PressCommand = function(self)
+			self:finishtweening()
+			self:diffusealpha(1)
+			self:zoomy(0.5)
+			self:zoomx(1)
+		end,
+		LiftCommand = function(self)
+			self:zoomy(0.75)
+			self:decelerate(0.192)
+			self:zoomx(0.33)
+			self:diffusealpha(0)
+		end
 	}
+
+}
+return t
diff --git a/NoteSkins/beat/default/_White Tap Explosion Bright.redir b/NoteSkins/beat/default/_White Tap Explosion Bright.redir
diff --git a/NoteSkins/beat/default/_White Tap Explosion Dim.png b/NoteSkins/beat/default/_White Tap Explosion Dim.png
diff --git a/NoteSkins/beat/default/metrics.ini b/NoteSkins/beat/default/metrics.ini
@@ -13,7 +13,7 @@ HoldBottomCapAnimationLength=4	// doesn't matter.  Only 1 frame anyway.
 HoldBodyAnimationLength=4	// doesn't matter.  Only 1 frame anyway.
 HoldTailAnimationLength=4	// doesn't matter.  Only 1 frame anyway.
 StartDrawingHoldBodyOffsetFromHead=0
-StopDrawingHoldBodyOffsetFromTail=-32	// top of tail
+StopDrawingHoldBodyOffsetFromTail=4	// top of tail
 HoldLetGoGrayPercent=0.25
 ReverseDrawOrder=0000000
 HoldHeadIsAboveWavyParts=1
@@ -40,8 +40,8 @@ JudgmentFrames=7
 JudgmentSeconds=0.2
 MineFrames=1
 MineSeconds=0.2
-HoldFrames=1
-HoldSeconds=0.2
+HoldFrames=9
+HoldSeconds=0.3
 
 [GhostArrowBright]
 W5Command=loop,0;diffusealpha,1;setstate,0;sleep,self:GetAnimationLengthSeconds();diffusealpha,0
@@ -56,7 +56,12 @@ LetGoCommand=sleep,0.06
 HeldCommand=diffuse,1.0,1.0,0.3,1;zoom,1;linear,0.1;zoom,1.1;linear,0.1;diffusealpha,0
 
 [ReceptorArrow]
+HitMineCommand=
+MissCommand=
+W5Command=
+W4Command=
 W3Command=
 W2Command=
 W1Command=
-#NoneCommand=
+NoneCommand=
+InitCommand=
diff --git a/NoteSkins/beat/default/zBlank.png b/NoteSkins/beat/default/zBlank.png