diff --git a/Scripts/CoverControl.gd b/Scripts/CoverControl.gd index 2aeeb52..3dc4202 100644 --- a/Scripts/CoverControl.gd +++ b/Scripts/CoverControl.gd @@ -97,11 +97,13 @@ func _on_BedBot_body_exited(body): func _on_BathTop_body_entered(body): if body == player: hide_cover(areamap['bathtop']) + furniture.get_node("BathTop").show() func _on_BathTop_body_exited(body): if body == player: show_cover(areamap['bathtop']) + furniture.get_node("BathTop").hide() func _on_BathBot_body_entered(body): diff --git a/Sprites/joe/Joe.tscn b/Sprites/joe/Joe.tscn new file mode 100644 index 0000000..dd7cc2d --- /dev/null +++ b/Sprites/joe/Joe.tscn @@ -0,0 +1,16 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://Sprites/joe/front.png" type="Texture" id=1] + +[sub_resource type="CapsuleShape2D" id=1] +radius = 25.0 +height = 0.0 + +[node name="Joe" type="StaticBody2D"] + +[node name="Sprite" type="Sprite" parent="."] +texture = ExtResource( 1 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +position = Vector2( 0, 35 ) +shape = SubResource( 1 ) diff --git a/Sprites/josha/Josh.tscn b/Sprites/josha/Josh.tscn new file mode 100644 index 0000000..fd1f92d --- /dev/null +++ b/Sprites/josha/Josh.tscn @@ -0,0 +1,16 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://Sprites/josha/front.png" type="Texture" id=1] + +[sub_resource type="CapsuleShape2D" id=1] +radius = 25.0 +height = 0.0 + +[node name="Josh" type="StaticBody2D"] + +[node name="Sprite" type="Sprite" parent="."] +texture = ExtResource( 1 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +position = Vector2( 0, 35 ) +shape = SubResource( 1 ) diff --git a/Story/Ch1S2.tscn b/Story/Ch1S2.tscn index ec0cb7b..f01e9e8 100644 --- a/Story/Ch1S2.tscn +++ b/Story/Ch1S2.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=27 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] @@ -24,6 +24,8 @@ [ext_resource path="res://Scripts/AnimateJorts.gd" type="Script" id=22] [ext_resource path="res://Sprites/bong/jorts-3.png" type="Texture" id=23] [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] [sub_resource type="SpriteFrames" id=1] animations = [ { @@ -191,7 +193,6 @@ timeline = "timeline-1642498159.json" position = Vector2( 0, 18 ) [node name="BedTop" type="TileMap" parent="FG/Rooms"] -visible = false tile_set = ExtResource( 1 ) cell_size = Vector2( 30, 30 ) cell_y_sort = true @@ -233,6 +234,7 @@ 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 @@ -243,23 +245,23 @@ tile_data = PoolIntArray( 1507312, 68, 0, 1441832, 536870980, 0, 1638384, 68, 0, position = Vector2( 1353, 888 ) scale = Vector2( 1.00493, 0.995532 ) -[node name="Sit1Cat" type="Sprite" parent="FG/Rooms/BedBot/Eunsu"] -position = Vector2( -98.5142, -87.3905 ) +[node name="Bong" type="Sprite" parent="FG/Rooms/BedBot/Eunsu"] +position = Vector2( -104.485, -90.404 ) scale = Vector2( 1, 1 ) texture = ExtResource( 17 ) -[node name="BlackCat" type="Sprite" parent="FG/Rooms/BedBot/Eunsu/Sit1Cat"] +[node name="BlackCat" type="Sprite" parent="FG/Rooms/BedBot/Eunsu/Bong"] position = Vector2( 119.411, -15.0673 ) texture = ExtResource( 19 ) -[node name="Jorts" type="AnimatedSprite" parent="FG/Rooms/BedBot/Eunsu/Sit1Cat"] +[node name="Jorts" type="AnimatedSprite" parent="FG/Rooms/BedBot/Eunsu/Bong"] position = Vector2( 11.9412, 87.3904 ) frames = SubResource( 1 ) frame = 2 script = ExtResource( 22 ) [node name="Josep" parent="FG/Rooms/BedBot" instance=ExtResource( 16 )] -position = Vector2( -393, 957 ) +position = Vector2( -375, 1020 ) scale = Vector2( 1.00493, 0.995532 ) [node name="Furniture" type="TileMap" parent="FG/Rooms/BedBot"] @@ -270,6 +272,18 @@ 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 ) + +[node name="BathTop" type="TileMap" parent="FG/Rooms"] +format = 1 + +[node name="Joe" parent="FG/Rooms/BathTop" instance=ExtResource( 26 )] +position = Vector2( 1498, 378 ) + +[node name="BathBot" type="TileMap" parent="FG/Rooms"] +format = 1 + [node name="Floating" type="TileMap" parent="FG"] z_index = 1 tile_set = ExtResource( 1 ) @@ -336,6 +350,7 @@ format = 1 tile_data = PoolIntArray( 655348, 61, 0, 589848, 61, 0, 917492, 61, 0, 851992, 61, 0 ) [node name="CoverControl" type="Node2D" parent="FG"] +visible = false script = ExtResource( 14 ) [node name="Living" type="Area2D" parent="FG/CoverControl"]