- Musik Hinzugefügt

- Settings für Musik
- Angefangen mit Wüstenbiom
- Wolken Texture fix
This commit is contained in:
megamichi 2024-10-08 20:53:45 +02:00
parent 9a2b3c1677
commit 4676b83b61
25 changed files with 410 additions and 53 deletions

BIN
assets/GUI/note button.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

View file

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://b4k3dsaoft0uf"
path="res://.godot/imported/note button.png-d01ea21981304add54e4d620f6e0137c.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/GUI/note button.png"
dest_files=["res://.godot/imported/note button.png-d01ea21981304add54e4d620f6e0137c.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: 5.6 KiB

View file

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://d0s1arwpmlxot"
path="res://.godot/imported/sound button off.png-364c5b9e9d325567ac89e0662c159ee6.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/GUI/sound button off.png"
dest_files=["res://.godot/imported/sound button off.png-364c5b9e9d325567ac89e0662c159ee6.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

BIN
assets/GUI/sound button.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.3 KiB

View file

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://46wo0ufacs5d"
path="res://.godot/imported/sound button.png-cbd8cb8ff7b0b3140245c51cf2746007.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/GUI/sound button.png"
dest_files=["res://.godot/imported/sound button.png-cbd8cb8ff7b0b3140245c51cf2746007.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

View file

Before

Width:  |  Height:  |  Size: 9.6 KiB

After

Width:  |  Height:  |  Size: 9.6 KiB

View file

@ -3,15 +3,15 @@
importer="texture" importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://bg78j6xxw3ck4" uid="uid://bg78j6xxw3ck4"
path="res://.godot/imported/background.png-b4e7437f07894e7f253b684ff783fbd2.ctex" path="res://.godot/imported/normal.png-37b1636db5b68b29e796c7291d1e7fb7.ctex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
[deps] [deps]
source_file="res://assets/Ground/background.png" source_file="res://assets/Ground/normal.png"
dest_files=["res://.godot/imported/background.png-b4e7437f07894e7f253b684ff783fbd2.ctex"] dest_files=["res://.godot/imported/normal.png-37b1636db5b68b29e796c7291d1e7fb7.ctex"]
[params] [params]

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

View file

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://cthy542lxhe5q"
path="res://.godot/imported/normal_wueste.png-89ab2ffcf2bef316921cd900939a3c10.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/Ground/normal_wueste.png"
dest_files=["res://.godot/imported/normal_wueste.png-89ab2ffcf2bef316921cd900939a3c10.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

BIN
assets/Ground/wueste.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

View file

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://bc586lwyvhc0x"
path="res://.godot/imported/wueste.png-5ab8ec82be959612090d314f1b3048a9.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://assets/Ground/wueste.png"
dest_files=["res://.godot/imported/wueste.png-5ab8ec82be959612090d314f1b3048a9.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

BIN
assets/audio/duckrun.mmpz Normal file

Binary file not shown.

BIN
assets/audio/duckrun.wav Normal file

Binary file not shown.

View file

@ -0,0 +1,24 @@
[remap]
importer="wav"
type="AudioStreamWAV"
uid="uid://c4wrtvywao1jn"
path="res://.godot/imported/duckrun.wav-242d7e6ae3c6a4a64a5d4361cd433eb4.sample"
[deps]
source_file="res://assets/audio/duckrun.wav"
dest_files=["res://.godot/imported/duckrun.wav-242d7e6ae3c6a4a64a5d4361cd433eb4.sample"]
[params]
force/8_bit=false
force/mono=false
force/max_rate=false
force/max_rate_hz=44100
edit/trim=false
edit/normalize=false
edit/loop_mode=3
edit/loop_begin=0
edit/loop_end=-1
compress/mode=0

Binary file not shown.

View file

@ -1,19 +0,0 @@
[remap]
importer="oggvorbisstr"
type="AudioStreamOggVorbis"
uid="uid://bewyogh2fo3uk"
path="res://.godot/imported/quak.ogg-b0e6bc2e0145f8282fd075381e14b36c.oggvorbisstr"
[deps]
source_file="res://assets/audio/quak.ogg"
dest_files=["res://.godot/imported/quak.ogg-b0e6bc2e0145f8282fd075381e14b36c.oggvorbisstr"]
[params]
loop=false
loop_offset=0
bpm=0
beat_count=0
bar_beats=4

6
code/GUI/gui.gd Normal file
View file

@ -0,0 +1,6 @@
extends Control
# Called when the node enters the scene tree for the first time.
func _ready() -> void:
show()

View file

@ -1,8 +1,12 @@
extends TextureRect extends TextureRect
var audio_bus_music = 1
var audio_bus_sounds = 2
var sound_button_on_of = {true:preload("res://assets/GUI/sound button.png"),false:preload("res://assets/GUI/sound button off.png")}
# Called when the node enters the scene tree for the first time. # Called when the node enters the scene tree for the first time.
func _ready() -> void: func _ready() -> void:
#$"../../Audio/Duckrun".volume_db = linear_to_db(20*0.01)
$AnimationPlayer.play_backwards("out-in") $AnimationPlayer.play_backwards("out-in")
hide() hide()
@ -21,3 +25,13 @@ func _on_back_pressed() -> void:
await $AnimationPlayer.animation_finished await $AnimationPlayer.animation_finished
hide() hide()
$"../StartSchild"._ready() $"../StartSchild"._ready()
func _volume_slider_changed(value: float) -> void:
AudioServer.set_bus_volume_db(audio_bus_music,linear_to_db(value*0.01))
func _on_sound_button_toggled(toggled_on: bool) -> void:
$SoundToggleButton.texture_normal = sound_button_on_of[AudioServer.is_bus_mute(audio_bus_sounds)]
AudioServer.set_bus_mute(audio_bus_sounds,not AudioServer.is_bus_mute(audio_bus_sounds))

View file

@ -1,5 +1,8 @@
extends Node extends Node
var biom_n = preload("res://assets/Ground/normal.png")
var biom_n_w = preload("res://assets/Ground/normal_wueste.png")
var biom_w = preload("res://assets/Ground/wueste.png")
func _ready() -> void: func _ready() -> void:
$Screen/Background/Floor/EasterEggFixCollision.disabled = false $Screen/Background/Floor/EasterEggFixCollision.disabled = false
@ -34,10 +37,9 @@ func _process(delta):
var bla = (background_size_x) + $Screen/Background/Sprite.position.x var bla = (background_size_x) + $Screen/Background/Sprite.position.x
print(background_size_x)
print(bla)
if $"/root/Global".gamerunning: if $"/root/Global".gamerunning:
$Screen/Background/Sprite.position.x -= $"/root/Global".speed*delta $Screen/Background/Sprite.position.x -= $"/root/Global".speed*delta
if bla <= 0: if bla <= 0:
#$Screen/Background/Sprite.texture =biom_n_w
$Screen/Background/Sprite.position.x = 0 $Screen/Background/Sprite.position.x = 0

15
default_bus_layout.tres Normal file
View file

@ -0,0 +1,15 @@
[gd_resource type="AudioBusLayout" format=3 uid="uid://dpjc8mup03kil"]
[resource]
bus/1/name = &"Background"
bus/1/solo = false
bus/1/mute = false
bus/1/bypass_fx = false
bus/1/volume_db = -21.8264
bus/1/send = &"Master"
bus/2/name = &"Sounds"
bus/2/solo = false
bus/2/mute = false
bus/2/bypass_fx = false
bus/2/volume_db = 0.0
bus/2/send = &"Master"

View file

@ -2,7 +2,7 @@
importer="font_data_dynamic" importer="font_data_dynamic"
type="FontFile" type="FontFile"
uid="uid://ddcous2vnc3ux" uid="uid://da6fxih8qew6g"
path="res://.godot/imported/m5x7.ttf-ede74fbe3753eb2fe0ebc455b7b3a4db.fontdata" path="res://.godot/imported/m5x7.ttf-ede74fbe3753eb2fe0ebc455b7b3a4db.fontdata"
[deps] [deps]

View file

@ -43,13 +43,11 @@ func _process(_delta: float) -> void:
$AnimationPlayer.play("walk") $AnimationPlayer.play("walk")
func _collide_with_hindernis(_body: Node2D) -> void: func _collide_with_hindernis(_body: Node2D) -> void:
print("colide")
if alive: if alive:
die() die()
func _color_slider_changed(value) -> void: func _color_slider_changed(value) -> void:
print($"../../Gui/Settings/ColorSlider".value*0.01)
$EnteConstantSprite/EnteColormask.modulate.h = $"../../Gui/Settings/ColorSlider".value*0.01 $EnteConstantSprite/EnteColormask.modulate.h = $"../../Gui/Settings/ColorSlider".value*0.01

File diff suppressed because one or more lines are too long

Binary file not shown.

Before

Width:  |  Height:  |  Size: 934 B

After

Width:  |  Height:  |  Size: 889 B