Compare commits

...

2 Commits

Author SHA1 Message Date
notdraimdev 8557adbed5 Credits + new backrounds 2024-11-02 03:38:28 +01:00
notdraimdev 891bfc7382 "bug" fixes 2024-11-02 02:36:54 +01:00
9 changed files with 188 additions and 113 deletions
Binary file not shown.

Before

Width:  |  Height:  |  Size: 136 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 271 KiB

+34
View File
@@ -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
Binary file not shown.

After

Width:  |  Height:  |  Size: 782 KiB

@@ -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]
+7 -6
View File
@@ -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"
text = "v1.5.1"
horizontal_alignment = 2
[node name="SettingsButton" type="Button" parent="."]
+46 -1
View File
@@ -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
+73 -79
View File
@@ -181,42 +181,40 @@ func _ready() -> void:
child.focus_mode = child is LineEdit
func setUpDiscord():
DiscordRPC.app_id = 13
print("stibidiii ",DiscordRPC.get_current_user())
if DiscordUsername == "vrenthusiest" or DiscordRPC.get_current_user().get("username") == "vrenthusiest":
DiscordRPC.app_id = 1302002529378369568
else:
DiscordRPC.app_id = 1276916292170809426
DiscordRPC.app_id = 1276916292170809426
DiscordRPC.refresh()
print("stiff chicks ",DiscordRPC.get_current_user())
DiscordUsername = DiscordRPC.get_current_user().get("username")
DiscordRPC.refresh()
if DiscordRPC.app_id == 1302002529378369568:
DiscordRPC.large_image = "changed"
DiscordRPC.start_timestamp = Time.get_unix_time_from_system()
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"
# 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
if textSongs.size() >= CurrentIDX:
if textSongs.size() > CurrentIDX:
DiscordRPC.details = textSongs[CurrentIDX]
# Set the second custom text row of the activity here
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
DiscordRPC.small_image_text = "Nothing"
# "02:41 elapsed" timestamp for the activity
# Always refresh after changing the values!
DiscordRPC.refresh()
DiscordUsername = DiscordRPC.get_current_user().get("username")
DiscordRPC.refresh()
# 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
if textSongs.size() >= CurrentIDX:
if textSongs.size() > CurrentIDX:
DiscordRPC.details = textSongs[CurrentIDX]
# Set the second custom text row of the activity here
DiscordRPC.state = ""
# Image key for small image from "Art Assets" from the Discord Developer website
# Tooltip text for the large image
# Image key for large image from "Art Assets" from the Discord Developer website
DiscordRPC.small_image = ""
# Tooltip text for the small image
DiscordRPC.small_image_text = "Nothing"
# "02:41 elapsed" timestamp for the activity
# Always refresh after changing the values!
DiscordRPC.refresh()
func deletesong(idx:int):
var currentDir:String= CurrentDir
@@ -256,9 +254,8 @@ func SongDragStopped(Changed:bool):
pausePlay()
UpdateProgressSlider = true
if DiscordRPC.app_id != 1302002529378369568:
DiscordRPC.start_timestamp = int(Time.get_unix_time_from_system() - (current_progress.value * CurrentSongLenth / current_progress.max_value))
DiscordRPC.refresh()
DiscordRPC.start_timestamp = int(Time.get_unix_time_from_system() - (current_progress.value * CurrentSongLenth / current_progress.max_value))
DiscordRPC.refresh()
func SongDragStarted():
UpdateProgressSlider = false
@@ -332,14 +329,13 @@ func PlaySongs():
Paused = true
music_player.stream_paused = true
play_list.icon = PLAY
if DiscordRPC.app_id != 1302002529378369568:
DiscordRPC.state = "Paused"
print(DiscordRPC.get_current_user())
DiscordRPC.state = "Paused"
print(DiscordRPC.get_current_user())
else:
if DiscordRPC.app_id != 1302002529378369568:
DiscordRPC.start_timestamp = int(Time.get_unix_time_from_system() - (current_progress.value * CurrentSongLenth / current_progress.max_value))
print(DiscordRPC.get_current_user())
DiscordRPC.state = "Listening To Music"
DiscordRPC.start_timestamp = int(Time.get_unix_time_from_system() - (current_progress.value * CurrentSongLenth / current_progress.max_value))
print(DiscordRPC.get_current_user())
DiscordRPC.state = "Listening To Music"
Paused = false
music_player.stream_paused = false
play_list.icon = PAUSE
@@ -366,8 +362,7 @@ func PlaySongs():
if !CurrentDir.ends_with(CurrentPlaylist):
GetSongs(PlaylistsLocation[CurrentPlaylist])
var CurrentSongDir:String = PlaylistsLocation[CurrentPlaylist] + "/" + textSongs[index]
if DiscordRPC.app_id != 1302002529378369568:
DiscordRPC.details = textSongs[index].replace(".mp3","")
DiscordRPC.details = textSongs[index].replace(".mp3","")
print(CurrentSongDir)
var sonnname:String = textSongs[index]
sonnname = sonnname.replace(".mp3", "")
@@ -476,26 +471,26 @@ 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
if music_player.playing:
TimeSpentListening += _delta
CurrentPausedIndicatorShaderIntensity = lerp(CurrentPausedIndicatorShaderIntensity,0.0,0.1)
if DiscordRPC.app_id != 1302002529378369568:
DiscordRPC.state = "Listening To Music"
DiscordRPC.state = "Listening To Music"
else:
if DiscordRPC.app_id != 1302002529378369568:
DiscordRPC.start_timestamp = int(0)
DiscordRPC.state = "Paused"
if DiscordRPC.get_is_discord_working():
DiscordRPC.refresh()
DiscordRPC.start_timestamp = int(0)
DiscordRPC.state = "Paused"
if DiscordRPC.get_is_discord_working():
DiscordRPC.refresh()
CurrentPausedIndicatorShaderIntensity = lerp(CurrentPausedIndicatorShaderIntensity,1.0,0.1)
if DiscordRichPresenceEnabled:
DiscordRPC.run_callbacks()
@@ -535,31 +530,30 @@ func _process(_delta: float) -> void:
func UpdateSplashes():
if DiscordRPC.app_id != 1302002529378369568:
if DiscordRPC.get_is_discord_working():
SplashStrings = ["Total listening time: %s!" % str(str(int(TimeSpentListening/60)/60 )
+ "h : " + str((int(TimeSpentListening) / 60) % 60) + "m : " +
str(int(TimeSpentListening) % 60) + "s"),
"Version: %s" % version.text,"🤷‍♂️","This Changes every ~11 seconds",
"hello everybody my name is %s" % DiscordRPC.get_current_user()["username"],
"wash your dishes, i know you got some","Running on %s" % OS.get_distribution_name(),
"%s is cooking" % DiscordRPC.get_current_user()["username"], "debugging" if OS.has_feature("editor") else "Release build",
"this user chose to show you all this info","Playing a Banger",
":steamhappy:","This is a sign that crocodiles live in water",
"Space? SPACE?! SPAAAAAAAAAAAAACE!!!",
"i love gd colonge",
"listening with reverb" if settings_menu_child.reverb_check.button_pressed else
"not listening with reverb","the cake is edible",
"what a great song!","this message is useless",
"stop reading these","why are you reading these",
"hello from mars", "hello to mars","there is a fly in my room",
"yippee!","What, are they allergic to bathtubs or something",
"Did you know, a 737 can land with up to 33knots of wind!",
"Welcome to todays JahresSchau",
"ram is very useful","your cpu is tasty","main course: Nvidia GPU",
"SCHOTTLAND FUER IMMER","i eat airborne vehicles","linus trovalds",
"","\(〇_o)/","Nuh Uh!","Yuh Huh","Breaching.",
"I get a narcissistic injury when the wall ignores me","totally not using %s" % version.text]
if DiscordRPC.get_is_discord_working():
SplashStrings = ["Total listening time: %s!" % str(str(int(TimeSpentListening/60)/60 )
+ "h : " + str((int(TimeSpentListening) / 60) % 60) + "m : " +
str(int(TimeSpentListening) % 60) + "s"),
"Version: %s" % version.text,"🤷‍♂️","This Changes every ~11 seconds",
"hello everybody my name is %s" % DiscordRPC.get_current_user()["username"],
"wash your dishes, i know you got some","Running on %s" % OS.get_distribution_name(),
"%s is cooking" % DiscordRPC.get_current_user()["username"], "debugging" if OS.has_feature("editor") else "Release build",
"this user chose to show you all this info","Playing a Banger",
":steamhappy:","This is a sign that crocodiles live in water",
"Space? SPACE?! SPAAAAAAAAAAAAACE!!!",
"i love gd colonge",
"listening with reverb" if settings_menu_child.reverb_check.button_pressed else
"not listening with reverb","the cake is edible",
"what a great song!","this message is useless",
"stop reading these","why are you reading these",
"hello from mars", "hello to mars","there is a fly in my room",
"yippee!","What, are they allergic to bathtubs or something",
"Did you know, a 737 can land with up to 33knots of wind!",
"Welcome to todays JahresSchau",
"ram is very useful","your cpu is tasty","main course: Nvidia GPU",
"SCHOTTLAND FUER IMMER","i eat airborne vehicles","linus trovalds",
"","\(〇_o)/","Nuh Uh!","Yuh Huh","Breaching.",
"I get a narcissistic injury when the wall ignores me","totally not using %s" % version.text]
func SaveEverything():
@@ -638,4 +632,4 @@ func loadPlaylists():
print(Playlists.keys())
print("Playlists")
file.close()
file2.close()
file2.close()
+24 -23
View File
@@ -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()