Merge pull request 'feature/art_update' (#40) from feature/art_update into develop
Reviewed-on: #40 Reviewed-by: Jonathan <cblech@ymail.com>pull/45/head
commit
3d19509826
|
After Width: | Height: | Size: 741 KiB |
@ -0,0 +1,40 @@
|
||||
[remap]
|
||||
|
||||
importer="texture"
|
||||
type="CompressedTexture2D"
|
||||
uid="uid://da67c7avarwq2"
|
||||
path="res://.godot/imported/kitchen_bgAssets.png-26f2820caaada75bd252a5f0e781a1f7.ctex"
|
||||
metadata={
|
||||
"vram_texture": false
|
||||
}
|
||||
|
||||
[deps]
|
||||
|
||||
source_file="res://art/indoor/kitchen_bgAssets.png"
|
||||
dest_files=["res://.godot/imported/kitchen_bgAssets.png-26f2820caaada75bd252a5f0e781a1f7.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
|
||||
@ -0,0 +1,282 @@
|
||||
[gd_scene load_steps=10 format=3 uid="uid://bvp5ju36h1vl2"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://cssdu8viimwm6" path="res://scripts/CSharp/Common/SceneTransition.cs" id="1_ftmt4"]
|
||||
[ext_resource type="Texture2D" uid="uid://da67c7avarwq2" path="res://art/indoor/kitchen_bgAssets.png" id="2_qsw8g"]
|
||||
[ext_resource type="Texture2D" uid="uid://x7trh4dgsvoe" path="res://art/indoor/room export/Room_01_assets.png" id="5_3wvmt"]
|
||||
[ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interactions/interaction_area_2d.tscn" id="7_6mpmc"]
|
||||
[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/characters/Vesna.tscn" id="25_58hm8"]
|
||||
[ext_resource type="Script" uid="uid://bqomwxclsbhd3" path="res://scripts/CSharp/Common/Camera/CameraController.cs" id="30_wqpex"]
|
||||
[ext_resource type="PackedScene" uid="uid://cgjc4wurbgimy" path="res://prefabs/UI/Inventory/Inventory.tscn" id="31_jyyyu"]
|
||||
|
||||
[sub_resource type="RectangleShape2D" id="RectangleShape2D_a2ood"]
|
||||
resource_local_to_scene = true
|
||||
size = Vector2(4757.2813, 1086)
|
||||
|
||||
[sub_resource type="CircleShape2D" id="CircleShape2D_yd2gv"]
|
||||
resource_local_to_scene = true
|
||||
radius = 300.0
|
||||
|
||||
[node name="Kitchen" type="Node2D"]
|
||||
z_index = 1
|
||||
y_sort_enabled = true
|
||||
script = ExtResource("1_ftmt4")
|
||||
_sceneNamesToLoad = PackedStringArray("res://scenes/Babushka_scene_indoor_common_room.tscn")
|
||||
|
||||
[node name="Foreground" type="Node" parent="."]
|
||||
|
||||
[node name="FrontCollider" type="StaticBody2D" parent="Foreground"]
|
||||
position = Vector2(-4344, 3056)
|
||||
scale = Vector2(2, 2)
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="Foreground/FrontCollider"]
|
||||
position = Vector2(950, -419)
|
||||
shape = SubResource("RectangleShape2D_a2ood")
|
||||
|
||||
[node name="SideColliderLeft" type="StaticBody2D" parent="."]
|
||||
position = Vector2(-4344, 3056)
|
||||
scale = Vector2(2, 2)
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="SideColliderLeft"]
|
||||
position = Vector2(-2461.1406, -1168)
|
||||
shape = SubResource("RectangleShape2D_a2ood")
|
||||
|
||||
[node name="SideColliderRight" type="StaticBody2D" parent="."]
|
||||
position = Vector2(10992, 2856)
|
||||
scale = Vector2(2, 2)
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="SideColliderRight"]
|
||||
position = Vector2(-2863.5, -1165)
|
||||
shape = SubResource("RectangleShape2D_a2ood")
|
||||
|
||||
[node name="Background" type="Node2D" parent="."]
|
||||
z_index = -100
|
||||
|
||||
[node name="Ceiling" type="Sprite2D" parent="Background"]
|
||||
z_index = -100
|
||||
position = Vector2(-2453, -1419)
|
||||
scale = Vector2(2, 2)
|
||||
texture = ExtResource("2_qsw8g")
|
||||
region_enabled = true
|
||||
region_rect = Rect2(0, 1749.6222, 3840, 358.11316)
|
||||
|
||||
[node name="WallUpper" type="Sprite2D" parent="Background"]
|
||||
z_index = -100
|
||||
position = Vector2(-2469, -969)
|
||||
scale = Vector2(26, 2)
|
||||
texture = ExtResource("2_qsw8g")
|
||||
region_enabled = true
|
||||
region_rect = Rect2(1405.1335, 120.67705, 306.53345, 90.03079)
|
||||
|
||||
[node name="Wall" type="Sprite2D" parent="Background"]
|
||||
z_index = -100
|
||||
position = Vector2(-2460, -262)
|
||||
scale = Vector2(31, 8)
|
||||
texture = ExtResource("2_qsw8g")
|
||||
region_enabled = true
|
||||
region_rect = Rect2(1755, 119, 254, 160)
|
||||
|
||||
[node name="WallDecoration" type="Sprite2D" parent="Background"]
|
||||
z_index = -20
|
||||
position = Vector2(-4498, -300)
|
||||
scale = Vector2(1.5, 1.5)
|
||||
texture = ExtResource("2_qsw8g")
|
||||
region_enabled = true
|
||||
region_rect = Rect2(820.787, 78.31859, 448.79602, 821.64185)
|
||||
|
||||
[node name="WallDecoration2" type="Sprite2D" parent="Background/WallDecoration"]
|
||||
position = Vector2(356, 0)
|
||||
texture = ExtResource("2_qsw8g")
|
||||
region_enabled = true
|
||||
region_rect = Rect2(820.787, 78.31859, 448.79602, 821.64185)
|
||||
|
||||
[node name="WallDecoration3" type="Sprite2D" parent="Background/WallDecoration"]
|
||||
position = Vector2(732, 0)
|
||||
texture = ExtResource("2_qsw8g")
|
||||
region_enabled = true
|
||||
region_rect = Rect2(820.787, 78.31859, 448.79602, 821.64185)
|
||||
|
||||
[node name="WallDecoration4" type="Sprite2D" parent="Background/WallDecoration"]
|
||||
position = Vector2(1110.6666, -3.5)
|
||||
texture = ExtResource("2_qsw8g")
|
||||
region_enabled = true
|
||||
region_rect = Rect2(820.787, 78.31859, 448.79602, 821.64185)
|
||||
|
||||
[node name="WallDecoration12" type="Sprite2D" parent="Background/WallDecoration"]
|
||||
z_index = -50
|
||||
position = Vector2(-1123.3334, 0)
|
||||
texture = ExtResource("2_qsw8g")
|
||||
region_enabled = true
|
||||
region_rect = Rect2(820.787, 78.31859, 448.79602, 821.64185)
|
||||
|
||||
[node name="WallDecoration13" type="Sprite2D" parent="Background/WallDecoration"]
|
||||
z_index = -50
|
||||
position = Vector2(-747.3334, 0)
|
||||
texture = ExtResource("2_qsw8g")
|
||||
region_enabled = true
|
||||
region_rect = Rect2(820.787, 78.31859, 448.79602, 821.64185)
|
||||
|
||||
[node name="WallDecoration14" type="Sprite2D" parent="Background/WallDecoration"]
|
||||
z_index = -50
|
||||
position = Vector2(-368.66675, -3.5)
|
||||
texture = ExtResource("2_qsw8g")
|
||||
region_enabled = true
|
||||
region_rect = Rect2(820.787, 78.31859, 448.79602, 821.64185)
|
||||
|
||||
[node name="WallDecoration5" type="Sprite2D" parent="Background/WallDecoration"]
|
||||
position = Vector2(1486.6666, -3.5)
|
||||
texture = ExtResource("2_qsw8g")
|
||||
region_enabled = true
|
||||
region_rect = Rect2(820.787, 78.31859, 448.79602, 821.64185)
|
||||
|
||||
[node name="WallDecoration6" type="Sprite2D" parent="Background/WallDecoration"]
|
||||
position = Vector2(1854, 6)
|
||||
texture = ExtResource("2_qsw8g")
|
||||
region_enabled = true
|
||||
region_rect = Rect2(820.787, 78.31859, 448.79602, 821.64185)
|
||||
|
||||
[node name="WallDecoration7" type="Sprite2D" parent="Background/WallDecoration"]
|
||||
position = Vector2(2230, 6)
|
||||
texture = ExtResource("2_qsw8g")
|
||||
region_enabled = true
|
||||
region_rect = Rect2(820.787, 78.31859, 448.79602, 821.64185)
|
||||
|
||||
[node name="WallDecoration8" type="Sprite2D" parent="Background/WallDecoration"]
|
||||
position = Vector2(2608.6665, 2.5)
|
||||
texture = ExtResource("2_qsw8g")
|
||||
region_enabled = true
|
||||
region_rect = Rect2(820.787, 78.31859, 448.79602, 821.64185)
|
||||
|
||||
[node name="WallDecoration9" type="Sprite2D" parent="Background/WallDecoration"]
|
||||
position = Vector2(2984.6665, 2.5)
|
||||
texture = ExtResource("2_qsw8g")
|
||||
region_enabled = true
|
||||
region_rect = Rect2(820.787, 78.31859, 448.79602, 821.64185)
|
||||
|
||||
[node name="WallDecoration10" type="Sprite2D" parent="Background/WallDecoration"]
|
||||
position = Vector2(3333.9998, 2.6666667)
|
||||
texture = ExtResource("2_qsw8g")
|
||||
region_enabled = true
|
||||
region_rect = Rect2(820.787, 78.31859, 448.79602, 821.64185)
|
||||
|
||||
[node name="WallDecoration11" type="Sprite2D" parent="Background/WallDecoration"]
|
||||
position = Vector2(3698, 2.6666667)
|
||||
texture = ExtResource("2_qsw8g")
|
||||
region_enabled = true
|
||||
region_rect = Rect2(820.787, 78.31859, 448.79602, 821.64185)
|
||||
|
||||
[node name="Floor" type="Sprite2D" parent="Background"]
|
||||
z_index = -10
|
||||
position = Vector2(-2431, 670)
|
||||
scale = Vector2(2, 1)
|
||||
texture = ExtResource("2_qsw8g")
|
||||
region_enabled = true
|
||||
region_rect = Rect2(0, 2246, 3840, 912)
|
||||
|
||||
[node name="Room01DoorL" type="Sprite2D" parent="Background"]
|
||||
position = Vector2(-4000, -221)
|
||||
texture = ExtResource("2_qsw8g")
|
||||
region_enabled = true
|
||||
region_rect = Rect2(92, 458, 641, 1050)
|
||||
|
||||
[node name="CommonRoomDoor" parent="Background/Room01DoorL" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("7_6mpmc")]
|
||||
_spritesToOutline = [NodePath("..")]
|
||||
_id = 0
|
||||
|
||||
[node name="CollisionShape3D" parent="Background/Room01DoorL/CommonRoomDoor/Area2D" index="0"]
|
||||
shape = SubResource("CircleShape2D_yd2gv")
|
||||
|
||||
[node name="BackwallCollider" type="StaticBody2D" parent="Background"]
|
||||
position = Vector2(-4368, 40)
|
||||
scale = Vector2(2, 2)
|
||||
|
||||
[node name="CollisionShape2D" type="CollisionShape2D" parent="Background/BackwallCollider"]
|
||||
position = Vector2(950, -419)
|
||||
shape = SubResource("RectangleShape2D_a2ood")
|
||||
|
||||
[node name="Vesna" parent="." instance=ExtResource("25_58hm8")]
|
||||
y_sort_enabled = false
|
||||
position = Vector2(-1971, 319)
|
||||
|
||||
[node name="Camera2D" type="Camera2D" parent="." node_paths=PackedStringArray("_followNode")]
|
||||
position = Vector2(-1534, -29)
|
||||
offset = Vector2(0, -200)
|
||||
zoom = Vector2(0.5, 0.5)
|
||||
limit_left = -4500
|
||||
limit_top = -1050
|
||||
limit_right = 500
|
||||
limit_bottom = 1150
|
||||
editor_draw_limits = true
|
||||
script = ExtResource("30_wqpex")
|
||||
_followNode = NodePath("../Vesna/CharacterBody2D")
|
||||
|
||||
[node name="CanvasLayer" parent="." instance=ExtResource("31_jyyyu")]
|
||||
|
||||
[node name="BackItems" type="Node2D" parent="."]
|
||||
|
||||
[node name="cupboard" type="Sprite2D" parent="BackItems"]
|
||||
z_index = -10
|
||||
position = Vector2(-2071, 114)
|
||||
texture = ExtResource("2_qsw8g")
|
||||
region_enabled = true
|
||||
region_rect = Rect2(1359, 440, 1591, 401)
|
||||
|
||||
[node name="wallshelf" type="Sprite2D" parent="BackItems"]
|
||||
z_index = -10
|
||||
position = Vector2(-1708, -335)
|
||||
texture = ExtResource("2_qsw8g")
|
||||
region_enabled = true
|
||||
region_rect = Rect2(3037, 440, 701, 170)
|
||||
|
||||
[node name="wallshelf2" type="Sprite2D" parent="BackItems/wallshelf"]
|
||||
z_index = -10
|
||||
position = Vector2(-700, 0)
|
||||
texture = ExtResource("2_qsw8g")
|
||||
flip_h = true
|
||||
region_enabled = true
|
||||
region_rect = Rect2(3037, 440, 701, 170)
|
||||
|
||||
[node name="vase" type="Sprite2D" parent="BackItems/wallshelf"]
|
||||
z_index = -10
|
||||
y_sort_enabled = true
|
||||
position = Vector2(42, 124)
|
||||
texture = ExtResource("5_3wvmt")
|
||||
offset = Vector2(0, -296)
|
||||
region_enabled = true
|
||||
region_rect = Rect2(2748, 432, 174, 191)
|
||||
|
||||
[node name="FrontItems" type="Node2D" parent="."]
|
||||
z_index = 50
|
||||
|
||||
[node name="Stove" type="Sprite2D" parent="FrontItems"]
|
||||
position = Vector2(-2482, 926)
|
||||
texture = ExtResource("2_qsw8g")
|
||||
region_enabled = true
|
||||
region_rect = Rect2(823, 1105, 734, 420)
|
||||
|
||||
[node name="Fireleft" type="Sprite2D" parent="FrontItems/Stove"]
|
||||
position = Vector2(-189, -238)
|
||||
texture = ExtResource("2_qsw8g")
|
||||
region_enabled = true
|
||||
region_rect = Rect2(928.24866, 976.94073, 145.9801, 78.52728)
|
||||
|
||||
[node name="FireRight" type="Sprite2D" parent="FrontItems/Stove"]
|
||||
position = Vector2(191, -240)
|
||||
texture = ExtResource("2_qsw8g")
|
||||
region_enabled = true
|
||||
region_rect = Rect2(1278.6433, 986.7815, 213.37354, 67.61841)
|
||||
|
||||
[node name="Firetoggle" parent="FrontItems/Stove" node_paths=PackedStringArray("_spritesToOutline") instance=ExtResource("7_6mpmc")]
|
||||
_spritesToOutline = [NodePath("..")]
|
||||
|
||||
[node name="Counter" type="Sprite2D" parent="FrontItems"]
|
||||
position = Vector2(-1388, 921)
|
||||
texture = ExtResource("2_qsw8g")
|
||||
region_enabled = true
|
||||
region_rect = Rect2(1599, 1107, 1351, 418)
|
||||
|
||||
[connection signal="InteractedTool" from="Background/Room01DoorL/CommonRoomDoor" to="." method="LoadSceneAtIndex"]
|
||||
[connection signal="Interacted" from="FrontItems/Stove/Firetoggle" to="FrontItems/Stove/Fireleft" method="hide"]
|
||||
[connection signal="Interacted" from="FrontItems/Stove/Firetoggle" to="FrontItems/Stove/FireRight" method="hide"]
|
||||
|
||||
[editable path="Background/Room01DoorL/CommonRoomDoor"]
|
||||
[editable path="Vesna"]
|
||||
Loading…
Reference in new issue