From 5005267e0dba684b6e4036023bd344a60e3ccccd Mon Sep 17 00:00:00 2001 From: balloonpopper <5151242+balloonpopper@users.noreply.github.com> Date: Sun, 13 Feb 2022 07:09:48 +1100 Subject: [PATCH] feat: Updated room 1 graphics (#491) Co-authored-by: Balloonpopper --- README.md | 1 + game/assets_sources/worker/worker.png | Bin 6472 -> 4852 bytes game/rooms/room01/art1.png | Bin 0 -> 7680 bytes game/rooms/room01/art2.png | Bin 0 -> 7405 bytes game/rooms/room01/background.tscn | 20 --- game/rooms/room01/esc/trigger.esc | 2 +- game/rooms/room01/item.tscn | 27 ---- game/rooms/room01/r_door.tscn | 26 ---- game/rooms/room01/room01.tscn | 176 ++++++++++++++++++-------- game/rooms/room01/room1background.png | Bin 0 -> 2072 bytes game/rooms/room01/walkable_area.tscn | 18 --- 11 files changed, 123 insertions(+), 147 deletions(-) create mode 100644 game/rooms/room01/art1.png create mode 100644 game/rooms/room01/art2.png delete mode 100644 game/rooms/room01/background.tscn delete mode 100644 game/rooms/room01/item.tscn delete mode 100644 game/rooms/room01/r_door.tscn create mode 100644 game/rooms/room01/room1background.png delete mode 100644 game/rooms/room01/walkable_area.tscn diff --git a/README.md b/README.md index e8ae1820..fd3d3e60 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,7 @@ This is the demo game that acts as a testing ground for future Escoria developme ### Items * Generic items by Kenney +* Animal pack redux by Kenney Licence: CC0 Licence https://www.kenney.nl/assets/generic-items diff --git a/game/assets_sources/worker/worker.png b/game/assets_sources/worker/worker.png index bb83fd8656161fa87650ac0e6908c6f7845800e4..dce2539eba032e45bc518cb21b39e6f22eabbc70 100644 GIT binary patch literal 4852 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 diff --git a/game/rooms/room01/art1.png b/game/rooms/room01/art1.png new file mode 100644 index 0000000000000000000000000000000000000000..21ad184acee9c5c141c47669bec02f96ddf5ad16 GIT binary patch literal 7680 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 OiJ~N@2Ca}W4f!vZSQ{V! literal 0 HcmV?d00001 diff --git a/game/rooms/room01/background.tscn b/game/rooms/room01/background.tscn deleted file mode 100644 index 993665d2..00000000 --- a/game/rooms/room01/background.tscn +++ /dev/null @@ -1,20 +0,0 @@ -[gd_scene load_steps=2 format=2] - -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_background.gd" type="Script" id=1] - -[node name="background" type="TextureRect"] -margin_right = 1289.0 -margin_bottom = 555.0 -mouse_filter = 2 -script = ExtResource( 1 ) -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="l_platform" type="Line2D" parent="."] -position = Vector2( 2, -266 ) -points = PoolVector2Array( -2.96298, 712.01, 129.973, 614.429, 1167.5, 612.894, 1281.5, 668.894, 1281.5, 812.894, -4.3772, 811.004, -2.96295, 713.424 ) - -[node name="r_door" type="Line2D" parent="."] -position = Vector2( 0, -267.828 ) -points = PoolVector2Array( 1175.07, 620.086, 1171.24, 311.267, 1274.8, 356.87, 1278.31, 672.412, 1188.64, 624.843 ) diff --git a/game/rooms/room01/esc/trigger.esc b/game/rooms/room01/esc/trigger.esc index 5ed0e1de..8540ae75 100644 --- a/game/rooms/room01/esc/trigger.esc +++ b/game/rooms/room01/esc/trigger.esc @@ -2,4 +2,4 @@ :trigger_out -say player "About to leave..." +say player "I'm about to leave..." diff --git a/game/rooms/room01/item.tscn b/game/rooms/room01/item.tscn deleted file mode 100644 index 6ec39df1..00000000 --- a/game/rooms/room01/item.tscn +++ /dev/null @@ -1,27 +0,0 @@ -[gd_scene load_steps=3 format=2] - -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=1] -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=2] - -[node name="item" type="Area2D"] -pause_mode = 1 -script = ExtResource( 1 ) -tooltip_name = "Item on the wall" -default_action = "look" -dialog_color = Color( 1, 1, 1, 1 ) -animations = null - -[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."] -position = Vector2( -652.737, -162.85 ) -polygon = PoolVector2Array( 635.586, 253.345, 568.928, 60.1716, 709.047, 120.028, 699.524, 247.903 ) - -[node name="Line2D" type="Line2D" parent="."] -position = Vector2( -655.406, -430.678 ) -points = PoolVector2Array( 634.097, 516.751, 578.861, 335.008, 701.805, 386.68, 696.459, 509.624, 634.097, 516.751 ) -__meta__ = { -"_editor_description_": "" -} - -[node name="ESCLocation" type="Position2D" parent="."] -position = Vector2( 0, 236.681 ) -script = ExtResource( 2 ) diff --git a/game/rooms/room01/r_door.tscn b/game/rooms/room01/r_door.tscn deleted file mode 100644 index 5fb1e616..00000000 --- a/game/rooms/room01/r_door.tscn +++ /dev/null @@ -1,26 +0,0 @@ -[gd_scene load_steps=3 format=2] - -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_item.gd" type="Script" id=1] -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=2] - -[node name="r_door" type="Area2D"] -pause_mode = 1 -script = ExtResource( 1 ) -__meta__ = { -"_editor_description_": "" -} -global_id = "r1_r_exit" -esc_script = "res://game/rooms/room01/esc/right_exit.esc" -is_exit = true -tooltip_name = "Exit" -default_action = "walk" -dialog_color = Color( 1, 1, 1, 1 ) -animations = null - -[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."] -position = Vector2( -1229.68, -223.006 ) -polygon = PoolVector2Array( 1177.94, 348.61, 1175.95, 45.3759, 1276.06, 92.0953, 1277.95, 399.407 ) - -[node name="Position2D" type="Position2D" parent="."] -position = Vector2( -0.432617, 124.685 ) -script = ExtResource( 2 ) diff --git a/game/rooms/room01/room01.tscn b/game/rooms/room01/room01.tscn index 6ce91917..bd600029 100644 --- a/game/rooms/room01/room01.tscn +++ b/game/rooms/room01/room01.tscn @@ -1,14 +1,20 @@ -[gd_scene load_steps=10 format=2] +[gd_scene load_steps=12 format=2] -[ext_resource path="res://game/rooms/room01/walkable_area.tscn" type="PackedScene" id=1] -[ext_resource path="res://game/rooms/room01/background.tscn" type="PackedScene" id=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] [ext_resource path="res://game/fonts/caslonantique.tres" type="DynamicFont" id=3] [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://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=7] -[ext_resource path="res://game/rooms/room01/r_door.tscn" type="PackedScene" id=8] -[ext_resource path="res://game/rooms/room01/item.tscn" type="PackedScene" id=9] +[ext_resource path="res://game/rooms/room01/room1background.png" type="Texture" id=8] +[ext_resource path="res://game/rooms/room01/art2.png" type="Texture" id=9] +[ext_resource path="res://game/rooms/room01/art1.png" type="Texture" id=10] + +[sub_resource type="NavigationPolygon" id=1] +vertices = PoolVector2Array( 125, 357, 1170, 355, 1277, 417, 1279, 550, -1, 548, 0, 449 ) +polygons = [ PoolIntArray( 0, 1, 2, 3, 4, 5 ) ] +outlines = [ PoolVector2Array( 125, 357, 1170, 355, 1277, 417, 1279, 550, -1, 548, 0, 449 ) ] [node name="room1" type="Node2D"] script = ExtResource( 6 ) @@ -21,15 +27,48 @@ player_scene = ExtResource( 4 ) camera_limits = [ Rect2( 0, 0, 1285, 550 ) ] editor_debug_mode = 1 -[node name="background" parent="." instance=ExtResource( 2 )] +[node name="ESCBackground" type="TextureRect" parent="."] +margin_right = 40.0 +margin_bottom = 40.0 +mouse_filter = 2 +texture = ExtResource( 8 ) +script = ExtResource( 2 ) +__meta__ = { +"_edit_use_anchors_": false +} -[node name="advice" type="Label" parent="background"] +[node name="advice2" type="Label" parent="ESCBackground"] +anchor_right = 0.023274 +anchor_bottom = 0.018018 +margin_left = 90.2752 +margin_top = 170.824 +margin_right = 298.275 +margin_bottom = 215.824 +custom_fonts/font = ExtResource( 3 ) +text = "Move : left click +Fast move : double left click" +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="room_label" type="Label" parent="ESCBackground"] +margin_left = 7.0 +margin_top = 3.0 +margin_right = 89.0 +margin_bottom = 24.0 +custom_fonts/font = ExtResource( 3 ) +text = "ROOM 1" +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="advice" type="Label" parent="ESCBackground"] anchor_right = 0.023274 anchor_bottom = 0.018018 margin_left = 90.0 margin_top = 59.0 -margin_right = 338.0 -margin_bottom = 118.0 +margin_right = 368.0 +margin_bottom = 128.0 custom_fonts/font = ExtResource( 3 ) text = "Don't click immediately! Player will walk around the room, @@ -38,70 +77,99 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="advice2" type="Label" parent="background"] -anchor_right = 0.023274 -anchor_bottom = 0.018018 -margin_left = 90.2752 -margin_top = 170.824 -margin_right = 270.275 -margin_bottom = 205.824 -custom_fonts/font = ExtResource( 3 ) -text = "Move : left click -Fast move : double left click" -__meta__ = { -"_edit_use_anchors_": false -} +[node name="walkable_area" type="Navigation2D" parent="."] +script = ExtResource( 1 ) -[node name="room_label" type="Label" parent="background"] -margin_right = 40.0 -margin_bottom = 14.0 -custom_fonts/font = ExtResource( 3 ) -text = "ROOM 1" -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="walkable_area" parent="." instance=ExtResource( 1 )] -position = Vector2( 3.5636, 0 ) +[node name="NavigationPolygonInstance" type="NavigationPolygonInstance" parent="walkable_area"] +navpoly = SubResource( 1 ) [node name="Hotspots" type="Node" parent="."] -[node name="r_door" parent="Hotspots" instance=ExtResource( 8 )] -position = Vector2( 1225.9, 217.966 ) +[node name="r_door" type="Area2D" parent="Hotspots"] +pause_mode = 1 +script = ExtResource( 5 ) +global_id = "r1_r_exit" +esc_script = "res://game/rooms/room01/esc/right_exit.esc" +is_exit = true +tooltip_name = "Exit to room 2" +default_action = "walk" +dialog_color = Color( 1, 1, 1, 1 ) +animations = null + +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/r_door"] +polygon = PoolVector2Array( 1173, 63, 1278, 106, 1278, 420, 1172, 356 ) [node name="ESCLocation" type="Position2D" parent="Hotspots/r_door"] -position = Vector2( 1.35498, 136.453 ) +position = Vector2( 1221, 400 ) script = ExtResource( 7 ) -[node name="item" parent="Hotspots" instance=ExtResource( 9 )] -position = Vector2( 480.542, 146.832 ) +[node name="artwork1" type="Area2D" parent="Hotspots"] +pause_mode = 1 +script = ExtResource( 5 ) global_id = "r1_wall_item1" esc_script = "res://game/rooms/room01/esc/wall_item.esc" +tooltip_name = "Artwork" +default_action = "look" +inventory_texture = ExtResource( 10 ) +dialog_color = Color( 1, 1, 1, 1 ) +animations = null -[node name="Label" type="Label" parent="Hotspots/item"] -margin_left = -105.12 -margin_top = 121.762 -margin_right = 122.88 -margin_bottom = 142.762 +[node name="Art1" type="Sprite" parent="Hotspots/artwork1"] +position = Vector2( 470, 140 ) +texture = ExtResource( 10 ) + +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/artwork1"] +position = Vector2( -84, 11.1 ) +polygon = PoolVector2Array( 487, 62, 627, 62, 627, 198, 487, 199 ) + +[node name="ESCLocation" type="Position2D" parent="Hotspots/artwork1"] +position = Vector2( 476, 385 ) +script = ExtResource( 7 ) + +[node name="Label" type="Label" parent="Hotspots/artwork1"] +margin_left = 375.422 +margin_top = 268.594 +margin_right = 657.422 +margin_bottom = 313.594 custom_fonts/font = ExtResource( 3 ) -text = "Character talks with text above" +text = "If you look at this object, the character's +speech will appear above his head" __meta__ = { "_edit_use_anchors_": false, "_editor_description_": "" } -[node name="item2" parent="Hotspots" instance=ExtResource( 9 )] -position = Vector2( 839.614, 147.455 ) +[node name="artwork2" type="Area2D" parent="Hotspots"] +pause_mode = 1 +script = ExtResource( 5 ) global_id = "r1_wall_item2" esc_script = "res://game/rooms/room01/esc/wall_item_popupdialog.esc" +tooltip_name = "Artwork 2" +default_action = "look" +inventory_texture = ExtResource( 9 ) +dialog_color = Color( 1, 1, 1, 1 ) +animations = null -[node name="Label" type="Label" parent="Hotspots/item2"] -margin_left = -105.12 -margin_top = 121.762 -margin_right = 122.88 -margin_bottom = 142.762 +[node name="Art12" type="Sprite" parent="Hotspots/artwork2"] +position = Vector2( 830, 140 ) +texture = ExtResource( 9 ) + +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/artwork2"] +position = Vector2( 273, 11 ) +polygon = PoolVector2Array( 487, 62, 627, 62, 627, 198, 487, 199 ) + +[node name="ESCLocation" type="Position2D" parent="Hotspots/artwork2"] +position = Vector2( 829, 379 ) +script = ExtResource( 7 ) + +[node name="Label2" type="Label" parent="Hotspots/artwork2"] +margin_left = 734.0 +margin_top = 269.0 +margin_right = 1020.0 +margin_bottom = 314.0 custom_fonts/font = ExtResource( 3 ) -text = "Character talks with popup" +text = "If you look at this object, the character +will talk via a popup" __meta__ = { "_edit_use_anchors_": false, "_editor_description_": "" @@ -118,7 +186,7 @@ dialog_color = Color( 1, 1, 1, 1 ) animations = null [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Hotspots/trigger_talk"] -polygon = PoolVector2Array( 1020.6, 348.369, 1155.87, 515.233, 1249.67, 445.131, 1114.4, 347.382 ) +polygon = PoolVector2Array( 1027, 352, 1187, 502, 1249.67, 445.131, 1123, 351 ) [node name="player_start" type="Position2D" parent="."] position = Vector2( 172.471, 434.487 ) @@ -143,5 +211,3 @@ position = Vector2( 660.468, 381.489 ) script = ExtResource( 7 ) global_id = "r1_destination_point3" player_orients_on_arrival = false - -[editable path="Hotspots/item"] diff --git a/game/rooms/room01/room1background.png b/game/rooms/room01/room1background.png new file mode 100644 index 0000000000000000000000000000000000000000..a2d5cd8612cd77976d99a3380a27a39471382400 GIT binary patch literal 2072 zcmeHI?N3uz7(eH>w}lqU3?Oe6x)eb&QkJr)z+!I+tZnQ7I}$V@l~+qLu$^_TL}h1W z31iHON(_XolE_xFB`U^YH-g;GII2@#mdqk$a>+I~;$Seeomk4An|<*Q*q3E~IL~=r ze$VfBo|BWD_OcRPv?N)A5Q;YFi%ba7;8Gbv0c_#!{A$>+-J~l-7slla5C|>W*R==@ zo|J~Fd1y?TvAh^noJCz5J^2u$O{gfx<&c9HY18ksBP6@dFFa-)s6$A6+EAn|cg!r_ zoj;W_7XRAR+3z9`i$0I`7}*;Oq1wyF5Bv41ONmtnmd@F0+>fvAFbBro&r?%%lFn&w zL}wOLqf|1Vq4pCWp&lxI`+ugea&hVf#p-TiRldkP@S(YI)LN`!Be<3AXRvyd-W#`# zc@RW%_l5fTqr^(3FDuzEEPKiAQ9-DjuU$nQ6zvVAa;}ZaaD=4uiIRONjZ>_qVe_u* zR9!fZyFo+NPJEjIorBG5Jm^hQ!G~6C-U*;ppk0Yv77uD5bCS>-ME=l&N*zMlJG+UShx}KW?D;e;R=-0#Y#_fR zU7iMcyOrp8p(PZP4f5+aHOMm;k$2%xvOx`dF*lo$tr*EUp?8l{vU~>ReSi#+on6n( z^E>$0-a&Z+*E(8`!$&>)!zr|z>&Rf~{l`_*E9|ifp_}WS@QK}A+eC%9fjqhS16KWY z^GlphLN&u`W__i1@f(y7Ixw8gh&zLo@qJ;(TrpNTd`ApKrnuUeARN#f^pD5bJWVd~ zZ|IQk9#*+61v^+e*klm_;badGPBudeyALNJq55m7%H@6~br?0z9ASvm zIW!{YS`!*`K(YBw2N2%b4Q47(NJQPfrU{tu?NTrir2xqD+OcZqw*eyz&~`5%9?;0H zXjoc2lLCr^0UF|=MTyPh8QKDh@;_G4#JLG0Ntlhf;v9@~73_@V1epDw9l+wSG#? z_RAU5nzEi4^2oF9Bi$`@<`6P0ob19Gzo664xZkH`35>UJ`llL`sJly`|Hq}$w=$;x cpSf~(1HDv8wCC+Zx%}^KC@v|wP*~OaH`DsTb^rhX literal 0 HcmV?d00001 diff --git a/game/rooms/room01/walkable_area.tscn b/game/rooms/room01/walkable_area.tscn deleted file mode 100644 index 872bfd15..00000000 --- a/game/rooms/room01/walkable_area.tscn +++ /dev/null @@ -1,18 +0,0 @@ -[gd_scene load_steps=3 format=2] - -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" type="Script" id=1] - -[sub_resource type="NavigationPolygon" id=1] -vertices = PoolVector2Array( 1168.92, 640.557, 1182.53, 588.863, 1269.59, 622.872, 1275.03, 799.721, 129.634, 615.792, 1143.08, 613.35, -9.16094, 803.802, -6.44019, 711.297 ) -polygons = [ PoolIntArray( 0, 1, 2, 3 ), PoolIntArray( 4, 5, 0, 3, 6, 7 ) ] -outlines = [ PoolVector2Array( -6.44019, 711.297, 129.634, 615.792, 1143.08, 613.35, 1168.92, 640.557, 1182.53, 588.863, 1269.59, 622.872, 1275.03, 799.721, -9.16094, 803.802 ) ] - -[node name="walkable_area" type="Navigation2D"] -script = ExtResource( 1 ) - -[node name="platform" type="NavigationPolygonInstance" parent="."] -position = Vector2( 6.73163, -264.779 ) -navpoly = SubResource( 1 ) -__meta__ = { -"_editor_description_": "" -}