diff --git a/gymkhana/characters/eneko/eneko_smoking.esc b/gymkhana/characters/eneko/eneko_smoking.esc index b40ffe92..bf3f7bd0 100644 --- a/gymkhana/characters/eneko/eneko_smoking.esc +++ b/gymkhana/characters/eneko/eneko_smoking.esc @@ -7,7 +7,6 @@ say current_player "Tiene pinta de que fuma" say current_player "No me escucha, parece que me tiene bloqueado" stop -set_global loom_conversation_done false #set_gui_visible false #turn_to eneko_smoking player @@ -23,25 +22,6 @@ set_global loom_conversation_done false say current_player "Que haces aqui?" say eneko_smoking "Fumar" say eneko_smoking "no lo ves?" - # This starts an inner subset of questions - - "Can I ask you about Loom?" [!loom_conversation_done] - say current_player "What do you know about Loom?" - say eneko_smoking "What do you want to know about Loom?" - ? - - "Could it be created in Escoria?" [!loom_conversation_done] - say player "Could Loom be created in Escoria?" - say eneko_smoking "Yes!" - - "Is it a fun game?" [!loom_conversation_done, !fun_game_asked] - say player "Is Loom a fun game?" - say eneko_smoking "Yes!" - set_global fun_game_asked true - - "I don't want to talk at all any more." [!loom_conversation_done] - #turn_to eneko_smoking worker_face_down - stop - # This will take you back to the outer set of questions - - "I know enough about Loom." [!loom_conversation_done] - set_global loom_conversation_done true - ! - "Agur" say player "Agur yogur!" #turn_to eneko_smoking player diff --git a/gymkhana/characters/eneko/eneko_smoking.tscn b/gymkhana/characters/eneko/eneko_smoking.tscn index 428c5af6..055db242 100644 --- a/gymkhana/characters/eneko/eneko_smoking.tscn +++ b/gymkhana/characters/eneko/eneko_smoking.tscn @@ -45,7 +45,6 @@ script = ExtResource( 2 ) global_id = "eneko_smoking" esc_script = "res://gymkhana/characters/eneko/eneko_smoking.esc" is_movable = true -default_action = "action1" combine_when_selected_action_is_in = [ ] dialog_color = Color( 1, 1, 1, 1 ) animations = ExtResource( 1 ) @@ -54,7 +53,7 @@ animations = ExtResource( 1 ) position = Vector2( 32.625, -50.56 ) scale = Vector2( 0.8, 0.8 ) frames = SubResource( 1 ) -animation = "idle" +animation = "speak" flip_h = true [node name="dialog_position" type="Position2D" parent="."] diff --git a/gymkhana/rooms/trasera_cocina/HoverStartAnimation.gd b/gymkhana/rooms/trasera_cocina/HoverStartAnimation.gd deleted file mode 100644 index 3460fb2a..00000000 --- a/gymkhana/rooms/trasera_cocina/HoverStartAnimation.gd +++ /dev/null @@ -1,34 +0,0 @@ -extends CollisionPolygon2D - - -# Declare member variables here. Examples: -# var a = 2 -# var b = "text" - - -# Called when the node enters the scene tree for the first time. -func _ready(): - pass # Replace with function body. - - -# Called every frame. 'delta' is the elapsed time since the previous frame. -#func _process(delta): -# pass -func _on_mouse_entered(): - $AnimatedSprite3.play() - -func _on_mouse_exited(): - $AnimatedSprite3.stop() - - -func _on_Area2D_mouse_entered(): - $AnimatedSprite3.play() - - - -func _on_Area2D_mouse_exited(): - $AnimatedSprite3.stop() - - -func _on_TextureRect_mouse_entered(): - $AnimatedSprite3.play() diff --git a/gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc b/gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc index 6c1b602f..2fdbd9b8 100644 --- a/gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc +++ b/gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc @@ -1,5 +1,6 @@ :setup inventory_add turno_cocina_frontal + anim eneko_smoking idle > [eq ESC_LAST_SCENE despensa] teleport player puerta_despensa_start