diff --git a/Assets/Sprites/Backgrounds/Hills/Hill.json b/Assets/Sprites/Backgrounds/Hills/Hill.json index 9504ec7..b18f7ee 100644 --- a/Assets/Sprites/Backgrounds/Hills/Hill.json +++ b/Assets/Sprites/Backgrounds/Hills/Hill.json @@ -1,4 +1,7 @@ { + "properties": { + "primary_layer_size": [512, 512] + }, "animations": { "default": { "frames": [[0, 0, 512, 512]], diff --git a/Scenes/Levels/SMB1/World5/5-1.tscn b/Scenes/Levels/SMB1/World5/5-1.tscn index 94eda99..ca98d0c 100644 --- a/Scenes/Levels/SMB1/World5/5-1.tscn +++ b/Scenes/Levels/SMB1/World5/5-1.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=25 format=4 uid="uid://c4pw4rm4fbtbo"] +[gd_scene load_steps=26 format=4 uid="uid://c4pw4rm4fbtbo"] [ext_resource type="Script" uid="uid://bcqr1v25ygedb" path="res://Scripts/Classes/LevelClass.gd" id="1_2nn4f"] [ext_resource type="JSON" path="res://Assets/Audio/BGM/Desert.json" id="2_eurtf"] @@ -24,6 +24,7 @@ [ext_resource type="PackedScene" uid="uid://dsa8lpl7n8ge0" path="res://Scenes/Prefabs/Blocks/BrickBlocks/BrickBlock.tscn" id="22_eurtf"] [ext_resource type="PackedScene" uid="uid://d3gnwmvds4ors" path="res://Scenes/Prefabs/Entities/Items/SpinningRedCoin.tscn" id="23_wa2gp"] [ext_resource type="PackedScene" uid="uid://ctx0nbkjf2osn" path="res://Scenes/Prefabs/Entities/Items/YoshiEgg.tscn" id="24_eurtf"] +[ext_resource type="PackedScene" uid="uid://c145qqkvy8pr5" path="res://Scenes/Parts/DecoTiles.tscn" id="25_d0g3f"] [node name="5-1" type="Node"] script = ExtResource("1_2nn4f") @@ -41,7 +42,7 @@ time_of_day = 1 position = Vector2(-216, 0) [node name="DecoTiles" parent="." instance=ExtResource("6_r3wqm")] -tile_map_data = PackedByteArray("AAD+////AAABAAEAAAD/////AAABAAEAAAAAAP//AAABAAEAAAABAP//AAABAAEAAAAZAP//AAABAAEAAAAuAP//AAABAAEAAAAvAP//AAABAAEAAAAwAP//AAABAAEAAAAxAP//AAABAAEAAABeAP//AAABAAEAAABfAP//AAABAAEAAABgAP//AAABAAEAAABhAP//AAABAAEAAAB2AP//AAABAAEAAAB3AP//AAABAAEAAACOAP//AAABAAEAAACPAP//AAABAAEAAACQAP//AAABAAEAAACRAP//AAABAAEAAACmAP//AAABAAEAAADBAP//AAABAAEAAAD7//7/AAADAAAAAAD7////AAADAAEAAAAHAP7/AAADAAAAAAAHAP//AAADAAEAAAAIAP7/AAADAAAAAAAIAP//AAADAAEAAAAYAP7/AAADAAAAAAAYAP//AAADAAEAAAArAP7/AAADAAAAAAArAP//AAADAAEAAAA3AP7/AAADAAAAAAA3AP//AAADAAEAAAA4AP7/AAADAAAAAAA4AP//AAADAAEAAABbAP7/AAADAAAAAABbAP//AAADAAEAAABnAP7/AAADAAAAAABnAP//AAADAAEAAABoAP7/AAADAAAAAABoAP//AAADAAEAAAB4AP7/AAADAAAAAACLAP7/AAADAAAAAACLAP//AAADAAEAAACXAP7/AAADAAAAAACXAP//AAADAAEAAACYAP7/AAADAAAAAACYAP//AAADAAEAAAC7AP7/AAADAAAAAAC7AP//AAADAAEAAACVAP//AAAAAAEAAACVAP3/AAAEAAAAAACVAP7/AAAEAAEAAACNAP3/AAAEAAAAAACNAP7/AAAEAAEAAACNAP//AAAAAAEAAABlAP3/AAAEAAAAAABlAP7/AAAEAAEAAABlAP//AAAAAAEAAABdAP3/AAAEAAAAAABdAP7/AAAEAAEAAABdAP//AAAAAAEAAABLAP3/AAAEAAAAAABLAP7/AAAEAAEAAABLAP//AAAAAAEAAAA1AP3/AAAEAAAAAAA1AP7/AAAEAAEAAAA1AP//AAAAAAEAAAAtAP3/AAAEAAAAAAAtAP7/AAAEAAEAAAAtAP//AAAAAAEAAAAbAP3/AAAEAAAAAAAbAP7/AAAEAAEAAAAbAP//AAAAAAEAAAAFAP3/AAAEAAAAAAAFAP7/AAAEAAEAAAAFAP//AAAAAAEAAAD9//3/AAAEAAAAAAD9//7/AAAEAAEAAAD9////AAAAAAEAAAB4AP//AAADAAEAAAB5AP//AAABAAEAAAB7AP3/AAAEAAAAAAB7AP7/AAAEAAEAAAB7AP//AAAAAAEAAACrAP3/AAAEAAAAAACrAP7/AAAEAAEAAACrAP//AAAAAAEAAACsAP3/AAAEAAAAAACsAP7/AAAEAAEAAACsAP//AAAAAAEAAAAWAP//AAABAAEAAAAXAP//AAABAAEAAAA=") +tile_map_data = PackedByteArray("AAD+////AAABAAEAAAD/////AAABAAEAAAAAAP//AAABAAEAAAABAP//AAABAAEAAAAZAP//AAABAAEAAAAuAP//AAABAAEAAAAvAP//AAABAAEAAAAwAP//AAABAAEAAAAxAP//AAABAAEAAABeAP//AAABAAEAAABfAP//AAABAAEAAABgAP//AAABAAEAAABhAP//AAABAAEAAAB2AP//AAABAAEAAAB3AP//AAABAAEAAACOAP//AAABAAEAAACPAP//AAABAAEAAACQAP//AAABAAEAAACRAP//AAABAAEAAACmAP//AAABAAEAAADBAP//AAABAAEAAAD7//7/AAADAAAAAAD7////AAADAAEAAAAHAP7/AAADAAAAAAAHAP//AAADAAEAAAAIAP7/AAADAAAAAAAIAP//AAADAAEAAAAYAP7/AAADAAAAAAAYAP//AAADAAEAAAArAP7/AAADAAAAAAArAP//AAADAAEAAAA3AP7/AAADAAAAAAA3AP//AAADAAEAAAA4AP7/AAADAAAAAAA4AP//AAADAAEAAABbAP7/AAADAAAAAABbAP//AAADAAEAAABnAP7/AAADAAAAAABnAP//AAADAAEAAABoAP7/AAADAAAAAABoAP//AAADAAEAAAB4AP7/AAADAAAAAACLAP7/AAADAAAAAACLAP//AAADAAEAAACXAP7/AAADAAAAAACXAP//AAADAAEAAACYAP7/AAADAAAAAACYAP//AAADAAEAAAC7AP7/AAADAAAAAAC7AP//AAADAAEAAACVAP//AAAAAAEAAACVAP3/AAAEAAAAAACVAP7/AAAEAAEAAACNAP3/AAAEAAAAAACNAP7/AAAEAAEAAACNAP//AAAAAAEAAABlAP3/AAAEAAAAAABlAP7/AAAEAAEAAABlAP//AAAAAAEAAABdAP3/AAAEAAAAAABdAP7/AAAEAAEAAABdAP//AAAAAAEAAABLAP3/AAAEAAAAAABLAP7/AAAEAAEAAABLAP//AAAAAAEAAAA1AP3/AAAEAAAAAAA1AP7/AAAEAAEAAAA1AP//AAAAAAEAAAAtAP3/AAAEAAAAAAAtAP7/AAAEAAEAAAAtAP//AAAAAAEAAAAbAP3/AAAEAAAAAAAbAP7/AAAEAAEAAAAbAP//AAAAAAEAAAAFAP3/AAAEAAAAAAAFAP7/AAAEAAEAAAAFAP//AAAAAAEAAAD9//3/AAAEAAAAAAD9//7/AAAEAAEAAAD9////AAAAAAEAAAB4AP//AAADAAEAAAB5AP//AAABAAEAAAB7AP3/AAAEAAAAAAB7AP7/AAAEAAEAAAB7AP//AAAAAAEAAACrAP3/AAAEAAAAAACrAP7/AAAEAAEAAACrAP//AAAAAAEAAAAWAP//AAABAAEAAAAXAP//AAABAAEAAAA=") [node name="Tiles" parent="." instance=ExtResource("5_r3wqm")] tile_map_data = PackedByteArray("AADw/wAAAAACAAAAAADw/wEAAAACAAEAAADx/wAAAAACAAAAAADx/wEAAAACAAEAAADy/wAAAAACAAAAAADy/wEAAAACAAEAAADz/wAAAAACAAAAAADz/wEAAAACAAEAAAD0/wAAAAACAAAAAAD0/wEAAAACAAEAAAD1/wAAAAACAAAAAAD1/wEAAAACAAEAAAD2/wAAAAACAAAAAAD2/wEAAAACAAEAAAD3/wAAAAACAAAAAAD3/wEAAAACAAEAAAD4/wAAAAACAAAAAAD4/wEAAAACAAEAAAD5/wAAAAACAAAAAAD5/wEAAAACAAEAAAD6/wAAAAACAAAAAAD6/wEAAAACAAEAAAD7/wAAAAACAAAAAAD7/wEAAAACAAEAAAD8/wAAAAACAAAAAAD8/wEAAAACAAEAAAD9/wAAAAACAAAAAAD9/wEAAAACAAEAAAD+/wAAAAACAAAAAAD+/wEAAAACAAEAAAD//wAAAAACAAAAAAD//wEAAAACAAEAAAAAAAAAAAACAAAAAAAAAAEAAAACAAEAAAABAAAAAAACAAAAAAABAAEAAAACAAEAAAACAAAAAAACAAAAAAACAAEAAAACAAEAAAADAAAAAAACAAAAAAADAAEAAAACAAEAAAAEAAAAAAACAAAAAAAEAAEAAAACAAEAAAAFAAAAAAACAAAAAAAFAAEAAAACAAEAAAAGAAAAAAACAAAAAAAGAAEAAAACAAEAAAAHAAAAAAACAAAAAAAHAAEAAAACAAEAAAAIAAAAAAACAAAAAAAIAAEAAAACAAEAAAAJAAAAAAACAAAAAAAJAAEAAAACAAEAAAAKAAAAAAACAAAAAAAKAAEAAAACAAEAAAALAAAAAAACAAAAAAALAAEAAAACAAEAAAAMAAAAAAACAAAAAAAMAAEAAAACAAEAAAANAAAAAAACAAAAAAANAAEAAAACAAEAAAAOAAAAAAACAAAAAAAOAAEAAAACAAEAAAAPAAAAAAACAAAAAAAPAAEAAAACAAEAAAAQAAAAAAACAAAAAAAQAAEAAAACAAEAAAARAAAAAAACAAAAAAARAAEAAAACAAEAAAASAAAAAAACAAAAAAASAAEAAAACAAEAAAATAAAAAAACAAAAAAATAAEAAAACAAEAAAAUAAAAAAACAAAAAAAUAAEAAAACAAEAAAAVAAAAAAACAAAAAAAVAAEAAAACAAEAAAAWAAAAAAACAAAAAAAWAAEAAAACAAEAAAAXAAAAAAACAAAAAAAXAAEAAAACAAEAAAAYAAAAAAACAAAAAAAYAAEAAAACAAEAAAAZAAAAAAACAAAAAAAZAAEAAAACAAEAAAAaAAAAAAACAAAAAAAaAAEAAAACAAEAAAAbAAAAAAACAAAAAAAbAAEAAAACAAEAAAAcAAAAAAACAAAAAAAcAAEAAAACAAEAAAAdAAAAAAACAAAAAAAdAAEAAAACAAEAAAAeAAAAAAACAAAAAAAeAAEAAAACAAEAAAAfAAAAAAACAAAAAAAfAAEAAAACAAEAAAAgAAAAAAADAAAAAAAgAAEAAAADAAEAAAAjAAAAAAABAAAAAAAjAAEAAAABAAEAAAAkAAAAAAACAAAAAAAkAAEAAAACAAEAAAAlAAAAAAACAAAAAAAlAAEAAAACAAEAAAAmAAAAAAACAAAAAAAmAAEAAAACAAEAAAAnAAAAAAACAAAAAAAnAAEAAAACAAEAAAAoAAAAAAACAAAAAAAoAAEAAAACAAEAAAApAAAAAAACAAAAAAApAAEAAAACAAEAAAAqAAAAAAACAAAAAAAqAAEAAAACAAEAAAArAAAAAAACAAAAAAArAAEAAAACAAEAAAAsAAAAAAACAAAAAAAsAAEAAAACAAEAAAAtAAAAAAACAAAAAAAtAAEAAAACAAEAAAAuAAAAAAACAAAAAAAuAAEAAAACAAEAAAAvAAAAAAACAAAAAAAvAAEAAAACAAEAAAAwAAAAAAACAAAAAAAwAAEAAAACAAEAAAAxAAAAAAACAAAAAAAxAAEAAAACAAEAAAAyAAAAAAACAAAAAAAyAAEAAAACAAEAAAAzAAAAAAACAAAAAAAzAAEAAAACAAEAAAA0AAAAAAACAAAAAAA0AAEAAAACAAEAAAA1AAAAAAACAAAAAAA1AAEAAAACAAEAAAA2AAAAAAACAAAAAAA2AAEAAAACAAEAAAA3AAAAAAACAAAAAAA3AAEAAAACAAEAAAA4AAAAAAACAAAAAAA4AAEAAAACAAEAAAA5AAAAAAACAAAAAAA5AAEAAAACAAEAAAA6AAAAAAACAAAAAAA6AAEAAAACAAEAAAA7AAAAAAACAAAAAAA7AAEAAAACAAEAAAA8AAAAAAACAAAAAAA8AAEAAAACAAEAAAA9AAAAAAACAAAAAAA9AAEAAAACAAEAAAA+AAAAAAACAAAAAAA+AAEAAAACAAEAAAA/AAAAAAACAAAAAAA/AAEAAAACAAEAAABAAAAAAAACAAAAAABAAAEAAAACAAEAAABBAAAAAAACAAAAAABBAAEAAAACAAEAAABCAAAAAAACAAAAAABCAAEAAAACAAEAAABDAAAAAAACAAAAAABDAAEAAAACAAEAAABEAAAAAAACAAAAAABEAAEAAAACAAEAAABFAAAAAAACAAAAAABFAAEAAAACAAEAAABGAAAAAAACAAAAAABGAAEAAAACAAEAAABHAAAAAAACAAAAAABHAAEAAAACAAEAAABIAAAAAAACAAAAAABIAAEAAAACAAEAAABJAAAAAAACAAAAAABJAAEAAAACAAEAAABKAAAAAAACAAAAAABKAAEAAAACAAEAAABLAAAAAAADAAAAAABLAAEAAAADAAEAAABQAAAAAAABAAAAAABQAAEAAAABAAEAAABRAAAAAAACAAAAAABRAAEAAAACAAEAAABSAAAAAAACAAAAAABSAAEAAAACAAEAAABTAAAAAAACAAAAAABTAAEAAAACAAEAAABUAAAAAAACAAAAAABUAAEAAAACAAEAAABVAAAAAAACAAAAAABVAAEAAAACAAEAAABWAAAAAAACAAAAAABWAAEAAAACAAEAAABXAAAAAAACAAAAAABXAAEAAAACAAEAAABYAAAAAAACAAAAAABYAAEAAAACAAEAAABZAAAAAAACAAAAAABZAAEAAAACAAEAAABaAAAAAAACAAAAAABaAAEAAAACAAEAAABbAAAAAAACAAAAAABbAAEAAAACAAEAAABcAAAAAAACAAAAAABcAAEAAAACAAEAAABdAAAAAAACAAAAAABdAAEAAAACAAEAAABeAAAAAAACAAAAAABeAAEAAAACAAEAAABfAAAAAAACAAAAAABfAAEAAAACAAEAAABgAAAAAAACAAAAAABgAAEAAAACAAEAAABhAAAAAAADAAAAAABhAAEAAAADAAEAAABkAAAAAAABAAAAAABkAAEAAAABAAEAAABlAAAAAAACAAAAAABlAAEAAAACAAEAAABmAAAAAAACAAAAAABmAAEAAAACAAEAAABnAAAAAAACAAAAAABnAAEAAAACAAEAAABoAAAAAAACAAAAAABoAAEAAAACAAEAAABpAAAAAAACAAAAAABpAAEAAAACAAEAAABqAAAAAAACAAAAAABqAAEAAAACAAEAAABrAAAAAAACAAAAAABrAAEAAAACAAEAAABsAAAAAAACAAAAAABsAAEAAAACAAEAAABtAAAAAAACAAAAAABtAAEAAAACAAEAAABuAAAAAAACAAAAAABuAAEAAAACAAEAAABvAAAAAAACAAAAAABvAAEAAAACAAEAAABwAAAAAAACAAAAAABwAAEAAAACAAEAAABxAAAAAAACAAAAAABxAAEAAAACAAEAAAByAAAAAAACAAAAAAByAAEAAAACAAEAAABzAAAAAAACAAAAAABzAAEAAAACAAEAAAB0AAAAAAACAAAAAAB0AAEAAAACAAEAAAB1AAAAAAACAAAAAAB1AAEAAAACAAEAAAB2AAAAAAACAAAAAAB2AAEAAAACAAEAAAB3AAAAAAACAAAAAAB3AAEAAAACAAEAAAB4AAAAAAACAAAAAAB4AAEAAAACAAEAAAB5AAAAAAACAAAAAAB5AAEAAAACAAEAAAB6AAAAAAACAAAAAAB6AAEAAAACAAEAAAB7AAAAAAACAAAAAAB7AAEAAAACAAEAAAB8AAAAAAACAAAAAAB8AAEAAAACAAEAAAB9AAAAAAACAAAAAAB9AAEAAAACAAEAAAB+AAAAAAACAAAAAAB+AAEAAAACAAEAAAB/AAAAAAACAAAAAAB/AAEAAAACAAEAAACAAAAAAAACAAAAAACAAAEAAAACAAEAAACBAAAAAAACAAAAAACBAAEAAAACAAEAAACCAAAAAAACAAAAAACCAAEAAAACAAEAAACDAAAAAAACAAAAAACDAAEAAAACAAEAAACEAAAAAAACAAAAAACEAAEAAAACAAEAAACFAAAAAAACAAAAAACFAAEAAAACAAEAAACGAAAAAAACAAAAAACGAAEAAAACAAEAAACHAAAAAAADAAAAAACHAAEAAAADAAEAAACLAAAAAAABAAAAAACLAAEAAAABAAEAAACMAAAAAAACAAAAAACMAAEAAAACAAEAAACNAAAAAAACAAAAAACNAAEAAAACAAEAAACOAAAAAAACAAAAAACOAAEAAAACAAEAAACPAAAAAAACAAAAAACPAAEAAAACAAEAAACQAAAAAAACAAAAAACQAAEAAAACAAEAAACRAAAAAAACAAAAAACRAAEAAAACAAEAAACSAAAAAAACAAAAAACSAAEAAAACAAEAAACTAAAAAAACAAAAAACTAAEAAAACAAEAAACUAAAAAAACAAAAAACUAAEAAAACAAEAAACVAAAAAAACAAAAAACVAAEAAAACAAEAAACWAAAAAAACAAAAAACWAAEAAAACAAEAAACXAAAAAAACAAAAAACXAAEAAAACAAEAAACYAAAAAAACAAAAAACYAAEAAAACAAEAAACZAAAAAAACAAAAAACZAAEAAAACAAEAAACaAAAAAAACAAAAAACaAAEAAAACAAEAAACbAAAAAAACAAAAAACbAAEAAAACAAEAAACcAAAAAAACAAAAAACcAAEAAAACAAEAAACdAAAAAAACAAAAAACdAAEAAAACAAEAAACeAAAAAAACAAAAAACeAAEAAAACAAEAAACfAAAAAAACAAAAAACfAAEAAAACAAEAAACgAAAAAAACAAAAAACgAAEAAAACAAEAAAChAAAAAAACAAAAAAChAAEAAAACAAEAAACiAAAAAAACAAAAAACiAAEAAAACAAEAAACjAAAAAAACAAAAAACjAAEAAAACAAEAAACkAAAAAAACAAAAAACkAAEAAAACAAEAAAClAAAAAAACAAAAAAClAAEAAAACAAEAAACmAAAAAAACAAAAAACmAAEAAAACAAEAAACnAAAAAAACAAAAAACnAAEAAAACAAEAAACoAAAAAAACAAAAAACoAAEAAAACAAEAAACpAAAAAAACAAAAAACpAAEAAAACAAEAAACqAAAAAAACAAAAAACqAAEAAAACAAEAAACrAAAAAAACAAAAAACrAAEAAAACAAEAAACsAAAAAAACAAAAAACsAAEAAAACAAEAAACtAAAAAAACAAAAAACtAAEAAAACAAEAAACuAAAAAAACAAAAAACuAAEAAAACAAEAAACvAAAAAAACAAAAAACvAAEAAAACAAEAAACwAAAAAAACAAAAAACwAAEAAAACAAEAAACxAAAAAAACAAAAAACxAAEAAAACAAEAAACyAAAAAAACAAAAAACyAAEAAAACAAEAAACzAAAAAAACAAAAAACzAAEAAAACAAEAAAC0AAAAAAACAAAAAAC0AAEAAAACAAEAAAC1AAAAAAACAAAAAAC1AAEAAAACAAEAAAC2AAAAAAACAAAAAAC2AAEAAAACAAEAAAC3AAAAAAACAAAAAAC3AAEAAAACAAEAAAC4AAAAAAACAAAAAAC4AAEAAAACAAEAAAC5AAAAAAACAAAAAAC5AAEAAAACAAEAAAC6AAAAAAACAAAAAAC6AAEAAAACAAEAAAC7AAAAAAACAAAAAAC7AAEAAAACAAEAAAC8AAAAAAACAAAAAAC8AAEAAAACAAEAAAC9AAAAAAACAAAAAAC9AAEAAAACAAEAAAC+AAAAAAACAAAAAAC+AAEAAAACAAEAAAC/AAAAAAACAAAAAAC/AAEAAAACAAEAAAAcAP3/AAAIAAAAAAAcAP7/AAAIAAEAAAAdAP3/AAAJAAAAAAAdAP7/AAAJAAEAAAAjAP3/AAAIAAIAAAAjAP7/AAAIAAMAAAAkAP3/AAAJAAIAAAAkAP7/AAAJAAMAAACMAPr/AAAIAAIAAACMAPv/AAAIAAMAAACNAPr/AAAJAAIAAACNAPv/AAAJAAMAAACTAP7/AAAIAAAAAACTAP//AAAIAAEAAACUAP7/AAAJAAAAAACUAP//AAAJAAEAAACmAP//AAAEAAIAAACnAP//AAAEAAIAAACoAP//AAAEAAIAAACpAP//AAAEAAIAAACqAP//AAAEAAIAAACnAP7/AAAEAAIAAACoAP7/AAAEAAIAAACpAP7/AAAEAAIAAACqAP7/AAAEAAIAAACoAP3/AAAEAAIAAACpAP3/AAAEAAIAAACqAP3/AAAEAAIAAACpAPz/AAAEAAIAAACqAPz/AAAEAAIAAACqAPv/AAAEAAIAAACtAPj/AAAEAAIAAACtAPn/AAAEAAIAAACtAPr/AAAEAAIAAACtAPv/AAAEAAIAAACtAPz/AAAEAAIAAACtAP3/AAAEAAIAAACuAPj/AAAEAAIAAACuAPn/AAAEAAIAAACuAPr/AAAEAAIAAACuAPv/AAAEAAIAAACuAPz/AAAEAAIAAACuAP3/AAAEAAIAAACDAPz/AAAEAAIAAACDAP3/AAAEAAIAAACDAP7/AAAEAAIAAACDAP//AAAEAAIAAACMAPz/AAAEAAIAAACNAPz/AAAEAAIAAABkAP3/AAAEAAIAAABkAP7/AAAEAAIAAABkAP//AAAEAAIAAABJAP//AAAEAAIAAAAjAP//AAAIAAMAAAAkAP//AAAJAAMAAAAcAP//AAAIAAEAAAAdAP//AAAJAAEAAABKAPj/AQAAAAAAAQBLAPj/AQAAAAAACgCFAPz/AQAAAAAAAQCGAPz/AQAAAAAAAQC3AP//AAAEAAIAAABfAP7/AAABAAQAAABfAP//AAACAAQAAACaAP7/AAABAAQAAACaAP//AAACAAQAAAAhAAIAAQAAAAAABAAiAAIAAQAAAAAABABNAAIAAQAAAAAABABOAAIAAQAAAAAABABPAAIAAQAAAAAABABMAAIAAQAAAAAABABiAAIAAQAAAAAABABjAAIAAQAAAAAABACIAAIAAQAAAAAABACJAAIAAQAAAAAABACKAAIAAQAAAAAABADAAAAAAAACAAAAAADBAAAAAAACAAAAAADCAAAAAAACAAAAAADDAAAAAAACAAAAAADEAAAAAAACAAAAAADFAAAAAAACAAAAAADGAAAAAAACAAAAAADHAAAAAAACAAAAAADAAAEAAAACAAEAAADBAAEAAAACAAEAAADCAAEAAAACAAEAAADDAAEAAAACAAEAAADEAAEAAAACAAEAAADFAAEAAAACAAEAAADGAAEAAAACAAEAAADHAAEAAAACAAEAAADv/wAAAAABAAAAAADv/wEAAAABAAEAAADv/wIAAAABAAIAAADw/wIAAAACAAIAAADx/wIAAAACAAIAAADy/wIAAAACAAIAAADz/wIAAAACAAIAAAD0/wIAAAACAAIAAAD1/wIAAAACAAIAAAD2/wIAAAACAAIAAAD3/wIAAAACAAIAAAD4/wIAAAACAAIAAAD5/wIAAAACAAIAAAD6/wIAAAACAAIAAAD7/wIAAAACAAIAAAD8/wIAAAACAAIAAAD9/wIAAAACAAIAAAD+/wIAAAACAAIAAAD//wIAAAACAAIAAAAAAAIAAAACAAIAAAABAAIAAAACAAIAAAACAAIAAAACAAIAAAADAAIAAAACAAIAAAAEAAIAAAACAAIAAAAFAAIAAAACAAIAAAAGAAIAAAACAAIAAAAHAAIAAAACAAIAAAAIAAIAAAACAAIAAAAJAAIAAAACAAIAAAAKAAIAAAACAAIAAAALAAIAAAACAAIAAAAMAAIAAAACAAIAAAANAAIAAAACAAIAAAAOAAIAAAACAAIAAAAPAAIAAAACAAIAAAAQAAIAAAACAAIAAAARAAIAAAACAAIAAAASAAIAAAACAAIAAAATAAIAAAACAAIAAAAUAAIAAAACAAIAAAAVAAIAAAACAAIAAAAWAAIAAAACAAIAAAAXAAIAAAACAAIAAAAYAAIAAAACAAIAAAAZAAIAAAACAAIAAAAaAAIAAAACAAIAAAAbAAIAAAACAAIAAAAcAAIAAAACAAIAAAAdAAIAAAACAAIAAAAeAAIAAAACAAIAAAAfAAIAAAACAAIAAAAgAAIAAAADAAIAAAAjAAIAAAABAAIAAAAkAAIAAAACAAIAAAAlAAIAAAACAAIAAAAmAAIAAAACAAIAAAAnAAIAAAACAAIAAAAoAAIAAAACAAIAAAApAAIAAAACAAIAAAAqAAIAAAACAAIAAAArAAIAAAACAAIAAAAsAAIAAAACAAIAAAAtAAIAAAACAAIAAAAuAAIAAAACAAIAAAAvAAIAAAACAAIAAAAwAAIAAAACAAIAAAAxAAIAAAACAAIAAAAyAAIAAAACAAIAAAAzAAIAAAACAAIAAAA0AAIAAAACAAIAAAA1AAIAAAACAAIAAAA2AAIAAAACAAIAAAA3AAIAAAACAAIAAAA4AAIAAAACAAIAAAA5AAIAAAACAAIAAAA6AAIAAAACAAIAAAA7AAIAAAACAAIAAAA8AAIAAAACAAIAAAA9AAIAAAACAAIAAAA+AAIAAAACAAIAAAA/AAIAAAACAAIAAABAAAIAAAACAAIAAABBAAIAAAACAAIAAABCAAIAAAACAAIAAABDAAIAAAACAAIAAABEAAIAAAACAAIAAABFAAIAAAACAAIAAABGAAIAAAACAAIAAABHAAIAAAACAAIAAABIAAIAAAACAAIAAABJAAIAAAACAAIAAABKAAIAAAACAAIAAABLAAIAAAADAAIAAABQAAIAAAABAAIAAABRAAIAAAACAAIAAABSAAIAAAACAAIAAABTAAIAAAACAAIAAABUAAIAAAACAAIAAABVAAIAAAACAAIAAABWAAIAAAACAAIAAABXAAIAAAACAAIAAABYAAIAAAACAAIAAABZAAIAAAACAAIAAABaAAIAAAACAAIAAABbAAIAAAACAAIAAABcAAIAAAACAAIAAABdAAIAAAACAAIAAABeAAIAAAACAAIAAABfAAIAAAACAAIAAABgAAIAAAACAAIAAABhAAIAAAADAAIAAABkAAIAAAABAAIAAABlAAIAAAACAAIAAABmAAIAAAACAAIAAABnAAIAAAACAAIAAABoAAIAAAACAAIAAABpAAIAAAACAAIAAABqAAIAAAACAAIAAABrAAIAAAACAAIAAABsAAIAAAACAAIAAABtAAIAAAACAAIAAABuAAIAAAACAAIAAABvAAIAAAACAAIAAABwAAIAAAACAAIAAABxAAIAAAACAAIAAAByAAIAAAACAAIAAABzAAIAAAACAAIAAAB0AAIAAAACAAIAAAB1AAIAAAACAAIAAAB2AAIAAAACAAIAAAB3AAIAAAACAAIAAAB4AAIAAAACAAIAAAB5AAIAAAACAAIAAAB6AAIAAAACAAIAAAB7AAIAAAACAAIAAAB8AAIAAAACAAIAAAB9AAIAAAACAAIAAAB+AAIAAAACAAIAAAB/AAIAAAACAAIAAACAAAIAAAACAAIAAACBAAIAAAACAAIAAACCAAIAAAACAAIAAACDAAIAAAACAAIAAACEAAIAAAACAAIAAACFAAIAAAACAAIAAACGAAIAAAACAAIAAACHAAIAAAADAAIAAACLAAIAAAABAAIAAACMAAIAAAACAAIAAACNAAIAAAACAAIAAACOAAIAAAACAAIAAACPAAIAAAACAAIAAACQAAIAAAACAAIAAACRAAIAAAACAAIAAACSAAIAAAACAAIAAACTAAIAAAACAAIAAACUAAIAAAACAAIAAACVAAIAAAACAAIAAACWAAIAAAACAAIAAACXAAIAAAACAAIAAACYAAIAAAACAAIAAACZAAIAAAACAAIAAACaAAIAAAACAAIAAACbAAIAAAACAAIAAACcAAIAAAACAAIAAACdAAIAAAACAAIAAACeAAIAAAACAAIAAACfAAIAAAACAAIAAACgAAIAAAACAAIAAAChAAIAAAACAAIAAACiAAIAAAACAAIAAACjAAIAAAACAAIAAACkAAIAAAACAAIAAAClAAIAAAACAAIAAACmAAIAAAACAAIAAACnAAIAAAACAAIAAACoAAIAAAACAAIAAACpAAIAAAACAAIAAACqAAIAAAACAAIAAADIAAAAAAACAAAAAADJAAAAAAACAAAAAADKAAAAAAADAAAAAADIAAEAAAACAAEAAADJAAEAAAACAAEAAADKAAEAAAADAAEAAACrAAIAAAACAAIAAACsAAIAAAACAAIAAACtAAIAAAACAAIAAACuAAIAAAACAAIAAACvAAIAAAACAAIAAACwAAIAAAACAAIAAACxAAIAAAACAAIAAACyAAIAAAACAAIAAACzAAIAAAACAAIAAAC0AAIAAAACAAIAAAC1AAIAAAACAAIAAAC2AAIAAAACAAIAAAC3AAIAAAACAAIAAAC4AAIAAAACAAIAAAC5AAIAAAACAAIAAAC6AAIAAAACAAIAAAC7AAIAAAACAAIAAAC8AAIAAAACAAIAAAC9AAIAAAACAAIAAAC+AAIAAAACAAIAAAC/AAIAAAACAAIAAADAAAIAAAACAAIAAADBAAIAAAACAAIAAADCAAIAAAACAAIAAADDAAIAAAACAAIAAADEAAIAAAACAAIAAADFAAIAAAACAAIAAADGAAIAAAACAAIAAADHAAIAAAACAAIAAADIAAIAAAACAAIAAADJAAIAAAACAAIAAADKAAIAAAADAAIAAABKAPz/AAAEAAIAAABLAPz/AAAEAAIAAABMAPz/AAAEAAIAAABNAPz/AAAEAAIAAABJAPz/AAAEAAIAAABJAP3/AAAEAAIAAABJAP7/AAAEAAIAAACPAP7/AAABAAQAAACPAP//AAACAAQAAAA=") @@ -222,43 +223,50 @@ id = 4 position = Vector2(2760, -72) item = ExtResource("24_eurtf") +[node name="DecoTiles" parent="ChallengeNodes" instance=ExtResource("25_d0g3f")] +tile_map_data = PackedByteArray("AACsAP3/AAAEAAAAAACsAP7/AAAEAAEAAACsAP//AAAAAAEAAAA=") + [node name="Blocks" type="Node" parent="."] [node name="BrickBlock" parent="Blocks" instance=ExtResource("22_eurtf")] position = Vector2(1224, -120) -[connection signal="block_destroyed" from="Tiles/@AnimatableBody2D@117407" to="Tiles/@AnimatableBody2D@117407/LevelPersistance" method="set_as_active_2"] -[connection signal="block_emptied" from="Tiles/@AnimatableBody2D@117407" to="Tiles/@AnimatableBody2D@117407/LevelPersistance" method="set_as_active"] -[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@117407" to="Tiles/@AnimatableBody2D@117407" method="on_block_hit"] -[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@117407" to="Tiles/@AnimatableBody2D@117407/BlockAnimations" method="bounce_block" unbinds=1] -[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@117407" to="Tiles/@AnimatableBody2D@117407" method="on_shell_block_hit"] -[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@117407" to="Tiles/@AnimatableBody2D@117407/BlockAnimations" method="bounce_block" unbinds=1] -[connection signal="block_destroyed" from="Tiles/@AnimatableBody2D@117408" to="Tiles/@AnimatableBody2D@117408/LevelPersistance" method="set_as_active_2"] -[connection signal="block_emptied" from="Tiles/@AnimatableBody2D@117408" to="Tiles/@AnimatableBody2D@117408/LevelPersistance" method="set_as_active"] -[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@117408" to="Tiles/@AnimatableBody2D@117408" method="on_block_hit"] -[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@117408" to="Tiles/@AnimatableBody2D@117408/BlockAnimations" method="bounce_block" unbinds=1] -[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@117408" to="Tiles/@AnimatableBody2D@117408" method="on_shell_block_hit"] -[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@117408" to="Tiles/@AnimatableBody2D@117408/BlockAnimations" method="bounce_block" unbinds=1] -[connection signal="block_destroyed" from="Tiles/@AnimatableBody2D@117409" to="Tiles/@AnimatableBody2D@117409/LevelPersistance" method="set_as_active_2"] -[connection signal="block_emptied" from="Tiles/@AnimatableBody2D@117409" to="Tiles/@AnimatableBody2D@117409/LevelPersistance" method="set_as_active"] -[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@117409" to="Tiles/@AnimatableBody2D@117409" method="on_block_hit"] -[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@117409" to="Tiles/@AnimatableBody2D@117409/BlockAnimations" method="bounce_block" unbinds=1] -[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@117409" to="Tiles/@AnimatableBody2D@117409" method="on_shell_block_hit"] -[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@117409" to="Tiles/@AnimatableBody2D@117409/BlockAnimations" method="bounce_block" unbinds=1] -[connection signal="block_destroyed" from="Tiles/@AnimatableBody2D@117410" to="Tiles/@AnimatableBody2D@117410/LevelPersistance" method="set_as_active_2"] -[connection signal="block_emptied" from="Tiles/@AnimatableBody2D@117410" to="Tiles/@AnimatableBody2D@117410/LevelPersistance" method="set_as_active"] -[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@117410" to="Tiles/@AnimatableBody2D@117410" method="on_block_hit"] -[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@117410" to="Tiles/@AnimatableBody2D@117410/BlockAnimations" method="bounce_block" unbinds=1] -[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@117410" to="Tiles/@AnimatableBody2D@117410" method="on_shell_block_hit"] -[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@117410" to="Tiles/@AnimatableBody2D@117410/BlockAnimations" method="bounce_block" unbinds=1] -[connection signal="area_entered" from="Tiles/@Area2D@117411" to="Tiles/@Area2D@117411" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@117412" to="Tiles/@Area2D@117412" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@117413" to="Tiles/@Area2D@117413" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@117414" to="Tiles/@Area2D@117414" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@117415" to="Tiles/@Area2D@117415" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@117416" to="Tiles/@Area2D@117416" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@117417" to="Tiles/@Area2D@117417" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@117418" to="Tiles/@Area2D@117418" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@117419" to="Tiles/@Area2D@117419" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@117420" to="Tiles/@Area2D@117420" method="area_entered"] -[connection signal="area_entered" from="Tiles/@Area2D@117421" to="Tiles/@Area2D@117421" method="area_entered"] +[connection signal="block_destroyed" from="Tiles/BrickBlock" to="Tiles/BrickBlock/LevelPersistance" method="set_as_active_2"] +[connection signal="block_emptied" from="Tiles/BrickBlock" to="Tiles/BrickBlock/LevelPersistance" method="set_as_active"] +[connection signal="item_changed" from="Tiles/BrickBlock" to="Tiles/BrickBlock" method="check_brick_empty"] +[connection signal="player_block_hit" from="Tiles/BrickBlock" to="Tiles/BrickBlock" method="on_block_hit"] +[connection signal="player_block_hit" from="Tiles/BrickBlock" to="Tiles/BrickBlock/BlockAnimations" method="bounce_block" unbinds=1] +[connection signal="shell_block_hit" from="Tiles/BrickBlock" to="Tiles/BrickBlock" method="on_shell_block_hit"] +[connection signal="shell_block_hit" from="Tiles/BrickBlock" to="Tiles/BrickBlock/BlockAnimations" method="bounce_block" unbinds=1] +[connection signal="block_destroyed" from="Tiles/@AnimatableBody2D@79529" to="Tiles/@AnimatableBody2D@79529/LevelPersistance" method="set_as_active_2"] +[connection signal="block_emptied" from="Tiles/@AnimatableBody2D@79529" to="Tiles/@AnimatableBody2D@79529/LevelPersistance" method="set_as_active"] +[connection signal="item_changed" from="Tiles/@AnimatableBody2D@79529" to="Tiles/@AnimatableBody2D@79529" method="check_brick_empty"] +[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@79529" to="Tiles/@AnimatableBody2D@79529" method="on_block_hit"] +[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@79529" to="Tiles/@AnimatableBody2D@79529/BlockAnimations" method="bounce_block" unbinds=1] +[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@79529" to="Tiles/@AnimatableBody2D@79529" method="on_shell_block_hit"] +[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@79529" to="Tiles/@AnimatableBody2D@79529/BlockAnimations" method="bounce_block" unbinds=1] +[connection signal="block_destroyed" from="Tiles/@AnimatableBody2D@79530" to="Tiles/@AnimatableBody2D@79530/LevelPersistance" method="set_as_active_2"] +[connection signal="block_emptied" from="Tiles/@AnimatableBody2D@79530" to="Tiles/@AnimatableBody2D@79530/LevelPersistance" method="set_as_active"] +[connection signal="item_changed" from="Tiles/@AnimatableBody2D@79530" to="Tiles/@AnimatableBody2D@79530" method="check_brick_empty"] +[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@79530" to="Tiles/@AnimatableBody2D@79530" method="on_block_hit"] +[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@79530" to="Tiles/@AnimatableBody2D@79530/BlockAnimations" method="bounce_block" unbinds=1] +[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@79530" to="Tiles/@AnimatableBody2D@79530" method="on_shell_block_hit"] +[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@79530" to="Tiles/@AnimatableBody2D@79530/BlockAnimations" method="bounce_block" unbinds=1] +[connection signal="block_destroyed" from="Tiles/@AnimatableBody2D@79531" to="Tiles/@AnimatableBody2D@79531/LevelPersistance" method="set_as_active_2"] +[connection signal="block_emptied" from="Tiles/@AnimatableBody2D@79531" to="Tiles/@AnimatableBody2D@79531/LevelPersistance" method="set_as_active"] +[connection signal="item_changed" from="Tiles/@AnimatableBody2D@79531" to="Tiles/@AnimatableBody2D@79531" method="check_brick_empty"] +[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@79531" to="Tiles/@AnimatableBody2D@79531" method="on_block_hit"] +[connection signal="player_block_hit" from="Tiles/@AnimatableBody2D@79531" to="Tiles/@AnimatableBody2D@79531/BlockAnimations" method="bounce_block" unbinds=1] +[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@79531" to="Tiles/@AnimatableBody2D@79531" method="on_shell_block_hit"] +[connection signal="shell_block_hit" from="Tiles/@AnimatableBody2D@79531" to="Tiles/@AnimatableBody2D@79531/BlockAnimations" method="bounce_block" unbinds=1] +[connection signal="area_entered" from="Tiles/DeathPit" to="Tiles/DeathPit" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@79532" to="Tiles/@Area2D@79532" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@79533" to="Tiles/@Area2D@79533" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@79534" to="Tiles/@Area2D@79534" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@79535" to="Tiles/@Area2D@79535" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@79536" to="Tiles/@Area2D@79536" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@79537" to="Tiles/@Area2D@79537" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@79538" to="Tiles/@Area2D@79538" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@79539" to="Tiles/@Area2D@79539" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@79540" to="Tiles/@Area2D@79540" method="area_entered"] +[connection signal="area_entered" from="Tiles/@Area2D@79541" to="Tiles/@Area2D@79541" method="area_entered"] diff --git a/Scenes/Parts/ScoreNote.tscn b/Scenes/Parts/ScoreNote.tscn index 3b01f5c..e868075 100644 --- a/Scenes/Parts/ScoreNote.tscn +++ b/Scenes/Parts/ScoreNote.tscn @@ -36,7 +36,7 @@ tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true tracks/0/path = NodePath(".:position") -tracks/0/interp = 2 +tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { "times": PackedFloat32Array(0, 0.5), diff --git a/Scenes/Prefabs/LevelObjects/CastleToad.tscn b/Scenes/Prefabs/LevelObjects/CastleToad.tscn index 42c8665..baf6ba3 100644 --- a/Scenes/Prefabs/LevelObjects/CastleToad.tscn +++ b/Scenes/Prefabs/LevelObjects/CastleToad.tscn @@ -58,6 +58,7 @@ sprite_frames = SubResource("SpriteFrames_jvnky") animation = &"Emote" autoplay = "Emote" frame_progress = 0.91931444 +offset = Vector2(0, 1) script = ExtResource("3_puq45") metadata/_custom_type_script = "uid://caq1qiwmy0mox" diff --git a/Scripts/Classes/States/Player/LevelExit.gd b/Scripts/Classes/States/Player/LevelExit.gd index f0ee0e0..245ba84 100644 --- a/Scripts/Classes/States/Player/LevelExit.gd +++ b/Scripts/Classes/States/Player/LevelExit.gd @@ -1,6 +1,7 @@ extends PlayerState func enter(_msg := {}) -> void: + player.can_hurt = false player.has_jumped = false player.crouching = false player.get_node("CameraCenterJoint/RightWall").set_collision_layer_value(1, false) diff --git a/Scripts/UI/WorldSelect.gd b/Scripts/UI/WorldSelect.gd index 5a52ca3..5faad06 100644 --- a/Scripts/UI/WorldSelect.gd +++ b/Scripts/UI/WorldSelect.gd @@ -39,6 +39,8 @@ func open() -> void: setup_visuals() show() await get_tree().process_frame + if Global.current_game_mode != Global.GameMode.CAMPAIGN: + selected_world = clamp(selected_world, 0, 7) $%SlotContainer.get_child(selected_world).grab_focus() active = true