diff --git a/assets/sounds/Hurry! (LOOP).wav b/assets/music/Hurry! (LOOP).wav similarity index 100% rename from assets/sounds/Hurry! (LOOP).wav rename to assets/music/Hurry! (LOOP).wav diff --git a/assets/sounds/Hurry! (LOOP).wav.import b/assets/music/Hurry! (LOOP).wav.import similarity index 53% rename from assets/sounds/Hurry! (LOOP).wav.import rename to assets/music/Hurry! (LOOP).wav.import index 58ffa4b..c5afc88 100644 --- a/assets/sounds/Hurry! (LOOP).wav.import +++ b/assets/music/Hurry! (LOOP).wav.import @@ -2,12 +2,12 @@ importer="wav" type="AudioStreamSample" -path="res://.import/Hurry! (LOOP).wav-c3b7051d10110a80def09151131c49af.sample" +path="res://.import/Hurry! (LOOP).wav-b31bb89386b2d18e887c3205c867ae07.sample" [deps] -source_file="res://assets/sounds/Hurry! (LOOP).wav" -dest_files=[ "res://.import/Hurry! (LOOP).wav-c3b7051d10110a80def09151131c49af.sample" ] +source_file="res://assets/music/Hurry! (LOOP).wav" +dest_files=[ "res://.import/Hurry! (LOOP).wav-b31bb89386b2d18e887c3205c867ae07.sample" ] [params] diff --git a/assets/sounds/Shopping For The Future (LOOP).wav b/assets/music/Shopping For The Future (LOOP).wav similarity index 100% rename from assets/sounds/Shopping For The Future (LOOP).wav rename to assets/music/Shopping For The Future (LOOP).wav diff --git a/assets/music/Shopping For The Future (LOOP).wav.import b/assets/music/Shopping For The Future (LOOP).wav.import new file mode 100644 index 0000000..fc95576 --- /dev/null +++ b/assets/music/Shopping For The Future (LOOP).wav.import @@ -0,0 +1,23 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/Shopping For The Future (LOOP).wav-d534bfc01b0771285faaf6e61188d62c.sample" + +[deps] + +source_file="res://assets/music/Shopping For The Future (LOOP).wav" +dest_files=[ "res://.import/Shopping For The Future (LOOP).wav-d534bfc01b0771285faaf6e61188d62c.sample" ] + +[params] + +force/8_bit=false +force/mono=true +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=true +edit/loop_mode=2 +edit/loop_begin=0 +edit/loop_end=1878660 +compress/mode=0 diff --git a/assets/sounds/Energy Escape.wav b/assets/sounds/Energy Escape.wav new file mode 100644 index 0000000..2477ad6 Binary files /dev/null and b/assets/sounds/Energy Escape.wav differ diff --git a/assets/sounds/Energy Escape.wav.import b/assets/sounds/Energy Escape.wav.import new file mode 100644 index 0000000..2fd5e32 --- /dev/null +++ b/assets/sounds/Energy Escape.wav.import @@ -0,0 +1,23 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/Energy Escape.wav-7921407c44017de72616c199d40a54a8.sample" + +[deps] + +source_file="res://assets/sounds/Energy Escape.wav" +dest_files=[ "res://.import/Energy Escape.wav-7921407c44017de72616c199d40a54a8.sample" ] + +[params] + +force/8_bit=false +force/mono=true +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=true +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=0 diff --git a/assets/sounds/Shopping For The Future (LOOP).wav.import b/assets/sounds/Shopping For The Future (LOOP).wav.import deleted file mode 100644 index 4bc4e9d..0000000 --- a/assets/sounds/Shopping For The Future (LOOP).wav.import +++ /dev/null @@ -1,23 +0,0 @@ -[remap] - -importer="wav" -type="AudioStreamSample" -path="res://.import/Shopping For The Future (LOOP).wav-7fd67300dedd210ed4d463045d3513c3.sample" - -[deps] - -source_file="res://assets/sounds/Shopping For The Future (LOOP).wav" -dest_files=[ "res://.import/Shopping For The Future (LOOP).wav-7fd67300dedd210ed4d463045d3513c3.sample" ] - -[params] - -force/8_bit=false -force/mono=true -force/max_rate=false -force/max_rate_hz=44100 -edit/trim=false -edit/normalize=true -edit/loop_mode=2 -edit/loop_begin=0 -edit/loop_end=1878660 -compress/mode=0 diff --git a/src/Actors/Blobby/Blobby.gd b/src/Actors/Blobby/Blobby.gd index 66505a1..840f8e9 100644 --- a/src/Actors/Blobby/Blobby.gd +++ b/src/Actors/Blobby/Blobby.gd @@ -444,7 +444,7 @@ func die(animation_number: int = 0) -> void: $"%BlobbymationTree".active = false $"%BlobbymationPlayer".play("dying3") if animation_number < 1: - $BlobbySprite/BlobbymationPlayer.play("expandingDisolve") + $"%BlobbymationPlayer".play("expandingDisolve") func die_for_real(animation_number: int = 0) -> void: shielded = false @@ -490,12 +490,6 @@ func _on_InvincibilityTimer_timeout() -> void: if area.is_in_group("harmful"): die() -func _on_PitfallTimer_timeout() -> void: - # TODO Debuff function to remove wanted buffs - shielded = false - levelState.player_dying() - respawn() - func handle_grounded_movement(delta: float, direction: Vector2) -> Vector2: return calculate_grounded_velocity(velocity, delta, direction) diff --git a/src/Actors/Blobby/Blobby.tscn b/src/Actors/Blobby/Blobby.tscn index d34303f..00dd284 100644 --- a/src/Actors/Blobby/Blobby.tscn +++ b/src/Actors/Blobby/Blobby.tscn @@ -1106,20 +1106,6 @@ tracks/1/keys = { "update": 0, "values": [ Vector2( 0, 0 ) ] } -tracks/2/type = "method" -tracks/2/path = NodePath("../DyingSound") -tracks/2/interp = 1 -tracks/2/loop_wrap = true -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"values": [ { -"args": [ 0.0 ], -"method": "play" -} ] -} [sub_resource type="Animation" id=192] resource_name = "expandingDisolve" @@ -1161,7 +1147,7 @@ tracks/2/keys = { "values": [ 32 ] } -[sub_resource type="Animation" id=6] +[sub_resource type="Animation" id=204] length = 0.14 loop = true tracks/0/type = "value" @@ -4274,7 +4260,7 @@ anims/dying = SubResource( 184 ) anims/dying2 = SubResource( 187 ) anims/dying3 = SubResource( 188 ) anims/expandingDisolve = SubResource( 192 ) -anims/falling = SubResource( 6 ) +anims/falling = SubResource( 204 ) anims/fallingLeft = SubResource( 106 ) anims/idleTurn = SubResource( 70 ) anims/idling = SubResource( 7 ) @@ -4420,4 +4406,5 @@ one_shot = true [connection signal="got_grounded" from="BlobbyStateMachine" to="." method="_on_Blobby_got_grounded"] [connection signal="timeout" from="BlobbyStateMachine/JumpBufferTimer" to="BlobbyStateMachine" method="_on_JumpBufferTimer_timeout"] [connection signal="timeout" from="InvincibilityTimer" to="." method="_on_InvincibilityTimer_timeout"] +[connection signal="timeout" from="PitfallTimer" to="." method="die_for_real"] [connection signal="timeout" from="PitfallTimer" to="." method="_on_PitfallTimer_timeout"] diff --git a/src/Actors/BlobbyCam.gd b/src/Actors/BlobbyCam.gd index 07ac1bb..c23fb0d 100644 --- a/src/Actors/BlobbyCam.gd +++ b/src/Actors/BlobbyCam.gd @@ -5,6 +5,7 @@ export var offset_reset_seconds := 1 export var offset_adapt_seconds := 1 export var offset_input_seconds := 0.618 * 2 export var alarm_light_shader: Material +export var fixed_position : bool = false onready var levelState := $"%LevelState" onready var signalManager := $"%SignalManager" @@ -49,7 +50,8 @@ var screen_right = Vector2() func _ready(): _set_boundaries() get_tree().get_root().connect("size_changed", self, "_set_boundaries") - self.position = blobby.global_position + if !fixed_position: + self.position = blobby.global_position image.create(128, 2, false, Image.FORMAT_RGBAH) # TODO Test Performance material.set_shader_param("light_data", null) @@ -66,6 +68,8 @@ func _on_SignalManager_terminal_activated(animation_number: int = 0): # draw_line(Vector2((limit_left - position.x), screen_center.y), screen_left, Color(255, 0, 0), 1) func _physics_process(delta: float) -> void: + if fixed_position: + return # update() screen_center = (get_camera_screen_center() - position) screen_bottom = screen_center + Vector2(0, screen_rect.y/2) diff --git a/src/Actors/BlobbyCam.tscn b/src/Actors/BlobbyCam.tscn index 9b862a0..5f3c5fc 100644 --- a/src/Actors/BlobbyCam.tscn +++ b/src/Actors/BlobbyCam.tscn @@ -1031,9 +1031,9 @@ texture = ExtResource( 8 ) [node name="AnimatedSprite" type="AnimatedSprite" parent="ParallaxBackground/ParallaxLayer5"] frames = SubResource( 7 ) +frame = 9 playing = true [node name="AnimatedSprite2" type="AnimatedSprite" parent="ParallaxBackground/ParallaxLayer5"] frames = SubResource( 8 ) -frame = 5 playing = true diff --git a/src/Autoload/GlobalState.gd b/src/Autoload/GlobalState.gd index 6238c29..ffa239f 100644 --- a/src/Autoload/GlobalState.gd +++ b/src/Autoload/GlobalState.gd @@ -11,19 +11,20 @@ func _ready(): load_sounds() func load_sounds() -> void: - var path = "res://assets/sounds" - var dir = Directory.new() - dir.open(path) - dir.list_dir_begin() - while true: - var file_name = dir.get_next() - if file_name == "": - break - var sound_file - if file_name.ends_with(".import"): - sound_file = load(path + "/" + file_name.split(".import")[0]) - sound_library[sound_file.resource_path] = sound_file - dir.list_dir_end() + var paths = ["res://assets/sounds","res://assets/music"] + for path in paths: + var dir = Directory.new() + dir.open(path) + dir.list_dir_begin() + while true: + var file_name = dir.get_next() + if file_name == "": + break + var sound_file + if file_name.ends_with(".import"): + sound_file = load(path + "/" + file_name.split(".import")[0]) + sound_library[sound_file.resource_path] = sound_file + dir.list_dir_end() func set_progress(value) -> void: gsr.progress_dict = value diff --git a/src/BenefitialObjects/Coin.tscn b/src/BenefitialObjects/Coin.tscn index fcd842f..38f939a 100644 --- a/src/BenefitialObjects/Coin.tscn +++ b/src/BenefitialObjects/Coin.tscn @@ -466,7 +466,7 @@ rotation = -0.235619 scale = Vector2( 0.036, 0.036 ) frames = SubResource( 4 ) animation = "rotate" -frame = 148 +frame = 155 playing = true [node name="Sprite" type="Sprite" parent="."] diff --git a/src/Cinematics/FreedFrogCorridor.tscn b/src/Cinematics/FreedFrogCorridor.tscn new file mode 100644 index 0000000..fe7b9cc --- /dev/null +++ b/src/Cinematics/FreedFrogCorridor.tscn @@ -0,0 +1,118 @@ +[gd_scene load_steps=14 format=2] + +[ext_resource path="res://src/Actors/Friendlies/WhatAreFrog.tscn" type="PackedScene" id=1] +[ext_resource path="res://assets/ui/sci-fi-godot-theme/sci-fi-pixel.tres" type="DynamicFont" id=2] +[ext_resource path="res://src/Levels/Templates/LevelTemplate.gd" type="Script" id=5] +[ext_resource path="res://src/Utilities/SignalManager.tscn" type="PackedScene" id=8] +[ext_resource path="res://src/Actors/BlobbyCam.tscn" type="PackedScene" id=9] +[ext_resource path="res://src/UserInterface/UserInterface.tscn" type="PackedScene" id=11] +[ext_resource path="res://src/Utilities/LevelState.tscn" type="PackedScene" id=12] +[ext_resource path="res://src/Utilities/SceneAudio.tscn" type="PackedScene" id=13] +[ext_resource path="res://src/Environment/DropThroughPlatforms.tres" type="TileSet" id=14] +[ext_resource path="res://src/Environment/GreenHouseTiles.tres" type="TileSet" id=15] +[ext_resource path="res://assets/sounds/AMBIENCE_SciFi_Large_Space_Hangar_Deep_Smooth_loop_stereo.wav" type="AudioStream" id=16] +[ext_resource path="res://assets/environment/decor/platform-plants.png" type="Texture" id=17] + +[sub_resource type="TileSet" id=5] +0/name = "platform-plants.png 0" +0/texture = ExtResource( 17 ) +0/tex_offset = Vector2( 0, 0 ) +0/modulate = Color( 1, 1, 1, 1 ) +0/region = Rect2( 16, 0, 256, 16 ) +0/tile_mode = 2 +0/autotile/icon_coordinate = Vector2( 5, 0 ) +0/autotile/tile_size = Vector2( 16, 16 ) +0/autotile/spacing = 0 +0/autotile/occluder_map = [ ] +0/autotile/navpoly_map = [ ] +0/autotile/priority_map = [ ] +0/autotile/z_index_map = [ ] +0/occluder_offset = Vector2( 0, 0 ) +0/navigation_offset = Vector2( 0, 0 ) +0/shape_offset = Vector2( 0, 0 ) +0/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +0/shape_one_way = false +0/shape_one_way_margin = 0.0 +0/shapes = [ ] +0/z_index = 0 + +[node name="LevelTemplate" type="Node2D"] +script = ExtResource( 5 ) +__meta__ = { +"_edit_horizontal_guides_": [ 464.0 ], +"_edit_vertical_guides_": [ 2880.0 ] +} + +[node name="SignalManager" parent="." instance=ExtResource( 8 )] + +[node name="SceneAudio" parent="." instance=ExtResource( 13 )] + +[node name="LevelState" parent="." instance=ExtResource( 12 )] +unique_name_in_owner = true + +[node name="UserInterface" parent="." instance=ExtResource( 11 )] +unique_name_in_owner = true + +[node name="Timer" parent="UserInterface/HUD/HUDOverlay/GetBackTimer" index="0"] +wait_time = 20.0 + +[node name="Label" type="Label" parent="."] +margin_left = -61.0 +margin_top = 20.0 +margin_right = 62.0 +margin_bottom = 53.0 +custom_fonts/font = ExtResource( 2 ) +text = "<= Escape Pods +0/10 Seats occupied +" +align = 1 +valign = 1 + +[node name="WhatAreFrog" parent="." instance=ExtResource( 1 )] +position = Vector2( 121, 103 ) + +[node name="BlobbyCam" parent="." instance=ExtResource( 9 )] +unique_name_in_owner = true +drag_margin_bottom = 0.3 +fixed_position = true + +[node name="AnimatedSprite" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="4"] +frame = 1 + +[node name="AnimatedSprite2" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="5"] +frame = 0 + +[node name="TileMap" type="TileMap" parent="."] +unique_name_in_owner = true +tile_set = ExtResource( 15 ) +cell_size = Vector2( 16, 16 ) +cell_quadrant_size = 3 +cell_custom_transform = Transform2D( 24, 0, 0, 24, 0, 0 ) +collision_layer = 8 +collision_mask = 8 +bake_navigation = true +format = 1 +tile_data = PoolIntArray( 65522, 5, 65540, 65523, 5, 10, 65524, 5, 10, 65525, 5, 10, 65526, 5, 10, 65527, 5, 10, 65528, 5, 10, 65529, 5, 10, 65530, 5, 10, 65531, 5, 10, 65532, 5, 10, 65533, 5, 10, 65534, 5, 10, 65535, 5, 10, 0, 5, 10, 1, 5, 10, 2, 5, 10, 3, 5, 10, 4, 5, 10, 5, 5, 10, 6, 5, 10, 7, 5, 10, 8, 5, 10, 9, 5, 10, 10, 5, 10, 11, 5, 10, 12, 5, 10, 13, 5, 10, 14, 5, 10, 15, 5, 10, 16, 5, 10, 17, 5, 10, 18, 5, 10, 19, 5, 10, 131058, 5, 7, 196594, 5, 7, 262130, 5, 7, 327666, 5, 7, 393202, 5, 7, 458738, 5, 7, 524274, 5, 65538, 524275, 5, 2, 524276, 5, 2, 524277, 5, 2, 524278, 5, 2, 524279, 5, 2, 524280, 5, 2, 524281, 5, 2, 524282, 5, 2, 524283, 5, 2, 524284, 5, 2, 524285, 5, 2, 524286, 5, 2, 524287, 5, 2, 458752, 5, 2, 458753, 5, 2, 458754, 5, 2, 458755, 5, 2, 458756, 5, 2, 458757, 5, 2, 458758, 5, 2, 458759, 5, 2, 458760, 5, 2, 458761, 5, 2, 458762, 5, 2, 458763, 5, 2, 458764, 5, 2, 458765, 5, 2, 458766, 5, 2, 458767, 5, 2, 458768, 5, 2, 458769, 5, 2, 458770, 5, 2, 458771, 5, 3 ) + +[node name="DropThroughPlatforms" type="TileMap" parent="."] +tile_set = ExtResource( 14 ) +cell_size = Vector2( 16, 16 ) +format = 1 + +[node name="PlatformPlants" type="TileMap" parent="."] +tile_set = SubResource( 5 ) +cell_size = Vector2( 16, 16 ) +format = 1 + +[node name="LevelAmbiance" type="AudioStreamPlayer" parent="."] +unique_name_in_owner = true +stream = ExtResource( 16 ) +volume_db = -14.994 +autoplay = true +bus = "Music" + +[editable path="SignalManager"] +[editable path="LevelState"] +[editable path="UserInterface"] +[editable path="UserInterface/HUD"] +[editable path="BlobbyCam"] diff --git a/src/Contraptions/Triggers/ElevatorButton.tscn b/src/Contraptions/Triggers/ElevatorButton.tscn index 935fc2d..3c2407a 100644 --- a/src/Contraptions/Triggers/ElevatorButton.tscn +++ b/src/Contraptions/Triggers/ElevatorButton.tscn @@ -4,7 +4,7 @@ [ext_resource path="res://assets/contraption/button.png" type="Texture" id=2] [ext_resource path="res://assets/contraption/buttonStateIndicator.png" type="Texture" id=3] [ext_resource path="res://assets/ui/sci-fi-godot-theme/sci-fi-pixel.tres" type="DynamicFont" id=4] -[ext_resource path="res://assets/sounds/Hurry! (LOOP).wav" type="AudioStream" id=5] +[ext_resource path="res://assets/music/Hurry! (LOOP).wav" type="AudioStream" id=5] [sub_resource type="Gradient" id=23] interpolation_mode = 2 diff --git a/src/Environment/Grass/ShaderGrass.tscn b/src/Environment/Grass/ShaderGrass.tscn index 0e6c664..9aac513 100644 --- a/src/Environment/Grass/ShaderGrass.tscn +++ b/src/Environment/Grass/ShaderGrass.tscn @@ -12,7 +12,6 @@ [node name="ShaderGrass" type="Node2D"] script = ExtResource( 2 ) interact_power = 0.07 -max_displacement = 7 [node name="StraightStraw" type="Polygon2D" parent="."] material = ExtResource( 3 ) diff --git a/src/Levels/1 Tutorial Level.tscn b/src/Levels/1 Tutorial Level.tscn index 293916a..7fe7a6b 100644 --- a/src/Levels/1 Tutorial Level.tscn +++ b/src/Levels/1 Tutorial Level.tscn @@ -208,10 +208,10 @@ unique_name_in_owner = true process_mode = 1 [node name="AnimatedSprite" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="4"] -frame = 9 +frame = 12 [node name="AnimatedSprite2" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="5"] -frame = 8 +frame = 11 [node name="Blobby" parent="." instance=ExtResource( 7 )] unique_name_in_owner = true diff --git a/src/Levels/2 Tutorial Level.tscn b/src/Levels/2 Tutorial Level.tscn index ee50575..1a94a7f 100644 --- a/src/Levels/2 Tutorial Level.tscn +++ b/src/Levels/2 Tutorial Level.tscn @@ -1035,10 +1035,10 @@ drag_margin_top = 0.1 drag_margin_bottom = 0.1 [node name="AnimatedSprite" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="4"] -frame = 2 +frame = 8 [node name="AnimatedSprite2" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="5"] -frame = 10 +frame = 2 [node name="Blobby" parent="." instance=ExtResource( 8 )] unique_name_in_owner = true diff --git a/src/Levels/3 Tutorial Level.tscn b/src/Levels/3 Tutorial Level.tscn index 8748f5a..692eb0f 100644 --- a/src/Levels/3 Tutorial Level.tscn +++ b/src/Levels/3 Tutorial Level.tscn @@ -123,9 +123,6 @@ wait_time = 20.0 unique_name_in_owner = true visible = false -[node name="AnimatedSprite" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="4"] -frame = 0 - [node name="AnimatedSprite2" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="5"] frame = 13 diff --git a/src/Levels/4 Tutorial Level.tscn b/src/Levels/4 Tutorial Level.tscn index d78cd09..8327fcb 100644 --- a/src/Levels/4 Tutorial Level.tscn +++ b/src/Levels/4 Tutorial Level.tscn @@ -69,10 +69,10 @@ unique_name_in_owner = true drag_margin_bottom = 0.3 [node name="AnimatedSprite" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="4"] -frame = 2 +frame = 11 [node name="AnimatedSprite2" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="5"] -frame = 1 +frame = 10 [node name="Blobby" parent="." instance=ExtResource( 8 )] unique_name_in_owner = true diff --git a/src/Levels/5 Tutorial Level.tscn b/src/Levels/5 Tutorial Level.tscn index e4381fd..9e07d51 100644 --- a/src/Levels/5 Tutorial Level.tscn +++ b/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 = 13 +frame = 7 [node name="AnimatedSprite2" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="5"] -frame = 12 +frame = 6 [node name="Blobby" parent="." instance=ExtResource( 9 )] unique_name_in_owner = true @@ -81,7 +81,7 @@ scale = Vector2( 0.878906, 0.936025 ) parameters/playback = SubResource( 7 ) [node name="VendingMachine" parent="." instance=ExtResource( 19 )] -position = Vector2( 48, 100 ) +position = Vector2( -64, 100 ) [node name="TileMap" type="TileMap" parent="."] unique_name_in_owner = true @@ -93,7 +93,7 @@ collision_layer = 8 collision_mask = 8 bake_navigation = true format = 1 -tile_data = PoolIntArray( -393230, 1610612741, 65539, -393229, 5, 10, -393228, 5, 10, -393227, 5, 10, -393226, 5, 10, -393225, 5, 10, -393224, 5, 10, -393223, 5, 10, -393222, 5, 10, -393221, 5, 10, -393220, 5, 10, -393219, 5, 10, -393218, 5, 10, -393217, 5, 10, -458752, 5, 10, -458751, 5, 10, -458750, 5, 10, -458749, 5, 10, -458748, 5, 10, -458747, 5, 65541, -458746, 5, 65540, -458745, 5, 10, -458744, 5, 10, -458743, 5, 10, -458742, 5, 10, -458741, 5, 10, -458740, 5, 10, -458739, 5, 10, -458738, 5, 10, -458737, 5, 10, -458736, 5, 10, -458735, 5, 10, -458734, 5, 10, -458733, 5, 10, -458732, 5, 10, -458731, 5, 10, -458730, 5, 10, -458729, 5, 10, -458728, 5, 10, -458727, 5, 10, -458726, 5, 10, -458725, 5, 10, -458724, 5, 10, -458723, 5, 10, -458722, 5, 10, -458721, 5, 10, -458720, 5, 10, -458719, 5, 65541, -327694, 5, 7, -327693, 7, 0, -327692, 7, 0, -327691, 7, 0, -327690, 7, 0, -327689, 7, 0, -327688, 7, 0, -327687, 7, 0, -327686, 7, 0, -327685, 7, 0, -327684, 7, 0, -327683, 7, 0, -327682, 7, 0, -327681, 7, 0, -393216, 7, 0, -393215, 7, 0, -393214, 7, 0, -393213, 7, 0, -393212, 7, 0, -393211, 5, 6, -393210, 5, 8, -393209, 7, 0, -393208, 7, 0, -393207, 7, 0, -393206, 7, 0, -393205, 7, 0, -393204, 7, 0, -393203, 7, 0, -393202, 7, 0, -393201, 7, 0, -393200, 7, 0, -393199, 7, 0, -393198, 7, 0, -393197, 7, 0, -393196, 7, 0, -393195, 7, 0, -393194, 7, 0, -393193, 7, 0, -393192, 7, 0, -393191, 7, 0, -393190, 7, 0, -393189, 7, 0, -393188, 7, 0, -393187, 7, 0, -393186, 7, 0, -393185, 7, 0, -393184, 7, 0, -393183, 5, 6, -262158, 5, 7, -262157, 7, 0, -262156, 7, 0, -262155, 7, 0, -262154, 7, 0, -262153, 7, 0, -262152, 7, 0, -262151, 7, 0, -262150, 7, 0, -262149, 7, 0, -262148, 7, 0, -262147, 7, 0, -262146, 7, 0, -262145, 7, 0, -327680, 7, 0, -327679, 7, 0, -327678, 7, 0, -327677, 7, 0, -327676, 7, 0, -327675, 5, 6, -327674, 5, 8, -327673, 7, 0, -327672, 7, 0, -327671, 7, 0, -327670, 7, 0, -327669, 7, 0, -327668, 7, 0, -327667, 7, 0, -327666, 7, 0, -327665, 7, 0, -327664, 7, 0, -327663, 7, 0, -327662, 7, 0, -327661, 7, 0, -327660, 7, 0, -327659, 7, 0, -327658, 7, 0, -327657, 7, 0, -327656, 7, 0, -327655, 7, 0, -327654, 7, 0, -327653, 7, 0, -327652, 7, 0, -327651, 7, 0, -327650, 7, 0, -327649, 7, 0, -327648, 7, 0, -327647, 5, 6, -196622, 5, 7, -196621, 7, 0, -196620, 7, 0, -196619, 7, 0, -196618, 7, 0, -196617, 7, 0, -196616, 7, 0, -196615, 7, 0, -196614, 7, 0, -196613, 7, 0, -196612, 7, 0, -196611, 7, 0, -196610, 7, 0, -196609, 7, 0, -262144, 7, 0, -262143, 7, 0, -262142, 7, 0, -262141, 7, 0, -262140, 7, 0, -262139, 5, 6, -262138, 5, 8, -262137, 7, 0, -262136, 7, 0, -262135, 7, 0, -262134, 7, 0, -262133, 7, 0, -262132, 7, 0, -262131, 7, 0, -262130, 7, 0, -262129, 7, 0, -262128, 7, 0, -262127, 7, 0, -262126, 7, 0, -262125, 7, 0, -262124, 7, 0, -262123, 7, 0, -262122, 7, 0, -262121, 7, 0, -262120, 7, 0, -262119, 7, 0, -262118, 7, 0, -262117, 7, 0, -262116, 7, 0, -262115, 7, 0, -262114, 7, 0, -262113, 7, 0, -262112, 7, 0, -262111, 5, 6, -131086, 5, 7, -131085, 7, 0, -131084, 7, 0, -131083, 7, 0, -131082, 7, 0, -131081, 7, 0, -131080, 7, 0, -131079, 7, 0, -131078, 7, 0, -131077, 7, 0, -131076, 7, 0, -131075, 7, 0, -131074, 7, 0, -131073, 7, 0, -196608, 7, 0, -196607, 7, 0, -196606, 7, 0, -196605, 7, 0, -196604, 7, 0, -196603, 5, 6, -196602, 5, 8, -196601, 7, 0, -196600, 7, 0, -196599, 7, 0, -196598, 7, 0, -196597, 7, 0, -196596, 7, 0, -196595, 7, 0, -196594, 7, 0, -196593, 7, 0, -196592, 7, 0, -196591, 7, 0, -196590, 7, 0, -196589, 7, 0, -196588, 7, 0, -196587, 7, 0, -196586, 7, 0, -196585, 7, 0, -196584, 7, 0, -196583, 7, 0, -196582, 7, 0, -196581, 7, 0, -196580, 7, 0, -196579, 7, 0, -196578, 7, 0, -196577, 7, 0, -196576, 7, 0, -196575, 5, 6, -65550, 5, 7, -65549, 7, 0, -65548, 7, 0, -65547, 7, 0, -65546, 7, 0, -65545, 7, 0, -65544, 7, 0, -65543, 7, 0, -65542, 7, 0, -65541, 7, 0, -65540, 7, 0, -65539, 7, 0, -65538, 7, 0, -65537, 7, 0, -131072, 7, 0, -131071, 7, 0, -131070, 7, 0, -131069, 7, 0, -131068, 7, 0, -131067, 5, 6, -131066, 5, 8, -131065, 7, 0, -131064, 7, 0, -131063, 7, 0, -131062, 7, 0, -131061, 7, 0, -131060, 7, 0, -131059, 7, 0, -131058, 7, 0, -131057, 7, 0, -131056, 7, 0, -131055, 7, 0, -131054, 7, 0, -131053, 7, 0, -131052, 7, 0, -131051, 7, 0, -131050, 7, 0, -131049, 7, 0, -131048, 7, 0, -131047, 7, 0, -131046, 7, 0, -131045, 7, 0, -131044, 7, 0, -131043, 7, 0, -131042, 7, 0, -131041, 7, 0, -131040, 7, 0, -131039, 5, 6, -14, 5, 7, -13, 7, 0, -12, 7, 0, -11, 7, 0, -10, 7, 0, -9, 7, 0, -8, 7, 0, -7, 7, 0, -6, 7, 0, -5, 7, 0, -4, 7, 0, -3, 7, 0, -2, 7, 0, -1, 7, 0, -65536, 7, 0, -65535, 7, 0, -65534, 7, 0, -65533, 7, 0, -65532, 7, 0, -65531, 5, 6, -65530, 5, 8, -65529, 7, 0, -65528, 7, 0, -65527, 7, 0, -65526, 7, 0, -65525, 7, 0, -65524, 7, 0, -65523, 7, 0, -65522, 7, 0, -65521, 7, 0, -65520, 7, 0, -65519, 7, 0, -65518, 7, 0, -65517, 7, 0, -65516, 7, 0, -65515, 5, 1, -65514, 5, 3, -65513, 5, 3, -65512, 5, 3, -65511, 5, 3, -65510, 5, 3, -65509, 5, 3, -65508, 5, 3, -65507, 5, 3, -65506, 5, 3, -65505, 5, 3, -65504, 5, 3, -65503, 5, 6, 65522, 5, 7, 65523, 7, 0, 65524, 7, 0, 65525, 7, 0, 65526, 7, 0, 65527, 7, 0, 65528, 7, 0, 65529, 7, 0, 65530, 7, 0, 65531, 7, 0, 65532, 7, 0, 65533, 7, 0, 65534, 7, 0, 65535, 7, 0, 0, 7, 0, 1, 7, 0, 2, 7, 0, 3, 7, 0, 4, 7, 0, 5, 5, 6, 6, 5, 8, 7, 7, 0, 8, 7, 0, 9, 7, 0, 10, 7, 0, 11, 7, 0, 12, 7, 0, 13, 7, 0, 14, 7, 0, 15, 7, 0, 16, 7, 0, 17, 7, 0, 18, 7, 0, 19, 7, 0, 20, 7, 0, 21, 5, 6, 33, 5, 6, 131058, 5, 7, 131059, 7, 0, 131060, 7, 0, 131061, 7, 0, 131062, 7, 0, 131063, 7, 0, 131064, 7, 0, 131065, 7, 0, 131066, 7, 0, 131067, 7, 0, 131068, 7, 0, 131069, 7, 0, 131070, 7, 0, 131071, 7, 0, 65536, 7, 0, 65537, 7, 0, 65538, 7, 0, 65539, 7, 0, 65540, 7, 0, 65541, 5, 6, 65542, 5, 8, 65543, 7, 0, 65544, 7, 0, 65545, 7, 0, 65546, 7, 0, 65547, 7, 0, 65548, 7, 0, 65549, 7, 0, 65550, 7, 0, 65551, 7, 0, 65552, 7, 0, 65553, 7, 0, 65554, 7, 0, 65555, 7, 0, 65556, 7, 0, 65557, 5, 9, 65558, 5, 10, 65559, 5, 10, 65560, 5, 10, 65561, 5, 10, 65562, 5, 10, 65563, 5, 10, 65564, 5, 10, 65565, 5, 10, 65566, 5, 10, 65567, 5, 10, 65568, 5, 10, 65569, 5, 6, 196594, 5, 7, 196595, 7, 0, 196596, 7, 0, 196597, 7, 0, 196598, 7, 0, 196599, 7, 0, 196600, 7, 0, 196601, 7, 0, 196602, 7, 0, 196603, 7, 0, 196604, 7, 0, 196605, 7, 0, 196606, 7, 0, 196607, 7, 0, 131072, 7, 0, 131073, 7, 0, 131074, 7, 0, 131075, 7, 0, 131076, 7, 0, 131077, 5, 6, 131078, 5, 8, 131079, 7, 0, 131080, 7, 0, 131081, 7, 0, 131082, 7, 0, 131083, 7, 0, 131084, 7, 0, 131085, 7, 0, 131086, 7, 0, 131087, 7, 0, 131088, 7, 0, 131089, 7, 0, 131090, 7, 0, 131091, 7, 0, 131092, 7, 0, 131093, 7, 0, 131094, 7, 0, 131095, 7, 0, 131096, 7, 0, 131097, 7, 0, 131098, 7, 0, 131099, 7, 0, 131100, 7, 0, 131101, 7, 0, 131102, 7, 0, 131103, 7, 0, 131104, 7, 0, 131105, 5, 6, 262130, 5, 7, 262131, 7, 0, 262132, 7, 0, 262133, 7, 0, 262134, 7, 0, 262135, 7, 0, 262136, 7, 0, 262137, 7, 0, 262138, 7, 0, 262139, 7, 0, 262140, 7, 0, 262141, 7, 0, 262142, 7, 0, 262143, 7, 0, 196608, 7, 0, 196609, 7, 0, 196610, 7, 0, 196611, 7, 0, 196612, 7, 0, 196613, 5, 6, 196614, 5, 65538, 196615, 5, 2, 196616, 5, 2, 196617, 5, 2, 196618, 5, 4, 196619, 7, 0, 196620, 7, 0, 196621, 7, 0, 196622, 7, 0, 196623, 7, 0, 196624, 7, 0, 196625, 7, 0, 196626, 7, 0, 196627, 7, 0, 196628, 7, 0, 196629, 7, 0, 196630, 7, 0, 196631, 7, 0, 196632, 7, 0, 196633, 7, 0, 196634, 7, 0, 196635, 7, 0, 196636, 7, 0, 196637, 7, 0, 196638, 7, 0, 196639, 7, 0, 196640, 7, 0, 196641, 5, 6, 327666, 5, 7, 327667, 7, 0, 327668, 7, 0, 327669, 7, 0, 327670, 7, 0, 327671, 7, 0, 327672, 7, 0, 327673, 7, 0, 327674, 7, 0, 327675, 7, 0, 327676, 7, 0, 327677, 7, 0, 327678, 7, 0, 327679, 7, 0, 262144, 7, 0, 262145, 7, 0, 262146, 7, 0, 262147, 7, 0, 262148, 7, 0, 262149, 5, 9, 262150, 5, 10, 262151, 5, 10, 262152, 5, 10, 262153, 5, 10, 262154, 5, 65536, 262155, 7, 0, 262156, 7, 0, 262157, 7, 0, 262158, 7, 0, 262159, 7, 0, 262160, 7, 0, 262161, 7, 0, 262162, 7, 0, 262163, 7, 0, 262164, 7, 0, 262165, 7, 0, 262166, 7, 0, 262167, 7, 0, 262168, 7, 0, 262169, 7, 0, 262170, 7, 0, 262171, 7, 0, 262172, 7, 0, 262173, 7, 0, 262174, 7, 0, 262175, 7, 0, 262176, 7, 0, 262177, 5, 6, 393202, 5, 7, 393203, 7, 0, 393204, 7, 0, 393205, 7, 0, 393206, 7, 0, 393207, 7, 0, 393208, 7, 0, 393209, 7, 0, 393210, 7, 0, 393211, 7, 0, 393212, 7, 0, 393213, 7, 0, 393214, 7, 0, 393215, 7, 0, 327680, 7, 0, 327681, 7, 0, 327682, 7, 0, 327683, 7, 0, 327684, 7, 0, 327685, 7, 0, 327686, 7, 0, 327687, 7, 0, 327688, 7, 0, 327689, 7, 0, 327690, 7, 0, 327691, 7, 0, 327692, 7, 0, 327693, 7, 0, 327694, 7, 0, 327695, 7, 0, 327696, 7, 0, 327697, 7, 0, 327698, 7, 0, 327699, 7, 0, 327700, 7, 0, 327701, 7, 0, 327702, 7, 0, 327703, 7, 0, 327704, 7, 0, 327705, 7, 0, 327706, 7, 0, 327707, 7, 0, 327708, 7, 0, 327709, 7, 0, 327710, 7, 0, 327711, 7, 0, 327712, 7, 0, 327713, 5, 6, 458738, 5, 7, 458739, 7, 0, 458740, 7, 0, 458741, 7, 0, 458742, 7, 0, 458743, 7, 0, 458744, 7, 0, 458745, 7, 0, 458746, 7, 0, 458747, 7, 0, 458748, 7, 0, 458749, 7, 0, 458750, 7, 0, 458751, 7, 0, 393216, 7, 0, 393217, 7, 0, 393218, 7, 0, 393219, 7, 0, 393220, 7, 0, 393221, 7, 0, 393222, 7, 0, 393223, 7, 0, 393224, 7, 0, 393225, 7, 0, 393226, 7, 0, 393227, 7, 0, 393228, 7, 0, 393229, 7, 0, 393230, 7, 0, 393231, 7, 0, 393232, 7, 0, 393233, 7, 0, 393234, 7, 0, 393235, 7, 0, 393236, 7, 0, 393237, 7, 0, 393238, 7, 0, 393239, 7, 0, 393240, 7, 0, 393241, 7, 0, 393242, 7, 0, 393243, 7, 0, 393244, 7, 0, 393245, 7, 0, 393246, 7, 0, 393247, 7, 0, 393248, 7, 0, 393249, 5, 6, 524274, 5, 65538, 524275, 5, 2, 524276, 5, 2, 524277, 5, 2, 524278, 5, 2, 524279, 5, 2, 524280, 5, 2, 524281, 5, 2, 524282, 5, 2, 524283, 5, 2, 524284, 5, 2, 524285, 5, 2, 524286, 5, 2, 524287, 5, 3, 458752, 5, 3, 458753, 5, 3, 458754, 5, 3, 458755, 5, 3, 458756, 5, 3, 458757, 5, 3, 458758, 5, 3, 458759, 5, 3, 458760, 5, 3, 458761, 5, 3, 458762, 5, 3, 458763, 5, 3, 458764, 5, 3, 458765, 5, 3, 458766, 5, 3, 458767, 5, 3, 458768, 5, 3, 458769, 5, 3, 458770, 5, 3, 458771, 5, 3, 458772, 5, 3, 458773, 5, 3, 458774, 5, 3, 458775, 5, 3, 458776, 5, 3, 458777, 5, 3, 458778, 5, 3, 458779, 5, 3, 458780, 5, 3, 458781, 5, 3, 458782, 5, 3, 458783, 5, 3, 458784, 5, 3, 458785, 5, 65539 ) +tile_data = PoolIntArray( -524304, 1610612741, 524291, -524303, -1073741819, 458758, -524302, -1073741819, 458758, -524301, -1073741819, 458758, -524300, -1073741819, 458758, -524299, -1073741819, 458758, -524298, -1073741819, 458758, -524297, -1073741819, 458758, -524296, -1073741819, 458758, -524295, -1073741819, 458758, -524294, -1073741819, 458758, -524293, -1073741819, 458758, -524292, -1073741819, 458758, -524291, -1073741819, 458758, -524290, -1073741819, 458758, -524289, -1073741819, 458758, -589824, -1073741819, 458758, -589823, -1073741819, 458758, -589822, -1073741819, 458758, -589821, -1073741819, 458758, -589820, -1073741819, 458758, -589819, -1073741819, 458758, -589818, -1073741819, 458758, -589817, -1073741819, 458758, -589816, -1073741819, 458758, -589815, -1073741819, 458758, -589814, -1073741819, 458758, -589813, -1073741819, 458758, -589812, -1073741819, 458758, -589811, -1073741819, 458758, -589810, -1073741819, 458758, -589809, -1073741819, 458758, -589808, -1073741819, 458758, -589807, -1073741819, 458758, -589806, -1073741819, 458758, -589805, -1073741819, 458758, -589804, -1073741819, 458758, -589803, -1073741819, 458758, -589802, -1073741819, 458758, -589801, -1073741819, 458758, -589800, -1073741819, 458758, -589799, -1073741819, 458758, -589798, -1073741819, 458758, -589797, -1073741819, 458758, -589796, -1073741819, 458758, -589795, -1073741819, 458758, -589794, -1073741819, 458758, -589793, -1073741819, 458758, -589792, -1073741819, 458758, -589791, -1073741819, 458758, -589790, -1073741819, 458758, -589789, -1073741819, 524291, -458768, 1610612741, 458758, -458767, 1610612741, 196609, -458766, 5, 196613, -458765, 5, 196613, -458764, 5, 196613, -458763, 5, 196613, -458762, 5, 65546, -458761, 5, 65546, -458760, 5, 196613, -458759, 5, 196613, -458758, 5, 196613, -458757, 5, 196613, -458756, 5, 196613, -458755, 5, 196613, -458754, 5, 196613, -458753, 5, 196613, -524288, 5, 196613, -524287, 1610612741, 131082, -524286, 5, 196613, -524285, 5, 196613, -524284, 5, 196613, -524283, 5, 196613, -524282, 5, 196613, -524281, 5, 196613, -524280, 5, 196613, -524279, 5, 196613, -524278, 5, 196613, -524277, 5, 196613, -524276, 5, 196613, -524275, 5, 196613, -524274, 5, 196613, -524273, 5, 196613, -524272, 5, 196613, -524271, 1610612741, 131082, -524270, 5, 196613, -524269, 5, 196613, -524268, 5, 196613, -524267, 5, 196613, -524266, 5, 196613, -524265, 5, 196613, -524264, 5, 196613, -524263, 5, 196613, -524262, 5, 262151, -524261, 5, 196613, -524260, 5, 196613, -524259, 5, 196613, -524258, 5, 196613, -524257, 5, 196613, -524256, 5, 196613, -524255, 5, 196613, -524254, -1073741819, 196609, -524253, 5, 458758, -393232, 1610612741, 458758, -393231, 5, 196612, -393230, 1610612741, 65539, -393229, 5, 10, -393228, 5, 10, -393227, 5, 10, -393226, 5, 10, -393225, 5, 10, -393224, 5, 10, -393223, 5, 10, -393222, 5, 10, -393221, 5, 10, -393220, 5, 10, -393219, 5, 10, -393218, 5, 10, -393217, 5, 10, -458752, 5, 10, -458751, 5, 10, -458750, 5, 10, -458749, 5, 10, -458748, 5, 10, -458747, 5, 65541, -458746, 5, 65540, -458745, 5, 10, -458744, 5, 10, -458743, 5, 10, -458742, 5, 10, -458741, 5, 10, -458740, 5, 10, -458739, 5, 10, -458738, 5, 10, -458737, 5, 10, -458736, 5, 10, -458735, 5, 10, -458734, 5, 10, -458733, 5, 10, -458732, 5, 10, -458731, 5, 10, -458730, 5, 10, -458729, 5, 10, -458728, 5, 10, -458727, 5, 10, -458726, 5, 10, -458725, 5, 10, -458724, 5, 10, -458723, 5, 10, -458722, 5, 10, -458721, 5, 10, -458720, 5, 10, -458719, 5, 65541, -458718, -1610612731, 196613, -458717, 5, 458758, -327696, 1610612741, 458758, -327695, 5, 196612, -327694, 5, 7, -327693, 7, 0, -327692, 7, 0, -327691, 7, 0, -327690, 7, 0, -327689, 7, 0, -327688, 7, 0, -327687, 7, 0, -327686, 7, 0, -327685, 7, 0, -327684, 7, 0, -327683, 7, 0, -327682, 7, 0, -327681, 7, 0, -393216, 7, 0, -393215, 7, 0, -393214, 7, 0, -393213, 7, 0, -393212, 7, 0, -393211, 5, 6, -393210, 5, 8, -393209, 7, 0, -393208, 7, 0, -393207, 7, 0, -393206, 7, 0, -393205, 7, 0, -393204, 7, 0, -393203, 7, 0, -393202, 7, 0, -393201, 7, 0, -393200, 7, 0, -393199, 7, 0, -393198, 7, 0, -393197, 7, 0, -393196, 7, 0, -393195, 7, 0, -393194, 7, 0, -393193, 7, 0, -393192, 7, 0, -393191, 7, 0, -393190, 7, 0, -393189, 7, 0, -393188, 7, 0, -393187, 7, 0, -393186, 7, 0, -393185, 7, 0, -393184, 7, 0, -393183, 5, 6, -393182, -1610612731, 196613, -393181, 5, 458758, -262160, 1610612741, 458758, -262159, 5, 196612, -262158, 5, 7, -262157, 7, 0, -262156, 7, 0, -262155, 7, 0, -262154, 7, 0, -262153, 7, 0, -262152, 7, 0, -262151, 7, 0, -262150, 7, 0, -262149, 7, 0, -262148, 7, 0, -262147, 7, 0, -262146, 7, 0, -262145, 7, 0, -327680, 7, 0, -327679, 7, 0, -327678, 7, 0, -327677, 7, 0, -327676, 7, 0, -327675, 5, 6, -327674, 5, 8, -327673, 7, 0, -327672, 7, 0, -327671, 7, 0, -327670, 7, 0, -327669, 7, 0, -327668, 7, 0, -327667, 7, 0, -327666, 7, 0, -327665, 7, 0, -327664, 7, 0, -327663, 7, 0, -327662, 7, 0, -327661, 7, 0, -327660, 7, 0, -327659, 7, 0, -327658, 7, 0, -327657, 7, 0, -327656, 7, 0, -327655, 7, 0, -327654, 7, 0, -327653, 7, 0, -327652, 7, 0, -327651, 7, 0, -327650, 7, 0, -327649, 7, 0, -327648, 7, 0, -327647, 5, 6, -327646, -1610612731, 196613, -327645, 5, 458758, -196624, 1610612741, 458758, -196623, 5, 196612, -196622, 5, 7, -196621, 7, 0, -196620, 7, 0, -196619, 7, 0, -196618, 7, 0, -196617, 7, 0, -196616, 7, 0, -196615, 7, 0, -196614, 7, 0, -196613, 7, 0, -196612, 7, 0, -196611, 7, 0, -196610, 7, 0, -196609, 7, 0, -262144, 7, 0, -262143, 7, 0, -262142, 7, 0, -262141, 7, 0, -262140, 7, 0, -262139, 5, 6, -262138, 5, 8, -262137, 7, 0, -262136, 7, 0, -262135, 7, 0, -262134, 7, 0, -262133, 7, 0, -262132, 7, 0, -262131, 7, 0, -262130, 7, 0, -262129, 7, 0, -262128, 7, 0, -262127, 7, 0, -262126, 7, 0, -262125, 7, 0, -262124, 7, 0, -262123, 7, 0, -262122, 7, 0, -262121, 7, 0, -262120, 7, 0, -262119, 7, 0, -262118, 7, 0, -262117, 7, 0, -262116, 7, 0, -262115, 7, 0, -262114, 7, 0, -262113, 7, 0, -262112, 7, 0, -262111, 5, 6, -262110, -1610612731, 196613, -262109, 5, 458758, -131088, 1610612741, 458758, -131087, 5, 196612, -131086, 5, 7, -131085, 7, 0, -131084, 7, 0, -131083, 7, 0, -131082, 7, 0, -131081, 7, 0, -131080, 7, 0, -131079, 7, 0, -131078, 7, 0, -131077, 7, 0, -131076, 7, 0, -131075, 7, 0, -131074, 7, 0, -131073, 7, 0, -196608, 7, 0, -196607, 7, 0, -196606, 7, 0, -196605, 7, 0, -196604, 7, 0, -196603, 5, 6, -196602, 5, 8, -196601, 7, 0, -196600, 7, 0, -196599, 7, 0, -196598, 7, 0, -196597, 7, 0, -196596, 7, 0, -196595, 7, 0, -196594, 7, 0, -196593, 7, 0, -196592, 7, 0, -196591, 7, 0, -196590, 7, 0, -196589, 7, 0, -196588, 7, 0, -196587, 7, 0, -196586, 7, 0, -196585, 7, 0, -196584, 7, 0, -196583, 7, 0, -196582, 7, 0, -196581, 7, 0, -196580, 7, 0, -196579, 7, 0, -196578, 7, 0, -196577, 7, 0, -196576, 7, 0, -196575, 5, 6, -196574, 1610612741, 196612, -196573, 5, 458758, -65552, 1610612741, 458758, -65551, 5, 196612, -65550, 5, 7, -65549, 7, 0, -65548, 7, 0, -65547, 7, 0, -65546, 7, 0, -65545, 7, 0, -65544, 7, 0, -65543, 7, 0, -65542, 7, 0, -65541, 7, 0, -65540, 7, 0, -65539, 7, 0, -65538, 7, 0, -65537, 7, 0, -131072, 7, 0, -131071, 7, 0, -131070, 7, 0, -131069, 7, 0, -131068, 7, 0, -131067, 5, 6, -131066, 5, 8, -131065, 7, 0, -131064, 7, 0, -131063, 7, 0, -131062, 7, 0, -131061, 7, 0, -131060, 7, 0, -131059, 7, 0, -131058, 7, 0, -131057, 7, 0, -131056, 7, 0, -131055, 7, 0, -131054, 7, 0, -131053, 7, 0, -131052, 7, 0, -131051, 7, 0, -131050, 7, 0, -131049, 7, 0, -131048, 7, 0, -131047, 7, 0, -131046, 7, 0, -131045, 7, 0, -131044, 7, 0, -131043, 7, 0, -131042, 7, 0, -131041, 7, 0, -131040, 7, 0, -131039, 5, 6, -131038, 1610612741, 196612, -131037, 5, 458758, -16, 1610612741, 458758, -15, 5, 196612, -14, 5, 7, -13, 7, 0, -12, 7, 0, -11, 7, 0, -10, 7, 0, -9, 7, 0, -8, 7, 0, -7, 7, 0, -6, 7, 0, -5, 7, 0, -4, 7, 0, -3, 7, 0, -2, 7, 0, -1, 7, 0, -65536, 7, 0, -65535, 7, 0, -65534, 7, 0, -65533, 7, 0, -65532, 7, 0, -65531, 5, 6, -65530, 5, 8, -65529, 7, 0, -65528, 7, 0, -65527, 7, 0, -65526, 7, 0, -65525, 7, 0, -65524, 7, 0, -65523, 7, 0, -65522, 7, 0, -65521, 7, 0, -65520, 7, 0, -65519, 7, 0, -65518, 7, 0, -65517, 7, 0, -65516, 7, 0, -65515, 5, 1, -65514, 5, 3, -65513, 5, 3, -65512, 5, 3, -65511, 5, 3, -65510, 5, 3, -65509, 5, 3, -65508, 5, 3, -65507, 5, 3, -65506, 5, 3, -65505, 5, 3, -65504, 5, 3, -65503, 1610612741, 65540, -65502, 1610612741, 196612, -65501, 5, 458758, 65520, 1610612741, 458758, 65521, 5, 196612, 65522, 5, 7, 65523, 7, 0, 65524, 7, 0, 65525, 7, 0, 65526, 7, 0, 65527, 7, 0, 65528, 7, 0, 65529, 7, 0, 65530, 7, 0, 65531, 7, 0, 65532, 7, 0, 65533, 7, 0, 65534, 7, 0, 65535, 7, 0, 0, 7, 0, 1, 7, 0, 2, 7, 0, 3, 7, 0, 4, 7, 0, 5, 5, 6, 6, 5, 8, 7, 7, 0, 8, 7, 0, 9, 7, 0, 10, 7, 0, 11, 7, 0, 12, 7, 0, 13, 7, 0, 14, 7, 0, 15, 7, 0, 16, 7, 0, 17, 7, 0, 18, 7, 0, 19, 7, 0, 20, 7, 0, 21, 5, 6, 22, 5, 65546, 23, 5, 196613, 24, -1610612731, 196612, 25, -1610612731, 196612, 26, 1610612741, 393220, 27, -1610612731, 196612, 28, -1610612731, 196612, 29, -1610612731, 196612, 30, -1610612731, 196612, 31, -1610612731, 196612, 32, 5, 196608, 33, 5, 131074, 34, 1610612741, 196612, 35, 5, 458758, 131056, 1610612741, 458758, 131057, 5, 196612, 131058, 5, 7, 131059, 7, 0, 131060, 7, 0, 131061, 7, 0, 131062, 7, 0, 131063, 7, 0, 131064, 7, 0, 131065, 7, 0, 131066, 7, 0, 131067, 7, 0, 131068, 7, 0, 131069, 7, 0, 131070, 7, 0, 131071, 7, 0, 65536, 7, 0, 65537, 7, 0, 65538, 7, 0, 65539, 7, 0, 65540, 7, 0, 65541, 5, 6, 65542, 5, 8, 65543, 7, 0, 65544, 7, 0, 65545, 7, 0, 65546, 7, 0, 65547, 7, 0, 65548, 7, 0, 65549, 7, 0, 65550, 7, 0, 65551, 7, 0, 65552, 7, 0, 65553, 7, 0, 65554, 7, 0, 65555, 7, 0, 65556, 7, 0, 65557, 5, 9, 65558, 5, 10, 65559, 5, 10, 65560, 5, 10, 65561, 5, 10, 65562, 5, 10, 65563, 5, 10, 65564, 5, 10, 65565, 5, 10, 65566, 5, 10, 65567, 5, 10, 65568, 5, 10, 65569, 536870917, 65540, 65570, 1610612741, 196612, 65571, 5, 458758, 196592, 1610612741, 458758, 196593, -1073741819, 65546, 196594, 5, 7, 196595, 7, 0, 196596, 7, 0, 196597, 7, 0, 196598, 7, 0, 196599, 7, 0, 196600, 7, 0, 196601, 7, 0, 196602, 7, 0, 196603, 7, 0, 196604, 7, 0, 196605, 7, 0, 196606, 7, 0, 196607, 7, 0, 131072, 7, 0, 131073, 7, 0, 131074, 7, 0, 131075, 7, 0, 131076, 7, 0, 131077, 5, 6, 131078, 5, 8, 131079, 7, 0, 131080, 7, 0, 131081, 7, 0, 131082, 7, 0, 131083, 7, 0, 131084, 7, 0, 131085, 7, 0, 131086, 7, 0, 131087, 7, 0, 131088, 7, 0, 131089, 7, 0, 131090, 7, 0, 131091, 7, 0, 131092, 7, 0, 131093, 7, 0, 131094, 7, 0, 131095, 7, 0, 131096, 7, 0, 131097, 7, 0, 131098, 7, 0, 131099, 7, 0, 131100, 7, 0, 131101, 7, 0, 131102, 7, 0, 131103, 7, 0, 131104, 7, 0, 131105, 5, 6, 131106, 1610612741, 196612, 131107, 5, 458758, 262128, 1610612741, 458758, 262129, -1610612731, 131082, 262130, 5, 7, 262131, 7, 0, 262132, 7, 0, 262133, 7, 0, 262134, 7, 0, 262135, 7, 0, 262136, 7, 0, 262137, 7, 0, 262138, 7, 0, 262139, 7, 0, 262140, 7, 0, 262141, 7, 0, 262142, 7, 0, 262143, 7, 0, 196608, 7, 0, 196609, 7, 0, 196610, 7, 0, 196611, 7, 0, 196612, 7, 0, 196613, 5, 6, 196614, 5, 65538, 196615, 5, 2, 196616, 5, 2, 196617, 5, 2, 196618, 5, 4, 196619, 7, 0, 196620, 7, 0, 196621, 7, 0, 196622, 7, 0, 196623, 7, 0, 196624, 7, 0, 196625, 7, 0, 196626, 7, 0, 196627, 7, 0, 196628, 7, 0, 196629, 7, 0, 196630, 7, 0, 196631, 7, 0, 196632, 7, 0, 196633, 7, 0, 196634, 7, 0, 196635, 7, 0, 196636, 7, 0, 196637, 7, 0, 196638, 7, 0, 196639, 7, 0, 196640, 7, 0, 196641, 5, 6, 196642, 1610612741, 196612, 196643, 5, 458758, 327664, 1610612741, 458758, 327665, 5, 196612, 327666, 5, 7, 327667, 7, 0, 327668, 7, 0, 327669, 7, 0, 327670, 7, 0, 327671, 7, 0, 327672, 7, 0, 327673, 7, 0, 327674, 7, 0, 327675, 7, 0, 327676, 7, 0, 327677, 7, 0, 327678, 7, 0, 327679, 7, 0, 262144, 7, 0, 262145, 7, 0, 262146, 7, 0, 262147, 7, 0, 262148, 7, 0, 262149, 5, 9, 262150, 5, 10, 262151, 5, 10, 262152, 5, 10, 262153, 5, 10, 262154, 5, 65536, 262155, 7, 0, 262156, 7, 0, 262157, 7, 0, 262158, 7, 0, 262159, 7, 0, 262160, 7, 0, 262161, 7, 0, 262162, 7, 0, 262163, 7, 0, 262164, 7, 0, 262165, 7, 0, 262166, 7, 0, 262167, 7, 0, 262168, 7, 0, 262169, 7, 0, 262170, 7, 0, 262171, 7, 0, 262172, 7, 0, 262173, 7, 0, 262174, 7, 0, 262175, 7, 0, 262176, 7, 0, 262177, 5, 6, 262178, 1610612741, 196612, 262179, 5, 458758, 393200, 1610612741, 458758, 393201, 5, 196612, 393202, 5, 7, 393203, 7, 0, 393204, 7, 0, 393205, 7, 0, 393206, 7, 0, 393207, 7, 0, 393208, 7, 0, 393209, 7, 0, 393210, 7, 0, 393211, 7, 0, 393212, 7, 0, 393213, 7, 0, 393214, 7, 0, 393215, 7, 0, 327680, 7, 0, 327681, 7, 0, 327682, 7, 0, 327683, 7, 0, 327684, 7, 0, 327685, 7, 0, 327686, 7, 0, 327687, 7, 0, 327688, 7, 0, 327689, 7, 0, 327690, 7, 0, 327691, 7, 0, 327692, 7, 0, 327693, 7, 0, 327694, 7, 0, 327695, 7, 0, 327696, 7, 0, 327697, 7, 0, 327698, 7, 0, 327699, 7, 0, 327700, 7, 0, 327701, 7, 0, 327702, 7, 0, 327703, 7, 0, 327704, 7, 0, 327705, 7, 0, 327706, 7, 0, 327707, 7, 0, 327708, 7, 0, 327709, 7, 0, 327710, 7, 0, 327711, 7, 0, 327712, 7, 0, 327713, 5, 6, 327714, 1610612741, 196612, 327715, 5, 458758, 458736, 1610612741, 458758, 458737, 5, 196612, 458738, 5, 7, 458739, 7, 0, 458740, 7, 0, 458741, 7, 0, 458742, 7, 0, 458743, 7, 0, 458744, 7, 0, 458745, 7, 0, 458746, 7, 0, 458747, 7, 0, 458748, 7, 0, 458749, 7, 0, 458750, 7, 0, 458751, 7, 0, 393216, 7, 0, 393217, 7, 0, 393218, 7, 0, 393219, 7, 0, 393220, 7, 0, 393221, 7, 0, 393222, 7, 0, 393223, 7, 0, 393224, 7, 0, 393225, 7, 0, 393226, 7, 0, 393227, 7, 0, 393228, 7, 0, 393229, 7, 0, 393230, 7, 0, 393231, 7, 0, 393232, 7, 0, 393233, 7, 0, 393234, 7, 0, 393235, 7, 0, 393236, 7, 0, 393237, 7, 0, 393238, 7, 0, 393239, 7, 0, 393240, 7, 0, 393241, 7, 0, 393242, 7, 0, 393243, 7, 0, 393244, 7, 0, 393245, 7, 0, 393246, 7, 0, 393247, 7, 0, 393248, 7, 0, 393249, 5, 6, 393250, 1610612741, 196612, 393251, 5, 458758, 524272, 1610612741, 458758, 524273, 5, 196612, 524274, 5, 65538, 524275, 5, 2, 524276, 5, 2, 524277, 5, 2, 524278, 5, 2, 524279, 5, 2, 524280, 5, 2, 524281, 5, 2, 524282, 5, 2, 524283, 5, 2, 524284, 5, 2, 524285, 5, 2, 524286, 5, 2, 524287, 5, 3, 458752, 5, 3, 458753, 5, 3, 458754, 5, 3, 458755, 5, 3, 458756, 5, 3, 458757, 5, 3, 458758, 5, 3, 458759, 5, 3, 458760, 5, 3, 458761, 5, 3, 458762, 5, 3, 458763, 5, 3, 458764, 5, 3, 458765, 5, 3, 458766, 5, 3, 458767, 5, 3, 458768, 5, 3, 458769, 5, 3, 458770, 5, 3, 458771, 5, 3, 458772, 5, 3, 458773, 5, 3, 458774, 5, 3, 458775, 5, 3, 458776, 5, 3, 458777, 5, 3, 458778, 5, 3, 458779, 5, 3, 458780, 5, 3, 458781, 5, 3, 458782, 5, 3, 458783, 5, 3, 458784, 5, 3, 458785, 5, 65539, 458786, 1610612741, 196612, 458787, 5, 458758, 589808, 1610612741, 458758, 589809, -1610612731, 196609, 589810, -1073741819, 196612, 589811, -1073741819, 196612, 589812, -1073741819, 196612, 589813, -1073741819, 196612, 589814, -1073741819, 196612, 589815, -1073741819, 196612, 589816, -1073741819, 196612, 589817, -1073741819, 196612, 589818, -1073741819, 196612, 589819, -1073741819, 196612, 589820, 1610612741, 131078, 589821, -1073741819, 196612, 589822, -1073741819, 196612, 589823, -1073741819, 196612, 524288, -1073741819, 196612, 524289, -1073741819, 196612, 524290, -1073741819, 196612, 524291, -1073741819, 196612, 524292, -1073741819, 196612, 524293, -1073741819, 196612, 524294, -1073741819, 196612, 524295, -1073741819, 196612, 524296, -1073741819, 196612, 524297, 1610612741, 131074, 524298, -1073741819, 196612, 524299, -1073741819, 196612, 524300, -1073741819, 196612, 524301, -1073741819, 196612, 524302, -1073741819, 196612, 524303, -1073741819, 196612, 524304, -1073741819, 196612, 524305, -1073741819, 196612, 524306, -1073741819, 196612, 524307, -1073741819, 196612, 524308, -1073741819, 196612, 524309, 5, 131082, 524310, -1073741819, 196612, 524311, -1073741819, 196612, 524312, -1073741819, 196612, 524313, -1073741819, 196612, 524314, 5, 327687, 524315, -1073741819, 196612, 524316, -1073741819, 196612, 524317, -1073741819, 196612, 524318, -1073741819, 196612, 524319, -1073741819, 196612, 524320, 1610612741, 131078, 524321, -1073741819, 196612, 524322, 5, 196609, 524323, 5, 458758, 655344, -1610612731, 524291, 655345, -1610612731, 458758, 655346, -1610612731, 458758, 655347, -1610612731, 458758, 655348, -1610612731, 458758, 655349, -1610612731, 458758, 655350, -1610612731, 458758, 655351, -1610612731, 458758, 655352, -1610612731, 458758, 655353, -1610612731, 458758, 655354, -1610612731, 458758, 655355, -1610612731, 458758, 655356, -1610612731, 458758, 655357, -1610612731, 458758, 655358, -1610612731, 458758, 655359, -1610612731, 458758, 589824, -1610612731, 458758, 589825, -1610612731, 458758, 589826, -1610612731, 458758, 589827, -1610612731, 458758, 589828, -1610612731, 458758, 589829, -1610612731, 458758, 589830, -1610612731, 458758, 589831, -1610612731, 458758, 589832, -1610612731, 458758, 589833, -1610612731, 458758, 589834, -1610612731, 458758, 589835, -1610612731, 458758, 589836, -1610612731, 458758, 589837, -1610612731, 458758, 589838, -1610612731, 458758, 589839, -1610612731, 458758, 589840, -1610612731, 458758, 589841, -1610612731, 458758, 589842, -1610612731, 458758, 589843, -1610612731, 458758, 589844, -1610612731, 458758, 589845, -1610612731, 458758, 589846, -1610612731, 458758, 589847, -1610612731, 458758, 589848, -1610612731, 458758, 589849, -1610612731, 458758, 589850, -1610612731, 458758, 589851, -1610612731, 458758, 589852, -1610612731, 458758, 589853, -1610612731, 458758, 589854, -1610612731, 458758, 589855, -1610612731, 458758, 589856, -1610612731, 458758, 589857, -1610612731, 458758, 589858, -1610612731, 458758, 589859, 5, 524291 ) [node name="DropThroughPlatforms" type="TileMap" parent="."] tile_set = ExtResource( 2 ) diff --git a/src/Levels/6 Tutorial Level.tscn b/src/Levels/6 Tutorial Level.tscn index d0973ed..0438a98 100644 --- a/src/Levels/6 Tutorial Level.tscn +++ b/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 = 6 +frame = 13 [node name="AnimatedSprite2" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="5"] -frame = 0 +frame = 7 [node name="Blobby" parent="." instance=ExtResource( 9 )] unique_name_in_owner = true @@ -283,7 +283,7 @@ collision_layer = 8 collision_mask = 8 bake_navigation = true format = 1 -tile_data = PoolIntArray( -393228, 5, 65540, -393227, 5, 10, -393226, 5, 10, -393225, 5, 10, -393224, 5, 10, -393223, 5, 10, -393222, 5, 10, -393221, 5, 10, -393220, 5, 10, -393219, 5, 10, -393218, 5, 10, -393217, 5, 10, -458752, 5, 10, -458751, 5, 10, -458750, 5, 10, -458749, 5, 10, -458748, 5, 10, -458747, 5, 10, -458746, 5, 10, -458745, 5, 10, -458744, 5, 10, -458743, 5, 10, -458742, 5, 10, -458741, 5, 10, -458740, 5, 10, -458739, 5, 10, -458738, 5, 65541, -327692, 5, 7, -327691, 7, 0, -327690, 7, 0, -327689, 7, 0, -327688, 7, 0, -327687, 7, 0, -327686, 7, 0, -327685, 7, 0, -327684, 7, 0, -327683, 7, 0, -327682, 7, 0, -327681, 7, 0, -393216, 7, 0, -393215, 7, 0, -393214, 5, 6, -393213, 5, 7, -393212, 7, 0, -393211, 7, 0, -393210, 7, 0, -393209, 7, 0, -393208, 7, 0, -393207, 7, 0, -393206, 7, 0, -393205, 7, 0, -393204, 7, 0, -393203, 7, 0, -393202, 5, 6, -262156, 5, 7, -262155, 7, 0, -262154, 7, 0, -262153, 7, 0, -262152, 7, 0, -262151, 7, 0, -262150, 7, 0, -262149, 7, 0, -262148, 7, 0, -262147, 7, 0, -262146, 7, 0, -262145, 7, 0, -327680, 7, 0, -327679, 7, 0, -327678, 5, 6, -327677, 5, 7, -327676, 7, 0, -327675, 7, 0, -327674, 7, 0, -327673, 7, 0, -327672, 7, 0, -327671, 7, 0, -327670, 7, 0, -327669, 7, 0, -327668, 7, 0, -327667, 7, 0, -327666, 5, 6, -196620, 5, 7, -196619, 7, 0, -196618, 7, 0, -196617, 7, 0, -196616, 7, 0, -196615, 7, 0, -196614, 7, 0, -196613, 7, 0, -196612, 7, 0, -196611, 7, 0, -196610, 7, 0, -196609, 7, 0, -262144, 7, 0, -262143, 7, 0, -262142, 5, 6, -262141, 5, 7, -262140, 7, 0, -262139, 7, 0, -262138, 7, 0, -262137, 7, 0, -262136, 7, 0, -262135, 7, 0, -262134, 7, 0, -262133, 7, 0, -262132, 7, 0, -262131, 7, 0, -262130, 5, 6, -131084, 5, 7, -131083, 7, 0, -131082, 7, 0, -131081, 7, 0, -131080, 7, 0, -131079, 7, 0, -131078, 7, 0, -131077, 7, 0, -131076, 7, 0, -131075, 7, 0, -131074, 7, 0, -131073, 7, 0, -196608, 7, 0, -196607, 7, 0, -196606, 5, 6, -196605, 5, 7, -196604, 7, 0, -196603, 7, 0, -196602, 7, 0, -196601, 7, 0, -196600, 7, 0, -196599, 7, 0, -196598, 7, 0, -196597, 7, 0, -196596, 7, 0, -196595, 7, 0, -196594, 5, 6, -65548, 5, 7, -65547, 7, 0, -65546, 7, 0, -65545, 7, 0, -65544, 7, 0, -65543, 7, 0, -65542, 7, 0, -65541, 7, 0, -65540, 7, 0, -65539, 7, 0, -65538, 7, 0, -65537, 7, 0, -131072, 7, 0, -131071, 7, 0, -131070, 5, 6, -131069, 5, 7, -131068, 7, 0, -131067, 7, 0, -131066, 7, 0, -131065, 7, 0, -131064, 7, 0, -131063, 7, 0, -131062, 7, 0, -131061, 7, 0, -131060, 7, 0, -131059, 7, 0, -131058, 5, 6, -12, 5, 7, -11, 7, 0, -10, 7, 0, -9, 7, 0, -8, 7, 0, -7, 7, 0, -6, 7, 0, -5, 7, 0, -4, 7, 0, -3, 7, 0, -2, 7, 0, -1, 7, 0, -65536, 7, 0, -65535, 7, 0, -65534, 5, 6, -65533, 5, 7, -65532, 7, 0, -65531, 7, 0, -65530, 7, 0, -65529, 7, 0, -65528, 7, 0, -65527, 7, 0, -65526, 7, 0, -65525, 7, 0, -65524, 7, 0, -65523, 7, 0, -65522, 5, 6, 65524, 5, 7, 65525, 7, 0, 65526, 7, 0, 65527, 7, 0, 65528, 7, 0, 65529, 7, 0, 65530, 7, 0, 65531, 7, 0, 65532, 7, 0, 65533, 7, 0, 65534, 7, 0, 65535, 7, 0, 0, 7, 0, 1, 7, 0, 2, 5, 6, 3, 5, 7, 4, 7, 0, 5, 7, 0, 6, 7, 0, 7, 7, 0, 8, 7, 0, 9, 7, 0, 10, 7, 0, 11, 7, 0, 12, 7, 0, 13, 7, 0, 14, 5, 6, 131060, 5, 7, 131061, 5, 2, 131062, 5, 2, 131063, 5, 2, 131064, 5, 2, 131065, 5, 2, 131066, 5, 2, 131067, 5, 2, 131068, 7, 0, 131069, 7, 0, 131070, 7, 0, 131071, 5, 2, 65536, 5, 2, 65537, 5, 2, 65538, 5, 65539, 65539, 5, 65536, 65540, 7, 0, 65541, 7, 0, 65542, 7, 0, 65543, 7, 0, 65544, 5, 1, 65545, 5, 2, 65546, 5, 2, 65547, 5, 2, 65548, 5, 2, 65549, 5, 3, 65550, 5, 65539, 196596, 5, 7, 196597, 5, 10, 196598, 5, 10, 196599, 5, 10, 196600, 5, 10, 196601, 5, 10, 196602, 5, 10, 196603, 5, 10, 196604, 7, 0, 196605, 7, 0, 196606, 7, 0, 196607, 5, 10, 131072, 5, 10, 131073, 5, 10, 131074, 5, 65536, 131075, 7, 0, 131076, 7, 0, 131077, 7, 0, 131078, 7, 0, 131079, 7, 0, 131080, 5, 6, 131081, 1610612741, 131075, 131082, -1073741819, 196610, 131083, -1073741819, 196610, 131084, -1073741819, 196610, 131085, 1610612741, 196612, 131086, 5, 196611, 262132, 5, 7, 262133, 7, 0, 262134, 7, 0, 262135, 7, 0, 262136, 7, 0, 262137, 7, 0, 262138, 7, 0, 262139, 7, 0, 262140, 7, 0, 262141, 7, 0, 262142, 7, 0, 262143, 7, 0, 196608, 7, 0, 196609, 7, 0, 196610, 7, 0, 196611, 7, 0, 196612, 7, 0, 196613, 7, 0, 196614, 7, 0, 196615, 7, 0, 196616, 5, 6, 196617, 5, 196610, 196618, 5, 196614, 196619, -1073741819, 196610, 196620, -1073741819, 196610, 196621, -1610612731, 393217, 196622, 5, 196611, 327668, 5, 7, 327669, 7, 0, 327670, 7, 0, 327671, 7, 0, 327672, 7, 0, 327673, 7, 0, 327674, 7, 0, 327675, 7, 0, 327676, 7, 0, 327677, 7, 0, 327678, 7, 0, 327679, 7, 0, 262144, 7, 0, 262145, 7, 0, 262146, 7, 0, 262147, 7, 0, 262148, 7, 0, 262149, 7, 0, 262150, 5, 1, 262151, 5, 2, 262152, 5, 65539, 262153, 5, 196610, 262154, 5, 196610, 262155, 5, 196614, 262156, -1073741819, 131079, 262157, -1073741819, 65545, 262158, 5, 196611, 393204, 5, 7, 393205, 7, 0, 393206, 7, 0, 393207, 7, 0, 393208, 7, 0, 393209, 7, 0, 393210, 7, 0, 393211, 7, 0, 393212, 7, 0, 393213, 7, 0, 393214, 7, 0, 393215, 7, 0, 327680, 7, 0, 327681, 7, 0, 327682, 7, 0, 327683, 7, 0, 327684, 7, 0, 327685, 7, 0, 327686, 5, 6, 327687, 5, 196610, 327688, 5, 196610, 327689, 5, 196610, 327690, 5, 196610, 327691, 5, 196610, 327692, 5, 196609, 327693, 1610612741, 196612, 327694, 5, 196611, 458740, 5, 7, 458741, 7, 0, 458742, 7, 0, 458743, 7, 0, 458744, 7, 0, 458745, 7, 0, 458746, 7, 0, 458747, 7, 0, 458748, 7, 0, 458749, 7, 0, 458750, 7, 0, 458751, 7, 0, 393216, 7, 0, 393217, 7, 0, 393218, 7, 0, 393219, 7, 0, 393220, 7, 0, 393221, 7, 0, 393222, 5, 6, 393223, -1073741819, 196612, 393224, -1073741819, 196612, 393225, -1073741819, 196612, 393226, 5, 262146, 393227, -1073741819, 196612, 393228, -1073741819, 196612, 393229, 5, 196615, 393230, 5, 196611, 524276, 5, 65537, 524277, 5, 2, 524278, 5, 2, 524279, 5, 2, 524280, 5, 2, 524281, 5, 2, 524282, 5, 2, 524283, 5, 2, 524284, 5, 2, 524285, 5, 2, 524286, 5, 2, 524287, 5, 2, 458752, 5, 2, 458753, 5, 2, 458754, 5, 2, 458755, 5, 2, 458756, 5, 2, 458757, 5, 2, 458758, 5, 65539, 458759, 5, 196610, 458760, 5, 196610, 458761, 5, 196610, 458762, 5, 196610, 458763, 5, 196610, 458764, 5, 196610, 458765, 5, 393225, 458766, 5, 196615 ) +tile_data = PoolIntArray( -524302, -536870907, 524291, -524301, -1073741819, 458758, -524300, -1073741819, 458758, -524299, -1073741819, 458758, -524298, -1073741819, 458758, -524297, -1073741819, 458758, -524296, -1073741819, 458758, -524295, -1073741819, 458758, -524294, -1073741819, 458758, -524293, -1073741819, 458758, -524292, -1073741819, 458758, -524291, -1073741819, 458758, -524290, -1073741819, 458758, -524289, -1073741819, 458758, -589824, -1073741819, 458758, -589823, -1073741819, 458758, -589822, -1073741819, 458758, -589821, -1073741819, 458758, -589820, -1073741819, 458758, -589819, -1073741819, 458758, -589818, -1073741819, 458758, -589817, -1073741819, 458758, -589816, -1073741819, 458758, -589815, -1073741819, 458758, -589814, -1073741819, 458758, -589813, -1073741819, 458758, -589812, -1073741819, 458758, -589811, -1073741819, 458758, -589810, -1073741819, 458758, -589809, -1073741819, 458758, -589808, 1073741829, 524291, -458766, 1610612741, 458758, -458765, 1073741829, 196617, -458764, -2147483643, 196612, -458763, -2147483643, 196612, -458762, -2147483643, 196612, -458761, -2147483643, 196612, -458760, -2147483643, 196612, -458759, -2147483643, 196612, -458758, -2147483643, 196612, -458757, -2147483643, 196612, -458756, -2147483643, 196612, -458755, -2147483643, 196612, -458754, -2147483643, 196612, -458753, 5, 131074, -524288, -2147483643, 196612, -524287, -2147483643, 196612, -524286, 1610612741, 327687, -524285, -2147483643, 196612, -524284, -2147483643, 196612, -524283, -2147483643, 196612, -524282, -2147483643, 196612, -524281, -2147483643, 196612, -524280, -2147483643, 196612, -524279, -2147483643, 196612, -524278, 1610612741, 131079, -524277, -2147483643, 196612, -524276, -2147483643, 196612, -524275, -2147483643, 196612, -524274, -2147483643, 196612, -524273, -2147483643, 196617, -524272, 5, 458758, -393230, 1610612741, 458758, -393229, -1610612731, 131079, -393228, 5, 65540, -393227, 5, 10, -393226, 5, 10, -393225, 5, 10, -393224, 5, 10, -393223, 5, 10, -393222, 5, 10, -393221, 5, 10, -393220, 5, 10, -393219, 5, 10, -393218, 5, 10, -393217, 5, 10, -458752, 5, 10, -458751, 5, 10, -458750, 5, 65541, -458749, 536870917, 65541, -458748, 5, 10, -458747, 5, 10, -458746, 5, 10, -458745, 5, 10, -458744, 5, 10, -458743, 5, 10, -458742, 5, 10, -458741, 5, 10, -458740, 5, 10, -458739, 5, 10, -458738, 5, 65541, -458737, 536870917, 196612, -458736, 5, 458758, -327694, 1610612741, 458758, -327693, 1073741829, 196612, -327692, 5, 7, -327691, 7, 0, -327690, 7, 0, -327689, 7, 0, -327688, 7, 0, -327687, 7, 0, -327686, 7, 0, -327685, 7, 0, -327684, 7, 0, -327683, 7, 0, -327682, 7, 0, -327681, 7, 0, -393216, 7, 0, -393215, 7, 0, -393214, 5, 6, -393213, 5, 7, -393212, 7, 0, -393211, 7, 0, -393210, 7, 0, -393209, 7, 0, -393208, 7, 0, -393207, 7, 0, -393206, 7, 0, -393205, 7, 0, -393204, 7, 0, -393203, 7, 0, -393202, 5, 6, -393201, -1073741819, 65545, -393200, 5, 458758, -262158, 1610612741, 458758, -262157, 1073741829, 196612, -262156, 5, 7, -262155, 7, 0, -262154, 7, 0, -262153, 7, 0, -262152, 7, 0, -262151, 7, 0, -262150, 7, 0, -262149, 7, 0, -262148, 7, 0, -262147, 7, 0, -262146, 7, 0, -262145, 7, 0, -327680, 7, 0, -327679, 7, 0, -327678, 5, 6, -327677, 5, 7, -327676, 7, 0, -327675, 7, 0, -327674, 7, 0, -327673, 7, 0, -327672, 7, 0, -327671, 7, 0, -327670, 7, 0, -327669, 7, 0, -327668, 7, 0, -327667, 7, 0, -327666, 5, 6, -327665, 536870917, 196612, -327664, 5, 458758, -196622, 1610612741, 458758, -196621, 1073741829, 196612, -196620, 5, 7, -196619, 7, 0, -196618, 7, 0, -196617, 7, 0, -196616, 7, 0, -196615, 7, 0, -196614, 7, 0, -196613, 7, 0, -196612, 7, 0, -196611, 7, 0, -196610, 7, 0, -196609, 7, 0, -262144, 7, 0, -262143, 7, 0, -262142, 5, 6, -262141, 5, 7, -262140, 7, 0, -262139, 7, 0, -262138, 7, 0, -262137, 7, 0, -262136, 7, 0, -262135, 7, 0, -262134, 7, 0, -262133, 7, 0, -262132, 7, 0, -262131, 7, 0, -262130, 5, 6, -262129, 536870917, 196612, -262128, 5, 458758, -131086, 1610612741, 458758, -131085, -1610612731, 262150, -131084, 5, 7, -131083, 7, 0, -131082, 7, 0, -131081, 7, 0, -131080, 7, 0, -131079, 7, 0, -131078, 7, 0, -131077, 7, 0, -131076, 7, 0, -131075, 7, 0, -131074, 7, 0, -131073, 7, 0, -196608, 7, 0, -196607, 7, 0, -196606, 5, 6, -196605, 5, 7, -196604, 7, 0, -196603, 7, 0, -196602, 7, 0, -196601, 7, 0, -196600, 7, 0, -196599, 7, 0, -196598, 7, 0, -196597, 7, 0, -196596, 7, 0, -196595, 7, 0, -196594, 5, 6, -196593, 536870917, 196612, -196592, 5, 458758, -65550, 1610612741, 458758, -65549, 1073741829, 196612, -65548, 5, 7, -65547, 7, 0, -65546, 7, 0, -65545, 7, 0, -65544, 7, 0, -65543, 7, 0, -65542, 7, 0, -65541, 7, 0, -65540, 7, 0, -65539, 7, 0, -65538, 7, 0, -65537, 7, 0, -131072, 7, 0, -131071, 7, 0, -131070, 5, 6, -131069, 5, 7, -131068, 7, 0, -131067, 7, 0, -131066, 7, 0, -131065, 7, 0, -131064, 7, 0, -131063, 7, 0, -131062, 7, 0, -131061, 7, 0, -131060, 7, 0, -131059, 7, 0, -131058, 5, 6, -131057, -1073741819, 131079, -131056, 5, 458758, -14, 1610612741, 458758, -13, 1073741829, 196612, -12, 5, 7, -11, 7, 0, -10, 7, 0, -9, 7, 0, -8, 7, 0, -7, 7, 0, -6, 7, 0, -5, 7, 0, -4, 7, 0, -3, 7, 0, -2, 7, 0, -1, 7, 0, -65536, 7, 0, -65535, 7, 0, -65534, 5, 6, -65533, 5, 7, -65532, 7, 0, -65531, 7, 0, -65530, 7, 0, -65529, 7, 0, -65528, 7, 0, -65527, 7, 0, -65526, 7, 0, -65525, 7, 0, -65524, 7, 0, -65523, 7, 0, -65522, 5, 6, -65521, 536870917, 196612, -65520, 5, 458758, 65522, 1610612741, 458758, 65523, 1073741829, 196612, 65524, 5, 7, 65525, 7, 0, 65526, 7, 0, 65527, 7, 0, 65528, 7, 0, 65529, 7, 0, 65530, 7, 0, 65531, 7, 0, 65532, 7, 0, 65533, 7, 0, 65534, 7, 0, 65535, 7, 0, 0, 7, 0, 1, 7, 0, 2, 5, 6, 3, 5, 7, 4, 7, 0, 5, 7, 0, 6, 7, 0, 7, 7, 0, 8, 7, 0, 9, 7, 0, 10, 7, 0, 11, 7, 0, 12, 7, 0, 13, 7, 0, 14, 5, 6, 15, 536870917, 196612, 16, 5, 458758, 131058, 1610612741, 458758, 131059, 1073741829, 196612, 131060, -536870907, 65537, 131061, 5, 2, 131062, 5, 2, 131063, 5, 2, 131064, 5, 2, 131065, 5, 2, 131066, 5, 2, 131067, 5, 4, 131068, 7, 0, 131069, 7, 0, 131070, 7, 0, 131071, 5, 1, 65536, 5, 2, 65537, 5, 2, 65538, 5, 65539, 65539, 1610612741, 6, 65540, 7, 0, 65541, 7, 0, 65542, 7, 0, 65543, 7, 0, 65544, 5, 1, 65545, 5, 2, 65546, 5, 2, 65547, 5, 2, 65548, 5, 2, 65549, 5, 3, 65550, 5, 65539, 65551, 536870917, 196612, 65552, 5, 458758, 196594, 1610612741, 458758, 196595, 1073741829, 196612, 196596, 536870917, 65541, 196597, 5, 10, 196598, 5, 10, 196599, 5, 10, 196600, 5, 10, 196601, 5, 10, 196602, 5, 10, 196603, 5, 65536, 196604, 7, 0, 196605, 7, 0, 196606, 7, 0, 196607, 5, 9, 131072, 5, 10, 131073, 5, 10, 131074, 5, 10, 131075, 5, 65536, 131076, 7, 0, 131077, 7, 0, 131078, 7, 0, 131079, 7, 0, 131080, 5, 6, 131081, 1610612741, 131075, 131082, -1073741819, 196610, 131083, -1073741819, 196610, 131084, -1073741819, 196610, 131085, 1610612741, 196612, 131086, 5, 196611, 131087, 536870917, 196612, 131088, 5, 458758, 262130, 1610612741, 458758, 262131, -1610612731, 65545, 262132, 5, 7, 262133, 7, 0, 262134, 7, 0, 262135, 7, 0, 262136, 7, 0, 262137, 7, 0, 262138, 7, 0, 262139, 7, 0, 262140, 7, 0, 262141, 7, 0, 262142, 7, 0, 262143, 7, 0, 196608, 7, 0, 196609, 7, 0, 196610, 7, 0, 196611, 7, 0, 196612, 7, 0, 196613, 7, 0, 196614, 7, 0, 196615, 7, 0, 196616, 5, 6, 196617, 5, 196610, 196618, 5, 196614, 196619, -1073741819, 196610, 196620, -1073741819, 196610, 196621, -2147483643, 327687, 196622, 5, 196611, 196623, 536870917, 196612, 196624, 5, 458758, 327666, 1610612741, 458758, 327667, -1610612731, 65545, 327668, 5, 7, 327669, 7, 0, 327670, 7, 0, 327671, 7, 0, 327672, 7, 0, 327673, 7, 0, 327674, 7, 0, 327675, 7, 0, 327676, 7, 0, 327677, 7, 0, 327678, 7, 0, 327679, 7, 0, 262144, 7, 0, 262145, 7, 0, 262146, 7, 0, 262147, 7, 0, 262148, 7, 0, 262149, 7, 0, 262150, 5, 1, 262151, 5, 2, 262152, 5, 65539, 262153, 5, 196610, 262154, 5, 196610, 262155, 5, 196614, 262156, -1073741819, 131079, 262157, -1073741819, 65545, 262158, 5, 196611, 262159, 536870917, 196612, 262160, 5, 458758, 393202, 1610612741, 458758, 393203, 1073741829, 196612, 393204, 5, 7, 393205, 7, 0, 393206, 7, 0, 393207, 7, 0, 393208, 7, 0, 393209, 7, 0, 393210, 7, 0, 393211, 7, 0, 393212, 7, 0, 393213, 7, 0, 393214, 7, 0, 393215, 7, 0, 327680, 7, 0, 327681, 7, 0, 327682, 7, 0, 327683, 7, 0, 327684, 7, 0, 327685, 7, 0, 327686, 5, 6, 327687, 5, 196610, 327688, 5, 196610, 327689, 5, 196610, 327690, 5, 196610, 327691, 5, 196610, 327692, 5, 196609, 327693, 1610612741, 196612, 327694, 5, 196611, 327695, 536870917, 196612, 327696, 5, 458758, 458738, 1610612741, 458758, 458739, 1073741829, 196612, 458740, 5, 7, 458741, 7, 0, 458742, 7, 0, 458743, 7, 0, 458744, 7, 0, 458745, 7, 0, 458746, 7, 0, 458747, 7, 0, 458748, 7, 0, 458749, 7, 0, 458750, 7, 0, 458751, 7, 0, 393216, 7, 0, 393217, 7, 0, 393218, 7, 0, 393219, 7, 0, 393220, 7, 0, 393221, 7, 0, 393222, 5, 6, 393223, -1073741819, 196612, 393224, -1073741819, 196612, 393225, -1073741819, 196612, 393226, 536870917, 262150, 393227, -1073741819, 196612, 393228, -1073741819, 196612, 393229, 5, 196615, 393230, 5, 196611, 393231, 536870917, 196612, 393232, 5, 458758, 524274, 1610612741, 458758, 524275, 1073741829, 196612, 524276, 1073741829, 65540, 524277, 5, 2, 524278, 5, 2, 524279, 5, 2, 524280, 5, 2, 524281, 5, 2, 524282, 5, 2, 524283, 5, 2, 524284, 5, 2, 524285, 5, 2, 524286, 5, 2, 524287, 5, 2, 458752, 5, 2, 458753, 5, 2, 458754, 5, 2, 458755, 5, 2, 458756, 5, 2, 458757, 5, 2, 458758, 5, 65539, 458759, 5, 196610, 458760, 5, 196610, 458761, 5, 196610, 458762, 5, 196610, 458763, 5, 196610, 458764, 5, 196610, 458765, 536870917, 393220, 458766, 5, 196615, 458767, 536870917, 196612, 458768, 5, 458758, 589810, 1610612741, 458758, 589811, -536870907, 196617, 589812, -536870907, 196612, 589813, -536870907, 196612, 589814, -536870907, 196612, 589815, -536870907, 196612, 589816, -536870907, 196612, 589817, -536870907, 196612, 589818, -536870907, 196612, 589819, -536870907, 196612, 589820, -536870907, 196612, 589821, -536870907, 196612, 589822, -536870907, 196612, 589823, 5, 131079, 524288, 5, 65545, 524289, -536870907, 196612, 524290, -536870907, 196612, 524291, -536870907, 196612, 524292, -536870907, 196612, 524293, -536870907, 196612, 524294, -536870907, 196612, 524295, -536870907, 196612, 524296, -536870907, 196612, 524297, -536870907, 196612, 524298, -536870907, 196612, 524299, -536870907, 196612, 524300, -536870907, 196612, 524301, -536870907, 196612, 524302, -536870907, 196612, 524303, 536870917, 196617, 524304, 5, 458758, 655346, 536870917, 524291, 655347, -1610612731, 458758, 655348, -1610612731, 458758, 655349, -1610612731, 458758, 655350, -1610612731, 458758, 655351, -1610612731, 458758, 655352, -1610612731, 458758, 655353, -1610612731, 458758, 655354, -1610612731, 458758, 655355, -1610612731, 458758, 655356, -1610612731, 458758, 655357, -1610612731, 458758, 655358, -1610612731, 458758, 655359, -1610612731, 458758, 589824, -1610612731, 458758, 589825, -1610612731, 458758, 589826, -1610612731, 458758, 589827, -1610612731, 458758, 589828, -1610612731, 458758, 589829, -1610612731, 458758, 589830, -1610612731, 458758, 589831, -1610612731, 458758, 589832, -1610612731, 458758, 589833, -1610612731, 458758, 589834, -1610612731, 458758, 589835, -1610612731, 458758, 589836, -1610612731, 458758, 589837, -1610612731, 458758, 589838, -1610612731, 458758, 589839, -1610612731, 458758, 589840, -2147483643, 524291 ) [node name="DropThroughPlatforms" type="TileMap" parent="."] tile_set = ExtResource( 2 ) @@ -300,7 +300,7 @@ position = Vector2( -80, 16 ) elevator_time = 10 [node name="Portal" parent="ElevatorButton" instance=ExtResource( 11 )] -position = Vector2( 64, 40.5 ) +position = Vector2( -40, 40 ) scale = Vector2( 0.5, 0.5 ) next_scene = "res://src/Levels/Actual Level 1.tscn" @@ -449,7 +449,7 @@ collide_with_areas = true position = Vector2( 6, 0 ) [node name="GateButton" parent="." instance=ExtResource( 20 )] -position = Vector2( -128, 97 ) +position = Vector2( 48, 91 ) [node name="Coin3" parent="." instance=ExtResource( 22 )] position = Vector2( 207, -4 ) diff --git a/src/Levels/Level 4.tscn b/src/Levels/Level 4.tscn index 1640daf..09c2f51 100644 --- a/src/Levels/Level 4.tscn +++ b/src/Levels/Level 4.tscn @@ -17,7 +17,7 @@ [ext_resource path="res://src/Contraptions/GateBlock.tscn" type="PackedScene" id=15] [ext_resource path="res://src/Contraptions/Triggers/GateButton.tscn" type="PackedScene" id=16] -[sub_resource type="AnimationNodeStateMachinePlayback" id=4] +[sub_resource type="AnimationNodeStateMachinePlayback" id=15] [sub_resource type="AnimationNodeStateMachinePlayback" id=5] @@ -214,10 +214,10 @@ drag_margin_top = 0.13 drag_margin_bottom = 0.3 [node name="AnimatedSprite" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="4"] -frame = 0 +frame = 7 [node name="AnimatedSprite2" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="5"] -frame = 0 +frame = 7 [node name="Blobby" parent="." instance=ExtResource( 8 )] unique_name_in_owner = true @@ -226,8 +226,8 @@ position = Vector2( 21, -9 ) [node name="StateLabel" parent="Blobby" index="0"] visible = true -[node name="AnimationTree" parent="Blobby/BlobbySprite" index="0"] -parameters/playback = SubResource( 4 ) +[node name="BlobbymationTree" parent="Blobby/BlobbySprite" index="0"] +parameters/playback = SubResource( 15 ) [node name="Coin" parent="." instance=ExtResource( 7 )] position = Vector2( 216, -216 ) @@ -277,6 +277,9 @@ position = Vector2( 778, -9 ) [node name="BoundFrog2" parent="." instance=ExtResource( 5 )] position = Vector2( 1266, -537 ) +[node name="WhatAreFrog" parent="BoundFrog2" index="0"] +frog_number = 1 + [node name="Digit" parent="BoundFrog2/WhatAreFrog" index="2"] frame = 1 @@ -314,8 +317,9 @@ position = Vector2( 696, -144 ) [node name="FrogFreeButton2" parent="." instance=ExtResource( 10 )] position = Vector2( 744, -624 ) +frog_number = 1 -[node name="Digit" parent="FrogFreeButton2" index="1"] +[node name="Digit" parent="FrogFreeButton2" index="3"] frame = 1 [node name="IndicatorPlayer" parent="FrogFreeButton2/Indicator" index="0"] diff --git a/src/Platforms/FlyingPlatform.tscn b/src/Platforms/FlyingPlatform.tscn index 46804b7..96499ef 100644 --- a/src/Platforms/FlyingPlatform.tscn +++ b/src/Platforms/FlyingPlatform.tscn @@ -59,6 +59,7 @@ script = ExtResource( 1 ) [node name="PlatformBody" type="KinematicBody2D" parent="."] collision_layer = 16 collision_mask = 0 +collision/safe_margin = 0.001 motion/sync_to_physics = true [node name="FlyingSound" type="AudioStreamPlayer2D" parent="PlatformBody"] diff --git a/src/Platforms/FlyingPlatformSmol.tscn b/src/Platforms/FlyingPlatformSmol.tscn index bb25c97..8557f85 100644 --- a/src/Platforms/FlyingPlatformSmol.tscn +++ b/src/Platforms/FlyingPlatformSmol.tscn @@ -71,6 +71,7 @@ script = ExtResource( 1 ) [node name="PlatformBody" type="KinematicBody2D" parent="."] collision_layer = 16 collision_mask = 0 +collision/safe_margin = 0.001 motion/sync_to_physics = true [node name="Sprite" type="Sprite" parent="PlatformBody"] diff --git a/src/Sounds/default_bus_layout.tres b/src/Sounds/default_bus_layout.tres index 7b01dfb..6f3f9e6 100644 --- a/src/Sounds/default_bus_layout.tres +++ b/src/Sounds/default_bus_layout.tres @@ -41,7 +41,7 @@ resource_name = "LowPassFilter" cutoff_hz = 3000.0 [resource] -bus/0/volume_db = -1.9382 +bus/0/volume_db = -6.0206 bus/1/name = "Music" bus/1/solo = false bus/1/mute = 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 = -3.09804 +bus/3/volume_db = -4.43698 bus/3/send = "Master" bus/3/effect/0/effect = SubResource( 6 ) bus/3/effect/0/enabled = true diff --git a/src/StateMachines/FlyerStateMachine.gd b/src/StateMachines/FlyerStateMachine.gd index 2a11cd4..6f90dc4 100644 --- a/src/StateMachines/FlyerStateMachine.gd +++ b/src/StateMachines/FlyerStateMachine.gd @@ -4,60 +4,60 @@ onready var anim_tree = $"../FlyerSprite/AnimationTree" onready var anim_state_playback = $"../FlyerSprite/AnimationTree".get("parameters/playback") func _ready() -> void: - add_state("searching") - add_state("hunting") - add_state("fleeing") - add_state("sleeping") - state = states.searching - set_state(states.searching) - print(self.state) - for state in states: - if state_matching_method_exists(state): - continue - else: - printerr("StateMachine -> State: " + state + " has no matching method in parent.") - push_error("StateMachine -> State: " + state + " has no matching method in parent.") - + add_state("searching") + add_state("hunting") + add_state("fleeing") + add_state("sleeping") + state = states.searching + set_state(states.searching) + print(self.state) + for state in states: + if state_matching_method_exists(state): + continue + else: + printerr("StateMachine -> State: " + state + " has no matching method in parent.") + push_error("StateMachine -> State: " + state + " has no matching method in parent.") + # Game logic consequences of state func _state_logic(delta): - var state_action_ref = funcref(parent, self.state) - parent.path_direction = state_action_ref.call_func() - parent.execute_movement(delta) + var state_action_ref = funcref(parent, self.state) + parent.path_direction = state_action_ref.call_func() + parent.execute_movement(delta) func _get_transition(_delta): - parent.get_node("StateLabel").text = self.state - _animation_logic() - var new_state - if parent.target == null: - new_state = states.searching - if parent.target != null: - new_state = states.hunting - if parent.is_hurt: - new_state = states.sleeping - if new_state != self.state: - return new_state - return null + parent.get_node("StateLabel").text = self.state + _animation_logic() + var new_state + if parent.target == null: + new_state = states.searching + if parent.target != null: + new_state = states.hunting + if parent.is_hurt: + new_state = states.sleeping + if new_state != self.state: + return new_state + return null func _enter_state(_new_state, _previous_state): - pass + pass func _exit_state(_previous_state, _new_state): - pass + pass func _animation_logic(): - _set_blendspaces_direction() - if self.state == "searching": - anim_state_playback.travel("searching") - else: - anim_state_playback.travel("hunting") + _set_blendspaces_direction() + if self.state == "searching": + anim_state_playback.travel("searching") + else: + anim_state_playback.travel("hunting") func _set_blendspaces_direction(): - var value = parent.get_facing_direction() - anim_tree.set("parameters/searching/blend_position", value) - anim_tree.set("parameters/hunting/blend_position", value) + var value = parent.get_facing_direction() + anim_tree.set("parameters/searching/blend_position", value) + anim_tree.set("parameters/hunting/blend_position", value) diff --git a/src/UserInterface/Buttons/ChangeSceneButton.gd b/src/UserInterface/Buttons/ChangeSceneButton.gd new file mode 100644 index 0000000..27f42b8 --- /dev/null +++ b/src/UserInterface/Buttons/ChangeSceneButton.gd @@ -0,0 +1,15 @@ +extends AudibleButton + +export(String, FILE) var next_scene_path: String = "" +onready var selected_level_base_path: String = "res://src/Levels/" + +func _on_button_up() -> void: + get_tree().change_scene(next_scene_path) + get_tree().get_current_scene().queue_free() + get_tree().paused = false + +func _get_configuration_warning() -> String: + return "next_scene_path must be set for the button to work" if next_scene_path == "" else "" + +func _level_selection_changed(button): + next_scene_path = selected_level_base_path + button.text + ".tscn" diff --git a/src/UserInterface/Buttons/ChangeSceneButton.tscn b/src/UserInterface/Buttons/ChangeSceneButton.tscn index adb1e54..02825c3 100644 --- a/src/UserInterface/Buttons/ChangeSceneButton.tscn +++ b/src/UserInterface/Buttons/ChangeSceneButton.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://src/UserInterface/Buttons/PlayButton.gd" type="Script" id=1] +[ext_resource path="res://src/UserInterface/Buttons/ChangeSceneButton.gd" type="Script" id=1] [node name="ChangeSceneButton" type="Button"] margin_right = 139.0 @@ -8,6 +8,5 @@ margin_bottom = 78.0 size_flags_vertical = 3 text = "Begin" script = ExtResource( 1 ) -next_scene_path = "res://src/Levels/New Tiles Level.tscn" [connection signal="button_up" from="." to="." method="_on_button_up"] diff --git a/src/UserInterface/Buttons/PlayButton.gd b/src/UserInterface/Buttons/PlayButton.gd index dccb69b..5e05f9b 100644 --- a/src/UserInterface/Buttons/PlayButton.gd +++ b/src/UserInterface/Buttons/PlayButton.gd @@ -4,7 +4,7 @@ export(String, FILE) var next_scene_path: String = "" onready var selected_level_base_path: String = "res://src/Levels/" func _on_button_up() -> void: - GlobalAudio.stop_scene_independent("res://assets/sounds/Shopping For The Future (LOOP).wav") + GlobalAudio.stop_scene_independent("res://assets/music/Shopping For The Future (LOOP).wav") GlobalAudio.play_scene_independent("res://assets/sounds/MAGIC_SPELL_Morphing_Synth_Harp_Scales_Deep_stereo.wav", "Effects", -8) get_tree().change_scene(next_scene_path) get_tree().get_current_scene().queue_free() diff --git a/src/UserInterface/Screens/InGameMenu/PauseScreen.tscn b/src/UserInterface/Screens/InGameMenu/PauseScreen.tscn index 144690b..e1de705 100644 --- a/src/UserInterface/Screens/InGameMenu/PauseScreen.tscn +++ b/src/UserInterface/Screens/InGameMenu/PauseScreen.tscn @@ -22,7 +22,7 @@ [ext_resource path="res://assets/ui/Screenshot 2023-05-23 160521.png" type="Texture" id=21] [ext_resource path="res://assets/meta/montserrat_extrabold.otf" type="DynamicFontData" id=22] [ext_resource path="res://src/UserInterface/Buttons/AudibleButton.gd" type="Script" id=23] -[ext_resource path="res://assets/sounds/Shopping For The Future (LOOP).wav" type="AudioStream" id=24] +[ext_resource path="res://assets/music/Shopping For The Future (LOOP).wav" type="AudioStream" id=24] [ext_resource path="res://src/UserInterface/Screens/MainMenu/AudioMenu.gd" type="Script" id=26] [ext_resource path="res://src/UserInterface/Screens/MainMenu/AudioSlider.gd" type="Script" id=28] [ext_resource path="res://src/UserInterface/Buttons/MenuNavigationButton.gd" type="Script" id=29] diff --git a/src/UserInterface/Screens/MainMenu/LevelCheckBox.gd b/src/UserInterface/Screens/MainMenu/LevelCheckBox.gd index 150ce43..604ea33 100644 --- a/src/UserInterface/Screens/MainMenu/LevelCheckBox.gd +++ b/src/UserInterface/Screens/MainMenu/LevelCheckBox.gd @@ -11,7 +11,7 @@ func initialize_with_progress(levelFullName: String) -> void: func register_froggy(var count : int = 0, var freed: bool = false) -> void: - var frogo: String = "FreedFroggy" + str(count + 1) + var frogo: String = "%FreedFroggy" + str(count + 1) var test = self.get_children() get_node(frogo).visible = true get_node(frogo + "/ImprisionedFroggy").visible = !freed diff --git a/src/UserInterface/Screens/MainMenu/MainScreen.gd b/src/UserInterface/Screens/MainMenu/MainScreen.gd index c4181e4..a6fb0fb 100644 --- a/src/UserInterface/Screens/MainMenu/MainScreen.gd +++ b/src/UserInterface/Screens/MainMenu/MainScreen.gd @@ -3,4 +3,4 @@ extends Control func _ready() -> void: $"%PlayButton".grab_focus() - GlobalAudio.play_scene_independent("res://assets/sounds/Shopping For The Future (LOOP).wav","Music", -14, true) + GlobalAudio.play_scene_independent("res://assets/music/Shopping For The Future (LOOP).wav","Music", -14, true) diff --git a/src/UserInterface/Screens/MainMenu/MainScreen.tscn b/src/UserInterface/Screens/MainMenu/MainScreen.tscn index 555b239..3c430d1 100644 --- a/src/UserInterface/Screens/MainMenu/MainScreen.tscn +++ b/src/UserInterface/Screens/MainMenu/MainScreen.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=19 format=2] +[gd_scene load_steps=20 format=2] [ext_resource path="res://src/UserInterface/Buttons/QuitButton.tscn" type="PackedScene" id=1] [ext_resource path="res://src/UserInterface/Titel.tscn" type="PackedScene" id=2] @@ -7,6 +7,7 @@ [ext_resource path="res://assets/meta/ui_theme.tres" type="Theme" id=5] [ext_resource path="res://assets/environment/background/Spaceship-Wall.png" type="Texture" id=6] [ext_resource path="res://assets/environment/background/starry-space.png" type="Texture" id=7] +[ext_resource path="res://src/UserInterface/Buttons/PlayButton.gd" type="Script" id=8] [ext_resource path="res://src/UserInterface/Screens/MainMenu/LevelSelectButtonGroup.tres" type="ButtonGroup" id=9] [ext_resource path="res://assets/meta/montserrat_extrabold.otf" type="DynamicFontData" id=10] [ext_resource path="res://src/UserInterface/Screens/MainMenu/LevelList.gd" type="Script" id=11] @@ -150,14 +151,16 @@ margin_bottom = 135.0 focus_mode = 2 size_flags_horizontal = 3 -[node name="PlayButton" parent="MenuContainer/Buttons" instance=ExtResource( 3 )] +[node name="PlayButton" type="Button" parent="MenuContainer/Buttons"] unique_name_in_owner = true margin_right = 154.0 margin_bottom = 30.0 focus_neighbour_top = NodePath("../QuitButton") focus_neighbour_bottom = NodePath("../Controlls") +size_flags_vertical = 3 theme = ExtResource( 13 ) -next_scene_path = "res://src/Levels/1 Tutorial Level.tscn" +text = "Begin" +script = ExtResource( 8 ) [node name="Controlls" parent="MenuContainer/Buttons" instance=ExtResource( 3 )] unique_name_in_owner = true @@ -240,3 +243,5 @@ focus_neighbour_left = NodePath("../../../../Buttons/PlayButton") size_flags_horizontal = 3 size_flags_vertical = 3 group = ExtResource( 9 ) + +[connection signal="button_up" from="MenuContainer/Buttons/PlayButton" to="MenuContainer/Buttons/PlayButton" method="_on_button_up"] diff --git a/src/UserInterface/TutorialThingy.tscn b/src/UserInterface/TutorialThingy.tscn index 1478920..0a189cb 100644 --- a/src/UserInterface/TutorialThingy.tscn +++ b/src/UserInterface/TutorialThingy.tscn @@ -222,7 +222,7 @@ shape = SubResource( 6 ) [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] stream = ExtResource( 7 ) -volume_db = -10.0 +volume_db = -14.776 bus = "UI" [connection signal="area_entered" from="Area" to="." method="_on_Area_area_entered"]