diff options
| author | nokoe <nokoe@mailbox.org> | 2024-06-23 00:59:05 +0200 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2024-06-23 19:31:29 +0200 |
| commit | f722ef29c49e358c0e7fb660d49e99cf0f7591fa (patch) | |
| tree | 842802cd700c0549de63b673a11555e59314c0b1 /client/scripts/tiles | |
| parent | 8709a005e81495e8c3ed2c12c1e1421e4736a258 (diff) | |
| download | hurrycurry-f722ef29c49e358c0e7fb660d49e99cf0f7591fa.tar hurrycurry-f722ef29c49e358c0e7fb660d49e99cf0f7591fa.tar.bz2 hurrycurry-f722ef29c49e358c0e7fb660d49e99cf0f7591fa.tar.zst | |
fix warnings
Diffstat (limited to 'client/scripts/tiles')
| -rw-r--r-- | client/scripts/tiles/counter.gd | 2 | ||||
| -rw-r--r-- | client/scripts/tiles/floor.gd | 2 | ||||
| -rw-r--r-- | client/scripts/tiles/flour_counter.gd | 2 | ||||
| -rw-r--r-- | client/scripts/tiles/generic_tile.gd | 18 |
4 files changed, 23 insertions, 1 deletions
diff --git a/client/scripts/tiles/counter.gd b/client/scripts/tiles/counter.gd index f4b609d5..a10f3986 100644 --- a/client/scripts/tiles/counter.gd +++ b/client/scripts/tiles/counter.gd @@ -25,7 +25,7 @@ func _init(rename: String, neighbors: Array): var edges = neighbors.duplicate() for i in range(4): var i_name = tile_name(edges[i]) - if is_counter(i_name): + if Counter.is_counter(i_name): edges[i] = "counter" else: edges[i] = tile_name(edges[i]) diff --git a/client/scripts/tiles/floor.gd b/client/scripts/tiles/floor.gd index b596895a..ba352bde 100644 --- a/client/scripts/tiles/floor.gd +++ b/client/scripts/tiles/floor.gd @@ -19,6 +19,8 @@ func _init(rename: String, _neighbors: Array): add_child(base) self.name = rename var item_base_ = Node3D.new() + # this method is supposed to be overriden + @warning_ignore("static_called_on_instance") item_base_.position = interact_target() item_base_.name = "ItemBase" base.add_child(item_base_) diff --git a/client/scripts/tiles/flour_counter.gd b/client/scripts/tiles/flour_counter.gd index 6c512d92..56dad60f 100644 --- a/client/scripts/tiles/flour_counter.gd +++ b/client/scripts/tiles/flour_counter.gd @@ -4,6 +4,8 @@ extends CounterBase func _init(rename: String, neighbors: Array): super(rename, neighbors) var bag = load("res://models/prefabs/map/bag.tscn").instantiate() + # this is supposed to be overridden + @warning_ignore("static_called_on_instance") bag.position = interact_target() bag.rotation_degrees.y = 45 base.add_child(bag) diff --git a/client/scripts/tiles/generic_tile.gd b/client/scripts/tiles/generic_tile.gd new file mode 100644 index 00000000..23b86a84 --- /dev/null +++ b/client/scripts/tiles/generic_tile.gd @@ -0,0 +1,18 @@ +class_name GenericTile +extends Floor + +func _init(rename: String, neighbors: Array, kind: String): + super(rename, neighbors) + var mesh = MeshInstance3D.new() + var text = TextMesh.new() + var mat = StandardMaterial3D.new() + text.text = kind + text.font = SystemFont.new() + text.depth = 0 + mesh.mesh = text + mesh.position.y = 1 + mesh.scale = Vector3(3, 3, 3) + mat.billboard_mode = mat.BILLBOARD_ENABLED + mat.shading_mode = BaseMaterial3D.SHADING_MODE_UNSHADED + text.material = mat + item_base.add_child(mesh) |