feat: rollback fix

This commit is contained in:
2026-06-10 10:48:20 +08:00
parent 5653473c12
commit 8520f9db3c
6 changed files with 81 additions and 69 deletions
+52
View File
@@ -0,0 +1,52 @@
[gd_scene load_steps=2 format=3]
[ext_resource type="FontFile" uid="uid://xnjx058n4tsw" path="res://assets/fonts/Nougat-ExtraBlack.ttf" id="1_font"]
[node name="GauntletHUD" type="CanvasLayer"]
layer = 5
visible = false
[node name="TopContainer" type="CenterContainer" parent="."]
anchors_preset = 5
anchor_left = 0.5
anchor_right = 0.5
offset_top = 70.0
grow_horizontal = 2
[node name="PhaseLabel" type="Label" parent="TopContainer"]
layout_mode = 2
theme_override_font_sizes/font_size = 24
theme_override_colors/font_color = Color(1, 0.6, 0.8, 1)
theme_override_colors/font_outline_color = Color(0, 0, 0, 1)
theme_override_constants/outline_size = 6
theme_override_fonts/font = ExtResource("1_font")
text = "🍬 OPEN ARENA"
horizontal_alignment = 1
[node name="BottomContainer" type="CenterContainer" parent="."]
anchors_preset = 7
anchor_left = 0.5
anchor_top = 1.0
anchor_right = 0.5
anchor_bottom = 1.0
offset_top = -90.0
grow_horizontal = 2
grow_vertical = 0
[node name="CleanserHBox" type="HBoxContainer" parent="BottomContainer"]
layout_mode = 2
theme_override_constants/separation = 6
[node name="CleanserIcon" type="TextureRect" parent="BottomContainer/CleanserHBox"]
layout_mode = 2
custom_minimum_size = Vector2(20, 20)
stretch_mode = 5
[node name="CleanserLabel" type="Label" parent="BottomContainer/CleanserHBox"]
layout_mode = 2
theme_override_font_sizes/font_size = 20
theme_override_colors/font_outline_color = Color(0, 0, 0, 1)
theme_override_constants/outline_size = 6
theme_override_fonts/font = ExtResource("1_font")
text = "Cleanser: 0"
horizontal_alignment = 1
+2
View File
@@ -498,6 +498,8 @@ func _on_mail_unread_count_changed(count: int) -> void:
mail_badge.visible = false
func _sync_room_profile_card() -> void:
if username_label:
username_label.text = UserProfileManager.get_display_name()
if room_player_username:
room_player_username.text = UserProfileManager.get_display_name()
if room_player_score:
+9 -11
View File
@@ -1854,18 +1854,16 @@ func randomize_item_at_position(grid_position: Vector2i):
break
if is_ground:
var new_item = 7
var get_mode_specific_tile = func():
if LobbyManager.game_mode != "Stop n Go" and LobbyManager.game_mode != "Tekton Doors" and LobbyManager.game_mode != "Candy Cannon Survival":
# 60% Chance for Common (7-10), 40% for PowerUp
if randf() <= 0.6:
return [7, 8, 9, 10].pick_random()
else:
return ScarcityModel.SPECIAL_TILES.pick_random()
return ScarcityController.get_random_tile_id()
var get_mode_specific_tile = func():
if LobbyManager.game_mode != "Stop n Go" and LobbyManager.game_mode != "Tekton Doors" and LobbyManager.game_mode != "Candy Cannon Survival":
# 60% Chance for Common (7-10), 40% for PowerUp
if randf() <= 0.6:
return [7, 8, 9, 10].pick_random()
else:
return ScarcityModel.SPECIAL_TILES.pick_random()
return ScarcityController.get_random_tile_id()
new_item = get_mode_specific_tile.call()
var new_item = get_mode_specific_tile.call()
# If we are replacing an existing item, try to ensure it changes
if current_item != -1: