Skip to content

Commit

Permalink
Level design and various fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
Pawlogates committed Sep 13, 2024
1 parent efa3266 commit 7c828e6
Show file tree
Hide file tree
Showing 26 changed files with 8,666 additions and 6,673 deletions.
Binary file modified Assets/Graphics/tilesets/tileset2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Assets/Graphics/tilesets/tileset_decorations2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Boxes/box_general.gd
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ func _physics_process(delta):
#BODY ENTERED
func _on_area_2d_body_entered(body: Node2D) -> void:
if not active:
print("BonusBox entered, but it was inactive.")
print("Box entered, but it was inactive.")
return

if body.is_in_group("player") and not body.get_parent().is_in_group("weightless"):
Expand Down
4 changes: 2 additions & 2 deletions Collectibles/collectible_general.gd
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ var collidable = true
func inside_check_enter(body):
if body.is_in_group("player"):
player_inside = true
print("entered player")
print("Player entered.")
if collidable and hard_to_collect or collidable and rotten:
collidable = false
collisionCheck_delay.start()
Expand Down Expand Up @@ -555,7 +555,7 @@ func inside_check_exit(body):
#if hard_to_collect or rotten:
player_inside = false
direction = body.direction
print("exitted player")
print("Player exitted.")

if body.is_in_group("player_projectile"):
player_projectile_inside = false
Expand Down
16 changes: 10 additions & 6 deletions Levels/MAIN_7.tscn

Large diffs are not rendered by default.

29 changes: 25 additions & 4 deletions Levels/empty.tscn
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[gd_scene load_steps=10 format=3 uid="uid://dun5a8r7qx00f"]
[gd_scene load_steps=11 format=3 uid="uid://dun5a8r7qx00f"]

[ext_resource type="PackedScene" uid="uid://pu6px63ietmi" path="res://Other/Scenes/world.tscn" id="1_vblad"]
[ext_resource type="PackedScene" uid="uid://cccpw68bhryyg" path="res://Tilesets/decorations.tscn" id="2_wyjmk"]
[ext_resource type="PackedScene" uid="uid://dfg7r4vdcruea" path="res://Tilesets/tileset_main_precise.tscn" id="3_68c3k"]
[ext_resource type="PackedScene" uid="uid://b4rgndv0cew0" path="res://Tilesets/tileset_main_veryPrecise.tscn" id="4_igqdp"]
[ext_resource type="PackedScene" uid="uid://b6sm67hlya8p" path="res://Tilesets/tileset_main.tscn" id="4_x2u5u"]
Expand Down Expand Up @@ -48,13 +49,33 @@ layer_2/enabled = false
layer_3/enabled = false
layer_4/enabled = false

[node name="kill_area" parent="." index="16" instance=ExtResource("8_tkrux")]
[node name="decorations_fg3" parent="." index="7" instance=ExtResource("2_wyjmk")]
z_index = 3

[node name="decorations_fg2" parent="." index="8" instance=ExtResource("2_wyjmk")]
z_index = 2

[node name="decorations_fg" parent="." index="9" instance=ExtResource("2_wyjmk")]
z_index = 1

[node name="decorations_main" parent="." index="10" instance=ExtResource("2_wyjmk")]

[node name="decorations_bg" parent="." index="11" instance=ExtResource("2_wyjmk")]
z_index = -1

[node name="decorations_bg2" parent="." index="12" instance=ExtResource("2_wyjmk")]
z_index = -2

[node name="decorations_bg3" parent="." index="13" instance=ExtResource("2_wyjmk")]
z_index = -3

[node name="kill_area" parent="." index="23" instance=ExtResource("8_tkrux")]
position = Vector2(7168, 5184)
scale = Vector2(320, 1)

[node name="trigger_bgChange" parent="." index="17" instance=ExtResource("9_wxu0a")]
[node name="trigger_bgChange" parent="." index="24" instance=ExtResource("9_wxu0a")]
position = Vector2(-3.05176e-05, -1.52588e-05)
scale = Vector2(8, 8)

[node name="trigger_bgMove" parent="." index="18" instance=ExtResource("8_wsrry")]
[node name="trigger_bgMove" parent="." index="25" instance=ExtResource("8_wsrry")]
scale = Vector2(4, 4)
273 changes: 144 additions & 129 deletions Levels/overworld_infected_glades.tscn

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions Objects/Decorations/deco_chainLong_H.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,8 @@ sprite_frames = SubResource("SpriteFrames_a8t04")
autoplay = "default"

[node name="VisibleOnScreenNotifier2D" type="VisibleOnScreenNotifier2D" parent="."]
position = Vector2(-384, -384)
scale = Vector2(3, 1.5)
rect = Rect2(0, 0, 256, 512)
modulate = Color(1, 1, 1, 0.196078)
rect = Rect2(-250, -250, 500, 500)

[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
libraries = {
Expand Down
5 changes: 2 additions & 3 deletions Objects/Decorations/deco_chainLong_H_bg.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,8 @@ sprite_frames = SubResource("SpriteFrames_a8t04")
autoplay = "default"

[node name="VisibleOnScreenNotifier2D" type="VisibleOnScreenNotifier2D" parent="."]
position = Vector2(-384, -384)
scale = Vector2(3, 1.5)
rect = Rect2(0, 0, 256, 512)
modulate = Color(1, 1, 1, 0.196078)
rect = Rect2(-250, -250, 500, 500)

[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
libraries = {
Expand Down
5 changes: 2 additions & 3 deletions Objects/Decorations/deco_chainLong_V.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,8 @@ sprite_frames = SubResource("SpriteFrames_a8t04")
autoplay = "default"

[node name="VisibleOnScreenNotifier2D" type="VisibleOnScreenNotifier2D" parent="."]
position = Vector2(-352, -512)
scale = Vector2(3, 1.75)
rect = Rect2(0, 0, 256, 512)
modulate = Color(1, 1, 1, 0.196078)
rect = Rect2(-250, -250, 500, 500)

[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
libraries = {
Expand Down
5 changes: 2 additions & 3 deletions Objects/Decorations/deco_chainLong_V_bg.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,8 @@ sprite_frames = SubResource("SpriteFrames_a8t04")
autoplay = "default"

[node name="VisibleOnScreenNotifier2D" type="VisibleOnScreenNotifier2D" parent="."]
position = Vector2(-352, -512)
scale = Vector2(3, 1.75)
rect = Rect2(0, 0, 256, 512)
modulate = Color(1, 1, 1, 0.196078)
rect = Rect2(-250, -250, 500, 500)

[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
libraries = {
Expand Down
5 changes: 2 additions & 3 deletions Objects/Decorations/deco_chain_H.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,8 @@ sprite_frames = SubResource("SpriteFrames_a8t04")
autoplay = "default"

[node name="VisibleOnScreenNotifier2D" type="VisibleOnScreenNotifier2D" parent="."]
position = Vector2(-352, -512)
scale = Vector2(3, 1.75)
rect = Rect2(0, 0, 256, 512)
modulate = Color(1, 1, 1, 0.196078)
rect = Rect2(-250, -250, 500, 500)

[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
libraries = {
Expand Down
5 changes: 2 additions & 3 deletions Objects/Decorations/deco_chain_V.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,8 @@ sprite_frames = SubResource("SpriteFrames_a8t04")
autoplay = "default"

[node name="VisibleOnScreenNotifier2D" type="VisibleOnScreenNotifier2D" parent="."]
position = Vector2(-352, -512)
scale = Vector2(3, 1.75)
rect = Rect2(0, 0, 256, 512)
modulate = Color(1, 1, 1, 0.196078)
rect = Rect2(-250, -250, 500, 500)

[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
libraries = {
Expand Down
4 changes: 2 additions & 2 deletions Objects/Decorations/deco_tile_chain_H.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,8 @@ autoplay = "default"
frame_progress = 0.525694

[node name="VisibleOnScreenNotifier2D" type="VisibleOnScreenNotifier2D" parent="."]
position = Vector2(-96, -192)
rect = Rect2(0, 0, 256, 512)
modulate = Color(1, 1, 1, 0.196078)
rect = Rect2(-250, -250, 500, 500)

[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
libraries = {
Expand Down
4 changes: 2 additions & 2 deletions Objects/Decorations/deco_tile_chain_V.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,8 @@ autoplay = "default"
frame_progress = 0.525694

[node name="VisibleOnScreenNotifier2D" type="VisibleOnScreenNotifier2D" parent="."]
position = Vector2(-96, -192)
rect = Rect2(0, 0, 256, 512)
modulate = Color(1, 1, 1, 0.196078)
rect = Rect2(-250, -250, 500, 500)

[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
libraries = {
Expand Down
4 changes: 2 additions & 2 deletions Other/Scenes/world.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"handle_modes": PackedInt32Array(0, 0),
"points": PackedFloat32Array(0, -0.25, 0, 0.25, 0, 0.5, -0.25, 0, 0.25, 0),
"points": PackedFloat32Array(0, -0.25, 0, 0.25, 0, 0.25, -0.25, 0, 0.25, 0),
"times": PackedFloat32Array(0, 4)
}

Expand All @@ -60,7 +60,7 @@ tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"handle_modes": PackedInt32Array(0, 0),
"points": PackedFloat32Array(0.5, -0.25, 0, 0.25, 0, 0, -0.25, 0, 0.25, 0),
"points": PackedFloat32Array(0.25, -0.25, 0, 0.25, 0, 0, -0.25, 0, 0.25, 0),
"times": PackedFloat32Array(0, 4)
}

Expand Down
2 changes: 1 addition & 1 deletion Scripts/player.gd
Original file line number Diff line number Diff line change
Expand Up @@ -1167,7 +1167,7 @@ func handle_flight(delta):
func handle_just_landed():
if true_just_landed:
true_just_landed = false
print("landed")
print("Player landed.")
player_just_landed.emit()
if not is_on_floor():
true_just_landed_queued = true
Expand Down
2 changes: 0 additions & 2 deletions Scripts/world.gd
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,6 @@ func bg_move():

#Save state
func save_game():
print(Globals.is_saving)
if not Globals.is_saving:
Globals.is_saving = true

Expand Down Expand Up @@ -1064,7 +1063,6 @@ func _on_meme_mode_timer_timeout():


func _on_timer_timeout() -> void:
print(whiteBlocks_toggle)
if whiteBlocks_toggle:
whiteBlocks_toggle = false
$whiteBlocks_make_rainbow.play("fade_out")
Expand Down
Loading

0 comments on commit 7c828e6

Please sign in to comment.