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

New Level Design Tests

Browse Source
This commit is contained in:
Jakob Feldmann 2023-04-05 19:28:30 +02:00
parent 3fd696d988
commit d3838a21fb
18 changed files with 506 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/obstacle object/mine.aseprite
View File

Binary file not shown.

BIN
assets/obstacle object/mine.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 295 B

After

Width:  |  Height:  |  Size: 274 B

2
src/Actors/Actor.gd
View File

@ -8,7 +8,7 @@ const PhysicsConst = preload("res://src/Utilities/Physic/PhysicsConst.gd")
const FLOOR_NORMAL := Vector2.UP
var stomp_feedback := 1200
var stomp_feedback := 1500
var reset_stomp_time := 0.108
var stomp_time := 0.108
var inair_velocity := 21

5
src/Actors/Blobby/Blobby.tscn
View File

@ -1,6 +1,7 @@
[gd_scene load_steps=117 format=2]
[gd_scene load_steps=118 format=2]
[ext_resource path="res://assets/blobby/blobby-effects-spritesheet.png" type="Texture" id=1]
[ext_resource path="res://src/Actors/Blobby/DeathShader.tres" type="Material" id=2]
[ext_resource path="res://src/Actors/Blobby/BlobbyStateMachine.gd" type="Script" id=3]
[ext_resource path="res://src/Actors/Blobby/Blobby.gd" type="Script" id=4]
[ext_resource path="res://assets/meta/new_dynamicfont.tres" type="DynamicFont" id=5]
@ -4540,7 +4541,6 @@ tracks/2/keys = {
}
[node name="Blobby" type="KinematicBody2D" groups=["player"]]
scale = Vector2( 0.879, 0.936 )
collision_mask = 248
collision/safe_margin = 0.001
script = ExtResource( 4 )
@ -4580,6 +4580,7 @@ transparent_bg = true
visible = false
[node name="BlobbySprite" type="Sprite" parent="."]
material = ExtResource( 2 )
position = Vector2( 0, -16 )
scale = Vector2( -1, 1 )
texture = SubResource( 62 )

10
src/Actors/Enemies/Beings/WhatAreFrog.gd
View File

@ -12,6 +12,7 @@ onready var state_machine = $Statemachine
onready var jump_timer: Timer
onready var target_lost_timer: Timer
onready var rng = RandomNumberGenerator.new()
onready var invincible_shader = preload("res://src/Actors/Blobby/InvincibleShader.tres")
# Is given in blocks
export var vision_distance := 6.0
@ -25,6 +26,7 @@ export var jump_time_hunt := 0.3
export var jump_time_standard_deviation := 0.1
# Also in blocks
var movement_radius: float
var anchor: Node2D
@ -74,6 +76,9 @@ func _on_StompDetector_body_entered(body: Node) -> void:
$StompDetector.remove_from_group("weakpoint")
signalManager.emit_signal("got_stomped")
is_hurt = true
$HurtTimer.start()
$FrogSprite.material = invincible_shader
func execute_movement(delta: float) -> void:
@ -486,3 +491,8 @@ func reverse_facing_direction() -> void:
func get_facing_direction() -> float:
return orientation.cast_to.x
func _on_HurtTimer_timeout() -> void:
is_hurt = false
$FrogSprite.material = null

5
src/Actors/Enemies/Beings/WhatAreFrog.tscn
View File

@ -559,6 +559,11 @@ collision_mask = 126
position = Vector2( 0, -0.738329 )
shape = SubResource( 3 )
[node name="HurtTimer" type="Timer" parent="."]
wait_time = 3.236
one_shot = true
[connection signal="body_entered" from="StompDetector" to="." method="_on_StompDetector_body_entered"]
[connection signal="area_entered" from="EnemySkin" to="." method="_on_EnemySkin_area_entered"]
[connection signal="body_entered" from="EnemySkin" to="." method="_on_EnemySkin_body_entered"]
[connection signal="timeout" from="HurtTimer" to="." method="_on_HurtTimer_timeout"]

71
src/Levels/01 Level.tscn → src/Levels/Legacy Levels/01 Level.tscn
View File

File diff suppressed because one or more lines are too long

6
src/Levels/02 Level.tscn → src/Levels/Legacy Levels/02 Level.tscn
View File

@ -3,7 +3,7 @@
[ext_resource path="res://src/Environment/AlienShipTileSet.tres" type="TileSet" id=1]
[ext_resource path="res://src/Actors/Blobby/Blobby.tscn" type="PackedScene" id=2]
[ext_resource path="res://src/ObstacleObjects/Spikes.tscn" type="PackedScene" id=3]
[ext_resource path="res://src/Levels/03 Level.tscn" type="PackedScene" id=4]
[ext_resource path="res://src/Levels/Legacy Levels/03 Level.tscn" type="PackedScene" id=4]
[ext_resource path="res://src/Platforms/FlyingPlatform.gd" type="Script" id=5]
[ext_resource path="res://src/Contraptions/Portal/Portal.tscn" type="PackedScene" id=6]
[ext_resource path="res://src/UserInterface/UserInterface.tscn" type="PackedScene" id=7]
@ -89,10 +89,10 @@ wait_time = 20.0
[node name="BlobbyCam" parent="." instance=ExtResource( 12 )]
[node name="AnimatedSprite" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="4"]
frame = 6
frame = 1
[node name="AnimatedSprite2" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="5"]
frame = 11
frame = 6
[node name="Blobby" parent="." instance=ExtResource( 2 )]
unique_name_in_owner = true

6
src/Levels/03 Level.tscn → src/Levels/Legacy Levels/03 Level.tscn
View File

@ -140,7 +140,7 @@ shape = SubResource( 3 )
position = Vector2( 0, 1.5 )
z_index = -1
frames = SubResource( 5 )
frame = 20
frame = 21
playing = true
[node name="Terminal" parent="." instance=ExtResource( 47 )]
@ -167,7 +167,6 @@ tile_data = PoolIntArray( 851970, 1, 0, 851971, 0, 0, 851973, 0, 0, 851975, 2, 0
[node name="Flyer" parent="." instance=ExtResource( 41 )]
position = Vector2( 496, 152 )
scale = Vector2( 0.879, 0.936 )
max_speed = 120
[node name="StateLabel" parent="Flyer" index="1"]
@ -180,9 +179,6 @@ parameters/playback = SubResource( 6 )
position = Vector2( 776, 320 )
movement_radius = 4
[node name="WhatAreFrog" parent="BoundFrog" index="0"]
scale = Vector2( 0.879, 0.936 )
[node name="FlyingPlatformClean" parent="." instance=ExtResource( 43 )]
position = Vector2( 496, 220 )

46
src/Levels/Enemy Test Level.tscn → src/Levels/Legacy Levels/Enemy Test Level.tscn
View File

@ -1,23 +1,23 @@
[gd_scene load_steps=14 format=2]
[ext_resource path="res://src/Actors/Blobby/Blobby.tscn" type="PackedScene" id=1]
[ext_resource path="res://assets/environment/blocks/legacy/24BlockBasic.png" type="Texture" id=2]
[ext_resource path="res://src/UserInterface/UserInterface.tscn" type="PackedScene" id=3]
[ext_resource path="res://src/ObstacleObjects/Spikes.tscn" type="PackedScene" id=4]
[ext_resource path="res://src/Actors/Enemies/Beings/Caterpillar.tscn" type="PackedScene" id=5]
[ext_resource path="res://assets/environment/blocks/legacy/24BlockBasic.png" type="Texture" id=1]
[ext_resource path="res://src/Utilities/SignalManager.tscn" type="PackedScene" id=2]
[ext_resource path="res://src/Utilities/LevelState.tscn" type="PackedScene" id=3]
[ext_resource path="res://src/Actors/BlobbyCam.tscn" type="PackedScene" id=4]
[ext_resource path="res://src/Actors/Enemies/Beings/SmortEnemy.tscn" type="PackedScene" id=5]
[ext_resource path="res://src/Actors/Enemies/Beings/SimpleEnemy.tscn" type="PackedScene" id=6]
[ext_resource path="res://src/Actors/Enemies/Beings/SmortEnemy.tscn" type="PackedScene" id=7]
[ext_resource path="res://src/Actors/Enemies/Beings/DartingEnemy.tscn" type="PackedScene" id=8]
[ext_resource path="res://src/Actors/BlobbyCam.tscn" type="PackedScene" id=9]
[ext_resource path="res://src/Utilities/SignalManager.tscn" type="PackedScene" id=11]
[ext_resource path="res://src/Utilities/LevelState.tscn" type="PackedScene" id=12]
[ext_resource path="res://src/ObstacleObjects/Spikes.tscn" type="PackedScene" id=7]
[ext_resource path="res://src/Actors/Enemies/Beings/Caterpillar.tscn" type="PackedScene" id=8]
[ext_resource path="res://src/Actors/Enemies/Beings/DartingEnemy.tscn" type="PackedScene" id=9]
[ext_resource path="res://src/Actors/Blobby/Blobby.tscn" type="PackedScene" id=10]
[ext_resource path="res://src/UserInterface/UserInterface.tscn" type="PackedScene" id=11]
[sub_resource type="ConvexPolygonShape2D" id=3]
points = PoolVector2Array( 0, 0, 24, 0, 24, 24, 0, 24 )
[sub_resource type="TileSet" id=2]
1/name = "24BlockBasic.png 1"
1/texture = ExtResource( 2 )
1/texture = ExtResource( 1 )
1/tex_offset = Vector2( 0, 0 )
1/modulate = Color( 1, 1, 1, 1 )
1/region = Rect2( 0, 0, 24, 24 )
@ -44,41 +44,41 @@ __meta__ = {
"_edit_vertical_guides_": [ 2880.0 ]
}
[node name="SignalManager" parent="." instance=ExtResource( 11 )]
[node name="SignalManager" parent="." instance=ExtResource( 2 )]
[node name="LevelState" parent="." instance=ExtResource( 12 )]
[node name="LevelState" parent="." instance=ExtResource( 3 )]
unique_name_in_owner = true
[node name="UserInterface" parent="." instance=ExtResource( 3 )]
[node name="UserInterface" parent="." instance=ExtResource( 11 )]
[node name="BlobbyCam" parent="." instance=ExtResource( 9 )]
[node name="BlobbyCam" parent="." instance=ExtResource( 4 )]
[node name="Blobby" parent="." instance=ExtResource( 1 )]
[node name="Blobby" parent="." instance=ExtResource( 10 )]
unique_name_in_owner = true
position = Vector2( -259.915, 710.547 )
[node name="SmortEnemy" parent="." instance=ExtResource( 7 )]
[node name="SmortEnemy" parent="." instance=ExtResource( 5 )]
position = Vector2( 220, 804 )
[node name="Caterpillar" parent="." instance=ExtResource( 5 )]
[node name="Caterpillar" parent="." instance=ExtResource( 8 )]
position = Vector2( 73, 882 )
[node name="Enemy2" parent="." instance=ExtResource( 6 )]
position = Vector2( 492, 804 )
[node name="DartingEnemy" parent="." instance=ExtResource( 8 )]
[node name="DartingEnemy" parent="." instance=ExtResource( 9 )]
position = Vector2( 800, 875 )
[node name="Spikes3" parent="." instance=ExtResource( 4 )]
[node name="Spikes3" parent="." instance=ExtResource( 7 )]
position = Vector2( 108, 900 )
[node name="Spikes5" parent="." instance=ExtResource( 4 )]
[node name="Spikes5" parent="." instance=ExtResource( 7 )]
position = Vector2( 372, 900 )
[node name="Spikes4" parent="." instance=ExtResource( 4 )]
[node name="Spikes4" parent="." instance=ExtResource( 7 )]
position = Vector2( 132, 900 )
[node name="Spikes6" parent="." instance=ExtResource( 4 )]
[node name="Spikes6" parent="." instance=ExtResource( 7 )]
position = Vector2( 348, 900 )
[node name="TileMap" type="TileMap" parent="."]

2
src/Levels/Flyer Test Level.tscn → src/Levels/Legacy Levels/Flyer Test Level.tscn
View File

@ -5,7 +5,7 @@
[ext_resource path="res://src/Actors/BlobbyCam.tscn" type="PackedScene" id=4]
[ext_resource path="res://src/Utilities/SignalManager.tscn" type="PackedScene" id=5]
[ext_resource path="res://src/Contraptions/Portal/Portal.tscn" type="PackedScene" id=6]
[ext_resource path="res://src/Levels/Enemy Test Level.tscn" type="PackedScene" id=7]
[ext_resource path="res://src/Levels/Legacy Levels/Enemy Test Level.tscn" type="PackedScene" id=7]
[ext_resource path="res://src/Actors/Enemies/Beings/Flyer.tscn" type="PackedScene" id=8]
[ext_resource path="res://src/Utilities/LevelState.tscn" type="PackedScene" id=9]
[ext_resource path="res://src/Contraptions/Triggers/ThreeWhyButtons.tscn" type="PackedScene" id=10]

2
src/Levels/Froggy Test Level.tscn → src/Levels/Legacy Levels/Froggy Test Level.tscn
View File

@ -5,7 +5,7 @@
[ext_resource path="res://src/Actors/BlobbyCam.tscn" type="PackedScene" id=4]
[ext_resource path="res://src/NeutralObjects/Coin.tscn" type="PackedScene" id=5]
[ext_resource path="res://src/Contraptions/Portal/Portal.tscn" type="PackedScene" id=6]
[ext_resource path="res://src/Levels/Enemy Test Level.tscn" type="PackedScene" id=7]
[ext_resource path="res://src/Levels/Legacy Levels/Enemy Test Level.tscn" type="PackedScene" id=7]
[ext_resource path="res://src/Platforms/FlyingLaserCutter.tscn" type="PackedScene" id=8]
[ext_resource path="res://src/Actors/Enemies/Beings/BoundFrog.tscn" type="PackedScene" id=9]
[ext_resource path="res://src/Contraptions/Triggers/ThreeWhyButtons.tscn" type="PackedScene" id=10]

0
src/Levels/Grass Test Level.tscn → src/Levels/Legacy Levels/Grass Test Level.tscn
View File

24
src/Levels/LevelTemplate.tscn → src/Levels/Legacy Levels/Template.tscn
View File

@ -1,13 +1,13 @@
[gd_scene load_steps=10 format=2]
[ext_resource path="res://src/Environment/AlienShipTileSet.tres" type="TileSet" id=1]
[ext_resource path="res://src/Actors/Blobby/Blobby.tscn" type="PackedScene" id=2]
[ext_resource path="res://src/Levels/02 Level.tscn" type="PackedScene" id=4]
[ext_resource path="res://src/Utilities/SignalManager.tscn" type="PackedScene" id=2]
[ext_resource path="res://src/Utilities/LevelState.tscn" type="PackedScene" id=3]
[ext_resource path="res://src/Actors/BlobbyCam.tscn" type="PackedScene" id=4]
[ext_resource path="res://src/Contraptions/Portal/Portal.tscn" type="PackedScene" id=5]
[ext_resource path="res://src/Utilities/LevelState.tscn" type="PackedScene" id=6]
[ext_resource path="res://src/UserInterface/UserInterface.tscn" type="PackedScene" id=7]
[ext_resource path="res://src/Utilities/SignalManager.tscn" type="PackedScene" id=8]
[ext_resource path="res://src/Actors/BlobbyCam.tscn" type="PackedScene" id=12]
[ext_resource path="res://src/Levels/Legacy Levels/02 Level.tscn" type="PackedScene" id=6]
[ext_resource path="res://src/Actors/Blobby/Blobby.tscn" type="PackedScene" id=7]
[ext_resource path="res://src/UserInterface/UserInterface.tscn" type="PackedScene" id=8]
[sub_resource type="AnimationNodeStateMachinePlayback" id=4]
@ -17,18 +17,18 @@ __meta__ = {
"_edit_vertical_guides_": [ 2880.0 ]
}
[node name="SignalManager" parent="." instance=ExtResource( 8 )]
[node name="SignalManager" parent="." instance=ExtResource( 2 )]
[node name="LevelState" parent="." instance=ExtResource( 6 )]
[node name="LevelState" parent="." instance=ExtResource( 3 )]
unique_name_in_owner = true
[node name="UserInterface" parent="." instance=ExtResource( 7 )]
[node name="UserInterface" parent="." instance=ExtResource( 8 )]
unique_name_in_owner = true
[node name="Timer" parent="UserInterface/HUD/HUDOverlay/GetBackTimer" index="0"]
wait_time = 20.0
[node name="BlobbyCam" parent="." instance=ExtResource( 12 )]
[node name="BlobbyCam" parent="." instance=ExtResource( 4 )]
unique_name_in_owner = true
drag_margin_bottom = 0.3
@ -38,7 +38,7 @@ frame = 6
[node name="AnimatedSprite2" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="5"]
frame = 10
[node name="Blobby" parent="." instance=ExtResource( 2 )]
[node name="Blobby" parent="." instance=ExtResource( 7 )]
unique_name_in_owner = true
position = Vector2( -70, -1.90735e-06 )
scale = Vector2( 0.878906, 0.936025 )
@ -59,7 +59,7 @@ format = 1
[node name="Portal" parent="." instance=ExtResource( 5 )]
position = Vector2( 1488, -120 )
next_scene = ExtResource( 4 )
next_scene = ExtResource( 6 )
[connection signal="body_exited" from="Blobby/BlobbySkin" to="Blobby" method="_on_BlobbySkin_body_exited"]

168
src/Levels/First Level.tscn → src/Levels/Level 1.tscn
View File

File diff suppressed because one or more lines are too long

224
src/Levels/Level 2.tscn Normal file
View File

File diff suppressed because one or more lines are too long

101
src/Levels/Level 3.tscn Normal file
View File

File diff suppressed because one or more lines are too long

4
src/NeutralObjects/Coin.tscn
View File

@ -387,7 +387,7 @@ animations = [ {
} ]
[node name="Coin" type="Area2D"]
position = Vector2( 0, -3.86918 )
position = Vector2( -6, -6 )
scale = Vector2( 0.18, 0.18 )
collision_layer = 4
monitorable = false
@ -407,7 +407,7 @@ position = Vector2( 0, -2.52127 )
scale = Vector2( 0.149428, 0.151196 )
frames = SubResource( 4 )
animation = "rotate"
frame = 126
frame = 308
playing = true
[connection signal="body_entered" from="." to="." method="_on_body_entered"]