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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions Projeto/Componentes/Personagens/Filha.tscn
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
[gd_scene load_steps=9 format=3 uid="uid://d2fdciig7einf"]
[gd_scene load_steps=7 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="BehaviorTree" uid="uid://dg4au85ocqv7c" path="res://ai/filha.tres" id="4_jt3xk"]

[sub_resource type="CircleShape2D" id="CircleShape2D_suqhv"]
radius = 23.0

[sub_resource type="BlackboardPlan" id="BlackboardPlan_s06ml"]

[sub_resource type="RectangleShape2D" id="RectangleShape2D_jt3xk"]
size = Vector2(128, 80)

Expand Down Expand Up @@ -37,11 +34,6 @@ scale = Vector2(0.12, 0.12)
radius = 300.0
cor = Color(1, 0, 0, 1)

[node name="BTPlayer" type="BTPlayer" parent="."]
behavior_tree = ExtResource("4_jt3xk")
active = false
blackboard_plan = SubResource("BlackboardPlan_s06ml")

[node name="Topo" type="Area2D" parent="."]
position = Vector2(0, -42)

Expand Down
34 changes: 32 additions & 2 deletions Projeto/Componentes/Personagens/filha.gd
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,23 @@ extends Personagem
@export var bagunca_scene: PackedScene
@export var waypoints : Node2D
@export var cutscene : bool = false
@export var chance_bagunca : float = 30
@export var chance_andar : float = 30

var target: Marker2D = null
var speed: float = 100.0

# Controle de índice e direção
var waypoint_index := 0
var moving_forward := true
var wait_timer : float = 0
var ativa : bool = false

@onready var agent: NavigationAgent2D = $NavigationAgent2D
@onready var carolina_rig: CarolinaRig = $carolina_rig
@onready var visualizador_percentual: VisualizadorPercentual = $VisualizadorPercentual
@onready var bt_player: BTPlayer = $BTPlayer



func _ready():
if (
Expand All @@ -25,7 +30,7 @@ func _ready():
):
carolina_rig.sentada = true
return
bt_player.active = true
ativa = true
carolina_rig.sentada = false
ControleDeFase.prato_entregue.connect(_ir_comer)
visualizador_percentual.valor = 0
Expand All @@ -34,6 +39,7 @@ func _process(delta):
if not cutscene:
if not ControleDeFase.nivel_atual or not ControleDeFase.nivel_atual.bagunca:
return
acao_automatica(delta)
if not (
target and global_position.distance_to(
target.global_position
Expand Down Expand Up @@ -135,6 +141,30 @@ func spawn_bagunca():
bagunca.global_position = global_position
bagunca.z_index = 4
get_tree().current_scene.add_child(bagunca)

func acao_automatica(delta : float):
if not ativa:
return

if wait_timer > 0:
wait_timer -= delta
return

var chance = randf() * 100

if chance <= chance_bagunca:
mover()
get_tree().create_timer(2).timeout.connect(func() :
spawn_bagunca()
mover()
)
wait_timer = 5.0
elif chance <= chance_bagunca + chance_andar:
mover()
wait_timer = 5.0
else:
celular()
wait_timer = randf_range(3.0, 7.0)

func _ir_comer(_prato) -> void:
print_debug('Ir comer')
Expand Down
6 changes: 2 additions & 4 deletions Projeto/Componentes/Personagens/rigs/elza_rig3.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ filters = ["", ".:position", ".:rotation", "rig1/Skeleton2D/tronco/bracoDir:posi
animation = &"qtftd anims/idle_segurando_Lucas"

[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_ghekw"]
animation = &"qtftd anims/luquinhas_mamando"
animation = &"anim_elza/luquinhas_mamando"

[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_2qtra"]
animation = &"anim_elza/ajuntar"
Expand Down Expand Up @@ -407,7 +407,7 @@ blend_point_1/node = SubResource("AnimationNodeAnimation_x465c")
blend_point_1/pos = 0.5

[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_ghekw"]
graph_offset = Vector2(337.988, 136.787)
graph_offset = Vector2(-161.346, 94.8683)
nodes/AmamentarLucas/node = SubResource("AnimationNodeBlend2_njihp")
nodes/AmamentarLucas/position = Vector2(521.195, 225.284)
nodes/Animation/node = SubResource("AnimationNodeAnimation_cw56l")
Expand Down Expand Up @@ -760,7 +760,6 @@ rest = Transform2D(1, 0, 0, 1, 35, 429)
[node name="pescoco" type="Bone2D" parent="rig1/Skeleton2D/tronco"]
position = Vector2(0, -410)
rotation = -0.207821
scale = Vector2(1, 1)
rest = Transform2D(1, 0, 0, 1, 0, -410)

[node name="rosto" type="Bone2D" parent="rig1/Skeleton2D/tronco/pescoco"]
Expand All @@ -786,7 +785,6 @@ bone_angle = 0.0
[node name="bracoDir" type="Bone2D" parent="rig1/Skeleton2D/tronco"]
position = Vector2(99, -384)
rotation = 1.97828
scale = Vector2(1, 1)
rest = Transform2D(1, 0, 0, 1, 99, -384)
auto_calculate_length_and_angle = false
length = 16.0
Expand Down
2 changes: 0 additions & 2 deletions Projeto/Dialogo/balao.tres
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,4 @@ layer_info = {
"10": SubResource("Resource_y7ph6"),
"11": SubResource("Resource_nxeu2")
}
base_overrides = {}
layers = Array[ExtResource("2_ojnrh")]([])
metadata/_latest_layer = "11"
2 changes: 0 additions & 2 deletions Projeto/Dialogo/celular.tres
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,4 @@ layer_info = {
"10": SubResource("Resource_0c1js"),
"11": SubResource("Resource_wrcfo")
}
base_overrides = {}
layers = Array[ExtResource("2_jchcn")]([])
metadata/_latest_layer = "10"
3 changes: 0 additions & 3 deletions Projeto/Dialogo/narrador.tres
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
[sub_resource type="Resource" id="Resource_q5n5i"]
script = ExtResource("2_vc6qt")
scene = ExtResource("1_dhopu")
overrides = {}

[sub_resource type="Resource" id="Resource_2of88"]
script = ExtResource("2_vc6qt")
Expand Down Expand Up @@ -47,6 +46,4 @@ layer_info = {
"12": SubResource("Resource_2of88"),
"13": SubResource("Resource_gc5b1")
}
base_overrides = {}
layers = Array[ExtResource("2_vc6qt")]([])
metadata/_latest_layer = "13"
7 changes: 0 additions & 7 deletions Projeto/addons/limboai/LICENSE.md

This file was deleted.

5 changes: 0 additions & 5 deletions Projeto/addons/limboai/LOGO_LICENSE.md

This file was deleted.

142 changes: 0 additions & 142 deletions Projeto/addons/limboai/README.md

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading