diff --git a/Ch1S2.tscn b/Ch1S2.tscn index 9df3e09..59861df 100644 --- a/Ch1S2.tscn +++ b/Ch1S2.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=9 format=2] +[gd_scene load_steps=12 format=2] [ext_resource path="res://Player.tscn" type="PackedScene" id=1] [ext_resource path="res://UI.tscn" type="PackedScene" id=2] @@ -7,6 +7,9 @@ [ext_resource path="res://Tiles/Furniture/mug.png" type="Texture" id=5] [ext_resource path="res://Sprites/jame/James.tscn" type="PackedScene" id=6] [ext_resource path="res://Sprites/sak/Sak.tscn" type="PackedScene" id=7] +[ext_resource path="res://woods.tres" type="TileSet" id=8] +[ext_resource path="res://Sprites/charlene/Charlene.tscn" type="PackedScene" id=9] +[ext_resource path="res://Sprites/alistair/Alistair-back.tscn" type="PackedScene" id=10] [ext_resource path="res://lodge.tres" type="TileSet" id=14] [node name="LivingRoom" type="Node2D"] @@ -16,6 +19,18 @@ position = Vector2( 60, 0 ) [node name="UI" parent="CanvasLayer" instance=ExtResource( 2 )] +[node name="Sky" type="TileMap" parent="."] +tile_set = ExtResource( 8 ) +cell_size = Vector2( 60, 60 ) +format = 1 +tile_data = PoolIntArray( 65535, 0, 0, 3, 0, 0, 7, 0, 0 ) + +[node name="Woods" type="TileMap" parent="."] +tile_set = ExtResource( 8 ) +cell_size = Vector2( 60, 60 ) +format = 1 +tile_data = PoolIntArray( 65538, 1, 0, 65540, 1, 0 ) + [node name="Lodge" type="TileMap" parent="."] tile_set = ExtResource( 14 ) cell_size = Vector2( 60, 60 ) @@ -52,13 +67,19 @@ format = 1 tile_data = PoolIntArray( 524305, 35, 0, 524307, 35, 0, 524309, 35, 0, 524311, 35, 0, 524313, 35, 0 ) [node name="Richal" parent="YSort" instance=ExtResource( 3 )] -position = Vector2( 548, 180 ) +position = Vector2( 546, 181 ) [node name="James" parent="YSort" instance=ExtResource( 6 )] position = Vector2( 786, 189 ) [node name="Sak" parent="YSort" instance=ExtResource( 7 )] -position = Vector2( 831, 216 ) +position = Vector2( 843, 218 ) + +[node name="Charlene" parent="YSort" instance=ExtResource( 9 )] +position = Vector2( 371, 385 ) + +[node name="Alistair" parent="YSort" instance=ExtResource( 10 )] +position = Vector2( 149, 164 ) [node name="Kettle" type="Sprite" parent="YSort"] position = Vector2( 593, 156 ) diff --git a/Sprites/alistair/Alistair-back.tscn b/Sprites/alistair/Alistair-back.tscn new file mode 100644 index 0000000..4905073 --- /dev/null +++ b/Sprites/alistair/Alistair-back.tscn @@ -0,0 +1,16 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://Sprites/alistair/back.png" type="Texture" id=1] + +[sub_resource type="CapsuleShape2D" id=2] +radius = 25.0 +height = 0.0 + +[node name="Alistair" type="StaticBody2D" groups=["Human"]] + +[node name="Back" type="Sprite" parent="."] +texture = ExtResource( 1 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +position = Vector2( 0, 35 ) +shape = SubResource( 2 ) diff --git a/Sprites/alistair/Alistair.tscn b/Sprites/alistair/Alistair.tscn new file mode 100644 index 0000000..92c0daa --- /dev/null +++ b/Sprites/alistair/Alistair.tscn @@ -0,0 +1,20 @@ +[gd_scene load_steps=3 format=2] + +[sub_resource type="StreamTexture" id=1] +flags = 4 +load_path = "res://.import/front.png-a756d11d0a8b51bde2f613dfb80275e2.stex" + +[sub_resource type="CapsuleShape2D" id=2] +radius = 25.0 +height = 0.0 + +[node name="Alistair" type="StaticBody2D" groups=["Human"]] + +[node name="Front" type="Sprite" parent="."] +position = Vector2( -117, -95 ) +texture = SubResource( 1 ) +offset = Vector2( 117, 95 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +position = Vector2( 0, 35 ) +shape = SubResource( 2 ) diff --git a/Sprites/alistair/back.png b/Sprites/alistair/back.png new file mode 100644 index 0000000..1c1b6a1 Binary files /dev/null and b/Sprites/alistair/back.png differ diff --git a/Sprites/alistair/back.png.import b/Sprites/alistair/back.png.import new file mode 100644 index 0000000..7e1c53d --- /dev/null +++ b/Sprites/alistair/back.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/back.png-46ef887744db02b01a7dc063f4a13468.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/alistair/back.png" +dest_files=[ "res://.import/back.png-46ef887744db02b01a7dc063f4a13468.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/Sprites/charlene/Charlene.tscn b/Sprites/charlene/Charlene.tscn new file mode 100644 index 0000000..7791615 --- /dev/null +++ b/Sprites/charlene/Charlene.tscn @@ -0,0 +1,16 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://Sprites/charlene/front.png" type="Texture" id=1] + +[sub_resource type="CapsuleShape2D" id=1] +radius = 25.0 +height = 0.0 + +[node name="Charlene" type="StaticBody2D" groups=["Human"]] + +[node name="Sprite" type="Sprite" parent="." groups=["Human"]] +texture = ExtResource( 1 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +position = Vector2( 0, 35 ) +shape = SubResource( 1 ) diff --git a/Sprites/chsh/right.png b/Sprites/chsh/right.png index 2c6b249..83cfed3 100644 Binary files a/Sprites/chsh/right.png and b/Sprites/chsh/right.png differ diff --git a/Sprites/jame/James.tscn b/Sprites/jame/James.tscn index 21475e5..80313f0 100644 --- a/Sprites/jame/James.tscn +++ b/Sprites/jame/James.tscn @@ -2,14 +2,15 @@ [ext_resource path="res://Sprites/jame/front.png" type="Texture" id=1] -[sub_resource type="RectangleShape2D" id=1] -extents = Vector2( 22, 4.5 ) +[sub_resource type="CapsuleShape2D" id=1] +radius = 25.0 +height = 0.0 [node name="James" type="StaticBody2D" groups=["Humans"]] [node name="Sprite" type="Sprite" parent="."] texture = ExtResource( 1 ) -[node name="CollisionShape2D" type="CollisionShape2D" parent="."] -position = Vector2( 0, 32 ) +[node name="CollisionShape2D" type="CollisionShape2D" parent="." groups=["Human"]] +position = Vector2( 0, 35 ) shape = SubResource( 1 ) diff --git a/Sprites/richal/Richal.tscn b/Sprites/richal/Richal.tscn index a88cd12..26c8820 100644 --- a/Sprites/richal/Richal.tscn +++ b/Sprites/richal/Richal.tscn @@ -2,14 +2,15 @@ [ext_resource path="res://Sprites/richal/front.png" type="Texture" id=1] -[sub_resource type="RectangleShape2D" id=1] -extents = Vector2( 22, 4.5 ) +[sub_resource type="CapsuleShape2D" id=1] +radius = 25.0 +height = 0.0 -[node name="Richal" type="StaticBody2D" groups=["Humans"]] +[node name="Richal" type="StaticBody2D" groups=["Human"]] [node name="Sprite" type="Sprite" parent="."] texture = ExtResource( 1 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -position = Vector2( 0, 32 ) +position = Vector2( 0, 35 ) shape = SubResource( 1 ) diff --git a/Sprites/sak/Sak.tscn b/Sprites/sak/Sak.tscn index 8558fe5..7623a6a 100644 --- a/Sprites/sak/Sak.tscn +++ b/Sprites/sak/Sak.tscn @@ -2,14 +2,15 @@ [ext_resource path="res://Sprites/sak/front.png" type="Texture" id=1] -[sub_resource type="RectangleShape2D" id=1] -extents = Vector2( 22, 4.5 ) +[sub_resource type="CapsuleShape2D" id=1] +radius = 25.0 +height = 0.0 -[node name="Sak" type="StaticBody2D"] +[node name="Sak" type="StaticBody2D" groups=["Human"]] [node name="Sprite" type="Sprite" parent="."] texture = ExtResource( 1 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] -position = Vector2( 0, 32 ) +position = Vector2( 0, 35 ) shape = SubResource( 1 ) diff --git a/Tiles/sky-backup.png b/Tiles/sky-backup.png new file mode 100644 index 0000000..5d81510 Binary files /dev/null and b/Tiles/sky-backup.png differ diff --git a/Tiles/sky-backup.png.import b/Tiles/sky-backup.png.import new file mode 100644 index 0000000..07be830 --- /dev/null +++ b/Tiles/sky-backup.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/sky-backup.png-4d6a519172ec27dc394e34b634b533f8.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Tiles/sky-backup.png" +dest_files=[ "res://.import/sky-backup.png-4d6a519172ec27dc394e34b634b533f8.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/Tiles/sky.png b/Tiles/sky.png new file mode 100644 index 0000000..cd62f30 Binary files /dev/null and b/Tiles/sky.png differ diff --git a/Tiles/sky.png.import b/Tiles/sky.png.import new file mode 100644 index 0000000..8dc7948 --- /dev/null +++ b/Tiles/sky.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/sky.png-607a77b7b95a400ce06a87a2edf3a9ac.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Tiles/sky.png" +dest_files=[ "res://.import/sky.png-607a77b7b95a400ce06a87a2edf3a9ac.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/woods.tres b/woods.tres new file mode 100644 index 0000000..83a1921 --- /dev/null +++ b/woods.tres @@ -0,0 +1,34 @@ +[gd_resource type="TileSet" load_steps=3 format=2] + +[ext_resource path="res://Tiles/sky.png" type="Texture" id=1] +[ext_resource path="res://Tiles/tree.png" type="Texture" id=2] + +[resource] +0/name = "Sky" +0/texture = ExtResource( 1 ) +0/tex_offset = Vector2( 0, 0 ) +0/modulate = Color( 1, 1, 1, 1 ) +0/region = Rect2( 0, 0, 240, 180 ) +0/tile_mode = 0 +0/occluder_offset = Vector2( 30, 30 ) +0/navigation_offset = Vector2( 30, 30 ) +0/shape_offset = Vector2( 0, 0 ) +0/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +0/shape_one_way = false +0/shape_one_way_margin = 0.0 +0/shapes = [ ] +0/z_index = 0 +1/name = "tree.png 1" +1/texture = ExtResource( 2 ) +1/tex_offset = Vector2( 0, 0 ) +1/modulate = Color( 1, 1, 1, 1 ) +1/region = Rect2( 0, 0, 60, 120 ) +1/tile_mode = 0 +1/occluder_offset = Vector2( 0, 0 ) +1/navigation_offset = Vector2( 0, 0 ) +1/shape_offset = Vector2( 0, 0 ) +1/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +1/shape_one_way = false +1/shape_one_way_margin = 0.0 +1/shapes = [ ] +1/z_index = 0