Finished ESC camera commands reimplementation.

Some cleaning done, and all logging commands put in escoria.logger script.

game/rooms/room3/esc/room3_bridge.esc

@@ -29,6 +29,7 @@
 
 :ready
 set_global bridge_closed false
+set_state r3_button button_broken
 set_global button_broken true
 
 # DEBUG

game/rooms/room3/room3.tscn

@@ -95,6 +95,8 @@ polygon = PoolVector2Array( -2.71457, 437.818, 6.6293, 121.462, 89.3893, 74.7422
 position = Vector2( 44.1375, 384.691 )
 
 [node name="button" parent="Hotspots" instance=ExtResource( 7 )]
+global_id = "r3_button"
+esc_script = "res://game/rooms/room3/esc/button.esc"
 interact_positions = {
 "default": Vector2( 347.767, 378.011 )
 }

game/rooms/room6/esc/worker.esc

@@ -33,7 +33,7 @@ say player "I don't think he'd like that."
 		
 
 :use r5_filled_sheet
-say player "I'll give you this!"
+jump give r5_filled_sheet
 
 :give r5_filled_sheet
 inventory_remove r5_filled_sheet

game/rooms/room7/esc/button_set_pos.esc

@@ -0,0 +1,14 @@
+:look
+say player "That button triggers a camera set_pos effect."
+
+:use
+camera_set_limits 2
+camera_set_pos 500 150 150
+wait 6
+
+camera_set_pos 1 1080 1000
+wait 1
+camera_set_limits 0
+
+camera_set_target 0 player
+

game/rooms/room7/esc/lower_stairs.esc

@@ -2,16 +2,6 @@
 
 say player "movin up"
 
-
-#camera_push player 1 LINEAR
-#camera_set_drag_margin_enabled bool bool
-#camera_set_pos real int int
-#camera_set_target real
-#camera_set_zoom real
-#camera_set_zoom_height int
-#camera_shift int int
-
-
 teleport player r7_upper_stairs
 set_angle player 270
 camera_set_limits 2

game/rooms/room7/room7.tscn

@@ -345,6 +345,28 @@ __meta__ = {
 "_edit_use_anchors_": false
 }
 
+[node name="button_camera_set_pos" parent="Hotspots" instance=ExtResource( 3 )]
+position = Vector2( 910.482, 1464.03 )
+global_id = "r7_button_set_pos"
+esc_script = "res://game/rooms/room7/esc/button_set_pos.esc"
+interact_positions = {
+"default": Vector2( 682.785, 1765.65 )
+}
+
+[node name="Position2D" type="Position2D" parent="Hotspots/button_camera_set_pos"]
+position = Vector2( 350.258, 301.616 )
+
+[node name="Label" type="Label" parent="Hotspots/button_camera_set_pos"]
+margin_left = 292.919
+margin_top = 96.8108
+margin_right = 390.919
+margin_bottom = 112.811
+custom_fonts/font = ExtResource( 5 )
+text = "Camera_set_pos"
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
 [node name="trigger_left" type="Area2D" parent="Hotspots"]
 position = Vector2( 406, 0 )
 script = ExtResource( 7 )

game/rooms/room8/esc/button_puzzle.esc

@@ -3,7 +3,8 @@ say player "That must be the command to open the door."
 
 :use
 > [!r8_m_door_open]
-	superpose_scene "res://game/rooms/room8/puzzle/10_buttons_puzzle.tscn"
+	#superpose_scene "res://game/rooms/room8/puzzle/10_buttons_puzzle.tscn"
+	spawn "res://game/rooms/room8/puzzle/10_buttons_puzzle.tscn"
 	
 > [r8_m_door_open]
 	say player "The door is already open."

game/rooms/room9/closet/magical_closet.tscn

@@ -3,10 +3,10 @@
 [ext_resource path="res://addons/escoria-core/game/core-scripts/escitem.gd" type="Script" id=1]
 [ext_resource path="res://game/items/escitems/bottle_escitem.tscn" type="PackedScene" id=2]
 
-[sub_resource type="RectangleShape2D" id=2]
+[sub_resource type="RectangleShape2D" id=1]
 extents = Vector2( 66.4415, 154.457 )
 
-[sub_resource type="Animation" id=3]
+[sub_resource type="Animation" id=2]
 length = 0.5
 tracks/0/type = "value"
 tracks/0/path = NodePath("base/closed:visible")
@@ -57,6 +57,57 @@ tracks/3/keys = {
 "values": [ false ]
 }
 
+[sub_resource type="Animation" id=3]
+length = 0.5
+tracks/0/type = "value"
+tracks/0/path = NodePath("base/closed:visible")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/keys = {
+"times": PoolRealArray( 0 ),
+"transitions": PoolRealArray( 1 ),
+"update": 1,
+"values": [ false ]
+}
+tracks/1/type = "value"
+tracks/1/path = NodePath("base/open_no_object:visible")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/keys = {
+"times": PoolRealArray( 0 ),
+"transitions": PoolRealArray( 1 ),
+"update": 1,
+"values": [ true ]
+}
+tracks/2/type = "value"
+tracks/2/path = NodePath("base/open_object:visible")
+tracks/2/interp = 1
+tracks/2/loop_wrap = true
+tracks/2/imported = false
+tracks/2/enabled = true
+tracks/2/keys = {
+"times": PoolRealArray( 0 ),
+"transitions": PoolRealArray( 1 ),
+"update": 1,
+"values": [ false ]
+}
+tracks/3/type = "value"
+tracks/3/path = NodePath("bottle:visible")
+tracks/3/interp = 1
+tracks/3/loop_wrap = true
+tracks/3/imported = false
+tracks/3/enabled = true
+tracks/3/keys = {
+"times": PoolRealArray( 0 ),
+"transitions": PoolRealArray( 1 ),
+"update": 1,
+"values": [ false ]
+}
+
 [sub_resource type="Animation" id=4]
 length = 0.5
 tracks/0/type = "value"
@@ -81,57 +132,6 @@ tracks/1/keys = {
 "times": PoolRealArray( 0 ),
 "transitions": PoolRealArray( 1 ),
 "update": 1,
-"values": [ true ]
-}
-tracks/2/type = "value"
-tracks/2/path = NodePath("base/open_object:visible")
-tracks/2/interp = 1
-tracks/2/loop_wrap = true
-tracks/2/imported = false
-tracks/2/enabled = true
-tracks/2/keys = {
-"times": PoolRealArray( 0 ),
-"transitions": PoolRealArray( 1 ),
-"update": 1,
-"values": [ false ]
-}
-tracks/3/type = "value"
-tracks/3/path = NodePath("bottle:visible")
-tracks/3/interp = 1
-tracks/3/loop_wrap = true
-tracks/3/imported = false
-tracks/3/enabled = true
-tracks/3/keys = {
-"times": PoolRealArray( 0 ),
-"transitions": PoolRealArray( 1 ),
-"update": 1,
-"values": [ false ]
-}
-
-[sub_resource type="Animation" id=5]
-length = 0.5
-tracks/0/type = "value"
-tracks/0/path = NodePath("base/closed:visible")
-tracks/0/interp = 1
-tracks/0/loop_wrap = true
-tracks/0/imported = false
-tracks/0/enabled = true
-tracks/0/keys = {
-"times": PoolRealArray( 0 ),
-"transitions": PoolRealArray( 1 ),
-"update": 1,
-"values": [ false ]
-}
-tracks/1/type = "value"
-tracks/1/path = NodePath("base/open_no_object:visible")
-tracks/1/interp = 1
-tracks/1/loop_wrap = true
-tracks/1/imported = false
-tracks/1/enabled = true
-tracks/1/keys = {
-"times": PoolRealArray( 0 ),
-"transitions": PoolRealArray( 1 ),
-"update": 1,
 "values": [ false ]
 }
 tracks/2/type = "value"
@@ -163,7 +163,7 @@ tracks/3/keys = {
 script = ExtResource( 1 )
 dialog_color = Color( 1, 1, 1, 1 )
 interact_positions = {
-"default": null
+"default": Vector2( 64.2172, 153.408 )
 }
 
 [node name="base" type="Line2D" parent="."]
@@ -224,17 +224,17 @@ visible = false
 position = Vector2( 51.1535, 45.7845 )
 scale = Vector2( 0.507, 0.507 )
 interact_positions = {
-"default": Vector2( 51.1535, 45.7845 )
+"default": Vector2( 45.4966, 321.556 )
 }
 
 [node name="Position2D" type="Position2D" parent="bottle"]
-position = Vector2( 298.463, 596.926 )
+position = Vector2( -11.1576, 543.928 )
 
 [node name="CollisionPolygon2D" type="CollisionShape2D" parent="."]
 position = Vector2( 64.2172, 153.408 )
-shape = SubResource( 2 )
+shape = SubResource( 1 )
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
-anims/closed = SubResource( 3 )
-anims/open_no_object = SubResource( 4 )
-anims/open_object = SubResource( 5 )
+anims/closed = SubResource( 2 )
+anims/open_no_object = SubResource( 3 )
+anims/open_object = SubResource( 4 )