New PIU noteskins! :D

NoteSkins/pump/cmd/metrics.ini

@@ -0,0 +1,5 @@
+[UpLeft]
+StartDrawingHoldBodyOffsetFromHead=-22
+
+[UpRight]
+StartDrawingHoldBodyOffsetFromHead=-22

NoteSkins/pump/complex/Center Outline Receptor.redir

@@ -0,0 +1 @@
+_blank

NoteSkins/pump/default/DownRight Ready Receptor.lua

@@ -0,0 +1,8 @@
+return NOTESKIN:LoadActor("DownLeft", "Ready Receptor")..{
+	Frames = {
+		{ Frame = 0 };
+		{ Frame = 1 };
+		{ Frame = 2 };
+	};
+	InitCommand=cmd(rotationy,180);
+};

NoteSkins/pump/default/DownRight Tap Note.lua

@@ -0,0 +1,3 @@
+return NOTESKIN:LoadActor("DownLeft","Tap Note")..{
+	InitCommand=cmd(rotationy,180);
+};

NoteSkins/pump/default/NoteSkin.lua

@@ -0,0 +1,107 @@
+local Noteskin = {}
+
+--bBlanks:
+Noteskin.bBlanks = {
+	--["element"] = true|false;
+	["Hold Tail Active"] = true;
+	["Hold Tail Active"] = true;
+	["Roll Tail Inactive"] = true;
+	["Roll Tail Inactive"] = true;
+}
+Noteskin.ElementRedirs = {
+	--["element"] = "redirected_element";
+	["Hold Head Active"] = "Tap Note";
+	["Hold Head Inactive"] = "Tap Note";
+	["Roll Head Active"] = "Roll Head Active";
+	["Roll Head Inactive"] = "Roll Head Active";
+	["Tap Fake"] = "Tap Note";
+	--
+	["Hold Topcap Inactive"] = "Hold Topcap Active";
+	["Hold Body Inactive"] = "Hold Body Active";
+	["Hold Bottomcap Inactive"] = "Hold Bottomcap Active";
+	["Hold Tail Inactive"] = "Hold Tail Active";
+	--
+	["Roll Topcap Active"] = "Hold Topcap Active";
+	["Roll Body Active"] = "Hold Body Active";
+	["Roll Bottomcap Active"] = "Hold Bottomcap Active";
+	["Roll Tail Active"] = "Hold Tail Active";
+	--
+	["Roll Topcap Inactive"] = "Hold Topcap Active";
+	["Roll Body Inactive"] = "Hold Body Active";
+	["Roll Bottomcap Inactive"] = "Hold Bottomcap Active";
+	["Roll Tail Inactive"] = "Hold Tail Active";
+}
+Noteskin.ButtonRedirs = {
+	Center = "Center";
+	UpLeft = "UpLeft";
+	UpRight = "UpRight";
+	DownLeft = "DownLeft";
+	DownRight = "DownRight";
+}
+Noteskin.BaseRotX = {
+	Center = 0;
+	UpLeft = 0;
+	UpRight = 0;
+	DownLeft = 0;
+	DownRight = 0;
+}
+Noteskin.BaseRotY = {
+	Center = 0;
+	UpLeft = 0;
+	UpRight = 0;
+	DownLeft = 0;
+	DownRight = 0;
+}
+
+local function func()
+	local sButton = Var "Button"
+	local sElement = Var "Element"
+	
+	if Noteskin.bBlanks[sElement] then
+		return Def.Actor {}
+	end
+	
+	--local ButtonToLoad = Noteskin.ButtonRedirs[sButton]
+	local ElementToLoad = Noteskin.ElementRedirs[sElement]
+	if not ElementToLoad then
+		ElementToLoad = sElement
+	end
+	
+	--update: ahora receptor también
+	if sElement == "Explosion"
+	or sElement == "Tap Lift"
+	or sElement == "Tap Mine"
+	or sElement == "Receptor"
+	then
+		sButton = "UpLeft"
+	end
+	local path = NOTESKIN:GetPath(Noteskin.ButtonRedirs[sButton],ElementToLoad)
+	--Graficos separados para holds y rolls
+	--if string.find(sElement,"Hold") or string.find(sElement,"Roll") then
+	if ( string.find(sElement,"Hold") or string.find(sElement,"Roll") ) and not ( string.find(sElement,"Head") or string.find(sElement,"Tail") ) then
+	--if ( string.find(sElement,"Hold") or string.find(sElement,"Roll") ) and ( string.find(sElement,"Body") ) then
+		path = NOTESKIN:GetPath(sButton,ElementToLoad)
+	end
+	
+	local t = LoadActor(path)
+	--Rotaciones independientes por elemento
+	--[[local dRotationX = Noteskin.BaseRotX[sButton][ElementToLoad]
+	if not dRotationX then
+		dRotationX = Noteskin.BaseRotX[sButton]["Common"]
+	end
+	
+	local dRotationY = Noteskin.BaseRotY[sButton][ElementToLoad]
+	if not dRotationY then
+		dRotationY = Noteskin.BaseRotY[sButton]["Common"]
+	end]]
+
+	t.BaseRotationX=Noteskin.BaseRotX[sButton]
+	t.BaseRotationY=Noteskin.BaseRotY[sButton]
+	
+	return t
+end
+
+Noteskin.Load = func
+Noteskin.CommonLoad = func
+
+return Noteskin

NoteSkins/pump/default/UpLeft Explosion.lua

@@ -0,0 +1,53 @@
+return Def.ActorFrame {
+	--note graphic
+	NOTESKIN:LoadActor(Var "Button", "Tap Note") .. {
+		InitCommand=cmd(blend,"BlendMode_Add";playcommand,"Glow");
+		W1Command=cmd(playcommand,"Glow");
+		W2Command=cmd(playcommand,"Glow");
+		W3Command=cmd(playcommand,"Glow");
+		W4Command=cmd();
+		W5Command=cmd();
+		--HoldingOnCommand=cmd(playcommand,"Glow");
+		HitMineCommand=cmd(playcommand,"Glow");
+		GlowCommand=cmd(setstate,0;finishtweening;diffusealpha,1.0;zoom,1.0;linear,0.15;diffusealpha,0.9;zoom,1.15;linear,0.15;diffusealpha,0.0;zoom,1.3);
+		HeldCommand=cmd(playcommand,"Glow");
+	};
+	NOTESKIN:LoadActor(Var "Button", "Ready Receptor")..{
+		Name="Tap";
+		Frames = { { Frame = 2 } };
+		InitCommand=cmd(zoom,1;diffusealpha,0);
+		TapCommand=cmd(finishtweening;diffusealpha,1;zoom,1;linear,0.2;diffusealpha,0;zoom,1.2);
+		
+		W1Command=cmd(playcommand,"Tap");
+		W2Command=cmd(playcommand,"Tap");
+		W3Command=cmd(playcommand,"Tap");
+		W4Command=cmd(playcommand,"Tap");
+		W5Command=cmd(playcommand,"Tap");
+		
+		HitMineCommand=cmd(playcommand,"Tap");
+		HeldCommand=cmd(playcommand,"Tap");
+		
+		--NONECommand=cmd(playcommand,"Tap");
+		
+		--HeldCommand=NOTESKIN:GetMetricA(Var "Button", "TapHeldCommand");
+		--NOT WORKING!!
+		NoneCommand=cmd(linear,0.1;zoom,2);
+	};
+	--explosion
+	LoadActor("_flash")..{
+		InitCommand=cmd(blend,"BlendMode_Add";playcommand,"Glow");
+		W1Command=cmd(playcommand,"Glow");
+		W2Command=cmd(playcommand,"Glow");
+		W3Command=cmd(playcommand,"Glow");
+		W4Command=cmd();
+		W5Command=cmd();
+		--HoldingOnCommand=cmd(playcommand,"Glow");
+		HitMineCommand=cmd(playcommand,"Glow");
+		HeldCommand=cmd(playcommand,"Glow");
+		GlowCommand=cmd(setstate,0;finishtweening;diffusealpha,1;zoom,1;linear,0.2;diffusealpha,0;zoom,1.2);
+	};
+	Def.Quad {
+		InitCommand=cmd(diffuse,1,1,1,0;zoomto,SCREEN_WIDTH*100,SCREEN_HEIGHT*100;zoomz,SCREEN_WIDTH*SCREEN_HEIGHT);
+		HitMineCommand=cmd(finishtweening;diffusealpha,1;linear,0.3;diffusealpha,0);
+	};
+}

NoteSkins/pump/default/UpLeft Receptor.lua

@@ -0,0 +1,49 @@
+local function Beat(self)
+	local this = self:GetChildren()
+	
+	local beat = GAMESTATE:GetSongBeat()
+	
+	local part = beat%1
+	part = clamp(part,0,0.5)
+	local eff = scale(part,0,0.5,1,0)
+	if (GAMESTATE:GetSongDelay() or false) and part == 0 then eff = 0 end
+	if beat < 0 then
+		eff = 0
+	end
+	this.Glow:diffusealpha(eff);
+end
+
+return Def.ActorFrame {
+	-- COMMANDS --
+	InitCommand=cmd(SetUpdateFunction,Beat);
+	
+	-- LAYERS --
+	NOTESKIN:LoadActor("Center", "Outline Receptor")..{
+		Name="Outline";
+		Condition=Var "Button" == "Center";
+		--InitCommand=cmd(x,96);
+	};
+	NOTESKIN:LoadActor(Var "Button", "Ready Receptor")..{
+		Name="Base";
+		Frames = { { Frame = 0 } };
+		--PressCommand=cmd(finishtweening;glow,1,1,1,1;linear,0.1;glow,1,1,1,0);
+	};
+	NOTESKIN:LoadActor(Var "Button", "Ready Receptor")..{
+		Name="Glow";
+		Frames = { { Frame = 1 } };
+		InitCommand=cmd(blend,'BlendMode_Add');
+		--PressCommand=cmd(finishtweening;linear,0.05;zoom,0.9;linear,0.1;zoom,1);
+	};
+	--[[
+	NOTESKIN:LoadActor(Var "Button", "Ready Receptor")..{
+		Name="Tap";
+		Frames = { { Frame = 2 } };
+		InitCommand=cmd(zoom,1;diffusealpha,0;glow,1,1,1,0);
+		--NOTESKIN:GetMetricA(Var "Button", "TapInitCommand");
+		--
+		PressCommand=cmd(finishtweening;glow,1,1,1,1;zoom,1;linear,0.2;glow,1,1,1,0;zoom,1.2);
+		--NOTESKIN:GetMetricA(Var "Button", "TapHeldCommand");
+		--
+	};
+	--]]
+}

NoteSkins/pump/default/UpRight Ready Receptor.lua

@@ -0,0 +1,8 @@
+return NOTESKIN:LoadActor("UpLeft", "Ready Receptor")..{
+	Frames = {
+		{ Frame = 0 };
+		{ Frame = 1 };
+		{ Frame = 2 };
+	};
+	InitCommand=cmd(rotationy,180);
+};

NoteSkins/pump/default/UpRight Tap Note.lua

@@ -0,0 +1,3 @@
+return NOTESKIN:LoadActor("UpLeft","Tap Note")..{
+	InitCommand=cmd(rotationy,180);
+};

NoteSkins/pump/default/metrics.ini

@@ -0,0 +1,29 @@
+[NoteDisplay]
+AnimationIsBeatBased=0
+
+TapNoteAnimationLength=0.25
+TapMineAnimationLength=0.25
+TapLiftAnimationLength=0.25
+TapFakeAnimationLength=0.25
+HoldHeadAnimationLength=0.25
+HoldTopCapAnimationLength=0.25
+HoldBottomCapAnimationLength=0.25
+HoldBodyAnimationLength=0.25
+HoldTailAnimationLength=0.25
+
+HoldLetGoGrayPercent=1
+
+FlipHeadAndTailWhenReverse=1
+FlipHoldBodyWhenReverse=1
+TopHoldAnchorWhenReverse=0
+HoldActiveIsAddLayer=0
+
+[Center]
+
+[DownLeft]
+
+[DownRight]
+
+[UpLeft]
+
+[UpRight]

NoteSkins/pump/simple/Center Outline Receptor.redir

@@ -0,0 +1 @@
+_blank

NoteSkins/pump/simple/metrics.ini

@@ -0,0 +1,10 @@
+[NoteDisplay]
+TapNoteAnimationLength=0.166
+TapMineAnimationLength=0.166
+TapLiftAnimationLength=0.166
+TapFakeAnimationLength=0.166
+HoldHeadAnimationLength=0.166
+HoldTopCapAnimationLength=0.166
+HoldBottomCapAnimationLength=0.166
+HoldBodyAnimationLength=0.166
+HoldTailAnimationLength=0.166

src/Player.cpp

@@ -2008,7 +2008,7 @@ void Player::StepStrumHopo( int col, int row, const RageTimer &tm, bool bHeld, b
 				//oh wow, this was causing the trigger
 				//before the hold heads -DaisuMaster
 				//(It was >)
-				if( !REQUIRE_STEP_ON_HOLD_HEADS && fNoteOffset <= 0.f )
+				if( !REQUIRE_STEP_ON_HOLD_HEADS && fNoteOffset <= GetWindowSeconds( TW_W5 ) )
 				{
 					score = TNS_W1;
 					break;