From 2a1eda7cc0699f2e99b2ba7bf75e7b56b916d5bd Mon Sep 17 00:00:00 2001 From: pennyrigate Date: Tue, 13 Aug 2024 20:33:46 -0400 Subject: [PATCH 01/50] shield! --- audio/sounds/coin.wav | Bin 0 -> 14188 bytes audio/sounds/coin.wav.import | 23 +++++++++++++++++++++++ audio/sounds/stab.wav | Bin 0 -> 7108 bytes audio/sounds/stab.wav.import | 23 +++++++++++++++++++++++ autoloads/audio.gd | 2 ++ autoloads/debug.gd | 3 +++ autoloads/game.gd | 1 + objects/player/player.gd | 24 ++++++++++++++++++++++++ objects/player/player.tscn | 20 ++++++++++++++++++-- project.godot | 6 ++++++ 10 files changed, 100 insertions(+), 2 deletions(-) create mode 100644 audio/sounds/coin.wav create mode 100644 audio/sounds/coin.wav.import create mode 100644 audio/sounds/stab.wav create mode 100644 audio/sounds/stab.wav.import diff --git a/audio/sounds/coin.wav b/audio/sounds/coin.wav new file mode 100644 index 0000000000000000000000000000000000000000..c258b39e772a0a35b57e30394cd852926bc6fc48 GIT binary patch literal 14188 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 literal 0 HcmV?d00001 diff --git a/audio/sounds/coin.wav.import b/audio/sounds/coin.wav.import new file mode 100644 index 0000000..24f1394 --- /dev/null +++ b/audio/sounds/coin.wav.import @@ -0,0 +1,23 @@ +[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/stab.wav b/audio/sounds/stab.wav new file mode 100644 index 0000000000000000000000000000000000000000..665e7e26b415109fa55da5aff78cade736c46b4d GIT binary patch literal 7108 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 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 @@ -571,3 +584,14 @@ 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) diff --git a/objects/player/player.tscn b/objects/player/player.tscn index b51552d..5e7e3fe 100644 --- a/objects/player/player.tscn +++ b/objects/player/player.tscn @@ -1515,13 +1515,27 @@ 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"] [connection signal="state_entered" from="StateChart/Root/Movement/Grounded" to="." method="_on_Grounded_state_entered"] [connection signal="state_physics_processing" from="StateChart/Root/Movement/Grounded" to="." method="_process_grounded"] -[connection signal="state_physics_processing" from="StateChart/Root/Movement/Grounded/CanWalk" to="." method="_process_horizontal_movement_grounded"] [connection signal="state_physics_processing" from="StateChart/Root/Movement/Grounded/CanWalk" to="." method="_process_can_walk"] +[connection signal="state_physics_processing" from="StateChart/Root/Movement/Grounded/CanWalk" to="." method="_process_horizontal_movement_grounded"] [connection signal="state_entered" from="StateChart/Root/Movement/Grounded/CanWalk/Still" to="." method="_on_Still_state_entered"] [connection signal="state_entered" from="StateChart/Root/Movement/Grounded/CanWalk/Walking" to="." method="_on_Walking_state_entered"] [connection signal="state_entered" from="StateChart/Root/Movement/Grounded/CanWalk/Blinking" to="." method="_on_Blinking_state_entered"] @@ -1535,8 +1549,8 @@ align = 1 [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"] +[connection signal="state_physics_processing" from="StateChart/Root/Movement/Airborne/Jump" to="." method="_process_horizontal_movement"] [connection signal="state_entered" from="StateChart/Root/Movement/Airborne/Jump/NormalJump" to="." method="_on_NormalJump_state_entered"] [connection signal="state_exited" from="StateChart/Root/Movement/Airborne/Jump/NormalJump" to="." method="_on_NormalJump_state_exited"] [connection signal="state_entered" from="StateChart/Root/Movement/Airborne/Jump/LadderJump" to="." method="_on_LadderJump_state_entered"] @@ -1569,3 +1583,5 @@ align = 1 [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 711f1ec..c7a8f27 100644 --- a/project.godot +++ b/project.godot @@ -354,6 +354,12 @@ 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) + ] +} [input_devices] From ca3bd478c1397b1e97810507a505acb1c2aa5933 Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Wed, 21 Aug 2024 21:22:58 -0400 Subject: [PATCH 02/50] What need be done for the repository to become public. --- LICENSE-ASSETS | 395 +++++++++++++++++++++++++++++++++++++++++++++++++ LICENSE-CODE | 7 + README.md | 20 +++ 3 files changed, 422 insertions(+) create mode 100644 LICENSE-ASSETS create mode 100644 LICENSE-CODE create mode 100644 README.md diff --git a/LICENSE-ASSETS b/LICENSE-ASSETS new file mode 100644 index 0000000..4ea99c2 --- /dev/null +++ b/LICENSE-ASSETS @@ -0,0 +1,395 @@ +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 new file mode 100644 index 0000000..5dba822 --- /dev/null +++ b/LICENSE-CODE @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..bf4b627 --- /dev/null +++ b/README.md @@ -0,0 +1,20 @@ +# 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 [Ivy Snyder](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 licensed +under a [CC-BY license](LICENSE-ASSETS). + +All other code and data is licensed under the [MIT license](LICENSE-CODE). From 4e85053411ce016534954c0a73b96949e22773cf Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Wed, 21 Aug 2024 21:27:06 -0400 Subject: [PATCH 03/50] Slight correction --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index bf4b627..f31166d 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ 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 licensed -under a [CC-BY license](LICENSE-ASSETS). +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). From f895270218dd03e7d643fc653008328c54fc7bcb Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Wed, 30 Oct 2024 11:07:59 -0400 Subject: [PATCH 04/50] Update credit's to Scarlett's new name --- README.md | 2 +- credits.txt | 4 ++-- graphics/hud/title_credits.png | Bin 1380 -> 5025 bytes menus/credits.tscn | 18 ++++-------------- menus/sound_test.tscn | 6 +----- menus/title_screen.tscn | 1 + 6 files changed, 9 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index f31166d..4ff031d 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Apologies in advance for the messy code :) ## License -Music is by [Ivy Snyder](https://ivsnyd.bandcamp.com/) and licensed under +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. diff --git a/credits.txt b/credits.txt index 4a6674d..66b51f7 100644 --- a/credits.txt +++ b/credits.txt @@ -1,3 +1,3 @@ Game by Penny Rigate -Music by Ivy Snyder (https://ivysnyder.newgrounds.com/) -Shaders and code help by Haze \ No newline at end of file +Music by Scarlett Sylvistrix (https://ivysnyder.newgrounds.com/) +Shaders and code help by Haze diff --git a/graphics/hud/title_credits.png b/graphics/hud/title_credits.png index 89e099d897a211550e3c1fa0e2a2fbc181ebb294..7c2bfaaf0ea45e78ef1965cfa0cdea07b6ce3b3c 100644 GIT binary patch literal 5025 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 M>FVdQ&MBb@03M27@&Et; diff --git a/menus/credits.tscn b/menus/credits.tscn index 256b952..0407de7 100644 --- a/menus/credits.tscn +++ b/menus/credits.tscn @@ -712,7 +712,7 @@ margin_right = 128.0 margin_bottom = 105.0 theme = ExtResource( 6 ) text = "Team SG is: Penny rigate, -Haze Weathers, Ivy snyder +Haze Weathers, Scarlett Sylvistrix 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 = "-Ivy \"Shedge\" Snyder- +text = "-Scarlett \"Shedge\" Sylvistrix- Lead Composer Sound effects mixing" @@ -846,7 +846,7 @@ theme = ExtResource( 6 ) text = "-Our playtesters- Penny rigate Haze Weathers -Ivy snyder +Scarlett Sylvistrix DogJelly Wolfboy Rhidianruckus @@ -918,7 +918,6 @@ 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"] @@ -935,7 +934,6 @@ 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"] @@ -965,7 +963,6 @@ 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"] @@ -1085,7 +1082,6 @@ 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"] @@ -1117,7 +1113,6 @@ 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"] @@ -1163,7 +1158,6 @@ 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"] @@ -1193,7 +1187,6 @@ 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"] @@ -1210,7 +1203,6 @@ 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"] @@ -1227,7 +1219,6 @@ 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"] @@ -1257,7 +1248,6 @@ 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"] @@ -1265,7 +1255,6 @@ 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"] @@ -1362,6 +1351,7 @@ 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 diff --git a/menus/sound_test.tscn b/menus/sound_test.tscn index 1e54358..740a33d 100644 --- a/menus/sound_test.tscn +++ b/menus/sound_test.tscn @@ -193,7 +193,6 @@ material = SubResource( 12 ) position = Vector2( 72, 152 ) scale = Vector2( 2, 2 ) frames = SubResource( 15 ) -frame = 1 playing = true [node name="AnimatedSprite3" type="AnimatedSprite" parent="."] @@ -201,7 +200,6 @@ material = SubResource( 12 ) position = Vector2( 112, 152 ) scale = Vector2( 2, 2 ) frames = SubResource( 15 ) -frame = 1 playing = true [node name="AnimatedSprite4" type="AnimatedSprite" parent="."] @@ -209,7 +207,6 @@ material = SubResource( 12 ) position = Vector2( 152, 152 ) scale = Vector2( 2, 2 ) frames = SubResource( 15 ) -frame = 1 playing = true [node name="AnimatedSprite5" type="AnimatedSprite" parent="."] @@ -217,7 +214,6 @@ material = SubResource( 12 ) position = Vector2( 192, 152 ) scale = Vector2( 2, 2 ) frames = SubResource( 15 ) -frame = 1 playing = true [node name="Music" type="TextureButton" parent="."] @@ -266,7 +262,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", "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" ] +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" ] 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 1f59323..57d919d 100644 --- a/menus/title_screen.tscn +++ b/menus/title_screen.tscn @@ -36,6 +36,7 @@ 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 ] From f22e8706ca30d8d057eb67ae9fcb8f13eb95fc7b Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Sat, 2 Nov 2024 02:26:44 -0400 Subject: [PATCH 05/50] Update to godot 3.6 --- project.godot | 1 - 1 file changed, 1 deletion(-) diff --git a/project.godot b/project.godot index c7a8f27..ec768cd 100644 --- a/project.godot +++ b/project.godot @@ -114,7 +114,6 @@ 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 From e9700219dbdb80b0276b93064b677065c045018e Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Sat, 23 Nov 2024 20:21:42 -0500 Subject: [PATCH 06/50] Add the arrow sign to save new players from the stuccy. --- .../go_right_from_here/arrow_sign.png | Bin 0 -> 806 bytes .../go_right_from_here/arrow_sign.png.import | 35 ++++++++++++++++++ maps/hills_scholar.tscn | 10 ++++- 3 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 graphics/decal/helper_hints/the_signs/go_right_from_here/arrow_sign.png create mode 100644 graphics/decal/helper_hints/the_signs/go_right_from_here/arrow_sign.png.import 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 new file mode 100644 index 0000000000000000000000000000000000000000..66916308ec168669062f5dcc4db0ec2923a9f713 GIT binary patch literal 806 zcmV+>1KIqEP)EX>4Tx04R}tkv&MmKpe$iKcu1+2RjsT$WV2$i;6hbDionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|?BJy6A|?JWDYS_3;J6>}?mh0_0sdx{sb(+%sG4PD zQb{3~Ull^H=tmU5ID!&0^*K>Y!*hJy!^hXVIM4Dv_vaW;3MK=50&#-rhDE$VJhN%( zocD<%tSl+S=fo2RU6A;Z>$1yloJ$V-d1l1OX6A__#6qcyER!C{35wza#g^{ zv49#>NRA);4}N!R7N;iNq;L}Gd9m$}Q6RJnv>LYkeQevU6Cm&mTxlJDtqIJ2lHTZO zu_It`8@RacX!0I#xdTL>bjgq$DL~U-ECTOm^i6qS=oaW(b9-y=@vU-^S000JJOGiWi000000Qp0^e*gdg32;bRa{vG? zBLDy{BLR4&KXw2B00(qQO+^Rj3m5?sF9um!lK=n!8FWQhbVF}#ZDnqB07G(RVRU6= zAa`kWXdp*PO;A^X4i^9b0RKruK~yNuV_?7nrYF1pZwj~lk1o!HP4Vk5KNundEEv!= zU{%b(z`(#SB!r=XaeA`r|JPrBFo^PSz)cn9;b5>ZSAuIiaq=ER=G@(kEU&-(V8}@F zVqjokVEFj%9Rt6R5C$DAufXv7%a8voFhyTJe`4U_h($ literal 0 HcmV?d00001 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 new file mode 100644 index 0000000..09fd899 --- /dev/null +++ b/graphics/decal/helper_hints/the_signs/go_right_from_here/arrow_sign.png.import @@ -0,0 +1,35 @@ +[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/maps/hills_scholar.tscn b/maps/hills_scholar.tscn index b4c8ca1..e5b6bb2 100644 --- a/maps/hills_scholar.tscn +++ b/maps/hills_scholar.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=32 format=2] +[gd_scene load_steps=33 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,6 +31,7 @@ [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] [node name="Map" type="Node2D" groups=["map"]] pause_mode = 1 @@ -64,7 +65,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, 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 ) +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 ) [node name="Player" parent="." instance=ExtResource( 26 )] position = Vector2( 24, 176 ) @@ -153,6 +154,11 @@ 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" instance=ExtResource( 4 )] From b919ebb6580f9015105b88c8caed0324968c535d Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Sun, 24 Nov 2024 18:54:21 -0500 Subject: [PATCH 07/50] Animated and hidden whirlpool. --- graphics/level_select/whirlpool.png | Bin 1135 -> 5457 bytes graphics/level_select/whirlpool.xcf | Bin 0 -> 10211 bytes menus/level_select_scholar.gd | 9 ++++++++ menus/level_select_scholar.tscn | 34 ++++++++++++++++++++++++---- 4 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 graphics/level_select/whirlpool.xcf diff --git a/graphics/level_select/whirlpool.png b/graphics/level_select/whirlpool.png index 272806fea1a37d8364f0017329a1884cff4780cf..8f5db4b1976ac85458eeef588ba5f52a179eb953 100644 GIT binary patch literal 5457 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 literal 1135 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K54sfsm$=7f9rU3<7GM$|RJe{2t3X1a6GILTH z7&Io>zVAKG@q;i%(3X^hCg1osKSxYg!@;omPlOl^X2)!ad7GMN_Y@Df{5T z{-dj!yEm`nTi2xUgYnUu2TNWkss3B9xuxUdgB|kk-`T#q$LO^8jLB+kwv1i5%Y+II zC&!95uNN@rVPr8-G(J6J@)8xBESW9R#oQ=<{HFwK({6{w&n)gA@4IZl_~-nAsrSBx zzdG#jYgTFodG`YXrXR^)C%U@eN z$BrTMl~yIQj0{sU>#4Z!73JmW`Tyr-e*Mn8grjKJ8-uWuz-VDh@^*It#S#OEaktaqI0ZL$AXDGVBjR=Gr(2RJA^mIJnc> zJ^z8KRd=!8LtdF!EABLr^$H$*57bI0sOzuy4;IZ0-p|is=-K+<{q+CU8#RCyk^>To z-SQ5epBtw;U0!y#t^Cg88V#|0mFK>$(LI;vwX}ih#?%Y(=Wm_+X!79Y$2*o?46Ftl zKC~y)i#>ZE#H7){*!R1i|8@PnicMCkM^YED+?c|=eS!U-+Qj^4cQ5W=b((*@z4obl zwoC?$IR<|UEs7uVH~Kf<3+H?I=i?G<&KV2=4ADUhihl|}>=*iRzDr?W9A^TjK|^W1 z)SZi;lb+7m-TnCcdw;$6o9D-0z5M39E;CTQ3QLhqr0oCVhyKq0KYb}X_wQoK(_2p; zhWxmxRh{P;cmG&?#jE``x>oU-f=4bhYBcD6jn4j1;(6iB?Q_`&@Bg`b;kf)gso#u= zQW?*3%X;PQe&>3~{ihXjzAT+xcXrR$`}M$}(r&qvmbmMfc!kITdu_Hxc5vo>(4i@-utSh-MwcoI-fs$-1*s!n>PbKuPHYq@c9SIA|(v@I!9^V`+NHf735_~ zO!+&?`AU}EN)VWgdVZIoHy`dld$#jDryZzs>E6LkKi_%OIo!*ibpG_yKfAA<#l43Q zH(wm=Ki+$~v-!OLY)48%nf>(My-w9Z^Q;?k?^%C$XLI*p?~%+j>c3ojnSb$gr}J|E z>E5FcTGt-$KHPu0f6%$+s?CGlpY}U9+~3U)=>F*`-8Vb#Pu-ute9?cn_k6eW?OU|I zIMJ#ao1Z=3%R76|A3oW6sVDXyKYqEBcW%gjO7`MOW3734Y9G&b^8TZK-j|-eg#UH> zlh2<$?fh)#;N{-_^E+2>UcYg*v-AAn{v(!j=jwwW{mJHcuYPj3b$jyQ-Bzb_JMZsy z1l*nVKmL60@%2vy(e*#t%U|B#Irw4!*^8$;>vzA~;qUeqroa6W_u%(;p6}*Q*6-f> zM%I76_ejP!zxVC08T$tZdw4=WXIq$mjq&ylKjvq$eE`(!cfW4%AJ-48-~IT;jjgYn z;4i-U1NWco=lj?1$)$dXYXIe`ga7#1i|hH` z8sQd2em?X4{uet3oeg(TQxrOXmh!&jPyU*3&L~BC_dq361?yAtr75{JC3mLe*(rH$ zN}ivR&me2Q!1AGLP&Bv3zf#Fm!DY#n&Bl~Gi6Q$ksz32R*Rl&p0zl)c`Zr%M{$*AF zm9O3RYrbX6C;o3=&uAZf=0Emz5WI@+2R6IoN|?Itr1(CQEx5L9!|Wq$)UIoj&C|Y6ji;)*Gvjr$1#|0=9?9vrbKxcV2DkOtK0SZ;0DcBip*@gwX zckQ}11t=7t;Ou3~&XM(;buuUv?B1=z*P)w7YXk+iMo=g~z!gwneR09=3s7)1C={T; zbBzKNs{Psm6pCXMEGSSy3knt#EHhY8u%KW;!GZ!hYe4}ywxD1^!4-Cn&hl(zC4+(m zg{se3c1Byap=I~3UDw8ff&~Ri`3T};{U_rqZP+)zr z1qBNVt_B4Q3Ov`apiu4CT2QdRN1;Zc5v19-ID50fY}VmC%~tKXAaVM6bUJ?vRjo67 zjrJMN6u+@MiytHF{M~Z3&a2L5m~ByJDL1P6IyP!wXN(rIuVv@;n{FK@>(bWQ*7%xV z^@5w%5GQU@R;NHAVlfP||- zqN)vNG%7&ComG%s*3_JBJ`at#hk08d{KGywHM#t3jfw4d*nnAmPp{NH{&KqBa&J+!+T6;z#V}0SV?c zF8(MEfrOh2B#332!^Z@Wplw;ZrA~+o)`A2vEG33n3lgOAmIVn564Ztm@p~kuk=Wqu z+~FMcT#2*q1%~q!lj9BNZk97|IBRp{V4Yo?MO6-7p}m6L4E^VjmFxAK^87{YB>OXM zh$-R>;sTZ!p!^+CREOE!s=h|wGKKh`DVC(j#QE$J1^;p5u2GApoMY_smAu0Iqab5l zmYCxER~=u_KD4eD<0vkLjxWq3&tltU48LcsMLc4OSOFU3)u^C{5*MJsnTpBzhO;=! zxi_4*xdJpCe*g`4zCoh^4Qvg$JaRc-&xv<{h8qJk$la#m5aJk?IG{WpIo=}f0vb*R zjRG{7&&L(eaJe5eTwKw(puxD}4l#Vk%b-z=f}#Ko;)>US2G43AdZy)M@dxn+&>$XZ z9dWg1twnsILc_8;3mTNzf`(;RoaO8r&fJ^@4bHH&pyAFqXjss|){xU9m;3dc z_y=gXF+hVHZip@765<+`SfG3!QB;Q(G+YfD7Bra8#}?3F-q3;u^F?l4&|q9~h#21E zWzeuAY(azA;&q_Gv)YH&)pD|Ugfb^+5Rah9%AK@Fx0<^#0-c`kcfli z7>V=F_FW{j`gf7=2>4z9-=m;t>GvCgz_zX&KcQTZz(+4ubbr$4HAQXR(-sb&>>WIP zvA_TH`itkgD1t~|eEwhE^8Awi*S9>q(V6-z{moS4HL}pCZh1@p>ie!%x4o1nC;mz>CFUTZ!t5yMqqlTG`+Y? zd*tNaau)THAnJwXaxV^SZI}f6o3y{|mQ2^{nJldOYkcC~ zxYX9WN9`&v22e{6Mcd%4rUx6%3QXa1WmU2w%zTv9STcM zn+7S`W;K7>N1p+Nv`E zkAAZKWxr&)!NBDBsOzusi3j6STkjuj=Q+z5IXv)D>^w}uFV>=iB*#Ztwnqmq8{nfk zKI#C$M|0c9N7?4vt$u&Yp@5H~#YfRLw^C-n8~Js3ni=A)a4p`7LCb6LQMA!kx)!00 za=Z~+eAKOaW-Z(@*#0gpK8mf~YF4)RC?nvb{7mVZ=Ep}_5k86q2iRiH75Hm>wPt%i%C(a_%<6`0)I6pBavA z8M7XCHH;4JgA1CIhoYhO@fPNRhtU_(*JdrzFgY9zOV)&EIX#lw>6{&xY$hBY9a=lo zT2uBeo0L6EUf`L8`xW@GPwf?-0Ko+GX4s>c5BnP8QS9RF;c$4!?hJ3Cq{XAqHV;$A z#&?)iPisfvgP5J0N-Hj@y`&E!v=L8(;ZQ72yO?xRC|O&*ahv7GBd>yV&ue;ov0l;KHyn`C{lQN+(sp;GfDI!1!_0Ylg!&S zS%_IJLqiBo>T6P={>eBZ41Syt3c?a04TjeNoqJ;^efb#vS&sgVo^b4tJyn$b9>7Dr`&dwUL21kKv6 zC@hiMGUw2tP&duSn+asNPC-f^8hVOFumA5dEmB2d_(igN`&#(2xlw84t;e=aj!a z5t*y#$5Bak?^r`NhJuicNqcSs!x23jHmoR!=z%E76?=3D@6dbQ1Qb>r>uA7zv=A`? z$2Z8pG2@Zo=Z8&R6{U6om8gc&>AIr>y!L?zD8Z){xrk|pA_r6SB1TReC5j*zq7t59 zc)~G0L?u2k;Rs?GYB$is1EzR}n2P5eC-pTSQU7EdaScC?*c?lQZy4T@dG3+08P7Px zJPdq@y^3&5$cJdjBE(}6-ZpP>Jx5S+JxBMqLS_z3qNvT0EZ|>-WCm!FFn?ZzL8h`1p^Psn#q`XP$^7dX^CqUjNy4jQ-Pijr3 zWXJ1+nH+rZZ_GT)EbVW?o)LH0Xk;X4aJ2x7eDk) zUAGj1vBC$?xtLLf51``!FL6>i!1EU9h!)=ry0r?jivS|%rt1`VE&+)y(e0^Pc3wZ} o_jSTnE-;Q>%dfdwKapSS3P07Uiwyj`=J%-e(Hm0zzn$QJ0A0X<<^TWy literal 0 HcmV?d00001 diff --git a/menus/level_select_scholar.gd b/menus/level_select_scholar.gd index 40885a3..6c1c13f 100644 --- a/menus/level_select_scholar.gd +++ b/menus/level_select_scholar.gd @@ -44,6 +44,15 @@ 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 f5907f2..8af7178 100644 --- a/menus/level_select_scholar.tscn +++ b/menus/level_select_scholar.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=48 format=2] +[gd_scene load_steps=53 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] @@ -22,6 +22,30 @@ [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] +[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 particles_anim_h_frames = 9 @@ -939,10 +963,10 @@ margin_right = 256.0 margin_bottom = 192.0 texture = ExtResource( 2 ) -[node name="WhirlPool" type="TextureRect" parent="."] -margin_right = 256.0 -margin_bottom = 192.0 -texture = ExtResource( 15 ) +[node name="Whirlpool" type="AnimatedSprite" parent="."] +unique_name_in_owner = true +position = Vector2( 83, 65 ) +frames = SubResource( 32 ) [node name="WaveParticles" type="CPUParticles2D" parent="."] material = SubResource( 9 ) From 86e3b5d0a975b6ae743b5452976d233567b2d44f Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Sun, 24 Nov 2024 18:58:03 -0500 Subject: [PATCH 08/50] godo3.6 tileset diff --- tilesets/t_abstract.tres | 1 + tilesets/t_abyss.tres | 2 ++ tilesets/t_canopy.tres | 2 ++ tilesets/t_cave.tres | 2 ++ tilesets/t_grass.tres | 1 + tilesets/t_horror.tres | 2 ++ tilesets/t_laboratory.tres | 4 ++++ tilesets/t_station.tres | 1 + 8 files changed, 15 insertions(+) diff --git a/tilesets/t_abstract.tres b/tilesets/t_abstract.tres index 51ac7ec..fa4bac4 100644 --- a/tilesets/t_abstract.tres +++ b/tilesets/t_abstract.tres @@ -66,6 +66,7 @@ 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 eabe7cb..76adf2b 100644 --- a/tilesets/t_abyss.tres +++ b/tilesets/t_abyss.tres @@ -82,6 +82,7 @@ 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 ) @@ -202,6 +203,7 @@ 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 94fd97e..95814e5 100644 --- a/tilesets/t_canopy.tres +++ b/tilesets/t_canopy.tres @@ -181,6 +181,7 @@ 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 ) @@ -295,6 +296,7 @@ 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 f3eb607..978247f 100644 --- a/tilesets/t_cave.tres +++ b/tilesets/t_cave.tres @@ -152,6 +152,7 @@ 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 ) @@ -272,6 +273,7 @@ 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 d790a15..4f434a5 100644 --- a/tilesets/t_grass.tres +++ b/tilesets/t_grass.tres @@ -259,6 +259,7 @@ 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 093b489..cf67855 100644 --- a/tilesets/t_horror.tres +++ b/tilesets/t_horror.tres @@ -141,6 +141,7 @@ 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 ) @@ -315,6 +316,7 @@ 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 0b052b3..1f4092e 100644 --- a/tilesets/t_laboratory.tres +++ b/tilesets/t_laboratory.tres @@ -132,6 +132,7 @@ 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 ) @@ -180,6 +181,7 @@ 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 ) @@ -300,6 +302,7 @@ 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 ) @@ -420,6 +423,7 @@ 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 ed8a090..8c786ba 100644 --- a/tilesets/t_station.tres +++ b/tilesets/t_station.tres @@ -169,6 +169,7 @@ 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 ) From e656b5123254fc937420c9846ecf0f7be4b103ba Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Sun, 24 Nov 2024 19:14:37 -0500 Subject: [PATCH 09/50] All in a days yield(get_tree(), "idle_frame")!!! --- objects/camera.gd | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/objects/camera.gd b/objects/camera.gd index 554ebc0..73704bf 100644 --- a/objects/camera.gd +++ b/objects/camera.gd @@ -14,6 +14,7 @@ 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 @@ -42,8 +43,8 @@ func _process(delta): else: off_level_indicator.visible = false #Ms.X off level indicator - if msx_exists && is_instance_valid(msx): - if msx.get_parent().is_free: + if msx_exists: + if is_instance_valid(msx) and 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: @@ -56,3 +57,5 @@ 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 From 29d84b0c8002074313dfa7f24e82a70f0e0a762b Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Sun, 1 Dec 2024 11:45:41 -0500 Subject: [PATCH 10/50] Change shard sprite. --- graphics/collectibles/shard.png | Bin 197 -> 10061 bytes graphics/hud/hud.png | Bin 4672 -> 8026 bytes objects/collectibles/shard.tscn | 21 ++++++++++++++++++--- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/graphics/collectibles/shard.png b/graphics/collectibles/shard.png index fb1b4d396c5d94020d5e8f853e4e86f365bcc2be..4c2e263dc0180d7913a83a9ad6785ff80728ebe8 100644 GIT binary patch literal 10061 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 delta 180 zcmX@>ca(90WIZzj1H-(cb`c=OSRCZ;#IWw1%u67LCEd~2k%3`jKlh(RRv@1zz$e5t zV*i8G{~!PqSf*Te2c)hf$S)Wq;-Izi3y{xQ;1OBOz`%D1gc(IOyc&RlMxHK?Arj%S zJ&t?~3Ot7#{{2r^Ja+bE-Hm SbIAj0XYh3Ob6Mw<&;$VPnmy(K diff --git a/graphics/hud/hud.png b/graphics/hud/hud.png index 91dde0877904a980020437938451c25f75fb39f6..5b1887114a9843a56283fc518dbf24c88c3f2033 100644 GIT binary patch literal 8026 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 delta 985 zcmV;~119|1KENc9BLV=>ktK!!0FkUDe>MOBGB7eUIxsUjFgYMGGdeRgIy5i<0RRD@ z0{{U40003100000005jESDXL<0fcEoLr_UWLm+T+Z)Rz1WdHzpoPCi!NW(xJ#a~mU zDwQI35OK&*JK04=9BUPdP$AR`tvZ-o`UOoIk`xz5!L{Jv$70pN#aUMeS3wZ`e*kfI za8h)U691PLTEuv8+>dwn9(V5mp;2L))e{Fa-8R$7gqY2(ih)=7(T^cS5t5l@%t=xT zp5yBtKEB??c$W9MKgXb&w;13PiQ~*LZQ>2$nN8c^yiXivC0QjtC!R3rg2azpS6ckW zx#+UMGs9*kJx?4a7K>f1bTKQLe;V;LaYWU0$``UNRyl8R)+#mDz9)ZSFt4vHbDicG zl32tNB#2N@Lm3s=h|#K(Vj)fY2@n6M>zBx-kgE(vjs;YqL3aJ%fAG6ot1va$N(v@` z-WSLD7zYBoK(p>R-^Y&AJOTXAz?I(dR~x|WC+YQ$7C8b!+rY(jM^pBIM9Upug+c*%KcjET0mHYzz*?)f_C8J@fDCn&x&aOjfoPGk*FE0d*WKH{XWIS!0BVzR zqxnZwEC2uvc(bSub^((}5HOP-5Gs>+5V|C0Gcq$bV>n_hI5}fCEi^V_H7z+aGBqtX zG%z$YH85jgHZwPqRuNE>5E2=arV%|3F)%PNIWjmfH8eFeI5m^;5g7qClOz&T4KOo0 zFga8)GdeRgIy94n5+MyRGdeIiR53F;Gc-Chv$7Hr0kfwRU}q$ zjjD10h8_Ua!>}=+Wa0pHXXwDf!ocVbEfrNOCWkup_boxfiX2Dp56_{BF~$HCX&6EX zbv>~XP?)Bfg+XqUx_y33e$L(Qwexwm?L4&Yy!YcM%OJPnzkhkSOBw>F;=e`+K;Kj` z#+XA3a4P=8YWsD3o4zCqfzjx`lc)YA1L&4qwJ5I8H$|Hj(00000NkvXX Hu0mjfZf2Sl diff --git a/objects/collectibles/shard.tscn b/objects/collectibles/shard.tscn index 46603f6..6550926 100644 --- a/objects/collectibles/shard.tscn +++ b/objects/collectibles/shard.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=10 format=2] +[gd_scene load_steps=11 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,6 +14,21 @@ 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 @@ -28,7 +43,7 @@ tracks/0/keys = { "times": PoolRealArray( 0, 0.4, 0.8 ), "transitions": PoolRealArray( 1, 1, 1 ), "update": 0, -"values": [ Color( 0.329412, 0.360784, 0.847059, 1 ), Color( 1, 1, 1, 1 ), Color( 0.329412, 0.360784, 0.847059, 1 ) ] +"values": [ Color( 0.766, 0.73, 1, 1 ), Color( 1.1, 1.1, 1.1, 1 ), Color( 0.766, 0.73, 1, 1 ) ] } [sub_resource type="Curve" id=17] @@ -39,7 +54,6 @@ 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 ) @@ -55,6 +69,7 @@ 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="."] From 06f7d16aca2335240cb6ac41838848db0d00a7b8 Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Sun, 1 Dec 2024 11:45:41 -0500 Subject: [PATCH 11/50] Change shard sprite. --- graphics/collectibles/shard.png | Bin 197 -> 10061 bytes graphics/hud/hud.png | Bin 4672 -> 8026 bytes objects/collectibles/shard.tscn | 21 ++++++++++++++++++--- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/graphics/collectibles/shard.png b/graphics/collectibles/shard.png index fb1b4d396c5d94020d5e8f853e4e86f365bcc2be..4c2e263dc0180d7913a83a9ad6785ff80728ebe8 100644 GIT binary patch literal 10061 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 delta 180 zcmX@>ca(90WIZzj1H-(cb`c=OSRCZ;#IWw1%u67LCEd~2k%3`jKlh(RRv@1zz$e5t zV*i8G{~!PqSf*Te2c)hf$S)Wq;-Izi3y{xQ;1OBOz`%D1gc(IOyc&RlMxHK?Arj%S zJ&t?~3Ot7#{{2r^Ja+bE-Hm SbIAj0XYh3Ob6Mw<&;$VPnmy(K diff --git a/graphics/hud/hud.png b/graphics/hud/hud.png index 91dde0877904a980020437938451c25f75fb39f6..5b1887114a9843a56283fc518dbf24c88c3f2033 100644 GIT binary patch literal 8026 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 delta 985 zcmV;~119|1KENc9BLV=>ktK!!0FkUDe>MOBGB7eUIxsUjFgYMGGdeRgIy5i<0RRD@ z0{{U40003100000005jESDXL<0fcEoLr_UWLm+T+Z)Rz1WdHzpoPCi!NW(xJ#a~mU zDwQI35OK&*JK04=9BUPdP$AR`tvZ-o`UOoIk`xz5!L{Jv$70pN#aUMeS3wZ`e*kfI za8h)U691PLTEuv8+>dwn9(V5mp;2L))e{Fa-8R$7gqY2(ih)=7(T^cS5t5l@%t=xT zp5yBtKEB??c$W9MKgXb&w;13PiQ~*LZQ>2$nN8c^yiXivC0QjtC!R3rg2azpS6ckW zx#+UMGs9*kJx?4a7K>f1bTKQLe;V;LaYWU0$``UNRyl8R)+#mDz9)ZSFt4vHbDicG zl32tNB#2N@Lm3s=h|#K(Vj)fY2@n6M>zBx-kgE(vjs;YqL3aJ%fAG6ot1va$N(v@` z-WSLD7zYBoK(p>R-^Y&AJOTXAz?I(dR~x|WC+YQ$7C8b!+rY(jM^pBIM9Upug+c*%KcjET0mHYzz*?)f_C8J@fDCn&x&aOjfoPGk*FE0d*WKH{XWIS!0BVzR zqxnZwEC2uvc(bSub^((}5HOP-5Gs>+5V|C0Gcq$bV>n_hI5}fCEi^V_H7z+aGBqtX zG%z$YH85jgHZwPqRuNE>5E2=arV%|3F)%PNIWjmfH8eFeI5m^;5g7qClOz&T4KOo0 zFga8)GdeRgIy94n5+MyRGdeIiR53F;Gc-Chv$7Hr0kfwRU}q$ zjjD10h8_Ua!>}=+Wa0pHXXwDf!ocVbEfrNOCWkup_boxfiX2Dp56_{BF~$HCX&6EX zbv>~XP?)Bfg+XqUx_y33e$L(Qwexwm?L4&Yy!YcM%OJPnzkhkSOBw>F;=e`+K;Kj` z#+XA3a4P=8YWsD3o4zCqfzjx`lc)YA1L&4qwJ5I8H$|Hj(00000NkvXX Hu0mjfZf2Sl diff --git a/objects/collectibles/shard.tscn b/objects/collectibles/shard.tscn index 46603f6..6550926 100644 --- a/objects/collectibles/shard.tscn +++ b/objects/collectibles/shard.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=10 format=2] +[gd_scene load_steps=11 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,6 +14,21 @@ 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 @@ -28,7 +43,7 @@ tracks/0/keys = { "times": PoolRealArray( 0, 0.4, 0.8 ), "transitions": PoolRealArray( 1, 1, 1 ), "update": 0, -"values": [ Color( 0.329412, 0.360784, 0.847059, 1 ), Color( 1, 1, 1, 1 ), Color( 0.329412, 0.360784, 0.847059, 1 ) ] +"values": [ Color( 0.766, 0.73, 1, 1 ), Color( 1.1, 1.1, 1.1, 1 ), Color( 0.766, 0.73, 1, 1 ) ] } [sub_resource type="Curve" id=17] @@ -39,7 +54,6 @@ 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 ) @@ -55,6 +69,7 @@ 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="."] From 155c86c01376f06dc0ed7c0d44c3d475f513c682 Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Sun, 1 Dec 2024 13:24:47 -0500 Subject: [PATCH 12/50] Hook score submission into new server and move into the results screen. --- .gitignore | 3 +- autoloads/game.gd | 6 +- autoloads/options.gd | 10 + autoloads/scoreboard.gd | 123 ++++++ graphics/hud/high_score.png | Bin 0 -> 960 bytes graphics/hud/high_score.png.import | 35 ++ menus/results.gd | 35 +- menus/results.tscn | 649 ++++++++++++++++++++++++++++- project.godot | 1 + 9 files changed, 853 insertions(+), 9 deletions(-) create mode 100644 autoloads/scoreboard.gd create mode 100644 graphics/hud/high_score.png create mode 100644 graphics/hud/high_score.png.import diff --git a/.gitignore b/.gitignore index fb85297..d6037ed 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .import/ build/ -ngio.ini \ No newline at end of file +ngio.ini +scoreboard_host.txt diff --git a/autoloads/game.gd b/autoloads/game.gd index 6c6ee40..a17ea40 100644 --- a/autoloads/game.gd +++ b/autoloads/game.gd @@ -37,6 +37,7 @@ 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) @@ -60,9 +61,6 @@ 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) @@ -197,6 +195,8 @@ 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/options.gd b/autoloads/options.gd index 26ec300..fca7516 100644 --- a/autoloads/options.gd +++ b/autoloads/options.gd @@ -18,6 +18,8 @@ const TRANS_SPEEDS := [0.8, 0.4, 0.2, 0.0000001] #Game var rumble: int = RumbleMode.FULL var gore: int = Gore.FULL +var scoreboard_name: String = "" +var scoreboard_id: int = -1 #Video var fullscreen: bool = false setget _set_fullscreen @@ -42,6 +44,7 @@ var defaults = null func _ready() -> void: pause_mode = PAUSE_MODE_PROCESS + # clone self into defaults before loading stored values if defaults == null: defaults = duplicate() @@ -58,6 +61,9 @@ func load_options() -> void: # game rumble = file.get_value("game", "rumble", defaults.rumble) gore = file.get_value("game", "gore", defaults.gore) + 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)) @@ -78,6 +84,8 @@ func load_defaults(section: int = Section.ALL) -> void: Section.GAME, Section.ALL: rumble = defaults.rumble gore = defaults.gore + scoreboard_name = defaults.scoreboard_name + scoreboard_id = randi() Section.VIDEO, Section.ALL: fullscreen = defaults.fullscreen window_size = defaults.window_size @@ -96,6 +104,8 @@ func save_options() -> void: #Game file.set_value("game", "rumble", rumble) file.set_value("game", "gore", gore) + 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) diff --git a/autoloads/scoreboard.gd b/autoloads/scoreboard.gd new file mode 100644 index 0000000..4464cd5 --- /dev/null +++ b/autoloads/scoreboard.gd @@ -0,0 +1,123 @@ +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() + file.open("res://scoreboard_host.txt", File.READ) + server_host = file.get_line() + file.close() + + http = HTTPRequest.new() + http.download_chunk_size = 4096 + http.timeout = 10.0 + http.use_threads = true + 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/graphics/hud/high_score.png b/graphics/hud/high_score.png new file mode 100644 index 0000000000000000000000000000000000000000..908a3d74d7a4d3af61e3744acb5d4c15b3298363 GIT binary patch literal 960 zcmV;x13&zUP)AHIP0004nX+uL$Nkc;* zaB^>EX>4Tx04R}tkvmAkP!xv$riu?L3U&~2$WWauf{HlSDionYs1;guFuCaqnlvOS zE{=k0!NJF3)xpJCR|i)?5PX0*J2)x2NQvhrg%&X$xZIEbp8x0Ga{-}VW}4Lz12o+> zQ;E2k$*ziBuLvQ49t>bYW|lE0NlEzD*FE)8-9>qpf8U?gr{*jM1VrK(GfbO!gLr1s zHaPDShgnfpiO-40O}ZfQBi9v=-#8as7IZLMN=c5CXT3@PWeK{ zW0mt3XRTai&3p0}hI0DKGS_L1Ab~|JL4pVcRg_SMjVSFpDHc+69{2GNyMBpW3b{&P z_CX>@2HM@dakSAh-}0004(Nkl@UNfEYrMeDs|f#`885xA2$h z^5oNSDYvIDAk>O+v(g7@Qx3#LxBDY$zD;O{*pX7&gc#m7$Im;Ktu*!{pyz$6pLSqo2NSir>ng!=;#7{C0mNT91TF?Mro9?4x$?+SeuEKb1gN1k@v7qJ*Z;7PepiplY4&sIJSr+cjw iW5s*)*Aw@)e_%hti_TLb%*k*70000 LevelData.marathon_end: @@ -70,9 +73,33 @@ func _on_AnimationPlayer_animation_finished(anim_name): else: Game.change_map(LevelData.levels[Game.current_level].scene) return + if Game.final_score > Game.old_high_score and not Debug.is_cheating: + animation_player.play("submit_score_popup") + else: + 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: Fade.fade_out(Options.transition_speed_secs) yield(Fade, "fade_finished") - if Debug.is_cheating == false: - SceneManager.change_scene(SubmitScore.instance()) - else: - SceneManager.change_scene(LevelSelect.instance()) + SceneManager.change_scene(LevelSelect.instance()) diff --git a/menus/results.tscn b/menus/results.tscn index b6d0d50..aa437f8 100644 --- a/menus/results.tscn +++ b/menus/results.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=21 format=2] +[gd_scene load_steps=34 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,6 +14,11 @@ [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] [sub_resource type="ShaderMaterial" id=5] shader = ExtResource( 2 ) @@ -36,6 +41,29 @@ 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 ) @@ -117,6 +145,138 @@ 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=4] resource_name = "results" @@ -321,6 +481,340 @@ 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("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 ) ] +} +tracks/5/type = "value" +tracks/5/path = NodePath("CenterContainer/SubmitScore:visible") +tracks/5/interp = 1 +tracks/5/loop_wrap = true +tracks/5/imported = false +tracks/5/enabled = true +tracks/5/keys = { +"times": PoolRealArray( 0, 1 ), +"transitions": PoolRealArray( 1, 1 ), +"update": 1, +"values": [ false, true ] +} +tracks/6/type = "value" +tracks/6/path = NodePath("CenterContainer/SubmitScore:rect_scale") +tracks/6/interp = 1 +tracks/6/loop_wrap = true +tracks/6/imported = false +tracks/6/enabled = true +tracks/6/keys = { +"times": PoolRealArray( 0, 1, 1.3 ), +"transitions": PoolRealArray( 1, 1, 1 ), +"update": 0, +"values": [ Vector2( 1e-05, 1 ), Vector2( 1e-05, 1 ), Vector2( 1, 1 ) ] +} +tracks/7/type = "method" +tracks/7/path = NodePath("CenterContainer/SubmitScore/YesNoPrompt/HBoxContainer/YesSubmit") +tracks/7/interp = 1 +tracks/7/loop_wrap = true +tracks/7/imported = false +tracks/7/enabled = true +tracks/7/keys = { +"times": PoolRealArray( 1.5 ), +"transitions": PoolRealArray( 1 ), +"values": [ { +"args": [ ], +"method": "grab_focus" +} ] +} +tracks/8/type = "value" +tracks/8/path = NodePath("CenterContainer/SubmitScore:modulate") +tracks/8/interp = 1 +tracks/8/loop_wrap = true +tracks/8/imported = false +tracks/8/enabled = true +tracks/8/keys = { +"times": PoolRealArray( 1, 1.056 ), +"transitions": PoolRealArray( 1, 1 ), +"update": 1, +"values": [ Color( 1, 1, 1, 0 ), Color( 1, 1, 1, 1 ) ] +} +tracks/9/type = "value" +tracks/9/path = NodePath("CenterContainer/LoadingGraphic:visible") +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": [ false ] +} +tracks/10/type = "value" +tracks/10/path = NodePath("CenterContainer/SubmitScore/Label:text") +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": [ "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 ) @@ -529,6 +1023,28 @@ 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 @@ -547,6 +1063,131 @@ 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 = 47.0 +margin_right = 173.0 +margin_bottom = 67.0 +rect_pivot_offset = Vector2( 45.5, 18 ) +theme = ExtResource( 10 ) + +[node name="Label" type="Label" parent="CenterContainer/SubmitScore"] +margin_right = 126.0 +margin_bottom = 10.0 +custom_fonts/font = ExtResource( 19 ) +text = "submit score?" + +[node name="YesNoPrompt" type="PanelContainer" parent="CenterContainer/SubmitScore"] +margin_left = 18.0 +margin_top = 14.0 +margin_right = 107.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 ) @@ -557,5 +1198,11 @@ autoplay = "results" playback_speed = 2.0 anims/RESET = SubResource( 10 ) 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/project.godot b/project.godot index ec768cd..4b61178 100644 --- a/project.godot +++ b/project.godot @@ -110,6 +110,7 @@ Console="*res://autoloads/console.tscn" Fade="*res://autoloads/fade.tscn" StainLayer="*res://autoloads/stain_layer.tscn" Ngio="*res://autoloads/ngio.gd" +ScoreBoard="*res://autoloads/scoreboard.gd" [debug] From b61a5122f4a65ff50e09763790c4e61fa28f60de Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Sun, 1 Dec 2024 20:14:51 -0500 Subject: [PATCH 13/50] New scoreboard viewing screengit commit -m "New scoreboard viewing screen" --- autoloads/level_data.tscn | 42 ++-- export_presets.cfg | 12 +- graphics/hud/arrow_down.png | Bin 0 -> 6094 bytes graphics/hud/arrow_down.png.import | 35 +++ graphics/hud/arrow_up.png | Bin 0 -> 6086 bytes graphics/hud/arrow_up.png.import | 35 +++ graphics/hud/scores/pungent.png | Bin 0 -> 9390 bytes graphics/hud/scores/pungent.png.import | 35 +++ graphics/hud/scores/salty.png | Bin 0 -> 697 bytes graphics/hud/scores/salty.png.import | 35 +++ graphics/hud/scores/spicy.png | Bin 0 -> 662 bytes graphics/hud/scores/spicy.png.import | 35 +++ graphics/hud/scores/sweet.png | Bin 0 -> 675 bytes graphics/hud/scores/sweet.png.import | 35 +++ menus/main_menu.gd | 2 +- menus/results.gd | 1 - menus/score_entry.gd | 43 +++- menus/score_entry.tscn | 64 +++-- menus/scoreboards_scholar.gd | 108 +++++++++ menus/scoreboards_scholar.tscn | 320 +++++++++++++++++++++++++ project.godot | 1 - scripts/level_entry.gd | 3 +- 22 files changed, 739 insertions(+), 67 deletions(-) create mode 100644 graphics/hud/arrow_down.png create mode 100644 graphics/hud/arrow_down.png.import create mode 100644 graphics/hud/arrow_up.png create mode 100644 graphics/hud/arrow_up.png.import create mode 100644 graphics/hud/scores/pungent.png create mode 100644 graphics/hud/scores/pungent.png.import create mode 100644 graphics/hud/scores/salty.png create mode 100644 graphics/hud/scores/salty.png.import create mode 100644 graphics/hud/scores/spicy.png create mode 100644 graphics/hud/scores/spicy.png.import create mode 100644 graphics/hud/scores/sweet.png create mode 100644 graphics/hud/scores/sweet.png.import create mode 100644 menus/scoreboards_scholar.gd create mode 100644 menus/scoreboards_scholar.tscn diff --git a/autoloads/level_data.tscn b/autoloads/level_data.tscn index e2a8193..fe92a6f 100644 --- a/autoloads/level_data.tscn +++ b/autoloads/level_data.tscn @@ -29,8 +29,7 @@ shards_required_spicy = 0 shards_required_pungent = 0 boss_required = "" boss = false -scores_id = 13253 -times_id = 13255 +has_scoreboard = true scene = ExtResource( 2 ) [sub_resource type="Resource" id=2] @@ -45,8 +44,7 @@ shards_required_spicy = 0 shards_required_pungent = 0 boss_required = "" boss = false -scores_id = 13254 -times_id = 13257 +has_scoreboard = true scene = ExtResource( 3 ) [sub_resource type="Resource" id=4] @@ -61,8 +59,7 @@ shards_required_spicy = 0 shards_required_pungent = 0 boss_required = "" boss = false -scores_id = 13263 -times_id = 13270 +has_scoreboard = true scene = ExtResource( 6 ) [sub_resource type="Resource" id=6] @@ -77,8 +74,7 @@ shards_required_spicy = 16 shards_required_pungent = 24 boss_required = "" boss = true -scores_id = -1 -times_id = -1 +has_scoreboard = false scene = ExtResource( 8 ) [sub_resource type="Resource" id=3] @@ -93,8 +89,7 @@ shards_required_spicy = 0 shards_required_pungent = 0 boss_required = "boss1" boss = false -scores_id = 13264 -times_id = 13271 +has_scoreboard = true scene = ExtResource( 14 ) [sub_resource type="Resource" id=10] @@ -109,8 +104,7 @@ shards_required_spicy = 0 shards_required_pungent = 0 boss_required = "boss1" boss = false -scores_id = 13265 -times_id = 13272 +has_scoreboard = true scene = ExtResource( 7 ) [sub_resource type="Resource" id=9] @@ -125,8 +119,7 @@ shards_required_spicy = 0 shards_required_pungent = 0 boss_required = "boss1" boss = false -scores_id = 13266 -times_id = 13273 +has_scoreboard = true scene = ExtResource( 11 ) [sub_resource type="Resource" id=12] @@ -141,8 +134,7 @@ shards_required_spicy = 32 shards_required_pungent = 40 boss_required = "" boss = true -scores_id = -1 -times_id = -1 +has_scoreboard = false scene = ExtResource( 13 ) [sub_resource type="Resource" id=8] @@ -157,8 +149,7 @@ shards_required_spicy = 0 shards_required_pungent = 0 boss_required = "boss2" boss = false -scores_id = 13267 -times_id = 13274 +has_scoreboard = true scene = ExtResource( 10 ) [sub_resource type="Resource" id=7] @@ -173,8 +164,7 @@ shards_required_spicy = 0 shards_required_pungent = 0 boss_required = "boss2" boss = false -scores_id = 13268 -times_id = 13275 +has_scoreboard = true scene = ExtResource( 9 ) [sub_resource type="Resource" id=11] @@ -189,8 +179,7 @@ shards_required_spicy = 0 shards_required_pungent = 0 boss_required = "boss2" boss = false -scores_id = 13269 -times_id = 13276 +has_scoreboard = true scene = ExtResource( 12 ) [sub_resource type="Resource" id=15] @@ -205,8 +194,7 @@ shards_required_spicy = 50 shards_required_pungent = 60 boss_required = "" boss = true -scores_id = -1 -times_id = -1 +has_scoreboard = false scene = ExtResource( 16 ) [sub_resource type="Resource" id=14] @@ -221,8 +209,7 @@ shards_required_spicy = 72 shards_required_pungent = 72 boss_required = "boss3" boss = false -scores_id = -1 -times_id = -1 +has_scoreboard = false scene = ExtResource( 4 ) [sub_resource type="Resource" id=13] @@ -237,8 +224,7 @@ shards_required_spicy = 0 shards_required_pungent = 0 boss_required = "" boss = false -scores_id = -1 -times_id = -1 +has_scoreboard = false scene = ExtResource( 15 ) [node name="LevelData" type="Node"] diff --git a/export_presets.cfg b/export_presets.cfg index 7a3e24a..75f22d9 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -5,7 +5,7 @@ platform="Windows Desktop" runnable=true custom_features="" export_filter="all_resources" -include_filter="ngio.ini" +include_filter="scoreboard_host.txt" exclude_filter="" export_path="build/Revolution 2083.exe" script_export_mode=1 @@ -33,6 +33,7 @@ codesign/description="" codesign/custom_options=PoolStringArray( ) application/modify_resources=true application/icon="res://icon.ico" +application/icon_interpolation=4 application/file_version="" application/product_version="" application/company_name="Team SG" @@ -48,7 +49,7 @@ platform="Linux/X11" runnable=true custom_features="" export_filter="all_resources" -include_filter="ngio.ini" +include_filter="scoreboard_host.txt" exclude_filter="" export_path="build/linux/Revolution 2083.x86_64" script_export_mode=1 @@ -58,7 +59,7 @@ script_encryption_key="" custom_template/debug="" custom_template/release="" -binary_format/64_bits=true +binary_format/architecture="x86_64" binary_format/embed_pck=true texture_format/bptc=false texture_format/s3tc=true @@ -73,7 +74,7 @@ platform="HTML5" runnable=true custom_features="" export_filter="all_resources" -include_filter="ngio.ini" +include_filter="scoreboard_host.txt" exclude_filter="" export_path="build/html5/index.html" script_export_mode=1 @@ -108,7 +109,7 @@ platform="Android" runnable=true custom_features="" export_filter="all_resources" -include_filter="" +include_filter="scoreboard_host.txt" exclude_filter="" export_path="build/android/hero-mark-2.apk" script_export_mode=1 @@ -241,6 +242,7 @@ permissions/mount_format_filesystems=false permissions/mount_unmount_filesystems=false permissions/nfc=false permissions/persistent_activity=false +permissions/post_notifications=false permissions/process_outgoing_calls=false permissions/read_calendar=false permissions/read_call_log=false diff --git a/graphics/hud/arrow_down.png b/graphics/hud/arrow_down.png new file mode 100644 index 0000000000000000000000000000000000000000..b077880e0cabcf8f9c21ddca1b003fbbc868b082 GIT binary patch literal 6094 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 literal 0 HcmV?d00001 diff --git a/graphics/hud/arrow_down.png.import b/graphics/hud/arrow_down.png.import new file mode 100644 index 0000000..147e2b1 --- /dev/null +++ b/graphics/hud/arrow_down.png.import @@ -0,0 +1,35 @@ +[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 new file mode 100644 index 0000000000000000000000000000000000000000..795cca0c27703fd697a4bb55e6ed13bbe1d16ac9 GIT binary patch literal 6086 zcmeHLdsGzH8J}erc3B~aA|Rp;3sLYm`Z_WVq$ej)qnM}C`(jkC=monw3S<{K(ByJ5eL4HCLQ=0g2->NwKk{C zHc6NPo)Q@%3HwR<*)b9+A_e0epp5`F^nooy5-apS2lkk-y$aa5VV@Xa>m)HqBIwtH zh66hV^gBS~mWE;-0QN_qDTL3#F$huteu;gV&0dM(YMoZCH-Yt9oFH{Lsnwx66RF2Z z+yLTBHuhx%mLl=UJtTw;a}+tjL`6=}7C99ITN=(6Dihbw9u>ABcS%eLvmCAs+rNhk zz!l0pcqVur8D25XHVp)V0)emKXGjU6h>MfQ#VX`-d3?M=nUIp0Fl<=D=n*56QpRSC zA2&85GZW2GPefIdvokYu^YbQabp%0-pJ=w2@B+1-z#)hvK0ZESSVDSYVmh9cnS~Gf z3LZj|6)-2MM1{m8OQgw?;8A2e$TL*~25`T6FS)-HVU3-T1N5VHZik^!$6nM^8^Ltc`YR!BTq7MrDu8&Nb< zPBo2G;fob1#Va?xemFi`Uv+hq!*^VnnnQg4Py8 zGBO3ZeXlEbW6b|yOFG!QxeLkd*RCpaH!p&%aN*{zT;wsD^va#^5^-sPNHuB0K=}Tl zpndmI$|Q*?NG}ZxBZeysiarnPrH910QI&{RKy-arAFWWd0%B?p>mQ)d9Z@u~Pa0T& zJ{DqX(QGz~Q(}K}plXrOkvM}d(qj~5AoJ)V_0frdf_EFC?YxjILY#ou4r(WLPaQN^s$Em|_&zUWsT{Qgp zMW&}rd3(z{FHKmIsvEcauPcJD1TUTSOE&$`x$ac5l;|;5ckW*M-p;OPf2YV=G%jIY zv2%@XqRn>ebhqW3s-DueH4D#eIJNEKZoF|Q@DJuEhv_?L4Nkb-j{bBI*)y{@8SoqwJkp>N9}J^oJHhI57jQ- z)xF?sPfy`n3!htea9E>41sA@-qN)WiTqPbKixO%=t;I?MTnnx$RH6kw#z|ILr-dQF zFN><4=e?vx)7sjqZq=(jzB-N0Y&L7OxCX~D;DPzu+&mS)-2Q9`5yG&te%i-*dCucT zAtvSUH1igf3e2NoelD-w9)WlJ!zuthGy%%1(W$i>mrK)sg`Y2N0U+Uo9=O6^)8=J0 zRjl9B?4#Mz7S_#Y_lJP5nh^v@sg84b1yVq~`+_la#LwI8YZQDKTEjN7E&%EW`RVTS z=Q(GeSoh@yX9PO^69M5O`1g5>+y!UgWw(=758Vud+N>58%$H<5G{=yF=^%^-+Q8&v zCW0j}!mQO}ls?~p=_uM^U@1J`nXl~!Wpn#^%1yHn3V^FQfa7p#bvR{kU|IttTLW(LQ# zCZm}#2~e;OWKpHfqQcdo{DhIpMv8ZOd@hS>I_GW<^tsk>F1DJdplG^$yR64}T_;SyvXFob5SD`b6d()ZfD2jT zV=3O_tMPamEvm@zBrnASjQBf67z55qaz9_0;h9<(4- z@^a1(;_*Hi8~7Cb$|+f^Lr z9|{jT%Z0#8p@@%^lnl9 p;w8i?yS$-r)o0hfzDV>)dUlSJ{^N2Z_(wN_*h*(ucNWiU{||(C{pJ7w literal 0 HcmV?d00001 diff --git a/graphics/hud/arrow_up.png.import b/graphics/hud/arrow_up.png.import new file mode 100644 index 0000000..b303c7a --- /dev/null +++ b/graphics/hud/arrow_up.png.import @@ -0,0 +1,35 @@ +[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/scores/pungent.png b/graphics/hud/scores/pungent.png new file mode 100644 index 0000000000000000000000000000000000000000..7754646e8e3c8ffc472d8df941b8f9bc6746fdcd GIT binary patch literal 9390 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 literal 0 HcmV?d00001 diff --git a/graphics/hud/scores/pungent.png.import b/graphics/hud/scores/pungent.png.import new file mode 100644 index 0000000..1265a85 --- /dev/null +++ b/graphics/hud/scores/pungent.png.import @@ -0,0 +1,35 @@ +[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 new file mode 100644 index 0000000000000000000000000000000000000000..af22ef1b6b659ecaa026e1f6c6f97108bd30b8e7 GIT binary patch literal 697 zcmV;q0!ICbP)EX>4Tx04R}tkvmAkP!xv$riu?L3U&~2$WWauf{HlSDionYs1;guFuCaqnlvOS zE{=k0!NJF3)xpJCR|i)?5PX0*J2)x2NQvhrg%&X$xZIEbp8x0Ga{-}VW}4Lz12o+> zQ;E2k$*ziBuLvQ49t>bYW|lE0NlEzD*FE)8-9>qpf8U?gr{*jM1VrK(GfbO!gLr1s zHaPDShgnfpiO-40O}ZfQBi9v=-#8as7IZLMN=c5CXT3@PWeK{ zW0mt3XRTai&3p0}hI0DKGS_L1Ab~|JL4pVcRg_SMjVSFpDHc+69{2GNyMBpW3b{&P zy{D4^000SaNLh0L z04^T@04^T^c_CX>@2HM@dakSAh-}0001xNklYHAPoLPF#`hw0|O%=#TJu77#J8B7*6D^ zVPIfjU}PjlF$|o@Tf@La$UQEK&r$eHgiPOaUy`5(45zp#K4oh7S literal 0 HcmV?d00001 diff --git a/graphics/hud/scores/salty.png.import b/graphics/hud/scores/salty.png.import new file mode 100644 index 0000000..06ae307 --- /dev/null +++ b/graphics/hud/scores/salty.png.import @@ -0,0 +1,35 @@ +[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 new file mode 100644 index 0000000000000000000000000000000000000000..ddace82e572219b3fed5962aef7ae2399757fec1 GIT binary patch literal 662 zcmV;H0%`q;P)EX>4Tx04R}tkvmAkP!xv$riu?L3U&~2$WWauf{HlSDionYs1;guFuCaqnlvOS zE{=k0!NJF3)xpJCR|i)?5PX0*J2)x2NQvhrg%&X$xZIEbp8x0Ga{-}VW}4Lz12o+> zQ;E2k$*ziBuLvQ49t>bYW|lE0NlEzD*FE)8-9>qpf8U?gr{*jM1VrK(GfbO!gLr1s zHaPDShgnfpiO-40O}ZfQBi9v=-#8as7IZLMN=c5CXT3@PWeK{ zW0mt3XRTai&3p0}hI0DKGS_L1Ab~|JL4pVcRg_SMjVSFpDHc+69{2GNyMBpW3b{&P zy{D4^000SaNLh0L z04^T@04^T^c_CX>@2HM@dakSAh-}0001ONklYHAP)S8F_?%^Y%wVWu8D;hQ;`89F2(;3 zIWbsX5Mp3pU|=|rw+613376szJzp8N?|Dp=4gcT!nWG2@ZaRtA2E2fg6w}dd`2YWq w6JEv09D*hzYd}#9Rfsdl8L>nXBR)?900YPEX>4Tx04R}tkvmAkP!xv$riu?L3U&~2$WWauf{HlSDionYs1;guFuCaqnlvOS zE{=k0!NJF3)xpJCR|i)?5PX0*J2)x2NQvhrg%&X$xZIEbp8x0Ga{-}VW}4Lz12o+> zQ;E2k$*ziBuLvQ49t>bYW|lE0NlEzD*FE)8-9>qpf8U?gr{*jM1VrK(GfbO!gLr1s zHaPDShgnfpiO-40O}ZfQBi9v=-#8as7IZLMN=c5CXT3@PWeK{ zW0mt3XRTai&3p0}hI0DKGS_L1Ab~|JL4pVcRg_SMjVSFpDHc+69{2GNyMBpW3b{&P zy{D4^000SaNLh0L z04^T@04^T^c_CX>@2HM@dakSAh-}0001bNklYLzz_Z-u^Hh6F2(;pd_|}h;AUW8U|?jz zsrd3EQ~`+Q|4cYd-n5v3;qhAxNhYi&Po01edHfbdBO^X%z=6y)h+;tx1{S=Ep$ZwU zeu4|JU{#E+P@4}$13`t1f*x=$un?;d)dnIIA`AS-5-vDX002}HI67*DwD$l2002ov JPDHLkV1h2D6qx`3 literal 0 HcmV?d00001 diff --git a/graphics/hud/scores/sweet.png.import b/graphics/hud/scores/sweet.png.import new file mode 100644 index 0000000..8ed72ac --- /dev/null +++ b/graphics/hud/scores/sweet.png.import @@ -0,0 +1,35 @@ +[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/menus/main_menu.gd b/menus/main_menu.gd index 3856a39..f91fb60 100644 --- a/menus/main_menu.gd +++ b/menus/main_menu.gd @@ -52,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.tscn").instance() + SceneManager.current_scene = load("res://menus/scoreboards_scholar.tscn").instance() func _on_Options_button_down() -> void: diff --git a/menus/results.gd b/menus/results.gd index 641b3eb..7c320e6 100644 --- a/menus/results.gd +++ b/menus/results.gd @@ -1,7 +1,6 @@ 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 diff --git a/menus/score_entry.gd b/menus/score_entry.gd index d59a2ce..89927e3 100644 --- a/menus/score_entry.gd +++ b/menus/score_entry.gd @@ -1,26 +1,47 @@ 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 user: String = "Username" setget _set_user -export var score: String = "00000" setget _set_score +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 func _ready() -> void: - $Place.text = " %01d " % place - $User.text = user - $Score.text = score + _set_place(place) + _set_player(player) + _set_score(score) + _set_time(time) + _set_difficulty(difficulty) func _set_place(value: int) -> void: place = value if is_inside_tree(): - $Place.text = " %01d " % place + $Place.text = "%d" % place -func _set_user(value: String) -> void: - user = value +func _set_player(value: String) -> void: + player = value.substr(0, 10) if is_inside_tree(): - $User.text = user + $Player.text = player -func _set_score(value: String) -> void: +func _set_score(value: int) -> void: score = value if is_inside_tree(): - $Score.text = score + $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] diff --git a/menus/score_entry.tscn b/menus/score_entry.tscn index 2eaac8c..26aaa66 100644 --- a/menus/score_entry.tscn +++ b/menus/score_entry.tscn @@ -1,32 +1,60 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=5 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 = 210.0 -margin_bottom = 10.0 +margin_right = 228.0 +margin_bottom = 12.0 +rect_min_size = Vector2( 0, 12 ) theme = ExtResource( 1 ) custom_constants/separation = 8 script = ExtResource( 2 ) -user = "--------" -score = "-----" +player = "coolplayer" [node name="Place" type="Label" parent="."] -margin_right = 21.0 -margin_bottom = 10.0 -text = " 0 " +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 -[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="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="Score" type="Label" parent="."] -margin_left = 175.0 -margin_right = 210.0 -margin_bottom = 10.0 -text = "-----" +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" 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 new file mode 100644 index 0000000..10b3f05 --- /dev/null +++ b/menus/scoreboards_scholar.gd @@ -0,0 +1,108 @@ +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: + 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") + + loaded_scores[level] = {} + 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 new file mode 100644 index 0000000..bd9af0f --- /dev/null +++ b/menus/scoreboards_scholar.tscn @@ -0,0 +1,320 @@ +[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 = "score" +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/project.godot b/project.godot index 4b61178..d94c3f8 100644 --- a/project.godot +++ b/project.godot @@ -109,7 +109,6 @@ SceneManager="*res://autoloads/scene_manager.tscn" Console="*res://autoloads/console.tscn" Fade="*res://autoloads/fade.tscn" StainLayer="*res://autoloads/stain_layer.tscn" -Ngio="*res://autoloads/ngio.gd" ScoreBoard="*res://autoloads/scoreboard.gd" [debug] diff --git a/scripts/level_entry.gd b/scripts/level_entry.gd index 55024db..db1b37c 100644 --- a/scripts/level_entry.gd +++ b/scripts/level_entry.gd @@ -16,8 +16,7 @@ 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 scores_id: int = -1 -export var times_id: int = -1 +export var has_scoreboard: bool = false export var scene: PackedScene var shards_required: int = 0 setget , _get_shards_required From 65053aa2230921037cef12ad5f2880c8eb8fd2a0 Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Sun, 1 Dec 2024 21:37:15 -0500 Subject: [PATCH 14/50] Player scoreboard name option --- autoloads/debug.gd | 5 ++- autoloads/options.gd | 11 ++++-- menus/file_create.gd | 2 ++ objects/hud/options_screen_scholar.gd | 2 +- objects/hud/options_screen_scholar.tscn | 46 +++++++++++++++++++++++-- objects/hud/player_name_input.gd | 29 ++++++++++++++++ project.godot | 6 ++++ 7 files changed, 95 insertions(+), 6 deletions(-) create mode 100644 objects/hud/player_name_input.gd diff --git a/autoloads/debug.gd b/autoloads/debug.gd index e6d493c..606b626 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: + if debug == true && !entry && !entry_index > 0 && !Options.entry: #Move player to mouse if Input.is_action_just_pressed("debug_move_player"): Audio.play_sound(Audio.a_mkey,Audio.ac_jump) @@ -67,6 +67,9 @@ 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: diff --git a/autoloads/options.gd b/autoloads/options.gd index fca7516..215948a 100644 --- a/autoloads/options.gd +++ b/autoloads/options.gd @@ -18,7 +18,7 @@ const TRANS_SPEEDS := [0.8, 0.4, 0.2, 0.0000001] #Game var rumble: int = RumbleMode.FULL var gore: int = Gore.FULL -var scoreboard_name: String = "" +var scoreboard_name: String = "" setget _set_scoreboard_name var scoreboard_id: int = -1 #Video @@ -42,6 +42,9 @@ 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 @@ -51,7 +54,7 @@ func _ready() -> void: load_options() func _unhandled_input(event: InputEvent) -> void: - if Debug.entry == false: + if not Debug.entry and not entry: if event.is_action_pressed("fullscreen"): OS.window_fullscreen = not OS.window_fullscreen @@ -125,6 +128,10 @@ func save_options() -> void: # Setters +# game setters +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/menus/file_create.gd b/menus/file_create.gd index fd6f68a..6a91bf1 100644 --- a/menus/file_create.gd +++ b/menus/file_create.gd @@ -100,6 +100,8 @@ 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 file.save_to_file() Save.current_file = file Game.difficulty = file.difficulty diff --git a/objects/hud/options_screen_scholar.gd b/objects/hud/options_screen_scholar.gd index 4f8d11c..ffb07d0 100644 --- a/objects/hud/options_screen_scholar.gd +++ b/objects/hud/options_screen_scholar.gd @@ -39,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"): + if can_exit and event.is_action_pressed("ui_cancel") and not Options.entry: if visible == true: emit_signal("exit") diff --git a/objects/hud/options_screen_scholar.tscn b/objects/hud/options_screen_scholar.tscn index 3e1f343..13733a4 100644 --- a/objects/hud/options_screen_scholar.tscn +++ b/objects/hud/options_screen_scholar.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=16 format=2] +[gd_scene load_steps=19 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,6 +11,21 @@ [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 ) @@ -100,7 +115,6 @@ 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") @@ -146,11 +160,34 @@ margin_left = 39.0 margin_right = 218.0 margin_bottom = 12.0 focus_neighbour_top = NodePath("../../Rumble/SelectRumble") +focus_neighbour_bottom = NodePath("../../ScoreBoardName/PlayerNameInput") focus_mode = 2 size_flags_horizontal = 3 script = ExtResource( 3 ) options = [ "none", "no stains", "full" ] +[node name="ScoreBoardName" type="HBoxContainer" parent="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Tabs/Game"] +margin_top = 32.0 +margin_right = 218.0 +margin_bottom = 42.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("../../Gore/SelectGore") +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 @@ -459,6 +496,7 @@ 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") @@ -825,6 +863,10 @@ 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="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 new file mode 100644 index 0000000..23edaf8 --- /dev/null +++ b/objects/hud/player_name_input.gd @@ -0,0 +1,29 @@ +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/project.godot b/project.godot index d94c3f8..6b26af2 100644 --- a/project.godot +++ b/project.godot @@ -359,6 +359,12 @@ shield={ , 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] From 04c87ebf66af89c48541b1777b74e320a152cef7 Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Sun, 1 Dec 2024 22:34:49 -0500 Subject: [PATCH 15/50] EEEEEH?? EASY MODO?? --- autoloads/game.gd | 6 ++++++ menus/results.gd | 5 +++++ menus/results.tscn | 16 ++++++++++++---- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/autoloads/game.gd b/autoloads/game.gd index a17ea40..83dc856 100644 --- a/autoloads/game.gd +++ b/autoloads/game.gd @@ -9,6 +9,9 @@ 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) @@ -139,6 +142,9 @@ 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 diff --git a/menus/results.gd b/menus/results.gd index 7c320e6..9748925 100644 --- a/menus/results.gd +++ b/menus/results.gd @@ -28,6 +28,11 @@ 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" diff --git a/menus/results.tscn b/menus/results.tscn index aa437f8..d5d1733 100644 --- a/menus/results.tscn +++ b/menus/results.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=34 format=2] +[gd_scene load_steps=35 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] @@ -19,6 +19,7 @@ [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 ) @@ -1054,6 +1055,13 @@ 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 @@ -1113,15 +1121,15 @@ rect_pivot_offset = Vector2( 45.5, 18 ) theme = ExtResource( 10 ) [node name="Label" type="Label" parent="CenterContainer/SubmitScore"] -margin_right = 126.0 +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 = 18.0 +margin_left = 1.0 margin_top = 14.0 -margin_right = 107.0 +margin_right = 90.0 margin_bottom = 36.0 size_flags_horizontal = 4 From 2e604bb5f65bbbef1994f382b017e697c637cf7e Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Sun, 1 Dec 2024 22:35:29 -0500 Subject: [PATCH 16/50] That is supposed to say 'time' --- menus/scoreboards_scholar.tscn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/menus/scoreboards_scholar.tscn b/menus/scoreboards_scholar.tscn index bd9af0f..ca8f960 100644 --- a/menus/scoreboards_scholar.tscn +++ b/menus/scoreboards_scholar.tscn @@ -182,7 +182,7 @@ margin_right = 201.0 margin_bottom = 10.0 rect_min_size = Vector2( 56, 0 ) custom_fonts/font = ExtResource( 8 ) -text = "score" +text = "time" align = 1 [node name="Control" type="Control" parent="BoardsScreen/Scoreboard/MarginContainer/VBoxContainer/Header"] From b7b6ff64f3abe04e51cf925ae0f414e3b9b9d542 Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Sun, 1 Dec 2024 22:54:05 -0500 Subject: [PATCH 17/50] increase http timeout to give a bit more grace period --- autoloads/scoreboard.gd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autoloads/scoreboard.gd b/autoloads/scoreboard.gd index 4464cd5..17a043d 100644 --- a/autoloads/scoreboard.gd +++ b/autoloads/scoreboard.gd @@ -41,7 +41,7 @@ func _ready() -> void: http = HTTPRequest.new() http.download_chunk_size = 4096 - http.timeout = 10.0 + http.timeout = 30.0 http.use_threads = true http.connect("request_completed", self, "_on_request_completed") add_child(http) From ceb65b43189398059450e29af41876d8a81deae4 Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Sun, 1 Dec 2024 23:09:20 -0500 Subject: [PATCH 18/50] difficulty icons in file create screen :) --- menus/file_create.tscn | 49 ++++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/menus/file_create.tscn b/menus/file_create.tscn index 1ca045b..7521d3b 100644 --- a/menus/file_create.tscn +++ b/menus/file_create.tscn @@ -1,23 +1,26 @@ -[gd_scene load_steps=29 format=2] +[gd_scene load_steps=32 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/pause_arrow.png" type="Texture" id=6] +[ext_resource path="res://graphics/hud/scores/salty.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 ) @@ -136,20 +139,20 @@ theme = ExtResource( 2 ) [node name="Sweet" type="TextureButton" parent="DifficultySelect/ButtonsPanel"] material = SubResource( 3 ) -margin_left = 8.0 -margin_top = 9.0 -margin_right = 16.0 -margin_bottom = 17.0 +margin_left = 5.0 +margin_top = 8.0 +margin_right = 17.0 +margin_bottom = 20.0 focus_neighbour_top = NodePath("../Pungent") focus_neighbour_bottom = NodePath("../Salty") -texture_focused = ExtResource( 6 ) +texture_focused = ExtResource( 13 ) [node name="Salty" type="TextureButton" parent="DifficultySelect/ButtonsPanel"] material = SubResource( 3 ) -margin_left = 8.0 -margin_top = 22.0 -margin_right = 16.0 -margin_bottom = 30.0 +margin_left = 5.0 +margin_top = 21.0 +margin_right = 17.0 +margin_bottom = 33.0 focus_neighbour_top = NodePath("../Sweet") focus_neighbour_bottom = NodePath("../Spicy") texture_focused = ExtResource( 6 ) @@ -157,29 +160,29 @@ texture_focused = ExtResource( 6 ) [node name="Spicy" type="TextureButton" parent="DifficultySelect/ButtonsPanel"] unique_name_in_owner = true material = SubResource( 3 ) -margin_left = 8.0 -margin_top = 35.0 -margin_right = 16.0 -margin_bottom = 43.0 +margin_left = 5.0 +margin_top = 34.0 +margin_right = 17.0 +margin_bottom = 46.0 focus_neighbour_top = NodePath("../Salty") focus_neighbour_bottom = NodePath("../Pungent") -texture_focused = ExtResource( 6 ) +texture_focused = ExtResource( 21 ) [node name="Pungent" type="TextureButton" parent="DifficultySelect/ButtonsPanel"] material = SubResource( 3 ) -margin_left = 8.0 -margin_top = 48.0 -margin_right = 16.0 -margin_bottom = 56.0 +margin_left = 5.0 +margin_top = 47.0 +margin_right = 17.0 +margin_bottom = 59.0 focus_neighbour_top = NodePath("../Spicy") focus_neighbour_bottom = NodePath("../Sweet") -texture_focused = ExtResource( 6 ) +texture_focused = ExtResource( 20 ) [node name="Body" type="Label" parent="DifficultySelect/ButtonsPanel"] material = SubResource( 2 ) -margin_left = 16.0 +margin_left = 18.0 margin_top = 8.0 -margin_right = 65.0 +margin_right = 67.0 margin_bottom = 57.0 text = "sweet salty From 6a68e025ea14aa7e95cd095478d56e112e7eabed Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Tue, 3 Dec 2024 15:33:48 -0500 Subject: [PATCH 19/50] drag beta cave back to the stone age --- maps/cave.tscn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maps/cave.tscn b/maps/cave.tscn index e4741ef..ab72f3f 100644 --- a/maps/cave.tscn +++ b/maps/cave.tscn @@ -62,7 +62,7 @@ tile_set = ExtResource( 2 ) cell_size = Vector2( 8, 8 ) collision_layer = 9 format = 1 -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 ) +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 ) [node name="Player" parent="." instance=ExtResource( 1 )] position = Vector2( 32, 176 ) From 94ed6c6c6833c860b4c194cacf37c43137e378e0 Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Tue, 3 Dec 2024 16:08:33 -0500 Subject: [PATCH 20/50] guards in place for when scoreboard_host.txt is not present --- autoloads/scoreboard.gd | 7 ++++--- menus/results.gd | 2 +- menus/scoreboards_scholar.gd | 7 ++++++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/autoloads/scoreboard.gd b/autoloads/scoreboard.gd index 17a043d..649c2a7 100644 --- a/autoloads/scoreboard.gd +++ b/autoloads/scoreboard.gd @@ -35,9 +35,10 @@ class ScoreEntry: func _ready() -> void: var file = File.new() - file.open("res://scoreboard_host.txt", File.READ) - server_host = file.get_line() - file.close() + 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 diff --git a/menus/results.gd b/menus/results.gd index 9748925..8d03a0c 100644 --- a/menus/results.gd +++ b/menus/results.gd @@ -77,7 +77,7 @@ func _on_AnimationPlayer_animation_finished(anim_name): else: Game.change_map(LevelData.levels[Game.current_level].scene) return - if Game.final_score > Game.old_high_score and not Debug.is_cheating: + if Game.final_score > Game.old_high_score and not Debug.is_cheating and not ScoreBoard.server_host.empty(): animation_player.play("submit_score_popup") else: Fade.fade_out(Options.transition_speed_secs) diff --git a/menus/scoreboards_scholar.gd b/menus/scoreboards_scholar.gd index 10b3f05..9377f82 100644 --- a/menus/scoreboards_scholar.gd +++ b/menus/scoreboards_scholar.gd @@ -77,6 +77,12 @@ func _refresh_scores() -> void: 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 @@ -86,7 +92,6 @@ func _load_scores(level: String) -> void: _sorting_dict = result players.sort_custom(self, "_sort_scores") - loaded_scores[level] = {} for p in players: loaded_scores[level][p] = result[p] From b6daa18e6c068a6c7902309dc535273226027d25 Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Thu, 5 Dec 2024 02:21:22 -0500 Subject: [PATCH 21/50] quite incredible --- autoloads/debug.gd | 3 ++ graphics/secret/uncanny.png | Bin 0 -> 4277 bytes graphics/secret/uncanny.png.import | 35 +++++++++++++++++++++++ objects/enemy/uncanny_cat.gd | 31 ++++++++++++++++++++ objects/enemy/uncanny_cat.tscn | 44 +++++++++++++++++++++++++++++ 5 files changed, 113 insertions(+) create mode 100644 graphics/secret/uncanny.png create mode 100644 graphics/secret/uncanny.png.import create mode 100644 objects/enemy/uncanny_cat.gd create mode 100644 objects/enemy/uncanny_cat.tscn diff --git a/autoloads/debug.gd b/autoloads/debug.gd index 606b626..2e9f962 100644 --- a/autoloads/debug.gd +++ b/autoloads/debug.gd @@ -240,3 +240,6 @@ func _enter_code(): "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/graphics/secret/uncanny.png b/graphics/secret/uncanny.png new file mode 100644 index 0000000000000000000000000000000000000000..dfa69b64dcf55f3267cabede57eee6103ed8bfde GIT binary patch literal 4277 zcmeHKdrTBZ7~ew_MNLq#o)qJD)hM=myL&J0R!*RRaFtVplZVyF-tHW%a1ZttIEc2! z8mW&eTHAnPqxI27Vr!dPjrD=S#x}O~Q5$WIO0Yg^jW#}_@lpHj-tkIJ8j|`SdzqVW zW`6UV`F``wcel%PW@HYHj*G@HY^XgeJs0X2r9||DZ`Y<#cc40n3hi#YeKIx>8i3S9 zVj2YlMbpiW(DcKUS<9dd2V21?B~H^{tyh8la@bxE_M|W-0&GSTfenSa35p)ds-Uqmwaxq9AQ|nY0+9+R%?oO*`*yHu5iZR#6Paz!v30(5nncPMb0Z{ zqIa~Ct?h*Cmm}X66+{)J#yrtfRQYq|wZjijk0xCQF7K;*aOlC6 zTT@a>^Bdjw$77DYKW0x(xO%7A^>E~{rKJOy$%f+%?{70MJa*O=vGDN9yRSXlpPYGk z&Tef?%<>UG(4O|8?TwD}Z3kw?BUChD>co%eKb9O_Gq)h=t;=(zqPE6ahK-FAR}Wvg zU6;SV;RDBe!3~xj3)m}zt!rlg^k&nZ1)KKV{(inT;rgq`=YC>Z68q8@k%NfXGqX}h zn%lqnb6eqeCu>e0OTPJNf|T(4&c$najj6PLUh>1SPj2m+-L&D}I>L_MYqyN$Q-Y&P zP4U+rpR1TNG3Bq(`%X{!d(Mc4r{fQvI_1i2X)*gNE}U9#Ym=h1wR$11YCBGDDU7^$ z;`+urEp6n3{K|o0Ny$M!$Cn`)ccBu|Ya?!dbC|$I!A2CA9JIrq zhDyb(S_$RV&T#UzWxQ1&lBY%|1z8~QAeqC1o^o%14cZ8mmjzqtrU+bx$YnO75aKA! zCn4OZGwNtEBPdqsiK)?ek|em<-1KQ-3TWAgQd#!16jfbat*bWZd{PO;Sglry)>C>t z2?#P!`fU_-RZs&Sgw=52fD*|6$~hcgH8AG zmCB;_bQ_`Umlb@xD6p#OHXE75M2nj=TNs8kS_FY~A*(?0jKI5SH*GdrjNPd0-hj+` zd8AMQxlRNgjuR|Aj|`-RGn;{e*OOM4l_TAZ!Q!&I1>S7cccYjoi4c`sdG}o@R02>j zMytVUF$g5GnoXopuyCZ677%GPa0Z6sc)i(ZR;iS8U{iDKHbSqXyLxiUIoa)#JT@X* z^i~GD2ArY?<;k2P8k1-+7!pminbsQ^nlW{O@{tsPfKxct6se8~JUa~-IS3rl!<8V) z?=4XWlw)DR84#9J;uM(Ge(;4&lMpBSB&W|;ZX-IgZs)KAu9LvYTskKsSgkV;J3I0) zNt;+Y64?>Q%yV^-{1LA95kU zRUtv$Cvb&^_)^YWf*^Z@!?mMdd`>7Nnt5bNL}t>J$Qel^GVr9uNE=CufD9&+#l;8+ z^<)qD+;TN1q0|!45wwEvRDYrHN$LqE^h8&eBIS5MFp|-ONMXVBbXYJd>@cO|j1G^J zsDEjaqyoAn8JHL9gX9Idkm^i^Va=4Z^8%mnS-ij%fVyvyUg_H>SD#$HQlMAhzUbqGkYkBmJ~|MV7gW!uwJodeJE#ljoB$jqw6)z e+Ia1`d=2*XjA8Fi`ZPx2#q1d~(m#8>c*#HENUjS2 literal 0 HcmV?d00001 diff --git a/graphics/secret/uncanny.png.import b/graphics/secret/uncanny.png.import new file mode 100644 index 0000000..54773b6 --- /dev/null +++ b/graphics/secret/uncanny.png.import @@ -0,0 +1,35 @@ +[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/objects/enemy/uncanny_cat.gd b/objects/enemy/uncanny_cat.gd new file mode 100644 index 0000000..7e5f7e5 --- /dev/null +++ b/objects/enemy/uncanny_cat.gd @@ -0,0 +1,31 @@ +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 new file mode 100644 index 0000000..d944707 --- /dev/null +++ b/objects/enemy/uncanny_cat.tscn @@ -0,0 +1,44 @@ +[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"] From e218f3c10b3b675a7c1eac80056e4d24eee114f4 Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Thu, 5 Dec 2024 02:35:40 -0500 Subject: [PATCH 22/50] beta gameplay in beta levels ;) --- maps/cave.tscn | 1 + maps/hills.tscn | 1 + objects/player/player.gd | 11 +++++++++-- objects/player/player.tscn | 19 +++++++++++++++---- 4 files changed, 26 insertions(+), 6 deletions(-) diff --git a/maps/cave.tscn b/maps/cave.tscn index ab72f3f..66b0830 100644 --- a/maps/cave.tscn +++ b/maps/cave.tscn @@ -66,6 +66,7 @@ tile_data = PoolIntArray( 65571, 0, 0, 131107, 0, 0, 131155, 0, 65537, 131156, 0 [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/hills.tscn b/maps/hills.tscn index 4a237d0..a06cddd 100644 --- a/maps/hills.tscn +++ b/maps/hills.tscn @@ -66,6 +66,7 @@ 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/objects/player/player.gd b/objects/player/player.gd index 06e3688..22b8818 100644 --- a/objects/player/player.gd +++ b/objects/player/player.gd @@ -33,6 +33,8 @@ 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 @@ -92,6 +94,7 @@ 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 @@ -470,10 +473,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: + elif Input.is_action_just_pressed("move_left") and _attached_ladder.can_climb_left and not beta_gameplay: 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: + elif Input.is_action_just_pressed("move_right") and _attached_ladder.can_climb_right and not beta_gameplay: global_position.x = _attached_ladder.right_snap graphics.scale.x = -1.0 else: @@ -595,3 +598,7 @@ func _on_ShieldTimer_timeout(): 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 5e7e3fe..a05b632 100644 --- a/objects/player/player.tscn +++ b/objects/player/player.tscn @@ -1094,6 +1094,12 @@ __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") @@ -1330,6 +1336,9 @@ 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 ) @@ -1534,8 +1543,8 @@ one_shot = true [connection signal="state_physics_processing" from="StateChart/Root/Movement" to="." method="_process_movement"] [connection signal="state_entered" from="StateChart/Root/Movement/Grounded" to="." method="_on_Grounded_state_entered"] [connection signal="state_physics_processing" from="StateChart/Root/Movement/Grounded" to="." method="_process_grounded"] -[connection signal="state_physics_processing" from="StateChart/Root/Movement/Grounded/CanWalk" to="." method="_process_can_walk"] [connection signal="state_physics_processing" from="StateChart/Root/Movement/Grounded/CanWalk" to="." method="_process_horizontal_movement_grounded"] +[connection signal="state_physics_processing" from="StateChart/Root/Movement/Grounded/CanWalk" to="." method="_process_can_walk"] [connection signal="state_entered" from="StateChart/Root/Movement/Grounded/CanWalk/Still" to="." method="_on_Still_state_entered"] [connection signal="state_entered" from="StateChart/Root/Movement/Grounded/CanWalk/Walking" to="." method="_on_Walking_state_entered"] [connection signal="state_entered" from="StateChart/Root/Movement/Grounded/CanWalk/Blinking" to="." method="_on_Blinking_state_entered"] @@ -1546,11 +1555,11 @@ 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="_on_Airborne_state_entered"] [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_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_jump"] [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"] [connection signal="state_entered" from="StateChart/Root/Movement/Airborne/Jump/NormalJump" to="." method="_on_NormalJump_state_entered"] [connection signal="state_exited" from="StateChart/Root/Movement/Airborne/Jump/NormalJump" to="." method="_on_NormalJump_state_exited"] [connection signal="state_entered" from="StateChart/Root/Movement/Airborne/Jump/LadderJump" to="." method="_on_LadderJump_state_entered"] @@ -1558,9 +1567,11 @@ 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="reset_fall_speed"] [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_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"] From 7e57c2b7a6b7d8a50caf2341a5990145da74a7e3 Mon Sep 17 00:00:00 2001 From: pennyrigate Date: Fri, 6 Dec 2024 16:46:49 -0500 Subject: [PATCH 23/50] credits fix --- graphics/hud/title_credits.png | Bin 5025 -> 3170 bytes menus/credits.tscn | 1 + 2 files changed, 1 insertion(+) diff --git a/graphics/hud/title_credits.png b/graphics/hud/title_credits.png index 7c2bfaaf0ea45e78ef1965cfa0cdea07b6ce3b3c..5066a5972b3aad32288cf22bca197879c5b79cdf 100644 GIT binary patch delta 2196 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 Date: Fri, 6 Dec 2024 17:44:05 -0500 Subject: [PATCH 24/50] new glass noises --- audio/glass_break.ogg | Bin 0 -> 21176 bytes audio/glass_break.ogg.import | 15 +++++++++++++++ audio/glass_crack.ogg | Bin 0 -> 9271 bytes audio/glass_crack.ogg.import | 15 +++++++++++++++ audio/glass_crack.wav | Bin 0 -> 44940 bytes audio/glass_crack.wav.import | 23 +++++++++++++++++++++++ autoloads/audio.gd | 3 ++- maps/boss/boss2_arena.gd | 4 ++-- 8 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 audio/glass_break.ogg create mode 100644 audio/glass_break.ogg.import create mode 100644 audio/glass_crack.ogg create mode 100644 audio/glass_crack.ogg.import create mode 100644 audio/glass_crack.wav create mode 100644 audio/glass_crack.wav.import diff --git a/audio/glass_break.ogg b/audio/glass_break.ogg new file mode 100644 index 0000000000000000000000000000000000000000..ecafeb9b4333b0f00d52dc18ac891dd930977216 GIT binary patch literal 21176 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 literal 0 HcmV?d00001 diff --git a/audio/glass_crack.wav.import b/audio/glass_crack.wav.import new file mode 100644 index 0000000..9a2cc79 --- /dev/null +++ b/audio/glass_crack.wav.import @@ -0,0 +1,23 @@ +[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/autoloads/audio.gd b/autoloads/audio.gd index 3cd26e7..f7314a9 100644 --- a/autoloads/audio.gd +++ b/autoloads/audio.gd @@ -75,7 +75,8 @@ 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_break = preload("res://audio/sounds/cop_shoot.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") diff --git a/maps/boss/boss2_arena.gd b/maps/boss/boss2_arena.gd index 93850b3..47535a6 100644 --- a/maps/boss/boss2_arena.gd +++ b/maps/boss/boss2_arena.gd @@ -8,10 +8,10 @@ func _ready(): func _on_2600_entered_phase(phase): match phase: 2: - Audio.play_sound(Audio.a_glass_break,Audio.ac_small_explosion) + Audio.play_sound(Audio.a_glass_crack,Audio.ac_mech_hurt) $DelayedArrow2.start() 3: - Audio.play_sound(Audio.a_glass_break,Audio.ac_small_explosion) + Audio.play_sound(Audio.a_glass_break,Audio.ac_mech_hurt) $DelayedArrow3.start() 4: $ExitTimer.start() From b54e9272c6714a950a5d806cf3c9ca3a1fea84fb Mon Sep 17 00:00:00 2001 From: pennyrigate Date: Fri, 6 Dec 2024 17:45:11 -0500 Subject: [PATCH 25/50] fixed the funny ladder --- menus/file_create.tscn | 1 + 1 file changed, 1 insertion(+) diff --git a/menus/file_create.tscn b/menus/file_create.tscn index 7521d3b..1b622fa 100644 --- a/menus/file_create.tscn +++ b/menus/file_create.tscn @@ -412,6 +412,7 @@ 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 ) From 32189c29a488fc0fb5b23bbfd099f3208ccd202a Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Sat, 7 Dec 2024 21:58:34 -0500 Subject: [PATCH 26/50] gotta go fast, hit that BLJgit status --- autoloads/game.gd | 2 +- autoloads/options.gd | 13 +++++++++- autoloads/speedrun_timer.gd | 28 ++++++++++++++++++++ autoloads/speedrun_timer.tscn | 32 +++++++++++++++++++++++ maps/boss/boss3_arena.gd | 1 + menus/file_create.gd | 3 +++ menus/main_menu.gd | 2 ++ objects/hud/options_screen_scholar.gd | 5 ++++ objects/hud/options_screen_scholar.tscn | 34 ++++++++++++++++++++++--- project.godot | 1 + 10 files changed, 115 insertions(+), 6 deletions(-) create mode 100644 autoloads/speedrun_timer.gd create mode 100644 autoloads/speedrun_timer.tscn diff --git a/autoloads/game.gd b/autoloads/game.gd index 83dc856..1f3e1c9 100644 --- a/autoloads/game.gd +++ b/autoloads/game.gd @@ -105,7 +105,7 @@ func get_sector(pos): #Return the current Map func get_map(): - return get_tree().get_nodes_in_group("map")[0] + return get_tree().get_nodes_in_group("map").front() ## tally up scores diff --git a/autoloads/options.gd b/autoloads/options.gd index 215948a..0ffaef2 100644 --- a/autoloads/options.gd +++ b/autoloads/options.gd @@ -18,6 +18,7 @@ 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 scoreboard_name: String = "" setget _set_scoreboard_name var scoreboard_id: int = -1 @@ -64,7 +65,8 @@ func load_options() -> void: # game rumble = file.get_value("game", "rumble", defaults.rumble) gore = file.get_value("game", "gore", defaults.gore) - scoreboard_name = file.get_value("game", "scoreboard_name", "") + _set_speedrun_timer(file.get_value("game", "speedrun_timer", defaults.speedrun_timer)) + _set_scoreboard_name(file.get_value("game", "scoreboard_name", "")) randomize() scoreboard_id = file.get_value("game", "scoreboard_id", randi()) # video @@ -87,6 +89,7 @@ func load_defaults(section: int = Section.ALL) -> void: Section.GAME, Section.ALL: rumble = defaults.rumble gore = defaults.gore + speedrun_timer = defaults.speedrun_timer scoreboard_name = defaults.scoreboard_name scoreboard_id = randi() Section.VIDEO, Section.ALL: @@ -107,6 +110,7 @@ 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", "scoreboard_name", scoreboard_name) file.set_value("game", "scoreboard_id", scoreboard_id) #Video @@ -129,9 +133,16 @@ 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/speedrun_timer.gd b/autoloads/speedrun_timer.gd new file mode 100644 index 0000000..7f269cc --- /dev/null +++ b/autoloads/speedrun_timer.gd @@ -0,0 +1,28 @@ +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) + + 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 new file mode 100644 index 0000000..45be8be --- /dev/null +++ b/autoloads/speedrun_timer.tscn @@ -0,0 +1,32 @@ +[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/maps/boss/boss3_arena.gd b/maps/boss/boss3_arena.gd index 38192bf..2c36a93 100644 --- a/maps/boss/boss3_arena.gd +++ b/maps/boss/boss3_arena.gd @@ -66,6 +66,7 @@ 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/menus/file_create.gd b/menus/file_create.gd index 6a91bf1..c8dd5e2 100644 --- a/menus/file_create.gd +++ b/menus/file_create.gd @@ -108,4 +108,7 @@ func _on_player_teleport_finished() -> void: 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/main_menu.gd b/menus/main_menu.gd index f91fb60..d62e9bb 100644 --- a/menus/main_menu.gd +++ b/menus/main_menu.gd @@ -7,6 +7,8 @@ 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() diff --git a/objects/hud/options_screen_scholar.gd b/objects/hud/options_screen_scholar.gd index ffb07d0..62bd918 100644 --- a/objects/hud/options_screen_scholar.gd +++ b/objects/hud/options_screen_scholar.gd @@ -13,6 +13,7 @@ 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 fullscreen: HBoxContainer = $"%SelectFullscreen" onready var window_size: HBoxContainer = $"%SelectWindowSize" onready var scaling: HBoxContainer = $"%SelectScaling" @@ -47,6 +48,7 @@ func _init_values() -> void: # game rumble.selection = Options.rumble gore.selection = Options.gore + speedrun_timer.selection = 1 if Options.speedrun_timer else 0 # video fullscreen.selection = 1 if Options.fullscreen else 0 window_size.selection = int(Options.window_size) - 1 @@ -81,6 +83,9 @@ 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 + # # VIDEO diff --git a/objects/hud/options_screen_scholar.tscn b/objects/hud/options_screen_scholar.tscn index 13733a4..60996d9 100644 --- a/objects/hud/options_screen_scholar.tscn +++ b/objects/hud/options_screen_scholar.tscn @@ -160,16 +160,41 @@ margin_left = 39.0 margin_right = 218.0 margin_bottom = 12.0 focus_neighbour_top = NodePath("../../Rumble/SelectRumble") -focus_neighbour_bottom = NodePath("../../ScoreBoardName/PlayerNameInput") +focus_neighbour_bottom = NodePath("../../SpeedrunTimer/SelectSpeedrunTimer") focus_mode = 2 size_flags_horizontal = 3 script = ExtResource( 3 ) options = [ "none", "no stains", "full" ] -[node name="ScoreBoardName" type="HBoxContainer" parent="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Tabs/Game"] +[node name="SpeedrunTimer" type="HBoxContainer" parent="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Tabs/Game"] margin_top = 32.0 margin_right = 218.0 -margin_bottom = 42.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 = 109.0 +margin_right = 218.0 +margin_bottom = 12.0 +focus_neighbour_top = NodePath("../../Gore/SelectGore") +focus_neighbour_bottom = NodePath("../../ScoreBoardName/PlayerNameInput") +focus_mode = 2 +size_flags_horizontal = 3 +script = ExtResource( 3 ) +condense = true +options = [ "off", "on" ] + +[node name="ScoreBoardName" type="HBoxContainer" parent="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Tabs/Game"] +margin_top = 48.0 +margin_right = 218.0 +margin_bottom = 58.0 [node name="Label" type="Label" parent="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Tabs/Game/ScoreBoardName"] margin_right = 112.0 @@ -181,7 +206,7 @@ margin_left = 130.0 margin_right = 203.0 margin_bottom = 10.0 rect_min_size = Vector2( 73, 0 ) -focus_neighbour_top = NodePath("../../Gore/SelectGore") +focus_neighbour_top = NodePath("../../SpeedrunTimer/SelectSpeedrunTimer") size_flags_horizontal = 6 custom_constants/line_spacing = 0 custom_styles/focus = SubResource( 5 ) @@ -863,6 +888,7 @@ 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="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"] diff --git a/project.godot b/project.godot index 6b26af2..f9aa96b 100644 --- a/project.godot +++ b/project.godot @@ -110,6 +110,7 @@ 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" [debug] From f004479da1da7bc3f3af64a761299aa25205dc66 Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Sat, 7 Dec 2024 22:22:20 -0500 Subject: [PATCH 27/50] glass break particles --- graphics/particles/glass_shard.png | Bin 0 -> 622 bytes graphics/particles/glass_shard.png.import | 35 ++++++++++++++++++++++ objects/enemy/boss/2600.gd | 1 + objects/enemy/boss/2600.tscn | 32 +++++++++++++++++++- 4 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 graphics/particles/glass_shard.png create mode 100644 graphics/particles/glass_shard.png.import diff --git a/graphics/particles/glass_shard.png b/graphics/particles/glass_shard.png new file mode 100644 index 0000000000000000000000000000000000000000..716eda1d98a9a7112dda952bbc2d3d1939cc6085 GIT binary patch literal 622 zcmV-!0+IcRP)EX>4Tx04R}tkv&MmP!xqvQ>8^J4t5Z6$WWauf{N&-RVYG*P%E_RVDi#GXws0R zxHt-~1qXi?s}3&Cx;nTDg5VE`vxAeOiznMuzRM~TH^2P+-SN~T6UNgPu(o$`gO z$13M7&RV6$TKD8HjO6u|Wvu?YAB-u8*$ooQY@tDJmKRXbo~;!6mpfp z$gzMbG{~+W{11N5)+$Vldr6T5(EZ{#AHzUs7iiWU=lj@knkPW;8MxBh{%Ql5{v^HL z)?!CM-!^b@-PV*n;Bp5Tcrs*DcBLRKp-=$c&*+sb!v*yjMb&k^qAVafC-2exN zz(|p@*L~g{?ws4dJ+1lu0M({)&XfaYVE_OC24YJ`L;#)u&;b88{`j*1000SaNLh0L z01m(a01m(bYSxJf00007bV*G`2j~n40|y~D>CRyQ000?uMObu0Z*6U5Zgc=ca%Ew3 zWn>_CX>@2HM@dakSAh-}0000*Nkl-_)!|9`mAjEsyZ3XpYUxMAJ}gw8~Lgl-HI&?Sii08vX83s-ACYXATM07*qo IM6N<$f?34^=>Px# literal 0 HcmV?d00001 diff --git a/graphics/particles/glass_shard.png.import b/graphics/particles/glass_shard.png.import new file mode 100644 index 0000000..e19b7b6 --- /dev/null +++ b/graphics/particles/glass_shard.png.import @@ -0,0 +1,35 @@ +[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/objects/enemy/boss/2600.gd b/objects/enemy/boss/2600.gd index d336c4f..58c2483 100644 --- a/objects/enemy/boss/2600.gd +++ b/objects/enemy/boss/2600.gd @@ -71,6 +71,7 @@ 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 b5f6c23..eaf3db8 100644 --- a/objects/enemy/boss/2600.tscn +++ b/objects/enemy/boss/2600.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=35 format=2] +[gd_scene load_steps=37 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,6 +18,7 @@ [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 ) @@ -40,6 +41,9 @@ 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 @@ -956,6 +960,32 @@ 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 ) From ba836830d26ca9f90a1f8173bb22f083c68a8b8a Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Mon, 9 Dec 2024 00:10:47 -0500 Subject: [PATCH 28/50] cave transportation realignment --- maps/cave_scholar.tscn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maps/cave_scholar.tscn b/maps/cave_scholar.tscn index ffc060f..d7153c3 100644 --- a/maps/cave_scholar.tscn +++ b/maps/cave_scholar.tscn @@ -1150,5 +1150,5 @@ __meta__ = { } [node name="Exit" parent="." instance=ExtResource( 24 )] -position = Vector2( 656, 96 ) +position = Vector2( 656, 100 ) cost = 25 From 93656bdcfad5a466b2cb1214442ad3bc5bce3ed9 Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Mon, 9 Dec 2024 01:14:32 -0500 Subject: [PATCH 29/50] polish high score/score submit stuff --- menus/results.gd | 44 ++++++----- menus/results.tscn | 178 ++++++++++++++++++++++++--------------------- 2 files changed, 123 insertions(+), 99 deletions(-) diff --git a/menus/results.gd b/menus/results.gd index 8d03a0c..c52e4ec 100644 --- a/menus/results.gd +++ b/menus/results.gd @@ -65,24 +65,32 @@ func show_final_score(): func _on_AnimationPlayer_animation_finished(anim_name): - if anim_name != "results": - return - - 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 - if Game.final_score > Game.old_high_score and not Debug.is_cheating and not ScoreBoard.server_host.empty(): - animation_player.play("submit_score_popup") - else: - Fade.fade_out(Options.transition_speed_secs) - yield(Fade, "fade_finished") - SceneManager.change_scene(LevelSelect.instance()) + 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: diff --git a/menus/results.tscn b/menus/results.tscn index d5d1733..6187708 100644 --- a/menus/results.tscn +++ b/menus/results.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=35 format=2] +[gd_scene load_steps=36 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] @@ -279,9 +279,72 @@ tracks/16/keys = { "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 = 24.0 +length = 18.0 step = 1.0 tracks/0/type = "method" tracks/0/path = NodePath("ShardsAndBonuses/Shards/ResultsIcon") @@ -550,7 +613,7 @@ tracks/0/keys = { "values": [ Vector2( -512, 0 ) ] } tracks/1/type = "value" -tracks/1/path = NodePath("ShardsAndBonuses/FinalScore:visible") +tracks/1/path = NodePath("CenterContainer/SubmitScore:visible") tracks/1/interp = 1 tracks/1/loop_wrap = true tracks/1/imported = false @@ -562,7 +625,7 @@ tracks/1/keys = { "values": [ true ] } tracks/2/type = "value" -tracks/2/path = NodePath("ShardsAndBonuses/HighScore:visible") +tracks/2/path = NodePath("CenterContainer/SubmitScore:rect_scale") tracks/2/interp = 1 tracks/2/loop_wrap = true tracks/2/imported = false @@ -570,102 +633,54 @@ tracks/2/enabled = true tracks/2/keys = { "times": PoolRealArray( 0, 0.3 ), "transitions": PoolRealArray( 1, 1 ), -"update": 1, -"values": [ false, true ] +"update": 0, +"values": [ Vector2( 1e-05, 1 ), Vector2( 1, 1 ) ] } -tracks/3/type = "value" -tracks/3/path = NodePath("ShardsAndBonuses/FinalScore:scale") +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, 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 ) ] -} -tracks/5/type = "value" -tracks/5/path = NodePath("CenterContainer/SubmitScore:visible") -tracks/5/interp = 1 -tracks/5/loop_wrap = true -tracks/5/imported = false -tracks/5/enabled = true -tracks/5/keys = { -"times": PoolRealArray( 0, 1 ), -"transitions": PoolRealArray( 1, 1 ), -"update": 1, -"values": [ false, true ] -} -tracks/6/type = "value" -tracks/6/path = NodePath("CenterContainer/SubmitScore:rect_scale") -tracks/6/interp = 1 -tracks/6/loop_wrap = true -tracks/6/imported = false -tracks/6/enabled = true -tracks/6/keys = { -"times": PoolRealArray( 0, 1, 1.3 ), -"transitions": PoolRealArray( 1, 1, 1 ), -"update": 0, -"values": [ Vector2( 1e-05, 1 ), Vector2( 1e-05, 1 ), Vector2( 1, 1 ) ] -} -tracks/7/type = "method" -tracks/7/path = NodePath("CenterContainer/SubmitScore/YesNoPrompt/HBoxContainer/YesSubmit") -tracks/7/interp = 1 -tracks/7/loop_wrap = true -tracks/7/imported = false -tracks/7/enabled = true -tracks/7/keys = { -"times": PoolRealArray( 1.5 ), +"times": PoolRealArray( 0.5 ), "transitions": PoolRealArray( 1 ), "values": [ { "args": [ ], "method": "grab_focus" } ] } -tracks/8/type = "value" -tracks/8/path = NodePath("CenterContainer/SubmitScore:modulate") -tracks/8/interp = 1 -tracks/8/loop_wrap = true -tracks/8/imported = false -tracks/8/enabled = true -tracks/8/keys = { -"times": PoolRealArray( 1, 1.056 ), +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/9/type = "value" -tracks/9/path = NodePath("CenterContainer/LoadingGraphic:visible") -tracks/9/interp = 1 -tracks/9/loop_wrap = true -tracks/9/imported = false -tracks/9/enabled = true -tracks/9/keys = { +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/10/type = "value" -tracks/10/path = NodePath("CenterContainer/SubmitScore/Label:text") -tracks/10/interp = 1 -tracks/10/loop_wrap = true -tracks/10/imported = false -tracks/10/enabled = true -tracks/10/keys = { +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, @@ -1114,9 +1129,9 @@ valign = 1 unique_name_in_owner = true visible = false margin_left = 82.0 -margin_top = 47.0 +margin_top = 39.0 margin_right = 173.0 -margin_bottom = 67.0 +margin_bottom = 75.0 rect_pivot_offset = Vector2( 45.5, 18 ) theme = ExtResource( 10 ) @@ -1205,6 +1220,7 @@ 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 ) From 8252ff66b85bb0501eb8dc51f4e34ac55f022f3e Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Mon, 9 Dec 2024 14:50:19 -0500 Subject: [PATCH 30/50] level select menu indicator --- autoloads/scene_manager.gd | 8 ++++++ menus/level_select_scholar.tscn | 39 ++++++++++++++++++++++++++- objects/hud/gamepad_buttons.atlastex | Bin 238 -> 238 bytes scripts/show_button.gd | 22 +++++++++++++++ 4 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 scripts/show_button.gd diff --git a/autoloads/scene_manager.gd b/autoloads/scene_manager.gd index ea1b353..f6c8a67 100644 --- a/autoloads/scene_manager.gd +++ b/autoloads/scene_manager.gd @@ -19,6 +19,14 @@ 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/menus/level_select_scholar.tscn b/menus/level_select_scholar.tscn index 8af7178..d7c178b 100644 --- a/menus/level_select_scholar.tscn +++ b/menus/level_select_scholar.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=53 format=2] +[gd_scene load_steps=56 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,6 +21,8 @@ [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 ) @@ -952,6 +954,11 @@ 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 @@ -1469,6 +1476,36 @@ 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/objects/hud/gamepad_buttons.atlastex b/objects/hud/gamepad_buttons.atlastex index 328c5d18266ca7d3097309658bda27d39fb99c49..d9d5e079b3d67329e5edbebd2e4308cf0305b3e7 100644 GIT binary patch delta 173 zcmV;e08;<%0qy~i9)FTbA|XJhRtEr0P~A<$v{v$@crCdcSGUz%lsHEX-a*gC`_L%? zi~zGV{srKP{{`hIB+R4jUR%(>2YV614|dN+IT{yImYn${UhRo0SxOOh4BoNH#j&}i zoqVGE+yekUqxu?P3L6IbG1HU2;NR`Cs{u_zue1(GIY>Uj8o(|C2u& bk*+TkYsqt%E9WQo7AMzA)&sx-Qd2`io 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)) From f73a7ca01ed8b311eceeeadc2962a1a0abd42096 Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Tue, 10 Dec 2024 00:27:51 -0500 Subject: [PATCH 31/50] fix speedrun timer credits crash --- autoloads/speedrun_timer.gd | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/autoloads/speedrun_timer.gd b/autoloads/speedrun_timer.gd index 7f269cc..5a3c4ff 100644 --- a/autoloads/speedrun_timer.gd +++ b/autoloads/speedrun_timer.gd @@ -20,9 +20,10 @@ func _process(delta: float) -> void: if visible: time_counter.text = Game.format_time(time) - 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 + 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 From 4c94f01513546b7c5bd084f29c363a6e417c1177 Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Tue, 10 Dec 2024 03:21:36 -0500 Subject: [PATCH 32/50] save options when scoreboard name gets set via file create --- menus/file_create.gd | 1 + 1 file changed, 1 insertion(+) diff --git a/menus/file_create.gd b/menus/file_create.gd index c8dd5e2..3f2fe6f 100644 --- a/menus/file_create.gd +++ b/menus/file_create.gd @@ -102,6 +102,7 @@ func _on_player_teleport_finished() -> void: 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 From 05af56709ef7877476aad92d5a103e5a0e02912e Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Tue, 10 Dec 2024 03:33:16 -0500 Subject: [PATCH 33/50] fix player name in special thanks overlapping other text --- menus/credits.tscn | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/menus/credits.tscn b/menus/credits.tscn index ba7f98a..c2875a5 100644 --- a/menus/credits.tscn +++ b/menus/credits.tscn @@ -889,9 +889,9 @@ valign = 1 [node name="Playername" type="Label" parent="Control"] material = ExtResource( 4 ) margin_left = 3072.0 -margin_top = 117.0 +margin_top = 123.0 margin_right = 3328.0 -margin_bottom = 127.0 +margin_bottom = 133.0 theme = ExtResource( 6 ) text = "Ty Tiramisu" align = 1 @@ -1352,7 +1352,6 @@ 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 From b8c3cdd0a73df2175ef33443a56cd9d3294ced45 Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Tue, 10 Dec 2024 13:16:17 -0500 Subject: [PATCH 34/50] add my woofer to special thanks --- menus/credits.tscn | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/menus/credits.tscn b/menus/credits.tscn index c2875a5..a3f4484 100644 --- a/menus/credits.tscn +++ b/menus/credits.tscn @@ -882,7 +882,9 @@ theme = ExtResource( 6 ) text = "-Special thanks- Wolfboy Cirquet -wily beast" +wily beast +RhidianRuckus +" align = 1 valign = 1 From 0a706e1120ed6fe5768916a8c2141ca2638eac5c Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Tue, 10 Dec 2024 16:12:04 -0500 Subject: [PATCH 35/50] make HTTP requests work in web build --- autoloads/scoreboard.gd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autoloads/scoreboard.gd b/autoloads/scoreboard.gd index 649c2a7..0b15f8c 100644 --- a/autoloads/scoreboard.gd +++ b/autoloads/scoreboard.gd @@ -43,7 +43,7 @@ func _ready() -> void: http = HTTPRequest.new() http.download_chunk_size = 4096 http.timeout = 30.0 - http.use_threads = true + http.use_threads = OS.get_name() != "HTML5" http.connect("request_completed", self, "_on_request_completed") add_child(http) From 5080ae5436f011eef3a85ee12c0b752b0c386884 Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Sat, 4 Jan 2025 20:09:19 -0500 Subject: [PATCH 36/50] "Oi, SG!" Beginnings --- graphics/hud/speccy/break_the_glass.png | Bin 0 -> 257 bytes .../hud/speccy/break_the_glass.png.import | 35 ++++ graphics/hud/speccy/go_get_em.png | Bin 0 -> 225 bytes graphics/hud/speccy/go_get_em.png.import | 35 ++++ graphics/hud/speccy/kill_em_all.png | Bin 0 -> 232 bytes graphics/hud/speccy/kill_em_all.png.import | 35 ++++ graphics/hud/speccy/oi_go_right.png | Bin 0 -> 241 bytes graphics/hud/speccy/oi_go_right.png.import | 35 ++++ graphics/hud/speccy/over_here.png | Bin 0 -> 228 bytes graphics/hud/speccy/over_here.png.import | 35 ++++ graphics/hud/speccy/shoot_that_thing.png | Bin 0 -> 252 bytes .../hud/speccy/shoot_that_thing.png.import | 35 ++++ graphics/hud/speccy/shoot_the_eye.png | Bin 0 -> 250 bytes graphics/hud/speccy/shoot_the_eye.png.import | 35 ++++ graphics/npc/speccy_talk.png | Bin 0 -> 340 bytes graphics/npc/speccy_talk.png.import | 35 ++++ maps/test_room.tscn | 8 +- objects/npc/speccy.tscn | 180 ++++++++++++++++++ 18 files changed, 465 insertions(+), 3 deletions(-) create mode 100644 graphics/hud/speccy/break_the_glass.png create mode 100644 graphics/hud/speccy/break_the_glass.png.import create mode 100644 graphics/hud/speccy/go_get_em.png create mode 100644 graphics/hud/speccy/go_get_em.png.import create mode 100644 graphics/hud/speccy/kill_em_all.png create mode 100644 graphics/hud/speccy/kill_em_all.png.import create mode 100644 graphics/hud/speccy/oi_go_right.png create mode 100644 graphics/hud/speccy/oi_go_right.png.import create mode 100644 graphics/hud/speccy/over_here.png create mode 100644 graphics/hud/speccy/over_here.png.import create mode 100644 graphics/hud/speccy/shoot_that_thing.png create mode 100644 graphics/hud/speccy/shoot_that_thing.png.import create mode 100644 graphics/hud/speccy/shoot_the_eye.png create mode 100644 graphics/hud/speccy/shoot_the_eye.png.import create mode 100644 graphics/npc/speccy_talk.png create mode 100644 graphics/npc/speccy_talk.png.import create mode 100644 objects/npc/speccy.tscn diff --git a/graphics/hud/speccy/break_the_glass.png b/graphics/hud/speccy/break_the_glass.png new file mode 100644 index 0000000000000000000000000000000000000000..91b6e49e2a3f0df8f403da7087f3e03e1b41dfbb GIT binary patch literal 257 zcmeAS@N?(olHy`uVBq!ia0vp^9ze{-!3-qB6E!k{6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H$ef*Z=?jXJljmd1uv*gN$M>3Gxg6|DWOdDPEvj2F?PH$YKTtzQZ8Q zcszea3Q(}f)5S4FBe>R&ldr*mL-^nSjOv9tYMUaXu3e2?k@b+t$He5a&b(Luc5US_ z@Lq7}!mT-uHVfRP9B;y_noQW uCHJP>=CFr;`0{qfS@)|AVoN!~uJS&g#b~hNH2)!>?F^o-elF{r5}E*8Emc?m literal 0 HcmV?d00001 diff --git a/graphics/hud/speccy/break_the_glass.png.import b/graphics/hud/speccy/break_the_glass.png.import new file mode 100644 index 0000000..e130b48 --- /dev/null +++ b/graphics/hud/speccy/break_the_glass.png.import @@ -0,0 +1,35 @@ +[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 new file mode 100644 index 0000000000000000000000000000000000000000..a258c9b830e739e70bcc7257ff9e13906a5af1dd GIT binary patch literal 225 zcmeAS@N?(olHy`uVBq!ia0vp^xNn{1`IRkt`T>t<7pOKLPPZ!4!jbLBDPC*6*j;?R=R&pyZC>va!#&EgLXxpus5egpr`f?P1m1#}N z`f8x&$(M5e-(lrjxt=EkjjN}B|3Aa^Q@lX644efXk;M!Qe1}1p z@p%4<6rfi_@% literal 0 HcmV?d00001 diff --git a/graphics/hud/speccy/kill_em_all.png.import b/graphics/hud/speccy/kill_em_all.png.import new file mode 100644 index 0000000..ecf5766 --- /dev/null +++ b/graphics/hud/speccy/kill_em_all.png.import @@ -0,0 +1,35 @@ +[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 new file mode 100644 index 0000000000000000000000000000000000000000..dcde1da1a7ca2806c061220c7c06fce0312bc93b GIT binary patch literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^CP2*2!3-n|Jm%d3QjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`IRkt`T>t<7pOKLP5g%}h$n3n#x|CRFf%o@jprbCM_cs57|*+^}8ES#iVJV921 zcQ@mV#HqY{Kd^0BZ5VFlT6M5b(K3JTY!T7bOK<*XHe9~@;O@NhpHyEmC+aaATKnuB Q3(x`vPgg&ebxsLQ0KuNn{1`IRkt`T>t<7pOKLPeei)=7^<9vH6f zxVbL;{-q2B@s{b2p1wJ1nNxIcr|nQR_t?u*SJ=Noxlr3Icllq> q+mj8fLJu&TUH@IDk|ed@6*I$0#t6k(k_|wM89ZJ6T-G@yGywpr)m8Zb literal 0 HcmV?d00001 diff --git a/graphics/hud/speccy/shoot_that_thing.png.import b/graphics/hud/speccy/shoot_that_thing.png.import new file mode 100644 index 0000000..5347456 --- /dev/null +++ b/graphics/hud/speccy/shoot_that_thing.png.import @@ -0,0 +1,35 @@ +[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 new file mode 100644 index 0000000000000000000000000000000000000000..712c2ced2d2c3ecc6836dfcdc42264a485000cb8 GIT binary patch literal 250 zcmeAS@N?(olHy`uVBq!ia0vp^c0kO=!3-qVnBCn5q!^2X+?^QKos)S9a|ZZ?xc>kDKO-Xp$UCcc9Ap%8NswRg|NjivPw@iPGH@1nL>4nJ@ErzW z#^d=bQh7Ug$t5VhtY@GIYHGgLJ%%8OM ztl)>;ofoGzJzCjzaVM%xNb!1@J z*w6hZkrl|-4e$wZ1=6;bY5$+3DJWT`{V)8#bN2lC^RH_8{Le{y{P?k3$5vI-g#Uf_ zJ+*v*Dt+81e*sebB|(0{|4{(Ll{+&Q0;M<$JR*x382Ao>Fr%o3R|8ORs;7%%h(_?% z^U*@h1{|yb8kgL9Z~iZ;Zd`EeRr-62%7SAp0o5n!8ew)O}WF0^?&cCXPghnzPru3 Date: Sat, 4 Jan 2025 20:09:36 -0500 Subject: [PATCH 37/50] new glass break? --- audio/sounds/new_glass_break.ogg | Bin 0 -> 19784 bytes audio/sounds/new_glass_break.ogg.import | 15 +++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 audio/sounds/new_glass_break.ogg create mode 100644 audio/sounds/new_glass_break.ogg.import diff --git a/audio/sounds/new_glass_break.ogg b/audio/sounds/new_glass_break.ogg new file mode 100644 index 0000000000000000000000000000000000000000..67d43e5fa50af094126abc8eb46be1736d6be288 GIT binary patch literal 19784 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 Date: Sun, 5 Jan 2025 04:33:34 -0500 Subject: [PATCH 38/50] configurable speccy --- maps/test_room.tscn | 5 +-- objects/npc/speccy.gd | 61 +++++++++++++++++++++++++++++++++++ objects/npc/speccy.tscn | 70 +++++++++++++++++++++++++++++++---------- 3 files changed, 118 insertions(+), 18 deletions(-) create mode 100644 objects/npc/speccy.gd diff --git a/maps/test_room.tscn b/maps/test_room.tscn index 65b245c..c01e40d 100644 --- a/maps/test_room.tscn +++ b/maps/test_room.tscn @@ -137,7 +137,7 @@ position = Vector2( 27, 128 ) [node name="Button" parent="." instance=ExtResource( 19 )] position = Vector2( 16, 168 ) -target_group = "a" +target_group = "speccy" [node name="Cop" parent="." instance=ExtResource( 25 )] position = Vector2( 184, 112 ) @@ -203,7 +203,8 @@ position = Vector2( 144, 24 ) [node name="FallingBlock" parent="." instance=ExtResource( 24 )] position = Vector2( 124, 96 ) -[node name="speccy" parent="." instance=ExtResource( 2 )] +[node name="speccy" parent="." groups=["speccy"] instance=ExtResource( 2 )] position = Vector2( 82, 72 ) +message = "go_get_em" [editable path="RollingFiend"] diff --git a/objects/npc/speccy.gd b/objects/npc/speccy.gd new file mode 100644 index 0000000..7bb3cef --- /dev/null +++ b/objects/npc/speccy.gd @@ -0,0 +1,61 @@ +tool +extends Node2D + + +export(String, DIR) var messages_dir: String setget _set_messages_dir +#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: + $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 _get_property_list() -> Array: + var files: String = "" + var dir: Directory = Directory.new() + print(messages_dir) + 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"): + print("found file: ", file_name) + 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) + print(files) + 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 index 7575119..882c443 100644 --- a/objects/npc/speccy.tscn +++ b/objects/npc/speccy.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=11 format=2] +[gd_scene load_steps=12 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] @@ -6,16 +6,13 @@ [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] [sub_resource type="ShaderMaterial" id=3] shader = ExtResource( 2 ) shader_param/cycle_speed = 4.0 shader_param/gradient = ExtResource( 3 ) -[sub_resource type="AtlasTexture" id=4] -atlas = ExtResource( 6 ) -region = Rect2( 72, 0, 24, 24 ) - [sub_resource type="Animation" id=1] length = 0.001 tracks/0/type = "value" @@ -43,7 +40,7 @@ tracks/1/keys = { "values": [ Color( 1, 1, 1, 1 ) ] } tracks/2/type = "value" -tracks/2/path = NodePath("Sprite2:scale") +tracks/2/path = NodePath("Message:scale") tracks/2/interp = 1 tracks/2/loop_wrap = true tracks/2/imported = false @@ -52,7 +49,7 @@ tracks/2/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Vector2( 0.155205, 1 ) ] +"values": [ Vector2( 1, 1 ) ] } tracks/3/type = "value" tracks/3/path = NodePath("Sprite:hframes") @@ -66,6 +63,34 @@ tracks/3/keys = { "update": 1, "values": [ 1 ] } +tracks/4/type = "value" +tracks/4/path = NodePath("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 ) ] +} + +[sub_resource type="AtlasTexture" id=4] +atlas = ExtResource( 6 ) +region = Rect2( 72, 0, 24, 24 ) [sub_resource type="Animation" id=2] resource_name = "fun" @@ -96,7 +121,7 @@ tracks/1/keys = { "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("Sprite2:scale") +tracks/2/path = NodePath("Message:scale") tracks/2/interp = 1 tracks/2/loop_wrap = true tracks/2/imported = false @@ -155,26 +180,39 @@ tracks/6/keys = { "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 ) ] +} [node name="speccy" type="Node2D"] +script = ExtResource( 7 ) +messages_dir = "res://graphics/hud/speccy" +message = "over_here" [node name="Sprite" type="Sprite" parent="."] -position = Vector2( 0, -12 ) -texture = ExtResource( 6 ) -offset = Vector2( -2, 0 ) -region_rect = Rect2( 1.015, 0, 0, 0 ) +position = Vector2( -1, -12 ) +texture = ExtResource( 1 ) +offset = Vector2( -1, 0 ) [node name="Overlay" type="Sprite" parent="Sprite"] material = SubResource( 3 ) -texture = SubResource( 4 ) +texture = ExtResource( 1 ) +offset = Vector2( 1, 0 ) region_rect = Rect2( 1.015, 0, 0, 0 ) [node name="AnimationPlayer" type="AnimationPlayer" parent="."] -autoplay = "fun" anims/RESET = SubResource( 1 ) anims/fun = SubResource( 2 ) -[node name="Sprite2" type="Sprite" parent="."] +[node name="Message" type="Sprite" parent="."] position = Vector2( 0, -24 ) -scale = Vector2( 0.155205, 1 ) texture = ExtResource( 4 ) From 7b4d51979174c9019ea7aedec4ca0a3bc5213e8b Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Sun, 5 Jan 2025 14:53:19 -0500 Subject: [PATCH 39/50] oi, go right! --- maps/hills_scholar.tscn | 81 +++++++++++++++++++++---------------- maps/hills_speccy_detect.gd | 15 +++++++ maps/test_room.tscn | 2 +- objects/npc/speccy.gd | 9 +++-- objects/npc/speccy.tscn | 37 ++++++++--------- 5 files changed, 87 insertions(+), 57 deletions(-) create mode 100644 maps/hills_speccy_detect.gd diff --git a/maps/hills_scholar.tscn b/maps/hills_scholar.tscn index e5b6bb2..51a6a63 100644 --- a/maps/hills_scholar.tscn +++ b/maps/hills_scholar.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=33 format=2] +[gd_scene load_steps=35 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] @@ -32,6 +32,8 @@ [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 @@ -161,80 +163,80 @@ texture = ExtResource( 32 ) [node name="Collectibles" type="Node2D" parent="."] -[node name="Star" parent="Collectibles" instance=ExtResource( 4 )] +[node name="Star" parent="Collectibles" groups=["speccy_appear"] 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" instance=ExtResource( 5 )] +[node name="Key" parent="Collectibles" groups=["speccy_appear"] instance=ExtResource( 5 )] position = Vector2( 40, 168 ) -[node name="Key2" parent="Collectibles" instance=ExtResource( 5 )] +[node name="Key2" parent="Collectibles" groups=["speccy_appear"] instance=ExtResource( 5 )] position = Vector2( 64, 168 ) -[node name="Key3" parent="Collectibles" instance=ExtResource( 5 )] +[node name="Key3" parent="Collectibles" groups=["speccy_appear"] instance=ExtResource( 5 )] position = Vector2( 88, 152 ) -[node name="Key5" parent="Collectibles" instance=ExtResource( 5 )] +[node name="Key5" parent="Collectibles" groups=["speccy_appear"] instance=ExtResource( 5 )] position = Vector2( 232, 112 ) -[node name="Key6" parent="Collectibles" instance=ExtResource( 5 )] +[node name="Key6" parent="Collectibles" groups=["speccy_appear"] instance=ExtResource( 5 )] position = Vector2( 48, 80 ) -[node name="Key7" parent="Collectibles" instance=ExtResource( 5 )] +[node name="Key7" parent="Collectibles" groups=["speccy_appear"] instance=ExtResource( 5 )] position = Vector2( 72, 80 ) -[node name="Key8" parent="Collectibles" instance=ExtResource( 5 )] +[node name="Key8" parent="Collectibles" groups=["speccy_appear"] instance=ExtResource( 5 )] position = Vector2( 96, 80 ) -[node name="Key9" parent="Collectibles" instance=ExtResource( 5 )] +[node name="Key9" parent="Collectibles" groups=["speccy_appear"] instance=ExtResource( 5 )] position = Vector2( 152, 48 ) -[node name="Key10" parent="Collectibles" instance=ExtResource( 5 )] +[node name="Key10" parent="Collectibles" groups=["speccy_appear"] instance=ExtResource( 5 )] position = Vector2( 120, 32 ) -[node name="Key11" parent="Collectibles" instance=ExtResource( 5 )] +[node name="Key11" parent="Collectibles" groups=["speccy_appear"] instance=ExtResource( 5 )] position = Vector2( 184, 72 ) -[node name="Key14" parent="Collectibles" instance=ExtResource( 5 )] +[node name="Key14" parent="Collectibles" groups=["speccy_appear"] instance=ExtResource( 5 )] position = Vector2( 120, 72 ) -[node name="Key13" parent="Collectibles" instance=ExtResource( 5 )] +[node name="Key13" parent="Collectibles" groups=["speccy_appear"] instance=ExtResource( 5 )] position = Vector2( 192, 48 ) -[node name="Key4" parent="Collectibles" instance=ExtResource( 5 )] +[node name="Key4" parent="Collectibles" groups=["speccy_appear"] instance=ExtResource( 5 )] position = Vector2( 112, 152 ) -[node name="Key12" parent="Collectibles" instance=ExtResource( 5 )] +[node name="Key12" parent="Collectibles" groups=["speccy_appear"] instance=ExtResource( 5 )] position = Vector2( 160, 168 ) -[node name="Key15" parent="Collectibles" instance=ExtResource( 5 )] +[node name="Key15" parent="Collectibles" groups=["speccy_skip"] instance=ExtResource( 5 )] position = Vector2( 288, 120 ) -[node name="Key16" parent="Collectibles" instance=ExtResource( 5 )] +[node name="Key16" parent="Collectibles" groups=["speccy_appear"] instance=ExtResource( 5 )] position = Vector2( 248, 120 ) -[node name="Key20" parent="Collectibles" instance=ExtResource( 5 )] +[node name="Key20" parent="Collectibles" groups=["speccy_skip"] instance=ExtResource( 5 )] position = Vector2( 360, 104 ) -[node name="Key22" parent="Collectibles" instance=ExtResource( 5 )] +[node name="Key22" parent="Collectibles" groups=["speccy_skip"] instance=ExtResource( 5 )] position = Vector2( 264, 72 ) -[node name="Key24" parent="Collectibles" instance=ExtResource( 5 )] +[node name="Key24" parent="Collectibles" groups=["speccy_skip"] instance=ExtResource( 5 )] position = Vector2( 296, 72 ) -[node name="Key25" parent="Collectibles" instance=ExtResource( 5 )] +[node name="Key25" parent="Collectibles" groups=["speccy_skip"] instance=ExtResource( 5 )] position = Vector2( 288, 48 ) [node name="Key26" parent="Collectibles" instance=ExtResource( 5 )] position = Vector2( 488, 56 ) -[node name="Key27" parent="Collectibles" instance=ExtResource( 5 )] +[node name="Key27" parent="Collectibles" groups=["speccy_skip"] instance=ExtResource( 5 )] position = Vector2( 448, 64 ) -[node name="Key33" parent="Collectibles" instance=ExtResource( 5 )] +[node name="Key33" parent="Collectibles" groups=["speccy_skip"] instance=ExtResource( 5 )] position = Vector2( 432, 152 ) [node name="Key34" parent="Collectibles" instance=ExtResource( 5 )] @@ -288,13 +290,13 @@ position = Vector2( 648, 168 ) [node name="Key50" parent="Collectibles" instance=ExtResource( 5 )] position = Vector2( 528, 56 ) -[node name="Key28" parent="Collectibles" instance=ExtResource( 5 )] +[node name="Key28" parent="Collectibles" groups=["speccy_skip"] instance=ExtResource( 5 )] position = Vector2( 408, 64 ) [node name="Key23" parent="Collectibles" instance=ExtResource( 5 )] position = Vector2( 616, 168 ) -[node name="Key21" parent="Collectibles" instance=ExtResource( 5 )] +[node name="Key21" parent="Collectibles" groups=["speccy_skip"] instance=ExtResource( 5 )] position = Vector2( 320, 120 ) [node name="Key29" parent="Collectibles" instance=ExtResource( 5 )] @@ -303,29 +305,29 @@ position = Vector2( 200, 168 ) [node name="Key30" parent="Collectibles" instance=ExtResource( 5 )] position = Vector2( 232, 168 ) -[node name="Key31" parent="Collectibles" instance=ExtResource( 5 )] +[node name="Key31" parent="Collectibles" groups=["speccy_skip"] instance=ExtResource( 5 )] position = Vector2( 272, 168 ) -[node name="Key32" parent="Collectibles" instance=ExtResource( 5 )] +[node name="Key32" parent="Collectibles" groups=["speccy_skip"] instance=ExtResource( 5 )] position = Vector2( 304, 168 ) -[node name="Key18" parent="Collectibles" instance=ExtResource( 5 )] +[node name="Key18" parent="Collectibles" groups=["speccy_appear"] instance=ExtResource( 5 )] position = Vector2( 152, 112 ) -[node name="Key19" parent="Collectibles" instance=ExtResource( 5 )] +[node name="Key19" parent="Collectibles" groups=["speccy_appear"] instance=ExtResource( 5 )] position = Vector2( 216, 80 ) -[node name="Key17" parent="Collectibles" instance=ExtResource( 5 )] +[node name="Key17" parent="Collectibles" groups=["speccy_appear"] instance=ExtResource( 5 )] position = Vector2( 200, 112 ) -[node name="Shard" parent="Collectibles" instance=ExtResource( 17 )] +[node name="Shard" parent="Collectibles" groups=["speccy_appear"] 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" instance=ExtResource( 17 )] +[node name="Shard2" parent="Collectibles" groups=["speccy_skip"] instance=ExtResource( 17 )] position = Vector2( 456, 24 ) number = 1 @@ -333,7 +335,7 @@ number = 1 position = Vector2( 688, 80 ) number = 3 -[node name="Star3" parent="Collectibles" instance=ExtResource( 4 )] +[node name="Star3" parent="Collectibles" groups=["speccy_skip"] instance=ExtResource( 4 )] position = Vector2( 416, 104 ) color = 3 @@ -347,7 +349,7 @@ position = Vector2( 664, 80 ) position = Vector2( 760, 112 ) color = 4 -[node name="Star5" parent="Collectibles" instance=ExtResource( 4 )] +[node name="Star5" parent="Collectibles" groups=["speccy_appear"] instance=ExtResource( 4 )] position = Vector2( 224, 48 ) color = 2 @@ -450,3 +452,12 @@ 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 new file mode 100644 index 0000000..5d89a23 --- /dev/null +++ b/maps/hills_speccy_detect.gd @@ -0,0 +1,15 @@ +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/test_room.tscn b/maps/test_room.tscn index c01e40d..cb1375e 100644 --- a/maps/test_room.tscn +++ b/maps/test_room.tscn @@ -205,6 +205,6 @@ position = Vector2( 124, 96 ) [node name="speccy" parent="." groups=["speccy"] instance=ExtResource( 2 )] position = Vector2( 82, 72 ) -message = "go_get_em" +message = "" [editable path="RollingFiend"] diff --git a/objects/npc/speccy.gd b/objects/npc/speccy.gd index 7bb3cef..6326d92 100644 --- a/objects/npc/speccy.gd +++ b/objects/npc/speccy.gd @@ -3,6 +3,7 @@ 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 @@ -35,22 +36,24 @@ func _set_message(value: String) -> void: $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() - print(messages_dir) 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"): - print("found file: ", file_name) 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) - print(files) return [ { name = "message", diff --git a/objects/npc/speccy.tscn b/objects/npc/speccy.tscn index 882c443..2ac81b1 100644 --- a/objects/npc/speccy.tscn +++ b/objects/npc/speccy.tscn @@ -1,9 +1,8 @@ -[gd_scene load_steps=12 format=2] +[gd_scene load_steps=11 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] @@ -16,7 +15,7 @@ shader_param/gradient = ExtResource( 3 ) [sub_resource type="Animation" id=1] length = 0.001 tracks/0/type = "value" -tracks/0/path = NodePath("Sprite:scale") +tracks/0/path = NodePath("Flipper/Sprite:scale") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/imported = false @@ -28,7 +27,7 @@ tracks/0/keys = { "values": [ Vector2( 1, 1 ) ] } tracks/1/type = "value" -tracks/1/path = NodePath("Sprite/Overlay:modulate") +tracks/1/path = NodePath("Flipper/Sprite/Overlay:modulate") tracks/1/interp = 1 tracks/1/loop_wrap = true tracks/1/imported = false @@ -37,7 +36,7 @@ tracks/1/keys = { "times": PoolRealArray( 0 ), "transitions": PoolRealArray( 1 ), "update": 0, -"values": [ Color( 1, 1, 1, 1 ) ] +"values": [ Color( 1, 1, 1, 0 ) ] } tracks/2/type = "value" tracks/2/path = NodePath("Message:scale") @@ -52,7 +51,7 @@ tracks/2/keys = { "values": [ Vector2( 1, 1 ) ] } tracks/3/type = "value" -tracks/3/path = NodePath("Sprite:hframes") +tracks/3/path = NodePath("Flipper/Sprite:hframes") tracks/3/interp = 1 tracks/3/loop_wrap = true tracks/3/imported = false @@ -64,7 +63,7 @@ tracks/3/keys = { "values": [ 1 ] } tracks/4/type = "value" -tracks/4/path = NodePath("Sprite:texture") +tracks/4/path = NodePath("Flipper/Sprite:texture") tracks/4/interp = 1 tracks/4/loop_wrap = true tracks/4/imported = false @@ -97,7 +96,7 @@ resource_name = "fun" length = 3.0 step = 0.05 tracks/0/type = "value" -tracks/0/path = NodePath("Sprite:scale") +tracks/0/path = NodePath("Flipper/Sprite:scale") tracks/0/interp = 2 tracks/0/loop_wrap = true tracks/0/imported = false @@ -109,7 +108,7 @@ tracks/0/keys = { "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("Sprite/Overlay:modulate") +tracks/1/path = NodePath("Flipper/Sprite/Overlay:modulate") tracks/1/interp = 2 tracks/1/loop_wrap = true tracks/1/imported = false @@ -133,7 +132,7 @@ tracks/2/keys = { "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("Sprite:texture") +tracks/3/path = NodePath("Flipper/Sprite:texture") tracks/3/interp = 2 tracks/3/loop_wrap = true tracks/3/imported = false @@ -145,7 +144,7 @@ tracks/3/keys = { "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("Sprite:hframes") +tracks/4/path = NodePath("Flipper/Sprite:hframes") tracks/4/interp = 1 tracks/4/loop_wrap = true tracks/4/imported = false @@ -157,7 +156,7 @@ tracks/4/keys = { "values": [ 1, 4 ] } tracks/5/type = "value" -tracks/5/path = NodePath("Sprite:frame") +tracks/5/path = NodePath("Flipper/Sprite:frame") tracks/5/interp = 1 tracks/5/loop_wrap = true tracks/5/imported = false @@ -169,7 +168,7 @@ tracks/5/keys = { "values": [ 0, 0, 1, 2, 3 ] } tracks/6/type = "value" -tracks/6/path = NodePath("Sprite/Overlay:texture") +tracks/6/path = NodePath("Flipper/Sprite/Overlay:texture") tracks/6/interp = 1 tracks/6/loop_wrap = true tracks/6/imported = false @@ -193,17 +192,20 @@ tracks/7/keys = { "values": [ Vector2( 1, 1 ) ] } -[node name="speccy" type="Node2D"] +[node name="Speccy" type="Node2D"] script = ExtResource( 7 ) messages_dir = "res://graphics/hud/speccy" -message = "over_here" +message = "" -[node name="Sprite" type="Sprite" parent="."] +[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="Sprite"] +[node name="Overlay" type="Sprite" parent="Flipper/Sprite"] +modulate = Color( 1, 1, 1, 0 ) material = SubResource( 3 ) texture = ExtResource( 1 ) offset = Vector2( 1, 0 ) @@ -215,4 +217,3 @@ anims/fun = SubResource( 2 ) [node name="Message" type="Sprite" parent="."] position = Vector2( 0, -24 ) -texture = ExtResource( 4 ) From dce789752f5bbd4dc35ffaf921d50953a09125f5 Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Mon, 6 Jan 2025 04:40:03 -0500 Subject: [PATCH 40/50] speccy noise --- audio/sounds/oi_sg.ogg | Bin 0 -> 19486 bytes audio/sounds/oi_sg.ogg.import | 15 ++++++++ maps/test_room.tscn | 1 - objects/npc/speccy.tscn | 70 +++++++++++++++++++++++++++------- 4 files changed, 72 insertions(+), 14 deletions(-) create mode 100644 audio/sounds/oi_sg.ogg create mode 100644 audio/sounds/oi_sg.ogg.import diff --git a/audio/sounds/oi_sg.ogg b/audio/sounds/oi_sg.ogg new file mode 100644 index 0000000000000000000000000000000000000000..76265fb57030be461c4d5c57c6c5da3b216b0b09 GIT binary patch literal 19486 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 H9)Jf18Tp}M literal 0 HcmV?d00001 diff --git a/audio/sounds/oi_sg.ogg.import b/audio/sounds/oi_sg.ogg.import new file mode 100644 index 0000000..0d0afe5 --- /dev/null +++ b/audio/sounds/oi_sg.ogg.import @@ -0,0 +1,15 @@ +[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/maps/test_room.tscn b/maps/test_room.tscn index cb1375e..48d9571 100644 --- a/maps/test_room.tscn +++ b/maps/test_room.tscn @@ -205,6 +205,5 @@ position = Vector2( 124, 96 ) [node name="speccy" parent="." groups=["speccy"] instance=ExtResource( 2 )] position = Vector2( 82, 72 ) -message = "" [editable path="RollingFiend"] diff --git a/objects/npc/speccy.tscn b/objects/npc/speccy.tscn index 2ac81b1..3b2f0b6 100644 --- a/objects/npc/speccy.tscn +++ b/objects/npc/speccy.tscn @@ -1,11 +1,13 @@ -[gd_scene load_steps=11 format=2] +[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 ) @@ -86,6 +88,30 @@ tracks/5/keys = { "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 ) @@ -93,7 +119,7 @@ region = Rect2( 72, 0, 24, 24 ) [sub_resource type="Animation" id=2] resource_name = "fun" -length = 3.0 +length = 4.0 step = 0.05 tracks/0/type = "value" tracks/0/path = NodePath("Flipper/Sprite:scale") @@ -102,7 +128,7 @@ 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, 2.4, 2.5, 2.6, 2.65, 2.7, 2.75, 2.8, 2.85, 2.9, 2.95, 3 ), +"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 ) ] @@ -114,7 +140,7 @@ tracks/1/loop_wrap = true tracks/1/imported = false tracks/1/enabled = true tracks/1/keys = { -"times": PoolRealArray( 0, 0.5, 0.6, 2.4, 2.5, 3 ), +"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 ) ] @@ -126,7 +152,7 @@ tracks/2/loop_wrap = true tracks/2/imported = false tracks/2/enabled = true tracks/2/keys = { -"times": PoolRealArray( 0, 0.8, 0.9, 1, 1.65, 1.75, 1.85 ), +"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 ) ] @@ -138,7 +164,7 @@ tracks/3/loop_wrap = true tracks/3/imported = false tracks/3/enabled = true tracks/3/keys = { -"times": PoolRealArray( 0, 0.75, 0.85, 0.95, 1.05, 1.15, 1.25, 1.4, 2 ), +"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 ) ] @@ -150,7 +176,7 @@ tracks/4/loop_wrap = true tracks/4/imported = false tracks/4/enabled = true tracks/4/keys = { -"times": PoolRealArray( 0, 2 ), +"times": PoolRealArray( 0, 2.9 ), "transitions": PoolRealArray( 1, 1 ), "update": 1, "values": [ 1, 4 ] @@ -162,7 +188,7 @@ tracks/5/loop_wrap = true tracks/5/imported = false tracks/5/enabled = true tracks/5/keys = { -"times": PoolRealArray( 0, 2, 2.05, 2.1, 2.15 ), +"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 ] @@ -174,7 +200,7 @@ tracks/6/loop_wrap = true tracks/6/imported = false tracks/6/enabled = true tracks/6/keys = { -"times": PoolRealArray( 0, 2.4 ), +"times": PoolRealArray( 0, 3.3 ), "transitions": PoolRealArray( 1, 1 ), "update": 1, "values": [ ExtResource( 1 ), SubResource( 4 ) ] @@ -191,11 +217,23 @@ tracks/7/keys = { "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 = "" +message = "over_here" [node name="Flipper" type="Node2D" parent="."] @@ -211,9 +249,15 @@ 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 ) - -[node name="Message" type="Sprite" parent="."] -position = Vector2( 0, -24 ) From bc234930b0d5baeeac78b5c83bfcb2b7e4e7f2ad Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Mon, 6 Jan 2025 05:04:29 -0500 Subject: [PATCH 41/50] option for speccy help --- autoloads/options.gd | 4 +++ objects/hud/options_screen_scholar.gd | 5 ++++ objects/hud/options_screen_scholar.tscn | 38 +++++++++++++++++++++---- objects/npc/speccy.gd | 3 +- 4 files changed, 43 insertions(+), 7 deletions(-) diff --git a/autoloads/options.gd b/autoloads/options.gd index 0ffaef2..fbb7655 100644 --- a/autoloads/options.gd +++ b/autoloads/options.gd @@ -19,6 +19,7 @@ const TRANS_SPEEDS := [0.8, 0.4, 0.2, 0.0000001] 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 @@ -66,6 +67,7 @@ func load_options() -> void: 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()) @@ -90,6 +92,7 @@ func load_defaults(section: int = Section.ALL) -> void: 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: @@ -111,6 +114,7 @@ func save_options() -> void: 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 diff --git a/objects/hud/options_screen_scholar.gd b/objects/hud/options_screen_scholar.gd index 62bd918..8206e92 100644 --- a/objects/hud/options_screen_scholar.gd +++ b/objects/hud/options_screen_scholar.gd @@ -14,6 +14,7 @@ onready var select_tab: HBoxContainer = $"%SelectTab" 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" @@ -49,6 +50,7 @@ func _init_values() -> void: 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 @@ -86,6 +88,9 @@ func _on_Gore_selected(selection) -> void: 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 60996d9..1939090 100644 --- a/objects/hud/options_screen_scholar.tscn +++ b/objects/hud/options_screen_scholar.tscn @@ -180,21 +180,46 @@ text = "Speedrun Timer:" [node name="SelectSpeedrunTimer" type="HBoxContainer" parent="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Tabs/Game/SpeedrunTimer"] unique_name_in_owner = true -margin_left = 109.0 -margin_right = 218.0 +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 = 3 +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 = 48.0 +margin_top = 64.0 margin_right = 218.0 -margin_bottom = 58.0 +margin_bottom = 74.0 [node name="Label" type="Label" parent="CenterContainer/PanelContainer/MarginContainer/VBoxContainer/Tabs/Game/ScoreBoardName"] margin_right = 112.0 @@ -206,7 +231,7 @@ margin_left = 130.0 margin_right = 203.0 margin_bottom = 10.0 rect_min_size = Vector2( 73, 0 ) -focus_neighbour_top = NodePath("../../SpeedrunTimer/SelectSpeedrunTimer") +focus_neighbour_top = NodePath("../../SpeccyHelp/SelectSpeccyHelp") size_flags_horizontal = 6 custom_constants/line_spacing = 0 custom_styles/focus = SubResource( 5 ) @@ -889,6 +914,7 @@ align = 1 [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"] diff --git a/objects/npc/speccy.gd b/objects/npc/speccy.gd index 6326d92..982782f 100644 --- a/objects/npc/speccy.gd +++ b/objects/npc/speccy.gd @@ -17,7 +17,8 @@ func _ready() -> void: func appear() -> void: - $AnimationPlayer.play("fun") + if Options.speccy_help: + $AnimationPlayer.play("fun") func switch_action() -> void: From 79bb0b1323cd3985751e6c86f2142a913174d87e Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Mon, 6 Jan 2025 05:17:18 -0500 Subject: [PATCH 42/50] shoot the eye! --- maps/boss/boss1_arena.gd | 8 ++++++++ maps/boss/boss1_arena.tscn | 14 +++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/maps/boss/boss1_arena.gd b/maps/boss/boss1_arena.gd index deafc54..091ca90 100644 --- a/maps/boss/boss1_arena.gd +++ b/maps/boss/boss1_arena.gd @@ -2,6 +2,8 @@ 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 @@ -13,6 +15,7 @@ func _on_Boss1_entered_phase(phase): match phase: 2: $DelayedArrow2.start() + speccy_can_yap = false 3: $DelayedArrow3.start() 4: @@ -41,3 +44,8 @@ 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 3527825..d346699 100644 --- a/maps/boss/boss1_arena.tscn +++ b/maps/boss/boss1_arena.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=18 format=2] +[gd_scene load_steps=19 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,6 +17,7 @@ [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 @@ -105,6 +106,17 @@ 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"] From ddd3728704322f738d6086532409b95a96a1a1f4 Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Mon, 6 Jan 2025 05:22:40 -0500 Subject: [PATCH 43/50] break the glass!! --- maps/boss/boss2_arena.gd | 8 ++++++++ maps/boss/boss2_arena.tscn | 15 ++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/maps/boss/boss2_arena.gd b/maps/boss/boss2_arena.gd index 47535a6..959ee44 100644 --- a/maps/boss/boss2_arena.gd +++ b/maps/boss/boss2_arena.gd @@ -2,6 +2,8 @@ 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 @@ -10,6 +12,7 @@ func _on_2600_entered_phase(phase): 2: Audio.play_sound(Audio.a_glass_crack,Audio.ac_mech_hurt) $DelayedArrow2.start() + speccy_will_yell = false 3: Audio.play_sound(Audio.a_glass_break,Audio.ac_mech_hurt) $DelayedArrow3.start() @@ -34,3 +37,8 @@ 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 0584380..f127836 100644 --- a/maps/boss/boss2_arena.tscn +++ b/maps/boss/boss2_arena.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=19 format=2] +[gd_scene load_steps=20 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,6 +18,7 @@ [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 @@ -143,5 +144,17 @@ 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"] From 299dcaf06e03c39f3c519f61bd47bb6109c1831c Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Mon, 6 Jan 2025 05:28:29 -0500 Subject: [PATCH 44/50] killemall1989 2!! --- maps/station.tscn | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/maps/station.tscn b/maps/station.tscn index af3fc6c..bfeff08 100644 --- a/maps/station.tscn +++ b/maps/station.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=37 format=2] +[gd_scene load_steps=38 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,6 +34,7 @@ [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" @@ -569,3 +570,13 @@ 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"] From 5748d7dcf8a4353ca524afc9e2015d17aabc2b18 Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Mon, 6 Jan 2025 05:30:13 -0500 Subject: [PATCH 45/50] cheering you on --- maps/lab.tscn | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/maps/lab.tscn b/maps/lab.tscn index 1fb41cb..e407fcc 100644 --- a/maps/lab.tscn +++ b/maps/lab.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=52 format=2] +[gd_scene load_steps=53 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,6 +42,7 @@ [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 ) @@ -580,5 +581,12 @@ 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"] From eaa9490636fb85431f7100c104544364980ff7d3 Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Mon, 6 Jan 2025 05:44:06 -0500 Subject: [PATCH 46/50] ewwww destroy that fucking tonguegit statusgit status! --- maps/cave_scholar.tscn | 25 ++++++++++++++++++++++++- maps/cave_speccy_detector.gd | 10 ++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 maps/cave_speccy_detector.gd diff --git a/maps/cave_scholar.tscn b/maps/cave_scholar.tscn index d7153c3..3542bfd 100644 --- a/maps/cave_scholar.tscn +++ b/maps/cave_scholar.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=35 format=2] +[gd_scene load_steps=38 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,6 +32,8 @@ [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 ] @@ -39,6 +41,9 @@ _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 ) @@ -1152,3 +1157,21 @@ __meta__ = { [node name="Exit" parent="." instance=ExtResource( 24 )] position = Vector2( 656, 100 ) 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 new file mode 100644 index 0000000..192e595 --- /dev/null +++ b/maps/cave_speccy_detector.gd @@ -0,0 +1,10 @@ +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 From 5f736ae3b0c004bcffae6b6ee62c81263cc30e51 Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Sun, 19 Jan 2025 00:57:48 -0500 Subject: [PATCH 47/50] more speccy stuff --- maps/rust.tscn | 7 ++++++- maps/station.tscn | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/maps/rust.tscn b/maps/rust.tscn index 43f3103..cb64470 100644 --- a/maps/rust.tscn +++ b/maps/rust.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=34 format=2] +[gd_scene load_steps=35 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,6 +32,7 @@ [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 ) @@ -547,3 +548,7 @@ 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 bfeff08..5ab3c5a 100644 --- a/maps/station.tscn +++ b/maps/station.tscn @@ -580,3 +580,4 @@ 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"] From 634489613458c983fb992461f10d25685c932cfb Mon Sep 17 00:00:00 2001 From: pennyrigate Date: Mon, 24 Mar 2025 23:49:56 -0400 Subject: [PATCH 48/50] i hate revolution 2083 --- cutscenes/fami_cutscene.gd | 1 + cutscenes/fami_cutscene.tscn | 264 +++++++++++++++++++++++++++++++---- menus/credits.tscn | 59 ++++---- 3 files changed, 261 insertions(+), 63 deletions(-) diff --git a/cutscenes/fami_cutscene.gd b/cutscenes/fami_cutscene.gd index 4f2edb1..fb18afb 100644 --- a/cutscenes/fami_cutscene.gd +++ b/cutscenes/fami_cutscene.gd @@ -29,6 +29,7 @@ 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 f4130d9..14034bf 100644 --- a/cutscenes/fami_cutscene.tscn +++ b/cutscenes/fami_cutscene.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=46 format=2] +[gd_scene load_steps=47 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,7 +10,6 @@ [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] @@ -235,19 +234,20 @@ tracks/10/keys = { [sub_resource type="Animation" id=2] resource_name = "cutscene" -length = 93.0 +length = 100.0 +step = 0.05 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/enabled = false tracks/0/keys = { -"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 ), +"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": [ "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!", "", "" ] +"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("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, 78.75 ), +"times": PoolRealArray( 0.25, 96 ), "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, 59.25, 60.75 ), +"times": PoolRealArray( 0.25, 76.5, 78 ), "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, 59.25, 60.75 ), +"times": PoolRealArray( 0, 76.5, 78 ), "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, 61.75, 63.75, 64.25, 69.75, 71.75, 75.75, 76.25 ), +"times": PoolRealArray( 0.25, 79, 81, 81.5, 87, 89, 93, 93.5 ), "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, 61.75, 63.75, 69.75, 71.75, 75.75, 77.75, 78.75 ), +"times": PoolRealArray( 0.25, 79, 81, 87, 89, 93, 95, 96 ), "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, 65.5, 70.75 ), +"times": PoolRealArray( 0.5, 82.8, 88 ), "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, 72.75, 75.75 ), +"times": PoolRealArray( 0.25, 90, 93 ), "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, 74.75, 75.75 ), +"times": PoolRealArray( 0.25, 92, 93 ), "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, 74.75, 75.75 ), +"times": PoolRealArray( 0.25, 92, 93 ), "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( 78.75 ), +"times": PoolRealArray( 96 ), "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, 72.75 ), +"times": PoolRealArray( 0, 90 ), "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, 65.5 ), +"times": PoolRealArray( 0, 82.8 ), "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, 76.5 ), +"times": PoolRealArray( 0, 93.8 ), "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, 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 ), +"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 ), "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( 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 ) ] +"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 ) ] } 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, 61.5, 61.6, 73 ), +"times": PoolRealArray( 0, 50.75, 78.45, 90.4 ), "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( 64.25, 65.5 ), +"times": PoolRealArray( 81.5, 82.8 ), "transitions": PoolRealArray( 1, 1 ), "values": [ { "args": [ ], @@ -455,11 +455,212 @@ tracks/17/loop_wrap = true tracks/17/imported = false tracks/17/enabled = true tracks/17/keys = { -"times": PoolRealArray( -0.1, 60.5 ), +"times": PoolRealArray( -0.1, 78 ), "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 ) @@ -529,6 +730,7 @@ theme = ExtResource( 3 ) align = 1 valign = 1 autowrap = true +percent_visible = 0.0 [node name="FamiHuman" type="AnimatedSprite" parent="."] material = ExtResource( 19 ) @@ -548,7 +750,6 @@ vframes = 20 script = ExtResource( 5 ) [node name="FamiVoice" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 11 ) [node name="AnimationPlayer" type="AnimationPlayer" parent="."] autoplay = "cutscene" @@ -556,6 +757,13 @@ 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/menus/credits.tscn b/menus/credits.tscn index a3f4484..19d725c 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, 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 ), +"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 ), "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 ), Vector2( -4864, 0 ), Vector2( -4864, 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 ) ] } [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 = 2735.0 +margin_left = 2479.0 margin_top = -15.0 -margin_right = 2927.0 +margin_right = 2671.0 margin_bottom = 1.0 theme = SubResource( 93 ) text = "Roll Call!!!" [node name="RollCall2" type="Label" parent="Control/TeamSG"] -margin_left = 2735.0 +margin_left = 2479.0 margin_top = -17.0 -margin_right = 2927.0 +margin_right = 2671.0 margin_bottom = -1.0 theme = SubResource( 93 ) text = "Roll Call!!!" @@ -804,23 +804,12 @@ Character design help" align = 1 valign = 1 -[node name="GasStationCoffee" type="Label" parent="Control"] +[node name="Wolfboy" 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 @@ -828,8 +817,8 @@ valign = 1 [node name="Bodhi" type="Label" parent="Control"] material = ExtResource( 4 ) -margin_left = 2304.0 -margin_right = 2560.0 +margin_left = 2048.0 +margin_right = 2304.0 margin_bottom = 192.0 theme = ExtResource( 6 ) text = "-Bodhi \"eviscerator\" darner- @@ -839,8 +828,8 @@ valign = 1 [node name="Playtesters" type="Label" parent="Control"] material = ExtResource( 4 ) -margin_left = 2560.0 -margin_right = 2816.0 +margin_left = 2304.0 +margin_right = 2560.0 margin_bottom = 192.0 theme = ExtResource( 6 ) text = "-Our playtesters- @@ -857,8 +846,8 @@ valign = 1 [node name="WonderingNow" type="Label" parent="Control"] material = ExtResource( 4 ) -margin_left = 2816.0 -margin_right = 3072.0 +margin_left = 2560.0 +margin_right = 2816.0 margin_bottom = 192.0 theme = ExtResource( 6 ) text = "-You're wondering now- @@ -875,8 +864,8 @@ valign = 1 [node name="SpecialThanks" type="Label" parent="Control"] material = ExtResource( 4 ) -margin_left = 3072.0 -margin_right = 3328.0 +margin_left = 2816.0 +margin_right = 3072.0 margin_bottom = 192.0 theme = ExtResource( 6 ) text = "-Special thanks- @@ -890,9 +879,9 @@ valign = 1 [node name="Playername" type="Label" parent="Control"] material = ExtResource( 4 ) -margin_left = 3072.0 +margin_left = 2816.0 margin_top = 123.0 -margin_right = 3328.0 +margin_right = 3072.0 margin_bottom = 133.0 theme = ExtResource( 6 ) text = "Ty Tiramisu" @@ -900,7 +889,7 @@ align = 1 autowrap = true [node name="RollCall1" type="Node2D" parent="Control"] -position = Vector2( 3584, 0 ) +position = Vector2( 3328, 0 ) [node name="SG" type="AnimatedSprite" parent="Control/RollCall1"] material = SubResource( 7 ) @@ -1001,7 +990,7 @@ text = "Vile Villians" align = 1 [node name="RollCall2" type="Node2D" parent="Control"] -position = Vector2( 1024, 0 ) +position = Vector2( 768, 0 ) [node name="Eviscerator" type="AnimatedSprite" parent="Control/RollCall2"] material = SubResource( 13 ) @@ -1141,7 +1130,7 @@ Poachers" align = 1 [node name="RollCall3" type="Node2D" parent="Control"] -position = Vector2( 4096, 0 ) +position = Vector2( 3840, 0 ) [node name="Shedge" type="AnimatedSprite" parent="Control/RollCall3"] position = Vector2( 60, 25 ) @@ -1350,10 +1339,11 @@ experiments" align = 1 [node name="RollCall4" type="Node2D" parent="Control"] -position = Vector2( 1024, 0 ) +position = Vector2( 768, 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 @@ -1449,7 +1439,6 @@ 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 ) @@ -1478,7 +1467,7 @@ text = "Super Famira" align = 1 [node name="RollCall5" type="Node2D" parent="Control"] -position = Vector2( 4864, 0 ) +position = Vector2( 4608, 0 ) [node name="Haze" type="Sprite" parent="Control/RollCall5"] position = Vector2( 80, 136 ) From da17fbc52e1f61607ebbf41a30828bca4aec1137 Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Tue, 25 Mar 2025 01:50:08 -0400 Subject: [PATCH 49/50] this dragged out too long.. --- graphics/hud/title_credits.png | Bin 3170 -> 5178 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/graphics/hud/title_credits.png b/graphics/hud/title_credits.png index 5066a5972b3aad32288cf22bca197879c5b79cdf..6ebb035f67daf22765554997c21fe31e33a18860 100644 GIT binary patch literal 5178 zcmeHLX;c$g7EV}1)@Bs7-D7ZrV~nAzwIvWst19>r;#*X&jv=5su7!~5ATkXnZQTwAep zV@1-+Qz1m*%|TA#4d~_bYc@3;aM>N<0H<@t!(1dRe_)N5toFJ*HT7i1vq|md6fd0Cg)?PXKk6D8Z6UablfnyoLBMoZ25zd{FoV;b5eF<(+6|tF13mqB2IYmo-<`Bt&ifWo7-y=sU_>xAU9rg#TD;_jLJ; zAG7V>7*_2Rm6bL51&?0omay$O+rwj3DVI99^h8C);j$GMj=bq$A9gWSLf z`5R0WN5~WMU?{*!C!$7#FkO_=Yr9#eS{FQ19B(0I!L|lNQlo&-IR7??&5EpA9oDg7;gd#~qAVD#W zNZkucsW)2)JxMW80Gvky9Em_oXf#40B!W>bBotF3NR0|%h)|0#6hYKDPQbk&=9*}b zl|)=`uNWu|fD+)C2oaE4h!hLNkWeGSA)Ew~S`7>km=M9#S{oE|4$^5VrJRfMI>Bu- zsyM=;HJEgA?i^a5VEv#PPV1;J3&D_vNQ5YcArcHn1+WMaeo&fEnam*J7))DSJsR%&|y8Fo0Ns$y0!An+LH-{Y?~MF_^*)hB!I5r|R}B2Z8IP zAuNP~uu#BSPaO{LuEP*4l)^ovNrMa;TATdew3*Apk#!zokAM_{Q4lfp9}<|L`a1nThA4ty z0fdUWa{})hqKwa!#qL9u@&E1EI~97>Q9w=S9H`Hr-1B?teHUj;W&MP&u5|l^769~T zBOk@@XSzPq^-&Cbl=A27`b^hHG4N5!pR?=#MwiQnCq_yS{?SVU&x4VpihRMdq?>9^ zcmU`z@wDdVW*{U+Jc$4u+Y%Za#+rKXhL#zqXU|ly(j7+zf`PL!aDf>-pq^qH8*>aB z3nrZ`%Af$JpX`S^B1k{&%sJpkkgH0?wD85ZpX612(+qpA+k57fyVs_Ct@&JwT|JCn zU-j}zWC^+HLP%vw-8=6gb^RW$+qdt?Uz|$0c+T19??ZWJ>}|*IRLMt={-Zt7CMw5#iPf3eE?V0|Mxu*Eyf>X-Jy@i&?EbrFhab$O9b z){9p!9Of)@=R6gyIoK~_VC|*{Tk)w5=W8P0yj2d${GuvlbYsi35U+s$_|87%k2(1~ zaJ@Y{o;vW@KBoM{t{-n6cz7tQjvxQ%%yaEy0Y7%@f?31y5FHYk^D=$%&GKi5a=y$R z1QqZ5dP*>7+%_NVcuMdX{^dhg7Yrca38rdU$*t`8g;)F?o*&x(wo4jCU_1!BAu6z|zm6vDCcpMcqZ`1Oq zZJto->y~S|e|1u&J}SF5_e>@-$Tesa&XLOaXM zdqd8JbX?UR<9OI_-JW&kw!_hq1k?Dl*|WCzm9M_R9WQyVf~)E~4tg60|8Q!W*1K+G zAymy-U48Gnlg_PNeC5M)Y>hZRgSC9RM+#4!*5Z6jH~*I%6ZO?DPNi!LjIW~DFY;v` znws{>E#Jo_7Q8%FvQt-fc-M?S=PD$p9ZEe%UXO1KT)M0sxzx6BJF$6TVqI>79AD=w zyRh0d^vMplH*MvkVRo=1KI~2YN!e`{XJ!Hk_mO_82z5V%)V*&e(I9dy%eN8OBoQXD4rgj_D`-!EP((3 delta 2332 zcmcIleKgeR9-lGey+muITG#BaMPBC3(2U6#!yvUZdCj0qW@s>G;^&?F^Rl9Z^sCLb zTSz6cUh-DrvMStaDKe&zksLw|TM8w2-1gklx#ym{f9-S5^E~JK`Fy|M&-Z+v=R8mI z_UHO1^&vGB0)ZGNyLllH$P9s_Biq%{5zCGeg$N?}2*mc@GX*xgP)z;Iwr`JbwADZz z&yFbZ;lyKq*rKeX>u^Hmed88sUw33jWZ= z&%knvPn0k?r%D~^7XR>pO~RP+*r$PH_xU{Woq#^Lqpah6UI2UXz)R<}gSurYS``nn z;p`2XF5fqR>RXK>@HRh)i^TqY*Nqs|K-s0|)^~kE?tZ*kmdO3>BHg+i{1JD;vJ(xF ztk(JLH+H;$_Y>|5cz)dwH!ga&LOQbfIj2*%OU=&$9L-{qJ1-~d4(8C%kiu#oAtMzV3iNRITwO&B-doRH^AYdzi$)-{+SVqLs_gkK0-?-; z3zYUE*TXU;7HYi)7B)gTpcOk7K8!Mib5MA=6~#D(Hipg67BB~G4j)6C!VTzMrBD(~8Wb#ZlL)0k{mI$((> z0&uai9`G6S5(xR8AXg}+10)KWNG1|3sU)%$nPO!Hz|WL7>0x=nG-pwikPFfQfsh-@ zCx|0M0a!-`1DmRR4PoPjVwxKtQ>lT)d=3Fx*dj8O&~1ci)^-pHHj}3YzhCX zn$LbLespk@K)fdS?;M{|50V3<2eJG}MHx{5!)~$R<_*PV zfOK40Ot1I@uRPTwx4Ev{^ZTlc=-8!-$95_(GD3e(pI~38!R*_?d>bHDs%O+b=vh2& zdf~BIlIeh%p{CkgU@_*O7c=m)RaN2M3w;4zg45cjzSoj1u=Z(97jN#DUE!=l7EW93 zUi9yq9S&X9v`-Wy6?{sXLptom@WJD#p zaLM3Ns_1=7Qpg3n>V@}*kz%XCxEFF^*y8Mp+g8gd?w6M*i-u!l~@@^=E7jl8kwzdE*nfvI#QI z@avWpyBB%4azq|>8qoVB#Pv=Y

yXuHxS^pDC;s5TA1m#?8eUm{m($(5+*5KyqrJJ} ztiH|b_lKsaAE7aJylM*Toh);1zxkmoe7XmQG}^lVD;*0HV%wX!xtiV3i)(Ys9}Y5* z5vEBOXKE!kwSRLDNaTSAmC451<^NF21H2{VOPr8L=OEMN!iG)NwL;Yti?`ksV55mn z*wNVcdFreRUr65ZeMPjsLGyR~DC+Hp~}?dM7><;}kzB!qv&0Rpk(r{x4Kg&4K^` From 9748c64035cb4caa5d72b05fbb3ccaf41d8b45ea Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Tue, 25 Mar 2025 13:33:43 -0400 Subject: [PATCH 50/50] Set up exports --- export_presets.cfg | 280 +++++++++++++-------------------------------- 1 file changed, 80 insertions(+), 200 deletions(-) diff --git a/export_presets.cfg b/export_presets.cfg index 75f22d9..168510f 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -7,7 +7,7 @@ custom_features="" export_filter="all_resources" include_filter="scoreboard_host.txt" exclude_filter="" -export_path="build/Revolution 2083.exe" +export_path="build/windows/Revolution 2083.exe" script_export_mode=1 script_encryption_key="" @@ -33,13 +33,13 @@ codesign/description="" codesign/custom_options=PoolStringArray( ) application/modify_resources=true application/icon="res://icon.ico" -application/icon_interpolation=4 -application/file_version="" -application/product_version="" +application/icon_interpolation=0 +application/file_version="1.1.0.0" +application/product_version="1.1.0.0" application/company_name="Team SG" application/product_name="Revolution 2083" -application/file_description="" -application/copyright="" +application/file_description="Change the future!" +application/copyright="Team SG" application/trademarks="" [preset.1] @@ -60,7 +60,7 @@ script_encryption_key="" custom_template/debug="" custom_template/release="" binary_format/architecture="x86_64" -binary_format/embed_pck=true +binary_format/embed_pck=false texture_format/bptc=false texture_format/s3tc=true texture_format/etc=false @@ -104,207 +104,87 @@ progressive_web_app/background_color=Color( 0, 0, 0, 1 ) [preset.3] -name="android" -platform="Android" +name="Mac OSX" +platform="Mac OSX" runnable=true custom_features="" export_filter="all_resources" -include_filter="scoreboard_host.txt" +include_filter="" exclude_filter="" -export_path="build/android/hero-mark-2.apk" +export_path="build/macos/Revolution 2083.zip" script_export_mode=1 script_encryption_key="" [preset.3.options] +export/distribution_type=1 custom_template/debug="" custom_template/release="" -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/post_notifications=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 +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