From 925d68619b4bd9beac35eac14e01d391f8f6218a Mon Sep 17 00:00:00 2001 From: Luke Hubmayer-Werner Date: Fri, 8 Dec 2023 21:11:47 +1030 Subject: [PATCH] Add punch frames Also fix main.tcsn rect size --- PC.gd | 4 +++- main.tscn | 2 -- test/audio_system.gd | 1 + test/battle_sprites.tscn | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/PC.gd b/PC.gd index 7709203..762c953 100644 --- a/PC.gd +++ b/PC.gd @@ -21,6 +21,7 @@ enum Battle_Anim { DOWN, R_SWING, L_SWING, + PUNCH, CHEER, RECOIL, CHANT @@ -36,6 +37,7 @@ const Animation_Frames = { Battle_Anim.DOWN: [Battle_Frame.DOWN], Battle_Anim.R_SWING: [Battle_Frame.R_SWING, Battle_Frame.WALK], Battle_Anim.L_SWING: [Battle_Frame.L_SWING, Battle_Frame.L_SWING2], + Battle_Anim.PUNCH: [Battle_Frame.STAND, Battle_Frame.L_SWING2, Battle_Frame.R_SWING, Battle_Frame.L_SWING2, Battle_Frame.R_SWING, Battle_Frame.L_SWING2, Battle_Frame.R_SWING, Battle_Frame.R_SWING], Battle_Anim.CHEER: [Battle_Frame.CHEER, Battle_Frame.STAND], Battle_Anim.RECOIL: [Battle_Frame.RECOIL], Battle_Anim.CHANT: [Battle_Frame.CHANT1, Battle_Frame.CHANT2] @@ -53,7 +55,7 @@ func _draw(): if self.texture == null: return var frames = Animation_Frames[animation] - var frame = frames[int(globals.time*4) % len(frames)] + var frame = frames[int(globals.time*6) % len(frames)] var y = 0 if frame == Battle_Frame.CHEER: y -= 1 diff --git a/main.tscn b/main.tscn index 1e6903d..c964498 100644 --- a/main.tscn +++ b/main.tscn @@ -6,7 +6,5 @@ [node name="main" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 -margin_right = -640.0 -margin_bottom = -360.0 theme = ExtResource( 1 ) script = ExtResource( 5 ) diff --git a/test/audio_system.gd b/test/audio_system.gd index 1f9d31a..f6fd5c9 100644 --- a/test/audio_system.gd +++ b/test/audio_system.gd @@ -1,4 +1,5 @@ extends Node2D +#warning-ignore-all:return_value_discarded const MusicPlayer := preload('res://scripts/MusicPlayer.gd') var MusicLoader := preload('res://scripts/loaders/snes/music_ff5.gd').new() var inst_buttons = [] diff --git a/test/battle_sprites.tscn b/test/battle_sprites.tscn index 3381715..781ce34 100644 --- a/test/battle_sprites.tscn +++ b/test/battle_sprites.tscn @@ -13,7 +13,7 @@ margin_top = 160.0 margin_right = 100.0 margin_bottom = 180.0 text = "Stand" -items = [ "Stand", null, false, 0, null, "Guard", null, false, 1, null, "Walk", null, false, 2, null, "Down", null, false, 3, null, "R_Swing", null, false, 4, null, "L_Swing", null, false, 5, null, "Cheer", null, false, 6, null, "Recoil", null, false, 7, null, "Chant", null, false, 8, null ] +items = [ "Stand", null, false, 0, null, "Guard", null, false, 1, null, "Walk", null, false, 2, null, "Down", null, false, 3, null, "R_Swing", null, false, 4, null, "L_Swing", null, false, 5, null, "Punch", null, false, 6, null, "Cheer", null, false, 7, null, "Recoil", null, false, 8, null, "Chant", null, false, 9, null ] selected = 0 [connection signal="item_selected" from="OptionButton" to="." method="_on_OptionButton_item_selected"]