Compare commits

...

3 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
notdraimdev 424e591064 added easter egg
bug fixes
2024-11-01 23:10:56 +01:00
13 changed files with 162 additions and 55 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]
+9 -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="."]
@@ -775,10 +776,12 @@ offset_top = 24.0
offset_right = -328.0
offset_bottom = 80.0
grow_horizontal = 2
focus_mode = 0
text = "Select Songs"
script = ExtResource("27_f8wx0")
[node name="SearchResults" parent="." instance=ExtResource("27_g8wmp")]
visible = false
layout_mode = 1
anchors_preset = -1
anchor_left = 0.0
@@ -848,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
+41 -18
View File
@@ -32,7 +32,7 @@ extends Control
@onready var delete_confirm: ConfirmationDialog = $deleteConfirm
@onready var search_bar: LineEdit = $SearchBar
var DiscordUsername:String
const PLAYLIST_DISPLAY = preload("res://PlaylistDisplay.tscn")
const PAUSE = preload("res://Pause.png")
@@ -109,6 +109,9 @@ func _ready() -> void:
child.PlaylistSongs = Playlists[Playlist]
playlists_holder.add_child(child)
if data != null:
if data.has("DiscordUsername"):
DiscordUsername = data["DiscordUsername"]
print("stiff ",data)
if data.has("Volume"):
print(data["Volume"])
SetVolume(data["Volume"])
@@ -171,9 +174,30 @@ func _ready() -> void:
DirectorySelected(Strin)
PlaySongs()
#PlaySongs()
DiscordRPC.app_id = 1276916292170809426
DiscordRPC.refresh()
setUpDiscord()
for child in get_children(true):
if child is Control:
child.focus_mode = child is LineEdit
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()
# 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
@@ -183,12 +207,7 @@ func _ready() -> void:
# 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
DiscordRPC.large_image = "logo"
# 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
@@ -308,17 +327,15 @@ func PlaySongs():
if music_player.playing:
Paused = true
DiscordRPC.state = "Paused"
music_player.stream_paused = true
play_list.icon = PLAY
DiscordRPC.state = "Paused"
print(DiscordRPC.get_current_user())
else:
DiscordRPC.start_timestamp = int(Time.get_unix_time_from_system() - (current_progress.value * CurrentSongLenth / current_progress.max_value))
print(DiscordRPC.get_current_user())
if DiscordRPC.get_current_user().get("username") == "_bucketofchicken":
DiscordRPC.state = "i made the music player btw"
else:
DiscordRPC.state = "Listening To Music"
DiscordRPC.state = "Listening To Music"
Paused = false
music_player.stream_paused = false
play_list.icon = PAUSE
@@ -448,22 +465,27 @@ func _process(_delta: float) -> void:
BackroundSetup = true
if currentSaveTime < 0:
currentSaveTime = SaveInterval
DiscordUsername = DiscordRPC.get_current_user().get("username")
print(DiscordRPC.get_current_user())
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
DiscordRPC.state = "Listening To Music"
CurrentPausedIndicatorShaderIntensity = lerp(CurrentPausedIndicatorShaderIntensity,0.0,0.1)
DiscordRPC.state = "Listening To Music"
else:
DiscordRPC.start_timestamp = int(0)
DiscordRPC.state = "Paused"
@@ -554,7 +576,8 @@ func SaveEverything():
"CompressionRatio" : settings_menu_child.ratio_slider.value ,
"CompressionGain" : settings_menu_child.gain_slider.value,
"CurrentCustomBackroundImageDirectory" : CurrentCustomBackroundImageDirectory,
"PlayAllLists" : PlayAllLists
"PlayAllLists" : PlayAllLists,
"DiscordUsername" : DiscordRPC.get_current_user().get("username")
}
saveUserdata(Data)
savePlaylists()
@@ -609,4 +632,4 @@ func loadPlaylists():
print(Playlists.keys())
print("Playlists")
file.close()
file2.close()
file2.close()
+1 -1
View File
@@ -6,7 +6,7 @@ extends Control
@onready var options_dropdown: MenuButton = $HSplitContainer/HBoxContainer/OptionsDropdown
@onready var confirmation: ConfirmationDialog = $ConfirmationDialog
@onready var Parent:MainScene = get_tree().root.get_child(2)
@onready var Parent:MainScene = get_tree().root.get_child(3)
@export var Current:bool
var PlaylistLocation:String = ""
+1
View File
@@ -24,6 +24,7 @@ config/windows_native_icon="res://addons/godot-yt-dlp/src/favicon2.ico"
YtDlp="*res://addons/godot-yt-dlp/src/yt_dlp.gd"
MusicMetadataAutoload="*res://MusicMeta-f98d7384de3e2e658dcba3f5b06fb5b57ac2c73c/MusicMeta.gd"
DiscordRPCLoader="*res://addons/discord-rpc-gd/nodes/discord_autoload.gd"
[display]
+1 -1
View File
@@ -1,5 +1,5 @@
extends Control
@onready var Parent:MainScene = get_tree().root.get_child(2)
@onready var Parent:MainScene = get_tree().root.get_child(3)
@onready var version: Label = $"../Version"
@onready var http_request := $HTTPRequest as HTTPRequest
+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()
+1 -1
View File
@@ -11,7 +11,7 @@ var Target:float = 50
var downloadList:bool = false
signal ContinueProcess
@onready var Parent:MainScene = get_tree().root.get_child(2)
@onready var Parent:MainScene = get_tree().root.get_child(3)
# Called when the node enters the scene tree for the first time.
func _ready() -> void: