diff --git a/Assets/Audio/BGM/PSwitch.bgm b/Assets/Audio/BGM/PSwitch.bgm new file mode 100644 index 0000000..a696d86 --- /dev/null +++ b/Assets/Audio/BGM/PSwitch.bgm @@ -0,0 +1,10 @@ +{ + "Normal": { + "source": "PSwitch.mp3", + "loop": 8.801 + }, + "Hurry": { + "source": "PSwitchHurry.mp3", + "loop": 7.55 + } +} diff --git a/Assets/Audio/BGM/PSwitch.json b/Assets/Audio/BGM/PSwitch.json index cf344dd..50c02e2 100644 --- a/Assets/Audio/BGM/PSwitch.json +++ b/Assets/Audio/BGM/PSwitch.json @@ -1,3 +1,3 @@ { - "variations": {"source": "PSwitch.mp3"} + "variations": {"source": "PSwitch.bgm"} } diff --git a/Assets/Audio/BGM/PSwitchHurry.mp3 b/Assets/Audio/BGM/PSwitchHurry.mp3 new file mode 100644 index 0000000..2fcad9c Binary files /dev/null and b/Assets/Audio/BGM/PSwitchHurry.mp3 differ diff --git a/Assets/Audio/BGM/PSwitchHurry.mp3.import b/Assets/Audio/BGM/PSwitchHurry.mp3.import new file mode 100644 index 0000000..0453133 --- /dev/null +++ b/Assets/Audio/BGM/PSwitchHurry.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://7iqief2hn4rg" +path="res://.godot/imported/PSwitchHurry.mp3-3abe83c8eb89107e332495802cd7d785.mp3str" + +[deps] + +source_file="res://Assets/Audio/BGM/PSwitchHurry.mp3" +dest_files=["res://.godot/imported/PSwitchHurry.mp3-3abe83c8eb89107e332495802cd7d785.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/Scenes/Levels/SMBS/World7/7-4b.tscn b/Scenes/Levels/SMBS/World7/7-4b.tscn index 99087ec..4200a72 100644 --- a/Scenes/Levels/SMBS/World7/7-4b.tscn +++ b/Scenes/Levels/SMBS/World7/7-4b.tscn @@ -28,7 +28,7 @@ level_id = 4 metadata/_custom_type_script = "uid://bcqr1v25ygedb" [node name="Tiles" parent="." instance=ExtResource("2_dsrfb")] -tile_map_data = PackedByteArray("AADv/wAAAAABAAEAAADw/wAAAAACAAEAAADx/wAAAAABAAsAAADy/wAAAAACAAAAAADz/wAAAAACAAAAAAD0/wAAAAACAAAAAAD1/wAAAAACAAAAAAD2/wAAAAACAAAAAAD3/wAAAAACAAAAAAD4/wAAAAACAAAAAAD5/wAAAAACAAAAAAD6/wAAAAACAAAAAAD7/wAAAAACAAAAAAD8/wAAAAACAAAAAAD9/wAAAAACAAAAAAD+/wAAAAACAAAAAAD//wAAAAACAAAAAAAAAAAAAAACAAAAAAABAAAAAAACAAAAAAACAAAAAAACAAAAAAADAAAAAAACAAAAAAAEAAAAAAADAAAAAADv/wEAAAABAAEAAADw/wEAAAACAAEAAADx/wEAAAACAAEAAADy/wEAAAACAAEAAADz/wEAAAACAAEAAAD0/wEAAAACAAEAAAD1/wEAAAACAAEAAAD2/wEAAAACAAEAAAD3/wEAAAACAAEAAAD4/wEAAAACAAEAAAD5/wEAAAACAAEAAAD6/wEAAAACAAEAAAD7/wEAAAACAAEAAAD8/wEAAAACAAEAAAD9/wEAAAACAAEAAAD+/wEAAAACAAEAAAD//wEAAAACAAEAAAAAAAEAAAACAAEAAAABAAEAAAACAAEAAAACAAEAAAACAAEAAAADAAEAAAACAAEAAAAEAAEAAAADAAEAAADv/wIAAAABAAIAAADw/wIAAAACAAIAAADx/wIAAAACAAIAAADy/wIAAAACAAIAAADz/wIAAAACAAIAAAD0/wIAAAACAAIAAAD1/wIAAAACAAIAAAD2/wIAAAACAAIAAAD3/wIAAAACAAIAAAD4/wIAAAACAAIAAAD5/wIAAAACAAIAAAD6/wIAAAACAAIAAAD7/wIAAAACAAIAAAD8/wIAAAACAAIAAAD9/wIAAAACAAIAAAD+/wIAAAACAAIAAAD//wIAAAACAAIAAAAAAAIAAAACAAIAAAABAAIAAAACAAIAAAACAAIAAAACAAIAAAADAAIAAAACAAIAAAAEAAIAAAADAAIAAADv//b/AAABAAEAAADw//b/AAACAAEAAADx//b/AAACAAEAAADv//f/AAABAAEAAADw//f/AAACAAEAAADx//f/AAABAAwAAADv//j/AAABAAEAAADw//j/AAACAAEAAADx//j/AAADAAEAAADv//n/AAABAAEAAADw//n/AAACAAEAAADx//n/AAADAAEAAADv//r/AAABAAEAAADw//r/AAACAAEAAADx//r/AAADAAEAAADv//v/AAABAAEAAADw//v/AAACAAEAAADx//v/AAADAAEAAADv//z/AAABAAEAAADw//z/AAACAAEAAADx//z/AAADAAEAAADv//3/AAABAAEAAADw//3/AAACAAEAAADx//3/AAADAAEAAADv//7/AAABAAEAAADw//7/AAACAAEAAADx//7/AAADAAEAAADv////AAABAAEAAADw////AAACAAEAAADx////AAADAAEAAADy//b/AAACAAEAAADz//b/AAACAAEAAAD0//b/AAACAAEAAAD1//b/AAACAAEAAAD2//b/AAACAAEAAAD3//b/AAACAAEAAAD4//b/AAACAAEAAAD5//b/AAACAAEAAAD6//b/AAACAAEAAAD7//b/AAACAAEAAAD8//b/AAACAAEAAAD9//b/AAACAAEAAAD+//b/AAACAAEAAAD///b/AAACAAEAAAAAAPb/AAACAAEAAAABAPb/AAACAAEAAAACAPb/AAACAAEAAAADAPb/AAACAAEAAAAEAPb/AAACAAEAAAAFAPb/AAACAAEAAAAGAPb/AAACAAEAAAAHAPb/AAACAAEAAAAIAPb/AAACAAEAAADy//f/AAACAAIAAADz//f/AAACAAIAAAD0//f/AAACAAIAAAD1//f/AAACAAIAAAD2//f/AAACAAIAAAD3//f/AAACAAIAAAD4//f/AAACAAIAAAD5//f/AAACAAIAAAD6//f/AAACAAIAAAD7//f/AAACAAIAAAD8//f/AAACAAIAAAD9//f/AAACAAIAAAD+//f/AAACAAIAAAD///f/AAACAAIAAAAAAPf/AAACAAIAAAABAPf/AAACAAIAAAACAPf/AAACAAIAAAADAPf/AAACAAIAAAAEAPf/AAACAAIAAAAFAPf/AAACAAIAAAAGAPf/AAACAAIAAAAHAPf/AAACAAIAAAAIAPf/AAACAAIAAAAJAPb/AAACAAEAAAAKAPb/AAACAAEAAAALAPb/AAACAAEAAAAMAPb/AAACAAEAAAANAPb/AAACAAEAAAAOAPb/AAACAAEAAAAPAPb/AAACAAEAAAAQAPb/AAACAAEA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") +tile_map_data = PackedByteArray("AADv/wAAAAABAAEAAADw/wAAAAACAAEAAADx/wAAAAABAAsAAADy/wAAAAACAAAAAADz/wAAAAACAAAAAAD0/wAAAAACAAAAAAD1/wAAAAACAAAAAAD2/wAAAAACAAAAAAD3/wAAAAACAAAAAAD4/wAAAAACAAAAAAD5/wAAAAACAAAAAAD6/wAAAAACAAAAAAD7/wAAAAACAAAAAAD8/wAAAAACAAAAAAD9/wAAAAACAAAAAAD+/wAAAAACAAAAAAD//wAAAAACAAAAAAAAAAAAAAACAAAAAAABAAAAAAACAAAAAAACAAAAAAACAAAAAAADAAAAAAACAAAAAAAEAAAAAAADAAAAAADv/wEAAAABAAEAAADw/wEAAAACAAEAAADx/wEAAAACAAEAAADy/wEAAAACAAEAAADz/wEAAAACAAEAAAD0/wEAAAACAAEAAAD1/wEAAAACAAEAAAD2/wEAAAACAAEAAAD3/wEAAAACAAEAAAD4/wEAAAACAAEAAAD5/wEAAAACAAEAAAD6/wEAAAACAAEAAAD7/wEAAAACAAEAAAD8/wEAAAACAAEAAAD9/wEAAAACAAEAAAD+/wEAAAACAAEAAAD//wEAAAACAAEAAAAAAAEAAAACAAEAAAABAAEAAAACAAEAAAACAAEAAAACAAEAAAADAAEAAAACAAEAAAAEAAEAAAADAAEAAADv/wIAAAABAAIAAADw/wIAAAACAAIAAADx/wIAAAACAAIAAADy/wIAAAACAAIAAADz/wIAAAACAAIAAAD0/wIAAAACAAIAAAD1/wIAAAACAAIAAAD2/wIAAAACAAIAAAD3/wIAAAACAAIAAAD4/wIAAAACAAIAAAD5/wIAAAACAAIAAAD6/wIAAAACAAIAAAD7/wIAAAACAAIAAAD8/wIAAAACAAIAAAD9/wIAAAACAAIAAAD+/wIAAAACAAIAAAD//wIAAAACAAIAAAAAAAIAAAACAAIAAAABAAIAAAACAAIAAAACAAIAAAACAAIAAAADAAIAAAACAAIAAAAEAAIAAAADAAIAAADv//b/AAABAAEAAADw//b/AAACAAEAAADx//b/AAACAAEAAADv//f/AAABAAEAAADw//f/AAACAAEAAADx//f/AAABAAwAAADv//j/AAABAAEAAADw//j/AAACAAEAAADx//j/AAADAAEAAADv//n/AAABAAEAAADw//n/AAACAAEAAADx//n/AAADAAEAAADv//r/AAABAAEAAADw//r/AAACAAEAAADx//r/AAADAAEAAADv//v/AAABAAEAAADw//v/AAACAAEAAADx//v/AAADAAEAAADv//z/AAABAAEAAADw//z/AAACAAEAAADx//z/AAADAAEAAADv//3/AAABAAEAAADw//3/AAACAAEAAADx//3/AAADAAEAAADv//7/AAABAAEAAADw//7/AAACAAEAAADx//7/AAADAAEAAADv////AAABAAEAAADw////AAACAAEAAADx////AAADAAEAAADy//b/AAACAAEAAADz//b/AAACAAEAAAD0//b/AAACAAEAAAD1//b/AAACAAEAAAD2//b/AAACAAEAAAD3//b/AAACAAEAAAD4//b/AAACAAEAAAD5//b/AAACAAEAAAD6//b/AAACAAEAAAD7//b/AAACAAEAAAD8//b/AAACAAEAAAD9//b/AAACAAEAAAD+//b/AAACAAEAAAD///b/AAACAAEAAAAAAPb/AAACAAEAAAABAPb/AAACAAEAAAACAPb/AAACAAEAAAADAPb/AAACAAEAAAAEAPb/AAACAAEAAAAFAPb/AAACAAEAAAAGAPb/AAACAAEAAAAHAPb/AAACAAEAAAAIAPb/AAACAAEAAADy//f/AAACAAIAAADz//f/AAACAAIAAAD0//f/AAACAAIAAAD1//f/AAACAAIAAAD2//f/AAACAAIAAAD3//f/AAACAAIAAAD4//f/AAACAAIAAAD5//f/AAACAAIAAAD6//f/AAACAAIAAAD7//f/AAACAAIAAAD8//f/AAACAAIAAAD9//f/AAACAAIAAAD+//f/AAACAAIAAAD///f/AAACAAIAAAAAAPf/AAACAAIAAAABAPf/AAACAAIAAAACAPf/AAACAAIAAAADAPf/AAACAAIAAAAEAPf/AAACAAIAAAAFAPf/AAACAAIAAAAGAPf/AAACAAIAAAAHAPf/AAACAAIAAAAIAPf/AAACAAIAAAAJAPb/AAACAAEAAAAKAPb/AAACAAEAAAALAPb/AAACAAEAAAAMAPb/AAACAAEAAAANAPb/AAACAAEAAAAOAPb/AAACAAEAAAAPAPb/AAACAAEAAAAQAPb/AAACAAEA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") [node name="LevelBG" parent="." instance=ExtResource("3_p0fpe")] particles = 3 diff --git a/Scenes/Prefabs/Global.tscn b/Scenes/Prefabs/Global.tscn index 82252c0..859e1f7 100644 --- a/Scenes/Prefabs/Global.tscn +++ b/Scenes/Prefabs/Global.tscn @@ -310,6 +310,7 @@ layer = 1 [node name="FPSCount" type="Label" parent="GameHUD"] unique_name_in_owner = true +visible = false anchors_preset = 3 anchor_left = 1.0 anchor_top = 1.0 diff --git a/Scripts/Classes/Blocks/BrickBlock.gd b/Scripts/Classes/Blocks/BrickBlock.gd index 1ef429e..c09882c 100644 --- a/Scripts/Classes/Blocks/BrickBlock.gd +++ b/Scripts/Classes/Blocks/BrickBlock.gd @@ -13,6 +13,7 @@ func check_brick_empty() -> void: func on_block_hit(player: Player) -> void: if player.power_state.hitbox_size == "Big": if item == null: + self.add_collision_exception_with(player) # Don't bonk with physics, will be handled after block is broken await get_tree().physics_frame destroy() Global.score += 50 diff --git a/Scripts/Classes/Entities/Player.gd b/Scripts/Classes/Entities/Player.gd index 5f225ca..31a932b 100644 --- a/Scripts/Classes/Entities/Player.gd +++ b/Scripts/Classes/Entities/Player.gd @@ -270,6 +270,7 @@ func _physics_process(delta: float) -> void: set_power_state_frame() if Input.is_action_just_pressed("debug_noclip") and Global.debug_mode: state_machine.transition_to("NoClip") + Global.log_comment("NOCLIP Enabled") up_direction = -gravity_vector handle_directions() handle_block_collision_detection() diff --git a/Scripts/Classes/Singletons/Global.gd b/Scripts/Classes/Singletons/Global.gd index a7c9a2d..5c14eda 100644 --- a/Scripts/Classes/Singletons/Global.gd +++ b/Scripts/Classes/Singletons/Global.gd @@ -263,6 +263,10 @@ func take_screenshot() -> void: var img: Image = get_viewport().get_texture().get_image() var filename = Global.config_path.path_join("screenshots/screenshot_" + str(int(Time.get_unix_time_from_system())) + ".png") var err = img.save_png(filename) + if !err: + log_comment("Screenshot Saved!") + else: + log_error(error_string(err)) func handle_p_switch(delta: float) -> void: if p_switch_active and get_tree().paused == false: diff --git a/Scripts/Classes/States/Player/Dead.gd b/Scripts/Classes/States/Player/Dead.gd index d1bde73..b766ba8 100644 --- a/Scripts/Classes/States/Player/Dead.gd +++ b/Scripts/Classes/States/Player/Dead.gd @@ -13,7 +13,7 @@ func enter(msg := {}) -> void: player.set_collision_mask_value(i + 1, false) player.gravity = player.JUMP_GRAVITY if msg["Pit"] == false: - player.velocity.y = -player.DEATH_JUMP_HEIGHT + player.velocity.y = -player.DEATH_JUMP_HEIGHT * player.gravity_vector.y # nabbup : Flip death gravity when upside down func physics_update(delta: float) -> void: if can_fall: @@ -22,8 +22,9 @@ func physics_update(delta: float) -> void: player.play_animation("DieFreeze") player.sprite.speed_scale = 1 if can_fall: - player.velocity.y += (player.JUMP_GRAVITY / delta) * delta - player.velocity.y = clamp(player.velocity.y, -INF, player.MAX_FALL_SPEED) + # nabbup : Flip death gravity when upside down + player.velocity.y += (player.JUMP_GRAVITY / delta) * delta * player.gravity_vector.y + player.velocity.y = clamp(player.velocity.y, -player.MAX_FALL_SPEED, player.MAX_FALL_SPEED) # wish this could be better than just substituting -INF but you can't win em all ~ nabbup player.move_and_slide() if Input.is_action_just_pressed("ui_accept") or Input.is_action_just_pressed("jump_0"): player.death_load() diff --git a/Scripts/Classes/States/Player/NoClip.gd b/Scripts/Classes/States/Player/NoClip.gd index b337082..38f1ae1 100755 --- a/Scripts/Classes/States/Player/NoClip.gd +++ b/Scripts/Classes/States/Player/NoClip.gd @@ -15,6 +15,7 @@ func physics_update(_delta: float) -> void: player.move_and_slide() if Input.is_action_just_pressed("jump_0"): state_machine.transition_to("Normal") + Global.log_comment("NOCLIP Disabled") func exit() -> void: player.can_hurt = false