diff options
Diffstat (limited to 'client')
44 files changed, 236 insertions, 12 deletions
diff --git a/client/map/palette.png b/client/map/palette.png Binary files differnew file mode 100644 index 00000000..e184fe5b --- /dev/null +++ b/client/map/palette.png diff --git a/client/map/palette.png.import b/client/map/palette.png.import new file mode 100644 index 00000000..fc6946f3 --- /dev/null +++ b/client/map/palette.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dgcs4wkxsxe6a" +path.s3tc="res://.godot/imported/palette.png-3a59900c2345cc4f645d84b8df0a18e7.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://map/palette.png" +dest_files=["res://.godot/imported/palette.png-3a59900c2345cc4f645d84b8df0a18e7.s3tc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +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=0 diff --git a/client/map/tiles/chair.res b/client/map/tiles/chair.res Binary files differnew file mode 100644 index 00000000..cbf730ab --- /dev/null +++ b/client/map/tiles/chair.res diff --git a/client/map/tiles/chair.tscn b/client/map/tiles/chair.tscn new file mode 100644 index 00000000..5ba28da7 --- /dev/null +++ b/client/map/tiles/chair.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=2 format=3 uid="uid://bn1l1mcn8240o"] + +[ext_resource type="ArrayMesh" uid="uid://cwn5nt017j62d" path="res://map/tiles/chair.res" id="1_8tboh"] + +[node name="Chair" type="Node3D"] + +[node name="Mesh" type="MeshInstance3D" parent="."] +transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) +mesh = ExtResource("1_8tboh") +skeleton = NodePath("") diff --git a/client/map/tiles/counter_outer_corner.res b/client/map/tiles/counter_outer_corner.res Binary files differnew file mode 100644 index 00000000..53f0decf --- /dev/null +++ b/client/map/tiles/counter_outer_corner.res diff --git a/client/map/tiles/counter_outer_corner.tscn b/client/map/tiles/counter_outer_corner.tscn new file mode 100644 index 00000000..a24ff862 --- /dev/null +++ b/client/map/tiles/counter_outer_corner.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=2 format=3 uid="uid://blh11npblosbh"] + +[ext_resource type="ArrayMesh" uid="uid://brpeawypw3jmg" path="res://map/tiles/counter_outer_corner.res" id="1_rq22t"] + +[node name="Counter" type="Node3D"] + +[node name="Mesh" type="MeshInstance3D" parent="."] +transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) +mesh = ExtResource("1_rq22t") +skeleton = NodePath("") diff --git a/client/map/tiles/counter_straight.res b/client/map/tiles/counter_straight.res Binary files differnew file mode 100644 index 00000000..78a0cad3 --- /dev/null +++ b/client/map/tiles/counter_straight.res diff --git a/client/map/tiles/counter_straight.tscn b/client/map/tiles/counter_straight.tscn new file mode 100644 index 00000000..74517d2d --- /dev/null +++ b/client/map/tiles/counter_straight.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=2 format=3 uid="uid://cg084pjthp7tn"] + +[ext_resource type="ArrayMesh" uid="uid://btafby3tayv7r" path="res://map/tiles/counter_straight.res" id="1_5ksmf"] + +[node name="Counter" type="Node3D"] +transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) + +[node name="Mesh" type="MeshInstance3D" parent="."] +mesh = ExtResource("1_5ksmf") +skeleton = NodePath("") diff --git a/client/map/tiles/counter_straight_backsplash.res b/client/map/tiles/counter_straight_backsplash.res Binary files differnew file mode 100644 index 00000000..80845fc0 --- /dev/null +++ b/client/map/tiles/counter_straight_backsplash.res diff --git a/client/map/tiles/counter_straight_backsplash.tscn b/client/map/tiles/counter_straight_backsplash.tscn new file mode 100644 index 00000000..3490df9c --- /dev/null +++ b/client/map/tiles/counter_straight_backsplash.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=2 format=3 uid="uid://blcqlogspnah1"] + +[ext_resource type="ArrayMesh" uid="uid://cdlmrxt42emtr" path="res://map/tiles/counter_straight_backsplash.res" id="1_3t3hs"] + +[node name="Counter" type="Node3D"] +transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) + +[node name="Mesh" type="MeshInstance3D" parent="."] +mesh = ExtResource("1_3t3hs") +skeleton = NodePath("") diff --git a/client/map/tiles/cutting_board.res b/client/map/tiles/cutting_board.res Binary files differnew file mode 100644 index 00000000..15a1b5c3 --- /dev/null +++ b/client/map/tiles/cutting_board.res diff --git a/client/map/tiles/cutting_board.tscn b/client/map/tiles/cutting_board.tscn new file mode 100644 index 00000000..18d2f5a0 --- /dev/null +++ b/client/map/tiles/cutting_board.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=2 format=3 uid="uid://bslx1a7kdufde"] + +[ext_resource type="ArrayMesh" uid="uid://dd4g04lgvsly5" path="res://map/tiles/cutting_board.res" id="1_d4k2k"] + +[node name="CuttingBoard" type="Node3D"] + +[node name="Mesh" type="MeshInstance3D" parent="."] +transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0.5, 0) +mesh = ExtResource("1_d4k2k") +skeleton = NodePath("") diff --git a/client/map/tiles/door.res b/client/map/tiles/door.res Binary files differnew file mode 100644 index 00000000..ad64d5b6 --- /dev/null +++ b/client/map/tiles/door.res diff --git a/client/map/tiles/door.tscn b/client/map/tiles/door.tscn new file mode 100644 index 00000000..894d30a2 --- /dev/null +++ b/client/map/tiles/door.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=2 format=3 uid="uid://coxh3mgvch5bd"] + +[ext_resource type="ArrayMesh" uid="uid://bomlbxf33hd11" path="res://map/tiles/door.res" id="1_wfoe6"] + +[node name="Door" type="Node3D"] + +[node name="Door" type="MeshInstance3D" parent="."] +transform = Transform3D(5.96244e-09, 0, -0.5, 0, 0.5, 0, 0.5, 0, 5.96244e-09, 0, 0, 0) +mesh = ExtResource("1_wfoe6") +skeleton = NodePath("") diff --git a/client/map/tiles/floor.res b/client/map/tiles/floor.res Binary files differnew file mode 100644 index 00000000..a57ea088 --- /dev/null +++ b/client/map/tiles/floor.res diff --git a/client/map/tiles/floor.tscn b/client/map/tiles/floor.tscn new file mode 100644 index 00000000..24b12da1 --- /dev/null +++ b/client/map/tiles/floor.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=2 format=3 uid="uid://d22cslgao5jd4"] + +[ext_resource type="ArrayMesh" uid="uid://bd11w8rl78pab" path="res://map/tiles/floor.res" id="1_8pd6m"] + +[node name="Floor" type="Node3D"] + +[node name="Mesh" type="MeshInstance3D" parent="."] +transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, -0.25, 0) +mesh = ExtResource("1_8pd6m") +skeleton = NodePath("") diff --git a/client/map/tiles/full_tile.gd b/client/map/tiles/full_tile.gd index 2da54237..cc2b887b 100644 --- a/client/map/tiles/full_tile.gd +++ b/client/map/tiles/full_tile.gd @@ -17,7 +17,6 @@ class_name FullTile extends Floor var static_body = StaticBody3D.new() -var item: Node3D = null func _init(rename: String, neighbors: Array): super(rename, neighbors) @@ -37,13 +36,3 @@ static func interact_target() -> Vector3: # actions when interacting, e.g. animations func interact(): pass - -func put_item(i: Node3D): - if item != null: - push_error("already holding an item") - item = i - -func take_item() -> Node3D: - var i = item - item = null - return i diff --git a/client/map/tiles/oven.tscn b/client/map/tiles/oven.tscn new file mode 100644 index 00000000..369a1fa5 --- /dev/null +++ b/client/map/tiles/oven.tscn @@ -0,0 +1,16 @@ +[gd_scene load_steps=3 format=3 uid="uid://bil6eip7uwqvs"] + +[ext_resource type="ArrayMesh" uid="uid://blc1q50d5ky86" path="res://map/tiles/oven_base.res" id="1_d1hwl"] +[ext_resource type="ArrayMesh" uid="uid://blb5oew3sh7ek" path="res://map/tiles/oven_door.res" id="2_i5vso"] + +[node name="Oven" type="Node3D"] + +[node name="Base" type="MeshInstance3D" parent="."] +transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) +mesh = ExtResource("1_d1hwl") +skeleton = NodePath("") + +[node name="Door" type="MeshInstance3D" parent="Base"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.25, 0.43, 0.9) +mesh = ExtResource("2_i5vso") +skeleton = NodePath("") diff --git a/client/map/tiles/oven_base.res b/client/map/tiles/oven_base.res Binary files differnew file mode 100644 index 00000000..6cef2533 --- /dev/null +++ b/client/map/tiles/oven_base.res diff --git a/client/map/tiles/oven_door.res b/client/map/tiles/oven_door.res Binary files differnew file mode 100644 index 00000000..8c468117 --- /dev/null +++ b/client/map/tiles/oven_door.res diff --git a/client/map/tiles/raw_steak_crate.res b/client/map/tiles/raw_steak_crate.res Binary files differnew file mode 100644 index 00000000..afb91ff5 --- /dev/null +++ b/client/map/tiles/raw_steak_crate.res diff --git a/client/map/tiles/raw_steak_crate.tscn b/client/map/tiles/raw_steak_crate.tscn new file mode 100644 index 00000000..52a98f05 --- /dev/null +++ b/client/map/tiles/raw_steak_crate.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=2 format=3 uid="uid://cyi73ubyehy37"] + +[ext_resource type="ArrayMesh" uid="uid://bdsqnesyjl3kv" path="res://map/tiles/raw_steak_crate.res" id="1_ujg4h"] + +[node name="SteakCrate" type="Node3D"] + +[node name="Mesh" type="MeshInstance3D" parent="."] +transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) +mesh = ExtResource("1_ujg4h") +skeleton = NodePath("") diff --git a/client/map/tiles/sink.res b/client/map/tiles/sink.res Binary files differnew file mode 100644 index 00000000..dc8b2f8d --- /dev/null +++ b/client/map/tiles/sink.res diff --git a/client/map/tiles/sink.tscn b/client/map/tiles/sink.tscn new file mode 100644 index 00000000..887a6a86 --- /dev/null +++ b/client/map/tiles/sink.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=2 format=3 uid="uid://pxa0p42ojyg1"] + +[ext_resource type="ArrayMesh" uid="uid://bibdbxyp15njt" path="res://map/tiles/sink.res" id="1_w6v3o"] + +[node name="Sink" type="Node3D"] + +[node name="Mesh" type="MeshInstance3D" parent="."] +transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) +mesh = ExtResource("1_w6v3o") +skeleton = NodePath("") diff --git a/client/map/tiles/sink_backsplash.res b/client/map/tiles/sink_backsplash.res Binary files differnew file mode 100644 index 00000000..a1bec8c2 --- /dev/null +++ b/client/map/tiles/sink_backsplash.res diff --git a/client/map/tiles/sink_backsplash.tscn b/client/map/tiles/sink_backsplash.tscn new file mode 100644 index 00000000..8154023c --- /dev/null +++ b/client/map/tiles/sink_backsplash.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=2 format=3 uid="uid://ctwkcro4c528y"] + +[ext_resource type="ArrayMesh" uid="uid://rlvhl2hknvf6" path="res://map/tiles/sink_backsplash.res" id="1_bwi78"] + +[node name="Sink" type="Node3D"] + +[node name="Mesh" type="MeshInstance3D" parent="."] +transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) +mesh = ExtResource("1_bwi78") +skeleton = NodePath("") diff --git a/client/map/tiles/stove.res b/client/map/tiles/stove.res Binary files differnew file mode 100644 index 00000000..5008a897 --- /dev/null +++ b/client/map/tiles/stove.res diff --git a/client/map/tiles/stove.tscn b/client/map/tiles/stove.tscn new file mode 100644 index 00000000..c47b9a55 --- /dev/null +++ b/client/map/tiles/stove.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=2 format=3 uid="uid://gns51upjpuaf"] + +[ext_resource type="ArrayMesh" uid="uid://b343sdfdwvqne" path="res://map/tiles/stove.res" id="1_dpdf3"] + +[node name="Stove" type="Node3D"] + +[node name="Mesh" type="MeshInstance3D" parent="."] +transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) +mesh = ExtResource("1_dpdf3") +skeleton = NodePath("") diff --git a/client/map/tiles/table.res b/client/map/tiles/table.res Binary files differnew file mode 100644 index 00000000..0e4f0fa9 --- /dev/null +++ b/client/map/tiles/table.res diff --git a/client/map/tiles/table.tscn b/client/map/tiles/table.tscn new file mode 100644 index 00000000..96efc7eb --- /dev/null +++ b/client/map/tiles/table.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=2 format=3 uid="uid://ctuxsfv7rcqb4"] + +[ext_resource type="ArrayMesh" uid="uid://caf1m4egynwvn" path="res://map/tiles/table.res" id="1_ycvmt"] + +[node name="Table" type="Node3D"] +transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) + +[node name="Mesh" type="MeshInstance3D" parent="."] +mesh = ExtResource("1_ycvmt") +skeleton = NodePath("") diff --git a/client/map/tiles/tomato_crate.res b/client/map/tiles/tomato_crate.res Binary files differnew file mode 100644 index 00000000..4490208b --- /dev/null +++ b/client/map/tiles/tomato_crate.res diff --git a/client/map/tiles/tomato_crate.tscn b/client/map/tiles/tomato_crate.tscn new file mode 100644 index 00000000..999a9017 --- /dev/null +++ b/client/map/tiles/tomato_crate.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=2 format=3 uid="uid://div5vbcn10yv8"] + +[ext_resource type="ArrayMesh" uid="uid://ycxehic1fe7x" path="res://map/tiles/tomato_crate.res" id="1_2nsw8"] + +[node name="TomatoCrate" type="Node3D"] + +[node name="Mesh" type="MeshInstance3D" parent="."] +transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) +mesh = ExtResource("1_2nsw8") +skeleton = NodePath("") diff --git a/client/map/tiles/trash.res b/client/map/tiles/trash.res Binary files differnew file mode 100644 index 00000000..925af56e --- /dev/null +++ b/client/map/tiles/trash.res diff --git a/client/map/tiles/trash.tscn b/client/map/tiles/trash.tscn new file mode 100644 index 00000000..f1458277 --- /dev/null +++ b/client/map/tiles/trash.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=2 format=3 uid="uid://dab8capc4hhks"] + +[ext_resource type="ArrayMesh" uid="uid://b5jcsnrkaqnsu" path="res://map/tiles/trash.res" id="1_w302o"] + +[node name="Crate" type="Node3D"] +transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) + +[node name="Mesh" type="MeshInstance3D" parent="."] +mesh = ExtResource("1_w302o") +skeleton = NodePath("") diff --git a/client/map/tiles/wall_corner.res b/client/map/tiles/wall_corner.res Binary files differnew file mode 100644 index 00000000..f232815a --- /dev/null +++ b/client/map/tiles/wall_corner.res diff --git a/client/map/tiles/wall_corner.tscn b/client/map/tiles/wall_corner.tscn new file mode 100644 index 00000000..2229c952 --- /dev/null +++ b/client/map/tiles/wall_corner.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=2 format=3 uid="uid://ooke2w0txqvo"] + +[ext_resource type="ArrayMesh" uid="uid://bjhbhom37qena" path="res://map/tiles/wall_corner.res" id="1_8v0wt"] + +[node name="Wall" type="Node3D"] + +[node name="Mesh" type="MeshInstance3D" parent="."] +transform = Transform3D(5.96244e-09, 0, -0.5, 0, 0.5, 0, 0.5, 0, 5.96244e-09, 0, 0, 0) +mesh = ExtResource("1_8v0wt") +skeleton = NodePath("") diff --git a/client/map/tiles/wall_straight.res b/client/map/tiles/wall_straight.res Binary files differnew file mode 100644 index 00000000..61e00eea --- /dev/null +++ b/client/map/tiles/wall_straight.res diff --git a/client/map/tiles/wall_straight.tscn b/client/map/tiles/wall_straight.tscn new file mode 100644 index 00000000..cb0de6be --- /dev/null +++ b/client/map/tiles/wall_straight.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=2 format=3 uid="uid://tx8anusdso4j"] + +[ext_resource type="ArrayMesh" uid="uid://sxg6np20cvs2" path="res://map/tiles/wall_straight.res" id="1_stsuc"] + +[node name="Wall" type="Node3D"] + +[node name="Mesh" type="MeshInstance3D" parent="."] +transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) +mesh = ExtResource("1_stsuc") +skeleton = NodePath("") diff --git a/client/map/tiles/wall_t.res b/client/map/tiles/wall_t.res Binary files differnew file mode 100644 index 00000000..5de79639 --- /dev/null +++ b/client/map/tiles/wall_t.res diff --git a/client/map/tiles/wall_t.tscn b/client/map/tiles/wall_t.tscn new file mode 100644 index 00000000..a6dae2c1 --- /dev/null +++ b/client/map/tiles/wall_t.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=2 format=3 uid="uid://canjwc3qoprsp"] + +[ext_resource type="ArrayMesh" uid="uid://bysasgavbv1mj" path="res://map/tiles/wall_t.res" id="1_sb5lc"] + +[node name="Wall" type="Node3D"] + +[node name="Mesh" type="MeshInstance3D" parent="."] +transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) +mesh = ExtResource("1_sb5lc") +skeleton = NodePath("") diff --git a/client/map/tiles/wall_tile.gd b/client/map/tiles/wall_tile.gd index 7c9d4305..6cc5253a 100644 --- a/client/map/tiles/wall_tile.gd +++ b/client/map/tiles/wall_tile.gd @@ -72,3 +72,7 @@ func _init(rename: String, neighbors: Array): facing = adj[0] kind = WallKind.CROSS turn_facing(facing) + +func is_wall(_s: String): + return false # TODO + diff --git a/client/map/tiles/window.res b/client/map/tiles/window.res Binary files differnew file mode 100644 index 00000000..b2ff56f0 --- /dev/null +++ b/client/map/tiles/window.res diff --git a/client/map/tiles/window.tscn b/client/map/tiles/window.tscn new file mode 100644 index 00000000..15d0204b --- /dev/null +++ b/client/map/tiles/window.tscn @@ -0,0 +1,10 @@ +[gd_scene load_steps=2 format=3 uid="uid://mn0avehv0qtt"] + +[ext_resource type="ArrayMesh" uid="uid://ce60y0y6dqypp" path="res://map/tiles/window.res" id="1_ek3mj"] + +[node name="Window" type="Node3D"] + +[node name="Mesh" type="MeshInstance3D" parent="."] +transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) +mesh = ExtResource("1_ek3mj") +skeleton = NodePath("") diff --git a/client/player/marker.gd b/client/player/marker.gd index 6e3e6ffa..fa11ff98 100644 --- a/client/player/marker.gd +++ b/client/player/marker.gd @@ -16,7 +16,7 @@ class_name Marker extends Node3D -@onready var _cube: MeshInstance3D = $Cube +@onready var _cube: MeshInstance3D = $Cubew func set_interactive(val: bool): var mat: ShaderMaterial = _cube.get_active_material(0) |
