aboutsummaryrefslogtreecommitdiff
path: root/client/map
diff options
context:
space:
mode:
Diffstat (limited to 'client/map')
-rw-r--r--client/map/map.gd4
-rw-r--r--client/map/tiles/chair.gd2
-rw-r--r--client/map/tiles/counter_base.gd6
-rw-r--r--client/map/tiles/cutting_board.gd2
-rw-r--r--client/map/tiles/door.gd2
-rw-r--r--client/map/tiles/floor.gd2
-rw-r--r--client/map/tiles/oven.gd2
-rw-r--r--client/map/tiles/raw_steak_crate.gd2
-rw-r--r--client/map/tiles/sink.gd6
-rw-r--r--client/map/tiles/stove.gd2
-rw-r--r--client/map/tiles/table.gd2
-rw-r--r--client/map/tiles/tomato_crate.gd2
-rw-r--r--client/map/tiles/trash.gd2
-rw-r--r--client/map/tiles/wall.gd8
-rw-r--r--client/map/tiles/wall_corner.tscn2
-rw-r--r--client/map/tiles/wall_straight.tscn2
-rw-r--r--client/map/tiles/wall_t.tscn2
-rw-r--r--client/map/tiles/window.gd4
-rw-r--r--client/map/tiles/window.tscn2
19 files changed, 27 insertions, 29 deletions
diff --git a/client/map/map.gd b/client/map/map.gd
index c027fd4a..1155a70c 100644
--- a/client/map/map.gd
+++ b/client/map/map.gd
@@ -15,15 +15,13 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
#
-@tool
class_name Map
extends Node3D
var tile_by_pos: Dictionary = {}
func _ready():
- if !Engine.is_editor_hint():
- Multiplayer.connect("update_map", update)
+ Multiplayer.connect("update_map", update)
func update(pos, tile_name, neighbors):
var instance: Floor
diff --git a/client/map/tiles/chair.gd b/client/map/tiles/chair.gd
index 34735fda..a821ac80 100644
--- a/client/map/tiles/chair.gd
+++ b/client/map/tiles/chair.gd
@@ -18,7 +18,7 @@ extends Floor
func _init(rename: String, neighbors: Array):
super(rename, neighbors)
- var chair = load("res://models/prefabs/map/chair_A.tscn").instantiate()
+ var chair = load("res://map/tiles/chair.tscn").instantiate()
var facing = 0;
for i in range(4):
if tile_name(neighbors[i]) == "table":
diff --git a/client/map/tiles/counter_base.gd b/client/map/tiles/counter_base.gd
index a4eb6864..13c78799 100644
--- a/client/map/tiles/counter_base.gd
+++ b/client/map/tiles/counter_base.gd
@@ -20,8 +20,8 @@ func _init(rename: String, neighbors: Array):
super(rename, neighbors)
match kind:
CounterKind.OUTER_CORNER:
- base.add_child(load("res://map/tiles/counter_outer_corner.res").instantiate())
+ base.add_child(load("res://map/tiles/counter_outer_corner.tscn").instantiate())
CounterKind.STRAIGHT:
- base.add_child(load("res://map/tiles/counter_straight.res").instantiate())
+ base.add_child(load("res://map/tiles/counter_straight.tscn").instantiate())
CounterKind.STRAIGHT_BACKSPLASH:
- base.add_child(load("res://tiles/counter_straight_backsplash.tscn").instantiate())
+ base.add_child(load("res://map/tiles/counter_straight_backsplash.tscn").instantiate())
diff --git a/client/map/tiles/cutting_board.gd b/client/map/tiles/cutting_board.gd
index 098cc06c..cadfccfa 100644
--- a/client/map/tiles/cutting_board.gd
+++ b/client/map/tiles/cutting_board.gd
@@ -18,4 +18,4 @@ extends CounterBase
func _init(rename: String, neighbors: Array):
super(rename, neighbors)
- base.add_child(load("res://map/cutting_board.tscn").instantiate())
+ base.add_child(load("res://map/tiles/cutting_board.tscn").instantiate())
diff --git a/client/map/tiles/door.gd b/client/map/tiles/door.gd
index d3f977ad..79f6ee85 100644
--- a/client/map/tiles/door.gd
+++ b/client/map/tiles/door.gd
@@ -23,5 +23,5 @@ func _init(rename: String, neighbors: Array):
for i in range(4):
if tile_name(neighbors[i]) == "door":
facing = i % 4
- base.add_child(load("res://map/door.tscn").instantiate())
+ base.add_child(load("res://map/tiles/door.tscn").instantiate())
turn_facing(facing)
diff --git a/client/map/tiles/floor.gd b/client/map/tiles/floor.gd
index 69a347db..2433849d 100644
--- a/client/map/tiles/floor.gd
+++ b/client/map/tiles/floor.gd
@@ -28,7 +28,7 @@ enum Facing {
}
func _init(rename: String, _neighbors: Array):
- var floor_tile = load("res://map/floor.tscn").instantiate()
+ var floor_tile = load("res://map/tiles/floor.tscn").instantiate()
floor_tile.position += Vector3(0.5, 0, 0.5)
add_child(floor_tile)
base.name = "Base"
diff --git a/client/map/tiles/oven.gd b/client/map/tiles/oven.gd
index e68e809c..59d734e1 100644
--- a/client/map/tiles/oven.gd
+++ b/client/map/tiles/oven.gd
@@ -18,4 +18,4 @@ extends Counter
func _init(rename: String, neighbors: Array):
super(rename, neighbors)
- base.add_child(load("res://map/oven.tscn").instantiate())
+ base.add_child(load("res://map/tiles/oven.tscn").instantiate())
diff --git a/client/map/tiles/raw_steak_crate.gd b/client/map/tiles/raw_steak_crate.gd
index 6287271b..b7057cc3 100644
--- a/client/map/tiles/raw_steak_crate.gd
+++ b/client/map/tiles/raw_steak_crate.gd
@@ -18,4 +18,4 @@ extends Crate
func _init(rename: String, neighbors: Array):
super(rename, neighbors)
- base.add_child(load("res://map/raw_steak_crate.tscn").instantiate())
+ base.add_child(load("res://map/tiles/raw_steak_crate.tscn").instantiate())
diff --git a/client/map/tiles/sink.gd b/client/map/tiles/sink.gd
index 145c97c9..d1f4b5f2 100644
--- a/client/map/tiles/sink.gd
+++ b/client/map/tiles/sink.gd
@@ -20,8 +20,8 @@ func _init(rename: String, neighbors: Array):
super(rename, neighbors)
match kind:
CounterKind.STRAIGHT:
- base.add_child(load("res://map/sink.tscn").instantiate())
+ base.add_child(load("res://map/tiles/sink.tscn").instantiate())
CounterKind.STRAIGHT_BACKSPLASH:
- base.add_child(load("res://map/sink_backsplash.tscn").instantiate())
+ base.add_child(load("res://map/tiles/sink_backsplash.tscn").instantiate())
_:
- base.add_child(load("res://map/sink.tscn").instantiate())
+ base.add_child(load("res://map/tiles/sink.tscn").instantiate())
diff --git a/client/map/tiles/stove.gd b/client/map/tiles/stove.gd
index 45204964..216129fb 100644
--- a/client/map/tiles/stove.gd
+++ b/client/map/tiles/stove.gd
@@ -18,4 +18,4 @@ extends Counter
func _init(rename: String, neighbors: Array):
super(rename, neighbors)
- base.add_child(load("res://map/stove.tscn").instantiate())
+ base.add_child(load("res://map/tiles/stove.tscn").instantiate())
diff --git a/client/map/tiles/table.gd b/client/map/tiles/table.gd
index 3446991d..e62e88fc 100644
--- a/client/map/tiles/table.gd
+++ b/client/map/tiles/table.gd
@@ -18,4 +18,4 @@ extends FullTile
func _init(rename: String, neighbors: Array):
super(rename, neighbors)
- base.add_child(load("res://map/table.tscn").instantiate())
+ base.add_child(load("res://map/tiles/table.tscn").instantiate())
diff --git a/client/map/tiles/tomato_crate.gd b/client/map/tiles/tomato_crate.gd
index 876588da..9d5cfbe9 100644
--- a/client/map/tiles/tomato_crate.gd
+++ b/client/map/tiles/tomato_crate.gd
@@ -18,4 +18,4 @@ extends Crate
func _init(rename: String, neighbors: Array):
super(rename, neighbors)
- base.add_child(load("res://map/tomato_crate.tscn").instantiate())
+ base.add_child(load("res://map/tiles/tomato_crate.tscn").instantiate())
diff --git a/client/map/tiles/trash.gd b/client/map/tiles/trash.gd
index b156c366..99947742 100644
--- a/client/map/tiles/trash.gd
+++ b/client/map/tiles/trash.gd
@@ -18,4 +18,4 @@ extends Crate
func _init(rename: String, neighbors: Array):
super(rename, neighbors)
- base.add_child(load("res://models/prefabs/map/trash.tscn").instantiate())
+ base.add_child(load("res://map/tiles/trash.tscn").instantiate())
diff --git a/client/map/tiles/wall.gd b/client/map/tiles/wall.gd
index 21e28843..8be8df20 100644
--- a/client/map/tiles/wall.gd
+++ b/client/map/tiles/wall.gd
@@ -20,10 +20,10 @@ func _init(rename: String, neighbors: Array):
super(rename, neighbors)
match kind:
WallKind.STRAIGHT:
- base.add_child(load("res://map/wall_straight.tscn").instantiate())
+ base.add_child(load("res://map/tiles/wall_straight.tscn").instantiate())
WallKind.OUTER_CORNER:
- base.add_child(load("res://map/wall_corner.tscn").instantiate())
+ base.add_child(load("res://map/tiles/wall_corner.tscn").instantiate())
WallKind.T:
- base.add_child(load("res://map/wall_t.tscn").instantiate())
+ base.add_child(load("res://map/tiles/wall_t.tscn").instantiate())
WallKind.CROSS:
- base.add_child(load("res://map/wall_cross.tscn").instantiate())
+ base.add_child(load("res://map/tiles/wall_cross.tscn").instantiate())
diff --git a/client/map/tiles/wall_corner.tscn b/client/map/tiles/wall_corner.tscn
index 2229c952..a158a119 100644
--- a/client/map/tiles/wall_corner.tscn
+++ b/client/map/tiles/wall_corner.tscn
@@ -5,6 +5,6 @@
[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)
+transform = Transform3D(-2.18557e-08, 0, 0.5, 0, 0.5, 0, -0.5, 0, -2.18557e-08, 0, 0, 0)
mesh = ExtResource("1_8v0wt")
skeleton = NodePath("")
diff --git a/client/map/tiles/wall_straight.tscn b/client/map/tiles/wall_straight.tscn
index cb0de6be..0de536b8 100644
--- a/client/map/tiles/wall_straight.tscn
+++ b/client/map/tiles/wall_straight.tscn
@@ -5,6 +5,6 @@
[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)
+transform = Transform3D(-2.18557e-08, 0, 0.5, 0, 0.5, 0, -0.5, 0, -2.18557e-08, 0, 0, 0)
mesh = ExtResource("1_stsuc")
skeleton = NodePath("")
diff --git a/client/map/tiles/wall_t.tscn b/client/map/tiles/wall_t.tscn
index a6dae2c1..9d390517 100644
--- a/client/map/tiles/wall_t.tscn
+++ b/client/map/tiles/wall_t.tscn
@@ -5,6 +5,6 @@
[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)
+transform = Transform3D(5.96244e-09, 0, -0.5, 0, 0.5, 0, 0.5, 0, 5.96244e-09, 0, 0, 0)
mesh = ExtResource("1_sb5lc")
skeleton = NodePath("")
diff --git a/client/map/tiles/window.gd b/client/map/tiles/window.gd
index 7747bbcd..b3e7c478 100644
--- a/client/map/tiles/window.gd
+++ b/client/map/tiles/window.gd
@@ -23,7 +23,7 @@ func _init(rename: String, neighbors: Array):
super(rename, neighbors)
match kind:
WallKind.STRAIGHT:
- base.add_child(load("res://map/window.tscn").instantiate())
+ base.add_child(load("res://map/tiles/window.tscn").instantiate())
WallKind.OUTER_CORNER:
push_warning("There is no corner window!")
- base.add_child(load("res://map/window.tscn").instantiate())
+ base.add_child(load("res://map/tiles/window.tscn").instantiate())
diff --git a/client/map/tiles/window.tscn b/client/map/tiles/window.tscn
index 15d0204b..b2db9c74 100644
--- a/client/map/tiles/window.tscn
+++ b/client/map/tiles/window.tscn
@@ -5,6 +5,6 @@
[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)
+transform = Transform3D(-2.18557e-08, 0, 0.5, 0, 0.5, 0, -0.5, 0, -2.18557e-08, 0, 0, 0)
mesh = ExtResource("1_ek3mj")
skeleton = NodePath("")
generated by cgit v1.2.3-70-g09d2 (git 2.51.0) at 2025-10-08 08:27:45 +0000