Deleted ESCHotspot (use ESCItem instead)

Moved duplicated movement code from ESCPlayer and ESCItem/ESCHotspot to its own script.
Added talking animations management.
Fixed bug: character was turning to last_direction after talking, if coming from another direction than speaking direction.
Continued removing unfree stuff.

game/items/ESCORIA_ALL_ITEMS.tscn

@@ -11,12 +11,25 @@ visible = false
 script = ExtResource( 5 )
 
 [node name="empty_sheet" parent="." instance=ExtResource( 1 )]
+interact_positions = {
+"default": Vector2( 0, 0 )
+}
 
 [node name="filled_sheet" parent="." instance=ExtResource( 4 )]
 position = Vector2( -29.7823, 133.569 )
+dialog_color = Color( 1, 1, 1, 1 )
+interact_positions = {
+"default": Vector2( -29.7823, 133.569 )
+}
 
 [node name="pen" parent="." instance=ExtResource( 2 )]
 position = Vector2( 136.277, 13.5374 )
+interact_positions = {
+"default": Vector2( 136.277, 13.5374 )
+}
 
 [node name="wrench" parent="." instance=ExtResource( 3 )]
 position = Vector2( 293.311, 2.70747 )
+interact_positions = {
+"default": Vector2( 293.311, 2.70747 )
+}

game/items/escitems/empty_sheet_escitem.tscn

@@ -7,21 +7,23 @@
 [sub_resource type="RectangleShape2D" id=1]
 extents = Vector2( 86.9568, 115.211 )
 
-[node name="empty_sheet" type="Sprite"]
-texture = ExtResource( 2 )
+[node name="empty_sheet" type="Area2D"]
 script = ExtResource( 1 )
 global_id = "r5_empty_sheet"
 esc_script = "res://game/items/escitems/empty_sheet.esc"
-tooltip_name = "Sheet"
+tooltip_name = "Empty sheet"
 default_action = "look"
-combine_if_action_used_among = PoolStringArray( "use" )
+combine_if_action_used_among = PoolStringArray( "use", "give" )
 use_from_inventory_only = true
 inventory_item_scene_file = ExtResource( 3 )
-dialog_color = Color( 1, 1, 1, 1 )
+interact_positions = {
+"default": null
+}
 
-[node name="Area2D" type="Area2D" parent="."]
+[node name="sprite" type="Sprite" parent="."]
+texture = ExtResource( 2 )
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 rotation = 0.0218604
 scale = Vector2( 0.683022, 0.519355 )
-
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"]
 shape = SubResource( 1 )

game/items/escitems/filled_sheet.esc

@@ -2,21 +2,4 @@
 say player "'Dear Escoria developer: I hope you're having fun right now!'"
 stop
 
-:use android
-say player "I'll give you this!"
 
-:give android
-inventory_remove r5_filled_sheet
-
-say android "Hey! That's perfect!"
-say android "I can finally get away from here!"
-walk_to_pos android 1200 400
-#set_angle android 45
-
-# Open the door
-set_state r6_door r_door_open
-set_global r6_door_open true
-
-# Disappear!
-wait 1
-set_active android false

game/items/escitems/filled_sheet_escitem.tscn

@@ -1,15 +1,25 @@
-[gd_scene load_steps=3 format=2]
+[gd_scene load_steps=4 format=2]
 
 [ext_resource path="res://addons/escoria-core/game/core-scripts/escitem.gd" type="Script" id=1]
 [ext_resource path="res://game/items/inventory/filled_sheet_escinventoryitem.tscn" type="PackedScene" id=2]
 
-[node name="filled_sheet" type="Sprite"]
+[sub_resource type="RectangleShape2D" id=1]
+
+[node name="filled_sheet" type="Area2D"]
 script = ExtResource( 1 )
 global_id = "r5_filled_sheet"
 esc_script = "res://game/items/escitems/filled_sheet.esc"
 tooltip_name = "Filled sheet"
-default_action = "look"
 combine_if_action_used_among = PoolStringArray( "use", "give" )
+combine_is_one_way = true
 use_from_inventory_only = true
 inventory_item_scene_file = ExtResource( 2 )
 dialog_color = Color( 1, 1, 1, 1 )
+interact_positions = {
+"default": Vector2( 0, 0 )
+}
+
+[node name="sprite" type="Sprite" parent="."]
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
+shape = SubResource( 1 )

game/items/escitems/pen_escitem.tscn

@@ -7,20 +7,21 @@
 [sub_resource type="RectangleShape2D" id=1]
 extents = Vector2( 51.8881, 43.8187 )
 
-[node name="pen" type="Sprite"]
-texture = ExtResource( 2 )
+[node name="pen" type="Area2D"]
 script = ExtResource( 1 )
 global_id = "r5_pen"
 esc_script = "res://game/items/escitems/pen.esc"
 tooltip_name = "Pen"
 default_action = "look"
-combine_if_action_used_among = PoolStringArray( "use" )
-combine_is_one_way = true
+combine_if_action_used_among = PoolStringArray( "use", "give" )
 use_from_inventory_only = true
 inventory_item_scene_file = ExtResource( 3 )
-dialog_color = Color( 1, 1, 1, 1 )
+interact_positions = {
+"default": null
+}
 
-[node name="Area2D" type="Area2D" parent="."]
+[node name="pen" type="Sprite" parent="."]
+texture = ExtResource( 2 )
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 shape = SubResource( 1 )

game/items/escitems/wrench.esc

@@ -7,10 +7,4 @@ stop
 set_global i/r5_wrench true
 set_active r5_wrench false
 
-:use r5_wall_item
-> [r5_wall_item_state_round]
-	set_state r5_wall_item state_square	
-	set_global r5_wall_item_state_round false
-	stop
-set_state r5_wall_item state_round
-set_global r5_wall_item_state_round true
+

game/items/escitems/wrench_escitem.tscn

@@ -7,19 +7,22 @@
 [sub_resource type="RectangleShape2D" id=1]
 extents = Vector2( 44.696, 49.0953 )
 
-[node name="wrench" type="Sprite"]
-texture = ExtResource( 2 )
+[node name="wrench" type="Area2D"]
 script = ExtResource( 1 )
 global_id = "r5_wrench"
 esc_script = "res://game/items/escitems/wrench.esc"
 tooltip_name = "Wrench"
 default_action = "look"
-combine_if_action_used_among = PoolStringArray( "use", "give" )
+combine_if_action_used_among = PoolStringArray( "use" )
 use_from_inventory_only = true
 inventory_item_scene_file = ExtResource( 3 )
 dialog_color = Color( 1, 1, 1, 1 )
+interact_positions = {
+"default": Vector2( 0, 0 )
+}
 
-[node name="Area2D" type="Area2D" parent="."]
+[node name="sprite" type="Sprite" parent="."]
+texture = ExtResource( 2 )
 
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 shape = SubResource( 1 )