diff --git a/Cat_August_2010-4.jpg b/Cat_August_2010-4.jpg deleted file mode 100644 index 5fc9655..0000000 Binary files a/Cat_August_2010-4.jpg and /dev/null differ diff --git a/IMG_20241015_162213_033(1).jpg b/IMG_20241015_162213_033(1).jpg new file mode 100644 index 0000000..4fd6e4c Binary files /dev/null and b/IMG_20241015_162213_033(1).jpg differ diff --git a/IMG_20241015_162213_033(1).jpg.import b/IMG_20241015_162213_033(1).jpg.import new file mode 100644 index 0000000..964b176 --- /dev/null +++ b/IMG_20241015_162213_033(1).jpg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cmr1ij4s7xa27" +path="res://.godot/imported/IMG_20241015_162213_033(1).jpg-9929b05aea172bc5afc1063f329c9b14.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://IMG_20241015_162213_033(1).jpg" +dest_files=["res://.godot/imported/IMG_20241015_162213_033(1).jpg-9929b05aea172bc5afc1063f329c9b14.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/IMG_20241015_175925_722(1).jpg b/IMG_20241015_175925_722(1).jpg new file mode 100644 index 0000000..a4305a8 Binary files /dev/null and b/IMG_20241015_175925_722(1).jpg differ diff --git a/Cat_August_2010-4.jpg.import b/IMG_20241015_175925_722(1).jpg.import similarity index 65% rename from Cat_August_2010-4.jpg.import rename to IMG_20241015_175925_722(1).jpg.import index 4b151b3..edc8dc1 100644 --- a/Cat_August_2010-4.jpg.import +++ b/IMG_20241015_175925_722(1).jpg.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://drj8iwoxqu7kk" -path="res://.godot/imported/Cat_August_2010-4.jpg-ee22e0b2d7c21625ade8bb157ecd9ac0.ctex" +uid="uid://2vacx4h6vn46" +path="res://.godot/imported/IMG_20241015_175925_722(1).jpg-b4169e075837dc19cf9c8f3902aa4f18.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Cat_August_2010-4.jpg" -dest_files=["res://.godot/imported/Cat_August_2010-4.jpg-ee22e0b2d7c21625ade8bb157ecd9ac0.ctex"] +source_file="res://IMG_20241015_175925_722(1).jpg" +dest_files=["res://.godot/imported/IMG_20241015_175925_722(1).jpg-b4169e075837dc19cf9c8f3902aa4f18.ctex"] [params] diff --git a/Main.tscn b/Main.tscn index 5c1d02b..9305104 100644 --- a/Main.tscn +++ b/Main.tscn @@ -2,13 +2,13 @@ [ext_resource type="Script" path="res://main.gd" id="1_ubs1p"] [ext_resource type="Texture2D" uid="uid://b8on1case224h" path="res://LoopPressed.png" id="2_iolk5"] -[ext_resource type="Texture2D" uid="uid://cq8jj63iyu2cs" path="res://d7hftxdivxxvm.cloudfront.webp" id="2_wf35v"] [ext_resource type="Texture2D" uid="uid://daq8wnhtscpjl" path="res://Skip.png" id="3_4vx67"] [ext_resource type="Script" path="res://wallpaper_manager.gd" id="4_y372l"] +[ext_resource type="Texture2D" uid="uid://cmr1ij4s7xa27" path="res://IMG_20241015_162213_033(1).jpg" id="5_8v24s"] [ext_resource type="Texture2D" uid="uid://38c8dfym0svn" path="res://Loop.png" id="5_c2g63"] [ext_resource type="Texture2D" uid="uid://cekkhyppj88xi" path="res://Headphones.png" id="6_3mi6c"] -[ext_resource type="Texture2D" uid="uid://snne8iiftksi" path="res://Evening_view_of_Munnar_1633.jpg" id="6_5vm0w"] [ext_resource type="Texture2D" uid="uid://ba5wdmchyy50n" path="res://nighttime-in-the-hills-henry-porter.jpg" id="6_8abnc"] +[ext_resource type="Texture2D" uid="uid://2vacx4h6vn46" path="res://IMG_20241015_175925_722(1).jpg" id="6_hvupl"] [ext_resource type="Texture2D" uid="uid://ctb4s2nks73rx" path="res://Play.png" id="8_5v7u3"] [ext_resource type="Shader" path="res://CoverShader.gdshader" id="8_4531v"] [ext_resource type="Shader" path="res://Background1.gdshader" id="8_xtnau"] @@ -190,18 +190,19 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -texture = ExtResource("2_wf35v") +texture = ExtResource("5_8v24s") +expand_mode = 3 stretch_mode = 6 [node name="Evening" type="TextureRect" parent="."] -visible = false layout_mode = 1 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -texture = ExtResource("6_5vm0w") +texture = ExtResource("6_hvupl") +expand_mode = 3 stretch_mode = 6 [node name="Nighttime" type="TextureRect" parent="."] @@ -850,7 +851,7 @@ offset_left = -64.0 offset_top = -23.0 grow_horizontal = 0 grow_vertical = 0 -text = "v1.5.0.2" +text = "v1.5.1" horizontal_alignment = 2 [node name="SettingsButton" type="Button" parent="."] diff --git a/Settings.tscn b/Settings.tscn index ecce467..d9b4572 100644 --- a/Settings.tscn +++ b/Settings.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=9 format=3 uid="uid://dqg674t6kun4e"] +[gd_scene load_steps=10 format=3 uid="uid://dqg674t6kun4e"] [ext_resource type="Script" path="res://settings.gd" id="1_uaa7d"] [ext_resource type="Script" path="res://eq_settings.gd" id="2_1n4m6"] @@ -17,6 +17,9 @@ font_size = 11 [sub_resource type="LabelSettings" id="LabelSettings_cwn10"] font_size = 15 +[sub_resource type="LabelSettings" id="LabelSettings_i51gs"] +font_size = 50 + [node name="SettingsMenuChild" type="Control"] custom_minimum_size = Vector2(576, 493) layout_mode = 3 @@ -38,6 +41,7 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 +scroll_vertical = 250 [node name="VBoxContainer" type="VBoxContainer" parent="ScrollContainer"] custom_minimum_size = Vector2(576, 493) @@ -503,6 +507,47 @@ autowrap_mode = 2 custom_minimum_size = Vector2(0, 16.07) layout_mode = 2 +[node name="Credits" type="VBoxContainer" parent="ScrollContainer/VBoxContainer"] +layout_mode = 2 + +[node name="Label" type="Label" parent="ScrollContainer/VBoxContainer/Credits"] +layout_mode = 2 +size_flags_horizontal = 4 +text = "CREDITS" +label_settings = SubResource("LabelSettings_i51gs") + +[node name="Label5" type="LinkButton" parent="ScrollContainer/VBoxContainer/Credits"] +layout_mode = 2 +size_flags_horizontal = 4 +text = "Godot" +underline = 1 +uri = "https://godotengine.org" + +[node name="Label2" type="LinkButton" parent="ScrollContainer/VBoxContainer/Credits"] +layout_mode = 2 +size_flags_horizontal = 4 +text = "Godot YT-DL by NoƩ Le Cam" +underline = 1 +uri = "https://github.com/Nolkaloid/godot-yt-dlp" + +[node name="Label3" type="LinkButton" parent="ScrollContainer/VBoxContainer/Credits"] +layout_mode = 2 +size_flags_horizontal = 4 +text = "Discord RPC by vaporee" +underline = 1 +uri = "https://github.com/vaporvee/discord-rpc-godot" + +[node name="Label4" type="LinkButton" parent="ScrollContainer/VBoxContainer/Credits"] +layout_mode = 2 +size_flags_horizontal = 4 +text = "Godot GIF by b0tlanner" +underline = 1 +uri = "https://github.com/vaporvee/discord-rpc-godot" + +[node name="Seperator7" type="Control" parent="ScrollContainer/VBoxContainer"] +custom_minimum_size = Vector2(0, 16.07) +layout_mode = 2 + [node name="TimeListening" type="Label" parent="ScrollContainer/VBoxContainer"] layout_mode = 2 size_flags_horizontal = 4 diff --git a/main.gd b/main.gd index 4b53032..2191cf0 100644 --- a/main.gd +++ b/main.gd @@ -184,9 +184,20 @@ func setUpDiscord(): DiscordRPC.app_id = 1276916292170809426 DiscordRPC.refresh() print("stiff chicks ",DiscordRPC.get_current_user()) + SplashStrings = ["the party just started!"] + var LText = SplashStrings.pick_random() + print(LText) + DiscordRPC.large_image_text = LText + if DiscordUsername == "vrenthusiest": + if randi_range(1,4) == 1: + DiscordRPC.large_image = "nullbody" + DiscordRPC.large_image_text = "I am racist against nullbodys - Vr" + else: + DiscordRPC.large_image = "logo" + else: + DiscordRPC.large_image = "logo" DiscordUsername = DiscordRPC.get_current_user().get("username") DiscordRPC.refresh() - DiscordRPC.large_image = "logo" # this is boolean if everything worked print("Discord working: " + str(DiscordRPC.get_is_discord_working())) # Set the first custom text row of the activity here @@ -197,10 +208,6 @@ func setUpDiscord(): DiscordRPC.state = "" # Image key for small image from "Art Assets" from the Discord Developer website # Tooltip text for the large image - SplashStrings = ["the party just started!"] - var LText = SplashStrings.pick_random() - print(LText) - DiscordRPC.large_image_text = LText # Image key for large image from "Art Assets" from the Discord Developer website DiscordRPC.small_image = "" # Tooltip text for the small image @@ -464,12 +471,14 @@ func _process(_delta: float) -> void: SaveEverything() print("yoo") @warning_ignore("integer_division") - UpdateSplashes() + if DiscordRPC.large_image != "nullbody": + UpdateSplashes() if DiscordRPC.get_is_discord_working(): print(DiscordRPC.get_current_user()["username"]) print(TimeSpentListening) var LText = SplashStrings.pick_random() - DiscordRPC.large_image_text = LText + if DiscordRPC.large_image != "nullbody": + DiscordRPC.large_image_text = LText if DiscordRPC.get_is_discord_working(): DiscordRPC.refresh() # "59:59 remaining" timestamp for the activity diff --git a/wallpaper_manager.gd b/wallpaper_manager.gd index e9c205d..174b5de 100644 --- a/wallpaper_manager.gd +++ b/wallpaper_manager.gd @@ -11,26 +11,27 @@ func _ready() -> void: # Called every frame. 'delta' is the elapsed time since the previous frame. func _process(delta: float) -> void: - var timeInHours = Time.get_datetime_dict_from_system()["hour"] - if timeInHours < 6: - currentBG = 3 - elif timeInHours >= 6 and timeInHours <= 9: - currentBG = 2 - elif timeInHours >= 9 and timeInHours <= 17: - currentBG = 1 - elif timeInHours >= 17 and timeInHours <= 21: - currentBG = 2 - elif timeInHours > 21: - currentBG = 3 - if currentBG == 1: - Daytime.show() - Nighttime.hide() - Evening.hide() - elif currentBG == 2: - Daytime.hide() - Nighttime.hide() - Evening.show() - elif currentBG == 3: - Daytime.hide() - Nighttime.show() - Evening.hide() + if true != true: + var timeInHours = Time.get_datetime_dict_from_system()["hour"] + if timeInHours < 6: + currentBG = 3 + elif timeInHours >= 6 and timeInHours <= 9: + currentBG = 2 + elif timeInHours >= 9 and timeInHours <= 17: + currentBG = 1 + elif timeInHours >= 17 and timeInHours <= 21: + currentBG = 2 + elif timeInHours > 21: + currentBG = 3 + if currentBG == 1: + Daytime.show() + Nighttime.hide() + Evening.hide() + elif currentBG == 2: + Daytime.hide() + Nighttime.hide() + Evening.show() + elif currentBG == 3: + Daytime.hide() + Nighttime.show() + Evening.hide()