gabry/CodenameEngine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Alt anim Idle in evnet

Browse Source
This commit is contained in:
lunarcleint
2024-02-03 15:49:17 -07:00
parent 4059cdfc44
commit 887fd56f8c
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/backend/chart/EventsData.hx
+1 -1
View File
@@ -47,7 +47,7 @@ class EventsData {
defValue: "In"
}
],
"Alt Animation Toggle" => [{name: "Strumline", type: TStrumLine, defValue: 0}, {name: "Enable", type: TBool, defValue: true}],
"Alt Animation Toggle" => [{name: "Enable On Sing Poses", type: TBool, defValue: true}, {name: "Enable On Idle", type: TBool, defValue: true}, {name: "Strumline", type: TStrumLine, defValue: 0}],
"Play Animation" => [{name: "Character", type: TStrumLine, defValue: 0}, {name: "Animation", type: TString, defValue: "animation"}],
];
source/funkin/game/Character.hx
+3 -2
View File
@@ -62,6 +62,7 @@ class Character extends FunkinSprite implements IBeatReceiver implements IOffset
public var xml:Access;
public var shadowFrame:CharacterShadowFrame;
public var idleSuffix:String = "";
public inline function getCameraPosition()
{
@@ -219,10 +220,10 @@ class Character extends FunkinSprite implements IBeatReceiver implements IOffset
default:
if (isDanceLeftDanceRight)
{
playAnim((danced = !danced) ? 'danceLeft' : 'danceRight', DANCE);
playAnim(((danced = !danced) ? 'danceLeft' : 'danceRight') + idleSuffix, DANCE);
}
else
playAnim('idle', DANCE);
playAnim('idle' + idleSuffix, DANCE);
}
}
}
source/funkin/game/PlayState.hx
+11 -9
View File
@@ -1244,12 +1244,9 @@ class PlayState extends MusicBeatState
switch(event.name) {
case "HScript Call":
if (event.params[0] is String && event.params[1] is String) {
scripts.call(event.params[0], event.params[1].split(','));
}
scripts.call(event.params[0], event.params[1].split(','));
case "Camera Movement":
if (event.params[0] is Int)
curCameraTarget = event.params[0];
curCameraTarget = event.params[0];
case "Add Camera Zoom":
var camera:FlxCamera = event.params[1] == "camHUD" ? camHUD : camGame;
camera.zoom += event.params[0];
@@ -1272,10 +1269,15 @@ class PlayState extends MusicBeatState
else
scrollSpeedTween = FlxTween.tween(this, {scrollSpeed: event.params[1]}, (Conductor.stepCrochet / 1000) * event.params[2], {ease: CoolUtil.flxeaseFromString(event.params[3], event.params[4])});
case "Alt Animation Toggle":
if (event.params[0] is Int && event.params[1] is Bool) {
var strLine = strumLines.members[event.params[0]];
if (strLine != null)
strLine.altAnim = cast event.params[1];
var strLine = strumLines.members[event.params[2]];
if (strLine != null) {
strLine.altAnim = cast event.params[0];
if (event.params[1]) // Alt anim Idle
for (character in strLine.characters) {
if (character == null) continue;
character.idleSuffix = event.params[1] ? "-alt" : "";
}
}
case "Play Animation":
if (strumLines.members[event.params[0]] != null && strumLines.members[event.params[0]].characters != null)