birdulon/ChocolateBird
birdulon
/
ChocolateBird
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add punch frames 

Also fix main.tcsn rect size
This commit is contained in:
Luke Hubmayer-Werner 2023-12-08 21:11:47 +10:30
parent 923e2f463e
commit 925d68619b
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PC.gd
View File

@ -21,6 +21,7 @@ enum Battle_Anim {
DOWN, DOWN,
R_SWING, R_SWING,
L_SWING, L_SWING,
PUNCH,
CHEER, CHEER,
RECOIL, RECOIL,
CHANT CHANT
@ -36,6 +37,7 @@ const Animation_Frames = {
Battle_Anim.DOWN: [Battle_Frame.DOWN], Battle_Anim.DOWN: [Battle_Frame.DOWN],
Battle_Anim.R_SWING: [Battle_Frame.R_SWING, Battle_Frame.WALK], 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.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.CHEER: [Battle_Frame.CHEER, Battle_Frame.STAND],
Battle_Anim.RECOIL: [Battle_Frame.RECOIL], Battle_Anim.RECOIL: [Battle_Frame.RECOIL],
Battle_Anim.CHANT: [Battle_Frame.CHANT1, Battle_Frame.CHANT2] Battle_Anim.CHANT: [Battle_Frame.CHANT1, Battle_Frame.CHANT2]
@ -53,7 +55,7 @@ func _draw():
if self.texture == null: if self.texture == null:
return return
var frames = Animation_Frames[animation] 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 var y = 0
if frame == Battle_Frame.CHEER: if frame == Battle_Frame.CHEER:
y -= 1 y -= 1

2
main.tscn
View File

@ -6,7 +6,5 @@
[node name="main" type="Control"] [node name="main" type="Control"]
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
margin_right = -640.0
margin_bottom = -360.0
theme = ExtResource( 1 ) theme = ExtResource( 1 )
script = ExtResource( 5 ) script = ExtResource( 5 )

1
test/audio_system.gd
View File

@ -1,4 +1,5 @@
extends Node2D extends Node2D
#warning-ignore-all:return_value_discarded
const MusicPlayer := preload('res://scripts/MusicPlayer.gd') const MusicPlayer := preload('res://scripts/MusicPlayer.gd')
var MusicLoader := preload('res://scripts/loaders/snes/music_ff5.gd').new() var MusicLoader := preload('res://scripts/loaders/snes/music_ff5.gd').new()
var inst_buttons = [] var inst_buttons = []

2
test/battle_sprites.tscn
View File

@ -13,7 +13,7 @@ margin_top = 160.0
margin_right = 100.0 margin_right = 100.0
margin_bottom = 180.0 margin_bottom = 180.0
text = "Stand" 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 selected = 0
[connection signal="item_selected" from="OptionButton" to="." method="_on_OptionButton_item_selected"] [connection signal="item_selected" from="OptionButton" to="." method="_on_OptionButton_item_selected"]