From 8a20e56cb3e7931445ec18042653efb53cfa5abd Mon Sep 17 00:00:00 2001 From: dingo Date: Wed, 1 Apr 2026 17:38:49 -0400 Subject: [PATCH] Hex tiles: use affinity-coloured cylinder placeholder, no Square fallback When no Hex CDN model exists for an affinity, hex tiles now keep their coloured CylinderMesh (radial_segments=6) placeholder rather than loading a Square model or texture. Square boards are unchanged. Generated with [Claude Code](https://claude.ai/code) via [Happy](https://happy.engineering) Co-Authored-By: Claude Co-Authored-By: Happy --- Client/origin-client/scenes/game/game_screen.gd | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Client/origin-client/scenes/game/game_screen.gd b/Client/origin-client/scenes/game/game_screen.gd index d658e94..1bf2ff5 100644 --- a/Client/origin-client/scenes/game/game_screen.gd +++ b/Client/origin-client/scenes/game/game_screen.gd @@ -1201,8 +1201,7 @@ func _add_tile(x: int, y: int, affinity: String) -> void: # First roll: height (0.8-1.0 for model tiles, fixed 0.5 for placeholders). # Second roll: vertical stagger (±0.15) so the board isn't completely flat. var _shape_key_chk := "Hex" if _board_grid_type == "Hexagon" else "Square" - var has_model : bool = not ContentCache.get_tile_model_url(affinity, _shape_key_chk).is_empty() \ - or (_board_grid_type == "Hexagon" and not ContentCache.get_tile_model_url(affinity, "Square").is_empty()) + var has_model : bool = not ContentCache.get_tile_model_url(affinity, _shape_key_chk).is_empty() var rng := RandomNumberGenerator.new() rng.seed = hash("%d_%d" % [x, y]) var h : float = rng.randf_range(0.8, 1.0) if has_model else 0.5 @@ -1260,14 +1259,12 @@ func _try_load_tile_model(body: StaticBody3D, affinity: String) -> void: var want_bottom : bool = affinity != "PureVoid" var shape_key := "Hex" if _board_grid_type == "Hexagon" else "Square" var model_url := ContentCache.get_tile_model_url(affinity, shape_key) - if model_url.is_empty() and _board_grid_type == "Hexagon": - model_url = ContentCache.get_tile_model_url(affinity, "Square") if model_url.is_empty(): - # No 3D model — apply a 2D texture to the placeholder box and attach - # a stalagmite bottom so undecorated tiles still look coherent. - var tex_url := ContentCache.get_tile_texture_url(affinity, shape_key) - if tex_url.is_empty() and _board_grid_type == "Hexagon": - tex_url = ContentCache.get_tile_texture_url(affinity, "Square") + if _board_grid_type == "Hexagon": + # No hex model — keep the affinity-coloured cylinder placeholder as-is. + return + # Square: apply a 2D texture and attach a stalagmite bottom. + var tex_url := ContentCache.get_tile_texture_url(affinity, "Square") if not tex_url.is_empty(): _apply_tile_texture(body, tex_url) if want_bottom: