diff --git a/Sprites/josep/Josep_Sitting.tscn b/Sprites/josep/Josep_Sitting.tscn new file mode 100644 index 0000000..0bcb905 --- /dev/null +++ b/Sprites/josep/Josep_Sitting.tscn @@ -0,0 +1,16 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://Sprites/josep/at_desk.png" type="Texture" id=1] + +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 46.5001, 40.4998 ) + +[node name="Josep_Sitting" type="StaticBody2D"] + +[node name="Sprite" type="Sprite" parent="."] +texture = ExtResource( 1 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +position = Vector2( -10.5, 27.4999 ) +rotation = 1.5708 +shape = SubResource( 1 ) diff --git a/Sprites/josep/at_desk.png b/Sprites/josep/at_desk.png new file mode 100644 index 0000000..b3f2129 Binary files /dev/null and b/Sprites/josep/at_desk.png differ diff --git a/Sprites/josep/at_desk.png.import b/Sprites/josep/at_desk.png.import new file mode 100644 index 0000000..da96665 --- /dev/null +++ b/Sprites/josep/at_desk.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/at_desk.png-4d1628e675cf4f1eea9bbac5877439aa.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/josep/at_desk.png" +dest_files=[ "res://.import/at_desk.png-4d1628e675cf4f1eea9bbac5877439aa.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/josep/left.png b/Sprites/josep/left.png index dadaf67..5e9d7c0 100644 Binary files a/Sprites/josep/left.png and b/Sprites/josep/left.png differ diff --git a/Story/Ch1S2.tscn b/Story/Ch1S2.tscn index f105dfe..a138f4a 100644 --- a/Story/Ch1S2.tscn +++ b/Story/Ch1S2.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=30 format=2] +[gd_scene load_steps=29 format=2] [ext_resource path="res://Resources/lodge.tres" type="TileSet" id=1] [ext_resource path="res://Sprites/sak/Sak.tscn" type="PackedScene" id=2] @@ -15,7 +15,7 @@ [ext_resource path="res://Scenes/InteractiveDialog.tscn" type="PackedScene" id=13] [ext_resource path="res://Scripts/CoverControl.gd" type="Script" id=14] [ext_resource path="res://Music/Lodge-Unmastered.mp3" type="AudioStream" id=15] -[ext_resource path="res://Sprites/josep/Josep.tscn" type="PackedScene" id=16] +[ext_resource path="res://Sprites/josep/Josep_Sitting.tscn" type="PackedScene" id=16] [ext_resource path="res://Sprites/bong/sit_1cat.png" type="Texture" id=17] [ext_resource path="res://Sprites/eunsu/Eunsu.tscn" type="PackedScene" id=18] [ext_resource path="res://Sprites/bong/black_cat.png" type="Texture" id=19] @@ -26,7 +26,6 @@ [ext_resource path="res://Resources/bathrooms.tres" type="TileSet" id=24] [ext_resource path="res://Sprites/josha/Josh.tscn" type="PackedScene" id=25] [ext_resource path="res://Sprites/joe/Joe.tscn" type="PackedScene" id=26] -[ext_resource path="res://Tiles/Furniture/thonkpad.png" type="Texture" id=27] [sub_resource type="SpriteFrames" id=1] animations = [ { @@ -235,12 +234,19 @@ format = 1 tile_data = PoolIntArray( 1245168, 69, 0, 1179694, 536870981, 0 ) [node name="BedBot" type="TileMap" parent="FG/Rooms"] -visible = false tile_set = ExtResource( 1 ) cell_size = Vector2( 30, 30 ) cell_y_sort = true format = 1 -tile_data = PoolIntArray( 1507312, 68, 0, 1441832, 536870980, 0, 1638384, 68, 0, 1572904, 536870980, 0, 1769456, 67, 0, 1703976, 536870979, 0, 1834994, 65, 0, 1769512, 536870977, 0, 2228208, 74, 0, 2162733, 536870986, 0 ) +tile_data = PoolIntArray( 1507312, 68, 0, 1441832, 536870980, 0, 1638384, 68, 0, 1572904, 536870980, 0, 1769456, 67, 0, 1703976, 536870979, 0, 1834994, 65, 0, 1769512, 536870977, 0, 2162733, 536870986, 0 ) + +[node name="Furniture" type="TileMap" parent="FG/Rooms/BedBot"] +tile_set = ExtResource( 1 ) +cell_size = Vector2( 30, 30 ) +cell_tile_origin = 2 +cell_y_sort = true +format = 1 +tile_data = PoolIntArray( 1245168, 69, 0, 1769456, 69, 0, 1703982, 536870981, 0 ) [node name="Eunsu" parent="FG/Rooms/BedBot" instance=ExtResource( 18 )] position = Vector2( 1353, 888 ) @@ -260,25 +266,11 @@ frames = SubResource( 1 ) frame = 2 script = ExtResource( 22 ) -[node name="Josep" parent="FG/Rooms/BedBot" instance=ExtResource( 16 )] -position = Vector2( -375, 1020 ) -scale = Vector2( 1.00493, 0.995532 ) - -[node name="Thonkpad" type="Sprite" parent="FG/Rooms/BedBot"] -position = Vector2( -447, 1019 ) -scale = Vector2( 1.00493, 0.995532 ) -texture = ExtResource( 27 ) - -[node name="Furniture" type="TileMap" parent="FG/Rooms/BedBot"] -tile_set = ExtResource( 1 ) -cell_size = Vector2( 30, 30 ) -cell_tile_origin = 2 -cell_y_sort = true -format = 1 -tile_data = PoolIntArray( 1245168, 69, 0, 1769456, 69, 0, 1703982, 536870981, 0 ) - [node name="Josh" parent="FG/Rooms/BedBot" instance=ExtResource( 25 )] -position = Vector2( -330, 1068 ) +position = Vector2( -357, 1065 ) + +[node name="Josep_Sitting" parent="FG/Rooms/BedBot" instance=ExtResource( 16 )] +position = Vector2( -420, 1050 ) [node name="BathTop" type="TileMap" parent="FG/Rooms"] cell_tile_origin = 2