Deployment script update

MainMenu.tscn

@@ -1,7 +1,7 @@
-[gd_scene load_steps=5 format=3 uid="uid://bmnmenu0intr1"]
+[gd_scene format=3 uid="uid://bmnmenu0intr1"]
 
-[ext_resource type="Script" path="res://main_menu.gd" id="1_menu"]
+[ext_resource type="Script" uid="uid://46y10alai56q" path="res://main_menu.gd" id="1_menu"]
-[ext_resource type="VideoStream" path="res://Assets/intro_bg.ogv" id="2_video"]
+[ext_resource type="VideoStream" uid="uid://csxxlnq74fej4" path="res://Assets/intro_bg.ogv" id="2_video"]
 
 [sub_resource type="StyleBoxFlat" id="sb_normal"]
 content_margin_left = 16.0
@@ -30,7 +30,7 @@ corner_radius_top_right = 8
 corner_radius_bottom_right = 8
 corner_radius_bottom_left = 8
 
-[node name="MainMenu" type="Control"]
+[node name="MainMenu" type="Control" unique_id=371457725]
 layout_mode = 3
 anchors_preset = 15
 anchor_right = 1.0
@@ -39,7 +39,7 @@ grow_horizontal = 2
 grow_vertical = 2
 script = ExtResource("1_menu")
 
-[node name="VideoStreamPlayer" type="VideoStreamPlayer" parent="."]
+[node name="VideoStreamPlayer" type="VideoStreamPlayer" parent="." unique_id=374854265]
 layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
@@ -49,7 +49,7 @@ grow_vertical = 2
 stream = ExtResource("2_video")
 expand = true
 
-[node name="MainPanel" type="Control" parent="."]
+[node name="MainPanel" type="Control" parent="." unique_id=1263320918]
 layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
@@ -57,11 +57,12 @@ anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 
-[node name="PlayButton" type="Button" parent="MainPanel"]
+[node name="PlayButton" type="Button" parent="MainPanel" unique_id=743089847]
 layout_mode = 1
-anchor_left = 0.4530
+anchors_preset = -1
+anchor_left = 0.453
 anchor_top = 0.6513
-anchor_right = 0.4530
+anchor_right = 0.453
 anchor_bottom = 0.6513
 offset_left = -120.0
 offset_top = -55.0
@@ -74,13 +75,14 @@ theme_override_colors/font_outline_color = Color(0, 0, 0, 1)
 theme_override_constants/outline_size = 8
 theme_override_font_sizes/font_size = 56
 theme_override_styles/normal = SubResource("sb_normal")
-theme_override_styles/hover = SubResource("sb_hover")
 theme_override_styles/pressed = SubResource("sb_hover")
+theme_override_styles/hover = SubResource("sb_hover")
 theme_override_styles/focus = SubResource("sb_hover")
 text = "PLAY"
 
-[node name="OptionsButton" type="Button" parent="MainPanel"]
+[node name="OptionsButton" type="Button" parent="MainPanel" unique_id=673211179]
 layout_mode = 1
+anchors_preset = -1
 anchor_left = 0.11
 anchor_top = 0.94
 anchor_right = 0.11
@@ -96,13 +98,14 @@ theme_override_colors/font_outline_color = Color(0, 0, 0, 1)
 theme_override_constants/outline_size = 6
 theme_override_font_sizes/font_size = 30
 theme_override_styles/normal = SubResource("sb_normal")
-theme_override_styles/hover = SubResource("sb_hover")
 theme_override_styles/pressed = SubResource("sb_hover")
+theme_override_styles/hover = SubResource("sb_hover")
 theme_override_styles/focus = SubResource("sb_hover")
 text = "OPTIONS"
 
-[node name="CreditsButton" type="Button" parent="MainPanel"]
+[node name="CreditsButton" type="Button" parent="MainPanel" unique_id=882339461]
 layout_mode = 1
+anchors_preset = -1
 anchor_left = 0.489
 anchor_top = 0.951
 anchor_right = 0.489
@@ -118,13 +121,14 @@ theme_override_colors/font_outline_color = Color(0, 0, 0, 1)
 theme_override_constants/outline_size = 6
 theme_override_font_sizes/font_size = 30
 theme_override_styles/normal = SubResource("sb_normal")
-theme_override_styles/hover = SubResource("sb_hover")
 theme_override_styles/pressed = SubResource("sb_hover")
+theme_override_styles/hover = SubResource("sb_hover")
 theme_override_styles/focus = SubResource("sb_hover")
 text = "CREDITS"
 
-[node name="ExitButton" type="Button" parent="MainPanel"]
+[node name="ExitButton" type="Button" parent="MainPanel" unique_id=1064586744]
 layout_mode = 1
+anchors_preset = -1
 anchor_left = 0.92
 anchor_top = 0.951
 anchor_right = 0.92
@@ -140,12 +144,12 @@ theme_override_colors/font_outline_color = Color(0, 0, 0, 1)
 theme_override_constants/outline_size = 6
 theme_override_font_sizes/font_size = 30
 theme_override_styles/normal = SubResource("sb_normal")
-theme_override_styles/hover = SubResource("sb_hover")
 theme_override_styles/pressed = SubResource("sb_hover")
+theme_override_styles/hover = SubResource("sb_hover")
 theme_override_styles/focus = SubResource("sb_hover")
 text = "EXIT"
 
-[node name="OptionsPanel" type="CenterContainer" parent="."]
+[node name="OptionsPanel" type="CenterContainer" parent="." unique_id=593823446]
 visible = false
 layout_mode = 1
 anchors_preset = 15
@@ -154,17 +158,17 @@ anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 
-[node name="Backdrop" type="ColorRect" parent="OptionsPanel"]
+[node name="Backdrop" type="ColorRect" parent="OptionsPanel" unique_id=1811982549]
 layout_mode = 2
-color = Color(0, 0, 0, 0.55)
 mouse_filter = 2
+color = Color(0, 0, 0, 0.55)
 
-[node name="VBox" type="VBoxContainer" parent="OptionsPanel"]
+[node name="VBox" type="VBoxContainer" parent="OptionsPanel" unique_id=2125052135]
 custom_minimum_size = Vector2(560, 480)
 layout_mode = 2
 theme_override_constants/separation = 16
 
-[node name="TitleLabel" type="Label" parent="OptionsPanel/VBox"]
+[node name="TitleLabel" type="Label" parent="OptionsPanel/VBox" unique_id=853979265]
 layout_mode = 2
 theme_override_colors/font_outline_color = Color(0, 0, 0, 1)
 theme_override_constants/outline_size = 8
@@ -172,7 +176,7 @@ theme_override_font_sizes/font_size = 44
 text = "Controls"
 horizontal_alignment = 1
 
-[node name="Hint" type="Label" parent="OptionsPanel/VBox"]
+[node name="Hint" type="Label" parent="OptionsPanel/VBox" unique_id=1809504670]
 layout_mode = 2
 theme_override_colors/font_outline_color = Color(0, 0, 0, 1)
 theme_override_constants/outline_size = 5
@@ -180,24 +184,24 @@ theme_override_font_sizes/font_size = 20
 text = "Click a key, then press a new key. Esc cancels."
 horizontal_alignment = 1
 
-[node name="Scroll" type="ScrollContainer" parent="OptionsPanel/VBox"]
+[node name="Scroll" type="ScrollContainer" parent="OptionsPanel/VBox" unique_id=683738956]
 custom_minimum_size = Vector2(0, 340)
 layout_mode = 2
 size_flags_vertical = 3
 horizontal_scroll_mode = 0
 
-[node name="RebindList" type="VBoxContainer" parent="OptionsPanel/VBox/Scroll"]
+[node name="RebindList" type="VBoxContainer" parent="OptionsPanel/VBox/Scroll" unique_id=1261520279]
 layout_mode = 2
 size_flags_horizontal = 3
 theme_override_constants/separation = 8
 
-[node name="BackButton" type="Button" parent="OptionsPanel/VBox"]
+[node name="BackButton" type="Button" parent="OptionsPanel/VBox" unique_id=1587524951]
 custom_minimum_size = Vector2(0, 48)
 layout_mode = 2
 theme_override_font_sizes/font_size = 24
 text = "Back"
 
-[node name="CreditsPanel" type="CenterContainer" parent="."]
+[node name="CreditsPanel" type="CenterContainer" parent="." unique_id=175743902]
 visible = false
 layout_mode = 1
 anchors_preset = 15
@@ -206,17 +210,17 @@ anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 
-[node name="Backdrop" type="ColorRect" parent="CreditsPanel"]
+[node name="Backdrop" type="ColorRect" parent="CreditsPanel" unique_id=1950253735]
 layout_mode = 2
-color = Color(0, 0, 0, 0.55)
 mouse_filter = 2
+color = Color(0, 0, 0, 0.55)
 
-[node name="VBox" type="VBoxContainer" parent="CreditsPanel"]
+[node name="VBox" type="VBoxContainer" parent="CreditsPanel" unique_id=901836808]
 custom_minimum_size = Vector2(520, 360)
 layout_mode = 2
 theme_override_constants/separation = 20
 
-[node name="TitleLabel" type="Label" parent="CreditsPanel/VBox"]
+[node name="TitleLabel" type="Label" parent="CreditsPanel/VBox" unique_id=825593160]
 layout_mode = 2
 theme_override_colors/font_outline_color = Color(0, 0, 0, 1)
 theme_override_constants/outline_size = 8
@@ -224,36 +228,36 @@ theme_override_font_sizes/font_size = 44
 text = "Credits"
 horizontal_alignment = 1
 
-[node name="Names" type="RichTextLabel" parent="CreditsPanel/VBox"]
+[node name="Names" type="RichTextLabel" parent="CreditsPanel/VBox" unique_id=1355198629]
 layout_mode = 2
 size_flags_vertical = 3
-theme_override_colors/font_outline_color = Color(0, 0, 0, 1)
 theme_override_colors/default_color = Color(0.93, 0.88, 0.72, 1)
-theme_override_constants/outline_size = 5
+theme_override_colors/font_outline_color = Color(0, 0, 0, 1)
 theme_override_constants/line_separation = 6
+theme_override_constants/outline_size = 5
 theme_override_font_sizes/normal_font_size = 26
 theme_override_font_sizes/bold_font_size = 30
 bbcode_enabled = true
-fit_content = true
-scroll_active = false
 text = "[center][font_size=32][color=#d9a833]Bullosseum[/color][/font_size]
 
 [b][color=#d9a833]Siim Raud[/color][/b]  [url=https://instagram.com/siimpressionist]@siimpressionist[/url]
-[font_size=20]Creative, art, idea guy[/font_size]
+[font_size=20]Artist[/font_size]
 
 [b][color=#d9a833]Richard Aasa[/color][/b]  [url=https://instagram.com/aasarichard]@aasarichard[/url]
 [font_size=20]Programmer[/font_size]
 
-[b][color=#d9a833]Kadi Rebane[/color][/b]  [url=https://instagram.com/kadirebane]@kadirebane[/url]
+[b][color=#d9a833]Kadi Rebane[/color][/b]  [url=https://x.com/_barkseven]@_barkseven[/url]
 [font_size=20]Arena asset[/font_size][/center]"
+fit_content = true
+scroll_active = false
 
-[node name="BackButton" type="Button" parent="CreditsPanel/VBox"]
+[node name="BackButton" type="Button" parent="CreditsPanel/VBox" unique_id=1194791074]
 custom_minimum_size = Vector2(0, 48)
 layout_mode = 2
 theme_override_font_sizes/font_size = 24
 text = "Back"
 
-[node name="FadeRect" type="ColorRect" parent="."]
+[node name="FadeRect" type="ColorRect" parent="." unique_id=15381366]
 layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0

deploy_web.sh

@@ -1,17 +1,39 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
+# Run from the project root regardless of where the script is invoked.
+cd "$(dirname "$0")"
+
 SERVER_USER="richard"
 SERVER_HOST="192.168.1.168"
 SERVER_PATH="/opt/bulloseum/data"
 
 BUILD_DIR="build/web"
 
+# Derive the version the same way GameVersion does (single source of truth):
+# numeric version from project.godot, pre-release channel from game_version.gd.
+VERSION_NUMBER="$(grep -oP 'config/version="\K[^"]+' project.godot)"
+CHANNEL="$(grep -oP 'const CHANNEL: String = "\K[^"]*' game_version.gd || true)"
+VERSION="v${VERSION_NUMBER}"
+[ -n "$CHANNEL" ] && VERSION="${VERSION}-${CHANNEL}"
+
+GIT_COMMIT="$(git rev-parse --short HEAD 2>/dev/null || echo unknown)"
+BUILD_DATE="$(date -u +%Y-%m-%dT%H:%M:%SZ)"
+
+echo "building Bullosseum ${VERSION} (${GIT_COMMIT})"
+
 mkdir -p "$BUILD_DIR"
 godot --headless --export-release "Web" "$BUILD_DIR/index.html"
 
 gzip -kf "$BUILD_DIR/index.wasm"
 
+# Version stamp shipped alongside the flat build so the server records what's live.
+cat > "$BUILD_DIR/version.txt" <<EOF
+version=${VERSION}
+commit=${GIT_COMMIT}
+built=${BUILD_DATE}
+EOF
+
 scp "$BUILD_DIR/index.html" \
     "$BUILD_DIR/index.js" \
     "$BUILD_DIR/index.wasm.gz" \
@@ -21,6 +43,7 @@ scp "$BUILD_DIR/index.html" \
     "$BUILD_DIR/index.icon.png" \
     "$BUILD_DIR/index.apple-touch-icon.png" \
     "$BUILD_DIR/index.png" \
+    "$BUILD_DIR/version.txt" \
     "$SERVER_USER@$SERVER_HOST:$SERVER_PATH/"
 
-echo "deployed to $SERVER_HOST:$SERVER_PATH"
+echo "deployed ${VERSION} to $SERVER_HOST:$SERVER_PATH"

scene.tscn

@@ -11,8 +11,8 @@
 [ext_resource type="Script" uid="uid://di0jafakftp3n" path="res://publikum_controller.gd" id="9_pubctrl"]
 [ext_resource type="PackedScene" uid="uid://dxe72ig8gfbcg" path="res://Assets/arena model2026.glb" id="10_5juve"]
 [ext_resource type="Script" uid="uid://butd6b3tdwxrv" path="res://hud.gd" id="10_hud"]
-[ext_resource type="Script" path="res://crowd_billboards.gd" id="11_crowd"]
+[ext_resource type="Script" uid="uid://cj0ytlkuavmf4" path="res://crowd_billboards.gd" id="11_crowd"]
-[ext_resource type="Script" path="res://ps1_filter.gd" id="12_ps1ctl"]
+[ext_resource type="Script" uid="uid://ce5n4qu88mhyx" path="res://ps1_filter.gd" id="12_ps1ctl"]
 
 [sub_resource type="CameraAttributesPractical" id="CameraAttributesPractical_73fnb"]
 dof_blur_far_enabled = true
@@ -80,12 +80,12 @@ layer = 10
 
 [node name="PS1Filter" type="ColorRect" parent="CanvasLayer" unique_id=1449116873]
 material = SubResource("ShaderMaterial_ps1")
-script = ExtResource("12_ps1ctl")
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
+script = ExtResource("12_ps1ctl")
 
 [node name="Lights" type="Node3D" parent="." unique_id=737767662]
 
@@ -96,9 +96,9 @@ light_indirect_energy = 0.767
 shadow_blur = 0.47
 
 [node name="SpotLight3D2" type="SpotLight3D" parent="Lights" unique_id=918477294]
-transform = Transform3D(0.904133, 0.30962405, -0.2944087, 0.3084627, 0.0037425563, 0.9512291, 0.2956252, -0.95085174, -0.0921237, -3.629381, 8.186143, -2.0124264)
+transform = Transform3D(0.904133, 0.30962402, -0.2944087, 0.3084627, 0.0037425472, 0.9512291, 0.2956252, -0.95085174, -0.0921237, -3.629381, 10.86347, -2.0124264)
-visible = false
+light_energy = 16.0
-light_energy = 14.585
+light_indirect_energy = 26.095
 distance_fade_enabled = true
 spot_range = 32.90586
 spot_angle = 73.93
@@ -112,7 +112,7 @@ spot_range = 32.90586
 
 [node name="SUN_DirectionalLight3D2" type="DirectionalLight3D" parent="Lights" unique_id=1706919950]
 transform = Transform3D(0.45811793, 0.34843865, -0.81775206, 0.5316611, 0.62986195, 0.56622505, 0.7123655, -0.69416475, 0.10329977, 0, 8.980043, 0)
-light_energy = 2.988
+light_energy = 1.199
 shadow_enabled = true
 shadow_blur = 10.0
 
@@ -381,7 +381,8 @@ transform = Transform3D(0.97025216, 0, 0.24209678, 0, 1, 0, -0.24209678, 0, 0.97
 [node name="WorldEnvironment" type="WorldEnvironment" parent="." unique_id=755853425]
 environment = SubResource("Environment_73fnb")
 
-[node name="CrowdBillboards" type="MultiMeshInstance3D" parent="."]
+[node name="CrowdBillboards" type="MultiMeshInstance3D" parent="." unique_id=549548313]
+visible = false
 script = ExtResource("11_crowd")
 
 [editable path="Player"]