chore: Tutorial Level Tiles gesetzt

project.godot

@@ -133,8 +133,8 @@ settings/fps/force_fps=60
 
 window/size/width=640
 window/size/height=360
-window/size/test_width=1920
-window/size/test_height=1080
+window/size/test_width=1240
+window/size/test_height=720
 window/stretch/mode="2d"
 window/stretch/aspect="expand"
 

src/Actors/Blobby/Blobby.tscn

@@ -10,7 +10,7 @@
 [ext_resource path="res://assets/effects/jump-point.png" type="Texture" id=8]
 
 [sub_resource type="RectangleShape2D" id=2]
-extents = Vector2( 11.9219, 10.0313 )
+extents = Vector2( 14.9127, 5.98593 )
 
 [sub_resource type="StreamTexture" id=62]
 load_path = "res://.import/blobby-spritesheet.png-205c8efc79bec685345a637ed2dcfc9b.stex"
@@ -309,7 +309,7 @@ graph_offset = Vector2( 1135.54, -198.431 )
 [sub_resource type="AnimationNodeStateMachinePlayback" id=48]
 
 [sub_resource type="RectangleShape2D" id=1]
-extents = Vector2( 12, 9.981 )
+extents = Vector2( 12.971, 8.99662 )
 
 [sub_resource type="Animation" id=17]
 length = 0.001
@@ -4218,7 +4218,7 @@ process_priority = -1
 collision_mask = 254
 
 [node name="CollisionPolygon2D" type="CollisionShape2D" parent="BlobbySkin"]
-position = Vector2( 0.0469954, -10.0308 )
+position = Vector2( 0.0286326, -10.0053 )
 scale = Vector2( 1.03, 1.04 )
 shape = SubResource( 2 )
 
@@ -4233,10 +4233,12 @@ visible = false
 [node name="BlobbySprite" type="Sprite" parent="."]
 material = ExtResource( 2 )
 position = Vector2( 0, -16 )
+scale = Vector2( -1, 1 )
 texture = SubResource( 62 )
+offset = Vector2( 1, 0 )
 hframes = 6
 vframes = 6
-frame = 12
+frame = 5
 __meta__ = {
 "_editor_description_": "YXNlcHJpdGVfd2l6YXJkX2NvbmZpZwpwbGF5ZXJ8PUJsb2JieVNwcml0ZS9CbG9iYnltYXRpb25QbGF5ZXIKc291cmNlfD1yZXM6Ly9hc3NldHMvYmxvYmJ5L2Jsb2JieS1zcHJpdGVzaGVldHQuYXNlcHJpdGUKbGF5ZXJ8PUJsb2JieQpvcF9leHB8PUZhbHNlCm9fZm9sZGVyfD0Kb19uYW1lfD0Kb25seV92aXNpYmxlfD1GYWxzZQpvX2V4X3B8PQo="
 }
@@ -4341,7 +4343,7 @@ position = Vector2( 0, -9 )
 scale = Vector2( 0.48, 0.48 )
 
 [node name="BlobbyBody" type="CollisionShape2D" parent="." groups=["player"]]
-position = Vector2( -0.0184917, -10.0133 )
+position = Vector2( 0.0392303, -10.002 )
 shape = SubResource( 1 )
 
 [node name="WallRaycasts" type="Node2D" parent="."]
@@ -4350,13 +4352,13 @@ position = Vector2( 0, -1 )
 [node name="LeftWallRaycast" type="Node2D" parent="WallRaycasts"]
 
 [node name="Left_Wallcast1" type="RayCast2D" parent="WallRaycasts/LeftWallRaycast"]
-position = Vector2( -12, -9.013 )
+position = Vector2( -11.9763, -5 )
 enabled = true
 cast_to = Vector2( -2, 0 )
 collision_mask = 40
 
 [node name="Left_Wallcast2" type="RayCast2D" parent="WallRaycasts/LeftWallRaycast"]
-position = Vector2( -12, -1.942 )
+position = Vector2( -11.9763, 5 )
 enabled = true
 cast_to = Vector2( -2, 0 )
 collision_mask = 40
@@ -4364,13 +4366,13 @@ collision_mask = 40
 [node name="RightWallRaycast" type="Node2D" parent="WallRaycasts"]
 
 [node name="Right_Wallcast1" type="RayCast2D" parent="WallRaycasts/RightWallRaycast"]
-position = Vector2( 12.0573, -9.0133 )
+position = Vector2( 12.0551, -5 )
 enabled = true
 cast_to = Vector2( 2, 0 )
 collision_mask = 40
 
 [node name="Right_Wallcast2" type="RayCast2D" parent="WallRaycasts/RightWallRaycast"]
-position = Vector2( 12.0573, -1.94163 )
+position = Vector2( 12.0551, 5 )
 enabled = true
 cast_to = Vector2( 2, 0 )
 collision_mask = 40

src/Actors/BlobbyCam.tscn

@@ -1031,10 +1031,9 @@ texture = ExtResource( 8 )
 
 [node name="AnimatedSprite" type="AnimatedSprite" parent="ParallaxBackground/ParallaxLayer5"]
 frames = SubResource( 7 )
-frame = 13
 playing = true
 
 [node name="AnimatedSprite2" type="AnimatedSprite" parent="ParallaxBackground/ParallaxLayer5"]
 frames = SubResource( 8 )
-frame = 4
+frame = 5
 playing = true

src/BenefitialObjects/Coin.tscn

@@ -446,6 +446,7 @@ shader_param/lerp_color = Color( 0.658824, 0.901961, 0.8, 1 )
 
 [node name="Coin" type="Area2D"]
 position = Vector2( -6, -6 )
+scale = Vector2( 0.8, 0.8 )
 collision_layer = 4
 monitorable = false
 script = ExtResource( 2 )
@@ -465,7 +466,7 @@ rotation = -0.235619
 scale = Vector2( 0.036, 0.036 )
 frames = SubResource( 4 )
 animation = "rotate"
-frame = 161
+frame = 148
 playing = true
 
 [node name="Sprite" type="Sprite" parent="."]

src/Environment/Grass/ShaderGrass.gd

@@ -10,6 +10,7 @@ var radius = 15
 export var v_radius = 15
 export var draft_radius = 20
 export var interact_power = 0.04
+export var max_displacement = 7
 export var fps_limit := 30
 var rand = rand_range(1,1.3)
 var displacement_coeff: Vector2 = Vector2(1.0,0)
@@ -20,6 +21,8 @@ var begin_idle
 var time_since_last_exec := 0.0
 # var thread : Thread
 
+var saved_coeff:= 0.0
+
 func _ready():
     # TODO This could probably fuck something up later? For other randomness based events
     randomize()
@@ -44,6 +47,8 @@ func grass_wave_update(delta: float) -> void:
     time_since_last_exec = 0.0
     var distance: float = abs(global_position.x - blobby.global_position.x + 6)
     var v_distance: float = abs(global_position.y - blobby.global_position.y + 11)
+    #if (distance > draft_radius * 2 || v_distance > v_radius * 2):
+    #    return
     #Velocity relative to the grass, increasing distance is - velocity
     var blobby_vel = (last_distance.x - distance)/delta
     var blobby_vert_vel = (last_distance.y - v_distance)/delta
@@ -88,10 +93,13 @@ func grass_wave_update(delta: float) -> void:
             var start = displacement_coeff.x if begin_idle else 0.0
             displacement_coeff.x = start * exp(-0.2 * (time-start_swing_time)) + 0.3 * -sin(2.0*(time - start_swing_time))
             begin_idle = false
-        
+   # if(displacement_coeff.x > saved_coeff):
+   #     print(displacement_coeff.x)
+   #     saved_coeff = displacement_coeff.x
     for polygon in get_children():
         if polygon is Polygon2D:
-            polygon.material.set_shader_param("displacement_coefficient_x", displacement_coeff.x)
+            polygon.material.set_shader_param("displacement_coefficient_x",
+             clamp(displacement_coeff.x, -max_displacement, max_displacement))
             break
 
     last_distance = Vector2(distance, v_distance)

src/Environment/Grass/ShaderGrass.tscn

@@ -11,7 +11,8 @@
 
 [node name="ShaderGrass" type="Node2D"]
 script = ExtResource( 2 )
-interact_power = 0.055
+interact_power = 0.07
+max_displacement = 7
 
 [node name="StraightStraw" type="Polygon2D" parent="."]
 material = ExtResource( 3 )

src/Levels/5 Tutorial Level.tscn

@@ -67,10 +67,10 @@ unique_name_in_owner = true
 drag_margin_bottom = 0.3
 
 [node name="AnimatedSprite" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="4"]
-frame = 1
+frame = 13
 
 [node name="AnimatedSprite2" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="5"]
-frame = 0
+frame = 12
 
 [node name="Blobby" parent="." instance=ExtResource( 9 )]
 unique_name_in_owner = true

src/Levels/6 Tutorial Level.tscn

@@ -260,10 +260,10 @@ visible = false
 drag_margin_bottom = 0.3
 
 [node name="AnimatedSprite" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="4"]
-frame = 1
+frame = 6
 
 [node name="AnimatedSprite2" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="5"]
-frame = 9
+frame = 0
 
 [node name="Blobby" parent="." instance=ExtResource( 9 )]
 unique_name_in_owner = true

src/Levels/Actual Level 1.tscn

@@ -45,39 +45,19 @@ wait_time = 20.0
 unique_name_in_owner = true
 
 [node name="AnimatedSprite" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="4"]
-frame = 0
+frame = 13
+
+[node name="AnimatedSprite2" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="5"]
+frame = 3
 
 [node name="Blobby" parent="." instance=ExtResource( 15 )]
 unique_name_in_owner = true
 position = Vector2( 251, -24 )
 scale = Vector2( 0.878906, 0.936025 )
 
-[node name="CollisionPolygon2D" parent="Blobby/BlobbySkin" index="0"]
-position = Vector2( 0.0286326, -10.0053 )
-
-[node name="BlobbySprite" parent="Blobby" index="4"]
-scale = Vector2( -1, 1 )
-offset = Vector2( 1, 0 )
-frame = 5
-
 [node name="BlobbymationTree" parent="Blobby/BlobbySprite" index="0"]
 parameters/playback = SubResource( 1 )
 
-[node name="BlobbyBody" parent="Blobby" index="9"]
-position = Vector2( 0.0392303, -10.002 )
-
-[node name="Left_Wallcast1" parent="Blobby/WallRaycasts/LeftWallRaycast" index="0"]
-position = Vector2( -11.9763, -5 )
-
-[node name="Left_Wallcast2" parent="Blobby/WallRaycasts/LeftWallRaycast" index="1"]
-position = Vector2( -11.9763, 5 )
-
-[node name="Right_Wallcast1" parent="Blobby/WallRaycasts/RightWallRaycast" index="0"]
-position = Vector2( 12.0551, -5 )
-
-[node name="Right_Wallcast2" parent="Blobby/WallRaycasts/RightWallRaycast" index="1"]
-position = Vector2( 12.0551, 5 )
-
 [node name="GateButton" parent="." instance=ExtResource( 5 )]
 position = Vector2( 371, -45 )
 

src/Sounds/default_bus_layout.tres

@@ -56,7 +56,7 @@ bus/2/name = "Effects"
 bus/2/solo = false
 bus/2/mute = false
 bus/2/bypass_fx = false
-bus/2/volume_db = 0.0
+bus/2/volume_db = -6.0206
 bus/2/send = "Master"
 bus/2/effect/0/effect = SubResource( 3 )
 bus/2/effect/0/enabled = false
@@ -68,7 +68,7 @@ bus/3/name = "UI"
 bus/3/solo = false
 bus/3/mute = false
 bus/3/bypass_fx = false
-bus/3/volume_db = 0.0
+bus/3/volume_db = -3.09804
 bus/3/send = "Master"
 bus/3/effect/0/effect = SubResource( 6 )
 bus/3/effect/0/enabled = true

src/UserInterface/Screens/MainMenu/MainScreen.tscn

@@ -215,7 +215,6 @@ margin_right = 65.0
 margin_bottom = 55.5
 grow_horizontal = 2
 grow_vertical = 2
-focus_mode = 2
 size_flags_horizontal = 3
 size_flags_vertical = 3
 theme = ExtResource( 13 )

src/UserInterface/TutorialThingy.gd

@@ -12,7 +12,6 @@ onready var button = $Button
 var screen_size: Vector2
 var tex_size: Vector2
 var screen_stretch_factor: Vector2
-var rng = RandomNumberGenerator.new()
 var moving = false
 var tutorial_begun = false
 var tutorial_area_entered = false
@@ -93,9 +92,10 @@ func _lesson_learned(animation_name: String) -> void:
     queue_free()
 
 func start_tutorial():
+    var rng = RandomNumberGenerator.new()
     rng.randomize()
-    position.x += rng.randf_range(-100, 100) 
-    position.y += rng.randf_range(-100, 100)
+    position.x += rng.randf_range(-50, 50)
+    position.y += rng.randf_range(-50, 50)
     velocity.x = velocity.x * sign(rng.randf_range(-1,1))
     velocity.y = velocity.y * sign(rng.randf_range(-1,1))
     tutorial_begun = true