From a576058b01d00f5029db1aaca2f92fa8f0ea9949 Mon Sep 17 00:00:00 2001 From: Mylloon Date: Sat, 25 Feb 2023 17:48:13 +0100 Subject: [PATCH] use new animations in button logic --- Characters/Villain.gd | 3 +-- Scenes/Button_Node2D.gd | 12 ++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Characters/Villain.gd b/Characters/Villain.gd index 3561fb2..6f3b131 100755 --- a/Characters/Villain.gd +++ b/Characters/Villain.gd @@ -6,6 +6,7 @@ onready var timer var limit_random var rng = RandomNumberGenerator.new() onready var button = $"../Button/" +export(Array, String) var animations = ["orange", "red"] # True if animation should change var next = false @@ -23,8 +24,6 @@ func _ready(): func _process(delta): timer += delta - var animations = ["orange", "red"] - var max_frame = me.frames.get_frame_count(me.animation) - 1 var current_anim_idx = animations.find(me.animation) if current_anim_idx >= animations.size() - 1: diff --git a/Scenes/Button_Node2D.gd b/Scenes/Button_Node2D.gd index 301255f..ea56319 100755 --- a/Scenes/Button_Node2D.gd +++ b/Scenes/Button_Node2D.gd @@ -1,8 +1,9 @@ extends Button onready var villain = $"../Villain/AnimatedSprite" +onready var villain_animations = $"../Villain".animations -var etat +var etat = false const texture_pressed = preload("res://Assets/skin_assets/button_normal.png") const texture_released = preload("res://Assets/skin_assets/button_pressed.png") @@ -10,11 +11,10 @@ const texture_released = preload("res://Assets/skin_assets/button_pressed.png") # Called every frame. '_delta' is the elapsed time since the previous frame. func _process(_delta): if etat: - match villain.get_frame(): - 2: - print("non") - _: - print("oui") + if villain.animation == villain_animations[1]: + print("non") + else: + print("oui") else: print("caché")