Merge branch 'main' of github.com:henriquelalves/ggj2024

5 files changed, 74 insertions, 7 deletions

diff --git a/game/shared/assets/SingleDay-Regular.ttf b/game/shared/assets/SingleDay-Regular.ttf
new file mode 100644
index 0000000..c70da6b
--- /dev/null
+++ b/game/shared/assets/SingleDay-Regular.ttf
diff --git a/game/shared/assets/SingleDay-Regular.ttf.import b/game/shared/assets/SingleDay-Regular.ttf.import
new file mode 100644
index 0000000..48ef387
--- /dev/null
+++ b/game/shared/assets/SingleDay-Regular.ttf.import
@@ -0,0 +1,33 @@
+[remap]
+
+importer="font_data_dynamic"
+type="FontFile"
+uid="uid://den305djdhip6"
+path="res://.godot/imported/SingleDay-Regular.ttf-328494f7e7c7bddc457d5d401d0bdfa4.fontdata"
+
+[deps]
+
+source_file="res://game/shared/assets/SingleDay-Regular.ttf"
+dest_files=["res://.godot/imported/SingleDay-Regular.ttf-328494f7e7c7bddc457d5d401d0bdfa4.fontdata"]
+
+[params]
+
+Rendering=null
+antialiasing=1
+generate_mipmaps=false
+multichannel_signed_distance_field=false
+msdf_pixel_range=8
+msdf_size=48
+allow_system_fallback=true
+force_autohinter=false
+hinting=1
+subpixel_positioning=1
+oversampling=0.0
+Fallbacks=null
+fallbacks=[]
+Compress=null
+compress=true
+preload=[]
+language_support={}
+script_support={}
+opentype_features={}
diff --git a/game/shared/characters/character_animation.gd b/game/shared/characters/character_animation.gd
new file mode 100644
index 0000000..d3fdfc4
--- /dev/null
+++ b/game/shared/characters/character_animation.gd
@@ -0,0 +1,32 @@
+@tool
+extends Node2D
+
+@onready var animated_sprite: AnimatedSprite2D = %CharacterAnimatedSprite
+var _sprite_frames: SpriteFrames
+
+@export var sprite_frames: SpriteFrames :
+	set(v):
+		_sprite_frames = v
+		if not is_node_ready():
+			await ready
+		animated_sprite.sprite_frames = _sprite_frames
+	get:
+		return _sprite_frames
+
+
+func _reset_animation():
+	animated_sprite.animation = "default"
+
+
+func play_happy():
+	animated_sprite.animation = "happy"
+	var tween = create_tween()
+	tween.tween_property(animated_sprite, "scale", Vector2.ONE, 1).set_ease(Tween.EASE_OUT).set_trans(Tween.TRANS_ELASTIC).from(Vector2(1.3, 0.8))
+	tween.tween_callback(_reset_animation).set_delay(0.5)
+
+
+func play_mad():
+	animated_sprite.animation = "mad"
+	var tween = create_tween()
+	tween.tween_property(animated_sprite, "scale", Vector2.ONE, 1).set_ease(Tween.EASE_OUT).set_trans(Tween.TRANS_BACK).from(Vector2(1.2, 0.8))
+	tween.tween_callback(_reset_animation).set_delay(0.5)
diff --git a/game/shared/characters/character_animation.tscn b/game/shared/characters/character_animation.tscn
index 04ddb12..2dabd95 100644
--- a/game/shared/characters/character_animation.tscn
+++ b/game/shared/characters/character_animation.tscn
@@ -1,10 +1,12 @@
-[gd_scene load_steps=2 format=3 uid="uid://k0mx61qjphst"]
-
-[ext_resource type="SpriteFrames" uid="uid://c5j2ojumuirph" path="res://game/microgames/heart_break/assets/heart_animation.tres" id="1_utnrb"]
+[gd_scene load_steps=3 format=3 uid="uid://k0mx61qjphst"]
 
+[ext_resource type="Script" path="res://game/shared/characters/character_animation.gd" id="1_qpodi"]
+[ext_resource type="SpriteFrames" uid="uid://dbwmqcig0qbw8" path="res://game/shared/characters/ali_animation.tres" id="2_pffd0"]
 
 [node name="CharacterAnimation" type="Node2D"]
+script = ExtResource("1_qpodi")
+sprite_frames = ExtResource("2_pffd0")
 
-[node name="Character" type="AnimatedSprite2D" parent="."]
-sprite_frames = ExtResource("1_utnrb")
-frame_progress = 0.924904
+[node name="CharacterAnimatedSprite" type="AnimatedSprite2D" parent="."]
+unique_name_in_owner = true
+sprite_frames = ExtResource("2_pffd0")
diff --git a/game/shared/scripts/microgame.gd b/game/shared/scripts/microgame.gd
index 7aef5ed..29b63ed 100644
--- a/game/shared/scripts/microgame.gd
+++ b/game/shared/scripts/microgame.gd
@@ -4,4 +4,4 @@ extends Node
 @export var microgame_name = ""
 @export var instruction = ""
 
-signal finished
+signal finished(won)