diff --git a/scenes/bed/assets/bed.aseprite b/scenes/bed/assets/bed.aseprite new file mode 100644 index 0000000..8f16ae2 Binary files /dev/null and b/scenes/bed/assets/bed.aseprite differ diff --git a/scenes/bed/assets/bed.aseprite.import b/scenes/bed/assets/bed.aseprite.import new file mode 100644 index 0000000..3ae8803 --- /dev/null +++ b/scenes/bed/assets/bed.aseprite.import @@ -0,0 +1,20 @@ +[remap] + +importer="aseprite_wizard.plugin.static-texture" +type="PortableCompressedTexture2D" +uid="uid://b6kqx81h1kpql" +path="res://.godot/imported/bed.aseprite-41496986a4e64ed96c5c25382ceb0d93.res" + +[deps] + +source_file="res://scenes/bed/assets/bed.aseprite" +dest_files=["res://.godot/imported/bed.aseprite-41496986a4e64ed96c5c25382ceb0d93.res"] + +[params] + +layer/exclude_layers_pattern="" +layer/only_visible_layers=false +first_frame_only=true +sheet/sheet_type="packed" +sheet/sheet_columns=12 +sheet/scale=1 diff --git a/scenes/bed/assets/bed.pixelover b/scenes/bed/assets/bed.pixelover new file mode 100644 index 0000000..cc444b4 Binary files /dev/null and b/scenes/bed/assets/bed.pixelover differ diff --git a/scenes/bed/assets/bed_export.png b/scenes/bed/assets/bed_export.png new file mode 100644 index 0000000..29f4953 Binary files /dev/null and b/scenes/bed/assets/bed_export.png differ diff --git a/scenes/bed/assets/bed_export.png.import b/scenes/bed/assets/bed_export.png.import new file mode 100644 index 0000000..a6b6ee9 --- /dev/null +++ b/scenes/bed/assets/bed_export.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ca63jngtw3jka" +path="res://.godot/imported/bed_export.png-ed75e67ebe92e964a41aae297ea4d98a.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://scenes/bed/assets/bed_export.png" +dest_files=["res://.godot/imported/bed_export.png-ed75e67ebe92e964a41aae297ea4d98a.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/scenes/bed/assets/bed_n.png b/scenes/bed/assets/bed_n.png new file mode 100644 index 0000000..769bd3d Binary files /dev/null and b/scenes/bed/assets/bed_n.png differ diff --git a/scenes/bed/assets/bed_n.png.import b/scenes/bed/assets/bed_n.png.import new file mode 100644 index 0000000..a5b87eb --- /dev/null +++ b/scenes/bed/assets/bed_n.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dv6eeiat64s4r" +path="res://.godot/imported/bed_n.png-5065a14368e2ca7e64e84e9a43785cc2.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://scenes/bed/assets/bed_n.png" +dest_files=["res://.godot/imported/bed_n.png-5065a14368e2ca7e64e84e9a43785cc2.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/scenes/bed/assets/bed_normal.laigter b/scenes/bed/assets/bed_normal.laigter new file mode 100644 index 0000000..5195ccc Binary files /dev/null and b/scenes/bed/assets/bed_normal.laigter differ diff --git a/scenes/bed/assets/bed_o.png b/scenes/bed/assets/bed_o.png new file mode 100644 index 0000000..6864dbd Binary files /dev/null and b/scenes/bed/assets/bed_o.png differ diff --git a/scenes/bed/assets/bed_o.png.import b/scenes/bed/assets/bed_o.png.import new file mode 100644 index 0000000..2d82e67 --- /dev/null +++ b/scenes/bed/assets/bed_o.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c7aqn7cwyn8lk" +path="res://.godot/imported/bed_o.png-880a287f3d9c078b89996373122dac81.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://scenes/bed/assets/bed_o.png" +dest_files=["res://.godot/imported/bed_o.png-880a287f3d9c078b89996373122dac81.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/scenes/bed/assets/bed_s.png b/scenes/bed/assets/bed_s.png new file mode 100644 index 0000000..1cb58f5 Binary files /dev/null and b/scenes/bed/assets/bed_s.png differ diff --git a/scenes/bed/assets/bed_s.png.import b/scenes/bed/assets/bed_s.png.import new file mode 100644 index 0000000..f59f271 --- /dev/null +++ b/scenes/bed/assets/bed_s.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bahmkvceso40p" +path="res://.godot/imported/bed_s.png-f510bf4866bf64f3d4d893e61b5a21a9.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://scenes/bed/assets/bed_s.png" +dest_files=["res://.godot/imported/bed_s.png-f510bf4866bf64f3d4d893e61b5a21a9.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/scenes/bed/bed.tscn b/scenes/bed/bed.tscn new file mode 100644 index 0000000..cddc8a8 --- /dev/null +++ b/scenes/bed/bed.tscn @@ -0,0 +1,53 @@ +[gd_scene load_steps=6 format=3 uid="uid://brkv032w3gyfo"] + +[ext_resource type="Script" uid="uid://ccawks66thcw2" path="res://classes/room_object/room_object.gd" id="1_5prx0"] +[ext_resource type="Texture2D" uid="uid://b6kqx81h1kpql" path="res://scenes/bed/assets/bed.aseprite" id="2_w6piv"] +[ext_resource type="Texture2D" uid="uid://dv6eeiat64s4r" path="res://scenes/bed/assets/bed_n.png" id="3_ayy0y"] + +[sub_resource type="CanvasTexture" id="CanvasTexture_opn68"] +diffuse_texture = ExtResource("2_w6piv") +normal_texture = ExtResource("3_ayy0y") + +[sub_resource type="CircleShape2D" id="CircleShape2D_ayy0y"] +radius = 32.0 + +[node name="Bed" type="Node2D"] +z_index = 1 +script = ExtResource("1_5prx0") +metadata/_custom_type_script = "uid://ccawks66thcw2" + +[node name="StaticBody2D" type="StaticBody2D" parent="."] +collision_layer = 4 +collision_mask = 0 + +[node name="Sprite2D" type="Sprite2D" parent="StaticBody2D"] +position = Vector2(0, -24) +texture = SubResource("CanvasTexture_opn68") +metadata/_aseprite_wizard_interface_config_ = { +"animation_section": true, +"layer_section": true, +"output_section": true, +"pending_changes": { +"convert_fps_field": 60.0, +"convert_ms_field": 16.0, +"convert_to_fps": false, +"embed_tex": true, +"i_mode": 0, +"keep_anim_length": false, +"layers": [], +"o_ex_p": "", +"o_folder": "", +"o_name": "", +"only_visible": false, +"player": "", +"scale": "1.0", +"slice": "", +"source": "res://scenes/bed/assets/bed.aseprite", +"source_uid": 4583932932945451959 +}, +"slice_section": true +} + +[node name="CollisionShape2D" type="CollisionShape2D" parent="StaticBody2D"] +position = Vector2(0, -24) +shape = SubResource("CircleShape2D_ayy0y") diff --git a/scenes/player/player.tscn b/scenes/player/player.tscn index 3f25747..6b5f247 100644 --- a/scenes/player/player.tscn +++ b/scenes/player/player.tscn @@ -9,6 +9,21 @@ [ext_resource type="Texture2D" uid="uid://5mm8pi5i0yal" path="res://scenes/player/assets/pointlight_texture.aseprite" id="5_75vfm"] [ext_resource type="Script" uid="uid://cgiphcl4t75v8" path="res://scenes/player/states/player_paused.gd" id="6_qek5x"] +[sub_resource type="Animation" id="Animation_0owmy"] +length = 0.001 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("PointLight2D:offset:y") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [-15.0] +} + [sub_resource type="Animation" id="Animation_75vfm"] resource_name = "default" loop_mode = 1 @@ -25,21 +40,6 @@ tracks/0/keys = { "values": [-14.0, -15.0] } -[sub_resource type="Animation" id="Animation_0owmy"] -length = 0.001 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("PointLight2D:offset:y") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [-15.0] -} - [sub_resource type="AnimationLibrary" id="AnimationLibrary_qek5x"] _data = { &"RESET": SubResource("Animation_0owmy"), @@ -52,7 +52,7 @@ height = 14.0 [node name="Player" type="CharacterBody2D"] z_index = 1 -collision_mask = 2 +collision_mask = 6 motion_mode = 1 script = ExtResource("1_dovo2") max_speed = 85.0 diff --git a/scenes/worlds/yukotsukis_room/yukotsukis_room_config.tres b/scenes/worlds/yukotsukis_room/yukotsukis_room_config.tres index 7e62090..3aa8781 100644 --- a/scenes/worlds/yukotsukis_room/yukotsukis_room_config.tres +++ b/scenes/worlds/yukotsukis_room/yukotsukis_room_config.tres @@ -5,10 +5,8 @@ [resource] script = ExtResource("1_vlksg") initial_spawn = Vector2i(85, 225) -enable_point_light = true point_light_energy = 0.4 follow_player = false camera_position = Vector2i(160, 120) -enable_canvas_modulate = true modulate_color = Color(0.35156274, 0.35156295, 0.35156283, 1) metadata/_custom_type_script = "uid://bamoq5wi0lkdy"