Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 1 addition & 4 deletions Projeto/Cenas/Casa.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -169,13 +169,10 @@ z_index = 5

[node name="Player" parent="Personagens" instance=ExtResource("2_kc3ot")]
z_index = 20
z_as_relative = false
position = Vector2(347, 584)

[node name="Filha" parent="Personagens" node_paths=PackedStringArray("waypoints") groups=["filha_sprite"] instance=ExtResource("15_gklaa")]
z_index = 10
z_as_relative = false
position = Vector2(504, 860)
position = Vector2(509, 853)
bagunca_scene = ExtResource("17_utqv5")
waypoints = NodePath("../../Waypoints")

Expand Down
16 changes: 16 additions & 0 deletions Projeto/Componentes/Casa/Interagiveis/berco.gd
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ var amamentando : bool = false
@onready var timer: Timer = $Timer
@onready var visualizador_temporal: VisualizadorTemporal = $VisualizadorTemporal
@onready var lucas_rig: LucasRigDessat = $lucas_rig_dessat
@onready var berco = $BercoArte

func _ready() -> void:
ativo = false
Expand Down Expand Up @@ -52,6 +53,7 @@ func iniciar_choro():
choro_ativo = true
visualizador_temporal.visible = true
timer.start(ControleDeFase.nivel_atual.tempo_limite_choro)
_estado_berco("play_rot_anim")
ControleDeAudio.toca_efeito_ciclo("bebe_chorando", "bebe_chorando")

func finalizar_choro():
Expand All @@ -61,6 +63,7 @@ func finalizar_choro():
visualizador_temporal.visible = false
choro_ativo = false
timer.stop()
_estado_berco("stop_rot_anim")
ControleDeAudio.para_efeito_ciclo("bebe_chorando")
ControleDeAudio.toca_efeito("bebe_feliz")

Expand All @@ -73,6 +76,19 @@ func resetar_timer():
)
)

func _estado_berco(estado: String):
var berco_tween: Tween = create_tween()
if estado == "play_rot_anim":
berco_tween.tween_property(berco, "rotation", berco.rotation - 0.1, 0.8)
berco_tween.tween_property(berco, "rotation", 0, 1.0)
berco_tween.tween_property(berco, "rotation", berco.rotation + 0.1, 0.8)
berco_tween.tween_property(berco, "rotation", 0, 1.0)
berco_tween.set_loops(2)
berco_tween.play()
elif estado == "stop_rot_anim":
berco.rotation = 0
berco_tween.kill()

func _on_timer_timeout() -> void:
ControleDeFase.estado_nivel.limite_choro_atingido = true

Expand Down
7 changes: 6 additions & 1 deletion Projeto/Componentes/Personagens/Filha.tscn
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
[gd_scene load_steps=7 format=3 uid="uid://d2fdciig7einf"]
[gd_scene load_steps=8 format=3 uid="uid://d2fdciig7einf"]

[ext_resource type="Script" uid="uid://dnibm5siaj76a" path="res://Componentes/Personagens/filha.gd" id="2_suqhv"]
[ext_resource type="PackedScene" uid="uid://b4reg6fm7xkhh" path="res://Componentes/Personagens/rigs/carolina_rig.tscn" id="3_b34n8"]
[ext_resource type="PackedScene" uid="uid://d2q0862qh20rg" path="res://Componentes/VisualizadorTemporal/visualizador_percentual.tscn" id="3_jt3xk"]
[ext_resource type="PackedScene" uid="uid://db5gqkcfgr1ar" path="res://Componentes/Utilitarios/ZArea.tscn" id="4_jt3xk"]

[sub_resource type="CircleShape2D" id="CircleShape2D_suqhv"]
radius = 23.0
Expand All @@ -14,6 +15,7 @@ size = Vector2(128, 80)
size = Vector2(127, 56)

[node name="Filha" type="CharacterBody2D" groups=["personagem"]]
z_index = 1
collision_layer = 0
collision_mask = 0
script = ExtResource("2_suqhv")
Expand Down Expand Up @@ -48,5 +50,8 @@ position = Vector2(0, 48)
position = Vector2(-2.5, 3)
shape = SubResource("RectangleShape2D_s06ml")

[node name="ZArea" parent="." instance=ExtResource("4_jt3xk")]
position = Vector2(-2, 60)

[connection signal="body_entered" from="Topo" to="." method="_on_topo_body_entered"]
[connection signal="body_entered" from="Base" to="." method="_on_base_body_entered"]
16 changes: 12 additions & 4 deletions Projeto/Componentes/Personagens/Player.tscn
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
[gd_scene load_steps=22 format=3 uid="uid://dy4r4c8l5fuxr"]
[gd_scene load_steps=23 format=3 uid="uid://dy4r4c8l5fuxr"]

[ext_resource type="Script" uid="uid://cv0ya3xdt4bn" path="res://Componentes/Personagens/player.gd" id="1_c2vf6"]
[ext_resource type="PackedScene" uid="uid://daxpprdmxope6" path="res://Componentes/Personagens/rigs/elza_rig3.tscn" id="2_4ucjf"]
[ext_resource type="Script" uid="uid://cjm7t170vvwf" path="res://addons/2d_controls_toolkit/TopDownControler2D.gd" id="2_fo1re"]
[ext_resource type="Texture2D" uid="uid://cx2l2edobw7dh" path="res://Recursos/Graficos/Personagens/elzaVetorCores2.png" id="3_4ucjf"]
[ext_resource type="Script" uid="uid://bqcr2mhaxtp70" path="res://Componentes/VisualizadorTemporal/visualizador_temporal.gd" id="5_da2mp"]
[ext_resource type="PackedScene" uid="uid://db5gqkcfgr1ar" path="res://Componentes/Utilitarios/ZArea.tscn" id="6_dgr1c"]

[sub_resource type="CircleShape2D" id="CircleShape2D_c2vf6"]
radius = 46.0109
Expand Down Expand Up @@ -71,16 +72,17 @@ blend_point_1/pos = 0.5

[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_dgr1c"]
graph_offset = Vector2(-444.773, -16.7364)
nodes/output/position = Vector2(640, 140)
nodes/Segurando/node = SubResource("AnimationNodeBlend2_4ucjf")
nodes/Segurando/position = Vector2(280, 80)
nodes/Velocidade/node = SubResource("AnimationNodeBlendSpace1D_da2mp")
nodes/Velocidade/position = Vector2(-220, 60)
nodes/VelocidadeSegurando/node = SubResource("AnimationNodeBlendSpace1D_f4bm0")
nodes/VelocidadeSegurando/position = Vector2(-220, 280)
nodes/output/position = Vector2(640, 140)
node_connections = [&"Segurando", 0, &"Velocidade", &"Segurando", 1, &"VelocidadeSegurando", &"output", 0, &"Segurando"]
node_connections = [&"output", 0, &"Segurando", &"Segurando", 0, &"Velocidade", &"Segurando", 1, &"VelocidadeSegurando"]

[node name="Player" type="CharacterBody2D" groups=["personagem", "player"]]
z_index = 1
script = ExtResource("1_c2vf6")
id = "elza"
nome = "Elza"
Expand Down Expand Up @@ -129,7 +131,7 @@ libraries = {
[node name="AnimationTree" type="AnimationTree" parent="."]
tree_root = SubResource("AnimationNodeBlendTree_dgr1c")
anim_player = NodePath("../AnimationPlayer")
parameters/Segurando/blend_amount = 0
parameters/Segurando/blend_amount = 0.0
parameters/Velocidade/blend_position = 0.0
parameters/VelocidadeSegurando/blend_position = 0.0

Expand All @@ -144,6 +146,12 @@ temporizador = NodePath("../TimerAmamentacao")
cor = Color(0.278431, 0.54902, 0.74902, 0.8)
metadata/_custom_type_script = "uid://bqcr2mhaxtp70"

[node name="PosicaoEfeito" type="Marker2D" parent="."]
position = Vector2(0, -140)

[node name="ZArea" parent="." instance=ExtResource("6_dgr1c")]
position = Vector2(-1, 61)

[connection signal="area_entered" from="PivoAcao/AreaAcao" to="." method="_on_area_acao_area_entered"]
[connection signal="area_exited" from="PivoAcao/AreaAcao" to="." method="_on_area_acao_area_exited"]
[connection signal="body_entered" from="PivoAcao/AreaAcao" to="." method="_on_area_acao_body_entered"]
Expand Down
9 changes: 4 additions & 5 deletions Projeto/Componentes/Personagens/player.gd
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ var ativo : bool = true
@onready var animation_tree: AnimationTree = $AnimationTree
@onready var top_down_controler_2d: TopDownControler2D = $TopDownControler2D
@onready var pivo_acao: Node2D = $PivoAcao
@onready var posicao_objeto = $PosicaoObjeto
@onready var posicao_objeto: Marker2D = $PosicaoObjeto
@onready var posicao_efeito: Marker2D = $PosicaoEfeito
@onready var elza_rig: ElzaRig = $"elza rig"


func ao_transformar_objeto_agarrado(novo_objeto: IngredienteBase):
soltar()
agarrar(novo_objeto)
Expand All @@ -39,9 +39,8 @@ func ao_transformar_objeto_agarrado_falha(_objeto: IngredienteBase):
func _exibe_efeito(recurso_de_efeito: Resource) -> void:
var efeito = recurso_de_efeito.instantiate()
get_tree().root.add_child(efeito)
efeito.reparent(posicao_objeto)
efeito.global_position = posicao_objeto.global_position
efeito.global_position.y -= 180
efeito.reparent(posicao_efeito)
efeito.global_position = posicao_efeito.global_position - (efeito.size/2)

func _physics_process(delta: float) -> void:
if (Input.is_action_pressed("up") or
Expand Down
26 changes: 16 additions & 10 deletions Projeto/Componentes/Personagens/rigs/lucas_rig_dessat.tscn
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
[gd_scene load_steps=15 format=3 uid="uid://x3x4hdetf5a8"]
[gd_scene load_steps=16 format=3 uid="uid://x3x4hdetf5a8"]

[ext_resource type="Texture2D" uid="uid://de7m4n4afowt2" path="res://Componentes/Personagens/rigs/vetores_spritesheets/nenê1_dessat.svg" id="1_7vs35"]
[ext_resource type="Script" uid="uid://cy2ei2xo5xmqw" path="res://Componentes/Personagens/rigs/lucas_rig_dessat.gd" id="1_ml0f2"]
[ext_resource type="AnimationLibrary" uid="uid://cxh3707wklavm" path="res://Componentes/Personagens/rigs/vetores_spritesheets/qtftdanims.res" id="2_wx2i2"]
[ext_resource type="AnimationLibrary" uid="uid://did164vxkw5vw" path="res://anim_lucas.res" id="3_7hrgj"]
[ext_resource type="Script" uid="uid://bqyphsb3rnr2x" path="res://Componentes/Personagens/personagem.gd" id="4_ea3el"]
[ext_resource type="PackedScene" uid="uid://cs1q0yifhy8oy" path="res://Recursos/Graficos/Efeitos/grafico_lagrimas.tscn" id="6_se8xw"]

[sub_resource type="Animation" id="Animation_wx2i2"]
length = 0.001
Expand Down Expand Up @@ -51,19 +52,21 @@ _data = {
}

[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_qipe2"]
animation = &"qtftdanims/lucas_choramingando"
animation = &"anim_lucas/lucas_choramingando"

[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_x4cvg"]
animation = &"qtftdanims/lucas_chorando"
animation = &"anim_lucas/lucas_chorando"

[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_lgpga"]
animation = &"qtftdanims/lucas_idle"
animation = &"anim_lucas/lucas_idle"

[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_edu8c"]

[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_quv0o"]

[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_ml0f2"]
graph_offset = Vector2(-494.83508, 221.12552)
nodes/output/position = Vector2(520, 160)
nodes/Animation/node = SubResource("AnimationNodeAnimation_lgpga")
nodes/Animation/position = Vector2(-460, 40)
"nodes/Animation 2/node" = SubResource("AnimationNodeAnimation_qipe2")
Expand All @@ -74,8 +77,7 @@ nodes/Choramingando/node = SubResource("AnimationNodeBlend2_edu8c")
nodes/Choramingando/position = Vector2(-100, 100)
nodes/Chorando/node = SubResource("AnimationNodeBlend2_quv0o")
nodes/Chorando/position = Vector2(220, 240)
nodes/output/position = Vector2(520, 160)
node_connections = [&"Choramingando", 0, &"Animation", &"Choramingando", 1, &"Animation 2", &"Chorando", 0, &"Choramingando", &"Chorando", 1, &"Animation 3", &"output", 0, &"Chorando"]
node_connections = [&"output", 0, &"Chorando", &"Choramingando", 0, &"Animation", &"Choramingando", 1, &"Animation 2", &"Chorando", 0, &"Choramingando", &"Chorando", 1, &"Animation 3"]

[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_7hrgj"]
radius = 49.0
Expand Down Expand Up @@ -159,10 +161,11 @@ bones = ["tronco", PackedFloat32Array(0, 0, 0, 0), "tronco/pescoco", PackedFloat

[node name="tronco" type="Bone2D" parent="Skeleton2D"]
position = Vector2(0, 161)
scale = Vector2(0.99999994, 0.99999994)
rest = Transform2D(1, 0, 0, 1, 0, 161)

[node name="pescoco" type="Bone2D" parent="Skeleton2D/tronco"]
position = Vector2(0, -162.478)
position = Vector2(0, -163.96042)
rest = Transform2D(1, 0, 0, 1, 0, -161)

[node name="rosto" type="Bone2D" parent="Skeleton2D/tronco/pescoco"]
Expand All @@ -173,12 +176,12 @@ bone_angle = 0.0

[node name="babador" type="Bone2D" parent="Skeleton2D/tronco/pescoco"]
position = Vector2(-10, 0)
rotation = 0.0365309
scale = Vector2(1, 1)
rotation = 0.07318661
scale = Vector2(0.9999999, 0.9999999)
rest = Transform2D(1, 0, 0, 1, -10, -161)
auto_calculate_length_and_angle = false
length = 16.0
bone_angle = 0.0757404
bone_angle = 0.075740375

[node name="Nenê1" type="Sprite2D" parent="."]
visible = false
Expand Down Expand Up @@ -212,3 +215,6 @@ metadata/_custom_type_script = "uid://bqyphsb3rnr2x"

[node name="CollisionShape2D" type="CollisionShape2D" parent="Lucas"]
shape = SubResource("CapsuleShape2D_7hrgj")

[node name="Lágrimas" parent="." instance=ExtResource("6_se8xw")]
position = Vector2(-26, -75)
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,19 @@ dest_files=["res://.godot/imported/assetsCutscenes.svg-2e7ae7e4b1ecbb54348a1443b
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,19 @@ dest_files=["res://.godot/imported/assetsCutscenes2.svg-c6d38604fa8e77847c6aee09
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,19 @@ dest_files=["res://.godot/imported/carolinaVetorCores1.svg-b9b6b5ed3e0cd66f6d568
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,19 @@ dest_files=["res://.godot/imported/carolinaVetorCores2.svg-d699e8e45adbc18b7821d
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,19 @@ dest_files=["res://.godot/imported/carolinaVetorCores3.svg-a892301860b7886985119
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,19 @@ dest_files=["res://.godot/imported/carolinaVetorCoresDessat.svg-dc7c729c801253ce
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,19 @@ dest_files=["res://.godot/imported/cozsol1.svg-c1708bca26474a46f0bb9428d83af41d.
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/uastc_level=0
compress/rdo_quality_loss=0.0
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/channel_remap/red=0
process/channel_remap/green=1
process/channel_remap/blue=2
process/channel_remap/alpha=3
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
Expand Down
Loading