CommonParrot/Blobby
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: coin collections get saved, level fixes

Browse Source
This commit is contained in:
Jakob Feldmann 2023-10-12 20:54:53 +02:00
parent 06345bbfe7
commit 2d9a4337be
13 changed files with 22 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/Actors/Friendlies/WhatAreFrog.tscn
View File

@ -1,4 +1,4 @@
[gd_scene load_steps=52 format=2]
[gd_scene load_steps=50 format=2]
[ext_resource path="res://assets/enemy/froshler.png" type="Texture" id=1]
[ext_resource path="res://src/Actors/Friendlies/WhatAreFrog.gd" type="Script" id=2]
@ -8,38 +8,6 @@
[ext_resource path="res://assets/enemy/leash-hook.png" type="Texture" id=6]
[ext_resource path="res://src/Utilities/SceneAudio.tscn" type="PackedScene" id=7]
[sub_resource type="Shader" id=61]
code = "shader_type canvas_item;
uniform float wavelength = 10.0;
uniform float wavespeed = 1.0;
uniform float alpha = 0.25;
uniform float displacement = 0.0;
uniform float displacement_speed = 1.0;
uniform sampler2D noise_texture;
uniform sampler2D noise_displacement_texture;
uniform sampler2D gradiant;
void vertex()
{
vec3 perlin = texture(noise_displacement_texture, UV + (TIME * displacement_speed)).rgb;
VERTEX = VERTEX + (perlin * displacement);
}
void fragment()
{
vec3 perlin = texture(noise_texture, UV).rgb;
float ndotp = dot(VIEW, perlin) * wavelength;
float waves = (1.0 + sin(ndotp + TIME * wavespeed)) / 2.0;
vec4 color = texture(gradiant, vec2(waves, 0.5));
ALBEDO = color.rgb;
ALPHA = min(color.a, alpha);
}"
[sub_resource type="ShaderMaterial" id=62]
shader = SubResource( 61 )
[sub_resource type="Animation" id=5]
length = 0.001
tracks/0/type = "value"
@ -511,7 +479,6 @@ texture = ExtResource( 6 )
[node name="FrogSprite" type="Sprite" parent="."]
unique_name_in_owner = true
material = SubResource( 62 )
position = Vector2( 0, -7 )
texture = ExtResource( 1 )
hframes = 2

14
src/BenefitialObjects/Coin.gd
View File

@ -14,18 +14,20 @@ func _ready() -> void:
if collected_saved != null:
was_collected = collected_saved
if was_collected:
collected()
visible = false
func _on_body_entered(_body: Node) -> void:
if $AudioStreamPlayer.playing:
if was_collected == true:
visible = false
return
level_state.set_currency(level_state.get_currency() + currencyValue)
$CollisionShape2D.disabled = true
set_deferred("monitoring", false)
if $AudioStreamPlayer.playing:
return
$AudioStreamPlayer.play()
was_collected = true
anim_player.play("fade_out")
func collected() -> void:
queue_free()

18
src/BenefitialObjects/Coin.tscn
View File

@ -23,20 +23,6 @@ tracks/0/keys = {
"update": 0,
"values": [ Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 0 ) ]
}
tracks/1/type = "method"
tracks/1/path = NodePath(".")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/imported = false
tracks/1/enabled = false
tracks/1/keys = {
"times": PoolRealArray( 0.1 ),
"transitions": PoolRealArray( 1 ),
"values": [ {
"args": [ ],
"method": "queue_free"
} ]
}
[sub_resource type="Animation" id=3]
resource_name = "oscilating"
@ -129,13 +115,13 @@ anims/fade_out = SubResource( 2 )
anims/oscilating = SubResource( 3 )
[node name="Sprite2" type="Sprite" parent="."]
position = Vector2( 0, 1.28561 )
position = Vector2( 0, 2.62356 )
scale = Vector2( -0.484, -0.5 )
texture = ExtResource( 1 )
[node name="Sprite" type="Sprite" parent="."]
material = SubResource( 6 )
position = Vector2( 0.0560874, 1.24152 )
position = Vector2( 0.0564967, 2.37292 )
texture = ExtResource( 317 )
[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]

2
src/Levels/Level 0.1.tscn
View File

@ -1329,7 +1329,7 @@ position = Vector2( -70, 1 )
scale = Vector2( 0.878906, 0.936025 )
[node name="BlobbySprite" parent="Blobby" index="5"]
frame = 7
frame = 9
[node name="BlobbymationTree" parent="Blobby/BlobbySprite" index="0"]
parameters/playback = SubResource( 33 )

2
src/Levels/Level 0.2.tscn
View File

@ -1169,7 +1169,7 @@ position = Vector2( -156, -51 )
scale = Vector2( 0.878906, 0.936025 )
[node name="BlobbySprite" parent="Blobby" index="5"]
frame = 10
frame = 7
[node name="BlobbymationTree" parent="Blobby/BlobbySprite" index="0"]
parameters/playback = SubResource( 6 )

2
src/Levels/Level 0.3.tscn
View File

@ -237,7 +237,7 @@ position = Vector2( -180, 113 )
scale = Vector2( 0.878906, 0.936025 )
[node name="BlobbySprite" parent="Blobby" index="5"]
frame = 6
frame = 7
[node name="BlobbymationTree" parent="Blobby/BlobbySprite" index="0"]
parameters/playback = SubResource( 6 )

2
src/Levels/Level 0.4.tscn
View File

@ -126,7 +126,7 @@ position = Vector2( -70, 1 )
scale = Vector2( 0.878906, 0.936025 )
[node name="BlobbySprite" parent="Blobby" index="5"]
frame = 9
frame = 7
[node name="BlobbymationTree" parent="Blobby/BlobbySprite" index="0"]
parameters/playback = SubResource( 6 )

2
src/Levels/Level 0.5.tscn
View File

@ -128,7 +128,7 @@ death_sound_1 = null
death_sound_2 = null
[node name="BlobbySprite" parent="Blobby" index="5"]
frame = 7
frame = 6
[node name="BlobbymationTree" parent="Blobby/BlobbySprite" index="0"]
parameters/playback = SubResource( 7 )

2
src/Levels/Level 0.6.tscn
View File

@ -191,7 +191,7 @@ death_sound_1 = null
death_sound_2 = null
[node name="BlobbySprite" parent="Blobby" index="5"]
frame = 6
frame = 7
[node name="BlobbymationTree" parent="Blobby/BlobbySprite" index="0"]
parameters/playback = SubResource( 53 )

2
src/Levels/Level 2.tscn
View File

@ -132,7 +132,7 @@ position = Vector2( -64, -2.84217e-14 )
scale = Vector2( 0.878906, 0.936025 )
[node name="BlobbySprite" parent="Blobby" index="5"]
frame = 6
frame = 7
[node name="BlobbymationTree" parent="Blobby/BlobbySprite" index="0"]
parameters/playback = SubResource( 6 )

4
src/Levels/Level 4.tscn
View File

@ -116,11 +116,11 @@ drag_margin_bottom = 0.3
[node name="Blobby" parent="." instance=ExtResource( 8 )]
unique_name_in_owner = true
position = Vector2( -183, 111 )
position = Vector2( -167, 111 )
scale = Vector2( 0.878906, 0.936025 )
[node name="BlobbySprite" parent="Blobby" index="5"]
frame = 9
frame = 6
[node name="BlobbymationTree" parent="Blobby/BlobbySprite" index="0"]
parameters/playback = SubResource( 6 )

2
src/Levels/Level 5.tscn
View File

@ -186,7 +186,7 @@ position = Vector2( -45, -5.96046e-08 )
scale = Vector2( 0.878906, 0.936025 )
[node name="BlobbySprite" parent="Blobby" index="5"]
frame = 7
frame = 9
[node name="BlobbymationTree" parent="Blobby/BlobbySprite" index="0"]
parameters/playback = SubResource( 6 )

2
src/Sounds/default_bus_layout.tres
View File

@ -41,7 +41,7 @@ resource_name = "LowPassFilter"
cutoff_hz = 3000.0
[resource]
bus/0/volume_db = -12.3958
bus/0/volume_db = -4.43698
bus/1/name = "Music"
bus/1/solo = false
bus/1/mute = false