From 2952591bfa6fa2222a5161faa50eb547b595ab39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gerard=20Gasc=C3=B3n?= Date: Mon, 14 Apr 2025 23:17:38 +0200 Subject: [PATCH] chore: remove clock --- scenes/clock/clock.gd | 14 ---------- scenes/clock/clock.gd.uid | 1 - scenes/clock/clock.tscn | 44 -------------------------------- scenes/clock/clock_window.gd | 15 ----------- scenes/clock/clock_window.gd.uid | 1 - scenes/clock/day.gd | 22 ---------------- scenes/clock/day.gd.uid | 1 - scenes/main.gd | 5 ---- scenes/main.tscn | 4 +-- 9 files changed, 1 insertion(+), 106 deletions(-) delete mode 100644 scenes/clock/clock.gd delete mode 100644 scenes/clock/clock.gd.uid delete mode 100644 scenes/clock/clock.tscn delete mode 100644 scenes/clock/clock_window.gd delete mode 100644 scenes/clock/clock_window.gd.uid delete mode 100644 scenes/clock/day.gd delete mode 100644 scenes/clock/day.gd.uid diff --git a/scenes/clock/clock.gd b/scenes/clock/clock.gd deleted file mode 100644 index fd3af8f..0000000 --- a/scenes/clock/clock.gd +++ /dev/null @@ -1,14 +0,0 @@ -extends Label - - -func _process(delta: float) -> void: - var time: Dictionary = Time.get_time_dict_from_system() - - var hour: int = time['hour'] - var minute: int = time['minute'] - var second: int = time['second'] - - if second % 2 == 0: - text = "%02d:%02d" % [hour, minute] - else: - text = "%02d %02d" % [hour, minute] diff --git a/scenes/clock/clock.gd.uid b/scenes/clock/clock.gd.uid deleted file mode 100644 index 65ab5a6..0000000 --- a/scenes/clock/clock.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://drnne01ksnlqv diff --git a/scenes/clock/clock.tscn b/scenes/clock/clock.tscn deleted file mode 100644 index 71447a6..0000000 --- a/scenes/clock/clock.tscn +++ /dev/null @@ -1,44 +0,0 @@ -[gd_scene load_steps=5 format=3 uid="uid://bj5ptaniasaaj"] - -[ext_resource type="Script" uid="uid://ddsdlhbepjrm3" path="res://scenes/clock/day.gd" id="1_4o2gw"] -[ext_resource type="Script" uid="uid://catrd7ir3ekyj" path="res://scenes/clock/clock_window.gd" id="1_yxh3l"] -[ext_resource type="Script" uid="uid://drnne01ksnlqv" path="res://scenes/clock/clock.gd" id="2_ngmfe"] -[ext_resource type="Texture2D" uid="uid://fdqnc2qrrvn1" path="res://assets/sprites/icon.svg" id="4_hf0ru"] - -[node name="Clock" type="Window"] -transparent_bg = true -size = Vector2i(200, 100) -unresizable = true -borderless = true -always_on_top = true -transparent = true -script = ExtResource("1_yxh3l") - -[node name="TextureRect" type="TextureRect" parent="."] -offset_right = 200.0 -offset_bottom = 100.0 -texture = ExtResource("4_hf0ru") -expand_mode = 1 - -[node name="Clock" type="Label" parent="."] -offset_right = 146.0 -offset_bottom = 49.0 -theme_override_font_sizes/font_size = 41 -text = "00:00" -script = ExtResource("2_ngmfe") - -[node name="Coins" type="Label" parent="."] -offset_left = 126.0 -offset_right = 200.0 -offset_bottom = 57.0 -theme_override_font_sizes/font_size = 41 -text = "00" -horizontal_alignment = 2 - -[node name="Day" type="Label" parent="."] -offset_top = 65.0 -offset_right = 146.0 -offset_bottom = 100.0 -theme_override_font_sizes/font_size = 25 -text = "dl. 23-04" -script = ExtResource("1_4o2gw") diff --git a/scenes/clock/clock_window.gd b/scenes/clock/clock_window.gd deleted file mode 100644 index adb1c05..0000000 --- a/scenes/clock/clock_window.gd +++ /dev/null @@ -1,15 +0,0 @@ -extends Window - - -func _ready() -> void: - move_window_to_top_right() - - -func move_window_to_top_right(): - var display_index: int = DisplayServer.window_get_current_screen() - - var work_area_position: Vector2i = DisplayServer.screen_get_usable_rect(display_index).position - var work_area_size: Vector2i = DisplayServer.screen_get_usable_rect(display_index).size - - var offset: int = 30 - position = work_area_position + Vector2i(work_area_size.x - size.x - offset, offset) diff --git a/scenes/clock/clock_window.gd.uid b/scenes/clock/clock_window.gd.uid deleted file mode 100644 index 4038aeb..0000000 --- a/scenes/clock/clock_window.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://catrd7ir3ekyj diff --git a/scenes/clock/day.gd b/scenes/clock/day.gd deleted file mode 100644 index 65d5e2d..0000000 --- a/scenes/clock/day.gd +++ /dev/null @@ -1,22 +0,0 @@ -extends Label - - -const _weekday_converter: Dictionary[int, String] = { - 0: 'Dg.', - 1: 'Dl.', - 2: 'Dm.', - 3: 'Dc.', - 4: 'Dj.', - 5: 'Dv.', - 6: 'Ds.', -} - - -func _process(delta: float) -> void: - var time: Dictionary = Time.get_date_dict_from_system() - - var weekday: int = time['weekday'] - var month: int = time['month'] - var day: int = time['day'] - - text = "%s %02d/%02d" % [_weekday_converter[weekday], day, month] diff --git a/scenes/clock/day.gd.uid b/scenes/clock/day.gd.uid deleted file mode 100644 index 67f642a..0000000 --- a/scenes/clock/day.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://ddsdlhbepjrm3 diff --git a/scenes/main.gd b/scenes/main.gd index 2025295..13f5ba6 100644 --- a/scenes/main.gd +++ b/scenes/main.gd @@ -6,8 +6,6 @@ class_name GameManager @export var dragon_ingame: PackedScene @export var dragon_spots: Array[Node2D] -@export var clock: PackedScene - var _filled_spots: Dictionary[Node2D, int] @export var hat_outfits: DragonOutfit @@ -35,9 +33,6 @@ func _ready(): move_window_to_bottom_right() _load_game() _queue_dragon_instantiation() - - var clock_window: Window = clock.instantiate() - add_child(clock_window) func _queue_dragon_instantiation(): diff --git a/scenes/main.tscn b/scenes/main.tscn index 4e82ecf..ed88f7b 100644 --- a/scenes/main.tscn +++ b/scenes/main.tscn @@ -1,9 +1,8 @@ -[gd_scene load_steps=17 format=3 uid="uid://ctytpqaed0yqx"] +[gd_scene load_steps=16 format=3 uid="uid://ctytpqaed0yqx"] [ext_resource type="Script" uid="uid://3kyt3shje5r1" path="res://scenes/main.gd" id="1_sugp2"] [ext_resource type="PackedScene" uid="uid://c7nfcgjxqeg7l" path="res://scenes/window/dragon_popup.tscn" id="2_jyhfs"] [ext_resource type="Resource" uid="uid://cnhwn6kfcbjl5" path="res://assets/outfits/hats.tres" id="4_85g3d"] -[ext_resource type="PackedScene" uid="uid://bj5ptaniasaaj" path="res://scenes/clock/clock.tscn" id="4_a8y0u"] [ext_resource type="PackedScene" uid="uid://miutbdsgccd1" path="res://scenes/dragons/dragon.tscn" id="4_jyhfs"] [ext_resource type="Script" uid="uid://cj4l3a6a8ro0r" path="res://scenes/create_button.gd" id="4_tbgi4"] [ext_resource type="Resource" uid="uid://etegcak2sphs" path="res://assets/outfits/shirts.tres" id="5_choun"] @@ -22,7 +21,6 @@ script = ExtResource("1_sugp2") dragon_template = ExtResource("2_jyhfs") dragon_ingame = ExtResource("4_jyhfs") dragon_spots = [NodePath("DragonSpot1"), NodePath("DragonSpot2"), NodePath("DragonSpot3")] -clock = ExtResource("4_a8y0u") hat_outfits = ExtResource("4_85g3d") shirt_outfits = ExtResource("5_choun") shoes_outfits = ExtResource("6_ya4ey")