diff --git a/.gitignore b/.gitignore index d6037ed..fb85297 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ .import/ build/ -ngio.ini -scoreboard_host.txt +ngio.ini \ No newline at end of file diff --git a/LICENSE-ASSETS b/LICENSE-ASSETS deleted file mode 100644 index 4ea99c2..0000000 --- a/LICENSE-ASSETS +++ /dev/null @@ -1,395 +0,0 @@ -Attribution 4.0 International - -======================================================================= - -Creative Commons Corporation ("Creative Commons") is not a law firm and -does not provide legal services or legal advice. Distribution of -Creative Commons public licenses does not create a lawyer-client or -other relationship. Creative Commons makes its licenses and related -information available on an "as-is" basis. Creative Commons gives no -warranties regarding its licenses, any material licensed under their -terms and conditions, or any related information. Creative Commons -disclaims all liability for damages resulting from their use to the -fullest extent possible. - -Using Creative Commons Public Licenses - -Creative Commons public licenses provide a standard set of terms and -conditions that creators and other rights holders may use to share -original works of authorship and other material subject to copyright -and certain other rights specified in the public license below. The -following considerations are for informational purposes only, are not -exhaustive, and do not form part of our licenses. - - Considerations for licensors: Our public licenses are - intended for use by those authorized to give the public - permission to use material in ways otherwise restricted by - copyright and certain other rights. Our licenses are - irrevocable. Licensors should read and understand the terms - and conditions of the license they choose before applying it. - Licensors should also secure all rights necessary before - applying our licenses so that the public can reuse the - material as expected. Licensors should clearly mark any - material not subject to the license. This includes other CC- - licensed material, or material used under an exception or - limitation to copyright. More considerations for licensors: - wiki.creativecommons.org/Considerations_for_licensors - - Considerations for the public: By using one of our public - licenses, a licensor grants the public permission to use the - licensed material under specified terms and conditions. If - the licensor's permission is not necessary for any reason--for - example, because of any applicable exception or limitation to - copyright--then that use is not regulated by the license. Our - licenses grant only permissions under copyright and certain - other rights that a licensor has authority to grant. Use of - the licensed material may still be restricted for other - reasons, including because others have copyright or other - rights in the material. A licensor may make special requests, - such as asking that all changes be marked or described. - Although not required by our licenses, you are encouraged to - respect those requests where reasonable. More considerations - for the public: - wiki.creativecommons.org/Considerations_for_licensees - -======================================================================= - -Creative Commons Attribution 4.0 International Public License - -By exercising the Licensed Rights (defined below), You accept and agree -to be bound by the terms and conditions of this Creative Commons -Attribution 4.0 International Public License ("Public License"). To the -extent this Public License may be interpreted as a contract, You are -granted the Licensed Rights in consideration of Your acceptance of -these terms and conditions, and the Licensor grants You such rights in -consideration of benefits the Licensor receives from making the -Licensed Material available under these terms and conditions. - - -Section 1 -- Definitions. - - a. Adapted Material means material subject to Copyright and Similar - Rights that is derived from or based upon the Licensed Material - and in which the Licensed Material is translated, altered, - arranged, transformed, or otherwise modified in a manner requiring - permission under the Copyright and Similar Rights held by the - Licensor. For purposes of this Public License, where the Licensed - Material is a musical work, performance, or sound recording, - Adapted Material is always produced where the Licensed Material is - synched in timed relation with a moving image. - - b. Adapter's License means the license You apply to Your Copyright - and Similar Rights in Your contributions to Adapted Material in - accordance with the terms and conditions of this Public License. - - c. Copyright and Similar Rights means copyright and/or similar rights - closely related to copyright including, without limitation, - performance, broadcast, sound recording, and Sui Generis Database - Rights, without regard to how the rights are labeled or - categorized. For purposes of this Public License, the rights - specified in Section 2(b)(1)-(2) are not Copyright and Similar - Rights. - - d. Effective Technological Measures means those measures that, in the - absence of proper authority, may not be circumvented under laws - fulfilling obligations under Article 11 of the WIPO Copyright - Treaty adopted on December 20, 1996, and/or similar international - agreements. - - e. Exceptions and Limitations means fair use, fair dealing, and/or - any other exception or limitation to Copyright and Similar Rights - that applies to Your use of the Licensed Material. - - f. Licensed Material means the artistic or literary work, database, - or other material to which the Licensor applied this Public - License. - - g. Licensed Rights means the rights granted to You subject to the - terms and conditions of this Public License, which are limited to - all Copyright and Similar Rights that apply to Your use of the - Licensed Material and that the Licensor has authority to license. - - h. Licensor means the individual(s) or entity(ies) granting rights - under this Public License. - - i. Share means to provide material to the public by any means or - process that requires permission under the Licensed Rights, such - as reproduction, public display, public performance, distribution, - dissemination, communication, or importation, and to make material - available to the public including in ways that members of the - public may access the material from a place and at a time - individually chosen by them. - - j. Sui Generis Database Rights means rights other than copyright - resulting from Directive 96/9/EC of the European Parliament and of - the Council of 11 March 1996 on the legal protection of databases, - as amended and/or succeeded, as well as other essentially - equivalent rights anywhere in the world. - - k. You means the individual or entity exercising the Licensed Rights - under this Public License. Your has a corresponding meaning. - - -Section 2 -- Scope. - - a. License grant. - - 1. Subject to the terms and conditions of this Public License, - the Licensor hereby grants You a worldwide, royalty-free, - non-sublicensable, non-exclusive, irrevocable license to - exercise the Licensed Rights in the Licensed Material to: - - a. reproduce and Share the Licensed Material, in whole or - in part; and - - b. produce, reproduce, and Share Adapted Material. - - 2. Exceptions and Limitations. For the avoidance of doubt, where - Exceptions and Limitations apply to Your use, this Public - License does not apply, and You do not need to comply with - its terms and conditions. - - 3. Term. The term of this Public License is specified in Section - 6(a). - - 4. Media and formats; technical modifications allowed. The - Licensor authorizes You to exercise the Licensed Rights in - all media and formats whether now known or hereafter created, - and to make technical modifications necessary to do so. The - Licensor waives and/or agrees not to assert any right or - authority to forbid You from making technical modifications - necessary to exercise the Licensed Rights, including - technical modifications necessary to circumvent Effective - Technological Measures. For purposes of this Public License, - simply making modifications authorized by this Section 2(a) - (4) never produces Adapted Material. - - 5. Downstream recipients. - - a. Offer from the Licensor -- Licensed Material. Every - recipient of the Licensed Material automatically - receives an offer from the Licensor to exercise the - Licensed Rights under the terms and conditions of this - Public License. - - b. No downstream restrictions. You may not offer or impose - any additional or different terms or conditions on, or - apply any Effective Technological Measures to, the - Licensed Material if doing so restricts exercise of the - Licensed Rights by any recipient of the Licensed - Material. - - 6. No endorsement. Nothing in this Public License constitutes or - may be construed as permission to assert or imply that You - are, or that Your use of the Licensed Material is, connected - with, or sponsored, endorsed, or granted official status by, - the Licensor or others designated to receive attribution as - provided in Section 3(a)(1)(A)(i). - - b. Other rights. - - 1. Moral rights, such as the right of integrity, are not - licensed under this Public License, nor are publicity, - privacy, and/or other similar personality rights; however, to - the extent possible, the Licensor waives and/or agrees not to - assert any such rights held by the Licensor to the limited - extent necessary to allow You to exercise the Licensed - Rights, but not otherwise. - - 2. Patent and trademark rights are not licensed under this - Public License. - - 3. To the extent possible, the Licensor waives any right to - collect royalties from You for the exercise of the Licensed - Rights, whether directly or through a collecting society - under any voluntary or waivable statutory or compulsory - licensing scheme. In all other cases the Licensor expressly - reserves any right to collect such royalties. - - -Section 3 -- License Conditions. - -Your exercise of the Licensed Rights is expressly made subject to the -following conditions. - - a. Attribution. - - 1. If You Share the Licensed Material (including in modified - form), You must: - - a. retain the following if it is supplied by the Licensor - with the Licensed Material: - - i. identification of the creator(s) of the Licensed - Material and any others designated to receive - attribution, in any reasonable manner requested by - the Licensor (including by pseudonym if - designated); - - ii. a copyright notice; - - iii. a notice that refers to this Public License; - - iv. a notice that refers to the disclaimer of - warranties; - - v. a URI or hyperlink to the Licensed Material to the - extent reasonably practicable; - - b. indicate if You modified the Licensed Material and - retain an indication of any previous modifications; and - - c. indicate the Licensed Material is licensed under this - Public License, and include the text of, or the URI or - hyperlink to, this Public License. - - 2. You may satisfy the conditions in Section 3(a)(1) in any - reasonable manner based on the medium, means, and context in - which You Share the Licensed Material. For example, it may be - reasonable to satisfy the conditions by providing a URI or - hyperlink to a resource that includes the required - information. - - 3. If requested by the Licensor, You must remove any of the - information required by Section 3(a)(1)(A) to the extent - reasonably practicable. - - 4. If You Share Adapted Material You produce, the Adapter's - License You apply must not prevent recipients of the Adapted - Material from complying with this Public License. - - -Section 4 -- Sui Generis Database Rights. - -Where the Licensed Rights include Sui Generis Database Rights that -apply to Your use of the Licensed Material: - - a. for the avoidance of doubt, Section 2(a)(1) grants You the right - to extract, reuse, reproduce, and Share all or a substantial - portion of the contents of the database; - - b. if You include all or a substantial portion of the database - contents in a database in which You have Sui Generis Database - Rights, then the database in which You have Sui Generis Database - Rights (but not its individual contents) is Adapted Material; and - - c. You must comply with the conditions in Section 3(a) if You Share - all or a substantial portion of the contents of the database. - -For the avoidance of doubt, this Section 4 supplements and does not -replace Your obligations under this Public License where the Licensed -Rights include other Copyright and Similar Rights. - - -Section 5 -- Disclaimer of Warranties and Limitation of Liability. - - a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE - EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS - AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF - ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, - IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, - WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR - PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, - ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT - KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT - ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. - - b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE - TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, - NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, - INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, - COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR - USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN - ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR - DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR - IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. - - c. The disclaimer of warranties and limitation of liability provided - above shall be interpreted in a manner that, to the extent - possible, most closely approximates an absolute disclaimer and - waiver of all liability. - - -Section 6 -- Term and Termination. - - a. This Public License applies for the term of the Copyright and - Similar Rights licensed here. However, if You fail to comply with - this Public License, then Your rights under this Public License - terminate automatically. - - b. Where Your right to use the Licensed Material has terminated under - Section 6(a), it reinstates: - - 1. automatically as of the date the violation is cured, provided - it is cured within 30 days of Your discovery of the - violation; or - - 2. upon express reinstatement by the Licensor. - - For the avoidance of doubt, this Section 6(b) does not affect any - right the Licensor may have to seek remedies for Your violations - of this Public License. - - c. For the avoidance of doubt, the Licensor may also offer the - Licensed Material under separate terms or conditions or stop - distributing the Licensed Material at any time; however, doing so - will not terminate this Public License. - - d. Sections 1, 5, 6, 7, and 8 survive termination of this Public - License. - - -Section 7 -- Other Terms and Conditions. - - a. The Licensor shall not be bound by any additional or different - terms or conditions communicated by You unless expressly agreed. - - b. Any arrangements, understandings, or agreements regarding the - Licensed Material not stated herein are separate from and - independent of the terms and conditions of this Public License. - - -Section 8 -- Interpretation. - - a. For the avoidance of doubt, this Public License does not, and - shall not be interpreted to, reduce, limit, restrict, or impose - conditions on any use of the Licensed Material that could lawfully - be made without permission under this Public License. - - b. To the extent possible, if any provision of this Public License is - deemed unenforceable, it shall be automatically reformed to the - minimum extent necessary to make it enforceable. If the provision - cannot be reformed, it shall be severed from this Public License - without affecting the enforceability of the remaining terms and - conditions. - - c. No term or condition of this Public License will be waived and no - failure to comply consented to unless expressly agreed to by the - Licensor. - - d. Nothing in this Public License constitutes or may be interpreted - as a limitation upon, or waiver of, any privileges and immunities - that apply to the Licensor or You, including from the legal - processes of any jurisdiction or authority. - - -======================================================================= - -Creative Commons is not a party to its public -licenses. Notwithstanding, Creative Commons may elect to apply one of -its public licenses to material it publishes and in those instances -will be considered the “Licensor.” The text of the Creative Commons -public licenses is dedicated to the public domain under the CC0 Public -Domain Dedication. Except for the limited purpose of indicating that -material is shared under a Creative Commons public license or as -otherwise permitted by the Creative Commons policies published at -creativecommons.org/policies, Creative Commons does not authorize the -use of the trademark "Creative Commons" or any other trademark or logo -of Creative Commons without its prior written consent including, -without limitation, in connection with any unauthorized modifications -to any of its public licenses or any other arrangements, -understandings, or agreements concerning use of licensed material. For -the avoidance of doubt, this paragraph does not form part of the -public licenses. - -Creative Commons may be contacted at creativecommons.org. diff --git a/LICENSE-CODE b/LICENSE-CODE deleted file mode 100644 index 5dba822..0000000 --- a/LICENSE-CODE +++ /dev/null @@ -1,7 +0,0 @@ -Copyright © 2024 Haze Weathers and Penny Rigate - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/README.md b/README.md deleted file mode 100644 index 4ff031d..0000000 --- a/README.md +++ /dev/null @@ -1,20 +0,0 @@ -# Revolution 2083 -Published source code of [Revolution 2083](https://pennyrigate.itch.io/revolution-2083). - -Feel free to use this to make mods, fangames, whatever you like! It would make -us extra happy to be credited in and/or told about whatever you use this for. - -Apologies in advance for the messy code :) -— Haze - -## License - -Music is by [Scarlett Sylvistrix](https://ivsnyd.bandcamp.com/) and licensed under -the [CC-BY license](LICENSE-ASSETS) except for end credits -cover of "You're Wondering Now". -"You're Wondering Now" is not licensed for re-use. - -All textures and sound effects are by Haze Weathers and Penny Rigate. -They are also licensed under the [CC-BY license](LICENSE-ASSETS). - -All other code and data is licensed under the [MIT license](LICENSE-CODE). diff --git a/audio/glass_break.ogg b/audio/glass_break.ogg deleted file mode 100644 index ecafeb9..0000000 Binary files a/audio/glass_break.ogg and /dev/null differ diff --git a/audio/glass_break.ogg.import b/audio/glass_break.ogg.import deleted file mode 100644 index a3f5987..0000000 --- a/audio/glass_break.ogg.import +++ /dev/null @@ -1,15 +0,0 @@ -[remap] - -importer="ogg_vorbis" -type="AudioStreamOGGVorbis" -path="res://.import/glass_break.ogg-90d29d1196efeaa1b90b121f831dc311.oggstr" - -[deps] - -source_file="res://audio/glass_break.ogg" -dest_files=[ "res://.import/glass_break.ogg-90d29d1196efeaa1b90b121f831dc311.oggstr" ] - -[params] - -loop=false -loop_offset=0 diff --git a/audio/glass_crack.ogg b/audio/glass_crack.ogg deleted file mode 100644 index 443b833..0000000 Binary files a/audio/glass_crack.ogg and /dev/null differ diff --git a/audio/glass_crack.ogg.import b/audio/glass_crack.ogg.import deleted file mode 100644 index f7188f6..0000000 --- a/audio/glass_crack.ogg.import +++ /dev/null @@ -1,15 +0,0 @@ -[remap] - -importer="ogg_vorbis" -type="AudioStreamOGGVorbis" -path="res://.import/glass_crack.ogg-f61a203463634593b8f657b7bd6c8959.oggstr" - -[deps] - -source_file="res://audio/glass_crack.ogg" -dest_files=[ "res://.import/glass_crack.ogg-f61a203463634593b8f657b7bd6c8959.oggstr" ] - -[params] - -loop=false -loop_offset=0 diff --git a/audio/glass_crack.wav b/audio/glass_crack.wav deleted file mode 100644 index 46115e6..0000000 Binary files a/audio/glass_crack.wav and /dev/null differ diff --git a/audio/glass_crack.wav.import b/audio/glass_crack.wav.import deleted file mode 100644 index 9a2cc79..0000000 --- a/audio/glass_crack.wav.import +++ /dev/null @@ -1,23 +0,0 @@ -[remap] - -importer="wav" -type="AudioStreamSample" -path="res://.import/glass_crack.wav-e7bba5d7d195585aae47530d080ae6b3.sample" - -[deps] - -source_file="res://audio/glass_crack.wav" -dest_files=[ "res://.import/glass_crack.wav-e7bba5d7d195585aae47530d080ae6b3.sample" ] - -[params] - -force/8_bit=false -force/mono=false -force/max_rate=false -force/max_rate_hz=44100 -edit/trim=false -edit/normalize=false -edit/loop_mode=0 -edit/loop_begin=0 -edit/loop_end=-1 -compress/mode=0 diff --git a/audio/sounds/coin.wav b/audio/sounds/coin.wav deleted file mode 100644 index c258b39..0000000 Binary files a/audio/sounds/coin.wav and /dev/null differ diff --git a/audio/sounds/coin.wav.import b/audio/sounds/coin.wav.import deleted file mode 100644 index 24f1394..0000000 --- a/audio/sounds/coin.wav.import +++ /dev/null @@ -1,23 +0,0 @@ -[remap] - -importer="wav" -type="AudioStreamSample" -path="res://.import/coin.wav-684b22528021c5adcd535ba4ddcbd887.sample" - -[deps] - -source_file="res://audio/sounds/coin.wav" -dest_files=[ "res://.import/coin.wav-684b22528021c5adcd535ba4ddcbd887.sample" ] - -[params] - -force/8_bit=false -force/mono=false -force/max_rate=false -force/max_rate_hz=44100 -edit/trim=false -edit/normalize=false -edit/loop_mode=0 -edit/loop_begin=0 -edit/loop_end=-1 -compress/mode=0 diff --git a/audio/sounds/new_glass_break.ogg b/audio/sounds/new_glass_break.ogg deleted file mode 100644 index 67d43e5..0000000 Binary files a/audio/sounds/new_glass_break.ogg and /dev/null differ diff --git a/audio/sounds/new_glass_break.ogg.import b/audio/sounds/new_glass_break.ogg.import deleted file mode 100644 index 174c833..0000000 --- a/audio/sounds/new_glass_break.ogg.import +++ /dev/null @@ -1,15 +0,0 @@ -[remap] - -importer="ogg_vorbis" -type="AudioStreamOGGVorbis" -path="res://.import/new_glass_break.ogg-fbd6d1bed95228de08fb65aac302483f.oggstr" - -[deps] - -source_file="res://audio/sounds/new_glass_break.ogg" -dest_files=[ "res://.import/new_glass_break.ogg-fbd6d1bed95228de08fb65aac302483f.oggstr" ] - -[params] - -loop=false -loop_offset=0 diff --git a/audio/sounds/oi_sg.ogg b/audio/sounds/oi_sg.ogg deleted file mode 100644 index 76265fb..0000000 Binary files a/audio/sounds/oi_sg.ogg and /dev/null differ diff --git a/audio/sounds/oi_sg.ogg.import b/audio/sounds/oi_sg.ogg.import deleted file mode 100644 index 0d0afe5..0000000 --- a/audio/sounds/oi_sg.ogg.import +++ /dev/null @@ -1,15 +0,0 @@ -[remap] - -importer="ogg_vorbis" -type="AudioStreamOGGVorbis" -path="res://.import/oi_sg.ogg-ab72b502c36749cb6d98be5482c583fc.oggstr" - -[deps] - -source_file="res://audio/sounds/oi_sg.ogg" -dest_files=[ "res://.import/oi_sg.ogg-ab72b502c36749cb6d98be5482c583fc.oggstr" ] - -[params] - -loop=false -loop_offset=0 diff --git a/audio/sounds/stab.wav b/audio/sounds/stab.wav deleted file mode 100644 index 665e7e2..0000000 Binary files a/audio/sounds/stab.wav and /dev/null differ diff --git a/audio/sounds/stab.wav.import b/audio/sounds/stab.wav.import deleted file mode 100644 index c019167..0000000 --- a/audio/sounds/stab.wav.import +++ /dev/null @@ -1,23 +0,0 @@ -[remap] - -importer="wav" -type="AudioStreamSample" -path="res://.import/stab.wav-c201d15cc0a56178959694372eb53d41.sample" - -[deps] - -source_file="res://audio/sounds/stab.wav" -dest_files=[ "res://.import/stab.wav-c201d15cc0a56178959694372eb53d41.sample" ] - -[params] - -force/8_bit=false -force/mono=false -force/max_rate=false -force/max_rate_hz=44100 -edit/trim=false -edit/normalize=false -edit/loop_mode=0 -edit/loop_begin=0 -edit/loop_end=-1 -compress/mode=0 diff --git a/autoloads/audio.gd b/autoloads/audio.gd index f7314a9..285de20 100644 --- a/autoloads/audio.gd +++ b/autoloads/audio.gd @@ -75,10 +75,7 @@ const a_mech_hurt_1 = preload("res://audio/sounds/mech_hurt_1.ogg") const a_mech_hurt_2 = preload("res://audio/sounds/mech_hurt_2.ogg") const a_mech_hurt_3 = preload("res://audio/sounds/mech_hurt_3.ogg") const a_critical_heat = preload("res://audio/sounds/critical_heat.ogg") -const a_glass_crack = preload("res://audio/glass_crack.ogg") -const a_glass_break = preload("res://audio/glass_break.ogg") -const a_shield = preload("res://audio/sounds/stab.wav") -const a_shield_cooldown = preload("res://audio/sounds/coin.wav") +const a_glass_break = preload("res://audio/sounds/cop_shoot.ogg") var loop_section = null var has_looped = false diff --git a/autoloads/debug.gd b/autoloads/debug.gd index 2e9f962..079a35c 100644 --- a/autoloads/debug.gd +++ b/autoloads/debug.gd @@ -37,7 +37,7 @@ func _ready(): func _physics_process(delta): #DEBUG - if debug == true && !entry && !entry_index > 0 && !Options.entry: + if debug == true && !entry && !entry_index > 0: #Move player to mouse if Input.is_action_just_pressed("debug_move_player"): Audio.play_sound(Audio.a_mkey,Audio.ac_jump) @@ -67,9 +67,6 @@ func _physics_process(delta): if infinite_arrows: Game.arrows = 99 func _input(event): - if Options.entry: - return - if event is InputEventKey && event.is_pressed(): var character = OS.get_scancode_string(event.scancode) if character.length() > 1: @@ -237,9 +234,3 @@ func _enter_code(): Game.change_map(load("res://menus/credits.tscn")) "SLOWPOKE": Game.time = 99999 - "LASERTAG": - Game.can_use_shield = true - is_cheating = true - "INCREDIBLE": - var cat = load("res://objects/enemy/uncanny_cat.tscn").instance() - Game.get_map().add_child(cat) diff --git a/autoloads/game.gd b/autoloads/game.gd index 1f3e1c9..3c07606 100644 --- a/autoloads/game.gd +++ b/autoloads/game.gd @@ -9,9 +9,6 @@ enum Difficulty { PUNGENT, # faster enemies, 3 lives } -# score multiplier for easy mode -const EASY_DIFFICULTY_MODIFIER: float = 0.75 - ## resolution the game renders at const RESOLUTION := Vector2(256,192) @@ -40,7 +37,6 @@ var time_bonus: int = 0 var life_bonus: int = 0 var perfect_bonus: int = 0 var final_score: int = 0 -var old_high_score: int = 0 #== state ==# var current_sector := Vector2.ZERO var respawn_point := Vector2(32,166) @@ -55,7 +51,6 @@ var current_palette: String = "default" var still_playing: bool = false var last_mm_button = null var alternate_death = null -var can_use_shield: bool = false #== marathon mode ==# var marathon_mode: bool = false var marathon_score: int = 0 @@ -64,6 +59,9 @@ var marathon_shards: int = 0 var marathon_deaths: int = 0 +func _ready(): + pause_mode = Node.PAUSE_MODE_PROCESS + func _get_stars() -> int: return stars_collected.count(true) @@ -105,7 +103,7 @@ func get_sector(pos): #Return the current Map func get_map(): - return get_tree().get_nodes_in_group("map").front() + return get_tree().get_nodes_in_group("map")[0] ## tally up scores @@ -142,9 +140,6 @@ func tally_scores() -> void: perfect_bonus += 1000 # final score final_score = score + arrows_bonus + collection_bonus + time_bonus + life_bonus + perfect_bonus - # easy mode modifier - if difficulty == Difficulty.SWEET: - final_score *= EASY_DIFFICULTY_MODIFIER if marathon_mode: marathon_shards += shards_collected.count(true) marathon_score += final_score @@ -201,8 +196,6 @@ func save(): var save_id = LevelData.levels[current_level].save_id var save_data: Save.LevelSaveData = Save.current_file.levels[save_id] - old_high_score = max(save_data.score_100, save_data.score_any) - # save score and time depending on completion if _get_shards() >= 5 && keys >= 50: save_data.score_100 = max(save_data.score_100, final_score) as int diff --git a/autoloads/level_data.tscn b/autoloads/level_data.tscn index fe92a6f..e2a8193 100644 --- a/autoloads/level_data.tscn +++ b/autoloads/level_data.tscn @@ -29,7 +29,8 @@ shards_required_spicy = 0 shards_required_pungent = 0 boss_required = "" boss = false -has_scoreboard = true +scores_id = 13253 +times_id = 13255 scene = ExtResource( 2 ) [sub_resource type="Resource" id=2] @@ -44,7 +45,8 @@ shards_required_spicy = 0 shards_required_pungent = 0 boss_required = "" boss = false -has_scoreboard = true +scores_id = 13254 +times_id = 13257 scene = ExtResource( 3 ) [sub_resource type="Resource" id=4] @@ -59,7 +61,8 @@ shards_required_spicy = 0 shards_required_pungent = 0 boss_required = "" boss = false -has_scoreboard = true +scores_id = 13263 +times_id = 13270 scene = ExtResource( 6 ) [sub_resource type="Resource" id=6] @@ -74,7 +77,8 @@ shards_required_spicy = 16 shards_required_pungent = 24 boss_required = "" boss = true -has_scoreboard = false +scores_id = -1 +times_id = -1 scene = ExtResource( 8 ) [sub_resource type="Resource" id=3] @@ -89,7 +93,8 @@ shards_required_spicy = 0 shards_required_pungent = 0 boss_required = "boss1" boss = false -has_scoreboard = true +scores_id = 13264 +times_id = 13271 scene = ExtResource( 14 ) [sub_resource type="Resource" id=10] @@ -104,7 +109,8 @@ shards_required_spicy = 0 shards_required_pungent = 0 boss_required = "boss1" boss = false -has_scoreboard = true +scores_id = 13265 +times_id = 13272 scene = ExtResource( 7 ) [sub_resource type="Resource" id=9] @@ -119,7 +125,8 @@ shards_required_spicy = 0 shards_required_pungent = 0 boss_required = "boss1" boss = false -has_scoreboard = true +scores_id = 13266 +times_id = 13273 scene = ExtResource( 11 ) [sub_resource type="Resource" id=12] @@ -134,7 +141,8 @@ shards_required_spicy = 32 shards_required_pungent = 40 boss_required = "" boss = true -has_scoreboard = false +scores_id = -1 +times_id = -1 scene = ExtResource( 13 ) [sub_resource type="Resource" id=8] @@ -149,7 +157,8 @@ shards_required_spicy = 0 shards_required_pungent = 0 boss_required = "boss2" boss = false -has_scoreboard = true +scores_id = 13267 +times_id = 13274 scene = ExtResource( 10 ) [sub_resource type="Resource" id=7] @@ -164,7 +173,8 @@ shards_required_spicy = 0 shards_required_pungent = 0 boss_required = "boss2" boss = false -has_scoreboard = true +scores_id = 13268 +times_id = 13275 scene = ExtResource( 9 ) [sub_resource type="Resource" id=11] @@ -179,7 +189,8 @@ shards_required_spicy = 0 shards_required_pungent = 0 boss_required = "boss2" boss = false -has_scoreboard = true +scores_id = 13269 +times_id = 13276 scene = ExtResource( 12 ) [sub_resource type="Resource" id=15] @@ -194,7 +205,8 @@ shards_required_spicy = 50 shards_required_pungent = 60 boss_required = "" boss = true -has_scoreboard = false +scores_id = -1 +times_id = -1 scene = ExtResource( 16 ) [sub_resource type="Resource" id=14] @@ -209,7 +221,8 @@ shards_required_spicy = 72 shards_required_pungent = 72 boss_required = "boss3" boss = false -has_scoreboard = false +scores_id = -1 +times_id = -1 scene = ExtResource( 4 ) [sub_resource type="Resource" id=13] @@ -224,7 +237,8 @@ shards_required_spicy = 0 shards_required_pungent = 0 boss_required = "" boss = false -has_scoreboard = false +scores_id = -1 +times_id = -1 scene = ExtResource( 15 ) [node name="LevelData" type="Node"] diff --git a/autoloads/options.gd b/autoloads/options.gd index fbb7655..26ec300 100644 --- a/autoloads/options.gd +++ b/autoloads/options.gd @@ -18,10 +18,6 @@ const TRANS_SPEEDS := [0.8, 0.4, 0.2, 0.0000001] #Game var rumble: int = RumbleMode.FULL var gore: int = Gore.FULL -var speedrun_timer: bool = false setget _set_speedrun_timer -var speccy_help: bool = false -var scoreboard_name: String = "" setget _set_scoreboard_name -var scoreboard_id: int = -1 #Video var fullscreen: bool = false setget _set_fullscreen @@ -44,19 +40,15 @@ var last_file: int = 0 # default values var defaults = null -# text is being entered -var entry: bool = false - func _ready() -> void: pause_mode = PAUSE_MODE_PROCESS - # clone self into defaults before loading stored values if defaults == null: defaults = duplicate() load_options() func _unhandled_input(event: InputEvent) -> void: - if not Debug.entry and not entry: + if Debug.entry == false: if event.is_action_pressed("fullscreen"): OS.window_fullscreen = not OS.window_fullscreen @@ -66,11 +58,6 @@ func load_options() -> void: # game rumble = file.get_value("game", "rumble", defaults.rumble) gore = file.get_value("game", "gore", defaults.gore) - _set_speedrun_timer(file.get_value("game", "speedrun_timer", defaults.speedrun_timer)) - speccy_help = file.get_value("game", "speccy_help", defaults.speccy_help) - _set_scoreboard_name(file.get_value("game", "scoreboard_name", "")) - randomize() - scoreboard_id = file.get_value("game", "scoreboard_id", randi()) # video _set_fullscreen(file.get_value("video", "fullscreen", defaults.fullscreen)) _set_window_size(file.get_value("video", "window_size", defaults.window_size)) @@ -91,10 +78,6 @@ func load_defaults(section: int = Section.ALL) -> void: Section.GAME, Section.ALL: rumble = defaults.rumble gore = defaults.gore - speedrun_timer = defaults.speedrun_timer - speccy_help = defaults.speccy_help - scoreboard_name = defaults.scoreboard_name - scoreboard_id = randi() Section.VIDEO, Section.ALL: fullscreen = defaults.fullscreen window_size = defaults.window_size @@ -113,10 +96,6 @@ func save_options() -> void: #Game file.set_value("game", "rumble", rumble) file.set_value("game", "gore", gore) - file.set_value("game", "speedrun_timer", speedrun_timer) - file.set_value("game", "speccy_help", speccy_help) - file.set_value("game", "scoreboard_name", scoreboard_name) - file.set_value("game", "scoreboard_id", scoreboard_id) #Video file.set_value("video", "fullscreen", fullscreen) file.set_value("video", "window_size", window_size) @@ -136,17 +115,6 @@ func save_options() -> void: # Setters -# game setters -func _set_speedrun_timer(value: bool) -> void: - speedrun_timer = value - if not speedrun_timer: - SpeedrunTimer.visible = false - SpeedrunTimer.timer_running = false - -func _set_scoreboard_name(value: String) -> void: - scoreboard_name = value.substr(0, 10).to_lower() - - # video setters func _set_fullscreen(value: bool) -> void: fullscreen = value diff --git a/autoloads/scene_manager.gd b/autoloads/scene_manager.gd index f6c8a67..ea1b353 100644 --- a/autoloads/scene_manager.gd +++ b/autoloads/scene_manager.gd @@ -19,14 +19,6 @@ var resolution: Vector2 var current_scene: Node setget change_scene -var last_input_gamepad: bool = true - -func _input(event: InputEvent) -> void: - if event is InputEventJoypadButton: - last_input_gamepad = true - elif event is InputEventKey: - last_input_gamepad = false - ## change the current scene func change_scene(new_scene: Node) -> void: # remove current scene if it exists diff --git a/autoloads/scoreboard.gd b/autoloads/scoreboard.gd deleted file mode 100644 index 0b15f8c..0000000 --- a/autoloads/scoreboard.gd +++ /dev/null @@ -1,124 +0,0 @@ -extends Node - - -signal _response_received - - -const CHECK_INTERVAL: float = 60.0 -const POLL_INTERVAL: float = 0.5 - - -var server_host: String = "" -var http: HTTPRequest = null -## True if there is currently a request processing. -var waiting_for_response: bool = false -## True if the last request failed and the result is not valid. -var errored: bool = false - -var _response_code: int = -1 -var _response_body: String = "" - - -class ScoreEntry: - var score: int - var time: int - var difficulty: int - - func _init(score: int, time: int, difficulty: int) -> void: - self.score = score - self.time = time - self.difficulty = difficulty - - static func from_dict(dict: Dictionary) -> ScoreEntry: - return ScoreEntry.new(dict.score, dict.time, dict.difficulty) - - -func _ready() -> void: - var file = File.new() - var result = file.open("res://scoreboard_host.txt", File.READ) - if result == OK: - server_host = file.get_line() - file.close() - - http = HTTPRequest.new() - http.download_chunk_size = 4096 - http.timeout = 30.0 - http.use_threads = OS.get_name() != "HTML5" - http.connect("request_completed", self, "_on_request_completed") - add_child(http) - -func _on_request_completed(result: int, response_code: int, headers: PoolStringArray, body: PoolByteArray) -> void: - if result != OK: - errored = true - else: - errored = false - _response_code = response_code - _response_body = body.get_string_from_utf8() - waiting_for_response = false - emit_signal("_response_received") - - -func is_name_free(player_name: String, id: int) -> bool: - if waiting_for_response: - yield(self, "_response_received") - var err = http.request(server_host + "/api/players/" + player_name) - if err != OK: - errored = true - return false - waiting_for_response = true - - yield(self, "_response_received") - if _response_code == HTTPClient.RESPONSE_NOT_FOUND or _response_body.to_int() == id: - return true - return false - - -func touch_name(player_name: String, id: int) -> void: - if waiting_for_response: - yield(self, "_response_received") - var err = http.request( - server_host + "/api/players/%s/%d" % [player_name, id], - [], true, HTTPClient.METHOD_POST - ) - if err != OK: - errored = true - return - waiting_for_response = true - - -func submit_score(level: String, entry: ScoreEntry) -> bool: - if waiting_for_response: - yield(self, "_response_received") - var err = http.request( - server_host + "/api/scores/%s/%s/%d/%d/%d" % [ - level, Options.scoreboard_name, - entry.score, entry.time, entry.difficulty - ], - [], true, HTTPClient.METHOD_POST - ) - if err != OK: - errored = true - return false - waiting_for_response = true - yield(self, "_response_received") - if errored or _response_code != HTTPClient.RESPONSE_OK: - return false - return true - - -func get_scores(level: String) -> Dictionary: - if waiting_for_response: - yield(self, "_response_received") - var err = http.request(server_host + "/api/scores/%s" % level) - if err != OK: - errored = true - return {} - waiting_for_response = true - yield(self, "_response_received") - if not errored and _response_code == HTTPClient.RESPONSE_OK: - var dict = parse_json(_response_body) - var scores = {} - for player in dict.keys(): - scores[player] = ScoreEntry.from_dict(dict[player]) - return scores - return {} diff --git a/autoloads/speedrun_timer.gd b/autoloads/speedrun_timer.gd deleted file mode 100644 index 5a3c4ff..0000000 --- a/autoloads/speedrun_timer.gd +++ /dev/null @@ -1,29 +0,0 @@ -extends CanvasLayer - - -export var bonus_color: Color - - -var time: float = 0.0 -var timer_running: bool = false - - -onready var time_counter: Label = $Box/TimeCounter - - -func _physics_process(delta: float) -> void: - if timer_running: - time += delta - - -func _process(delta: float) -> void: - if visible: - time_counter.text = Game.format_time(time) - - if timer_running: - var map = Game.get_map() - if is_instance_valid(map): - if (Game.has_collection_bonus() && Game.time <= map.target_time_100) or (!Game.has_collection_bonus() && Game.time <= map.target_time_any): - time_counter.modulate = bonus_color - return - time_counter.modulate = Color.white diff --git a/autoloads/speedrun_timer.tscn b/autoloads/speedrun_timer.tscn deleted file mode 100644 index 45be8be..0000000 --- a/autoloads/speedrun_timer.tscn +++ /dev/null @@ -1,32 +0,0 @@ -[gd_scene load_steps=5 format=2] - -[ext_resource path="res://autoloads/speedrun_timer.gd" type="Script" id=1] -[ext_resource path="res://graphics/hud/hud.png" type="Texture" id=2] -[ext_resource path="res://ui/theme.tres" type="Theme" id=3] - -[sub_resource type="AtlasTexture" id=1] -atlas = ExtResource( 2 ) -region = Rect2( 0, 180, 58, 12 ) - -[node name="CanvasLayer" type="CanvasLayer" groups=["viewport_autoload"]] -pause_mode = 2 -layer = 127 -visible = false -script = ExtResource( 1 ) -bonus_color = Color( 0.478431, 1, 0.47451, 1 ) - -[node name="Box" type="TextureRect" parent="."] -anchor_top = 1.0 -anchor_bottom = 1.0 -margin_top = -12.0 -margin_right = 58.0 -texture = SubResource( 1 ) - -[node name="TimeCounter" type="Label" parent="Box"] -modulate = Color( 0.478431, 1, 0.47451, 1 ) -margin_left = 1.0 -margin_top = 1.0 -margin_right = 57.0 -margin_bottom = 11.0 -theme = ExtResource( 3 ) -text = "00:00:00" diff --git a/credits.txt b/credits.txt index 66b51f7..4a6674d 100644 --- a/credits.txt +++ b/credits.txt @@ -1,3 +1,3 @@ Game by Penny Rigate -Music by Scarlett Sylvistrix (https://ivysnyder.newgrounds.com/) -Shaders and code help by Haze +Music by Ivy Snyder (https://ivysnyder.newgrounds.com/) +Shaders and code help by Haze \ No newline at end of file diff --git a/cutscenes/fami_cutscene.gd b/cutscenes/fami_cutscene.gd index fb18afb..4f2edb1 100644 --- a/cutscenes/fami_cutscene.gd +++ b/cutscenes/fami_cutscene.gd @@ -29,7 +29,6 @@ func skip_cutscene() -> void: Fade.fade_out(Options.transition_speed_secs) yield(Fade, "fade_finished") animation_player.seek(cutscene_skip) - $Label.rect_position.y = -99999 # stupid 1.1 stuff Fade.fade_in(Options.transition_speed_secs) func kill_cop() -> void: diff --git a/cutscenes/fami_cutscene.tscn b/cutscenes/fami_cutscene.tscn index 14034bf..f4130d9 100644 --- a/cutscenes/fami_cutscene.tscn +++ b/cutscenes/fami_cutscene.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=47 format=2] +[gd_scene load_steps=46 format=2] [ext_resource path="res://shaders/recolor_border.shader" type="Shader" id=1] [ext_resource path="res://graphics/player/palettes/default.tex" type="Texture" id=2] @@ -10,6 +10,7 @@ [ext_resource path="res://tilesets/t_laboratory.tres" type="TileSet" id=8] [ext_resource path="res://graphics/npc/fami_human.png" type="Texture" id=9] [ext_resource path="res://cutscenes/fami_cutscene.gd" type="Script" id=10] +[ext_resource path="res://audio/sounds/fami_voice.ogg" type="AudioStream" id=11] [ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=12] [ext_resource path="res://graphics/collectibles/shard.png" type="Texture" id=13] [ext_resource path="res://graphics/enemy/cop/scope_walk.png" type="Texture" id=14] @@ -234,20 +235,19 @@ tracks/10/keys = { [sub_resource type="Animation" id=2] resource_name = "cutscene" -length = 100.0 -step = 0.05 +length = 93.0 tracks/0/type = "value" tracks/0/path = NodePath("Label:text") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/imported = false -tracks/0/enabled = false +tracks/0/enabled = true tracks/0/keys = { -"times": PoolRealArray( 0, 4.5, 9.5, 13.5, 18.5, 22.5, 26.5, 30.5, 34.5 ), -"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1, 1, 1 ), +"times": PoolRealArray( 0.25, 5.3, 13.2, 19.25, 28.75, 37.3, 46.8, 51.8, 58.3, 59.25, 78.75 ), +"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ), "update": 2, -"values": [ "So you've made it this far... too bad your efforts are all in vain.", "You see, SG, -I plan to use the shards to power my spaceship, its exhaust will be so powerful, you peasants will all be vaporized. ", "Me and all of the wonderful billionaires of the world will head to planet X, the newly discovered planet beyond pluto.", "You plan to hijack my wonderful future, eh? Whaddya kids call it? A revolution?", "Ha! I already started my own revolution in 2068.", "You know what they say, the freer the market, the freer the people! Ever since then, I never felt so free!", "You're such a fool. The perfect tool for the reconstruction of the Zircon Ultima.", "While you've been on your gay little adventure collecting shards I've been waiting for this very moment to take them all from you!", "Have at you!!!" ] +"values": [ "Aha! so you've made it this far, however your efforts are all in vain.", "You see, SG, +I plan to use the shards to power my spaceship, its exhaust will be so powerful, you peasants will all be vaporized. ", "Me and all of the wonderful billionaires of the world will head to planet X, the newly discovered planet beyond pluto.", "I've heard you want to start a revolution. Well, I'll have you know I kicked off my own revolution in 2068, and to be honest I don't quite see why you want my revolution to end.", "You know what they say, the freer the market, the freer the people, ever since then I've never felt so free! I think your revolution is a foolish pipe dream! ", "Adam Smith once said \"Nobody but a beggar chooses to depend chiefly upon the benevolence of his fellow citizens\", your commie society would never work!", "Oh? How will i reconstruct the Zircon Ultima? You're just the perfect tool for that. ", "While you've been on your gay little adventure collecting shards I've been waiting for this very moment to take them all from you!", "Have at you!", "", "" ] } tracks/1/type = "value" tracks/1/path = NodePath("FamiVoice:playing") @@ -256,7 +256,7 @@ tracks/1/loop_wrap = true tracks/1/imported = false tracks/1/enabled = true tracks/1/keys = { -"times": PoolRealArray( 0.25, 96 ), +"times": PoolRealArray( 0.25, 78.75 ), "transitions": PoolRealArray( 1, 1 ), "update": 1, "values": [ true, false ] @@ -268,7 +268,7 @@ tracks/2/loop_wrap = true tracks/2/imported = false tracks/2/enabled = true tracks/2/keys = { -"times": PoolRealArray( 0.25, 76.5, 78 ), +"times": PoolRealArray( 0.25, 59.25, 60.75 ), "transitions": PoolRealArray( 1, 1, 1 ), "update": 0, "values": [ Vector2( -8, 169 ), Vector2( -8, 169 ), Vector2( 72, 169 ) ] @@ -280,7 +280,7 @@ tracks/3/loop_wrap = true tracks/3/imported = false tracks/3/enabled = true tracks/3/keys = { -"times": PoolRealArray( 0, 76.5, 78 ), +"times": PoolRealArray( 0, 59.25, 60.75 ), "transitions": PoolRealArray( 1, 1, 1 ), "update": 1, "values": [ "gun", "walk", "gun" ] @@ -292,7 +292,7 @@ tracks/4/loop_wrap = true tracks/4/imported = false tracks/4/enabled = true tracks/4/keys = { -"times": PoolRealArray( 0.25, 79, 81, 81.5, 87, 89, 93, 93.5 ), +"times": PoolRealArray( 0.25, 61.75, 63.75, 64.25, 69.75, 71.75, 75.75, 76.25 ), "transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1, 1 ), "update": 1, "values": [ "idle", "walk", "idle", "punch", "walk", "idle", "shrink", "orb" ] @@ -304,7 +304,7 @@ tracks/5/loop_wrap = true tracks/5/imported = false tracks/5/enabled = true tracks/5/keys = { -"times": PoolRealArray( 0.25, 79, 81, 87, 89, 93, 95, 96 ), +"times": PoolRealArray( 0.25, 61.75, 63.75, 69.75, 71.75, 75.75, 77.75, 78.75 ), "transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1, 1 ), "update": 0, "values": [ Vector2( 160, 167 ), Vector2( 160, 167 ), Vector2( 105, 167 ), Vector2( 105, 167 ), Vector2( 160, 167 ), Vector2( 160, 167 ), Vector2( 160, 167 ), Vector2( 160, 83 ) ] @@ -316,7 +316,7 @@ tracks/6/loop_wrap = true tracks/6/imported = false tracks/6/enabled = true tracks/6/keys = { -"times": PoolRealArray( 0.5, 82.8, 88 ), +"times": PoolRealArray( 0.5, 65.5, 70.75 ), "transitions": PoolRealArray( 1, 1, 1 ), "update": 1, "values": [ false, true, false ] @@ -328,7 +328,7 @@ tracks/7/loop_wrap = true tracks/7/imported = false tracks/7/enabled = true tracks/7/keys = { -"times": PoolRealArray( 0.25, 90, 93 ), +"times": PoolRealArray( 0.25, 72.75, 75.75 ), "transitions": PoolRealArray( 1, 1, 1 ), "update": 1, "values": [ false, true, false ] @@ -340,7 +340,7 @@ tracks/8/loop_wrap = true tracks/8/imported = false tracks/8/enabled = true tracks/8/keys = { -"times": PoolRealArray( 0.25, 92, 93 ), +"times": PoolRealArray( 0.25, 74.75, 75.75 ), "transitions": PoolRealArray( 1, 1, 1 ), "update": 0, "values": [ Color( 0.396078, 1, 1, 0 ), Color( 0.396078, 1, 1, 0 ), Color( 0.396078, 1, 1, 1 ) ] @@ -352,7 +352,7 @@ tracks/9/loop_wrap = true tracks/9/imported = false tracks/9/enabled = true tracks/9/keys = { -"times": PoolRealArray( 0.25, 92, 93 ), +"times": PoolRealArray( 0.25, 74.75, 75.75 ), "transitions": PoolRealArray( 1, 1, 1 ), "update": 0, "values": [ Color( 0.345098, 0.74902, 0.878431, 0 ), Color( 0.345098, 0.74902, 0.878431, 0 ), Color( 0.345098, 0.74902, 0.878431, 1 ) ] @@ -364,7 +364,7 @@ tracks/10/loop_wrap = true tracks/10/imported = false tracks/10/enabled = true tracks/10/keys = { -"times": PoolRealArray( 96 ), +"times": PoolRealArray( 78.75 ), "transitions": PoolRealArray( 1 ), "values": [ { "args": [ "cutscene_finished" ], @@ -378,7 +378,7 @@ tracks/11/loop_wrap = true tracks/11/imported = false tracks/11/enabled = true tracks/11/keys = { -"times": PoolRealArray( 0, 90 ), +"times": PoolRealArray( 0, 72.75 ), "transitions": PoolRealArray( 1, 1 ), "update": 1, "values": [ false, true ] @@ -390,7 +390,7 @@ tracks/12/loop_wrap = true tracks/12/imported = false tracks/12/enabled = true tracks/12/keys = { -"times": PoolRealArray( 0, 82.8 ), +"times": PoolRealArray( 0, 65.5 ), "transitions": PoolRealArray( 1, 1 ), "update": 1, "values": [ false, true ] @@ -402,7 +402,7 @@ tracks/13/loop_wrap = true tracks/13/imported = false tracks/13/enabled = true tracks/13/keys = { -"times": PoolRealArray( 0, 93.8 ), +"times": PoolRealArray( 0, 76.5 ), "transitions": PoolRealArray( 1, 1 ), "update": 1, "values": [ false, true ] @@ -414,10 +414,10 @@ tracks/14/loop_wrap = true tracks/14/imported = false tracks/14/enabled = true tracks/14/keys = { -"times": PoolRealArray( 0, 2.6, 2.7, 2.8, 8, 8.1, 8.2, 12.4, 12.5, 13, 17.1092, 17.2092, 18.3092, 22.25, 24.25, 30.25, 30.5, 32.5, 40.25, 40.75, 41.25, 41.5, 48, 48.75, 49.25, 49.75, 50.25, 51, 51.5, 52, 52.5, 53.25, 53.75, 54.25, 54.75, 55.5, 56, 56.5, 57, 57.75, 58.25, 58.75, 60.75, 61.5, 62, 62.5, 63, 63.75, 64.25, 64.75, 65.25, 66, 66.5, 67, 67.5, 68.25, 68.75, 69.25, 69.75, 70.5, 71, 71.5, 72.25, 73, 73.5, 74, 74.5, 78, 78.15, 78.3, 78.45, 89.8, 90, 90.2, 90.3, 90.4 ), -"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1.03526, 1, 1, 1.03526, 1, 1.03526, 1, 1.03526, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ), +"times": PoolRealArray( 0, 2.6, 2.7, 2.8, 8, 8.1, 8.2, 12.4, 12.5, 13, 17.1092, 17.2092, 18.3092, 25.8, 25.9, 27.9, 36.6, 36.7, 38.7, 41.4, 41.8, 42.2, 42.6, 44.3, 45, 45.5, 46, 46.5, 47.2, 47.7, 48.2, 48.8, 49.5, 50, 50.5, 51, 51.7, 52.2, 52.7, 53.3, 54, 54.5, 55, 55.5, 56.2, 56.7, 57.2, 57.8, 58.5, 59, 59.5, 60.2, 60.8, 61, 61.5, 61.6, 64.25, 71.75, 71.85, 71.975, 72.125, 73, 73.1 ), +"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1.03526, 1, 1, 1.03526, 1, 1.03526, 1, 1.03526, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ), "update": 1, -"values": [ Vector2( 0, 0 ), Vector2( 0, 0 ), Vector2( 1, 12 ), Vector2( 0, 12 ), Vector2( 0, 0 ), Vector2( 1, 12 ), Vector2( 0, 12 ), Vector2( 0, 0 ), Vector2( 1, 12 ), Vector2( 0, 12 ), Vector2( 0, 0 ), Vector2( 1, 12 ), Vector2( 0, 12 ), Vector2( 0, 0 ), Vector2( 0, 19 ), Vector2( 0, 19 ), Vector2( 1, 12 ), Vector2( 0, 19 ), Vector2( 1, 12 ), Vector2( 0, 19 ), Vector2( 1, 12 ), Vector2( 0, 19 ), Vector2( 0, 18 ), Vector2( 1, 18 ), Vector2( 2, 18 ), Vector2( 3, 18 ), Vector2( 0, 18 ), Vector2( 1, 18 ), Vector2( 2, 18 ), Vector2( 3, 18 ), Vector2( 0, 18 ), Vector2( 1, 18 ), Vector2( 2, 18 ), Vector2( 3, 18 ), Vector2( 0, 18 ), Vector2( 1, 18 ), Vector2( 2, 18 ), Vector2( 3, 18 ), Vector2( 0, 18 ), Vector2( 1, 18 ), Vector2( 2, 18 ), Vector2( 3, 18 ), Vector2( 0, 18 ), Vector2( 1, 18 ), Vector2( 2, 18 ), Vector2( 3, 18 ), Vector2( 0, 18 ), Vector2( 1, 18 ), Vector2( 2, 18 ), Vector2( 3, 18 ), Vector2( 0, 18 ), Vector2( 1, 18 ), Vector2( 2, 18 ), Vector2( 3, 18 ), Vector2( 0, 18 ), Vector2( 1, 18 ), Vector2( 2, 18 ), Vector2( 3, 18 ), Vector2( 0, 18 ), Vector2( 1, 18 ), Vector2( 2, 18 ), Vector2( 3, 18 ), Vector2( 0, 18 ), Vector2( 1, 18 ), Vector2( 2, 18 ), Vector2( 3, 18 ), Vector2( 0, 18 ), Vector2( 0, 17 ), Vector2( 0, 0 ), Vector2( 0, 16 ), Vector2( 0, 17 ), Vector2( 1, 12 ), Vector2( 0, 12 ), Vector2( 0, 12 ), Vector2( 0, 16 ), Vector2( 0, 0 ) ] +"values": [ Vector2( 0, 0 ), Vector2( 0, 0 ), Vector2( 1, 12 ), Vector2( 0, 12 ), Vector2( 0, 0 ), Vector2( 1, 12 ), Vector2( 0, 12 ), Vector2( 0, 0 ), Vector2( 1, 12 ), Vector2( 0, 12 ), Vector2( 0, 0 ), Vector2( 1, 12 ), Vector2( 0, 12 ), Vector2( 0, 0 ), Vector2( 1, 12 ), Vector2( 0, 19 ), Vector2( 0, 19 ), Vector2( 1, 12 ), Vector2( 0, 19 ), Vector2( 1, 12 ), Vector2( 0, 19 ), Vector2( 1, 12 ), Vector2( 0, 19 ), Vector2( 0, 18 ), Vector2( 1, 18 ), Vector2( 2, 18 ), Vector2( 3, 18 ), Vector2( 0, 18 ), Vector2( 1, 18 ), Vector2( 2, 18 ), Vector2( 3, 18 ), Vector2( 0, 18 ), Vector2( 1, 18 ), Vector2( 2, 18 ), Vector2( 3, 18 ), Vector2( 0, 18 ), Vector2( 1, 18 ), Vector2( 2, 18 ), Vector2( 3, 18 ), Vector2( 0, 18 ), Vector2( 1, 18 ), Vector2( 2, 18 ), Vector2( 3, 18 ), Vector2( 0, 18 ), Vector2( 1, 18 ), Vector2( 2, 18 ), Vector2( 3, 18 ), Vector2( 0, 18 ), Vector2( 1, 18 ), Vector2( 2, 18 ), Vector2( 3, 18 ), Vector2( 0, 18 ), Vector2( 0, 17 ), Vector2( 0, 0 ), Vector2( 0, 16 ), Vector2( 0, 0 ), Vector2( 0, 17 ), Vector2( 1, 12 ), Vector2( 0, 12 ), Vector2( 1, 12 ), Vector2( 0, 12 ), Vector2( 0, 16 ), Vector2( 0, 0 ) ] } tracks/15/type = "value" tracks/15/path = NodePath("SgIdle:flip_h") @@ -426,7 +426,7 @@ tracks/15/loop_wrap = true tracks/15/imported = false tracks/15/enabled = true tracks/15/keys = { -"times": PoolRealArray( 0, 50.75, 78.45, 90.4 ), +"times": PoolRealArray( 0, 61.5, 61.6, 73 ), "transitions": PoolRealArray( 1, 1, 1, 1 ), "update": 1, "values": [ false, false, true, false ] @@ -438,7 +438,7 @@ tracks/16/loop_wrap = true tracks/16/imported = false tracks/16/enabled = true tracks/16/keys = { -"times": PoolRealArray( 81.5, 82.8 ), +"times": PoolRealArray( 64.25, 65.5 ), "transitions": PoolRealArray( 1, 1 ), "values": [ { "args": [ ], @@ -455,212 +455,11 @@ tracks/17/loop_wrap = true tracks/17/imported = false tracks/17/enabled = true tracks/17/keys = { -"times": PoolRealArray( -0.1, 78 ), +"times": PoolRealArray( -0.1, 60.5 ), "transitions": PoolRealArray( 1, 1 ), "update": 1, "values": [ false, true ] } -tracks/18/type = "value" -tracks/18/path = NodePath("Label:percent_visible") -tracks/18/interp = 1 -tracks/18/loop_wrap = true -tracks/18/imported = false -tracks/18/enabled = false -tracks/18/keys = { -"times": PoolRealArray( 0, 3, 4, 4.5, 8, 9, 9.5, 12, 13, 13.5, 17, 18, 18.5, 21, 22, 22.5, 25, 26, 26.5, 29, 30, 30.5, 33, 34, 34.5, 37 ), -"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ), -"update": 0, -"values": [ 0.0, 1.0, 1.0, 0.0, 1.0, 1.0, 0.0, 1.0, 1.0, 0.0, 1.0, 1.0, 0.0, 1.0, 1.0, 0.0, 1.0, 1.0, 0.0, 1.0, 1.0, 0.0, 1.0, 1.0, 0.0, 1.0 ] -} -tracks/19/type = "value" -tracks/19/path = NodePath("Label:visible") -tracks/19/interp = 1 -tracks/19/loop_wrap = true -tracks/19/imported = false -tracks/19/enabled = false -tracks/19/keys = { -"times": PoolRealArray( 0, 4, 4.5, 9, 9.5, 13, 13.5, 18, 18.5, 22, 22.5, 26, 26.5, 30, 30.5, 34, 34.5, 39 ), -"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ), -"update": 1, -"values": [ true, false, true, false, true, false, true, false, true, false, true, false, true, false, true, false, true, false ] -} - -[sub_resource type="Animation" id=27] -length = 0.001 -tracks/0/type = "value" -tracks/0/path = NodePath("ShardRain:emitting") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 0, -"values": [ false ] -} -tracks/1/type = "value" -tracks/1/path = NodePath("ShardParticles:emitting") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ false ] -} -tracks/2/type = "value" -tracks/2/path = NodePath("FamiVoice:playing") -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 ), -"update": 1, -"values": [ false ] -} -tracks/3/type = "value" -tracks/3/path = NodePath("FamiHuman:material:shader_param/background_color") -tracks/3/interp = 1 -tracks/3/loop_wrap = true -tracks/3/imported = false -tracks/3/enabled = true -tracks/3/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 0, -"values": [ Color( 0.396078, 1, 1, 0 ) ] -} -tracks/4/type = "value" -tracks/4/path = NodePath("FamiHuman:material:shader_param/arc_color") -tracks/4/interp = 1 -tracks/4/loop_wrap = true -tracks/4/imported = false -tracks/4/enabled = true -tracks/4/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 0, -"values": [ Color( 0.345098, 0.74902, 0.878431, 0 ) ] -} -tracks/5/type = "value" -tracks/5/path = NodePath("Label:text") -tracks/5/interp = 1 -tracks/5/loop_wrap = true -tracks/5/imported = false -tracks/5/enabled = true -tracks/5/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ "" ] -} -tracks/6/type = "value" -tracks/6/path = NodePath("FamiHuman:position") -tracks/6/interp = 1 -tracks/6/loop_wrap = true -tracks/6/imported = false -tracks/6/enabled = true -tracks/6/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 0, -"values": [ Vector2( 160, 167 ) ] -} -tracks/7/type = "value" -tracks/7/path = NodePath("SgIdle:frame_coords") -tracks/7/interp = 1 -tracks/7/loop_wrap = true -tracks/7/imported = false -tracks/7/enabled = true -tracks/7/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 0, -"values": [ Vector2( 0, 0 ) ] -} -tracks/8/type = "value" -tracks/8/path = NodePath("SgIdle:flip_h") -tracks/8/interp = 1 -tracks/8/loop_wrap = true -tracks/8/imported = false -tracks/8/enabled = true -tracks/8/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ false ] -} -tracks/9/type = "value" -tracks/9/path = NodePath("FamiHuman:animation") -tracks/9/interp = 1 -tracks/9/loop_wrap = true -tracks/9/imported = false -tracks/9/enabled = true -tracks/9/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ "idle" ] -} -tracks/10/type = "value" -tracks/10/path = NodePath("Cop:position") -tracks/10/interp = 1 -tracks/10/loop_wrap = true -tracks/10/imported = false -tracks/10/enabled = true -tracks/10/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 0, -"values": [ Vector2( -8, 169 ) ] -} - -[sub_resource type="Animation" id=28] -resource_name = "cutscene" -length = 93.0 -step = 0.25 -tracks/0/type = "value" -tracks/0/path = NodePath("Label:text") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/keys = { -"times": PoolRealArray( 0, 4.5, 9.5, 13.5, 18.5, 22.5, 26.5, 30.5, 34.5 ), -"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1, 1, 1 ), -"update": 2, -"values": [ "So you've made it this far... too bad your efforts are all in vain.", "You see, SG, -I plan to use the shards to power my spaceship, its exhaust will be so powerful, you peasants will all be vaporized. ", "Me and all of the wonderful billionaires of the world will head to planet X, the newly discovered planet beyond pluto.", "You plan to hijack my wonderful future, eh? Whaddya kids call it? A revolution?", "Ha! I already started my own revolution in 2068.", "You know what they say, the freer the market, the freer the people! Ever since then, I never felt so free!", "You're such a fool. The perfect tool for the reconstruction of the Zircon Ultima.", "While you've been on your gay little adventure collecting shards, I've been waiting for this very moment to take them all from you!", "Have at you!!!" ] -} -tracks/1/type = "value" -tracks/1/path = NodePath("Label:percent_visible") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/keys = { -"times": PoolRealArray( 0, 3, 4, 4.5, 8, 9, 9.5, 12, 13, 13.5, 17, 18, 18.5, 21, 22, 22.5, 25, 26, 26.5, 29, 30, 30.5, 33, 34, 34.5, 35.25 ), -"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ), -"update": 0, -"values": [ 0.0, 1.0, 1.0, 0.0, 1.0, 1.0, 0.0, 1.0, 1.0, 0.0, 1.0, 1.0, 0.0, 1.0, 1.0, 0.0, 1.0, 1.0, 0.0, 1.0, 1.0, 0.0, 1.0, 1.0, 0.0, 1.0 ] -} -tracks/2/type = "value" -tracks/2/path = NodePath("Label:visible") -tracks/2/interp = 1 -tracks/2/loop_wrap = true -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/keys = { -"times": PoolRealArray( 0, 4, 4.5, 9, 9.5, 13, 13.5, 18, 18.5, 22, 22.5, 26, 26.5, 30, 30.5, 34, 34.5, 37 ), -"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ), -"update": 1, -"values": [ true, false, true, false, true, false, true, false, true, false, true, false, true, false, true, false, true, false ] -} [sub_resource type="ShaderMaterial" id=8] shader = ExtResource( 12 ) @@ -730,7 +529,6 @@ theme = ExtResource( 3 ) align = 1 valign = 1 autowrap = true -percent_visible = 0.0 [node name="FamiHuman" type="AnimatedSprite" parent="."] material = ExtResource( 19 ) @@ -750,6 +548,7 @@ vframes = 20 script = ExtResource( 5 ) [node name="FamiVoice" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 11 ) [node name="AnimationPlayer" type="AnimationPlayer" parent="."] autoplay = "cutscene" @@ -757,13 +556,6 @@ playback_process_mode = 0 anims/RESET = SubResource( 16 ) anims/cutscene = SubResource( 2 ) -[node name="labelanim" type="AnimationPlayer" parent="."] -autoplay = "cutscene" -playback_process_mode = 0 -playback_speed = 0.5 -anims/RESET = SubResource( 27 ) -anims/cutscene = SubResource( 28 ) - [node name="Cop" type="AnimatedSprite" parent="."] material = SubResource( 8 ) position = Vector2( -8, 169 ) diff --git a/export_presets.cfg b/export_presets.cfg index 168510f..7a3e24a 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -5,9 +5,9 @@ platform="Windows Desktop" runnable=true custom_features="" export_filter="all_resources" -include_filter="scoreboard_host.txt" +include_filter="ngio.ini" exclude_filter="" -export_path="build/windows/Revolution 2083.exe" +export_path="build/Revolution 2083.exe" script_export_mode=1 script_encryption_key="" @@ -33,13 +33,12 @@ codesign/description="" codesign/custom_options=PoolStringArray( ) application/modify_resources=true application/icon="res://icon.ico" -application/icon_interpolation=0 -application/file_version="1.1.0.0" -application/product_version="1.1.0.0" +application/file_version="" +application/product_version="" application/company_name="Team SG" application/product_name="Revolution 2083" -application/file_description="Change the future!" -application/copyright="Team SG" +application/file_description="" +application/copyright="" application/trademarks="" [preset.1] @@ -49,7 +48,7 @@ platform="Linux/X11" runnable=true custom_features="" export_filter="all_resources" -include_filter="scoreboard_host.txt" +include_filter="ngio.ini" exclude_filter="" export_path="build/linux/Revolution 2083.x86_64" script_export_mode=1 @@ -59,8 +58,8 @@ script_encryption_key="" custom_template/debug="" custom_template/release="" -binary_format/architecture="x86_64" -binary_format/embed_pck=false +binary_format/64_bits=true +binary_format/embed_pck=true texture_format/bptc=false texture_format/s3tc=true texture_format/etc=false @@ -74,7 +73,7 @@ platform="HTML5" runnable=true custom_features="" export_filter="all_resources" -include_filter="scoreboard_host.txt" +include_filter="ngio.ini" exclude_filter="" export_path="build/html5/index.html" script_export_mode=1 @@ -104,87 +103,206 @@ progressive_web_app/background_color=Color( 0, 0, 0, 1 ) [preset.3] -name="Mac OSX" -platform="Mac OSX" +name="android" +platform="Android" runnable=true custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="build/macos/Revolution 2083.zip" +export_path="build/android/hero-mark-2.apk" script_export_mode=1 script_encryption_key="" [preset.3.options] -export/distribution_type=1 custom_template/debug="" custom_template/release="" -application/name="Revolution 2083" -application/icon="res://icon.png" -application/icon_interpolation=4 -application/identifier="club.teamsg.hero-mark-2" -application/signature="" -application/app_category="Arcade-games" -application/short_version="1.0" -application/version="1.0" -application/copyright="" -application/min_macos_version="10.12" -display/high_res=false -xcode/platform_build="14C18" -xcode/sdk_version="13.1" -xcode/sdk_build="22C55" -xcode/sdk_name="macosx13.1" -xcode/xcode_version="1420" -xcode/xcode_build="14C18" -codesign/codesign=1 -codesign/installer_identity="" -codesign/apple_team_id="" -codesign/identity="" -codesign/certificate_file="" -codesign/certificate_password="" -codesign/provisioning_profile="" -codesign/entitlements/custom_file="" -codesign/entitlements/allow_jit_code_execution=false -codesign/entitlements/allow_unsigned_executable_memory=false -codesign/entitlements/allow_dyld_environment_variables=false -codesign/entitlements/disable_library_validation=false -codesign/entitlements/audio_input=false -codesign/entitlements/camera=false -codesign/entitlements/location=false -codesign/entitlements/address_book=false -codesign/entitlements/calendars=false -codesign/entitlements/photos_library=false -codesign/entitlements/apple_events=false -codesign/entitlements/debugging=false -codesign/entitlements/app_sandbox/enabled=false -codesign/entitlements/app_sandbox/network_server=false -codesign/entitlements/app_sandbox/network_client=false -codesign/entitlements/app_sandbox/device_usb=false -codesign/entitlements/app_sandbox/device_bluetooth=false -codesign/entitlements/app_sandbox/files_downloads=0 -codesign/entitlements/app_sandbox/files_pictures=0 -codesign/entitlements/app_sandbox/files_music=0 -codesign/entitlements/app_sandbox/files_movies=0 -codesign/entitlements/app_sandbox/files_user_selected=0 -codesign/custom_options=PoolStringArray( ) -notarization/notarization=0 -notarization/apple_id_name="" -notarization/apple_id_password="" -notarization/api_uuid="" -notarization/api_key="" -notarization/api_key_id="" -privacy/microphone_usage_description="" -privacy/camera_usage_description="" -privacy/location_usage_description="" -privacy/address_book_usage_description="" -privacy/calendar_usage_description="" -privacy/photos_library_usage_description="" -privacy/desktop_folder_usage_description="" -privacy/documents_folder_usage_description="" -privacy/downloads_folder_usage_description="" -privacy/network_volumes_usage_description="" -privacy/removable_volumes_usage_description="" -texture_format/s3tc=true -texture_format/etc=false -texture_format/etc2=false +custom_build/use_custom_build=false +custom_build/export_format=0 +custom_build/min_sdk="" +custom_build/target_sdk="" +architectures/armeabi-v7a=true +architectures/arm64-v8a=true +architectures/x86=false +architectures/x86_64=false +keystore/debug="" +keystore/debug_user="" +keystore/debug_password="" +keystore/release="" +keystore/release_user="" +keystore/release_password="" +one_click_deploy/clear_previous_install=true +version/code=1 +version/name="1.0" +package/unique_name="org.godotengine.$genname" +package/name="" +package/signed=true +package/classify_as_game=true +package/retain_data_on_uninstall=false +package/exclude_from_recents=false +launcher_icons/main_192x192="" +launcher_icons/adaptive_foreground_432x432="" +launcher_icons/adaptive_background_432x432="" +graphics/opengl_debug=false +xr_features/xr_mode=0 +xr_features/hand_tracking=0 +xr_features/hand_tracking_frequency=0 +xr_features/passthrough=0 +screen/immersive_mode=true +screen/support_small=true +screen/support_normal=true +screen/support_large=true +screen/support_xlarge=true +user_data_backup/allow=false +command_line/extra_args="" +apk_expansion/enable=false +apk_expansion/SALT="" +apk_expansion/public_key="" +permissions/custom_permissions=PoolStringArray( ) +permissions/access_checkin_properties=false +permissions/access_coarse_location=false +permissions/access_fine_location=false +permissions/access_location_extra_commands=false +permissions/access_mock_location=false +permissions/access_network_state=false +permissions/access_surface_flinger=false +permissions/access_wifi_state=false +permissions/account_manager=false +permissions/add_voicemail=false +permissions/authenticate_accounts=false +permissions/battery_stats=false +permissions/bind_accessibility_service=false +permissions/bind_appwidget=false +permissions/bind_device_admin=false +permissions/bind_input_method=false +permissions/bind_nfc_service=false +permissions/bind_notification_listener_service=false +permissions/bind_print_service=false +permissions/bind_remoteviews=false +permissions/bind_text_service=false +permissions/bind_vpn_service=false +permissions/bind_wallpaper=false +permissions/bluetooth=false +permissions/bluetooth_admin=false +permissions/bluetooth_privileged=false +permissions/brick=false +permissions/broadcast_package_removed=false +permissions/broadcast_sms=false +permissions/broadcast_sticky=false +permissions/broadcast_wap_push=false +permissions/call_phone=false +permissions/call_privileged=false +permissions/camera=false +permissions/capture_audio_output=false +permissions/capture_secure_video_output=false +permissions/capture_video_output=false +permissions/change_component_enabled_state=false +permissions/change_configuration=false +permissions/change_network_state=false +permissions/change_wifi_multicast_state=false +permissions/change_wifi_state=false +permissions/clear_app_cache=false +permissions/clear_app_user_data=false +permissions/control_location_updates=false +permissions/delete_cache_files=false +permissions/delete_packages=false +permissions/device_power=false +permissions/diagnostic=false +permissions/disable_keyguard=false +permissions/dump=false +permissions/expand_status_bar=false +permissions/factory_test=false +permissions/flashlight=false +permissions/force_back=false +permissions/get_accounts=false +permissions/get_package_size=false +permissions/get_tasks=false +permissions/get_top_activity_info=false +permissions/global_search=false +permissions/hardware_test=false +permissions/inject_events=false +permissions/install_location_provider=false +permissions/install_packages=false +permissions/install_shortcut=false +permissions/internal_system_window=false +permissions/internet=false +permissions/kill_background_processes=false +permissions/location_hardware=false +permissions/manage_accounts=false +permissions/manage_app_tokens=false +permissions/manage_documents=false +permissions/manage_external_storage=false +permissions/master_clear=false +permissions/media_content_control=false +permissions/modify_audio_settings=false +permissions/modify_phone_state=false +permissions/mount_format_filesystems=false +permissions/mount_unmount_filesystems=false +permissions/nfc=false +permissions/persistent_activity=false +permissions/process_outgoing_calls=false +permissions/read_calendar=false +permissions/read_call_log=false +permissions/read_contacts=false +permissions/read_external_storage=false +permissions/read_frame_buffer=false +permissions/read_history_bookmarks=false +permissions/read_input_state=false +permissions/read_logs=false +permissions/read_phone_state=false +permissions/read_profile=false +permissions/read_sms=false +permissions/read_social_stream=false +permissions/read_sync_settings=false +permissions/read_sync_stats=false +permissions/read_user_dictionary=false +permissions/reboot=false +permissions/receive_boot_completed=false +permissions/receive_mms=false +permissions/receive_sms=false +permissions/receive_wap_push=false +permissions/record_audio=false +permissions/reorder_tasks=false +permissions/restart_packages=false +permissions/send_respond_via_message=false +permissions/send_sms=false +permissions/set_activity_watcher=false +permissions/set_alarm=false +permissions/set_always_finish=false +permissions/set_animation_scale=false +permissions/set_debug_app=false +permissions/set_orientation=false +permissions/set_pointer_speed=false +permissions/set_preferred_applications=false +permissions/set_process_limit=false +permissions/set_time=false +permissions/set_time_zone=false +permissions/set_wallpaper=false +permissions/set_wallpaper_hints=false +permissions/signal_persistent_processes=false +permissions/status_bar=false +permissions/subscribed_feeds_read=false +permissions/subscribed_feeds_write=false +permissions/system_alert_window=false +permissions/transmit_ir=false +permissions/uninstall_shortcut=false +permissions/update_device_stats=false +permissions/use_credentials=false +permissions/use_sip=false +permissions/vibrate=false +permissions/wake_lock=false +permissions/write_apn_settings=false +permissions/write_calendar=false +permissions/write_call_log=false +permissions/write_contacts=false +permissions/write_external_storage=false +permissions/write_gservices=false +permissions/write_history_bookmarks=false +permissions/write_profile=false +permissions/write_secure_settings=false +permissions/write_settings=false +permissions/write_sms=false +permissions/write_social_stream=false +permissions/write_sync_settings=false +permissions/write_user_dictionary=false diff --git a/graphics/collectibles/shard.png b/graphics/collectibles/shard.png index 4c2e263..fb1b4d3 100644 Binary files a/graphics/collectibles/shard.png and b/graphics/collectibles/shard.png differ diff --git a/graphics/decal/helper_hints/the_signs/go_right_from_here/arrow_sign.png b/graphics/decal/helper_hints/the_signs/go_right_from_here/arrow_sign.png deleted file mode 100644 index 6691630..0000000 Binary files a/graphics/decal/helper_hints/the_signs/go_right_from_here/arrow_sign.png and /dev/null differ diff --git a/graphics/decal/helper_hints/the_signs/go_right_from_here/arrow_sign.png.import b/graphics/decal/helper_hints/the_signs/go_right_from_here/arrow_sign.png.import deleted file mode 100644 index 09fd899..0000000 --- a/graphics/decal/helper_hints/the_signs/go_right_from_here/arrow_sign.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/arrow_sign.png-da6d10e9dfa32f0e569a1e5af2b395d9.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://graphics/decal/helper_hints/the_signs/go_right_from_here/arrow_sign.png" -dest_files=[ "res://.import/arrow_sign.png-da6d10e9dfa32f0e569a1e5af2b395d9.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=false -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/graphics/hud/arrow_down.png b/graphics/hud/arrow_down.png deleted file mode 100644 index b077880..0000000 Binary files a/graphics/hud/arrow_down.png and /dev/null differ diff --git a/graphics/hud/arrow_down.png.import b/graphics/hud/arrow_down.png.import deleted file mode 100644 index 147e2b1..0000000 --- a/graphics/hud/arrow_down.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/arrow_down.png-476089e36c213673a0f11adb99cc0724.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://graphics/hud/arrow_down.png" -dest_files=[ "res://.import/arrow_down.png-476089e36c213673a0f11adb99cc0724.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=false -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/graphics/hud/arrow_up.png b/graphics/hud/arrow_up.png deleted file mode 100644 index 795cca0..0000000 Binary files a/graphics/hud/arrow_up.png and /dev/null differ diff --git a/graphics/hud/arrow_up.png.import b/graphics/hud/arrow_up.png.import deleted file mode 100644 index b303c7a..0000000 --- a/graphics/hud/arrow_up.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/arrow_up.png-afb605e867089f8aedd83a8cc3ba6369.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://graphics/hud/arrow_up.png" -dest_files=[ "res://.import/arrow_up.png-afb605e867089f8aedd83a8cc3ba6369.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=false -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/graphics/hud/high_score.png b/graphics/hud/high_score.png deleted file mode 100644 index 908a3d7..0000000 Binary files a/graphics/hud/high_score.png and /dev/null differ diff --git a/graphics/hud/high_score.png.import b/graphics/hud/high_score.png.import deleted file mode 100644 index 23b4081..0000000 --- a/graphics/hud/high_score.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/high_score.png-02ca81bb7439e75fa559a1c0a399afc3.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://graphics/hud/high_score.png" -dest_files=[ "res://.import/high_score.png-02ca81bb7439e75fa559a1c0a399afc3.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=false -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/graphics/hud/hud.png b/graphics/hud/hud.png index 5b18871..91dde08 100644 Binary files a/graphics/hud/hud.png and b/graphics/hud/hud.png differ diff --git a/graphics/hud/scores/pungent.png b/graphics/hud/scores/pungent.png deleted file mode 100644 index 7754646..0000000 Binary files a/graphics/hud/scores/pungent.png and /dev/null differ diff --git a/graphics/hud/scores/pungent.png.import b/graphics/hud/scores/pungent.png.import deleted file mode 100644 index 1265a85..0000000 --- a/graphics/hud/scores/pungent.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/pungent.png-e07e66e400d4d252772a81c6867bb967.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://graphics/hud/scores/pungent.png" -dest_files=[ "res://.import/pungent.png-e07e66e400d4d252772a81c6867bb967.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=false -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/graphics/hud/scores/salty.png b/graphics/hud/scores/salty.png deleted file mode 100644 index af22ef1..0000000 Binary files a/graphics/hud/scores/salty.png and /dev/null differ diff --git a/graphics/hud/scores/salty.png.import b/graphics/hud/scores/salty.png.import deleted file mode 100644 index 06ae307..0000000 --- a/graphics/hud/scores/salty.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/salty.png-44a2905ee6e3795b4fc59059696696a8.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://graphics/hud/scores/salty.png" -dest_files=[ "res://.import/salty.png-44a2905ee6e3795b4fc59059696696a8.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=false -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/graphics/hud/scores/spicy.png b/graphics/hud/scores/spicy.png deleted file mode 100644 index ddace82..0000000 Binary files a/graphics/hud/scores/spicy.png and /dev/null differ diff --git a/graphics/hud/scores/spicy.png.import b/graphics/hud/scores/spicy.png.import deleted file mode 100644 index 2e03a1a..0000000 --- a/graphics/hud/scores/spicy.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/spicy.png-a2205eedcb443d8faf52477db79df90f.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://graphics/hud/scores/spicy.png" -dest_files=[ "res://.import/spicy.png-a2205eedcb443d8faf52477db79df90f.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=false -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/graphics/hud/scores/sweet.png b/graphics/hud/scores/sweet.png deleted file mode 100644 index 7dc896c..0000000 Binary files a/graphics/hud/scores/sweet.png and /dev/null differ diff --git a/graphics/hud/scores/sweet.png.import b/graphics/hud/scores/sweet.png.import deleted file mode 100644 index 8ed72ac..0000000 --- a/graphics/hud/scores/sweet.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/sweet.png-9fd594d4011ef7c51cf9c89d5c0132b0.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://graphics/hud/scores/sweet.png" -dest_files=[ "res://.import/sweet.png-9fd594d4011ef7c51cf9c89d5c0132b0.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=false -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/graphics/hud/speccy/break_the_glass.png b/graphics/hud/speccy/break_the_glass.png deleted file mode 100644 index 91b6e49..0000000 Binary files a/graphics/hud/speccy/break_the_glass.png and /dev/null differ diff --git a/graphics/hud/speccy/break_the_glass.png.import b/graphics/hud/speccy/break_the_glass.png.import deleted file mode 100644 index e130b48..0000000 --- a/graphics/hud/speccy/break_the_glass.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/break_the_glass.png-322e406de2ce417c6947e7c51513424a.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://graphics/hud/speccy/break_the_glass.png" -dest_files=[ "res://.import/break_the_glass.png-322e406de2ce417c6947e7c51513424a.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=false -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/graphics/hud/speccy/go_get_em.png b/graphics/hud/speccy/go_get_em.png deleted file mode 100644 index a258c9b..0000000 Binary files a/graphics/hud/speccy/go_get_em.png and /dev/null differ diff --git a/graphics/hud/speccy/go_get_em.png.import b/graphics/hud/speccy/go_get_em.png.import deleted file mode 100644 index f6a343a..0000000 --- a/graphics/hud/speccy/go_get_em.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/go_get_em.png-80076e7e728e92f49b471d7986a620fe.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://graphics/hud/speccy/go_get_em.png" -dest_files=[ "res://.import/go_get_em.png-80076e7e728e92f49b471d7986a620fe.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=false -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/graphics/hud/speccy/kill_em_all.png b/graphics/hud/speccy/kill_em_all.png deleted file mode 100644 index 2b12863..0000000 Binary files a/graphics/hud/speccy/kill_em_all.png and /dev/null differ diff --git a/graphics/hud/speccy/kill_em_all.png.import b/graphics/hud/speccy/kill_em_all.png.import deleted file mode 100644 index ecf5766..0000000 --- a/graphics/hud/speccy/kill_em_all.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/kill_em_all.png-043b29a5fc7f16177492c344511e8a3a.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://graphics/hud/speccy/kill_em_all.png" -dest_files=[ "res://.import/kill_em_all.png-043b29a5fc7f16177492c344511e8a3a.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=false -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/graphics/hud/speccy/oi_go_right.png b/graphics/hud/speccy/oi_go_right.png deleted file mode 100644 index dcde1da..0000000 Binary files a/graphics/hud/speccy/oi_go_right.png and /dev/null differ diff --git a/graphics/hud/speccy/oi_go_right.png.import b/graphics/hud/speccy/oi_go_right.png.import deleted file mode 100644 index bf4083e..0000000 --- a/graphics/hud/speccy/oi_go_right.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/oi_go_right.png-23a20f2a0d8cb4ec57588e4ae39867a8.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://graphics/hud/speccy/oi_go_right.png" -dest_files=[ "res://.import/oi_go_right.png-23a20f2a0d8cb4ec57588e4ae39867a8.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=false -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/graphics/hud/speccy/over_here.png b/graphics/hud/speccy/over_here.png deleted file mode 100644 index af337fd..0000000 Binary files a/graphics/hud/speccy/over_here.png and /dev/null differ diff --git a/graphics/hud/speccy/over_here.png.import b/graphics/hud/speccy/over_here.png.import deleted file mode 100644 index 48a4d32..0000000 --- a/graphics/hud/speccy/over_here.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/over_here.png-aea3855eafdcaa5c5f0a21f9ac1c64a0.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://graphics/hud/speccy/over_here.png" -dest_files=[ "res://.import/over_here.png-aea3855eafdcaa5c5f0a21f9ac1c64a0.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=false -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/graphics/hud/speccy/shoot_that_thing.png b/graphics/hud/speccy/shoot_that_thing.png deleted file mode 100644 index 284ea08..0000000 Binary files a/graphics/hud/speccy/shoot_that_thing.png and /dev/null differ diff --git a/graphics/hud/speccy/shoot_that_thing.png.import b/graphics/hud/speccy/shoot_that_thing.png.import deleted file mode 100644 index 5347456..0000000 --- a/graphics/hud/speccy/shoot_that_thing.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/shoot_that_thing.png-967594bf022da78bfe418a0ac5073eda.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://graphics/hud/speccy/shoot_that_thing.png" -dest_files=[ "res://.import/shoot_that_thing.png-967594bf022da78bfe418a0ac5073eda.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=false -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/graphics/hud/speccy/shoot_the_eye.png b/graphics/hud/speccy/shoot_the_eye.png deleted file mode 100644 index 712c2ce..0000000 Binary files a/graphics/hud/speccy/shoot_the_eye.png and /dev/null differ diff --git a/graphics/hud/speccy/shoot_the_eye.png.import b/graphics/hud/speccy/shoot_the_eye.png.import deleted file mode 100644 index 66c1332..0000000 --- a/graphics/hud/speccy/shoot_the_eye.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/shoot_the_eye.png-483a88ff92e95a40ee9cfc88aa6084cb.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://graphics/hud/speccy/shoot_the_eye.png" -dest_files=[ "res://.import/shoot_the_eye.png-483a88ff92e95a40ee9cfc88aa6084cb.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=false -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/graphics/hud/title_credits.png b/graphics/hud/title_credits.png index 6ebb035..89e099d 100644 Binary files a/graphics/hud/title_credits.png and b/graphics/hud/title_credits.png differ diff --git a/graphics/level_select/whirlpool.png b/graphics/level_select/whirlpool.png index 8f5db4b..272806f 100644 Binary files a/graphics/level_select/whirlpool.png and b/graphics/level_select/whirlpool.png differ diff --git a/graphics/level_select/whirlpool.xcf b/graphics/level_select/whirlpool.xcf deleted file mode 100644 index 1c875ba..0000000 Binary files a/graphics/level_select/whirlpool.xcf and /dev/null differ diff --git a/graphics/npc/speccy_talk.png b/graphics/npc/speccy_talk.png deleted file mode 100644 index c269c25..0000000 Binary files a/graphics/npc/speccy_talk.png and /dev/null differ diff --git a/graphics/npc/speccy_talk.png.import b/graphics/npc/speccy_talk.png.import deleted file mode 100644 index a62b071..0000000 --- a/graphics/npc/speccy_talk.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/speccy_talk.png-0e5075eaf8cca73ab16668de5d45d342.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://graphics/npc/speccy_talk.png" -dest_files=[ "res://.import/speccy_talk.png-0e5075eaf8cca73ab16668de5d45d342.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=false -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/graphics/particles/glass_shard.png b/graphics/particles/glass_shard.png deleted file mode 100644 index 716eda1..0000000 Binary files a/graphics/particles/glass_shard.png and /dev/null differ diff --git a/graphics/particles/glass_shard.png.import b/graphics/particles/glass_shard.png.import deleted file mode 100644 index e19b7b6..0000000 --- a/graphics/particles/glass_shard.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/glass_shard.png-9dc867929059fea83ab155e049de7ab1.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://graphics/particles/glass_shard.png" -dest_files=[ "res://.import/glass_shard.png-9dc867929059fea83ab155e049de7ab1.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=false -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/graphics/secret/uncanny.png b/graphics/secret/uncanny.png deleted file mode 100644 index dfa69b6..0000000 Binary files a/graphics/secret/uncanny.png and /dev/null differ diff --git a/graphics/secret/uncanny.png.import b/graphics/secret/uncanny.png.import deleted file mode 100644 index 54773b6..0000000 --- a/graphics/secret/uncanny.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/uncanny.png-a842bbb579fb6147c3e65cfee5536a0b.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://graphics/secret/uncanny.png" -dest_files=[ "res://.import/uncanny.png-a842bbb579fb6147c3e65cfee5536a0b.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=false -flags/mipmaps=false -flags/anisotropic=false -flags/srgb=2 -process/fix_alpha_border=true -process/premult_alpha=false -process/HDR_as_SRGB=false -process/invert_color=false -process/normal_map_invert_y=false -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/maps/boss/boss1_arena.gd b/maps/boss/boss1_arena.gd index 091ca90..deafc54 100644 --- a/maps/boss/boss1_arena.gd +++ b/maps/boss/boss1_arena.gd @@ -2,8 +2,6 @@ extends "res://maps/map.gd" const Text3D = preload("res://objects/hud/3d_text.tscn") -var speccy_can_yap: bool = true - func _ready(): Game.current_sector = Vector2.ZERO @@ -15,7 +13,6 @@ func _on_Boss1_entered_phase(phase): match phase: 2: $DelayedArrow2.start() - speccy_can_yap = false 3: $DelayedArrow3.start() 4: @@ -44,8 +41,3 @@ func _on_ExitTimer_timeout(): Game.change_map(LevelData.levels[Game.current_level].scene) else: Game.change_map(load("res://menus/level_select_scholar.tscn")) - - -func _on_SpeccyTimer_timeout() -> void: - if speccy_can_yap: - $Speccy.appear() diff --git a/maps/boss/boss1_arena.tscn b/maps/boss/boss1_arena.tscn index d346699..3527825 100644 --- a/maps/boss/boss1_arena.tscn +++ b/maps/boss/boss1_arena.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=19 format=2] +[gd_scene load_steps=18 format=2] [ext_resource path="res://objects/enemy/boss/scrump.tscn" type="PackedScene" id=1] [ext_resource path="res://objects/player/player.tscn" type="PackedScene" id=2] @@ -17,7 +17,6 @@ [ext_resource path="res://shaders/can_stain.tres" type="Material" id=15] [ext_resource path="res://objects/lore/boss/the_scrump.tscn" type="PackedScene" id=16] [ext_resource path="res://graphics/turniwood/turning_platform_wood_dark.png" type="Texture" id=17] -[ext_resource path="res://objects/npc/speccy.tscn" type="PackedScene" id=18] [node name="Map" type="Node2D" groups=["map"]] pause_mode = 1 @@ -106,17 +105,6 @@ scale = Vector2( 32, 1 ) wait_time = 5.0 one_shot = true -[node name="Speccy" parent="." instance=ExtResource( 18 )] -position = Vector2( 96, 80 ) -message = "shoot_the_eye" - -[node name="SpeccyTimer" type="Timer" parent="."] -process_mode = 0 -wait_time = 30.0 -one_shot = true -autostart = true - [connection signal="died" from="Boss1" to="." method="_on_Boss1_died"] [connection signal="entered_phase" from="Boss1" to="." method="_on_Boss1_entered_phase"] [connection signal="timeout" from="ExitTimer" to="." method="_on_ExitTimer_timeout"] -[connection signal="timeout" from="SpeccyTimer" to="." method="_on_SpeccyTimer_timeout"] diff --git a/maps/boss/boss2_arena.gd b/maps/boss/boss2_arena.gd index 959ee44..93850b3 100644 --- a/maps/boss/boss2_arena.gd +++ b/maps/boss/boss2_arena.gd @@ -2,19 +2,16 @@ extends "res://maps/map.gd" const Text3D = preload("res://objects/hud/3d_text.tscn") -var speccy_will_yell: bool = true - func _ready(): Game.current_sector = Vector2.ZERO func _on_2600_entered_phase(phase): match phase: 2: - Audio.play_sound(Audio.a_glass_crack,Audio.ac_mech_hurt) + Audio.play_sound(Audio.a_glass_break,Audio.ac_small_explosion) $DelayedArrow2.start() - speccy_will_yell = false 3: - Audio.play_sound(Audio.a_glass_break,Audio.ac_mech_hurt) + Audio.play_sound(Audio.a_glass_break,Audio.ac_small_explosion) $DelayedArrow3.start() 4: $ExitTimer.start() @@ -37,8 +34,3 @@ func _on_ExitTimer_timeout(): Game.change_map(LevelData.levels[Game.current_level].scene) else: Game.change_map(load("res://menus/level_select_scholar.tscn")) - - -func _on_SpeccyTimer_timeout() -> void: - if speccy_will_yell: - $Speccy.appear() diff --git a/maps/boss/boss2_arena.tscn b/maps/boss/boss2_arena.tscn index f127836..0584380 100644 --- a/maps/boss/boss2_arena.tscn +++ b/maps/boss/boss2_arena.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=20 format=2] +[gd_scene load_steps=19 format=2] [ext_resource path="res://tilesets/t_factory.tres" type="TileSet" id=1] [ext_resource path="res://objects/player/player.tscn" type="PackedScene" id=2] @@ -18,7 +18,6 @@ [ext_resource path="res://tilesets/t_death.tres" type="TileSet" id=16] [ext_resource path="res://objects/lore/boss/2600.tscn" type="PackedScene" id=17] [ext_resource path="res://objects/lore/boss/steel_factory.tscn" type="PackedScene" id=18] -[ext_resource path="res://objects/npc/speccy.tscn" type="PackedScene" id=19] [node name="Map" type="Node2D" groups=["map"]] pause_mode = 1 @@ -144,17 +143,5 @@ margin_top = 59.0 margin_right = 152.0 margin_bottom = 67.0 -[node name="Speccy" parent="." instance=ExtResource( 19 )] -position = Vector2( 152, 176 ) -flip = true -message = "break_the_glass" - -[node name="SpeccyTimer" type="Timer" parent="."] -process_mode = 0 -wait_time = 45.0 -one_shot = true -autostart = true - [connection signal="entered_phase" from="2600" to="." method="_on_2600_entered_phase"] [connection signal="timeout" from="ExitTimer" to="." method="_on_ExitTimer_timeout"] -[connection signal="timeout" from="SpeccyTimer" to="." method="_on_SpeccyTimer_timeout"] diff --git a/maps/boss/boss3_arena.gd b/maps/boss/boss3_arena.gd index 2c36a93..38192bf 100644 --- a/maps/boss/boss3_arena.gd +++ b/maps/boss/boss3_arena.gd @@ -66,7 +66,6 @@ func _on_2083_energy_changed(amount,laser_energy) -> void: func _on_Famira_died() -> void: sg2083.state = sg2083.State.INACTIVE - SpeedrunTimer.timer_running = false Game.can_pause = false var tween = create_tween() tween.set_trans(Tween.TRANS_CUBIC) diff --git a/maps/cave.tscn b/maps/cave.tscn index 66b0830..e4741ef 100644 --- a/maps/cave.tscn +++ b/maps/cave.tscn @@ -62,11 +62,10 @@ tile_set = ExtResource( 2 ) cell_size = Vector2( 8, 8 ) collision_layer = 9 format = 1 -tile_data = PoolIntArray( 65571, 0, 0, 131107, 0, 0, 131155, 0, 65537, 131156, 0, 65537, 196643, 0, 0, 196697, 0, 262145, 262153, 0, 65537, 262154, 0, 65537, 262155, 0, 65537, 262156, 0, 131073, 262159, 0, 65537, 262160, 0, 65537, 262161, 0, 65537, 262162, 0, 65537, 262163, 0, 65537, 262164, 0, 65537, 262165, 0, 65537, 262179, 0, 65537, 262180, 0, 65537, 262181, 0, 65537, 262182, 0, 65537, 262216, 0, 65537, 262217, 0, 65537, 262218, 0, 65537, 262229, 0, 65537, 262230, 0, 65537, 262231, 0, 65537, 262232, 0, 65537, 262233, 0, 65537, 262234, 0, 65537, 327685, 0, 65537, 327686, 0, 65537, 327687, 0, 65537, 327692, 0, 0, 327727, 0, 65537, 327728, 0, 65537, 327729, 0, 65537, 327734, 0, 262144, 327738, 0, 262145, 327748, 0, 262145, 327771, 0, 65537, 327772, 0, 65537, 327773, 0, 65537, 393228, 0, 0, 393240, 0, 262145, 393258, 0, 65537, 393259, 0, 65537, 393260, 0, 65537, 393269, 0, 65537, 393270, 0, 65537, 393271, 0, 65537, 393272, 0, 65537, 393273, 0, 65537, 393274, 0, 65537, 393275, 0, 65537, 393276, 0, 65537, 393277, 0, 65537, 393279, 0, 131072, 393280, 0, 65537, 393281, 0, 65537, 393282, 0, 65537, 393283, 0, 65537, 393284, 0, 65537, 393285, 0, 65537, 393292, 0, 65537, 458763, 0, 65537, 458764, 0, 65537, 458774, 0, 65537, 458775, 0, 65537, 458776, 0, 65537, 458777, 0, 65537, 458778, 0, 65537, 458779, 0, 65537, 458785, 0, 262145, 458815, 0, 0, 524318, 0, 65537, 524319, 0, 65537, 524320, 0, 65537, 524321, 0, 65537, 524322, 0, 65537, 524323, 0, 65537, 524351, 0, 0, 655365, 0, 262145, 786431, 0, 65537, 720896, 0, 65537, 720897, 0, 65537, 720898, 0, 65537, 720899, 0, 65537, 720900, 0, 65537, 720901, 0, 65537, 720902, 0, 65537, 720903, 0, 65537, 720904, 0, 65537, 720905, 0, 65537, 720919, 0, 0, 720931, 0, 262145, 720954, 0, 262144, 720972, 0, 262145, 720982, 0, 262145, 786448, 0, 262144, 786452, 0, 262145, 786455, 0, 65537, 786456, 0, 65537, 786457, 0, 65537, 786458, 0, 131073, 786462, 0, 65537, 786463, 0, 65537, 786464, 0, 65537, 786465, 0, 65537, 786466, 0, 65537, 786467, 0, 65537, 786468, 0, 65537, 786469, 0, 65537, 786477, 0, 65537, 786478, 0, 65537, 786479, 0, 65537, 786480, 0, 65537, 786481, 0, 65537, 786485, 0, 65537, 786486, 0, 65537, 786487, 0, 65537, 786488, 0, 65537, 786489, 0, 65537, 786490, 0, 65537, 786491, 0, 65537, 786494, 0, 131072, 786495, 0, 0, 786496, 0, 65537, 786497, 0, 65537, 786498, 0, 65537, 786499, 0, 65537, 786500, 0, 65537, 786501, 0, 65537, 786502, 0, 65537, 786503, 0, 65537, 786504, 0, 65537, 786505, 0, 65537, 786506, 0, 65537, 786507, 0, 65537, 786508, 0, 65537, 786509, 0, 65537, 786510, 0, 65537, 786511, 0, 65537, 786512, 0, 65537, 786513, 0, 65537, 786514, 0, 65537, 786515, 0, 65537, 786516, 0, 65537, 786517, 0, 65537, 786518, 0, 65537, 786519, 0, 65537, 786520, 0, 65537, 786521, 0, 131073, 786525, 0, 65537, 786526, 0, 65537, 786527, 0, 65537, 786528, 0, 65537, 851984, 0, 65537, 851985, 0, 65537, 851986, 0, 65537, 851987, 0, 65537, 851988, 0, 65537, 851989, 0, 65537, 851994, 0, 0, 852030, 0, 0, 852031, 0, 0, 852057, 0, 0, 917509, 0, 262144, 917530, 0, 0, 917566, 0, 0, 917567, 0, 0, 917593, 0, 0, 1048575, 0, 65537, 983040, 0, 65537, 983043, 0, 131072, 983044, 0, 65537, 983045, 0, 65537, 983046, 0, 65537, 983047, 0, 65537, 983048, 0, 65537, 983049, 0, 65537, 983050, 0, 65537, 983051, 0, 65537, 983066, 0, 0, 983084, 0, 262145, 983102, 0, 0, 983103, 0, 0, 983113, 0, 262144, 983129, 0, 0, 1048579, 0, 0, 1048592, 0, 65537, 1048593, 0, 65537, 1048594, 0, 65537, 1048595, 0, 65537, 1048596, 0, 65537, 1048597, 0, 65537, 1048598, 0, 65537, 1048599, 0, 65537, 1048600, 0, 65537, 1048601, 0, 65537, 1048602, 0, 65537, 1048607, 0, 131072, 1048608, 0, 0, 1048609, 0, 0, 1048610, 0, 0, 1048611, 0, 0, 1048612, 0, 0, 1048613, 0, 131073, 1048617, 0, 131072, 1048618, 0, 0, 1048619, 0, 0, 1048620, 0, 0, 1048621, 0, 0, 1048622, 0, 0, 1048623, 0, 0, 1048624, 0, 0, 1048625, 0, 0, 1048626, 0, 0, 1048627, 0, 0, 1048628, 0, 0, 1048629, 0, 0, 1048630, 0, 0, 1048631, 0, 131073, 1048638, 0, 0, 1048639, 0, 0, 1048648, 0, 65537, 1048649, 0, 65537, 1048650, 0, 65537, 1048651, 0, 65537, 1048665, 0, 65537, 1048666, 0, 65537, 1048667, 0, 65537, 1048668, 0, 65537, 1048669, 0, 65537, 1048670, 0, 65537, 1048671, 0, 65537, 1048672, 0, 65537, 1114115, 0, 0, 1114143, 0, 0, 1114144, 0, 0, 1114145, 0, 0, 1114146, 0, 0, 1114147, 0, 0, 1114148, 0, 0, 1114149, 0, 0, 1114153, 0, 0, 1114154, 0, 0, 1114155, 0, 0, 1114156, 0, 0, 1114157, 0, 0, 1114158, 0, 0, 1114159, 0, 65537, 1114160, 0, 65537, 1114161, 0, 0, 1114162, 0, 0, 1114163, 0, 0, 1114164, 0, 65537, 1114165, 0, 65537, 1114166, 0, 0, 1114167, 0, 0, 1114168, 0, 131073, 1114174, 0, 0, 1114175, 0, 0, 1114190, 0, 65537, 1114191, 0, 65537, 1114192, 0, 65537, 1114197, 0, 65537, 1114198, 0, 131073, 1179649, 0, 65537, 1179650, 0, 65537, 1179651, 0, 65537, 1179678, 0, 131072, 1179679, 0, 0, 1179680, 0, 0, 1179681, 0, 0, 1179682, 0, 0, 1179683, 0, 0, 1179684, 0, 0, 1179685, 0, 0, 1179689, 0, 0, 1179690, 0, 0, 1179691, 0, 0, 1179692, 0, 0, 1179693, 0, 0, 1179694, 0, 0, 1179697, 0, 0, 1179698, 0, 0, 1179699, 0, 0, 1179702, 0, 0, 1179703, 0, 0, 1179704, 0, 0, 1179710, 0, 0, 1179711, 0, 0, 1179734, 0, 0, 1179741, 0, 262145, 1245192, 0, 65537, 1245193, 0, 65537, 1245194, 0, 65537, 1245195, 0, 65537, 1245213, 0, 131072, 1245214, 0, 0, 1245215, 0, 0, 1245216, 0, 0, 1245217, 0, 0, 1245218, 0, 0, 1245219, 0, 0, 1245220, 0, 0, 1245221, 0, 0, 1245225, 0, 65537, 1245226, 0, 65537, 1245227, 0, 65537, 1245228, 0, 65537, 1245229, 0, 65537, 1245230, 0, 65537, 1245233, 0, 65537, 1245234, 0, 65537, 1245235, 0, 65537, 1245238, 0, 0, 1245239, 0, 0, 1245240, 0, 0, 1245270, 0, 65537, 1245271, 0, 65537, 1245272, 0, 65537, 1245273, 0, 65537, 1245274, 0, 65537, 1245275, 0, 65537, 1245276, 0, 65537, 1245277, 0, 65537, 1245278, 0, 65537, 1245279, 0, 65537, 1245280, 0, 65537, 1310749, 0, 0, 1310750, 0, 0, 1310751, 0, 0, 1310752, 0, 0, 1310753, 0, 0, 1310754, 0, 0, 1310755, 0, 0, 1310756, 0, 0, 1310757, 0, 0, 1310774, 0, 0, 1310775, 0, 0, 1310776, 0, 0, 1376268, 0, 262144, 1376274, 0, 262144, 1376284, 0, 262144, 1376285, 0, 0, 1376286, 0, 0, 1376287, 0, 0, 1376288, 0, 0, 1376289, 0, 0, 1376290, 0, 0, 1376291, 0, 0, 1376292, 0, 0, 1376293, 0, 0, 1376299, 0, 262144, 1376303, 0, 262145, 1376310, 0, 0, 1376311, 0, 0, 1376312, 0, 0, 1376325, 0, 262144, 1376332, 0, 262145, 1376340, 0, 262144, 1376345, 0, 262145, 1507327, 0, 0, 1441792, 0, 0, 1441793, 0, 0, 1441794, 0, 0, 1441795, 0, 0, 1441796, 0, 0, 1441797, 0, 0, 1441798, 0, 0, 1441799, 0, 0, 1441800, 0, 0, 1441801, 0, 0, 1441802, 0, 0, 1441803, 0, 0, 1441804, 0, 0, 1441805, 0, 0, 1441806, 0, 0, 1441807, 0, 0, 1441808, 0, 0, 1441809, 0, 0, 1441810, 0, 0, 1441811, 0, 0, 1441812, 0, 0, 1441813, 0, 0, 1441814, 0, 0, 1441815, 0, 0, 1441816, 0, 0, 1441817, 0, 0, 1441818, 0, 0, 1441819, 0, 0, 1441820, 0, 0, 1441821, 0, 0, 1441822, 0, 0, 1441823, 0, 0, 1441824, 0, 0, 1441825, 0, 0, 1441826, 0, 0, 1441827, 0, 0, 1441828, 0, 0, 1441829, 0, 0, 1441830, 0, 0, 1441831, 0, 0, 1441832, 0, 0, 1441833, 0, 0, 1441834, 0, 0, 1441835, 0, 0, 1441836, 0, 0, 1441837, 0, 0, 1441838, 0, 0, 1441839, 0, 0, 1441840, 0, 0, 1441841, 0, 0, 1441842, 0, 0, 1441843, 0, 0, 1441844, 0, 0, 1441845, 0, 0, 1441846, 0, 0, 1441847, 0, 0, 1441848, 0, 0, 1441849, 0, 0, 1441850, 0, 0, 1441851, 0, 0, 1441852, 0, 0, 1441853, 0, 0, 1441854, 0, 0, 1441855, 0, 0, 1441856, 0, 0, 1441857, 0, 0, 1441858, 0, 0, 1441859, 0, 0, 1441860, 0, 0, 1441861, 0, 0, 1441862, 0, 0, 1441863, 0, 0, 1441864, 0, 0, 1441865, 0, 0, 1441866, 0, 0, 1441867, 0, 0, 1441868, 0, 0, 1441869, 0, 0, 1441870, 0, 0, 1441871, 0, 0, 1441872, 0, 0, 1441873, 0, 0, 1441874, 0, 0, 1441875, 0, 0, 1441876, 0, 0, 1441877, 0, 0, 1441878, 0, 0, 1441879, 0, 0, 1441880, 0, 0, 1441881, 0, 0, 1441882, 0, 0, 1441883, 0, 0, 1441884, 0, 0, 1441885, 0, 0, 1441886, 0, 0, 1441887, 0, 0, 1441888, 0, 0, 1572863, 0, 0, 1507328, 0, 0, 1507329, 0, 0, 1507330, 0, 0, 1507331, 0, 0, 1507332, 0, 0, 1507333, 0, 0, 1507334, 0, 0, 1507335, 0, 0, 1507336, 0, 0, 1507337, 0, 0, 1507338, 0, 0, 1507339, 0, 0, 1507340, 0, 0, 1507341, 0, 0, 1507342, 0, 0, 1507343, 0, 0, 1507344, 0, 0, 1507345, 0, 0, 1507346, 0, 0, 1507347, 0, 0, 1507348, 0, 0, 1507349, 0, 0, 1507350, 0, 0, 1507351, 0, 0, 1507352, 0, 0, 1507353, 0, 0, 1507354, 0, 0, 1507355, 0, 0, 1507356, 0, 0, 1507357, 0, 0, 1507358, 0, 0, 1507359, 0, 0, 1507360, 0, 0, 1507361, 0, 0, 1507362, 0, 0, 1507363, 0, 0, 1507364, 0, 0, 1507365, 0, 0, 1507366, 0, 0, 1507367, 0, 0, 1507368, 0, 0, 1507369, 0, 0, 1507370, 0, 0, 1507371, 0, 0, 1507372, 0, 0, 1507373, 0, 0, 1507374, 0, 0, 1507375, 0, 0, 1507376, 0, 0, 1507377, 0, 0, 1507378, 0, 0, 1507379, 0, 0, 1507380, 0, 0, 1507381, 0, 0, 1507382, 0, 0, 1507383, 0, 0, 1507384, 0, 0, 1507385, 0, 0, 1507386, 0, 0, 1507387, 0, 0, 1507388, 0, 0, 1507389, 0, 0, 1507390, 0, 0, 1507391, 0, 0, 1507392, 0, 0, 1507393, 0, 0, 1507394, 0, 0, 1507395, 0, 0, 1507396, 0, 0, 1507397, 0, 0, 1507398, 0, 0, 1507399, 0, 0, 1507400, 0, 0, 1507401, 0, 0, 1507402, 0, 0, 1507403, 0, 0, 1507404, 0, 0, 1507405, 0, 0, 1507406, 0, 0, 1507407, 0, 0, 1507408, 0, 0, 1507409, 0, 0, 1507410, 0, 0, 1507411, 0, 0, 1507412, 0, 0, 1507413, 0, 0, 1507414, 0, 0, 1507415, 0, 0, 1507416, 0, 0, 1507417, 0, 0, 1507418, 0, 0, 1507419, 0, 0, 1507420, 0, 0, 1507421, 0, 0, 1507422, 0, 0, 1507423, 0, 0, 1507424, 0, 0, 1638399, 0, 0, 1572864, 0, 0, 1572865, 0, 0, 1572866, 0, 0, 1572867, 0, 0, 1572868, 0, 0, 1572869, 0, 0, 1572870, 0, 0, 1572871, 0, 0, 1572872, 0, 0, 1572873, 0, 0, 1572874, 0, 0, 1572875, 0, 0, 1572876, 0, 0, 1572877, 0, 0, 1572878, 0, 0, 1572879, 0, 0, 1572880, 0, 0, 1572881, 0, 0, 1572882, 0, 0, 1572883, 0, 0, 1572884, 0, 0, 1572885, 0, 0, 1572886, 0, 0, 1572887, 0, 0, 1572888, 0, 0, 1572889, 0, 0, 1572890, 0, 0, 1572891, 0, 0, 1572892, 0, 0, 1572893, 0, 0, 1572894, 0, 0, 1572895, 0, 0, 1572896, 0, 0, 1572897, 0, 0, 1572898, 0, 0, 1572899, 0, 0, 1572900, 0, 0, 1572901, 0, 0, 1572902, 0, 0, 1572903, 0, 0, 1572904, 0, 0, 1572905, 0, 0, 1572906, 0, 0, 1572907, 0, 0, 1572908, 0, 0, 1572909, 0, 0, 1572910, 0, 0, 1572911, 0, 0, 1572912, 0, 0, 1572913, 0, 0, 1572914, 0, 0, 1572915, 0, 0, 1572916, 0, 0, 1572917, 0, 0, 1572918, 0, 0, 1572919, 0, 0, 1572920, 0, 0, 1572921, 0, 0, 1572922, 0, 0, 1572923, 0, 0, 1572924, 0, 0, 1572925, 0, 0, 1572926, 0, 0, 1572927, 0, 0, 1572928, 0, 0, 1572929, 0, 0, 1572930, 0, 0, 1572931, 0, 0, 1572932, 0, 0, 1572933, 0, 0, 1572934, 0, 0, 1572935, 0, 0, 1572936, 0, 0, 1572937, 0, 0, 1572938, 0, 0, 1572939, 0, 0, 1572940, 0, 0, 1572941, 0, 0, 1572942, 0, 0, 1572943, 0, 0, 1572944, 0, 0, 1572945, 0, 0, 1572946, 0, 0, 1572947, 0, 0, 1572948, 0, 0, 1572949, 0, 0, 1572950, 0, 0, 1572951, 0, 0, 1572952, 0, 0, 1572953, 0, 0, 1572954, 0, 0, 1572955, 0, 0, 1572956, 0, 0, 1572957, 0, 0, 1572958, 0, 0, 1572959, 0, 0, 1572960, 0, 0 ) +tile_data = PoolIntArray( 65571, 1, 0, 131107, 1, 65536, 131155, 2, 1, 131156, 2, 3, 196643, 1, 65536, 196697, 0, 262145, 262153, 2, 1, 262154, 2, 2, 262155, 2, 2, 262156, 1, 3, 262159, 2, 1, 262160, 2, 2, 262161, 2, 2, 262162, 2, 2, 262163, 2, 2, 262164, 2, 2, 262165, 2, 3, 262179, 2, 1, 262180, 2, 2, 262181, 2, 2, 262182, 2, 3, 262216, 2, 1, 262217, 2, 2, 262218, 2, 3, 262229, 2, 1, 262230, 2, 2, 262231, 2, 2, 262232, 2, 2, 262233, 2, 2, 262234, 2, 3, 327685, 2, 1, 327686, 2, 2, 327687, 2, 3, 327692, 1, 65536, 327727, 2, 1, 327728, 2, 2, 327729, 2, 3, 327734, 0, 262144, 327738, 0, 262145, 327748, 0, 262145, 327771, 2, 1, 327772, 2, 2, 327773, 2, 3, 393228, 1, 65536, 393240, 0, 262145, 393258, 2, 1, 393259, 2, 2, 393260, 2, 3, 393269, 2, 1, 393270, 2, 2, 393271, 2, 2, 393272, 2, 2, 393273, 2, 2, 393274, 2, 2, 393275, 2, 2, 393276, 2, 2, 393277, 2, 3, 393279, 1, 1, 393280, 2, 2, 393281, 2, 2, 393282, 2, 2, 393283, 2, 2, 393284, 2, 2, 393285, 2, 3, 393292, 2, 0, 458763, 2, 1, 458764, 2, 3, 458774, 2, 1, 458775, 2, 2, 458776, 2, 2, 458777, 2, 2, 458778, 2, 2, 458779, 2, 3, 458785, 0, 262145, 458815, 1, 65536, 524318, 2, 1, 524319, 2, 2, 524320, 2, 2, 524321, 2, 2, 524322, 2, 2, 524323, 2, 3, 524351, 1, 131072, 655365, 0, 262145, 786431, 2, 1, 720896, 2, 2, 720897, 2, 2, 720898, 2, 2, 720899, 2, 2, 720900, 2, 2, 720901, 2, 2, 720902, 2, 2, 720903, 2, 2, 720904, 2, 2, 720905, 2, 3, 720919, 1, 0, 720931, 0, 262145, 720954, 0, 262144, 720972, 0, 262145, 720982, 0, 262145, 786448, 0, 262144, 786452, 0, 262145, 786455, 2, 1, 786456, 2, 2, 786457, 2, 2, 786458, 1, 3, 786462, 0, 65537, 786463, 0, 65537, 786464, 2, 1, 786465, 2, 2, 786466, 2, 2, 786467, 2, 2, 786468, 2, 2, 786469, 2, 3, 786477, 2, 1, 786478, 2, 2, 786479, 2, 2, 786480, 2, 2, 786481, 2, 3, 786485, 2, 1, 786486, 2, 2, 786487, 2, 2, 786488, 2, 2, 786489, 2, 2, 786490, 2, 2, 786491, 2, 3, 786494, 1, 1, 786495, 1, 2, 786496, 2, 2, 786497, 2, 2, 786498, 2, 2, 786499, 2, 2, 786500, 2, 2, 786501, 2, 2, 786502, 2, 2, 786503, 2, 2, 786504, 2, 2, 786505, 2, 2, 786506, 2, 2, 786507, 2, 2, 786508, 2, 2, 786509, 2, 2, 786510, 2, 2, 786511, 2, 2, 786512, 2, 2, 786513, 2, 2, 786514, 2, 2, 786515, 2, 2, 786516, 2, 2, 786517, 2, 2, 786518, 2, 2, 786519, 2, 2, 786520, 2, 2, 786521, 1, 3, 786525, 2, 1, 786526, 2, 2, 786527, 2, 2, 786528, 2, 3, 851984, 2, 1, 851985, 2, 2, 851986, 2, 2, 851987, 2, 2, 851988, 2, 2, 851989, 2, 3, 851994, 1, 65536, 852030, 1, 65537, 852031, 1, 65539, 852057, 1, 65536, 917509, 0, 262144, 917530, 1, 65536, 917566, 1, 65537, 917567, 1, 65539, 917593, 1, 65536, 1048575, 2, 1, 983040, 2, 3, 983043, 1, 1, 983044, 2, 2, 983045, 2, 2, 983046, 2, 2, 983047, 2, 2, 983048, 2, 2, 983049, 2, 2, 983050, 2, 2, 983051, 2, 3, 983066, 1, 65536, 983084, 0, 262145, 983102, 1, 65537, 983103, 1, 65539, 983113, 0, 262144, 983129, 1, 65536, 1048579, 1, 65536, 1048592, 2, 1, 1048593, 2, 2, 1048594, 2, 2, 1048595, 2, 2, 1048596, 2, 2, 1048597, 2, 2, 1048598, 2, 2, 1048599, 2, 2, 1048600, 2, 2, 1048601, 2, 2, 1048602, 2, 3, 1048607, 1, 1, 1048608, 1, 2, 1048609, 1, 2, 1048610, 1, 2, 1048611, 1, 2, 1048612, 1, 2, 1048613, 1, 3, 1048617, 1, 1, 1048618, 1, 2, 1048619, 1, 2, 1048620, 1, 2, 1048621, 1, 2, 1048622, 1, 2, 1048623, 1, 2, 1048624, 1, 2, 1048625, 1, 2, 1048626, 1, 2, 1048627, 1, 2, 1048628, 1, 2, 1048629, 1, 2, 1048630, 1, 2, 1048631, 1, 3, 1048638, 1, 65537, 1048639, 1, 65539, 1048648, 2, 1, 1048649, 2, 2, 1048650, 2, 2, 1048651, 2, 3, 1048665, 2, 1, 1048666, 2, 2, 1048667, 2, 2, 1048668, 2, 2, 1048669, 2, 2, 1048670, 2, 2, 1048671, 2, 2, 1048672, 2, 3, 1114115, 1, 65536, 1114143, 1, 65537, 1114144, 1, 65538, 1114145, 1, 65538, 1114146, 1, 65538, 1114147, 1, 65538, 1114148, 1, 65538, 1114149, 1, 65539, 1114153, 1, 65537, 1114154, 1, 65538, 1114155, 1, 65538, 1114156, 1, 65538, 1114157, 1, 65538, 1114158, 1, 65539, 1114159, 2, 2, 1114160, 2, 2, 1114161, 1, 65537, 1114162, 1, 65538, 1114163, 1, 65539, 1114164, 2, 2, 1114165, 2, 2, 1114166, 1, 65537, 1114167, 1, 65538, 1114168, 1, 3, 1114174, 1, 65537, 1114175, 1, 65539, 1114190, 2, 1, 1114191, 2, 2, 1114192, 2, 3, 1114197, 2, 1, 1114198, 1, 3, 1179649, 2, 1, 1179650, 2, 2, 1179651, 2, 3, 1179678, 1, 1, 1179679, 1, 65538, 1179680, 1, 65538, 1179681, 1, 65538, 1179682, 1, 65538, 1179683, 1, 65538, 1179684, 1, 65538, 1179685, 1, 65539, 1179689, 1, 65537, 1179690, 1, 65538, 1179691, 1, 65538, 1179692, 1, 65538, 1179693, 1, 65538, 1179694, 1, 65539, 1179697, 1, 65537, 1179698, 1, 65538, 1179699, 1, 65539, 1179702, 1, 65537, 1179703, 1, 65538, 1179704, 1, 65539, 1179710, 1, 131073, 1179711, 1, 131075, 1179734, 1, 65536, 1179741, 0, 262145, 1245192, 2, 1, 1245193, 2, 2, 1245194, 2, 2, 1245195, 2, 3, 1245213, 1, 1, 1245214, 1, 65538, 1245215, 1, 65538, 1245216, 1, 65538, 1245217, 1, 65538, 1245218, 1, 65538, 1245219, 1, 65538, 1245220, 1, 65538, 1245221, 1, 65539, 1245225, 2, 1, 1245226, 2, 2, 1245227, 2, 2, 1245228, 2, 2, 1245229, 2, 2, 1245230, 2, 3, 1245233, 2, 1, 1245234, 2, 2, 1245235, 2, 3, 1245238, 1, 65537, 1245239, 1, 65538, 1245240, 1, 65539, 1245270, 2, 1, 1245271, 2, 2, 1245272, 2, 2, 1245273, 2, 2, 1245274, 2, 2, 1245275, 2, 2, 1245276, 2, 2, 1245277, 2, 2, 1245278, 2, 2, 1245279, 2, 2, 1245280, 2, 3, 1310749, 1, 65537, 1310750, 1, 65538, 1310751, 1, 65538, 1310752, 1, 65538, 1310753, 1, 65538, 1310754, 1, 65538, 1310755, 1, 65538, 1310756, 1, 65538, 1310757, 1, 65539, 1310774, 1, 65537, 1310775, 1, 65538, 1310776, 1, 65539, 1376268, 0, 262144, 1376274, 0, 262144, 1376284, 0, 262144, 1376285, 1, 65537, 1376286, 1, 65538, 1376287, 1, 65538, 1376288, 1, 65538, 1376289, 1, 65538, 1376290, 1, 65538, 1376291, 1, 65538, 1376292, 1, 65538, 1376293, 1, 65539, 1376299, 0, 262144, 1376303, 0, 262145, 1376310, 1, 65537, 1376311, 1, 65538, 1376312, 1, 65539, 1376325, 0, 262144, 1376332, 0, 262145, 1376340, 0, 262144, 1376345, 0, 262145, 1507327, 1, 1, 1441792, 1, 2, 1441793, 1, 2, 1441794, 1, 2, 1441795, 1, 2, 1441796, 1, 2, 1441797, 1, 2, 1441798, 1, 2, 1441799, 1, 2, 1441800, 1, 2, 1441801, 1, 2, 1441802, 1, 2, 1441803, 1, 2, 1441804, 1, 2, 1441805, 1, 2, 1441806, 1, 2, 1441807, 1, 2, 1441808, 1, 2, 1441809, 1, 2, 1441810, 1, 2, 1441811, 1, 2, 1441812, 1, 2, 1441813, 1, 2, 1441814, 1, 2, 1441815, 1, 2, 1441816, 1, 2, 1441817, 1, 2, 1441818, 1, 2, 1441819, 1, 2, 1441820, 1, 2, 1441821, 1, 65538, 1441822, 1, 65538, 1441823, 1, 65538, 1441824, 1, 65538, 1441825, 1, 65538, 1441826, 1, 65538, 1441827, 1, 65538, 1441828, 1, 65538, 1441829, 1, 65538, 1441830, 1, 2, 1441831, 1, 2, 1441832, 1, 2, 1441833, 1, 2, 1441834, 1, 2, 1441835, 1, 2, 1441836, 1, 2, 1441837, 1, 2, 1441838, 1, 2, 1441839, 1, 2, 1441840, 1, 2, 1441841, 1, 2, 1441842, 1, 2, 1441843, 1, 2, 1441844, 1, 2, 1441845, 1, 2, 1441846, 1, 65538, 1441847, 1, 65538, 1441848, 1, 65538, 1441849, 1, 2, 1441850, 1, 2, 1441851, 1, 2, 1441852, 1, 2, 1441853, 1, 2, 1441854, 1, 2, 1441855, 1, 2, 1441856, 1, 2, 1441857, 1, 2, 1441858, 1, 2, 1441859, 1, 2, 1441860, 1, 2, 1441861, 1, 65538, 1441862, 1, 2, 1441863, 1, 2, 1441864, 1, 2, 1441865, 1, 2, 1441866, 1, 2, 1441867, 1, 2, 1441868, 1, 65538, 1441869, 1, 2, 1441870, 1, 2, 1441871, 1, 2, 1441872, 1, 2, 1441873, 1, 2, 1441874, 1, 2, 1441875, 1, 2, 1441876, 1, 65538, 1441877, 1, 2, 1441878, 1, 2, 1441879, 1, 2, 1441880, 1, 2, 1441881, 1, 65538, 1441882, 1, 2, 1441883, 1, 2, 1441884, 1, 2, 1441885, 1, 2, 1441886, 1, 2, 1441887, 1, 2, 1441888, 1, 3, 1572863, 1, 65537, 1507328, 1, 65538, 1507329, 1, 65538, 1507330, 1, 65538, 1507331, 1, 65538, 1507332, 1, 65538, 1507333, 1, 65538, 1507334, 1, 65538, 1507335, 1, 65538, 1507336, 1, 65538, 1507337, 1, 65538, 1507338, 1, 65538, 1507339, 1, 65538, 1507340, 1, 65538, 1507341, 1, 65538, 1507342, 1, 65538, 1507343, 1, 65538, 1507344, 1, 65538, 1507345, 1, 65538, 1507346, 1, 65538, 1507347, 1, 65538, 1507348, 1, 65538, 1507349, 1, 65538, 1507350, 1, 65538, 1507351, 1, 65538, 1507352, 1, 65538, 1507353, 1, 65538, 1507354, 1, 65538, 1507355, 1, 65538, 1507356, 1, 65538, 1507357, 1, 65538, 1507358, 1, 65538, 1507359, 1, 65538, 1507360, 1, 65538, 1507361, 1, 65538, 1507362, 1, 65538, 1507363, 1, 65538, 1507364, 1, 65538, 1507365, 1, 65538, 1507366, 1, 65538, 1507367, 1, 65538, 1507368, 1, 65538, 1507369, 1, 65538, 1507370, 1, 65538, 1507371, 1, 65538, 1507372, 1, 65538, 1507373, 1, 65538, 1507374, 1, 65538, 1507375, 1, 65538, 1507376, 1, 65538, 1507377, 1, 65538, 1507378, 1, 65538, 1507379, 1, 65538, 1507380, 1, 65538, 1507381, 1, 65538, 1507382, 1, 65538, 1507383, 1, 65538, 1507384, 1, 65538, 1507385, 1, 65538, 1507386, 1, 65538, 1507387, 1, 65538, 1507388, 1, 65538, 1507389, 1, 65538, 1507390, 1, 65538, 1507391, 1, 65538, 1507392, 1, 65538, 1507393, 1, 65538, 1507394, 1, 65538, 1507395, 1, 65538, 1507396, 1, 65538, 1507397, 1, 65538, 1507398, 1, 65538, 1507399, 1, 65538, 1507400, 1, 65538, 1507401, 1, 65538, 1507402, 1, 65538, 1507403, 1, 65538, 1507404, 1, 65538, 1507405, 1, 65538, 1507406, 1, 65538, 1507407, 1, 65538, 1507408, 1, 65538, 1507409, 1, 65538, 1507410, 1, 65538, 1507411, 1, 65538, 1507412, 1, 65538, 1507413, 1, 65538, 1507414, 1, 65538, 1507415, 1, 65538, 1507416, 1, 65538, 1507417, 1, 65538, 1507418, 1, 65538, 1507419, 1, 65538, 1507420, 1, 65538, 1507421, 1, 65538, 1507422, 1, 65538, 1507423, 1, 65538, 1507424, 1, 65539, 1638399, 1, 131073, 1572864, 1, 131074, 1572865, 1, 131074, 1572866, 1, 131074, 1572867, 1, 131074, 1572868, 1, 131074, 1572869, 1, 131074, 1572870, 1, 131074, 1572871, 1, 131074, 1572872, 1, 131074, 1572873, 1, 131074, 1572874, 1, 131074, 1572875, 1, 131074, 1572876, 1, 131074, 1572877, 1, 131074, 1572878, 1, 131074, 1572879, 1, 131074, 1572880, 1, 131074, 1572881, 1, 131074, 1572882, 1, 131074, 1572883, 1, 131074, 1572884, 1, 131074, 1572885, 1, 131074, 1572886, 1, 131074, 1572887, 1, 131074, 1572888, 1, 131074, 1572889, 1, 131074, 1572890, 1, 131074, 1572891, 1, 131074, 1572892, 1, 131074, 1572893, 1, 131074, 1572894, 1, 131074, 1572895, 1, 131074, 1572896, 1, 131074, 1572897, 1, 131074, 1572898, 1, 131074, 1572899, 1, 131074, 1572900, 1, 131074, 1572901, 1, 131074, 1572902, 1, 131074, 1572903, 1, 131074, 1572904, 1, 131074, 1572905, 1, 131074, 1572906, 1, 131074, 1572907, 1, 131074, 1572908, 1, 131074, 1572909, 1, 131074, 1572910, 1, 131074, 1572911, 1, 131074, 1572912, 1, 131074, 1572913, 1, 131074, 1572914, 1, 131074, 1572915, 1, 131074, 1572916, 1, 131074, 1572917, 1, 131074, 1572918, 1, 131074, 1572919, 1, 131074, 1572920, 1, 131074, 1572921, 1, 131074, 1572922, 1, 131074, 1572923, 1, 131074, 1572924, 1, 131074, 1572925, 1, 131074, 1572926, 1, 131074, 1572927, 1, 131074, 1572928, 1, 131074, 1572929, 1, 131074, 1572930, 1, 131074, 1572931, 1, 131074, 1572932, 1, 131074, 1572933, 1, 131074, 1572934, 1, 131074, 1572935, 1, 131074, 1572936, 1, 131074, 1572937, 1, 131074, 1572938, 1, 131074, 1572939, 1, 131074, 1572940, 1, 131074, 1572941, 1, 131074, 1572942, 1, 131074, 1572943, 1, 131074, 1572944, 1, 131074, 1572945, 1, 131074, 1572946, 1, 131074, 1572947, 1, 131074, 1572948, 1, 131074, 1572949, 1, 131074, 1572950, 1, 131074, 1572951, 1, 131074, 1572952, 1, 131074, 1572953, 1, 131074, 1572954, 1, 131074, 1572955, 1, 131074, 1572956, 1, 131074, 1572957, 1, 131074, 1572958, 1, 131074, 1572959, 1, 131074, 1572960, 1, 131075 ) [node name="Player" parent="." instance=ExtResource( 1 )] position = Vector2( 32, 176 ) -beta_gameplay = true [node name="Ladder" type="TileMap" parent="."] tile_set = ExtResource( 22 ) diff --git a/maps/cave_scholar.tscn b/maps/cave_scholar.tscn index 3542bfd..ffc060f 100644 --- a/maps/cave_scholar.tscn +++ b/maps/cave_scholar.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=38 format=2] +[gd_scene load_steps=35 format=2] [ext_resource path="res://objects/player/player.tscn" type="PackedScene" id=1] [ext_resource path="res://tilesets/t_cave.tres" type="TileSet" id=2] @@ -32,8 +32,6 @@ [ext_resource path="res://objects/lore/mountain/rolling_fiend.tscn" type="PackedScene" id=30] [ext_resource path="res://scripts/randomize_particle_start.gd" type="Script" id=31] [ext_resource path="res://graphics/particles/shine.png" type="Texture" id=32] -[ext_resource path="res://objects/npc/speccy.tscn" type="PackedScene" id=33] -[ext_resource path="res://maps/cave_speccy_detector.gd" type="Script" id=34] [sub_resource type="Curve" id=2] _data = [ Vector2( 0, 0 ), 0.0, 0.100639, 0, 0, Vector2( 0.158257, 1 ), 7.51724, -6.83592, 0, 0, Vector2( 0.31422, 0 ), 0.0, 0.0, 0, 0 ] @@ -41,9 +39,6 @@ _data = [ Vector2( 0, 0 ), 0.0, 0.100639, 0, 0, Vector2( 0.158257, 1 ), 7.51724, [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 4, 96 ) -[sub_resource type="RectangleShape2D" id=3] -extents = Vector2( 20, 20 ) - [node name="Map2" type="Node2D" groups=["map"]] pause_mode = 1 script = ExtResource( 11 ) @@ -1155,23 +1150,5 @@ __meta__ = { } [node name="Exit" parent="." instance=ExtResource( 24 )] -position = Vector2( 656, 100 ) +position = Vector2( 656, 96 ) cost = 25 - -[node name="SpeccyArea" type="Area2D" parent="."] -position = Vector2( 536, 176 ) -collision_layer = 0 -collision_mask = 128 -monitorable = false -script = ExtResource( 34 ) - -[node name="CollisionShape2D" type="CollisionShape2D" parent="SpeccyArea"] -position = Vector2( 4, -20 ) -shape = SubResource( 3 ) - -[node name="Speccy" parent="SpeccyArea" instance=ExtResource( 33 )] -position = Vector2( 64, -56 ) -flip = true -message = "shoot_that_thing" - -[connection signal="body_entered" from="SpeccyArea" to="SpeccyArea" method="_on_body_entered"] diff --git a/maps/cave_speccy_detector.gd b/maps/cave_speccy_detector.gd deleted file mode 100644 index 192e595..0000000 --- a/maps/cave_speccy_detector.gd +++ /dev/null @@ -1,10 +0,0 @@ -extends Area2D - - -var speccy_urgent_warning: bool = true - - -func _on_body_entered(body: Node) -> void: - if speccy_urgent_warning: - $Speccy.appear() - speccy_urgent_warning = false diff --git a/maps/hills.tscn b/maps/hills.tscn index a06cddd..4a237d0 100644 --- a/maps/hills.tscn +++ b/maps/hills.tscn @@ -66,7 +66,6 @@ tile_data = PoolIntArray( 196660, 2, 2, 196661, 2, 2, 196668, 0, 0, 196669, 0, 0 [node name="Player" parent="." instance=ExtResource( 26 )] position = Vector2( 32, 176 ) -beta_gameplay = true [node name="Death" type="TileMap" parent="."] tile_set = ExtResource( 9 ) diff --git a/maps/hills_scholar.tscn b/maps/hills_scholar.tscn index 51a6a63..b4c8ca1 100644 --- a/maps/hills_scholar.tscn +++ b/maps/hills_scholar.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=35 format=2] +[gd_scene load_steps=32 format=2] [ext_resource path="res://objects/environment/ladder/ladder.tscn" type="PackedScene" id=1] [ext_resource path="res://objects/hud/hud.tscn" type="PackedScene" id=2] @@ -31,9 +31,6 @@ [ext_resource path="res://objects/lore/hills/speccy.tscn" type="PackedScene" id=29] [ext_resource path="res://objects/lore/hills/sg.tscn" type="PackedScene" id=30] [ext_resource path="res://graphics/turniwood/turning_platform_wood_dark.png" type="Texture" id=31] -[ext_resource path="res://graphics/decal/helper_hints/the_signs/go_right_from_here/arrow_sign.png" type="Texture" id=32] -[ext_resource path="res://objects/npc/speccy.tscn" type="PackedScene" id=33] -[ext_resource path="res://maps/hills_speccy_detect.gd" type="Script" id=34] [node name="Map" type="Node2D" groups=["map"]] pause_mode = 1 @@ -67,7 +64,7 @@ material = ExtResource( 10 ) tile_set = ExtResource( 8 ) cell_size = Vector2( 8, 8 ) format = 1 -tile_data = PoolIntArray( 65535, 3, 0, 96, 3, 0, 131071, 3, 65536, 65632, 3, 65536, 196607, 3, 65536, 131168, 3, 65536, 262143, 3, 65536, 196634, 5, 0, 196698, 3, 1, 196699, 3, 3, 196704, 3, 65536, 327679, 3, 65536, 262170, 3, 1, 262171, 3, 196610, 262172, 3, 196611, 262183, 5, 0, 262189, 5, 0, 262196, 3, 196609, 262197, 3, 196611, 262200, 3, 196609, 262201, 3, 196610, 262202, 3, 196611, 262228, 4, 0, 262230, 3, 1, 262231, 3, 3, 262234, 3, 65537, 262235, 3, 65539, 262236, 4, 0, 262240, 3, 65536, 393215, 3, 65536, 327682, 3, 1, 327683, 3, 2, 327684, 3, 2, 327685, 3, 2, 327686, 3, 3, 327690, 3, 196609, 327691, 3, 196610, 327692, 3, 196610, 327693, 3, 196610, 327694, 3, 196610, 327695, 3, 196611, 327706, 3, 65536, 327710, 3, 0, 327719, 3, 196609, 327720, 3, 196610, 327721, 3, 196610, 327722, 3, 196610, 327723, 3, 196610, 327724, 3, 196610, 327725, 3, 196611, 327762, 3, 1, 327763, 3, 2, 327764, 3, 2, 327765, 3, 2, 327766, 3, 65538, 327767, 3, 65538, 327768, 3, 2, 327769, 3, 2, 327770, 3, 65538, 327771, 3, 65538, 327772, 3, 3, 327776, 3, 65536, 458751, 3, 65536, 393218, 3, 131073, 393219, 3, 131074, 393220, 3, 131074, 393221, 3, 131074, 393222, 3, 131075, 393237, 5, 0, 393241, 3, 1, 393242, 3, 65539, 393246, 3, 65536, 393291, 4, 0, 393298, 3, 65537, 393299, 3, 65538, 393300, 3, 65538, 393301, 3, 131074, 393302, 3, 131074, 393303, 3, 131074, 393304, 3, 131074, 393305, 3, 131074, 393306, 3, 131074, 393307, 3, 131074, 393308, 3, 131075, 393312, 3, 65536, 524287, 3, 65536, 458770, 3, 1, 458771, 3, 2, 458772, 3, 2, 458773, 3, 3, 458776, 3, 196609, 458777, 3, 131074, 458778, 3, 131074, 458779, 3, 196610, 458780, 3, 196610, 458781, 3, 196610, 458782, 3, 131075, 458787, 3, 196609, 458788, 3, 196610, 458789, 3, 196611, 458815, 5, 0, 458819, 4, 0, 458827, 3, 1, 458828, 3, 196610, 458829, 3, 196610, 458830, 3, 196610, 458831, 3, 196610, 458832, 3, 196610, 458833, 3, 196610, 458834, 3, 131074, 458835, 3, 131074, 458836, 3, 65539, 458848, 3, 65536, 589823, 3, 65536, 524306, 3, 65537, 524307, 3, 65538, 524308, 3, 65538, 524309, 3, 65539, 524334, 5, 0, 524346, 5, 0, 524349, 3, 1, 524350, 3, 196610, 524351, 3, 196610, 524352, 3, 196610, 524353, 3, 196610, 524354, 3, 196610, 524355, 3, 3, 524363, 3, 65536, 524372, 3, 65536, 524384, 3, 65536, 655359, 3, 65536, 589838, 4, 0, 589842, 3, 65537, 589843, 3, 131074, 589844, 3, 131074, 589845, 3, 131074, 589846, 3, 3, 589854, 4, 0, 589859, 4, 0, 589863, 3, 0, 589870, 3, 196609, 589871, 3, 196610, 589872, 3, 196610, 589873, 3, 196610, 589874, 3, 196610, 589875, 3, 196610, 589876, 3, 196610, 589877, 3, 196610, 589878, 3, 2, 589879, 3, 196610, 589880, 3, 196610, 589881, 3, 196610, 589882, 3, 196610, 589883, 3, 196610, 589884, 3, 196610, 589885, 3, 131075, 589891, 3, 131073, 589892, 3, 196610, 589893, 3, 196610, 589894, 3, 196610, 589895, 3, 196610, 589896, 3, 196610, 589897, 3, 196610, 589898, 3, 196610, 589899, 3, 131075, 589908, 3, 65536, 589919, 3, 1, 589920, 3, 65539, 720895, 3, 65536, 655370, 5, 0, 655374, 3, 196609, 655375, 3, 196610, 655376, 3, 196610, 655377, 3, 196610, 655378, 3, 131075, 655382, 3, 131073, 655383, 3, 3, 655388, 4, 0, 655390, 3, 1, 655391, 3, 2, 655392, 3, 196610, 655393, 3, 196610, 655394, 3, 196610, 655395, 3, 196610, 655396, 3, 196610, 655397, 3, 196610, 655398, 3, 196610, 655399, 3, 131075, 655414, 3, 65536, 655444, 3, 65536, 655448, 5, 0, 655452, 5, 0, 655454, 3, 1, 655455, 3, 65538, 655456, 3, 65539, 786431, 3, 65536, 720902, 3, 196609, 720903, 3, 196610, 720904, 3, 196610, 720905, 3, 196610, 720906, 3, 196610, 720907, 3, 196610, 720908, 3, 196611, 720919, 3, 131073, 720920, 3, 196610, 720921, 3, 196610, 720922, 3, 196610, 720923, 3, 196610, 720924, 3, 196611, 720926, 3, 131073, 720927, 3, 131075, 720950, 3, 65536, 720977, 3, 1, 720978, 3, 2, 720979, 3, 2, 720980, 3, 131075, 720982, 3, 196609, 720983, 3, 196610, 720984, 3, 196610, 720985, 3, 196610, 720986, 3, 196610, 720987, 3, 196610, 720988, 3, 196610, 720989, 3, 196610, 720990, 3, 131074, 720991, 3, 131074, 720992, 3, 65539, 851967, 3, 65536, 786486, 3, 65536, 786513, 3, 131073, 786514, 3, 131074, 786515, 3, 131075, 786528, 3, 65536, 917503, 3, 65536, 851982, 3, 196609, 851983, 3, 196611, 852022, 3, 131072, 852037, 5, 0, 852040, 5, 0, 852044, 3, 1, 852045, 3, 2, 852046, 3, 2, 852047, 3, 3, 852064, 3, 65536, 983039, 3, 65536, 917517, 3, 0, 917522, 3, 0, 917531, 5, 0, 917548, 3, 196609, 917549, 3, 196610, 917550, 3, 196610, 917551, 3, 196611, 917554, 3, 196609, 917555, 3, 196610, 917556, 3, 196611, 917573, 3, 1, 917574, 3, 2, 917575, 3, 2, 917576, 3, 3, 917580, 3, 131073, 917581, 3, 131074, 917582, 3, 131074, 917583, 3, 131075, 917600, 3, 65536, 1048575, 3, 65536, 983051, 4, 0, 983052, 3, 1, 983053, 3, 65539, 983057, 3, 1, 983058, 3, 65538, 983059, 3, 2, 983060, 3, 2, 983061, 3, 2, 983062, 3, 3, 983065, 3, 196609, 983066, 3, 196610, 983067, 3, 196610, 983068, 3, 196610, 983069, 3, 3, 983073, 5, 0, 983078, 4, 0, 983103, 4, 0, 983106, 4, 0, 983109, 3, 131073, 983110, 3, 131074, 983111, 3, 131074, 983112, 3, 131075, 983124, 5, 0, 983134, 3, 196609, 983135, 3, 196610, 983136, 3, 65539, 1114111, 3, 65536, 1048587, 3, 196609, 1048588, 3, 131074, 1048589, 3, 131074, 1048590, 3, 196610, 1048591, 3, 196610, 1048592, 3, 196610, 1048593, 3, 131074, 1048594, 3, 131074, 1048595, 3, 131074, 1048596, 3, 131074, 1048597, 3, 131074, 1048598, 3, 131075, 1048605, 3, 131073, 1048606, 3, 196610, 1048607, 3, 196610, 1048608, 3, 196610, 1048609, 3, 196611, 1048612, 3, 196609, 1048613, 3, 196610, 1048614, 3, 196610, 1048615, 3, 196610, 1048616, 3, 196611, 1048638, 3, 1, 1048639, 3, 2, 1048640, 3, 2, 1048641, 3, 2, 1048642, 3, 3, 1048659, 3, 1, 1048660, 3, 2, 1048661, 3, 2, 1048662, 3, 3, 1048665, 3, 196608, 1048668, 3, 196608, 1048672, 3, 65536, 1179647, 3, 65536, 1114116, 5, 0, 1114120, 5, 0, 1114174, 3, 131073, 1114175, 3, 131074, 1114176, 3, 131074, 1114177, 3, 131074, 1114178, 3, 131075, 1114193, 5, 0, 1114194, 3, 1, 1114195, 3, 65538, 1114196, 3, 65538, 1114197, 3, 131074, 1114198, 3, 131075, 1114208, 3, 65536, 1245183, 3, 65537, 1179648, 3, 196610, 1179649, 3, 196611, 1179652, 3, 196609, 1179653, 3, 196610, 1179654, 3, 196610, 1179655, 3, 196610, 1179656, 3, 196611, 1179706, 3, 1, 1179707, 3, 3, 1179728, 3, 1, 1179729, 3, 2, 1179730, 3, 65538, 1179731, 3, 131074, 1179732, 3, 131075, 1179744, 3, 65536, 1310719, 3, 65536, 1245194, 4, 0, 1245199, 4, 0, 1245228, 4, 0, 1245242, 3, 131073, 1245243, 3, 131075, 1245264, 3, 131073, 1245265, 3, 131074, 1245266, 3, 131075, 1245280, 3, 65536, 1376255, 3, 65536, 1310730, 3, 1, 1310731, 3, 2, 1310732, 3, 2, 1310733, 3, 2, 1310734, 3, 2, 1310735, 3, 3, 1310761, 3, 1, 1310762, 3, 2, 1310763, 3, 2, 1310764, 3, 3, 1310773, 3, 1, 1310774, 3, 2, 1310775, 3, 3, 1310816, 3, 65536, 1441791, 3, 65536, 1376257, 4, 0, 1376260, 4, 0, 1376263, 4, 0, 1376264, 2, 1, 1376266, 3, 65537, 1376267, 3, 65538, 1376268, 3, 65538, 1376269, 3, 65538, 1376270, 3, 65538, 1376271, 3, 65538, 1376272, 3, 3, 1376275, 4, 0, 1376291, 4, 0, 1376297, 3, 65537, 1376298, 3, 65538, 1376299, 3, 65538, 1376300, 3, 65539, 1376309, 3, 65537, 1376310, 3, 65538, 1376311, 3, 65539, 1376312, 4, 0, 1376320, 4, 0, 1376327, 4, 0, 1376331, 4, 0, 1376339, 4, 0, 1376347, 4, 0, 1376352, 3, 65536, 1507327, 3, 65537, 1441792, 3, 2, 1441793, 3, 2, 1441794, 3, 2, 1441795, 3, 2, 1441796, 3, 2, 1441797, 3, 2, 1441798, 3, 2, 1441799, 3, 2, 1441800, 3, 2, 1441801, 3, 2, 1441802, 3, 65538, 1441803, 3, 65538, 1441804, 3, 65538, 1441805, 3, 65538, 1441806, 3, 65538, 1441807, 3, 65538, 1441808, 3, 65538, 1441809, 3, 2, 1441810, 3, 2, 1441811, 3, 2, 1441812, 3, 2, 1441813, 3, 3, 1441817, 3, 1, 1441818, 3, 2, 1441819, 3, 2, 1441820, 3, 2, 1441821, 3, 2, 1441822, 3, 2, 1441823, 3, 2, 1441824, 3, 2, 1441825, 3, 2, 1441826, 3, 2, 1441827, 3, 2, 1441828, 3, 2, 1441829, 3, 2, 1441830, 3, 2, 1441831, 3, 2, 1441832, 3, 2, 1441833, 3, 65538, 1441834, 3, 65538, 1441835, 3, 65538, 1441836, 3, 65539, 1441845, 3, 65537, 1441846, 3, 65538, 1441847, 3, 65538, 1441848, 3, 2, 1441849, 3, 2, 1441850, 3, 2, 1441851, 3, 2, 1441852, 3, 2, 1441853, 3, 2, 1441854, 3, 2, 1441855, 3, 2, 1441856, 3, 2, 1441857, 3, 2, 1441858, 3, 2, 1441859, 3, 2, 1441860, 3, 2, 1441861, 3, 2, 1441862, 3, 2, 1441863, 3, 3, 1441867, 3, 1, 1441868, 3, 2, 1441869, 3, 2, 1441870, 3, 2, 1441871, 3, 2, 1441872, 3, 2, 1441873, 3, 2, 1441874, 3, 2, 1441875, 3, 2, 1441876, 3, 2, 1441877, 3, 2, 1441878, 3, 2, 1441879, 3, 2, 1441880, 3, 2, 1441881, 3, 2, 1441882, 3, 2, 1441883, 3, 2, 1441884, 3, 2, 1441885, 3, 2, 1441886, 3, 2, 1441887, 3, 2, 1441888, 3, 65539, 1572863, 3, 65537, 1507328, 3, 65538, 1507329, 3, 65538, 1507330, 3, 65538, 1507331, 3, 65538, 1507332, 3, 65538, 1507333, 3, 65538, 1507334, 3, 65538, 1507335, 3, 65538, 1507336, 3, 65538, 1507337, 3, 65538, 1507338, 3, 65538, 1507339, 3, 65538, 1507340, 3, 65538, 1507341, 3, 65538, 1507342, 3, 65538, 1507343, 3, 65538, 1507344, 3, 65538, 1507345, 3, 65538, 1507346, 3, 65538, 1507347, 3, 65538, 1507348, 3, 65538, 1507349, 3, 65539, 1507353, 3, 65537, 1507354, 3, 65538, 1507355, 3, 65538, 1507356, 3, 65538, 1507357, 3, 65538, 1507358, 3, 65538, 1507359, 3, 65538, 1507360, 3, 65538, 1507361, 3, 65538, 1507362, 3, 65538, 1507363, 3, 65538, 1507364, 3, 65538, 1507365, 3, 65538, 1507366, 3, 65538, 1507367, 3, 65538, 1507368, 3, 65538, 1507369, 3, 65538, 1507370, 3, 65538, 1507371, 3, 65538, 1507372, 3, 65539, 1507381, 3, 65537, 1507382, 3, 65538, 1507383, 3, 65538, 1507384, 3, 65538, 1507385, 3, 65538, 1507386, 3, 65538, 1507387, 3, 65538, 1507388, 3, 65538, 1507389, 3, 65538, 1507390, 3, 65538, 1507391, 3, 65538, 1507392, 3, 65538, 1507393, 3, 65538, 1507394, 3, 65538, 1507395, 3, 65538, 1507396, 3, 65538, 1507397, 3, 65538, 1507398, 3, 65538, 1507399, 3, 65539, 1507403, 3, 65537, 1507404, 3, 65538, 1507405, 3, 65538, 1507406, 3, 65538, 1507407, 3, 65538, 1507408, 3, 65538, 1507409, 3, 65538, 1507410, 3, 65538, 1507411, 3, 65538, 1507412, 3, 65538, 1507413, 3, 65538, 1507414, 3, 65538, 1507415, 3, 65538, 1507416, 3, 65538, 1507417, 3, 65538, 1507418, 3, 65538, 1507419, 3, 65538, 1507420, 3, 65538, 1507421, 3, 65538, 1507422, 3, 65538, 1507423, 3, 65538, 1507424, 3, 65539, 1638399, 3, 131073, 1572864, 3, 131074, 1572865, 3, 131074, 1572866, 3, 131074, 1572867, 3, 131074, 1572868, 3, 131074, 1572869, 3, 131074, 1572870, 3, 131074, 1572871, 3, 131074, 1572872, 3, 131074, 1572873, 3, 131074, 1572874, 3, 131074, 1572875, 3, 131074, 1572876, 3, 131074, 1572877, 3, 131074, 1572878, 3, 131074, 1572879, 3, 131074, 1572880, 3, 131074, 1572881, 3, 131074, 1572882, 3, 131074, 1572883, 3, 131074, 1572884, 3, 131074, 1572885, 3, 131075, 1572889, 3, 131073, 1572890, 3, 131074, 1572891, 3, 131074, 1572892, 3, 131074, 1572893, 3, 131074, 1572894, 3, 131074, 1572895, 3, 131074, 1572896, 3, 131074, 1572897, 3, 131074, 1572898, 3, 131074, 1572899, 3, 131074, 1572900, 3, 131074, 1572901, 3, 131074, 1572902, 3, 131074, 1572903, 3, 131074, 1572904, 3, 131074, 1572905, 3, 131074, 1572906, 3, 131074, 1572907, 3, 131074, 1572908, 3, 131075, 1572917, 3, 131073, 1572918, 3, 131074, 1572919, 3, 131074, 1572920, 3, 131074, 1572921, 3, 131074, 1572922, 3, 131074, 1572923, 3, 131074, 1572924, 3, 131074, 1572925, 3, 131074, 1572926, 3, 131074, 1572927, 3, 131074, 1572928, 3, 131074, 1572929, 3, 131074, 1572930, 3, 131074, 1572931, 3, 131074, 1572932, 3, 131074, 1572933, 3, 131074, 1572934, 3, 131074, 1572935, 3, 131075, 1572939, 3, 131073, 1572940, 3, 131074, 1572941, 3, 131074, 1572942, 3, 131074, 1572943, 3, 131074, 1572944, 3, 131074, 1572945, 3, 131074, 1572946, 3, 131074, 1572947, 3, 131074, 1572948, 3, 131074, 1572949, 3, 131074, 1572950, 3, 131074, 1572951, 3, 131074, 1572952, 3, 131074, 1572953, 3, 131074, 1572954, 3, 131074, 1572955, 3, 131074, 1572956, 3, 131074, 1572957, 3, 131074, 1572958, 3, 131074, 1572959, 3, 131074, 1572960, 3, 131075 ) +tile_data = PoolIntArray( 65535, 3, 0, 96, 3, 0, 131071, 3, 65536, 65632, 3, 65536, 196607, 3, 65536, 131168, 3, 65536, 262143, 3, 65536, 196634, 5, 0, 196698, 3, 1, 196699, 3, 3, 196704, 3, 65536, 327679, 3, 65536, 262170, 3, 1, 262171, 3, 196610, 262172, 3, 196611, 262183, 5, 0, 262189, 5, 0, 262196, 3, 196609, 262197, 3, 196611, 262200, 3, 196609, 262201, 3, 196610, 262202, 3, 196611, 262228, 4, 0, 262230, 3, 1, 262231, 3, 3, 262234, 3, 65537, 262235, 3, 65539, 262236, 4, 0, 262240, 3, 65536, 393215, 3, 65536, 327682, 3, 1, 327683, 3, 2, 327684, 3, 2, 327685, 3, 2, 327686, 3, 3, 327690, 3, 196609, 327691, 3, 196610, 327692, 3, 196610, 327693, 3, 196610, 327694, 3, 196610, 327695, 3, 196611, 327706, 3, 65536, 327710, 3, 0, 327719, 3, 196609, 327720, 3, 196610, 327721, 3, 196610, 327722, 3, 196610, 327723, 3, 196610, 327724, 3, 196610, 327725, 3, 196611, 327762, 3, 1, 327763, 3, 2, 327764, 3, 2, 327765, 3, 2, 327766, 3, 65538, 327767, 3, 65538, 327768, 3, 2, 327769, 3, 2, 327770, 3, 65538, 327771, 3, 65538, 327772, 3, 3, 327776, 3, 65536, 458751, 3, 65536, 393218, 3, 131073, 393219, 3, 131074, 393220, 3, 131074, 393221, 3, 131074, 393222, 3, 131075, 393237, 5, 0, 393241, 3, 1, 393242, 3, 65539, 393246, 3, 65536, 393291, 4, 0, 393298, 3, 65537, 393299, 3, 65538, 393300, 3, 65538, 393301, 3, 131074, 393302, 3, 131074, 393303, 3, 131074, 393304, 3, 131074, 393305, 3, 131074, 393306, 3, 131074, 393307, 3, 131074, 393308, 3, 131075, 393312, 3, 65536, 524287, 3, 65536, 458770, 3, 1, 458771, 3, 2, 458772, 3, 2, 458773, 3, 3, 458776, 3, 196609, 458777, 3, 131074, 458778, 3, 131074, 458779, 3, 196610, 458780, 3, 196610, 458781, 3, 196610, 458782, 3, 131075, 458787, 3, 196609, 458788, 3, 196610, 458789, 3, 196611, 458815, 5, 0, 458819, 4, 0, 458827, 3, 1, 458828, 3, 196610, 458829, 3, 196610, 458830, 3, 196610, 458831, 3, 196610, 458832, 3, 196610, 458833, 3, 196610, 458834, 3, 131074, 458835, 3, 131074, 458836, 3, 65539, 458848, 3, 65536, 589823, 3, 65536, 524306, 3, 65537, 524307, 3, 65538, 524308, 3, 65538, 524309, 3, 65539, 524334, 5, 0, 524346, 5, 0, 524349, 3, 1, 524350, 3, 196610, 524351, 3, 196610, 524352, 3, 196610, 524353, 3, 196610, 524354, 3, 196610, 524355, 3, 3, 524363, 3, 65536, 524372, 3, 65536, 524384, 3, 65536, 655359, 3, 65536, 589838, 4, 0, 589842, 3, 65537, 589843, 3, 131074, 589844, 3, 131074, 589845, 3, 131074, 589846, 3, 3, 589854, 4, 0, 589859, 4, 0, 589863, 3, 0, 589870, 3, 196609, 589871, 3, 196610, 589872, 3, 196610, 589873, 3, 196610, 589874, 3, 196610, 589875, 3, 196610, 589876, 3, 196610, 589877, 3, 196610, 589878, 3, 2, 589879, 3, 196610, 589880, 3, 196610, 589881, 3, 196610, 589882, 3, 196610, 589883, 3, 196610, 589884, 3, 196610, 589885, 3, 131075, 589891, 3, 131073, 589892, 3, 196610, 589893, 3, 196610, 589894, 3, 196610, 589895, 3, 196610, 589896, 3, 196610, 589897, 3, 196610, 589898, 3, 196610, 589899, 3, 131075, 589908, 3, 65536, 589919, 3, 1, 589920, 3, 65539, 720895, 3, 65536, 655370, 5, 0, 655374, 3, 196609, 655375, 3, 196610, 655376, 3, 196610, 655377, 3, 196610, 655378, 3, 131075, 655382, 3, 131073, 655383, 3, 3, 655388, 4, 0, 655390, 3, 1, 655391, 3, 2, 655392, 3, 196610, 655393, 3, 196610, 655394, 3, 196610, 655395, 3, 196610, 655396, 3, 196610, 655397, 3, 196610, 655398, 3, 196610, 655399, 3, 131075, 655414, 3, 65536, 655444, 3, 65536, 655448, 5, 0, 655452, 5, 0, 655454, 3, 1, 655455, 3, 65538, 655456, 3, 65539, 786431, 3, 65536, 720902, 3, 196609, 720903, 3, 196610, 720904, 3, 196610, 720905, 3, 196610, 720906, 3, 196610, 720907, 3, 196610, 720908, 3, 196611, 720919, 3, 131073, 720920, 3, 196610, 720921, 3, 196610, 720922, 3, 196610, 720923, 3, 196610, 720924, 3, 196611, 720926, 3, 131073, 720927, 3, 131075, 720950, 3, 65536, 720977, 3, 1, 720978, 3, 2, 720979, 3, 2, 720980, 3, 131075, 720982, 3, 196609, 720983, 3, 196610, 720984, 3, 196610, 720985, 3, 196610, 720986, 3, 196610, 720987, 3, 196610, 720988, 3, 196610, 720989, 3, 196610, 720990, 3, 131074, 720991, 3, 131074, 720992, 3, 65539, 851967, 3, 65536, 786486, 3, 65536, 786513, 3, 131073, 786514, 3, 131074, 786515, 3, 131075, 786528, 3, 65536, 917503, 3, 65536, 851982, 3, 196609, 851983, 3, 196611, 852022, 3, 131072, 852037, 5, 0, 852040, 5, 0, 852044, 3, 1, 852045, 3, 2, 852046, 3, 2, 852047, 3, 3, 852064, 3, 65536, 983039, 3, 65536, 917517, 3, 0, 917522, 3, 0, 917531, 5, 0, 917548, 3, 196609, 917549, 3, 196610, 917550, 3, 196610, 917551, 3, 196611, 917554, 3, 196609, 917555, 3, 196610, 917556, 3, 196611, 917573, 3, 1, 917574, 3, 2, 917575, 3, 2, 917576, 3, 3, 917580, 3, 131073, 917581, 3, 131074, 917582, 3, 131074, 917583, 3, 131075, 917600, 3, 65536, 1048575, 3, 65536, 983051, 4, 0, 983052, 3, 1, 983053, 3, 65539, 983057, 3, 1, 983058, 3, 65538, 983059, 3, 2, 983060, 3, 2, 983061, 3, 2, 983062, 3, 3, 983065, 3, 196609, 983066, 3, 196610, 983067, 3, 196610, 983068, 3, 196610, 983069, 3, 3, 983073, 5, 0, 983078, 4, 0, 983103, 4, 0, 983106, 4, 0, 983109, 3, 131073, 983110, 3, 131074, 983111, 3, 131074, 983112, 3, 131075, 983124, 5, 0, 983134, 3, 196609, 983135, 3, 196610, 983136, 3, 65539, 1114111, 3, 65536, 1048587, 3, 196609, 1048588, 3, 131074, 1048589, 3, 131074, 1048590, 3, 196610, 1048591, 3, 196610, 1048592, 3, 196610, 1048593, 3, 131074, 1048594, 3, 131074, 1048595, 3, 131074, 1048596, 3, 131074, 1048597, 3, 131074, 1048598, 3, 131075, 1048605, 3, 131073, 1048606, 3, 196610, 1048607, 3, 196610, 1048608, 3, 196610, 1048609, 3, 196611, 1048612, 3, 196609, 1048613, 3, 196610, 1048614, 3, 196610, 1048615, 3, 196610, 1048616, 3, 196611, 1048638, 3, 1, 1048639, 3, 2, 1048640, 3, 2, 1048641, 3, 2, 1048642, 3, 3, 1048659, 3, 1, 1048660, 3, 2, 1048661, 3, 2, 1048662, 3, 3, 1048665, 3, 196608, 1048668, 3, 196608, 1048672, 3, 65536, 1179647, 3, 65536, 1114116, 5, 0, 1114120, 5, 0, 1114174, 3, 131073, 1114175, 3, 131074, 1114176, 3, 131074, 1114177, 3, 131074, 1114178, 3, 131075, 1114193, 5, 0, 1114194, 3, 1, 1114195, 3, 65538, 1114196, 3, 65538, 1114197, 3, 131074, 1114198, 3, 131075, 1114208, 3, 65536, 1245183, 3, 65537, 1179648, 3, 196610, 1179649, 3, 196611, 1179652, 3, 196609, 1179653, 3, 196610, 1179654, 3, 196610, 1179655, 3, 196610, 1179656, 3, 196611, 1179706, 3, 1, 1179707, 3, 3, 1179728, 3, 1, 1179729, 3, 2, 1179730, 3, 65538, 1179731, 3, 131074, 1179732, 3, 131075, 1179744, 3, 65536, 1310719, 3, 65536, 1245194, 4, 0, 1245199, 4, 0, 1245228, 4, 0, 1245242, 3, 131073, 1245243, 3, 131075, 1245264, 3, 131073, 1245265, 3, 131074, 1245266, 3, 131075, 1245280, 3, 65536, 1376255, 3, 65536, 1310730, 3, 1, 1310731, 3, 2, 1310732, 3, 2, 1310733, 3, 2, 1310734, 3, 2, 1310735, 3, 3, 1310761, 3, 1, 1310762, 3, 2, 1310763, 3, 2, 1310764, 3, 3, 1310773, 3, 1, 1310774, 3, 2, 1310775, 3, 3, 1310816, 3, 65536, 1441791, 3, 65536, 1376257, 4, 0, 1376260, 4, 0, 1376263, 4, 0, 1376264, 2, 1, 1376266, 3, 65537, 1376267, 3, 65538, 1376268, 3, 65538, 1376269, 3, 65538, 1376270, 3, 65538, 1376271, 3, 65538, 1376272, 3, 3, 1376275, 4, 0, 1376283, 4, 0, 1376291, 4, 0, 1376297, 3, 65537, 1376298, 3, 65538, 1376299, 3, 65538, 1376300, 3, 65539, 1376309, 3, 65537, 1376310, 3, 65538, 1376311, 3, 65539, 1376312, 4, 0, 1376320, 4, 0, 1376327, 4, 0, 1376331, 4, 0, 1376339, 4, 0, 1376347, 4, 0, 1376352, 3, 65536, 1507327, 3, 65537, 1441792, 3, 2, 1441793, 3, 2, 1441794, 3, 2, 1441795, 3, 2, 1441796, 3, 2, 1441797, 3, 2, 1441798, 3, 2, 1441799, 3, 2, 1441800, 3, 2, 1441801, 3, 2, 1441802, 3, 65538, 1441803, 3, 65538, 1441804, 3, 65538, 1441805, 3, 65538, 1441806, 3, 65538, 1441807, 3, 65538, 1441808, 3, 65538, 1441809, 3, 2, 1441810, 3, 2, 1441811, 3, 2, 1441812, 3, 2, 1441813, 3, 3, 1441817, 3, 1, 1441818, 3, 2, 1441819, 3, 2, 1441820, 3, 2, 1441821, 3, 2, 1441822, 3, 2, 1441823, 3, 2, 1441824, 3, 2, 1441825, 3, 2, 1441826, 3, 2, 1441827, 3, 2, 1441828, 3, 2, 1441829, 3, 2, 1441830, 3, 2, 1441831, 3, 2, 1441832, 3, 2, 1441833, 3, 65538, 1441834, 3, 65538, 1441835, 3, 65538, 1441836, 3, 65539, 1441845, 3, 65537, 1441846, 3, 65538, 1441847, 3, 65538, 1441848, 3, 2, 1441849, 3, 2, 1441850, 3, 2, 1441851, 3, 2, 1441852, 3, 2, 1441853, 3, 2, 1441854, 3, 2, 1441855, 3, 2, 1441856, 3, 2, 1441857, 3, 2, 1441858, 3, 2, 1441859, 3, 2, 1441860, 3, 2, 1441861, 3, 2, 1441862, 3, 2, 1441863, 3, 3, 1441867, 3, 1, 1441868, 3, 2, 1441869, 3, 2, 1441870, 3, 2, 1441871, 3, 2, 1441872, 3, 2, 1441873, 3, 2, 1441874, 3, 2, 1441875, 3, 2, 1441876, 3, 2, 1441877, 3, 2, 1441878, 3, 2, 1441879, 3, 2, 1441880, 3, 2, 1441881, 3, 2, 1441882, 3, 2, 1441883, 3, 2, 1441884, 3, 2, 1441885, 3, 2, 1441886, 3, 2, 1441887, 3, 2, 1441888, 3, 65539, 1572863, 3, 65537, 1507328, 3, 65538, 1507329, 3, 65538, 1507330, 3, 65538, 1507331, 3, 65538, 1507332, 3, 65538, 1507333, 3, 65538, 1507334, 3, 65538, 1507335, 3, 65538, 1507336, 3, 65538, 1507337, 3, 65538, 1507338, 3, 65538, 1507339, 3, 65538, 1507340, 3, 65538, 1507341, 3, 65538, 1507342, 3, 65538, 1507343, 3, 65538, 1507344, 3, 65538, 1507345, 3, 65538, 1507346, 3, 65538, 1507347, 3, 65538, 1507348, 3, 65538, 1507349, 3, 65539, 1507353, 3, 65537, 1507354, 3, 65538, 1507355, 3, 65538, 1507356, 3, 65538, 1507357, 3, 65538, 1507358, 3, 65538, 1507359, 3, 65538, 1507360, 3, 65538, 1507361, 3, 65538, 1507362, 3, 65538, 1507363, 3, 65538, 1507364, 3, 65538, 1507365, 3, 65538, 1507366, 3, 65538, 1507367, 3, 65538, 1507368, 3, 65538, 1507369, 3, 65538, 1507370, 3, 65538, 1507371, 3, 65538, 1507372, 3, 65539, 1507381, 3, 65537, 1507382, 3, 65538, 1507383, 3, 65538, 1507384, 3, 65538, 1507385, 3, 65538, 1507386, 3, 65538, 1507387, 3, 65538, 1507388, 3, 65538, 1507389, 3, 65538, 1507390, 3, 65538, 1507391, 3, 65538, 1507392, 3, 65538, 1507393, 3, 65538, 1507394, 3, 65538, 1507395, 3, 65538, 1507396, 3, 65538, 1507397, 3, 65538, 1507398, 3, 65538, 1507399, 3, 65539, 1507403, 3, 65537, 1507404, 3, 65538, 1507405, 3, 65538, 1507406, 3, 65538, 1507407, 3, 65538, 1507408, 3, 65538, 1507409, 3, 65538, 1507410, 3, 65538, 1507411, 3, 65538, 1507412, 3, 65538, 1507413, 3, 65538, 1507414, 3, 65538, 1507415, 3, 65538, 1507416, 3, 65538, 1507417, 3, 65538, 1507418, 3, 65538, 1507419, 3, 65538, 1507420, 3, 65538, 1507421, 3, 65538, 1507422, 3, 65538, 1507423, 3, 65538, 1507424, 3, 65539, 1638399, 3, 131073, 1572864, 3, 131074, 1572865, 3, 131074, 1572866, 3, 131074, 1572867, 3, 131074, 1572868, 3, 131074, 1572869, 3, 131074, 1572870, 3, 131074, 1572871, 3, 131074, 1572872, 3, 131074, 1572873, 3, 131074, 1572874, 3, 131074, 1572875, 3, 131074, 1572876, 3, 131074, 1572877, 3, 131074, 1572878, 3, 131074, 1572879, 3, 131074, 1572880, 3, 131074, 1572881, 3, 131074, 1572882, 3, 131074, 1572883, 3, 131074, 1572884, 3, 131074, 1572885, 3, 131075, 1572889, 3, 131073, 1572890, 3, 131074, 1572891, 3, 131074, 1572892, 3, 131074, 1572893, 3, 131074, 1572894, 3, 131074, 1572895, 3, 131074, 1572896, 3, 131074, 1572897, 3, 131074, 1572898, 3, 131074, 1572899, 3, 131074, 1572900, 3, 131074, 1572901, 3, 131074, 1572902, 3, 131074, 1572903, 3, 131074, 1572904, 3, 131074, 1572905, 3, 131074, 1572906, 3, 131074, 1572907, 3, 131074, 1572908, 3, 131075, 1572917, 3, 131073, 1572918, 3, 131074, 1572919, 3, 131074, 1572920, 3, 131074, 1572921, 3, 131074, 1572922, 3, 131074, 1572923, 3, 131074, 1572924, 3, 131074, 1572925, 3, 131074, 1572926, 3, 131074, 1572927, 3, 131074, 1572928, 3, 131074, 1572929, 3, 131074, 1572930, 3, 131074, 1572931, 3, 131074, 1572932, 3, 131074, 1572933, 3, 131074, 1572934, 3, 131074, 1572935, 3, 131075, 1572939, 3, 131073, 1572940, 3, 131074, 1572941, 3, 131074, 1572942, 3, 131074, 1572943, 3, 131074, 1572944, 3, 131074, 1572945, 3, 131074, 1572946, 3, 131074, 1572947, 3, 131074, 1572948, 3, 131074, 1572949, 3, 131074, 1572950, 3, 131074, 1572951, 3, 131074, 1572952, 3, 131074, 1572953, 3, 131074, 1572954, 3, 131074, 1572955, 3, 131074, 1572956, 3, 131074, 1572957, 3, 131074, 1572958, 3, 131074, 1572959, 3, 131074, 1572960, 3, 131075 ) [node name="Player" parent="." instance=ExtResource( 26 )] position = Vector2( 24, 176 ) @@ -156,87 +153,82 @@ position = Vector2( 124, 109 ) scale = Vector2( 1, 19 ) cost = 30 -[node name="ArrowSign" type="Sprite" parent="Environment"] -position = Vector2( 221, 170 ) -z_index = -6 -texture = ExtResource( 32 ) - [node name="Collectibles" type="Node2D" parent="."] -[node name="Star" parent="Collectibles" groups=["speccy_appear"] instance=ExtResource( 4 )] +[node name="Star" parent="Collectibles" instance=ExtResource( 4 )] position = Vector2( 0, 136 ) [node name="Star2" parent="Collectibles" instance=ExtResource( 4 )] position = Vector2( 112, 120 ) color = 1 -[node name="Key" parent="Collectibles" groups=["speccy_appear"] instance=ExtResource( 5 )] +[node name="Key" parent="Collectibles" instance=ExtResource( 5 )] position = Vector2( 40, 168 ) -[node name="Key2" parent="Collectibles" groups=["speccy_appear"] instance=ExtResource( 5 )] +[node name="Key2" parent="Collectibles" instance=ExtResource( 5 )] position = Vector2( 64, 168 ) -[node name="Key3" parent="Collectibles" groups=["speccy_appear"] instance=ExtResource( 5 )] +[node name="Key3" parent="Collectibles" instance=ExtResource( 5 )] position = Vector2( 88, 152 ) -[node name="Key5" parent="Collectibles" groups=["speccy_appear"] instance=ExtResource( 5 )] +[node name="Key5" parent="Collectibles" instance=ExtResource( 5 )] position = Vector2( 232, 112 ) -[node name="Key6" parent="Collectibles" groups=["speccy_appear"] instance=ExtResource( 5 )] +[node name="Key6" parent="Collectibles" instance=ExtResource( 5 )] position = Vector2( 48, 80 ) -[node name="Key7" parent="Collectibles" groups=["speccy_appear"] instance=ExtResource( 5 )] +[node name="Key7" parent="Collectibles" instance=ExtResource( 5 )] position = Vector2( 72, 80 ) -[node name="Key8" parent="Collectibles" groups=["speccy_appear"] instance=ExtResource( 5 )] +[node name="Key8" parent="Collectibles" instance=ExtResource( 5 )] position = Vector2( 96, 80 ) -[node name="Key9" parent="Collectibles" groups=["speccy_appear"] instance=ExtResource( 5 )] +[node name="Key9" parent="Collectibles" instance=ExtResource( 5 )] position = Vector2( 152, 48 ) -[node name="Key10" parent="Collectibles" groups=["speccy_appear"] instance=ExtResource( 5 )] +[node name="Key10" parent="Collectibles" instance=ExtResource( 5 )] position = Vector2( 120, 32 ) -[node name="Key11" parent="Collectibles" groups=["speccy_appear"] instance=ExtResource( 5 )] +[node name="Key11" parent="Collectibles" instance=ExtResource( 5 )] position = Vector2( 184, 72 ) -[node name="Key14" parent="Collectibles" groups=["speccy_appear"] instance=ExtResource( 5 )] +[node name="Key14" parent="Collectibles" instance=ExtResource( 5 )] position = Vector2( 120, 72 ) -[node name="Key13" parent="Collectibles" groups=["speccy_appear"] instance=ExtResource( 5 )] +[node name="Key13" parent="Collectibles" instance=ExtResource( 5 )] position = Vector2( 192, 48 ) -[node name="Key4" parent="Collectibles" groups=["speccy_appear"] instance=ExtResource( 5 )] +[node name="Key4" parent="Collectibles" instance=ExtResource( 5 )] position = Vector2( 112, 152 ) -[node name="Key12" parent="Collectibles" groups=["speccy_appear"] instance=ExtResource( 5 )] +[node name="Key12" parent="Collectibles" instance=ExtResource( 5 )] position = Vector2( 160, 168 ) -[node name="Key15" parent="Collectibles" groups=["speccy_skip"] instance=ExtResource( 5 )] +[node name="Key15" parent="Collectibles" instance=ExtResource( 5 )] position = Vector2( 288, 120 ) -[node name="Key16" parent="Collectibles" groups=["speccy_appear"] instance=ExtResource( 5 )] +[node name="Key16" parent="Collectibles" instance=ExtResource( 5 )] position = Vector2( 248, 120 ) -[node name="Key20" parent="Collectibles" groups=["speccy_skip"] instance=ExtResource( 5 )] +[node name="Key20" parent="Collectibles" instance=ExtResource( 5 )] position = Vector2( 360, 104 ) -[node name="Key22" parent="Collectibles" groups=["speccy_skip"] instance=ExtResource( 5 )] +[node name="Key22" parent="Collectibles" instance=ExtResource( 5 )] position = Vector2( 264, 72 ) -[node name="Key24" parent="Collectibles" groups=["speccy_skip"] instance=ExtResource( 5 )] +[node name="Key24" parent="Collectibles" instance=ExtResource( 5 )] position = Vector2( 296, 72 ) -[node name="Key25" parent="Collectibles" groups=["speccy_skip"] instance=ExtResource( 5 )] +[node name="Key25" parent="Collectibles" instance=ExtResource( 5 )] position = Vector2( 288, 48 ) [node name="Key26" parent="Collectibles" instance=ExtResource( 5 )] position = Vector2( 488, 56 ) -[node name="Key27" parent="Collectibles" groups=["speccy_skip"] instance=ExtResource( 5 )] +[node name="Key27" parent="Collectibles" instance=ExtResource( 5 )] position = Vector2( 448, 64 ) -[node name="Key33" parent="Collectibles" groups=["speccy_skip"] instance=ExtResource( 5 )] +[node name="Key33" parent="Collectibles" instance=ExtResource( 5 )] position = Vector2( 432, 152 ) [node name="Key34" parent="Collectibles" instance=ExtResource( 5 )] @@ -290,13 +282,13 @@ position = Vector2( 648, 168 ) [node name="Key50" parent="Collectibles" instance=ExtResource( 5 )] position = Vector2( 528, 56 ) -[node name="Key28" parent="Collectibles" groups=["speccy_skip"] instance=ExtResource( 5 )] +[node name="Key28" parent="Collectibles" instance=ExtResource( 5 )] position = Vector2( 408, 64 ) [node name="Key23" parent="Collectibles" instance=ExtResource( 5 )] position = Vector2( 616, 168 ) -[node name="Key21" parent="Collectibles" groups=["speccy_skip"] instance=ExtResource( 5 )] +[node name="Key21" parent="Collectibles" instance=ExtResource( 5 )] position = Vector2( 320, 120 ) [node name="Key29" parent="Collectibles" instance=ExtResource( 5 )] @@ -305,29 +297,29 @@ position = Vector2( 200, 168 ) [node name="Key30" parent="Collectibles" instance=ExtResource( 5 )] position = Vector2( 232, 168 ) -[node name="Key31" parent="Collectibles" groups=["speccy_skip"] instance=ExtResource( 5 )] +[node name="Key31" parent="Collectibles" instance=ExtResource( 5 )] position = Vector2( 272, 168 ) -[node name="Key32" parent="Collectibles" groups=["speccy_skip"] instance=ExtResource( 5 )] +[node name="Key32" parent="Collectibles" instance=ExtResource( 5 )] position = Vector2( 304, 168 ) -[node name="Key18" parent="Collectibles" groups=["speccy_appear"] instance=ExtResource( 5 )] +[node name="Key18" parent="Collectibles" instance=ExtResource( 5 )] position = Vector2( 152, 112 ) -[node name="Key19" parent="Collectibles" groups=["speccy_appear"] instance=ExtResource( 5 )] +[node name="Key19" parent="Collectibles" instance=ExtResource( 5 )] position = Vector2( 216, 80 ) -[node name="Key17" parent="Collectibles" groups=["speccy_appear"] instance=ExtResource( 5 )] +[node name="Key17" parent="Collectibles" instance=ExtResource( 5 )] position = Vector2( 200, 112 ) -[node name="Shard" parent="Collectibles" groups=["speccy_appear"] instance=ExtResource( 17 )] +[node name="Shard" parent="Collectibles" instance=ExtResource( 17 )] position = Vector2( 32, 32 ) [node name="Shard4" parent="Collectibles" instance=ExtResource( 17 )] position = Vector2( 648, 80 ) number = 2 -[node name="Shard2" parent="Collectibles" groups=["speccy_skip"] instance=ExtResource( 17 )] +[node name="Shard2" parent="Collectibles" instance=ExtResource( 17 )] position = Vector2( 456, 24 ) number = 1 @@ -335,7 +327,7 @@ number = 1 position = Vector2( 688, 80 ) number = 3 -[node name="Star3" parent="Collectibles" groups=["speccy_skip"] instance=ExtResource( 4 )] +[node name="Star3" parent="Collectibles" instance=ExtResource( 4 )] position = Vector2( 416, 104 ) color = 3 @@ -349,7 +341,7 @@ position = Vector2( 664, 80 ) position = Vector2( 760, 112 ) color = 4 -[node name="Star5" parent="Collectibles" groups=["speccy_appear"] instance=ExtResource( 4 )] +[node name="Star5" parent="Collectibles" instance=ExtResource( 4 )] position = Vector2( 224, 48 ) color = 2 @@ -452,12 +444,3 @@ format = 1 [node name="Exit" parent="." instance=ExtResource( 20 )] position = Vector2( 757, 164 ) cost = 25 - -[node name="SpeccyDetect" type="Node2D" parent="."] -position = Vector2( 224, 176 ) -script = ExtResource( 34 ) - -[node name="Speccy" parent="SpeccyDetect" instance=ExtResource( 33 )] -position = Vector2( -8, 0 ) -flip = true -message = "oi_go_right" diff --git a/maps/hills_speccy_detect.gd b/maps/hills_speccy_detect.gd deleted file mode 100644 index 5d89a23..0000000 --- a/maps/hills_speccy_detect.gd +++ /dev/null @@ -1,15 +0,0 @@ -extends Node2D - - -var try_for_speccy: bool = true - -onready var skippers: int = get_tree().get_nodes_in_group("speccy_skip").size() - - -func _physics_process(delta: float) -> void: - if try_for_speccy: - if get_tree().get_nodes_in_group("speccy_appear").empty(): - try_for_speccy = false - $Speccy.appear() - elif get_tree().get_nodes_in_group("speccy_skip").size() < skippers: - try_for_speccy = false diff --git a/maps/lab.tscn b/maps/lab.tscn index e407fcc..1fb41cb 100644 --- a/maps/lab.tscn +++ b/maps/lab.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=53 format=2] +[gd_scene load_steps=52 format=2] [ext_resource path="res://graphics/backgrounds/factory.png" type="Texture" id=1] [ext_resource path="res://objects/hud/hud.tscn" type="PackedScene" id=2] @@ -42,7 +42,6 @@ [ext_resource path="res://objects/enemy/sheriff.tscn" type="PackedScene" id=40] [ext_resource path="res://objects/lore/lab/scope.tscn" type="PackedScene" id=41] [ext_resource path="res://objects/lore/lab/sheriff.tscn" type="PackedScene" id=42] -[ext_resource path="res://objects/npc/speccy.tscn" type="PackedScene" id=43] [sub_resource type="ShaderMaterial" id=9] shader = ExtResource( 13 ) @@ -581,12 +580,5 @@ song_name = "♫Mitten" position = Vector2( 736, 36 ) cost = 25 -[node name="Speccy" parent="." instance=ExtResource( 43 )] -position = Vector2( 128, 96 ) -flip = true -message = "go_get_em" - -[connection signal="ready" from="Speccy" to="Speccy" method="appear"] - [editable path="ElectricTiles"] [editable path="ElectricTiles/DeathTile"] diff --git a/maps/rust.tscn b/maps/rust.tscn index cb64470..43f3103 100644 --- a/maps/rust.tscn +++ b/maps/rust.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=35 format=2] +[gd_scene load_steps=34 format=2] [ext_resource path="res://maps/map.gd" type="Script" id=1] [ext_resource path="res://objects/Camera2D.tscn" type="PackedScene" id=2] @@ -32,7 +32,6 @@ [ext_resource path="res://objects/lore/rust/rolling_saw.tscn" type="PackedScene" id=30] [ext_resource path="res://objects/lore/rust/rust_inc.tscn" type="PackedScene" id=31] [ext_resource path="res://graphics/turniwood/turning_platform_rust.png" type="Texture" id=32] -[ext_resource path="res://objects/npc/speccy.tscn" type="PackedScene" id=33] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 4, 112 ) @@ -548,7 +547,3 @@ song_name = "♫Cryokiller" [node name="Exit" parent="." instance=ExtResource( 19 )] position = Vector2( 752, 164 ) cost = 25 - -[node name="Speccy" parent="." groups=["button3"] instance=ExtResource( 33 )] -position = Vector2( 705, 41 ) -flip = true diff --git a/maps/station.tscn b/maps/station.tscn index 5ab3c5a..af3fc6c 100644 --- a/maps/station.tscn +++ b/maps/station.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=38 format=2] +[gd_scene load_steps=37 format=2] [ext_resource path="res://maps/station.gd" type="Script" id=1] [ext_resource path="res://objects/player/player.tscn" type="PackedScene" id=2] @@ -34,7 +34,6 @@ [ext_resource path="res://ui/theme.tres" type="Theme" id=32] [ext_resource path="res://graphics/hatch/hatch.png" type="Texture" id=33] [ext_resource path="res://graphics/turniwood/turning_platoform_lab.png" type="Texture" id=34] -[ext_resource path="res://objects/npc/speccy.tscn" type="PackedScene" id=35] [sub_resource type="Animation" id=2] resource_name = "open" @@ -570,14 +569,3 @@ margin_bottom = 221.0 theme = ExtResource( 32 ) text = "Help me get outta here!" - -[node name="SpeccyDetection" type="VisibilityNotifier2D" parent="."] -position = Vector2( 384, 136 ) -rect = Rect2( -10, -20, 20, 20 ) - -[node name="Speccy" parent="SpeccyDetection" instance=ExtResource( 35 )] -flip = true -message = "kill_em_all" - -[connection signal="screen_entered" from="SpeccyDetection" to="SpeccyDetection/Speccy" method="appear"] -[connection signal="screen_exited" from="SpeccyDetection" to="SpeccyDetection" method="queue_free"] diff --git a/maps/test_room.tscn b/maps/test_room.tscn index 48d9571..dec673d 100644 --- a/maps/test_room.tscn +++ b/maps/test_room.tscn @@ -1,7 +1,6 @@ -[gd_scene load_steps=33 format=2] +[gd_scene load_steps=32 format=2] [ext_resource path="res://tilesets/t_death.tres" type="TileSet" id=1] -[ext_resource path="res://objects/npc/speccy.tscn" type="PackedScene" id=2] [ext_resource path="res://tilesets/t_mountain.tres" type="TileSet" id=3] [ext_resource path="res://objects/hud/hud.tscn" type="PackedScene" id=4] [ext_resource path="res://objects/enemy/roboturret.tscn" type="PackedScene" id=5] @@ -122,12 +121,14 @@ position = Vector2( 48, 120 ) [node name="AnimatedSprite" parent="RollingFiend" index="0"] visible = false +frame = 1 [node name="SawTest2" type="AnimatedSprite" parent="RollingFiend"] material = SubResource( 4 ) position = Vector2( 4, 4 ) z_index = -3 frames = SubResource( 5 ) +frame = 1 playing = true [node name="Steam" parent="." instance=ExtResource( 23 )] @@ -137,7 +138,7 @@ position = Vector2( 27, 128 ) [node name="Button" parent="." instance=ExtResource( 19 )] position = Vector2( 16, 168 ) -target_group = "speccy" +target_group = "a" [node name="Cop" parent="." instance=ExtResource( 25 )] position = Vector2( 184, 112 ) @@ -203,7 +204,4 @@ position = Vector2( 144, 24 ) [node name="FallingBlock" parent="." instance=ExtResource( 24 )] position = Vector2( 124, 96 ) -[node name="speccy" parent="." groups=["speccy"] instance=ExtResource( 2 )] -position = Vector2( 82, 72 ) - [editable path="RollingFiend"] diff --git a/menus/credits.tscn b/menus/credits.tscn index 19d725c..256b952 100644 --- a/menus/credits.tscn +++ b/menus/credits.tscn @@ -627,10 +627,10 @@ tracks/0/loop_wrap = true tracks/0/imported = false tracks/0/enabled = true tracks/0/keys = { -"times": PoolRealArray( 0, 2, 3, 5, 6, 10, 11, 15, 16, 20, 21, 25, 26, 30, 31, 35, 36, 40, 41, 45, 46, 50, 51, 55, 56, 60, 61, 65, 66, 70, 71, 75, 76, 80, 81, 85, 86, 90 ), -"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ), +"times": PoolRealArray( 0, 2, 3, 5, 6, 10, 11, 15, 16, 20, 21, 25, 26, 30, 31, 35, 36, 40, 41, 45, 46, 50, 51, 55, 56, 60, 61, 65, 66, 70, 71, 75, 76, 80, 81, 85, 86, 90, 91, 95 ), +"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ), "update": 0, -"values": [ Vector2( 0, 0 ), Vector2( 0, 0 ), Vector2( -256, 0 ), Vector2( -256, 0 ), Vector2( -512, 0 ), Vector2( -512, 0 ), Vector2( -768, 0 ), Vector2( -768, 0 ), Vector2( -1024, 0 ), Vector2( -1024, 0 ), Vector2( -1280, 0 ), Vector2( -1280, 0 ), Vector2( -1536, 0 ), Vector2( -1536, 0 ), Vector2( -1792, 0 ), Vector2( -1792, 0 ), Vector2( -2048, 0 ), Vector2( -2048, 0 ), Vector2( -2304, 0 ), Vector2( -2304, 0 ), Vector2( -2560, 0 ), Vector2( -2560, 0 ), Vector2( -2816, 0 ), Vector2( -2816, 0 ), Vector2( -3072, 0 ), Vector2( -3072, 0 ), Vector2( -3328, 0 ), Vector2( -3328, 0 ), Vector2( -3584, 0 ), Vector2( -3584, 0 ), Vector2( -3840, 0 ), Vector2( -3840, 0 ), Vector2( -4096, 0 ), Vector2( -4096, 0 ), Vector2( -4352, 0 ), Vector2( -4352, 0 ), Vector2( -4608, 0 ), Vector2( -4608, 0 ) ] +"values": [ Vector2( 0, 0 ), Vector2( 0, 0 ), Vector2( -256, 0 ), Vector2( -256, 0 ), Vector2( -512, 0 ), Vector2( -512, 0 ), Vector2( -768, 0 ), Vector2( -768, 0 ), Vector2( -1024, 0 ), Vector2( -1024, 0 ), Vector2( -1280, 0 ), Vector2( -1280, 0 ), Vector2( -1536, 0 ), Vector2( -1536, 0 ), Vector2( -1792, 0 ), Vector2( -1792, 0 ), Vector2( -2048, 0 ), Vector2( -2048, 0 ), Vector2( -2304, 0 ), Vector2( -2304, 0 ), Vector2( -2560, 0 ), Vector2( -2560, 0 ), Vector2( -2816, 0 ), Vector2( -2816, 0 ), Vector2( -3072, 0 ), Vector2( -3072, 0 ), Vector2( -3328, 0 ), Vector2( -3328, 0 ), Vector2( -3584, 0 ), Vector2( -3584, 0 ), Vector2( -3840, 0 ), Vector2( -3840, 0 ), Vector2( -4096, 0 ), Vector2( -4096, 0 ), Vector2( -4352, 0 ), Vector2( -4352, 0 ), Vector2( -4608, 0 ), Vector2( -4608, 0 ), Vector2( -4864, 0 ), Vector2( -4864, 0 ) ] } [node name="Credits" type="Node" groups=["map"]] @@ -685,17 +685,17 @@ text = "Game Staff" [node name="RollCall" type="Label" parent="Control/TeamSG"] modulate = Color( 0.426872, 0.218491, 0.433594, 1 ) -margin_left = 2479.0 +margin_left = 2735.0 margin_top = -15.0 -margin_right = 2671.0 +margin_right = 2927.0 margin_bottom = 1.0 theme = SubResource( 93 ) text = "Roll Call!!!" [node name="RollCall2" type="Label" parent="Control/TeamSG"] -margin_left = 2479.0 +margin_left = 2735.0 margin_top = -17.0 -margin_right = 2671.0 +margin_right = 2927.0 margin_bottom = -1.0 theme = SubResource( 93 ) text = "Roll Call!!!" @@ -712,7 +712,7 @@ margin_right = 128.0 margin_bottom = 105.0 theme = ExtResource( 6 ) text = "Team SG is: Penny rigate, -Haze Weathers, Scarlett Sylvistrix +Haze Weathers, Ivy snyder and Dog Jelly. " align = 1 @@ -783,7 +783,7 @@ margin_left = 1280.0 margin_right = 1536.0 margin_bottom = 192.0 theme = ExtResource( 6 ) -text = "-Scarlett \"Shedge\" Sylvistrix- +text = "-Ivy \"Shedge\" Snyder- Lead Composer Sound effects mixing" @@ -804,12 +804,23 @@ Character design help" align = 1 valign = 1 -[node name="Wolfboy" type="Label" parent="Control"] +[node name="GasStationCoffee" type="Label" parent="Control"] material = ExtResource( 4 ) margin_left = 1792.0 margin_right = 2048.0 margin_bottom = 192.0 theme = ExtResource( 6 ) +text = "-Amber \"fami\" coffee- +voice of \"fami\"" +align = 1 +valign = 1 + +[node name="Wolfboy" type="Label" parent="Control"] +material = ExtResource( 4 ) +margin_left = 2048.0 +margin_right = 2304.0 +margin_bottom = 192.0 +theme = ExtResource( 6 ) text = "-WolfBoy \"SG-2083\"- \"infiltration\" border" align = 1 @@ -817,8 +828,8 @@ valign = 1 [node name="Bodhi" type="Label" parent="Control"] material = ExtResource( 4 ) -margin_left = 2048.0 -margin_right = 2304.0 +margin_left = 2304.0 +margin_right = 2560.0 margin_bottom = 192.0 theme = ExtResource( 6 ) text = "-Bodhi \"eviscerator\" darner- @@ -828,14 +839,14 @@ valign = 1 [node name="Playtesters" type="Label" parent="Control"] material = ExtResource( 4 ) -margin_left = 2304.0 -margin_right = 2560.0 +margin_left = 2560.0 +margin_right = 2816.0 margin_bottom = 192.0 theme = ExtResource( 6 ) text = "-Our playtesters- Penny rigate Haze Weathers -Scarlett Sylvistrix +Ivy snyder DogJelly Wolfboy Rhidianruckus @@ -846,8 +857,8 @@ valign = 1 [node name="WonderingNow" type="Label" parent="Control"] material = ExtResource( 4 ) -margin_left = 2560.0 -margin_right = 2816.0 +margin_left = 2816.0 +margin_right = 3072.0 margin_bottom = 192.0 theme = ExtResource( 6 ) text = "-You're wondering now- @@ -864,32 +875,29 @@ valign = 1 [node name="SpecialThanks" type="Label" parent="Control"] material = ExtResource( 4 ) -margin_left = 2816.0 -margin_right = 3072.0 +margin_left = 3072.0 +margin_right = 3328.0 margin_bottom = 192.0 theme = ExtResource( 6 ) text = "-Special thanks- Wolfboy -Cirquet -wily beast -RhidianRuckus -" +wily beast" align = 1 valign = 1 [node name="Playername" type="Label" parent="Control"] material = ExtResource( 4 ) -margin_left = 2816.0 -margin_top = 123.0 -margin_right = 3072.0 -margin_bottom = 133.0 +margin_left = 3072.0 +margin_top = 117.0 +margin_right = 3328.0 +margin_bottom = 127.0 theme = ExtResource( 6 ) text = "Ty Tiramisu" align = 1 autowrap = true [node name="RollCall1" type="Node2D" parent="Control"] -position = Vector2( 3328, 0 ) +position = Vector2( 3584, 0 ) [node name="SG" type="AnimatedSprite" parent="Control/RollCall1"] material = SubResource( 7 ) @@ -910,6 +918,7 @@ text = "SG" [node name="Speccy" type="AnimatedSprite" parent="Control/RollCall1"] position = Vector2( 155, 68 ) frames = SubResource( 97 ) +frame = 5 playing = true [node name="Label" type="Label" parent="Control/RollCall1/Speccy"] @@ -926,6 +935,7 @@ align = 1 material = SubResource( 8 ) position = Vector2( 106, 69 ) frames = SubResource( 18 ) +frame = 2 playing = true [node name="Label" type="Label" parent="Control/RollCall1/MsX"] @@ -955,6 +965,7 @@ align = 1 [node name="Fami" type="AnimatedSprite" parent="Control/RollCall1"] position = Vector2( 152, 135 ) frames = SubResource( 100 ) +frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall1/Fami"] @@ -990,7 +1001,7 @@ text = "Vile Villians" align = 1 [node name="RollCall2" type="Node2D" parent="Control"] -position = Vector2( 768, 0 ) +position = Vector2( 1024, 0 ) [node name="Eviscerator" type="AnimatedSprite" parent="Control/RollCall2"] material = SubResource( 13 ) @@ -1074,6 +1085,7 @@ align = 1 material = SubResource( 34 ) position = Vector2( 3024, 62 ) frames = SubResource( 43 ) +frame = 2 playing = true [node name="Label" type="Label" parent="Control/RollCall2/Skelarcher"] @@ -1105,6 +1117,7 @@ align = 1 material = SubResource( 47 ) position = Vector2( 3016, 24 ) frames = SubResource( 50 ) +frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall2/BioSlime"] @@ -1130,7 +1143,7 @@ Poachers" align = 1 [node name="RollCall3" type="Node2D" parent="Control"] -position = Vector2( 3840, 0 ) +position = Vector2( 4096, 0 ) [node name="Shedge" type="AnimatedSprite" parent="Control/RollCall3"] position = Vector2( 60, 25 ) @@ -1150,6 +1163,7 @@ align = 1 [node name="TheScrumpsTongue" type="AnimatedSprite" parent="Control/RollCall3"] position = Vector2( 156, 20 ) frames = SubResource( 57 ) +frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall3/TheScrumpsTongue"] @@ -1179,6 +1193,7 @@ align = 1 [node name="Squig" type="AnimatedSprite" parent="Control/RollCall3"] position = Vector2( 200, 64 ) frames = SubResource( 65 ) +frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall3/Squig"] @@ -1195,6 +1210,7 @@ align = 1 material = SubResource( 71 ) position = Vector2( 72, 152 ) frames = SubResource( 80 ) +frame = 3 playing = true [node name="Label" type="Label" parent="Control/RollCall3/Hellarcher"] @@ -1211,6 +1227,7 @@ align = 1 material = SubResource( 66 ) position = Vector2( 68, 104 ) frames = SubResource( 70 ) +frame = 1 playing = true [node name="Label" type="Label" parent="Control/RollCall3/Turchin"] @@ -1240,6 +1257,7 @@ position = Vector2( 4, 0 ) z_index = 1 frames = SubResource( 61 ) animation = "chomp" +frame = 1 playing = true [node name="Border" type="AnimatedSprite" parent="Control/RollCall3/Beel/Head/Sprite"] @@ -1247,6 +1265,7 @@ material = SubResource( 62 ) z_index = -1 frames = SubResource( 61 ) animation = "chomp" +frame = 1 playing = true [node name="ShapeTransform" type="RemoteTransform2D" parent="Control/RollCall3/Beel/Head"] @@ -1339,11 +1358,10 @@ experiments" align = 1 [node name="RollCall4" type="Node2D" parent="Control"] -position = Vector2( 768, 0 ) +position = Vector2( 1024, 0 ) [node name="2600" parent="Control/RollCall4" instance=ExtResource( 37 )] position = Vector2( 3464, -8 ) -make_explosions = true [node name="ShootTimer" parent="Control/RollCall4/2600" index="2"] autostart = false @@ -1439,6 +1457,7 @@ text = "Tin" align = 1 [node name="RollCall6" type="Node2D" parent="Control"] +position = Vector2( 256, 0 ) [node name="Famira" parent="Control/RollCall6" instance=ExtResource( 47 )] position = Vector2( 4502, 184 ) @@ -1467,7 +1486,7 @@ text = "Super Famira" align = 1 [node name="RollCall5" type="Node2D" parent="Control"] -position = Vector2( 4608, 0 ) +position = Vector2( 4864, 0 ) [node name="Haze" type="Sprite" parent="Control/RollCall5"] position = Vector2( 80, 136 ) diff --git a/menus/file_create.gd b/menus/file_create.gd index 3f2fe6f..fd6f68a 100644 --- a/menus/file_create.gd +++ b/menus/file_create.gd @@ -100,16 +100,10 @@ func _on_Exit_area_entered(area: Area2D) -> void: func _on_player_teleport_finished() -> void: if file.name.length() > 0: get_tree().paused = true - if Options.scoreboard_name.empty(): - Options.scoreboard_name = file.name - Options.save_options() file.save_to_file() Save.current_file = file Game.difficulty = file.difficulty Fade.fade_out(Options.transition_speed_secs) yield(Fade, "fade_finished") get_tree().paused = false - if Options.speedrun_timer: - SpeedrunTimer.timer_running = true - SpeedrunTimer.visible = true SceneManager.current_scene = load("res://cutscenes/intro_story.tscn").instance() diff --git a/menus/file_create.tscn b/menus/file_create.tscn index 1b622fa..1ca045b 100644 --- a/menus/file_create.tscn +++ b/menus/file_create.tscn @@ -1,26 +1,23 @@ -[gd_scene load_steps=32 format=2] +[gd_scene load_steps=29 format=2] [ext_resource path="res://shaders/ska_plane.gdshader" type="Shader" id=1] [ext_resource path="res://ui/theme.tres" type="Theme" id=2] [ext_resource path="res://shaders/wibble_wobble.gdshader" type="Shader" id=3] [ext_resource path="res://graphics/hud/sg_menu.png" type="Texture" id=4] [ext_resource path="res://graphics/hud/sg_tasting.png" type="Texture" id=5] -[ext_resource path="res://graphics/hud/scores/salty.png" type="Texture" id=6] +[ext_resource path="res://graphics/hud/pause_arrow.png" type="Texture" id=6] [ext_resource path="res://menus/file_create.gd" type="Script" id=7] [ext_resource path="res://ui/2ndpuberty_outline.tres" type="Material" id=8] [ext_resource path="res://tilesets/t_abstract.tres" type="TileSet" id=9] [ext_resource path="res://objects/player/player.tscn" type="PackedScene" id=10] [ext_resource path="res://objects/hud/letter_block.tscn" type="PackedScene" id=11] [ext_resource path="res://tilesets/t_ladders.tres" type="TileSet" id=12] -[ext_resource path="res://graphics/hud/scores/sweet.png" type="Texture" id=13] [ext_resource path="res://graphics/exit/exit.png" type="Texture" id=14] [ext_resource path="res://objects/environment/ladder/ladder.tscn" type="PackedScene" id=15] [ext_resource path="res://objects/hud/menu_sounds.tscn" type="PackedScene" id=16] [ext_resource path="res://shaders/can_stain.tres" type="Material" id=17] [ext_resource path="res://shaders/beam_of_sin.gdshader" type="Shader" id=18] [ext_resource path="res://graphics/exit/exit_back.png" type="Texture" id=19] -[ext_resource path="res://graphics/hud/scores/pungent.png" type="Texture" id=20] -[ext_resource path="res://graphics/hud/scores/spicy.png" type="Texture" id=21] [sub_resource type="ShaderMaterial" id=1] shader = ExtResource( 1 ) @@ -139,20 +136,20 @@ theme = ExtResource( 2 ) [node name="Sweet" type="TextureButton" parent="DifficultySelect/ButtonsPanel"] material = SubResource( 3 ) -margin_left = 5.0 -margin_top = 8.0 -margin_right = 17.0 -margin_bottom = 20.0 +margin_left = 8.0 +margin_top = 9.0 +margin_right = 16.0 +margin_bottom = 17.0 focus_neighbour_top = NodePath("../Pungent") focus_neighbour_bottom = NodePath("../Salty") -texture_focused = ExtResource( 13 ) +texture_focused = ExtResource( 6 ) [node name="Salty" type="TextureButton" parent="DifficultySelect/ButtonsPanel"] material = SubResource( 3 ) -margin_left = 5.0 -margin_top = 21.0 -margin_right = 17.0 -margin_bottom = 33.0 +margin_left = 8.0 +margin_top = 22.0 +margin_right = 16.0 +margin_bottom = 30.0 focus_neighbour_top = NodePath("../Sweet") focus_neighbour_bottom = NodePath("../Spicy") texture_focused = ExtResource( 6 ) @@ -160,29 +157,29 @@ texture_focused = ExtResource( 6 ) [node name="Spicy" type="TextureButton" parent="DifficultySelect/ButtonsPanel"] unique_name_in_owner = true material = SubResource( 3 ) -margin_left = 5.0 -margin_top = 34.0 -margin_right = 17.0 -margin_bottom = 46.0 +margin_left = 8.0 +margin_top = 35.0 +margin_right = 16.0 +margin_bottom = 43.0 focus_neighbour_top = NodePath("../Salty") focus_neighbour_bottom = NodePath("../Pungent") -texture_focused = ExtResource( 21 ) +texture_focused = ExtResource( 6 ) [node name="Pungent" type="TextureButton" parent="DifficultySelect/ButtonsPanel"] material = SubResource( 3 ) -margin_left = 5.0 -margin_top = 47.0 -margin_right = 17.0 -margin_bottom = 59.0 +margin_left = 8.0 +margin_top = 48.0 +margin_right = 16.0 +margin_bottom = 56.0 focus_neighbour_top = NodePath("../Spicy") focus_neighbour_bottom = NodePath("../Sweet") -texture_focused = ExtResource( 20 ) +texture_focused = ExtResource( 6 ) [node name="Body" type="Label" parent="DifficultySelect/ButtonsPanel"] material = SubResource( 2 ) -margin_left = 18.0 +margin_left = 16.0 margin_top = 8.0 -margin_right = 67.0 +margin_right = 65.0 margin_bottom = 57.0 text = "sweet salty @@ -412,7 +409,6 @@ glyph = 25 [node name="Ladder" parent="NameEntry" instance=ExtResource( 15 )] scale = Vector2( 1, 20 ) -can_climb_left = false [node name="Exit" type="Node2D" parent="NameEntry"] position = Vector2( 248, 148 ) diff --git a/menus/level_select_scholar.gd b/menus/level_select_scholar.gd index 6c1c13f..40885a3 100644 --- a/menus/level_select_scholar.gd +++ b/menus/level_select_scholar.gd @@ -44,15 +44,6 @@ func _ready() -> void: if Game.current_palette == "super_player": $"%Sparkles".visible = true $ShardCount.text = "%02d" % Save.current_file.get_total_shards() - - var save := Save.current_file - - if save.levels["boss3"].completed: - $"%Whirlpool".visible = true - $"%Whirlpool".play("default") - else: - $"%Whirlpool".visible = false - Fade.fade_in(Options.transition_speed_secs) # set initial offset selected_level = Game.current_level diff --git a/menus/level_select_scholar.tscn b/menus/level_select_scholar.tscn index d7c178b..f5907f2 100644 --- a/menus/level_select_scholar.tscn +++ b/menus/level_select_scholar.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=56 format=2] +[gd_scene load_steps=48 format=2] [ext_resource path="res://menus/level_select_scholar.gd" type="Script" id=1] [ext_resource path="res://graphics/level_select/world_map.png" type="Texture" id=2] @@ -21,32 +21,6 @@ [ext_resource path="res://objects/hud/menu_sounds.tscn" type="PackedScene" id=19] [ext_resource path="res://scripts/randomize_particle_start.gd" type="Script" id=20] [ext_resource path="res://graphics/particles/shine.png" type="Texture" id=21] -[ext_resource path="res://graphics/hud/gamepad_buttons.png" type="Texture" id=22] -[ext_resource path="res://scripts/show_button.gd" type="Script" id=23] - -[sub_resource type="AtlasTexture" id=33] -atlas = ExtResource( 15 ) -region = Rect2( 0, 0, 48, 48 ) - -[sub_resource type="AtlasTexture" id=34] -atlas = ExtResource( 15 ) -region = Rect2( 48, 0, 48, 48 ) - -[sub_resource type="AtlasTexture" id=35] -atlas = ExtResource( 15 ) -region = Rect2( 96, 0, 48, 48 ) - -[sub_resource type="AtlasTexture" id=36] -atlas = ExtResource( 15 ) -region = Rect2( 144, 0, 48, 48 ) - -[sub_resource type="SpriteFrames" id=32] -animations = [ { -"frames": [ SubResource( 33 ), SubResource( 34 ), SubResource( 35 ), SubResource( 36 ) ], -"loop": true, -"name": "default", -"speed": 8.0 -} ] [sub_resource type="CanvasItemMaterial" id=9] particles_animation = true @@ -954,11 +928,6 @@ tracks/1/keys = { "values": [ Vector2( 0, 0.02 ), Vector2( 1, 0.02 ), Vector2( 1, 1 ) ] } -[sub_resource type="AtlasTexture" id=37] -resource_local_to_scene = true -atlas = ExtResource( 22 ) -region = Rect2( 0, 0, 12, 10 ) - [node name="LevelSelect" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 @@ -970,10 +939,10 @@ margin_right = 256.0 margin_bottom = 192.0 texture = ExtResource( 2 ) -[node name="Whirlpool" type="AnimatedSprite" parent="."] -unique_name_in_owner = true -position = Vector2( 83, 65 ) -frames = SubResource( 32 ) +[node name="WhirlPool" type="TextureRect" parent="."] +margin_right = 256.0 +margin_bottom = 192.0 +texture = ExtResource( 15 ) [node name="WaveParticles" type="CPUParticles2D" parent="."] material = SubResource( 9 ) @@ -1476,36 +1445,6 @@ theme = ExtResource( 4 ) custom_fonts/font = ExtResource( 12 ) text = "72" -[node name="MenuIndicator" type="HBoxContainer" parent="."] -margin_left = 3.0 -margin_top = 23.0 -margin_right = 47.0 -margin_bottom = 33.0 -custom_constants/separation = 2 -script = ExtResource( 23 ) -action = "ui_cancel" - -[node name="Label" type="Label" parent="MenuIndicator"] -margin_right = 35.0 -margin_bottom = 10.0 -custom_fonts/font = ExtResource( 12 ) -text = "Menu:" - -[node name="KeyboardButton" type="Label" parent="MenuIndicator"] -margin_left = 37.0 -margin_right = 44.0 -margin_bottom = 10.0 -custom_fonts/font = ExtResource( 12 ) -text = "X" - -[node name="GamepadButton" type="TextureRect" parent="MenuIndicator"] -visible = false -margin_left = 46.0 -margin_right = 58.0 -margin_bottom = 10.0 -size_flags_vertical = 4 -texture = SubResource( 37 ) - [node name="Shard" parent="." instance=ExtResource( 11 )] position = Vector2( 4, 5 ) diff --git a/menus/main_menu.gd b/menus/main_menu.gd index d62e9bb..3856a39 100644 --- a/menus/main_menu.gd +++ b/menus/main_menu.gd @@ -7,8 +7,6 @@ func _ready(): Game.marathon_mode = false Fade.fade_in(Options.transition_speed_secs) #Grey out continue if no save files - SpeedrunTimer.visible = false - SpeedrunTimer.timer_running = false yield(get_tree(),"idle_frame") if Save.current_file and not Save.current_file.debug: $Panel/Continue.grab_focus() @@ -54,7 +52,7 @@ func _on_HighScores_button_down() -> void: Game.last_mm_button = @"Panel/HighScores" Fade.fade_out(Options.transition_speed_secs) yield(Fade, "fade_finished") - SceneManager.current_scene = load("res://menus/scoreboards_scholar.tscn").instance() + SceneManager.current_scene = load("res://menus/scoreboards.tscn").instance() func _on_Options_button_down() -> void: diff --git a/menus/results.gd b/menus/results.gd index c52e4ec..d8c2d4c 100644 --- a/menus/results.gd +++ b/menus/results.gd @@ -1,6 +1,7 @@ extends Node const Text3D = preload("res://objects/hud/3d_text.tscn") +const SubmitScore = preload("res://menus/submit_score.tscn") const LevelSelect := preload("res://menus/level_select_scholar.tscn") onready var shards: Node2D = $ShardsAndBonuses/Shards @@ -28,11 +29,6 @@ func _notification(what: int) -> void: func _ready() -> void: var palette = load("res://graphics/player/palettes/%s.tex" % Game.current_palette) $"%ArrowBonus".material.set_shader_param("palette", palette) - # easy indicator - if Game.difficulty == Game.Difficulty.SWEET: - $EasyIndicator.visible = true - else: - $EasyIndicator.visible = false #preload final score text_3d = Text3D.instance() text_3d.anim = "final score" @@ -65,53 +61,18 @@ func show_final_score(): func _on_AnimationPlayer_animation_finished(anim_name): - match anim_name: - "results": - if Game.marathon_mode: - Game.current_level += 1 - if Game.current_level > LevelData.marathon_end: - yield(get_tree().create_timer(6.0), "timeout") - Fade.fade_out(Options.transition_speed_secs) - yield(Fade, "fade_finished") - SceneManager.change_scene(load("res://menus/marathon_results.tscn").instance()) - else: - Game.change_map(LevelData.levels[Game.current_level].scene) - elif Game.final_score > Game.old_high_score: - animation_player.play("high_score") - else: - yield(get_tree().create_timer(6.0), "timeout") - Fade.fade_out(Options.transition_speed_secs) - yield(Fade, "fade_finished") - SceneManager.change_scene(LevelSelect.instance()) - "high_score": - if not Debug.is_cheating and not ScoreBoard.server_host.empty(): - animation_player.play("submit_score_popup") - else: - yield(get_tree().create_timer(5.0), "timeout") - Fade.fade_out(Options.transition_speed_secs) - yield(Fade, "fade_finished") - SceneManager.change_scene(LevelSelect.instance()) - - -func _on_YesSubmit_button_down() -> void: - $"%YesSubmit".release_focus() - animation_player.play("submit") - - var save_id = LevelData.levels[Game.current_level].save_id - var entry = ScoreBoard.ScoreEntry.new(Game.final_score, int(Game.time * 1000.0), Game.difficulty) - var submitted = yield(ScoreBoard.submit_score(save_id, entry), "completed") - if ScoreBoard.errored or not submitted: - animation_player.play("try_again") - else: - animation_player.play("success") - - -func _on_NoSubmit_button_down() -> void: - $"%NoSubmit".release_focus() - _next_screen() - - -func _next_screen() -> void: + if Game.marathon_mode: + Game.current_level += 1 + if Game.current_level > LevelData.marathon_end: + Fade.fade_out(Options.transition_speed_secs) + yield(Fade, "fade_finished") + SceneManager.change_scene(load("res://menus/marathon_results.tscn").instance()) + else: + Game.change_map(LevelData.levels[Game.current_level].scene) + return Fade.fade_out(Options.transition_speed_secs) yield(Fade, "fade_finished") - SceneManager.change_scene(LevelSelect.instance()) + if Debug.is_cheating == false: + SceneManager.change_scene(SubmitScore.instance()) + else: + SceneManager.change_scene(LevelSelect.instance()) diff --git a/menus/results.tscn b/menus/results.tscn index 6187708..b6d0d50 100644 --- a/menus/results.tscn +++ b/menus/results.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=36 format=2] +[gd_scene load_steps=21 format=2] [ext_resource path="res://shaders/wibble_wobble.gdshader" type="Shader" id=1] [ext_resource path="res://shaders/ska_plane.gdshader" type="Shader" id=2] @@ -14,12 +14,6 @@ [ext_resource path="res://graphics/player/palettes/default.tex" type="Texture" id=12] [ext_resource path="res://menus/results.gd" type="Script" id=13] [ext_resource path="res://menus/results_icon.tscn" type="PackedScene" id=14] -[ext_resource path="res://graphics/hud/high_score.png" type="Texture" id=15] -[ext_resource path="res://graphics/particles/shine.png" type="Texture" id=16] -[ext_resource path="res://scripts/randomize_particle_start.gd" type="Script" id=17] -[ext_resource path="res://graphics/hud/pause_arrow.png" type="Texture" id=18] -[ext_resource path="res://ui/2ndpuberty_scholar_outline.fnt" type="BitmapFont" id=19] -[ext_resource path="res://graphics/hud/scores/sweet.png" type="Texture" id=20] [sub_resource type="ShaderMaterial" id=5] shader = ExtResource( 2 ) @@ -42,29 +36,6 @@ shader = ExtResource( 3 ) shader_param/border_color = Color( 0, 0, 0, 1 ) shader_param/border_corners = false -[sub_resource type="Curve" id=11] -_data = [ Vector2( 0, 0 ), 0.0, 0.100639, 0, 0, Vector2( 0.158257, 1 ), 7.51724, -6.83592, 0, 0, Vector2( 0.31422, 0 ), 0.0, 0.0, 0, 0 ] - -[sub_resource type="Gradient" id=17] -interpolation_mode = 2 -offsets = PoolRealArray( 0, 0.734694, 1 ) -colors = PoolColorArray( 0.576471, 0.980392, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0 ) - -[sub_resource type="ShaderMaterial" id=14] -resource_local_to_scene = true -shader = ExtResource( 1 ) -shader_param/speed = Vector2( 4, 8 ) -shader_param/ammount = Vector2( 24, 12 ) -shader_param/offset = Vector2( 0, 0 ) -shader_param/delay = Vector2( 0, 0 ) - -[sub_resource type="ShaderMaterial" id=13] -shader = ExtResource( 1 ) -shader_param/speed = Vector2( 4, 8 ) -shader_param/ammount = Vector2( 1, 1 ) -shader_param/offset = Vector2( 0, 0 ) -shader_param/delay = Vector2( 0, 0 ) - [sub_resource type="ShaderMaterial" id=6] shader = ExtResource( 1 ) shader_param/speed = Vector2( 4, 8 ) @@ -146,205 +117,10 @@ tracks/5/keys = { "update": 1, "values": [ false ] } -tracks/6/type = "value" -tracks/6/path = NodePath("ShardsAndBonuses/FinalScore:visible") -tracks/6/interp = 1 -tracks/6/loop_wrap = true -tracks/6/imported = false -tracks/6/enabled = true -tracks/6/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ true ] -} -tracks/7/type = "value" -tracks/7/path = NodePath("ShardsAndBonuses/HighScore:visible") -tracks/7/interp = 1 -tracks/7/loop_wrap = true -tracks/7/imported = false -tracks/7/enabled = true -tracks/7/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ false ] -} -tracks/8/type = "value" -tracks/8/path = NodePath("ShardsAndBonuses/FinalScore:scale") -tracks/8/interp = 1 -tracks/8/loop_wrap = true -tracks/8/imported = false -tracks/8/enabled = true -tracks/8/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 0, -"values": [ Vector2( 1, 1 ) ] -} -tracks/9/type = "value" -tracks/9/path = NodePath("ShardsAndBonuses/HighScore:scale") -tracks/9/interp = 1 -tracks/9/loop_wrap = true -tracks/9/imported = false -tracks/9/enabled = true -tracks/9/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 0, -"values": [ Vector2( 1, 1 ) ] -} -tracks/10/type = "value" -tracks/10/path = NodePath("CenterContainer/SubmitScore:visible") -tracks/10/interp = 1 -tracks/10/loop_wrap = true -tracks/10/imported = false -tracks/10/enabled = true -tracks/10/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ false ] -} -tracks/11/type = "value" -tracks/11/path = NodePath("CenterContainer/SubmitScore:rect_scale") -tracks/11/interp = 1 -tracks/11/loop_wrap = true -tracks/11/imported = false -tracks/11/enabled = true -tracks/11/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 0, -"values": [ Vector2( 1, 1 ) ] -} -tracks/12/type = "value" -tracks/12/path = NodePath("CenterContainer/LoadingGraphic:visible") -tracks/12/interp = 1 -tracks/12/loop_wrap = true -tracks/12/imported = false -tracks/12/enabled = true -tracks/12/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ false ] -} -tracks/13/type = "value" -tracks/13/path = NodePath("CenterContainer/LoadingGraphic:rect_scale") -tracks/13/interp = 1 -tracks/13/loop_wrap = true -tracks/13/imported = false -tracks/13/enabled = true -tracks/13/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 0, -"values": [ Vector2( 1, 1 ) ] -} -tracks/14/type = "value" -tracks/14/path = NodePath("CenterContainer/LoadingGraphic:material:shader_param/ammount") -tracks/14/interp = 1 -tracks/14/loop_wrap = true -tracks/14/imported = false -tracks/14/enabled = true -tracks/14/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 0, -"values": [ Vector2( 24, 12 ) ] -} -tracks/15/type = "value" -tracks/15/path = NodePath("CenterContainer/SubmitScore:modulate") -tracks/15/interp = 1 -tracks/15/loop_wrap = true -tracks/15/imported = false -tracks/15/enabled = true -tracks/15/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 0, -"values": [ Color( 1, 1, 1, 1 ) ] -} -tracks/16/type = "value" -tracks/16/path = NodePath("CenterContainer/SubmitScore/Label:text") -tracks/16/interp = 1 -tracks/16/loop_wrap = true -tracks/16/imported = false -tracks/16/enabled = true -tracks/16/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ "submit score?" ] -} - -[sub_resource type="Animation" id=19] -resource_name = "high_score" -tracks/0/type = "value" -tracks/0/path = NodePath("ShardsAndBonuses:position") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 0, -"values": [ Vector2( -512, 0 ) ] -} -tracks/1/type = "value" -tracks/1/path = NodePath("ShardsAndBonuses/FinalScore:visible") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ true ] -} -tracks/2/type = "value" -tracks/2/path = NodePath("ShardsAndBonuses/HighScore:visible") -tracks/2/interp = 1 -tracks/2/loop_wrap = true -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/keys = { -"times": PoolRealArray( 0, 0.3 ), -"transitions": PoolRealArray( 1, 1 ), -"update": 1, -"values": [ false, true ] -} -tracks/3/type = "value" -tracks/3/path = NodePath("ShardsAndBonuses/FinalScore:scale") -tracks/3/interp = 1 -tracks/3/loop_wrap = true -tracks/3/imported = false -tracks/3/enabled = true -tracks/3/keys = { -"times": PoolRealArray( 0, 0.3 ), -"transitions": PoolRealArray( 1, 1 ), -"update": 0, -"values": [ Vector2( 1, 1 ), Vector2( 1e-05, 1 ) ] -} -tracks/4/type = "value" -tracks/4/path = NodePath("ShardsAndBonuses/HighScore:scale") -tracks/4/interp = 1 -tracks/4/loop_wrap = true -tracks/4/imported = false -tracks/4/enabled = true -tracks/4/keys = { -"times": PoolRealArray( 0, 0.3, 0.6 ), -"transitions": PoolRealArray( 1, 1, 1 ), -"update": 0, -"values": [ Vector2( 1, 1 ), Vector2( 1e-05, 1 ), Vector2( 1, 1 ) ] -} [sub_resource type="Animation" id=4] resource_name = "results" -length = 18.0 +length = 24.0 step = 1.0 tracks/0/type = "method" tracks/0/path = NodePath("ShardsAndBonuses/Shards/ResultsIcon") @@ -545,292 +321,6 @@ tracks/14/keys = { } ] } -[sub_resource type="Animation" id=15] -resource_name = "submit" -length = 0.3 -tracks/0/type = "value" -tracks/0/path = NodePath("CenterContainer/SubmitScore:rect_scale") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/keys = { -"times": PoolRealArray( 0, 0.3 ), -"transitions": PoolRealArray( 1, 1 ), -"update": 0, -"values": [ Vector2( 1, 1 ), Vector2( 1e-05, 1 ) ] -} -tracks/1/type = "value" -tracks/1/path = NodePath("CenterContainer/SubmitScore:visible") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ true ] -} -tracks/2/type = "value" -tracks/2/path = NodePath("CenterContainer/LoadingGraphic:material:shader_param/ammount") -tracks/2/interp = 1 -tracks/2/loop_wrap = true -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/keys = { -"times": PoolRealArray( 0, 0.2 ), -"transitions": PoolRealArray( 1, 1 ), -"update": 0, -"values": [ Vector2( 0, 0 ), Vector2( 24, 12 ) ] -} -tracks/3/type = "value" -tracks/3/path = NodePath("CenterContainer/LoadingGraphic:visible") -tracks/3/interp = 1 -tracks/3/loop_wrap = true -tracks/3/imported = false -tracks/3/enabled = true -tracks/3/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ true ] -} - -[sub_resource type="Animation" id=12] -resource_name = "submit_score_popup" -length = 1.5 -tracks/0/type = "value" -tracks/0/path = NodePath("ShardsAndBonuses:position") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 0, -"values": [ Vector2( -512, 0 ) ] -} -tracks/1/type = "value" -tracks/1/path = NodePath("CenterContainer/SubmitScore:visible") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ true ] -} -tracks/2/type = "value" -tracks/2/path = NodePath("CenterContainer/SubmitScore:rect_scale") -tracks/2/interp = 1 -tracks/2/loop_wrap = true -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/keys = { -"times": PoolRealArray( 0, 0.3 ), -"transitions": PoolRealArray( 1, 1 ), -"update": 0, -"values": [ Vector2( 1e-05, 1 ), Vector2( 1, 1 ) ] -} -tracks/3/type = "method" -tracks/3/path = NodePath("CenterContainer/SubmitScore/YesNoPrompt/HBoxContainer/YesSubmit") -tracks/3/interp = 1 -tracks/3/loop_wrap = true -tracks/3/imported = false -tracks/3/enabled = true -tracks/3/keys = { -"times": PoolRealArray( 0.5 ), -"transitions": PoolRealArray( 1 ), -"values": [ { -"args": [ ], -"method": "grab_focus" -} ] -} -tracks/4/type = "value" -tracks/4/path = NodePath("CenterContainer/SubmitScore:modulate") -tracks/4/interp = 1 -tracks/4/loop_wrap = true -tracks/4/imported = false -tracks/4/enabled = true -tracks/4/keys = { -"times": PoolRealArray( 0, 0.1 ), -"transitions": PoolRealArray( 1, 1 ), -"update": 1, -"values": [ Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 1 ) ] -} -tracks/5/type = "value" -tracks/5/path = NodePath("CenterContainer/LoadingGraphic:visible") -tracks/5/interp = 1 -tracks/5/loop_wrap = true -tracks/5/imported = false -tracks/5/enabled = true -tracks/5/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ false ] -} -tracks/6/type = "value" -tracks/6/path = NodePath("CenterContainer/SubmitScore/Label:text") -tracks/6/interp = 1 -tracks/6/loop_wrap = true -tracks/6/imported = false -tracks/6/enabled = true -tracks/6/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ "submit score?" ] -} - -[sub_resource type="Animation" id=18] -resource_name = "success" -length = 1.5 -tracks/0/type = "value" -tracks/0/path = NodePath("CenterContainer/LoadingGraphic:material:shader_param/ammount") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/keys = { -"times": PoolRealArray( 0, 0.3 ), -"transitions": PoolRealArray( 1, 1 ), -"update": 0, -"values": [ Vector2( 24, 12 ), Vector2( 0, 0 ) ] -} -tracks/1/type = "value" -tracks/1/path = NodePath("CenterContainer/CollectedParticles:emitting") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/keys = { -"times": PoolRealArray( 0.3 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ true ] -} -tracks/2/type = "value" -tracks/2/path = NodePath("CenterContainer/LoadingGraphic:visible") -tracks/2/interp = 1 -tracks/2/loop_wrap = true -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/keys = { -"times": PoolRealArray( 0, 0.3 ), -"transitions": PoolRealArray( 1, 1 ), -"update": 1, -"values": [ true, false ] -} -tracks/3/type = "value" -tracks/3/path = NodePath("CenterContainer/SubmitScore:visible") -tracks/3/interp = 1 -tracks/3/loop_wrap = true -tracks/3/imported = false -tracks/3/enabled = true -tracks/3/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ false ] -} -tracks/4/type = "method" -tracks/4/path = NodePath(".") -tracks/4/interp = 1 -tracks/4/loop_wrap = true -tracks/4/imported = false -tracks/4/enabled = true -tracks/4/keys = { -"times": PoolRealArray( 1.5 ), -"transitions": PoolRealArray( 1 ), -"values": [ { -"args": [ ], -"method": "_next_screen" -} ] -} - -[sub_resource type="Animation" id=16] -resource_name = "try_again" -length = 0.5 -tracks/0/type = "value" -tracks/0/path = NodePath("CenterContainer/SubmitScore:rect_scale") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/keys = { -"times": PoolRealArray( 0, 0.3 ), -"transitions": PoolRealArray( 1, 1 ), -"update": 0, -"values": [ Vector2( 1e-05, 1 ), Vector2( 1, 1 ) ] -} -tracks/1/type = "value" -tracks/1/path = NodePath("CenterContainer/SubmitScore:visible") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ true ] -} -tracks/2/type = "value" -tracks/2/path = NodePath("CenterContainer/LoadingGraphic:material:shader_param/ammount") -tracks/2/interp = 1 -tracks/2/loop_wrap = true -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/keys = { -"times": PoolRealArray( 0, 0.1, 0.3 ), -"transitions": PoolRealArray( 1, 1, 1 ), -"update": 0, -"values": [ Vector2( 24, 12 ), Vector2( 24, 12 ), Vector2( 0, 0 ) ] -} -tracks/3/type = "value" -tracks/3/path = NodePath("CenterContainer/LoadingGraphic:visible") -tracks/3/interp = 1 -tracks/3/loop_wrap = true -tracks/3/imported = false -tracks/3/enabled = true -tracks/3/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ true ] -} -tracks/4/type = "value" -tracks/4/path = NodePath("CenterContainer/SubmitScore/Label:text") -tracks/4/interp = 1 -tracks/4/loop_wrap = true -tracks/4/imported = false -tracks/4/enabled = true -tracks/4/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ "failed. try again?" ] -} -tracks/5/type = "method" -tracks/5/path = NodePath("CenterContainer/SubmitScore/YesNoPrompt/HBoxContainer/YesSubmit") -tracks/5/interp = 1 -tracks/5/loop_wrap = true -tracks/5/imported = false -tracks/5/enabled = true -tracks/5/keys = { -"times": PoolRealArray( 0.5 ), -"transitions": PoolRealArray( 1 ), -"values": [ { -"args": [ ], -"method": "grab_focus" -} ] -} - [node name="Results" type="Node"] script = ExtResource( 13 ) @@ -1039,28 +529,6 @@ material = ExtResource( 7 ) position = Vector2( 640, 40 ) texture = ExtResource( 8 ) -[node name="HighScore" type="Sprite" parent="ShardsAndBonuses"] -visible = false -material = ExtResource( 7 ) -position = Vector2( 640, 40 ) -texture = ExtResource( 15 ) - -[node name="Sparkles" type="CPUParticles2D" parent="ShardsAndBonuses/HighScore"] -light_mask = 0 -amount = 4 -lifetime = 2.0 -texture = ExtResource( 16 ) -emission_shape = 2 -emission_rect_extents = Vector2( 48, 8 ) -gravity = Vector2( 0, 0 ) -angular_velocity = 720.0 -angular_velocity_random = 1.0 -angle = 720.0 -angle_random = 1.0 -scale_amount_curve = SubResource( 11 ) -color = Color( 0.72549, 0.956863, 1, 1 ) -script = ExtResource( 17 ) - [node name="Score" type="Label" parent="."] material = ExtResource( 9 ) margin_top = 8.0 @@ -1070,13 +538,6 @@ theme = ExtResource( 10 ) text = "Score: 0000000" align = 1 -[node name="EasyIndicator" type="TextureRect" parent="."] -margin_left = 61.0 -margin_top = 7.0 -margin_right = 73.0 -margin_bottom = 19.0 -texture = ExtResource( 20 ) - [node name="Time" type="Label" parent="."] material = ExtResource( 9 ) margin_top = 178.0 @@ -1086,131 +547,6 @@ theme = ExtResource( 10 ) text = "Time: " align = 1 -[node name="CenterContainer" type="CenterContainer" parent="."] -anchor_right = 1.0 -anchor_bottom = 1.0 -margin_top = 77.0 -theme = ExtResource( 10 ) - -[node name="CollectedParticles" type="CPUParticles2D" parent="CenterContainer"] -pause_mode = 2 -position = Vector2( 127, 56 ) -emitting = false -amount = 64 -one_shot = true -explosiveness = 1.0 -local_coords = false -emission_shape = 2 -emission_rect_extents = Vector2( 4, 4 ) -direction = Vector2( 0, -1 ) -spread = 180.0 -gravity = Vector2( 0, 150 ) -initial_velocity = 250.0 -initial_velocity_random = 0.9 -damping = 2.0 -angle = 720.0 -angle_random = 1.0 -scale_amount_random = 1.0 -color_ramp = SubResource( 17 ) - -[node name="LoadingGraphic" type="Label" parent="CenterContainer"] -unique_name_in_owner = true -visible = false -material = SubResource( 14 ) -margin_left = 124.0 -margin_top = 52.0 -margin_right = 131.0 -margin_bottom = 62.0 -text = "§" -align = 1 -valign = 1 - -[node name="SubmitScore" type="VBoxContainer" parent="CenterContainer"] -unique_name_in_owner = true -visible = false -margin_left = 82.0 -margin_top = 39.0 -margin_right = 173.0 -margin_bottom = 75.0 -rect_pivot_offset = Vector2( 45.5, 18 ) -theme = ExtResource( 10 ) - -[node name="Label" type="Label" parent="CenterContainer/SubmitScore"] -margin_right = 91.0 -margin_bottom = 10.0 -custom_fonts/font = ExtResource( 19 ) -text = "submit score?" - -[node name="YesNoPrompt" type="PanelContainer" parent="CenterContainer/SubmitScore"] -margin_left = 1.0 -margin_top = 14.0 -margin_right = 90.0 -margin_bottom = 36.0 -size_flags_horizontal = 4 - -[node name="HBoxContainer" type="HBoxContainer" parent="CenterContainer/SubmitScore/YesNoPrompt"] -margin_left = 3.0 -margin_top = 3.0 -margin_right = 86.0 -margin_bottom = 19.0 -rect_min_size = Vector2( 0, 16 ) -rect_pivot_offset = Vector2( -174, -69 ) -custom_constants/separation = 0 -alignment = 1 - -[node name="YesSubmit" type="TextureButton" parent="CenterContainer/SubmitScore/YesNoPrompt/HBoxContainer"] -unique_name_in_owner = true -material = SubResource( 13 ) -margin_top = 4.0 -margin_right = 12.0 -margin_bottom = 12.0 -rect_min_size = Vector2( 12, 8 ) -focus_neighbour_right = NodePath("../NoSubmit") -size_flags_vertical = 4 -texture_focused = ExtResource( 18 ) -expand = true -stretch_mode = 3 - -[node name="YesLabel" type="Label" parent="CenterContainer/SubmitScore/YesNoPrompt/HBoxContainer"] -margin_left = 12.0 -margin_top = 3.0 -margin_right = 33.0 -margin_bottom = 13.0 -text = "Yes" - -[node name="Spacer" type="Control" parent="CenterContainer/SubmitScore/YesNoPrompt/HBoxContainer"] -margin_left = 33.0 -margin_right = 45.0 -margin_bottom = 16.0 -rect_min_size = Vector2( 12, 0 ) - -[node name="NoSubmit" type="TextureButton" parent="CenterContainer/SubmitScore/YesNoPrompt/HBoxContainer"] -unique_name_in_owner = true -material = SubResource( 13 ) -margin_left = 45.0 -margin_top = 4.0 -margin_right = 57.0 -margin_bottom = 12.0 -rect_min_size = Vector2( 12, 8 ) -focus_neighbour_left = NodePath("../YesSubmit") -size_flags_vertical = 4 -texture_focused = ExtResource( 18 ) -expand = true -stretch_mode = 3 - -[node name="NoLabel" type="Label" parent="CenterContainer/SubmitScore/YesNoPrompt/HBoxContainer"] -margin_left = 57.0 -margin_top = 3.0 -margin_right = 71.0 -margin_bottom = 13.0 -text = "No" - -[node name="Spacer2" type="Control" parent="CenterContainer/SubmitScore/YesNoPrompt/HBoxContainer"] -margin_left = 71.0 -margin_right = 83.0 -margin_bottom = 16.0 -rect_min_size = Vector2( 12, 0 ) - [node name="Results" type="Sprite" parent="."] material = SubResource( 6 ) position = Vector2( 232, 80 ) @@ -1220,13 +556,6 @@ texture = ExtResource( 4 ) autoplay = "results" playback_speed = 2.0 anims/RESET = SubResource( 10 ) -anims/high_score = SubResource( 19 ) anims/results = SubResource( 4 ) -anims/submit = SubResource( 15 ) -anims/submit_score_popup = SubResource( 12 ) -anims/success = SubResource( 18 ) -anims/try_again = SubResource( 16 ) -[connection signal="button_down" from="CenterContainer/SubmitScore/YesNoPrompt/HBoxContainer/YesSubmit" to="." method="_on_YesSubmit_button_down"] -[connection signal="button_down" from="CenterContainer/SubmitScore/YesNoPrompt/HBoxContainer/NoSubmit" to="." method="_on_NoSubmit_button_down"] [connection signal="animation_finished" from="AnimationPlayer" to="." method="_on_AnimationPlayer_animation_finished"] diff --git a/menus/score_entry.gd b/menus/score_entry.gd index 89927e3..d59a2ce 100644 --- a/menus/score_entry.gd +++ b/menus/score_entry.gd @@ -1,47 +1,26 @@ tool extends HBoxContainer -const DIFFICULTY_ICONS = [ - preload("res://graphics/hud/scores/sweet.png"), - preload("res://graphics/hud/scores/salty.png"), - preload("res://graphics/hud/scores/spicy.png"), - preload("res://graphics/hud/scores/pungent.png"), -] - export var place: int = 0 setget _set_place -export var player: String = "Username" setget _set_player -export var score: int = 0 setget _set_score -export var time: float = 0.0 setget _set_time -export(int, "Sweet", "Salty", "Spicy", "Pungent") var difficulty: int = 0 setget _set_difficulty +export var user: String = "Username" setget _set_user +export var score: String = "00000" setget _set_score func _ready() -> void: - _set_place(place) - _set_player(player) - _set_score(score) - _set_time(time) - _set_difficulty(difficulty) + $Place.text = " %01d " % place + $User.text = user + $Score.text = score func _set_place(value: int) -> void: place = value if is_inside_tree(): - $Place.text = "%d" % place + $Place.text = " %01d " % place -func _set_player(value: String) -> void: - player = value.substr(0, 10) +func _set_user(value: String) -> void: + user = value if is_inside_tree(): - $Player.text = player + $User.text = user -func _set_score(value: int) -> void: +func _set_score(value: String) -> void: score = value if is_inside_tree(): - $Score.text = "%05d" % score - -func _set_time(value: float) -> void: - time = value - if is_inside_tree(): - $Time.text = Game.format_time(time) - -func _set_difficulty(value: int) -> void: - difficulty = value - if is_inside_tree(): - $Difficulty.texture = DIFFICULTY_ICONS[difficulty] + $Score.text = score diff --git a/menus/score_entry.tscn b/menus/score_entry.tscn index 26aaa66..2eaac8c 100644 --- a/menus/score_entry.tscn +++ b/menus/score_entry.tscn @@ -1,60 +1,32 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=3 format=2] [ext_resource path="res://ui/theme.tres" type="Theme" id=1] [ext_resource path="res://menus/score_entry.gd" type="Script" id=2] -[ext_resource path="res://graphics/hud/scores/sweet.png" type="Texture" id=3] -[ext_resource path="res://ui/2ndpuberty_scholar_outline.fnt" type="BitmapFont" id=4] [node name="ScoreEntry" type="HBoxContainer"] -margin_right = 228.0 -margin_bottom = 12.0 -rect_min_size = Vector2( 0, 12 ) +margin_right = 210.0 +margin_bottom = 10.0 theme = ExtResource( 1 ) custom_constants/separation = 8 script = ExtResource( 2 ) -player = "coolplayer" +user = "--------" +score = "-----" [node name="Place" type="Label" parent="."] -margin_top = 1.0 -margin_right = 16.0 -margin_bottom = 11.0 -rect_min_size = Vector2( 16, 0 ) -custom_fonts/font = ExtResource( 4 ) -text = "0" -align = 1 +margin_right = 21.0 +margin_bottom = 10.0 +text = " 0 " -[node name="Player" type="Label" parent="."] -margin_left = 24.0 -margin_top = 1.0 -margin_right = 94.0 -margin_bottom = 11.0 -rect_min_size = Vector2( 70, 0 ) -custom_fonts/font = ExtResource( 4 ) -text = "coolplayer" -align = 1 +[node name="User" type="Label" parent="."] +margin_left = 29.0 +margin_right = 167.0 +margin_bottom = 10.0 +size_flags_horizontal = 3 +text = "--------" [node name="Score" type="Label" parent="."] -margin_left = 102.0 -margin_top = 1.0 -margin_right = 137.0 -margin_bottom = 11.0 -rect_min_size = Vector2( 35, 0 ) -custom_fonts/font = ExtResource( 4 ) -text = "00000" +margin_left = 175.0 +margin_right = 210.0 +margin_bottom = 10.0 +text = "-----" align = 2 - -[node name="Time" type="Label" parent="."] -margin_left = 145.0 -margin_top = 1.0 -margin_right = 201.0 -margin_bottom = 11.0 -rect_min_size = Vector2( 56, 0 ) -custom_fonts/font = ExtResource( 4 ) -text = "--:--.--" -align = 2 - -[node name="Difficulty" type="TextureRect" parent="."] -margin_left = 209.0 -margin_right = 221.0 -margin_bottom = 12.0 -texture = ExtResource( 3 ) diff --git a/menus/scoreboards_scholar.gd b/menus/scoreboards_scholar.gd deleted file mode 100644 index 9377f82..0000000 --- a/menus/scoreboards_scholar.gd +++ /dev/null @@ -1,113 +0,0 @@ -extends Node - - -const PAGE_SIZE: int = 8 - - -var loaded_scores: Dictionary = {} -var selected_level: int = 0 -var _page: int = 0 - - -onready var scores: VBoxContainer = $"%Scores" -onready var level_title: Button = $"%LevelTitle" - - -func _ready() -> void: - yield(_refresh_scores(), "completed") - Fade.fade_in(Options.transition_speed_secs) - - -func _input(event: InputEvent) -> void: - if event.is_action_pressed("ui_right"): - selected_level = posmod(selected_level + 1, LevelData.levels.size()) - while not LevelData.levels[selected_level].has_scoreboard: - selected_level = posmod(selected_level + 1, LevelData.levels.size()) - _refresh_scores() - elif event.is_action_pressed("ui_left"): - selected_level = posmod(selected_level - 1, LevelData.levels.size()) - while not LevelData.levels[selected_level].has_scoreboard: - selected_level = posmod(selected_level - 1, LevelData.levels.size()) - _refresh_scores() - elif event.is_action_pressed("ui_down"): - _page += 1 - _refresh_scores() - elif event.is_action_pressed("ui_up"): - _page = int(max(_page - 1, 0)) - _refresh_scores() - elif event.is_action_pressed("ui_cancel"): - Fade.fade_out(Options.transition_speed_secs) - yield(Fade, "fade_finished") - SceneManager.current_scene = preload("res://menus/main_menu.tscn").instance() - - -func _refresh_scores() -> void: - level_title.text = LevelData.levels[selected_level].title - - var level = LevelData.levels[selected_level].save_id - if not level in loaded_scores: - yield(_load_scores(level), "completed") - - if ScoreBoard.errored: - push_error("Scoreboard could not be loaded.") - - var entries = loaded_scores.get(level, {}) - - while _page * PAGE_SIZE > entries.size(): - _page -= 1 - - var offset = _page * PAGE_SIZE - - $"%PrevScores".visible = _page > 0 - $"%NextScores".visible = entries.size() - offset > PAGE_SIZE - - for i in 8: - var entry_node = scores.get_node("ScoreEntry%d" % i) - if i >= entries.size() - offset: - entry_node.visible = false - else: - var player = entries.keys()[offset + i] - var entry = entries[player] - entry_node.visible = true - entry_node.place = offset + i + 1 - entry_node.player = player - entry_node.score = entry.score - entry_node.time = float(entry.time) * 0.001 # convert from ms - entry_node.difficulty = entry.difficulty - - -func _load_scores(level: String) -> void: - loaded_scores[level] = {} - - if ScoreBoard.server_host.empty(): - yield(get_tree(), "idle_frame") - return - - var result: Dictionary = yield(ScoreBoard.get_scores(level), "completed") - if ScoreBoard.errored: - #TODO: failure indication - return - - var players = result.keys().duplicate() - _sorting_dict = result - players.sort_custom(self, "_sort_scores") - - for p in players: - loaded_scores[level][p] = result[p] - - -var _sorting_dict: Dictionary = {} -func _sort_scores(a, b) -> bool: - var score_a = _sorting_dict[a] - var score_b = _sorting_dict[b] - - if score_b.score < score_a.score: - return true - elif score_b.score == score_a.score: - if score_b.difficulty < score_a.difficulty: - return true - elif score_b.difficulty == score_a.difficulty: - if score_b.time > score_a.time: - return true - - return false diff --git a/menus/scoreboards_scholar.tscn b/menus/scoreboards_scholar.tscn deleted file mode 100644 index ca8f960..0000000 --- a/menus/scoreboards_scholar.tscn +++ /dev/null @@ -1,320 +0,0 @@ -[gd_scene load_steps=16 format=2] - -[ext_resource path="res://shaders/ska_plane.gdshader" type="Shader" id=1] -[ext_resource path="res://menus/scoreboards_scholar.gd" type="Script" id=2] -[ext_resource path="res://graphics/hud/arrow_down.png" type="Texture" id=3] -[ext_resource path="res://shaders/wibble_wobble.gdshader" type="Shader" id=4] -[ext_resource path="res://ui/theme.tres" type="Theme" id=5] -[ext_resource path="res://graphics/hud/pause_arrow.png" type="Texture" id=6] -[ext_resource path="res://menus/score_entry.tscn" type="PackedScene" id=7] -[ext_resource path="res://ui/2ndpuberty_scholar_outline.fnt" type="BitmapFont" id=8] -[ext_resource path="res://graphics/hud/arrow_up.png" type="Texture" id=9] - -[sub_resource type="ShaderMaterial" id=1] -shader = ExtResource( 1 ) -shader_param/color_1 = Color( 0.615686, 0.670588, 0.984314, 1 ) -shader_param/color_2 = Color( 1, 0.709804, 0.984314, 1 ) -shader_param/checker_size = Vector2( 24, 12 ) -shader_param/pan_speed = Vector2( 0, 0 ) -shader_param/cycle_speed = Vector2( 8, -8 ) -shader_param/cycle_alternation = Vector2( 0, 1 ) -shader_param/uv_transform = Transform2D( 1, 0, 1, 1, 0, 0 ) - -[sub_resource type="ShaderMaterial" id=2] -shader = ExtResource( 4 ) -shader_param/speed = Vector2( 4, 0 ) -shader_param/ammount = Vector2( 2, 0 ) -shader_param/offset = Vector2( 0, 0 ) -shader_param/delay = Vector2( 0, 0 ) - -[sub_resource type="ShaderMaterial" id=3] -shader = ExtResource( 4 ) -shader_param/speed = Vector2( 4, 0 ) -shader_param/ammount = Vector2( 2, 0 ) -shader_param/offset = Vector2( 0, 0 ) -shader_param/delay = Vector2( 4, 0 ) - -[sub_resource type="ShaderMaterial" id=5] -shader = ExtResource( 4 ) -shader_param/speed = Vector2( 0, 4 ) -shader_param/ammount = Vector2( 0, 2 ) -shader_param/offset = Vector2( 0, 0 ) -shader_param/delay = Vector2( 0, 0 ) - -[sub_resource type="ShaderMaterial" id=6] -shader = ExtResource( 4 ) -shader_param/speed = Vector2( 0, 4 ) -shader_param/ammount = Vector2( 0, 2 ) -shader_param/offset = Vector2( 0, 0 ) -shader_param/delay = Vector2( 0, 4 ) - -[sub_resource type="ShaderMaterial" id=4] -shader = ExtResource( 4 ) -shader_param/speed = Vector2( 8, 4 ) -shader_param/ammount = Vector2( 12, 24 ) -shader_param/offset = Vector2( 0, 0 ) -shader_param/delay = Vector2( 0, 0 ) - -[node name="Scoreboards" type="Node"] -script = ExtResource( 2 ) - -[node name="Background" type="ColorRect" parent="."] -material = SubResource( 1 ) -anchor_right = 1.0 -anchor_bottom = 1.0 - -[node name="BoardsScreen" type="VBoxContainer" parent="."] -anchor_right = 1.0 -anchor_bottom = 1.0 -theme = ExtResource( 5 ) -custom_constants/separation = 0 - -[node name="SelectLevel" type="HBoxContainer" parent="BoardsScreen"] -margin_right = 256.0 -margin_bottom = 16.0 -rect_min_size = Vector2( 0, 16 ) -alignment = 1 - -[node name="BackArrow" type="TextureRect" parent="BoardsScreen/SelectLevel"] -unique_name_in_owner = true -material = SubResource( 2 ) -margin_left = 72.0 -margin_top = 4.0 -margin_right = 78.0 -margin_bottom = 12.0 -size_flags_vertical = 4 -texture = ExtResource( 6 ) -flip_h = true - -[node name="LevelTitle" type="Button" parent="BoardsScreen/SelectLevel"] -unique_name_in_owner = true -margin_left = 82.0 -margin_top = 3.0 -margin_right = 173.0 -margin_bottom = 13.0 -size_flags_vertical = 4 -theme = ExtResource( 5 ) -custom_colors/font_color_focus = Color( 1, 0.968627, 0.709804, 1 ) -custom_colors/font_color = Color( 1, 1, 1, 1 ) -custom_fonts/font = ExtResource( 8 ) -text = "Verdant Hills" - -[node name="NextArrow" type="TextureRect" parent="BoardsScreen/SelectLevel"] -unique_name_in_owner = true -material = SubResource( 3 ) -margin_left = 177.0 -margin_top = 4.0 -margin_right = 183.0 -margin_bottom = 12.0 -size_flags_vertical = 4 -texture = ExtResource( 6 ) - -[node name="Scoreboard" type="HBoxContainer" parent="BoardsScreen"] -margin_top = 16.0 -margin_right = 256.0 -margin_bottom = 192.0 -focus_mode = 2 -size_flags_vertical = 3 -alignment = 1 - -[node name="PrevBoard" type="TextureRect" parent="BoardsScreen/Scoreboard"] -unique_name_in_owner = true -visible = false -material = SubResource( 2 ) -margin_top = 84.0 -margin_right = 6.0 -margin_bottom = 92.0 -size_flags_vertical = 4 -texture = ExtResource( 6 ) -flip_h = true - -[node name="MarginContainer" type="MarginContainer" parent="BoardsScreen/Scoreboard"] -margin_left = 10.0 -margin_right = 246.0 -margin_bottom = 176.0 -custom_constants/margin_right = 4 -custom_constants/margin_top = 4 -custom_constants/margin_left = 4 -custom_constants/margin_bottom = 4 - -[node name="VBoxContainer" type="VBoxContainer" parent="BoardsScreen/Scoreboard/MarginContainer"] -margin_left = 4.0 -margin_top = 4.0 -margin_right = 232.0 -margin_bottom = 172.0 - -[node name="Header" type="HBoxContainer" parent="BoardsScreen/Scoreboard/MarginContainer/VBoxContainer"] -margin_right = 228.0 -margin_bottom = 10.0 -rect_min_size = Vector2( 228, 10 ) -custom_constants/separation = 8 - -[node name="Place" type="Label" parent="BoardsScreen/Scoreboard/MarginContainer/VBoxContainer/Header"] -margin_right = 16.0 -margin_bottom = 10.0 -rect_min_size = Vector2( 16, 0 ) -custom_fonts/font = ExtResource( 8 ) -text = "#" -align = 1 - -[node name="Player" type="Label" parent="BoardsScreen/Scoreboard/MarginContainer/VBoxContainer/Header"] -margin_left = 24.0 -margin_right = 94.0 -margin_bottom = 10.0 -rect_min_size = Vector2( 70, 0 ) -custom_fonts/font = ExtResource( 8 ) -text = "Player" -align = 1 -clip_text = true - -[node name="Score" type="Label" parent="BoardsScreen/Scoreboard/MarginContainer/VBoxContainer/Header"] -margin_left = 102.0 -margin_right = 137.0 -margin_bottom = 10.0 -rect_min_size = Vector2( 35, 0 ) -custom_fonts/font = ExtResource( 8 ) -text = "score" -align = 2 - -[node name="Time" type="Label" parent="BoardsScreen/Scoreboard/MarginContainer/VBoxContainer/Header"] -margin_left = 145.0 -margin_right = 201.0 -margin_bottom = 10.0 -rect_min_size = Vector2( 56, 0 ) -custom_fonts/font = ExtResource( 8 ) -text = "time" -align = 1 - -[node name="Control" type="Control" parent="BoardsScreen/Scoreboard/MarginContainer/VBoxContainer/Header"] -margin_left = 209.0 -margin_right = 221.0 -margin_bottom = 10.0 -rect_min_size = Vector2( 12, 0 ) - -[node name="HSeparator" type="HSeparator" parent="BoardsScreen/Scoreboard/MarginContainer/VBoxContainer"] -margin_top = 14.0 -margin_right = 228.0 -margin_bottom = 15.0 -custom_constants/separation = 1 - -[node name="ScoreboardTabs" type="Control" parent="BoardsScreen/Scoreboard/MarginContainer/VBoxContainer"] -unique_name_in_owner = true -margin_top = 19.0 -margin_right = 228.0 -margin_bottom = 168.0 -size_flags_vertical = 3 - -[node name="Scores" type="VBoxContainer" parent="BoardsScreen/Scoreboard/MarginContainer/VBoxContainer/ScoreboardTabs"] -unique_name_in_owner = true -anchor_right = 1.0 -anchor_bottom = 1.0 - -[node name="PrevScores" type="TextureRect" parent="BoardsScreen/Scoreboard/MarginContainer/VBoxContainer/ScoreboardTabs/Scores"] -unique_name_in_owner = true -visible = false -material = SubResource( 5 ) -margin_left = 110.0 -margin_right = 118.0 -margin_bottom = 8.0 -rect_pivot_offset = Vector2( 3, 4 ) -size_flags_horizontal = 4 -size_flags_vertical = 4 -texture = ExtResource( 9 ) - -[node name="ScoreEntry0" parent="BoardsScreen/Scoreboard/MarginContainer/VBoxContainer/ScoreboardTabs/Scores" instance=ExtResource( 7 )] -place = 1 - -[node name="ScoreEntry1" parent="BoardsScreen/Scoreboard/MarginContainer/VBoxContainer/ScoreboardTabs/Scores" instance=ExtResource( 7 )] -margin_top = 16.0 -margin_bottom = 28.0 -place = 2 - -[node name="ScoreEntry2" parent="BoardsScreen/Scoreboard/MarginContainer/VBoxContainer/ScoreboardTabs/Scores" instance=ExtResource( 7 )] -margin_top = 32.0 -margin_bottom = 44.0 -place = 3 - -[node name="ScoreEntry3" parent="BoardsScreen/Scoreboard/MarginContainer/VBoxContainer/ScoreboardTabs/Scores" instance=ExtResource( 7 )] -margin_top = 48.0 -margin_bottom = 60.0 -place = 4 - -[node name="ScoreEntry4" parent="BoardsScreen/Scoreboard/MarginContainer/VBoxContainer/ScoreboardTabs/Scores" instance=ExtResource( 7 )] -margin_top = 64.0 -margin_bottom = 76.0 -place = 5 - -[node name="ScoreEntry5" parent="BoardsScreen/Scoreboard/MarginContainer/VBoxContainer/ScoreboardTabs/Scores" instance=ExtResource( 7 )] -margin_top = 80.0 -margin_bottom = 92.0 -place = 6 - -[node name="ScoreEntry6" parent="BoardsScreen/Scoreboard/MarginContainer/VBoxContainer/ScoreboardTabs/Scores" instance=ExtResource( 7 )] -margin_top = 96.0 -margin_bottom = 108.0 -place = 7 - -[node name="ScoreEntry7" parent="BoardsScreen/Scoreboard/MarginContainer/VBoxContainer/ScoreboardTabs/Scores" instance=ExtResource( 7 )] -margin_top = 112.0 -margin_bottom = 124.0 -place = 8 - -[node name="NextScores" type="TextureRect" parent="BoardsScreen/Scoreboard/MarginContainer/VBoxContainer/ScoreboardTabs/Scores"] -unique_name_in_owner = true -visible = false -material = SubResource( 6 ) -margin_left = 110.0 -margin_top = 128.0 -margin_right = 118.0 -margin_bottom = 136.0 -rect_pivot_offset = Vector2( 3, 4 ) -size_flags_horizontal = 4 -size_flags_vertical = 4 -texture = ExtResource( 3 ) - -[node name="LoadingIndicator" type="CenterContainer" parent="BoardsScreen/Scoreboard/MarginContainer/VBoxContainer/ScoreboardTabs"] -visible = false -anchor_right = 1.0 -anchor_bottom = 1.0 -size_flags_vertical = 3 - -[node name="Label" type="Label" parent="BoardsScreen/Scoreboard/MarginContainer/VBoxContainer/ScoreboardTabs/LoadingIndicator"] -material = SubResource( 4 ) -margin_left = 110.0 -margin_top = 69.0 -margin_right = 117.0 -margin_bottom = 79.0 -text = "§" - -[node name="FailedIndicator" type="CenterContainer" parent="BoardsScreen/Scoreboard/MarginContainer/VBoxContainer/ScoreboardTabs"] -visible = false -anchor_right = 1.0 -anchor_bottom = 1.0 - -[node name="Label" type="Label" parent="BoardsScreen/Scoreboard/MarginContainer/VBoxContainer/ScoreboardTabs/FailedIndicator"] -margin_left = 65.0 -margin_top = 69.0 -margin_right = 163.0 -margin_bottom = 79.0 -text = "Failed to load" - -[node name="PanelContainer" type="PanelContainer" parent="BoardsScreen/Scoreboard"] -visible = false -margin_left = 250.0 -margin_right = 474.0 -margin_bottom = 144.0 -rect_min_size = Vector2( 224, 144 ) -size_flags_horizontal = 4 -size_flags_vertical = 0 - -[node name="NextBoard" type="TextureRect" parent="BoardsScreen/Scoreboard"] -unique_name_in_owner = true -visible = false -material = SubResource( 3 ) -margin_left = 250.0 -margin_top = 84.0 -margin_right = 256.0 -margin_bottom = 92.0 -size_flags_horizontal = 0 -size_flags_vertical = 4 -texture = ExtResource( 6 ) diff --git a/menus/sound_test.tscn b/menus/sound_test.tscn index 740a33d..1e54358 100644 --- a/menus/sound_test.tscn +++ b/menus/sound_test.tscn @@ -193,6 +193,7 @@ material = SubResource( 12 ) position = Vector2( 72, 152 ) scale = Vector2( 2, 2 ) frames = SubResource( 15 ) +frame = 1 playing = true [node name="AnimatedSprite3" type="AnimatedSprite" parent="."] @@ -200,6 +201,7 @@ material = SubResource( 12 ) position = Vector2( 112, 152 ) scale = Vector2( 2, 2 ) frames = SubResource( 15 ) +frame = 1 playing = true [node name="AnimatedSprite4" type="AnimatedSprite" parent="."] @@ -207,6 +209,7 @@ material = SubResource( 12 ) position = Vector2( 152, 152 ) scale = Vector2( 2, 2 ) frames = SubResource( 15 ) +frame = 1 playing = true [node name="AnimatedSprite5" type="AnimatedSprite" parent="."] @@ -214,6 +217,7 @@ material = SubResource( 12 ) position = Vector2( 192, 152 ) scale = Vector2( 2, 2 ) frames = SubResource( 15 ) +frame = 1 playing = true [node name="Music" type="TextureButton" parent="."] @@ -262,7 +266,7 @@ margin_bottom = 121.0 focus_neighbour_top = NodePath("../Music") texture_focused = ExtResource( 27 ) script = ExtResource( 16 ) -titles = [ "Select", "Confirm", "Jump", "Double Jump", "Land", "Climb", "Bmilc", "Shoot", "Die", "Sploosh", "Bzaap", "Teleport", "Gover", "Key Get", "Arrow Get", "Star Get", "Skeleton Die", "Scrump Shoot", "Scrump Hurt", "Scrump Die", "Bubble Get", "Big Explosion", "Collapse", "Glass Break", "Bullet Barrage", "Laser Charge", "Rainbow Laser", "Mech Hurt 1", "Mech Hurt 2", "Mech Hurt 3", "Small Explosion", "Bullet Casing", "Button Click", "Ominous", "GunCock", "Shards Expelled", "Shards Absorbed", "Shard Float", "Fami Transform", "Scope Squish", "Scope Splat", "Famira Roar", "2083 Shoot", "Laser Ready", "Famira Breath", "Critical Heat", "Famira Die", "Collected Shard", "Missed Shard", "Final Score", "Revolution 2083", "Shard Get", "Good Job!", "Great Job!", "Victory", "Wonderful!", "Come Here", "Help Me", "Agh!", "Fuck!", "Shit...", "Take This", "Fami's Grand Plan", "Debug M", "Spaghetti", "Sword", "Egg Collect", "Talking", "Fami Grumble", "Segz", "Mech Creak", "Mech Step 1", "Mech Step 2", "Mech Walking", "Mech Duck", "Mech Unduck", "Resolve", "Robolution 2083", "Scarletution 2083", "Dogolution 2083", "Classic Good Job", "Good Job - Scarlett", "Good Job - Dog", "Great Job - Scarlett", "Great Job - Dog", "Classic Wonderful", "Wonderful - Scarlett", "Wonderful - Dog", "Fucking Cop...", "Goddammit...", "Motherfucker...", "Intro Voiceover" ] +titles = [ "Select", "Confirm", "Jump", "Double Jump", "Land", "Climb", "Bmilc", "Shoot", "Die", "Sploosh", "Bzaap", "Teleport", "Gover", "Key Get", "Arrow Get", "Star Get", "Skeleton Die", "Scrump Shoot", "Scrump Hurt", "Scrump Die", "Bubble Get", "Big Explosion", "Collapse", "Glass Break", "Bullet Barrage", "Laser Charge", "Rainbow Laser", "Mech Hurt 1", "Mech Hurt 2", "Mech Hurt 3", "Small Explosion", "Bullet Casing", "Button Click", "Ominous", "GunCock", "Shards Expelled", "Shards Absorbed", "Shard Float", "Fami Transform", "Scope Squish", "Scope Splat", "Famira Roar", "2083 Shoot", "Laser Ready", "Famira Breath", "Critical Heat", "Famira Die", "Collected Shard", "Missed Shard", "Final Score", "Revolution 2083", "Shard Get", "Good Job!", "Great Job!", "Victory", "Wonderful!", "Come Here", "Help Me", "Agh!", "Fuck!", "Shit...", "Take This", "Fami's Grand Plan", "Debug M", "Spaghetti", "Sword", "Egg Collect", "Talking", "Fami Grumble", "Segz", "Mech Creak", "Mech Step 1", "Mech Step 2", "Mech Walking", "Mech Duck", "Mech Unduck", "Resolve", "Robolution 2083", "Ivolution 2083", "Dogolution 2083", "Classic Good Job", "Good Job - Ivy", "Good Job - Dog", "Great Job - Ivy", "Great Job - Dog", "Classic Wonderful", "Wonderful - Ivy", "Wonderful - Dog", "Fucking Cop...", "Goddammit...", "Motherfucker...", "Intro Voiceover" ] sounds = [ ExtResource( 7 ), ExtResource( 10 ), ExtResource( 25 ), ExtResource( 34 ), ExtResource( 8 ), ExtResource( 42 ), ExtResource( 41 ), ExtResource( 32 ), ExtResource( 30 ), ExtResource( 117 ), ExtResource( 118 ), ExtResource( 113 ), ExtResource( 35 ), ExtResource( 6 ), ExtResource( 9 ), ExtResource( 43 ), ExtResource( 33 ), ExtResource( 51 ), ExtResource( 37 ), ExtResource( 31 ), ExtResource( 24 ), ExtResource( 36 ), ExtResource( 85 ), ExtResource( 116 ), ExtResource( 39 ), ExtResource( 77 ), ExtResource( 52 ), ExtResource( 50 ), ExtResource( 47 ), ExtResource( 49 ), ExtResource( 48 ), ExtResource( 38 ), ExtResource( 29 ), ExtResource( 55 ), ExtResource( 40 ), ExtResource( 57 ), ExtResource( 58 ), ExtResource( 114 ), ExtResource( 53 ), ExtResource( 54 ), ExtResource( 56 ), ExtResource( 59 ), ExtResource( 82 ), ExtResource( 83 ), ExtResource( 72 ), ExtResource( 95 ), ExtResource( 64 ), ExtResource( 66 ), ExtResource( 61 ), ExtResource( 65 ), ExtResource( 74 ), ExtResource( 128 ), ExtResource( 62 ), ExtResource( 60 ), ExtResource( 127 ), ExtResource( 76 ), ExtResource( 69 ), ExtResource( 68 ), ExtResource( 63 ), ExtResource( 70 ), ExtResource( 71 ), ExtResource( 67 ), ExtResource( 73 ), ExtResource( 80 ), ExtResource( 79 ), ExtResource( 78 ), ExtResource( 87 ), ExtResource( 92 ), ExtResource( 81 ), ExtResource( 75 ), ExtResource( 88 ), ExtResource( 86 ), ExtResource( 94 ), ExtResource( 93 ), ExtResource( 90 ), ExtResource( 89 ), ExtResource( 91 ), ExtResource( 105 ), ExtResource( 108 ), ExtResource( 107 ), ExtResource( 111 ), ExtResource( 96 ), ExtResource( 97 ), ExtResource( 100 ), ExtResource( 99 ), ExtResource( 110 ), ExtResource( 127 ), ExtResource( 112 ), ExtResource( 103 ), ExtResource( 102 ), ExtResource( 104 ), ExtResource( 115 ) ] categories = [ { "color": Color( 0.690196, 0.690196, 0.690196, 1 ), diff --git a/menus/title_screen.tscn b/menus/title_screen.tscn index 57d919d..1f59323 100644 --- a/menus/title_screen.tscn +++ b/menus/title_screen.tscn @@ -36,7 +36,6 @@ shader_param/uv_transform = Transform2D( 0, 1, 1, 0, 0, 0 ) shader = ExtResource( 11 ) shader_param/animate_noise = true shader_param/noise_intensity = 1.0 -shader_param/fps = 60.0 [sub_resource type="Curve" id=4] _data = [ Vector2( 0, 0 ), 0.0, 0.0, 0, 0, Vector2( 0.130639, 1 ), 0.0, 0.0, 0, 0, Vector2( 0.348684, 1 ), 0.0, 0.0, 0, 0, Vector2( 1, 0 ), 0.0, 0.0, 0, 0 ] diff --git a/objects/camera.gd b/objects/camera.gd index 73704bf..554ebc0 100644 --- a/objects/camera.gd +++ b/objects/camera.gd @@ -14,7 +14,6 @@ var msx_exists = false func _ready(): set_as_toplevel(true) Game.current_sector = last_sector - yield(get_tree(), "idle_frame") if get_tree().get_nodes_in_group("msx").size() > 0: msx = get_tree().get_nodes_in_group("msx").pop_front() msx_exists = true @@ -43,8 +42,8 @@ func _process(delta): else: off_level_indicator.visible = false #Ms.X off level indicator - if msx_exists: - if is_instance_valid(msx) and msx.get_parent().is_free: + if msx_exists && is_instance_valid(msx): + if msx.get_parent().is_free: msx_off_level_indicator.visible = true var msx_sector = Game.get_sector(msx.global_position) if msx_sector == current_sector: @@ -57,5 +56,3 @@ func _process(delta): msx_off_level_indicator.position.y = msx.global_position.y msx_off_level_indicator.position.x = 240 msx_off_level_indicator.anims.play("right") - else: - msx_off_level_indicator.visible = false diff --git a/objects/collectibles/shard.tscn b/objects/collectibles/shard.tscn index 6550926..46603f6 100644 --- a/objects/collectibles/shard.tscn +++ b/objects/collectibles/shard.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=11 format=2] +[gd_scene load_steps=10 format=2] [ext_resource path="res://shaders/1px_border.gdshader" type="Shader" id=1] [ext_resource path="res://graphics/collectibles/shard.png" type="Texture" id=2] @@ -14,21 +14,6 @@ shader_param/border_corners = false [sub_resource type="RectangleShape2D" id=6] extents = Vector2( 3.5, 3.5 ) -[sub_resource type="Animation" id=18] -length = 0.001 -tracks/0/type = "value" -tracks/0/path = NodePath("Sprite:modulate") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 0, -"values": [ Color( 1, 1, 1, 1 ) ] -} - [sub_resource type="Animation" id=8] resource_name = "glow" length = 0.8 @@ -43,7 +28,7 @@ tracks/0/keys = { "times": PoolRealArray( 0, 0.4, 0.8 ), "transitions": PoolRealArray( 1, 1, 1 ), "update": 0, -"values": [ Color( 0.766, 0.73, 1, 1 ), Color( 1.1, 1.1, 1.1, 1 ), Color( 0.766, 0.73, 1, 1 ) ] +"values": [ Color( 0.329412, 0.360784, 0.847059, 1 ), Color( 1, 1, 1, 1 ), Color( 0.329412, 0.360784, 0.847059, 1 ) ] } [sub_resource type="Curve" id=17] @@ -54,6 +39,7 @@ pause_mode = 2 script = ExtResource( 3 ) [node name="Sprite" type="Sprite" parent="."] +modulate = Color( 0.861621, 0.868095, 0.96844, 1 ) light_mask = 0 material = SubResource( 7 ) position = Vector2( 5, 3 ) @@ -69,7 +55,6 @@ position = Vector2( 4.5, 2.5 ) shape = SubResource( 6 ) [node name="AnimationPlayer" type="AnimationPlayer" parent="."] -anims/RESET = SubResource( 18 ) anims/glow = SubResource( 8 ) [node name="Sparkles" type="CPUParticles2D" parent="."] diff --git a/objects/enemy/boss/2600.gd b/objects/enemy/boss/2600.gd index 58c2483..d336c4f 100644 --- a/objects/enemy/boss/2600.gd +++ b/objects/enemy/boss/2600.gd @@ -71,7 +71,6 @@ func die(): 1: shot_speed = 70 $"%GlassShape".queue_free() - $"%GlassBreakParticles".emitting = true emit_signal("entered_phase", 3) head_sprite.texture = preload("res://graphics/enemy/boss/stg_2600/head_broken.png") 0: diff --git a/objects/enemy/boss/2600.tscn b/objects/enemy/boss/2600.tscn index eaf3db8..b5f6c23 100644 --- a/objects/enemy/boss/2600.tscn +++ b/objects/enemy/boss/2600.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=37 format=2] +[gd_scene load_steps=35 format=2] [ext_resource path="res://objects/enemy/boss/2600.gd" type="Script" id=1] [ext_resource path="res://graphics/enemy/boss/stg_2600/tailpipes.png" type="Texture" id=2] @@ -18,7 +18,6 @@ [ext_resource path="res://graphics/particles/smoke.png" type="Texture" id=16] [ext_resource path="res://shaders/fade.gdshader" type="Shader" id=17] [ext_resource path="res://graphics/fade_patterns/stg_explosion.png" type="Texture" id=18] -[ext_resource path="res://graphics/particles/glass_shard.png" type="Texture" id=19] [sub_resource type="ShaderMaterial" id=11] shader = ExtResource( 3 ) @@ -41,9 +40,6 @@ extents = Vector2( 128, 8 ) [sub_resource type="Curve" id=13] _data = [ Vector2( 0, 0 ), 0.0, 0.0, 0, 0, Vector2( 0.803571, 1 ), 0.0, 0.0, 0, 0, Vector2( 1, 0 ), 0.0, 0.0, 0, 0 ] -[sub_resource type="Curve" id=21] -_data = [ Vector2( 0, 1 ), 0.0, 0.0, 0, 0, Vector2( 0.937702, 1 ), 0.0, 0.0, 0, 0, Vector2( 1, 0 ), -25.1918, 0.0, 0, 0 ] - [sub_resource type="ShaderMaterial" id=8] shader = ExtResource( 11 ) shader_param/pixel_scale = 1.0 @@ -960,32 +956,6 @@ scale_amount = 0.5 scale_amount_random = 0.5 scale_amount_curve = SubResource( 13 ) -[node name="GlassBreakParticles" type="CPUParticles2D" parent="Axle/Head"] -unique_name_in_owner = true -position = Vector2( -35, -39 ) -emitting = false -amount = 24 -lifetime = 3.0 -one_shot = true -explosiveness = 0.95 -randomness = 0.5 -lifetime_randomness = 0.5 -texture = ExtResource( 19 ) -emission_shape = 2 -emission_rect_extents = Vector2( 16, 12 ) -direction = Vector2( 0, -1 ) -spread = 90.0 -gravity = Vector2( 0, 80 ) -initial_velocity = 80.0 -initial_velocity_random = 0.25 -angular_velocity = 720.0 -angular_velocity_random = 1.0 -angle = 720.0 -angle_random = 1.0 -scale_amount = 0.25 -scale_amount_random = 0.5 -scale_amount_curve = SubResource( 21 ) - [node name="JointFront" type="Sprite" parent="Axle"] position = Vector2( 11, -4 ) texture = ExtResource( 7 ) diff --git a/objects/enemy/uncanny_cat.gd b/objects/enemy/uncanny_cat.gd deleted file mode 100644 index 7e5f7e5..0000000 --- a/objects/enemy/uncanny_cat.gd +++ /dev/null @@ -1,31 +0,0 @@ -extends "res://objects/enemy/enemy.gd" - - -export var acceleration: float = 8.0 -export var max_speed: float = 16.0 - - -var velocity: Vector2 = Vector2.ZERO - - -onready var player: Node2D = get_tree().get_nodes_in_group("player")[0] - - -func _physics_process(delta: float) -> void: - if not is_instance_valid(player): - return - - var target = (player.global_position - global_position).normalized() - velocity += target * acceleration * delta - velocity = velocity.clamped(max_speed) - - global_position += velocity * delta - -func _on_Hitbox_area_entered(area): - #Kill player - if area.is_in_group("player_hitbox"): - area.get_parent().die() - $Jumpscare.visible = true - $JumpscareSound.play() - var tween = create_tween() - tween.tween_property($Jumpscare, "visible", false, 0).set_delay(1.7) diff --git a/objects/enemy/uncanny_cat.tscn b/objects/enemy/uncanny_cat.tscn deleted file mode 100644 index d944707..0000000 --- a/objects/enemy/uncanny_cat.tscn +++ /dev/null @@ -1,44 +0,0 @@ -[gd_scene load_steps=5 format=2] - -[ext_resource path="res://graphics/secret/uncanny.png" type="Texture" id=1] -[ext_resource path="res://objects/enemy/uncanny_cat.gd" type="Script" id=2] -[ext_resource path="res://audio/sounds/scrump_die.ogg" type="AudioStream" id=3] - -[sub_resource type="CircleShape2D" id=1] -radius = 7.0 - -[node name="UncannyCat" type="Node2D"] -script = ExtResource( 2 ) -blood = false -acceleration = 48.0 -max_speed = 56.0 - -[node name="Sprite" type="Sprite" parent="."] -texture = ExtResource( 1 ) - -[node name="Hitbox" type="Area2D" parent="."] - -[node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"] -shape = SubResource( 1 ) - -[node name="JumpscareSound" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 3 ) -pitch_scale = 2.0 -bus = "sound" - -[node name="Jumpscare" type="CanvasLayer" parent="."] -visible = false - -[node name="ColorRect" type="ColorRect" parent="Jumpscare"] -anchor_right = 1.0 -anchor_bottom = 1.0 -color = Color( 0, 0, 0, 1 ) - -[node name="TextureRect" type="TextureRect" parent="Jumpscare"] -anchor_right = 1.0 -anchor_bottom = 1.0 -texture = ExtResource( 1 ) -expand = true -stretch_mode = 6 - -[connection signal="area_entered" from="Hitbox" to="." method="_on_Hitbox_area_entered"] diff --git a/objects/hud/gamepad_buttons.atlastex b/objects/hud/gamepad_buttons.atlastex index d9d5e07..328c5d1 100644 Binary files a/objects/hud/gamepad_buttons.atlastex and b/objects/hud/gamepad_buttons.atlastex differ diff --git a/objects/hud/options_screen_scholar.gd b/objects/hud/options_screen_scholar.gd index 8206e92..4f8d11c 100644 --- a/objects/hud/options_screen_scholar.gd +++ b/objects/hud/options_screen_scholar.gd @@ -13,8 +13,6 @@ onready var select_tab: HBoxContainer = $"%SelectTab" # options nodes onready var rumble: HBoxContainer = $"%SelectRumble" onready var gore: HBoxContainer = $"%SelectGore" -onready var speedrun_timer: HBoxContainer = $"%SelectSpeedrunTimer" -onready var speccy_help: HBoxContainer = $"%SelectSpeccyHelp" onready var fullscreen: HBoxContainer = $"%SelectFullscreen" onready var window_size: HBoxContainer = $"%SelectWindowSize" onready var scaling: HBoxContainer = $"%SelectScaling" @@ -41,7 +39,7 @@ func focus() -> void: func _unhandled_input(event: InputEvent) -> void: Options.save_options() - if can_exit and event.is_action_pressed("ui_cancel") and not Options.entry: + if can_exit and event.is_action_pressed("ui_cancel"): if visible == true: emit_signal("exit") @@ -49,8 +47,6 @@ func _init_values() -> void: # game rumble.selection = Options.rumble gore.selection = Options.gore - speedrun_timer.selection = 1 if Options.speedrun_timer else 0 - speccy_help.selection = 1 if Options.speccy_help else 0 # video fullscreen.selection = 1 if Options.fullscreen else 0 window_size.selection = int(Options.window_size) - 1 @@ -85,12 +81,6 @@ func _on_Rumble_selected(selection) -> void: func _on_Gore_selected(selection) -> void: Options.gore = selection -func _on_SelectSpeedrunTimer_selected(selection) -> void: - Options.speedrun_timer = selection == 1 - -func _on_SelectSpeccyHelp_selected(selection) -> void: - Options.speccy_help = selection == 1 - # # VIDEO diff --git a/objects/hud/options_screen_scholar.tscn b/objects/hud/options_screen_scholar.tscn index 1939090..3e1f343 100644 --- a/objects/hud/options_screen_scholar.tscn +++ b/objects/hud/options_screen_scholar.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=19 format=2] +[gd_scene load_steps=16 format=2] [ext_resource path="res://objects/hud/options_screen_scholar.gd" type="Script" id=1] [ext_resource path="res://ui/theme.tres" type="Theme" id=2] @@ -11,21 +11,6 @@ [ext_resource path="res://objects/hud/set_gamepad_button.gd" type="Script" id=9] [ext_resource path="res://objects/hud/scroll_follow_focus.gd" type="Script" id=10] [ext_resource path="res://graphics/hud/levelselect_nexlevel.png" type="Texture" id=11] -[ext_resource path="res://objects/hud/player_name_input.gd" type="Script" id=12] - -[sub_resource type="StyleBoxFlat" id=5] -content_margin_left = 1.0 -content_margin_right = 1.0 -bg_color = Color( 0.14902, 0.0980392, 0.247059, 1 ) -corner_detail = 1 -anti_aliasing = false - -[sub_resource type="StyleBoxFlat" id=6] -content_margin_left = 1.0 -content_margin_right = 1.0 -bg_color = Color( 0.213124, 0.165611, 0.382812, 1 ) -corner_detail = 1 -anti_aliasing = false [sub_resource type="ShaderMaterial" id=1] shader = ExtResource( 4 ) @@ -115,6 +100,7 @@ size_flags_vertical = 3 tabs_visible = false [node name="Game" type="VBoxContainer" parent="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Tabs"] +visible = false anchor_right = 1.0 anchor_bottom = 1.0 focus_next = NodePath("Rumble/SelectRumble") @@ -160,84 +146,11 @@ margin_left = 39.0 margin_right = 218.0 margin_bottom = 12.0 focus_neighbour_top = NodePath("../../Rumble/SelectRumble") -focus_neighbour_bottom = NodePath("../../SpeedrunTimer/SelectSpeedrunTimer") focus_mode = 2 size_flags_horizontal = 3 script = ExtResource( 3 ) options = [ "none", "no stains", "full" ] -[node name="SpeedrunTimer" type="HBoxContainer" parent="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Tabs/Game"] -margin_top = 32.0 -margin_right = 218.0 -margin_bottom = 44.0 -rect_min_size = Vector2( 0, 12 ) - -[node name="Label" type="Label" parent="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Tabs/Game/SpeedrunTimer"] -margin_top = 1.0 -margin_right = 105.0 -margin_bottom = 11.0 -text = "Speedrun Timer:" - -[node name="SelectSpeedrunTimer" type="HBoxContainer" parent="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Tabs/Game/SpeedrunTimer"] -unique_name_in_owner = true -margin_left = 144.0 -margin_right = 183.0 -margin_bottom = 12.0 -focus_neighbour_top = NodePath("../../Gore/SelectGore") -focus_neighbour_bottom = NodePath("../../SpeccyHelp/SelectSpeccyHelp") -focus_mode = 2 -size_flags_horizontal = 6 -script = ExtResource( 3 ) -condense = true -options = [ "off", "on" ] - -[node name="SpeccyHelp" type="HBoxContainer" parent="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Tabs/Game"] -margin_top = 48.0 -margin_right = 218.0 -margin_bottom = 60.0 -rect_min_size = Vector2( 0, 12 ) - -[node name="Label" type="Label" parent="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Tabs/Game/SpeccyHelp"] -margin_top = 1.0 -margin_right = 119.0 -margin_bottom = 11.0 -text = "Help from speccy:" - -[node name="SelectSpeccyHelp" type="HBoxContainer" parent="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Tabs/Game/SpeccyHelp"] -unique_name_in_owner = true -margin_left = 151.0 -margin_right = 190.0 -margin_bottom = 12.0 -focus_neighbour_top = NodePath("../../SpeedrunTimer/SelectSpeedrunTimer") -focus_neighbour_bottom = NodePath("../../ScoreBoardName/PlayerNameInput") -focus_mode = 2 -size_flags_horizontal = 6 -script = ExtResource( 3 ) -condense = true -options = [ "off", "on" ] - -[node name="ScoreBoardName" type="HBoxContainer" parent="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Tabs/Game"] -margin_top = 64.0 -margin_right = 218.0 -margin_bottom = 74.0 - -[node name="Label" type="Label" parent="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Tabs/Game/ScoreBoardName"] -margin_right = 112.0 -margin_bottom = 10.0 -text = "Scoreboard name:" - -[node name="PlayerNameInput" type="TextEdit" parent="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Tabs/Game/ScoreBoardName"] -margin_left = 130.0 -margin_right = 203.0 -margin_bottom = 10.0 -rect_min_size = Vector2( 73, 0 ) -focus_neighbour_top = NodePath("../../SpeccyHelp/SelectSpeccyHelp") -size_flags_horizontal = 6 -custom_constants/line_spacing = 0 -custom_styles/focus = SubResource( 5 ) -custom_styles/normal = SubResource( 6 ) -script = ExtResource( 12 ) - [node name="Video" type="VBoxContainer" parent="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Tabs"] visible = false anchor_right = 1.0 @@ -546,7 +459,6 @@ script = ExtResource( 3 ) options = [ "off", "on" ] [node name="Input" type="VBoxContainer" parent="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Tabs"] -visible = false anchor_right = 1.0 anchor_bottom = 1.0 focus_next = NodePath("ScrollContainer/ControlsVBox/Left/Keyboard") @@ -913,12 +825,6 @@ align = 1 [connection signal="selected" from="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/SelectTab" to="." method="_on_tab_selected"] [connection signal="selected" from="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Tabs/Game/Rumble/SelectRumble" to="." method="_on_Rumble_selected"] [connection signal="selected" from="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Tabs/Game/Gore/SelectGore" to="." method="_on_Gore_selected"] -[connection signal="selected" from="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Tabs/Game/SpeedrunTimer/SelectSpeedrunTimer" to="." method="_on_SelectSpeedrunTimer_selected"] -[connection signal="selected" from="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Tabs/Game/SpeccyHelp/SelectSpeccyHelp" to="." method="_on_SelectSpeccyHelp_selected"] -[connection signal="focus_entered" from="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Tabs/Game/ScoreBoardName/PlayerNameInput" to="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Tabs/Game/ScoreBoardName/PlayerNameInput" method="_on_focus_entered"] -[connection signal="focus_exited" from="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Tabs/Game/ScoreBoardName/PlayerNameInput" to="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Tabs/Game/ScoreBoardName/PlayerNameInput" method="_on_focus_exited"] -[connection signal="gui_input" from="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Tabs/Game/ScoreBoardName/PlayerNameInput" to="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Tabs/Game/ScoreBoardName/PlayerNameInput" method="_on_gui_input"] -[connection signal="text_changed" from="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Tabs/Game/ScoreBoardName/PlayerNameInput" to="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Tabs/Game/ScoreBoardName/PlayerNameInput" method="_on_text_changed"] [connection signal="selected" from="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Tabs/Video/Fullscreen/SelectFullscreen" to="." method="_on_Fullscreen_selected"] [connection signal="selected" from="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Tabs/Video/WindowSize/SelectWindowSize" to="." method="_on_WindowSize_selected"] [connection signal="selected" from="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Tabs/Video/Scaling/SelectScaling" to="." method="_on_Scaling_selected"] diff --git a/objects/hud/player_name_input.gd b/objects/hud/player_name_input.gd deleted file mode 100644 index 23edaf8..0000000 --- a/objects/hud/player_name_input.gd +++ /dev/null @@ -1,29 +0,0 @@ -extends TextEdit - - -func _ready() -> void: - text = Options.scoreboard_name - - -func _exit_tree() -> void: - Options.entry = false - - -func _on_text_changed() -> void: - text = text.substr(0, 10).to_lower().strip_escapes() - Options.scoreboard_name = text - cursor_set_column(text.length()) - - -func _on_focus_entered() -> void: - Options.entry = true - cursor_set_column(text.length()) - - -func _on_focus_exited() -> void: - Options.set_deferred("entry", false) - - -func _on_gui_input(event: InputEvent) -> void: - if event.is_action_pressed("text_enter"): - get_node(focus_neighbour_top).grab_focus() diff --git a/objects/npc/speccy.gd b/objects/npc/speccy.gd deleted file mode 100644 index 982782f..0000000 --- a/objects/npc/speccy.gd +++ /dev/null @@ -1,65 +0,0 @@ -tool -extends Node2D - - -export(String, DIR) var messages_dir: String setget _set_messages_dir -export var flip: bool = false setget _set_flip -#export -var message: String setget _set_message - - -func _ready() -> void: - if Engine.editor_hint: - return - - scale.x = 0.0 - $Message.texture = load("%s/%s.png" % [messages_dir, message]) - - -func appear() -> void: - if Options.speccy_help: - $AnimationPlayer.play("fun") - - -func switch_action() -> void: - appear() - - -func _set_messages_dir(value: String) -> void: - messages_dir = value - property_list_changed_notify() - - -func _set_message(value: String) -> void: - message = value - if not Engine.editor_hint: - return - $Message.texture = load("%s/%s.png" % [messages_dir, message]) - - -func _set_flip(value: bool) -> void: - flip = value - $Flipper.scale.x = -1.0 if flip else 1.0 - - -func _get_property_list() -> Array: - var files: String = "" - var dir: Directory = Directory.new() - if dir.open(messages_dir) == OK: - dir.list_dir_begin(true, true) - var file_name: String = dir.get_next() - while file_name != "": - if not dir.current_is_dir() and file_name.ends_with(".png"): - files += "%s," % file_name.trim_suffix(".png") - file_name = dir.get_next() - files = files.trim_suffix(",") - else: - push_error("Failed to open dir: %s" % messages_dir) - return [ - { - name = "message", - type = TYPE_STRING, - hint = PROPERTY_HINT_ENUM, - hint_string = files, - } - ] diff --git a/objects/npc/speccy.tscn b/objects/npc/speccy.tscn deleted file mode 100644 index 3b2f0b6..0000000 --- a/objects/npc/speccy.tscn +++ /dev/null @@ -1,263 +0,0 @@ -[gd_scene load_steps=13 format=2] - -[ext_resource path="res://graphics/npc/speccy.png" type="Texture" id=1] -[ext_resource path="res://shaders/beam_cycle.gdshader" type="Shader" id=2] -[ext_resource path="res://graphics/enemy/boss/stg_2600/beam_gradient.png" type="Texture" id=3] -[ext_resource path="res://graphics/hud/speccy/over_here.png" type="Texture" id=4] -[ext_resource path="res://graphics/npc/speccy_talk.png" type="Texture" id=5] -[ext_resource path="res://graphics/npc/speccy_cool.png" type="Texture" id=6] -[ext_resource path="res://objects/npc/speccy.gd" type="Script" id=7] -[ext_resource path="res://audio/sounds/oi_sg.ogg" type="AudioStream" id=8] - -[sub_resource type="ShaderMaterial" id=3] -shader = ExtResource( 2 ) -shader_param/cycle_speed = 4.0 -shader_param/gradient = ExtResource( 3 ) - -[sub_resource type="Animation" id=1] -length = 0.001 -tracks/0/type = "value" -tracks/0/path = NodePath("Flipper/Sprite:scale") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 0, -"values": [ Vector2( 1, 1 ) ] -} -tracks/1/type = "value" -tracks/1/path = NodePath("Flipper/Sprite/Overlay:modulate") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 0, -"values": [ Color( 1, 1, 1, 0 ) ] -} -tracks/2/type = "value" -tracks/2/path = NodePath("Message:scale") -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 ), -"update": 0, -"values": [ Vector2( 1, 1 ) ] -} -tracks/3/type = "value" -tracks/3/path = NodePath("Flipper/Sprite:hframes") -tracks/3/interp = 1 -tracks/3/loop_wrap = true -tracks/3/imported = false -tracks/3/enabled = true -tracks/3/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ 1 ] -} -tracks/4/type = "value" -tracks/4/path = NodePath("Flipper/Sprite:texture") -tracks/4/interp = 1 -tracks/4/loop_wrap = true -tracks/4/imported = false -tracks/4/enabled = true -tracks/4/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ ExtResource( 1 ) ] -} -tracks/5/type = "value" -tracks/5/path = NodePath(".:scale") -tracks/5/interp = 1 -tracks/5/loop_wrap = true -tracks/5/imported = false -tracks/5/enabled = true -tracks/5/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 0, -"values": [ Vector2( 1, 1 ) ] -} -tracks/6/type = "value" -tracks/6/path = NodePath("OiSG:playing") -tracks/6/interp = 1 -tracks/6/loop_wrap = true -tracks/6/imported = false -tracks/6/enabled = true -tracks/6/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ false ] -} -tracks/7/type = "value" -tracks/7/path = NodePath("OiSG:stream_paused") -tracks/7/interp = 1 -tracks/7/loop_wrap = true -tracks/7/imported = false -tracks/7/enabled = true -tracks/7/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 1, -"values": [ true ] -} - -[sub_resource type="AtlasTexture" id=4] -atlas = ExtResource( 6 ) -region = Rect2( 72, 0, 24, 24 ) - -[sub_resource type="Animation" id=2] -resource_name = "fun" -length = 4.0 -step = 0.05 -tracks/0/type = "value" -tracks/0/path = NodePath("Flipper/Sprite:scale") -tracks/0/interp = 2 -tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/keys = { -"times": PoolRealArray( 0, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.5, 0.6, 3.3, 3.4, 3.5, 3.55, 3.6, 3.65, 3.7, 3.75, 3.8, 3.85, 3.9 ), -"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ), -"update": 0, -"values": [ Vector2( 1e-05, 1 ), Vector2( 0.75, 1 ), Vector2( 1e-05, 1 ), Vector2( -0.75, 1 ), Vector2( 1e-05, 1 ), Vector2( 0.75, 1 ), Vector2( 1e-05, 1 ), Vector2( -0.75, 1 ), Vector2( 1e-05, 1 ), Vector2( 1.25, 0.833 ), Vector2( 1, 1 ), Vector2( 1, 1 ), Vector2( 1.25, 0.833 ), Vector2( 1e-05, 1 ), Vector2( -0.75, 1 ), Vector2( 1e-05, 1 ), Vector2( 0.75, 1 ), Vector2( 1e-05, 1 ), Vector2( -0.75, 1 ), Vector2( 1e-05, 1 ), Vector2( 0.75, 1 ), Vector2( 1e-05, 1 ) ] -} -tracks/1/type = "value" -tracks/1/path = NodePath("Flipper/Sprite/Overlay:modulate") -tracks/1/interp = 2 -tracks/1/loop_wrap = true -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/keys = { -"times": PoolRealArray( 0, 0.5, 0.6, 3.3, 3.4, 3.9 ), -"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1 ), -"update": 0, -"values": [ Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 1 ), Color( 1, 1, 1, 1 ) ] -} -tracks/2/type = "value" -tracks/2/path = NodePath("Message:scale") -tracks/2/interp = 1 -tracks/2/loop_wrap = true -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/keys = { -"times": PoolRealArray( 0, 0.8, 0.9, 1, 2.95, 3.05, 3.15 ), -"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1 ), -"update": 0, -"values": [ Vector2( 0, 0 ), Vector2( 1e-05, 1e-05 ), Vector2( 1.0418, 1 ), Vector2( 1, 0.96 ), Vector2( 1, 0.96 ), Vector2( 1.0418, 1 ), Vector2( 1e-05, 1e-05 ) ] -} -tracks/3/type = "value" -tracks/3/path = NodePath("Flipper/Sprite:texture") -tracks/3/interp = 2 -tracks/3/loop_wrap = true -tracks/3/imported = false -tracks/3/enabled = true -tracks/3/keys = { -"times": PoolRealArray( 0, 0.75, 0.85, 1.4, 1.55, 1.75, 1.9, 2.05, 2.9 ), -"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1, 1, 1, 1 ), -"update": 1, -"values": [ ExtResource( 1 ), ExtResource( 1 ), ExtResource( 5 ), ExtResource( 1 ), ExtResource( 5 ), ExtResource( 1 ), ExtResource( 5 ), ExtResource( 1 ), ExtResource( 6 ) ] -} -tracks/4/type = "value" -tracks/4/path = NodePath("Flipper/Sprite:hframes") -tracks/4/interp = 1 -tracks/4/loop_wrap = true -tracks/4/imported = false -tracks/4/enabled = true -tracks/4/keys = { -"times": PoolRealArray( 0, 2.9 ), -"transitions": PoolRealArray( 1, 1 ), -"update": 1, -"values": [ 1, 4 ] -} -tracks/5/type = "value" -tracks/5/path = NodePath("Flipper/Sprite:frame") -tracks/5/interp = 1 -tracks/5/loop_wrap = true -tracks/5/imported = false -tracks/5/enabled = true -tracks/5/keys = { -"times": PoolRealArray( 0, 2.9, 2.95, 3, 3.05 ), -"transitions": PoolRealArray( 1, 1, 1, 1, 1 ), -"update": 1, -"values": [ 0, 0, 1, 2, 3 ] -} -tracks/6/type = "value" -tracks/6/path = NodePath("Flipper/Sprite/Overlay:texture") -tracks/6/interp = 1 -tracks/6/loop_wrap = true -tracks/6/imported = false -tracks/6/enabled = true -tracks/6/keys = { -"times": PoolRealArray( 0, 3.3 ), -"transitions": PoolRealArray( 1, 1 ), -"update": 1, -"values": [ ExtResource( 1 ), SubResource( 4 ) ] -} -tracks/7/type = "value" -tracks/7/path = NodePath(".:scale") -tracks/7/interp = 1 -tracks/7/loop_wrap = true -tracks/7/imported = false -tracks/7/enabled = true -tracks/7/keys = { -"times": PoolRealArray( 0 ), -"transitions": PoolRealArray( 1 ), -"update": 0, -"values": [ Vector2( 1, 1 ) ] -} -tracks/8/type = "value" -tracks/8/path = NodePath("OiSG:playing") -tracks/8/interp = 1 -tracks/8/loop_wrap = true -tracks/8/imported = false -tracks/8/enabled = true -tracks/8/keys = { -"times": PoolRealArray( 0, 0.85, 2.4 ), -"transitions": PoolRealArray( 1, 1, 1 ), -"update": 2, -"values": [ false, true, false ] -} - -[node name="Speccy" type="Node2D"] -script = ExtResource( 7 ) -messages_dir = "res://graphics/hud/speccy" -message = "over_here" - -[node name="Flipper" type="Node2D" parent="."] - -[node name="Sprite" type="Sprite" parent="Flipper"] -position = Vector2( -1, -12 ) -texture = ExtResource( 1 ) -offset = Vector2( -1, 0 ) - -[node name="Overlay" type="Sprite" parent="Flipper/Sprite"] -modulate = Color( 1, 1, 1, 0 ) -material = SubResource( 3 ) -texture = ExtResource( 1 ) -offset = Vector2( 1, 0 ) -region_rect = Rect2( 1.015, 0, 0, 0 ) - -[node name="Message" type="Sprite" parent="."] -position = Vector2( 0, -24 ) -texture = ExtResource( 4 ) - -[node name="OiSG" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 8 ) -stream_paused = true -bus = "sound" - -[node name="AnimationPlayer" type="AnimationPlayer" parent="."] -anims/RESET = SubResource( 1 ) -anims/fun = SubResource( 2 ) diff --git a/objects/player/player.gd b/objects/player/player.gd index 22b8818..7c6c2ad 100644 --- a/objects/player/player.gd +++ b/objects/player/player.gd @@ -33,8 +33,6 @@ export var jump_release_force: float = 0.25 export var double_jump_force: float = 122.0 ## if on turn on oxygentimer to kill player export var underwater = false -## old player controls -export var beta_gameplay = false # velocity var velocity: Vector2 = Vector2.ZERO @@ -49,8 +47,6 @@ var skip_blood: bool = false #whether sg has landed before var first_land = true -var can_shield = true - # NODE REFERENCES # onready var state_chart: StateChart = $StateChart @@ -94,7 +90,6 @@ func _ready() -> void: state_chart.set_guard_property("can_respawn", true) state_chart.set_guard_property("use_iframes", use_iframes) state_chart.set_guard_property("red_feather", false) - state_chart.set_guard_property("beta_gameplay", beta_gameplay) # state chart debug $StateDebugLayer/StateChartDebug.target = state_chart # set lung size @@ -121,17 +116,6 @@ func _physics_process(delta: float) -> void: state_chart.send_event("duck_pressed") if Input.is_action_just_released("move_down"): state_chart.send_event("duck_released") - if Input.is_action_just_pressed("shield") && Game.can_use_shield == true: - if can_shield: - Audio.play_sound(Audio.a_shield,Audio.ac_die) - $ShieldTimer.start() - $ShieldCooldown.start() - $Shield.visible = true - $"%AirborneShape".disabled = true - $"%GroundedShape".disabled = true - can_shield = false - - # send relevant events if is_on_floor(): # check on floor status @@ -473,10 +457,10 @@ func _process_climbing(delta: float) -> void: # if sign(_attached_ladder.middle - global_position.x) != horizontal_dir: # global_position.x -= graphics.scale.x * 3.0 # state_chart.send_event("ladder_detach")# - elif Input.is_action_just_pressed("move_left") and _attached_ladder.can_climb_left and not beta_gameplay: + elif Input.is_action_just_pressed("move_left") and _attached_ladder.can_climb_left: global_position.x = _attached_ladder.left_snap graphics.scale.x = 1.0 - elif Input.is_action_just_pressed("move_right") and _attached_ladder.can_climb_right and not beta_gameplay: + elif Input.is_action_just_pressed("move_right") and _attached_ladder.can_climb_right: global_position.x = _attached_ladder.right_snap graphics.scale.x = -1.0 else: @@ -587,18 +571,3 @@ func make_blood(): func _on_Zapping_state_exited(): $Graphics/ZapSprite.visible = false emit_signal("died") - - -func _on_ShieldTimer_timeout(): - $Shield.visible = false - $"%AirborneShape".disabled = false - $"%GroundedShape".disabled = false - - -func _on_ShieldCooldown_timeout(): - can_shield = true - Audio.play_sound(Audio.a_shield_cooldown,Audio.ac_boss) - - -func _on_BetaFalling_state_entered() -> void: - velocity.x = 0.0 diff --git a/objects/player/player.tscn b/objects/player/player.tscn index a05b632..b51552d 100644 --- a/objects/player/player.tscn +++ b/objects/player/player.tscn @@ -1094,12 +1094,6 @@ __meta__ = { } initial_state = NodePath("CanWalk") -[node name="On AirborneBeta" type="Node" parent="StateChart/Root/Movement/Grounded"] -script = ExtResource( 10 ) -to = NodePath("../../Airborne/Falling/BetaFalling") -event = "airborne" -guard_expression = "beta_gameplay" - [node name="On Airborne" type="Node" parent="StateChart/Root/Movement/Grounded"] script = ExtResource( 10 ) to = NodePath("../../Airborne/Falling/CoyoteFalling") @@ -1336,9 +1330,6 @@ delay = 0.067 [node name="NormalFalling" type="Node" parent="StateChart/Root/Movement/Airborne/Falling"] script = ExtResource( 11 ) -[node name="BetaFalling" type="Node" parent="StateChart/Root/Movement/Airborne/Falling"] -script = ExtResource( 11 ) - [node name="ScaredFalling" type="Node" parent="StateChart/Root/Movement/Airborne/Falling"] script = ExtResource( 11 ) @@ -1524,20 +1515,6 @@ margin_bottom = -18.0 theme = ExtResource( 7 ) align = 1 -[node name="ShieldTimer" type="Timer" parent="."] -wait_time = 0.5 - -[node name="Shield" type="Polygon2D" parent="."] -visible = false -position = Vector2( 1, -1 ) -scale = Vector2( 1.06667, 0.727273 ) -color = Color( 0.0352941, 0.796078, 0.854902, 0.470588 ) -polygon = PoolVector2Array( 0, -29, -8, -14.3333, -1, 4, 7, -14 ) - -[node name="ShieldCooldown" type="Timer" parent="."] -wait_time = 2.0 -one_shot = true - [connection signal="tree_exited" from="." to="." method="_on_Player_tree_exited"] [connection signal="body_entered" from="Hitbox" to="." method="_on_Hitbox_body_entered"] [connection signal="state_physics_processing" from="StateChart/Root/Movement" to="." method="_process_movement"] @@ -1555,8 +1532,8 @@ one_shot = true [connection signal="state_entered" from="StateChart/Root/Movement/Grounded/Shooting" to="." method="_on_Shooting_state_entered"] [connection signal="state_entered" from="StateChart/Root/Movement/Grounded/Pushing" to="." method="_on_Pushing_state_entered"] [connection signal="state_physics_processing" from="StateChart/Root/Movement/Grounded/Pushing" to="." method="_process_pushing"] -[connection signal="state_entered" from="StateChart/Root/Movement/Airborne" to="." method="reset_fall_speed"] [connection signal="state_entered" from="StateChart/Root/Movement/Airborne" to="." method="_on_Airborne_state_entered"] +[connection signal="state_entered" from="StateChart/Root/Movement/Airborne" to="." method="reset_fall_speed"] [connection signal="state_physics_processing" from="StateChart/Root/Movement/Airborne" to="." method="_process_gravity"] [connection signal="state_physics_processing" from="StateChart/Root/Movement/Airborne/Jump" to="." method="_process_horizontal_movement"] [connection signal="state_physics_processing" from="StateChart/Root/Movement/Airborne/Jump" to="." method="_process_jump"] @@ -1567,11 +1544,9 @@ one_shot = true [connection signal="state_physics_processing" from="StateChart/Root/Movement/Airborne/Falling/CoyoteFalling" to="." method="_process_horizontal_movement"] [connection signal="state_entered" from="StateChart/Root/Movement/Airborne/Falling/NormalFalling" to="." method="_on_NormalFalling_state_entered"] [connection signal="state_physics_processing" from="StateChart/Root/Movement/Airborne/Falling/NormalFalling" to="." method="_process_horizontal_movement"] -[connection signal="state_entered" from="StateChart/Root/Movement/Airborne/Falling/BetaFalling" to="." method="_on_NormalFalling_state_entered"] -[connection signal="state_entered" from="StateChart/Root/Movement/Airborne/Falling/BetaFalling" to="." method="_on_BetaFalling_state_entered"] [connection signal="state_entered" from="StateChart/Root/Movement/Airborne/Falling/ScaredFalling" to="." method="_on_ScaredFalling_state_entered"] -[connection signal="state_entered" from="StateChart/Root/Movement/Airborne/DoubleJump" to="." method="_on_DoubleJump_state_entered"] [connection signal="state_entered" from="StateChart/Root/Movement/Airborne/DoubleJump" to="." method="reset_fall_speed"] +[connection signal="state_entered" from="StateChart/Root/Movement/Airborne/DoubleJump" to="." method="_on_DoubleJump_state_entered"] [connection signal="state_physics_processing" from="StateChart/Root/Movement/Airborne/DoubleJump" to="." method="_process_horizontal_movement"] [connection signal="state_entered" from="StateChart/Root/Movement/Airborne/AirShooting" to="." method="_on_AirShooting_state_entered"] [connection signal="state_physics_processing" from="StateChart/Root/Movement/Airborne/AirShooting" to="." method="_process_horizontal_movement"] @@ -1594,5 +1569,3 @@ one_shot = true [connection signal="state_entered" from="StateChart/Root/Health/Zapping" to="." method="_on_Zapping_state_entered"] [connection signal="state_exited" from="StateChart/Root/Health/Zapping" to="." method="_on_Zapping_state_exited"] [connection signal="timeout" from="OxygenTimer" to="." method="_on_OxygenTimer_timeout"] -[connection signal="timeout" from="ShieldTimer" to="." method="_on_ShieldTimer_timeout"] -[connection signal="timeout" from="ShieldCooldown" to="." method="_on_ShieldCooldown_timeout"] diff --git a/project.godot b/project.godot index f9aa96b..711f1ec 100644 --- a/project.godot +++ b/project.godot @@ -109,12 +109,12 @@ SceneManager="*res://autoloads/scene_manager.tscn" Console="*res://autoloads/console.tscn" Fade="*res://autoloads/fade.tscn" StainLayer="*res://autoloads/stain_layer.tscn" -ScoreBoard="*res://autoloads/scoreboard.gd" -SpeedrunTimer="*res://autoloads/speedrun_timer.tscn" +Ngio="*res://autoloads/ngio.gd" [debug] gdscript/warnings/unused_argument=false +gdscript/warnings/return_value_discarded=false shapes/collision/shape_color=Color( 0.564706, 0, 0.701961, 0.188235 ) shapes/collision/contact_color=Color( 0.101961, 1, 0.176471, 0.8 ) shapes/collision/draw_2d_outlines=false @@ -354,18 +354,6 @@ ui_start={ , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":11,"pressure":0.0,"pressed":false,"script":null) ] } -shield={ -"deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":67,"physical_scancode":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":5,"pressure":0.0,"pressed":false,"script":null) - ] -} -text_enter={ -"deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777221,"physical_scancode":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777217,"physical_scancode":0,"unicode":0,"echo":false,"script":null) - ] -} [input_devices] diff --git a/scripts/level_entry.gd b/scripts/level_entry.gd index db1b37c..55024db 100644 --- a/scripts/level_entry.gd +++ b/scripts/level_entry.gd @@ -16,7 +16,8 @@ export var shards_required_spicy: int = 0 export var shards_required_pungent: int = 0 export var boss_required: String = "" export var boss: bool = false -export var has_scoreboard: bool = false +export var scores_id: int = -1 +export var times_id: int = -1 export var scene: PackedScene var shards_required: int = 0 setget , _get_shards_required diff --git a/scripts/show_button.gd b/scripts/show_button.gd deleted file mode 100644 index 8a67a01..0000000 --- a/scripts/show_button.gd +++ /dev/null @@ -1,22 +0,0 @@ -extends Control - - -export var action: String - - -onready var keyboard_button: Label = $KeyboardButton -onready var gamepad_button: TextureRect = $GamepadButton - - -func _process(delta: float) -> void: - if SceneManager.last_input_gamepad: - keyboard_button.visible = false - gamepad_button.visible = true - var button = Controls.get_button(action) - if button >= 0: - gamepad_button.texture.region.position.x = float(button % 8) * 12.0 - gamepad_button.texture.region.position.y = float(button / 8) * 10.0 - else: - keyboard_button.visible = true - gamepad_button.visible = false - keyboard_button.text = OS.get_scancode_string(Controls.get_key(action)) diff --git a/tilesets/t_abstract.tres b/tilesets/t_abstract.tres index fa4bac4..51ac7ec 100644 --- a/tilesets/t_abstract.tres +++ b/tilesets/t_abstract.tres @@ -66,7 +66,6 @@ points = PoolVector2Array( 0, 0, 8, 0, 8, 8, 0, 8 ) 0/autotile/navpoly_map = [ ] 0/autotile/priority_map = [ ] 0/autotile/z_index_map = [ ] -0/autotile/fallback_mode = 0 0/occluder_offset = Vector2( 0, 0 ) 0/navigation_offset = Vector2( 0, 0 ) 0/shape_offset = Vector2( 0, 0 ) diff --git a/tilesets/t_abyss.tres b/tilesets/t_abyss.tres index 76adf2b..eabe7cb 100644 --- a/tilesets/t_abyss.tres +++ b/tilesets/t_abyss.tres @@ -82,7 +82,6 @@ points = PoolVector2Array( 8, 2, 0, 2, 0, 2, 8, 2 ) 0/autotile/navpoly_map = [ ] 0/autotile/priority_map = [ ] 0/autotile/z_index_map = [ ] -0/autotile/fallback_mode = 0 0/occluder_offset = Vector2( 0, 0 ) 0/navigation_offset = Vector2( 0, 0 ) 0/shape_offset = Vector2( 0, 0 ) @@ -203,7 +202,6 @@ points = PoolVector2Array( 8, 2, 0, 2, 0, 2, 8, 2 ) 1/autotile/navpoly_map = [ ] 1/autotile/priority_map = [ ] 1/autotile/z_index_map = [ ] -1/autotile/fallback_mode = 0 1/occluder_offset = Vector2( 0, 0 ) 1/navigation_offset = Vector2( 0, 0 ) 1/shape_offset = Vector2( 0, 0 ) diff --git a/tilesets/t_canopy.tres b/tilesets/t_canopy.tres index 95814e5..94fd97e 100644 --- a/tilesets/t_canopy.tres +++ b/tilesets/t_canopy.tres @@ -181,7 +181,6 @@ points = PoolVector2Array( 8, 8, 0, 8, 0, 0, 8, 0 ) 2/autotile/navpoly_map = [ ] 2/autotile/priority_map = [ ] 2/autotile/z_index_map = [ ] -2/autotile/fallback_mode = 0 2/occluder_offset = Vector2( 0, 0 ) 2/navigation_offset = Vector2( 0, 0 ) 2/shape_offset = Vector2( 0, 0 ) @@ -296,7 +295,6 @@ points = PoolVector2Array( 8, 8, 0, 8, 0, 0, 8, 0 ) 3/autotile/navpoly_map = [ ] 3/autotile/priority_map = [ ] 3/autotile/z_index_map = [ ] -3/autotile/fallback_mode = 0 3/occluder_offset = Vector2( 0, 0 ) 3/navigation_offset = Vector2( 0, 0 ) 3/shape_offset = Vector2( 0, 0 ) diff --git a/tilesets/t_cave.tres b/tilesets/t_cave.tres index 978247f..f3eb607 100644 --- a/tilesets/t_cave.tres +++ b/tilesets/t_cave.tres @@ -152,7 +152,6 @@ points = PoolVector2Array( 8, 6, 0, 6, 0, 0, 8, 0 ) 1/autotile/navpoly_map = [ ] 1/autotile/priority_map = [ ] 1/autotile/z_index_map = [ ] -1/autotile/fallback_mode = 0 1/occluder_offset = Vector2( 0, 0 ) 1/navigation_offset = Vector2( 0, 0 ) 1/shape_offset = Vector2( 0, 0 ) @@ -273,7 +272,6 @@ points = PoolVector2Array( 8, 6, 0, 6, 0, 0, 8, 0 ) 2/autotile/navpoly_map = [ ] 2/autotile/priority_map = [ ] 2/autotile/z_index_map = [ ] -2/autotile/fallback_mode = 0 2/occluder_offset = Vector2( 0, 0 ) 2/navigation_offset = Vector2( 0, 0 ) 2/shape_offset = Vector2( 0, 0 ) diff --git a/tilesets/t_grass.tres b/tilesets/t_grass.tres index 4f434a5..d790a15 100644 --- a/tilesets/t_grass.tres +++ b/tilesets/t_grass.tres @@ -259,7 +259,6 @@ points = PoolVector2Array( 8, 8, 0, 8, 0, 0, 8, 0 ) 3/autotile/navpoly_map = [ ] 3/autotile/priority_map = [ ] 3/autotile/z_index_map = [ ] -3/autotile/fallback_mode = 0 3/occluder_offset = Vector2( 0, 0 ) 3/navigation_offset = Vector2( 0, 0 ) 3/shape_offset = Vector2( 0, 0 ) diff --git a/tilesets/t_horror.tres b/tilesets/t_horror.tres index cf67855..093b489 100644 --- a/tilesets/t_horror.tres +++ b/tilesets/t_horror.tres @@ -141,7 +141,6 @@ points = PoolVector2Array( 8, 8, 0, 8, 0, 0, 8, 0 ) 0/autotile/navpoly_map = [ ] 0/autotile/priority_map = [ ] 0/autotile/z_index_map = [ ] -0/autotile/fallback_mode = 0 0/occluder_offset = Vector2( 0, 0 ) 0/navigation_offset = Vector2( 0, 0 ) 0/shape_offset = Vector2( 0, 0 ) @@ -316,7 +315,6 @@ points = PoolVector2Array( 8, 8, 0, 8, 0, 0, 8, 0 ) 1/autotile/navpoly_map = [ ] 1/autotile/priority_map = [ ] 1/autotile/z_index_map = [ ] -1/autotile/fallback_mode = 0 1/occluder_offset = Vector2( 0, 0 ) 1/navigation_offset = Vector2( 0, 0 ) 1/shape_offset = Vector2( 0, 0 ) diff --git a/tilesets/t_laboratory.tres b/tilesets/t_laboratory.tres index 1f4092e..0b052b3 100644 --- a/tilesets/t_laboratory.tres +++ b/tilesets/t_laboratory.tres @@ -132,7 +132,6 @@ points = PoolVector2Array( 8, 2, 0, 2, 0, 2, 8, 2 ) 0/autotile/navpoly_map = [ ] 0/autotile/priority_map = [ ] 0/autotile/z_index_map = [ ] -0/autotile/fallback_mode = 0 0/occluder_offset = Vector2( 0, 0 ) 0/navigation_offset = Vector2( 0, 0 ) 0/shape_offset = Vector2( 0, 0 ) @@ -181,7 +180,6 @@ points = PoolVector2Array( 8, 2, 0, 2, 0, 2, 8, 2 ) 1/autotile/navpoly_map = [ ] 1/autotile/priority_map = [ ] 1/autotile/z_index_map = [ ] -1/autotile/fallback_mode = 0 1/occluder_offset = Vector2( 0, 0 ) 1/navigation_offset = Vector2( 0, 0 ) 1/shape_offset = Vector2( 0, 0 ) @@ -302,7 +300,6 @@ points = PoolVector2Array( 8, 2, 0, 2, 0, 2, 8, 2 ) 2/autotile/navpoly_map = [ ] 2/autotile/priority_map = [ ] 2/autotile/z_index_map = [ ] -2/autotile/fallback_mode = 0 2/occluder_offset = Vector2( 0, 0 ) 2/navigation_offset = Vector2( 0, 0 ) 2/shape_offset = Vector2( 0, 0 ) @@ -423,7 +420,6 @@ points = PoolVector2Array( 8, 2, 0, 2, 0, 2, 8, 2 ) 3/autotile/navpoly_map = [ ] 3/autotile/priority_map = [ ] 3/autotile/z_index_map = [ ] -3/autotile/fallback_mode = 0 3/occluder_offset = Vector2( 0, 0 ) 3/navigation_offset = Vector2( 0, 0 ) 3/shape_offset = Vector2( 0, 0 ) diff --git a/tilesets/t_station.tres b/tilesets/t_station.tres index 8c786ba..ed8a090 100644 --- a/tilesets/t_station.tres +++ b/tilesets/t_station.tres @@ -169,7 +169,6 @@ points = PoolVector2Array( 0, 0, 8, 0, 8, 8, 0, 8 ) 1/autotile/navpoly_map = [ ] 1/autotile/priority_map = [ ] 1/autotile/z_index_map = [ ] -1/autotile/fallback_mode = 0 1/occluder_offset = Vector2( 0, 0 ) 1/navigation_offset = Vector2( 0, 0 ) 1/shape_offset = Vector2( 0, 0 )