diff --git a/game/rooms/room04/assets/background.png b/game/rooms/room04/assets/background.png deleted file mode 100644 index 0d1cb946..00000000 Binary files a/game/rooms/room04/assets/background.png and /dev/null differ diff --git a/game/rooms/room04/assets/background_and_depth.xcf b/game/rooms/room04/assets/background_and_depth.xcf deleted file mode 100644 index db12cfd5..00000000 Binary files a/game/rooms/room04/assets/background_and_depth.xcf and /dev/null differ diff --git a/game/rooms/room04/assets/background_reduced.png b/game/rooms/room04/assets/background_reduced.png deleted file mode 100644 index daff962d..00000000 Binary files a/game/rooms/room04/assets/background_reduced.png and /dev/null differ diff --git a/game/rooms/room04/assets/depth.png b/game/rooms/room04/assets/depth.png deleted file mode 100644 index 1e4a4d18..00000000 Binary files a/game/rooms/room04/assets/depth.png and /dev/null differ diff --git a/game/rooms/room04/assets/depth_reduced.png b/game/rooms/room04/assets/depth_reduced.png deleted file mode 100644 index d4162c7f..00000000 Binary files a/game/rooms/room04/assets/depth_reduced.png and /dev/null differ diff --git a/game/rooms/room04/assets/forrest.png b/game/rooms/room04/assets/forrest.png new file mode 100644 index 00000000..7f6d7633 Binary files /dev/null and b/game/rooms/room04/assets/forrest.png differ diff --git a/game/rooms/room04/assets/forrest_height_texture.png b/game/rooms/room04/assets/forrest_height_texture.png new file mode 100644 index 00000000..75d48a82 Binary files /dev/null and b/game/rooms/room04/assets/forrest_height_texture.png differ diff --git a/game/rooms/room04/assets/forrest_light_map.png b/game/rooms/room04/assets/forrest_light_map.png new file mode 100644 index 00000000..ba9aaf4a Binary files /dev/null and b/game/rooms/room04/assets/forrest_light_map.png differ diff --git a/game/rooms/room04/assets/walk_behind_tree.png b/game/rooms/room04/assets/walk_behind_tree.png new file mode 100644 index 00000000..eba483d4 Binary files /dev/null and b/game/rooms/room04/assets/walk_behind_tree.png differ diff --git a/game/rooms/room04/esc/right_platform.esc b/game/rooms/room04/esc/right_platform.esc deleted file mode 100755 index 3940a3d7..00000000 --- a/game/rooms/room04/esc/right_platform.esc +++ /dev/null @@ -1,3 +0,0 @@ -:look -say player "That's the other side." - diff --git a/game/rooms/room04/esc/room04.esc b/game/rooms/room04/esc/room04.esc index a5c75000..03a51529 100644 --- a/game/rooms/room04/esc/room04.esc +++ b/game/rooms/room04/esc/room04.esc @@ -1,14 +1,15 @@ :setup - > [eq ESC_LAST_SCENE room3] teleport player l_exit # Set player look right set_angle player 180 + camera_set_target 0 player stop > [eq ESC_LAST_SCENE room5] teleport player r_exit # Set player look left + camera_set_target 0 player set_angle player 270 stop diff --git a/game/rooms/room04/room04.tscn b/game/rooms/room04/room04.tscn index 82bbcc62..dbbfafc5 100644 --- a/game/rooms/room04/room04.tscn +++ b/game/rooms/room04/room04.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=11 format=2] +[gd_scene load_steps=13 format=2] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" type="Script" id=1] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_background.gd" type="Script" id=2] @@ -6,55 +6,101 @@ [ext_resource path="res://game/characters/mark/mark.tscn" type="PackedScene" id=4] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=5] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=6] -[ext_resource path="res://game/rooms/room04/assets/depth_reduced.png" type="Texture" id=8] +[ext_resource path="res://game/rooms/room04/assets/forrest.png" type="Texture" id=7] +[ext_resource path="res://game/rooms/room04/assets/forrest_light_map.png" type="Texture" id=8] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=9] -[ext_resource path="res://game/rooms/room04/assets/background_reduced.png" type="Texture" id=10] +[ext_resource path="res://game/rooms/room04/assets/walk_behind_tree.png" type="Texture" id=10] +[ext_resource path="res://game/rooms/room04/assets/forrest_height_texture.png" type="Texture" id=11] [sub_resource type="NavigationPolygon" id=1] -vertices = PoolVector2Array( 371.757, 688.152, 542.371, 788.052, 2.46706, 794.786, 11.4468, 698.255, 189.918, 682.54, 1564.36, 574.459, 1578.66, 529.011, 1635.23, 551.638, 1624.42, 800.399, 1536.87, 579.274, 1012.68, 786.929, 1197.79, 675.666, 908.294, 488.354, 996.968, 451.313, 600.739, 456.925, 673.699, 490.599, 127.06, 573.661, 23.7938, 614.07, 42.8757, 527.64, 125.717, 528.797 ) -polygons = [ PoolIntArray( 0, 1, 2, 3, 4 ), PoolIntArray( 5, 6, 7, 8 ), PoolIntArray( 9, 5, 8, 10, 11 ), PoolIntArray( 11, 10, 12, 13 ), PoolIntArray( 14, 13, 12, 15 ), PoolIntArray( 14, 15, 1, 0 ), PoolIntArray( 16, 4, 3, 17, 18 ), PoolIntArray( 16, 18, 19 ) ] -outlines = [ PoolVector2Array( 11.4468, 698.255, 23.7938, 614.07, 42.8757, 527.64, 125.717, 528.797, 127.06, 573.661, 189.918, 682.54, 371.757, 688.152, 600.739, 456.925, 996.968, 451.313, 1197.79, 675.666, 1536.87, 579.274, 1564.36, 574.459, 1578.66, 529.011, 1635.23, 551.638, 1624.42, 800.399, 1012.68, 786.929, 908.294, 488.354, 673.699, 490.599, 542.371, 788.052, 2.46706, 794.786 ) ] +vertices = PoolVector2Array( 42.2684, 846.779, 119.268, 796.779, 120.268, 837.779, 45.2684, 888.779, 2273.27, 750.779, 2275.27, 722.779, 2364.27, 769.779, 2363.27, 804.779, 2277.27, 891.779, 186.268, 917.779, 257.268, 857.779, 366.268, 1030.78, 263.268, 967.779, 430.268, 934.779, 486.268, 1064.78, 649.268, 1020.78, 605.268, 925.779, 778.268, 954.779, 721.268, 837.779, 840.268, 866.779, 887.268, 745.779, 802.268, 715.779, 894.268, 641.779, 934.268, 668.779, 968.268, 612.779, 996.268, 617.779, 1061.27, 600.779, 1045.27, 593.779, 1113.27, 584.779, 1123.27, 594.779, 1236.27, 593.779, 1221.27, 600.779, 1301.27, 624.779, 1318.27, 622.779, 1376.27, 675.779, 1381.27, 658.779, 1512.27, 744.779, 1433.27, 745.779, 1526.27, 860.779, 1608.27, 807.779, 1609.27, 948.779, 1708.27, 857.779, 1727.27, 1002.78, 1825.27, 879.779, 1939.27, 1010.78, 2005.27, 870.779, 2132.27, 971.779, 2168.27, 832.779 ) +polygons = [ PoolIntArray( 0, 1, 2, 3 ), PoolIntArray( 4, 5, 6, 7, 8 ), PoolIntArray( 9, 3, 2, 10 ), PoolIntArray( 11, 12, 9, 10, 13, 14 ), PoolIntArray( 15, 14, 13, 16, 17 ), PoolIntArray( 17, 16, 18, 19 ), PoolIntArray( 20, 19, 18, 21, 22 ), PoolIntArray( 23, 20, 22, 24 ), PoolIntArray( 25, 23, 24 ), PoolIntArray( 26, 25, 24, 27, 28 ), PoolIntArray( 29, 26, 28 ), PoolIntArray( 29, 28, 30, 31 ), PoolIntArray( 32, 31, 30, 33 ), PoolIntArray( 34, 32, 33, 35, 36 ), PoolIntArray( 37, 34, 36 ), PoolIntArray( 38, 37, 36, 39, 40 ), PoolIntArray( 40, 39, 41, 42 ), PoolIntArray( 42, 41, 43, 44 ), PoolIntArray( 44, 43, 45, 46 ), PoolIntArray( 46, 45, 47, 8 ), PoolIntArray( 8, 47, 4 ) ] +outlines = [ PoolVector2Array( 120.268, 837.779, 257.268, 857.779, 430.268, 934.779, 605.268, 925.779, 721.268, 837.779, 802.268, 715.779, 894.268, 641.779, 968.268, 612.779, 1045.27, 593.779, 1113.27, 584.779, 1236.27, 593.779, 1318.27, 622.779, 1381.27, 658.779, 1512.27, 744.779, 1608.27, 807.779, 1708.27, 857.779, 1825.27, 879.779, 2005.27, 870.779, 2168.27, 832.779, 2273.27, 750.779, 2275.27, 722.779, 2364.27, 769.779, 2363.27, 804.779, 2277.27, 891.779, 2132.27, 971.779, 1939.27, 1010.78, 1727.27, 1002.78, 1609.27, 948.779, 1526.27, 860.779, 1433.27, 745.779, 1376.27, 675.779, 1301.27, 624.779, 1221.27, 600.779, 1123.27, 594.779, 1061.27, 600.779, 996.268, 617.779, 934.268, 668.779, 887.268, 745.779, 840.268, 866.779, 778.268, 954.779, 649.268, 1020.78, 486.268, 1064.78, 366.268, 1030.78, 263.268, 967.779, 186.268, 917.779, 45.2684, 888.779, 42.2684, 846.779, 119.268, 796.779 ) ] [node name="room4" type="Node2D"] script = ExtResource( 6 ) global_id = "room4" esc_script = "res://game/rooms/room04/esc/room04.esc" player_scene = ExtResource( 4 ) -camera_limits = [ Rect2( 0, 0, 1666, 574 ) ] +camera_limits = [ Rect2( 0, 0, 2390, 1200 ) ] editor_debug_mode = 1 -[node name="background" type="TextureRect" parent="."] -margin_right = 1666.0 -margin_bottom = 574.0 +[node name="ESCBackground" type="TextureRect" parent="."] +margin_right = 2390.0 +margin_bottom = 1200.0 mouse_filter = 2 -texture = ExtResource( 10 ) +texture = ExtResource( 7 ) script = ExtResource( 2 ) __meta__ = { "_edit_use_anchors_": false } -[node name="room_label" type="Label" parent="background"] -margin_right = 40.0 -margin_bottom = 14.0 +[node name="room_label" type="Label" parent="ESCBackground"] +margin_right = 82.0 +margin_bottom = 21.0 custom_fonts/font = ExtResource( 3 ) text = "ROOM 4" -[node name="Label" type="Label" parent="background"] -margin_left = 214.299 -margin_top = 93.6566 -margin_right = 1008.3 -margin_bottom = 109.657 +[node name="Label" type="Label" parent="ESCBackground"] +modulate = Color( 0, 0, 0, 1 ) +margin_left = 782.0 +margin_top = 159.0 +margin_right = 1112.0 +margin_bottom = 425.0 custom_fonts/font = ExtResource( 3 ) -text = "This room demonstrates how to use a background image AND using a large image width AND setting a depth map on the ESCTerrain node" +text = "Change player height +using a greyscale +depth map on +the ESCTerrain node. +Use black for the +smallest scale, white for +the largest.Image must be + the same size as the + background." +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="Label2" type="Label" parent="ESCBackground"] +modulate = Color( 0, 0, 0, 1 ) +margin_left = 1246.0 +margin_top = 506.0 +margin_right = 1576.0 +margin_bottom = 682.0 +custom_fonts/font = ExtResource( 3 ) +text = "Colour the player with a +lightmap on the ESCTerrain +node. Use any RGB colour you +like. The image must be the same +size as the background. Here a grey is +used to darken the player as they walk +through shadows." +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="Label3" type="Label" parent="ESCBackground"] +modulate = Color( 0, 0, 0, 1 ) +margin_left = 1285.0 +margin_top = 211.0 +margin_right = 1615.0 +margin_bottom = 373.0 +custom_fonts/font = ExtResource( 3 ) +text = "Use the \"z index\" +on sprites to make +the player walk +behind them like +this tree trunk." __meta__ = { "_edit_use_anchors_": false } [node name="walkable_area" type="Navigation2D" parent="."] script = ExtResource( 1 ) -scales = ExtResource( 8 ) +scales = ExtResource( 11 ) scale_min = 0.4 lightmap = ExtResource( 8 ) +player_speed_multiplier = 1.5 player_doubleclick_speed_multiplier = 1.8 [node name="platform" type="NavigationPolygonInstance" parent="walkable_area"] @@ -65,7 +111,7 @@ __meta__ = { } [node name="player_start" type="Position2D" parent="."] -position = Vector2( 82.9282, 347.615 ) +position = Vector2( 91, 593 ) script = ExtResource( 9 ) global_id = "r4_player_start" is_start_location = true @@ -82,10 +128,10 @@ dialog_color = Color( 1, 1, 1, 1 ) animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/l_door"] -polygon = PoolVector2Array( 29.1046, 292.156, 31.0151, 76.8949, 147.177, 74.4792, 151.415, 293.788 ) +polygon = PoolVector2Array( 22, 633, 21, 328, 143, 276, 143, 565 ) [node name="Position2D" type="Position2D" parent="Hotspots/l_door"] -position = Vector2( 83.6298, 279.703 ) +position = Vector2( 80, 589 ) script = ExtResource( 9 ) [node name="r_door" type="Area2D" parent="Hotspots"] @@ -98,8 +144,13 @@ dialog_color = Color( 1, 1, 1, 1 ) animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/r_door"] -polygon = PoolVector2Array( 1567.92, 294.848, 1573.21, 92.4902, 1657.34, 129.485, 1654.79, 343.583 ) +polygon = PoolVector2Array( 2266, 480, 2266, 189, 2385, 242, 2387, 544 ) [node name="Position2D" type="Position2D" parent="Hotspots/r_door"] -position = Vector2( 1611.46, 301.017 ) +position = Vector2( 2313, 520 ) script = ExtResource( 9 ) + +[node name="Sprite" type="Sprite" parent="."] +position = Vector2( 1195, 278 ) +z_index = 366 +texture = ExtResource( 10 )