diff --git a/.import/A.png-e8eb459bc6556ccd2a36bb0444aec579.md5 b/.import/A.png-e8eb459bc6556ccd2a36bb0444aec579.md5 index 64facf0..f75a7b1 100644 --- a/.import/A.png-e8eb459bc6556ccd2a36bb0444aec579.md5 +++ b/.import/A.png-e8eb459bc6556ccd2a36bb0444aec579.md5 @@ -1,3 +1,3 @@ -source_md5="84c7e776a616d97d2a7f692398135015" -dest_md5="acfb108c68e655014c4dc876553ebd7b" +source_md5="b81b83f88b284d2ac3904c2d9f000f2f" +dest_md5="06917c681e66c081dbe52d1879f9bc8e" diff --git a/.import/A.png-e8eb459bc6556ccd2a36bb0444aec579.stex b/.import/A.png-e8eb459bc6556ccd2a36bb0444aec579.stex index 4b52a61..df565a9 100644 Binary files a/.import/A.png-e8eb459bc6556ccd2a36bb0444aec579.stex and b/.import/A.png-e8eb459bc6556ccd2a36bb0444aec579.stex differ diff --git a/.import/B.png-9d07cbf92eb8b76cf9538cdcd552fb23.md5 b/.import/B.png-9d07cbf92eb8b76cf9538cdcd552fb23.md5 index 3ac92f5..441fb3f 100644 --- a/.import/B.png-9d07cbf92eb8b76cf9538cdcd552fb23.md5 +++ b/.import/B.png-9d07cbf92eb8b76cf9538cdcd552fb23.md5 @@ -1,3 +1,3 @@ -source_md5="7479ae174d458d969279072c36e0d511" -dest_md5="e1291d4fba26a5310be50977f56921f0" +source_md5="a93832c16470eb8a7d20c66559e0db69" +dest_md5="7a14c6bff8406eea080859febebc1981" diff --git a/.import/B.png-9d07cbf92eb8b76cf9538cdcd552fb23.stex b/.import/B.png-9d07cbf92eb8b76cf9538cdcd552fb23.stex index a4cbc4b..724aa6e 100644 Binary files a/.import/B.png-9d07cbf92eb8b76cf9538cdcd552fb23.stex and b/.import/B.png-9d07cbf92eb8b76cf9538cdcd552fb23.stex differ diff --git a/.import/LB.png-c5075b1a373b12e705fb0c6ef0b5f91b.md5 b/.import/LB.png-c5075b1a373b12e705fb0c6ef0b5f91b.md5 index b7988ed..846fe60 100644 --- a/.import/LB.png-c5075b1a373b12e705fb0c6ef0b5f91b.md5 +++ b/.import/LB.png-c5075b1a373b12e705fb0c6ef0b5f91b.md5 @@ -1,3 +1,3 @@ -source_md5="0e14733f882021dba49fa7cb7b951863" -dest_md5="49d4bf843e7939d788cbb67fca9c5c9a" +source_md5="5b70f7a1e69f6fa81950ba92caf63767" +dest_md5="78c1b6deae3b3d26eb4a9d93d737e388" diff --git a/.import/LB.png-c5075b1a373b12e705fb0c6ef0b5f91b.stex b/.import/LB.png-c5075b1a373b12e705fb0c6ef0b5f91b.stex index d778f23..91a38cc 100644 Binary files a/.import/LB.png-c5075b1a373b12e705fb0c6ef0b5f91b.stex and b/.import/LB.png-c5075b1a373b12e705fb0c6ef0b5f91b.stex differ diff --git a/.import/LT.png-625b794033c3146c354a9bff9bba5745.md5 b/.import/LT.png-625b794033c3146c354a9bff9bba5745.md5 index de6b47d..f90ff29 100644 --- a/.import/LT.png-625b794033c3146c354a9bff9bba5745.md5 +++ b/.import/LT.png-625b794033c3146c354a9bff9bba5745.md5 @@ -1,3 +1,3 @@ -source_md5="d4f13c50c3235ed377cf585a34eba23a" -dest_md5="f1fa8c13253cbd1d946de408e363929b" +source_md5="5fee50d843aebe284d53b111ab34cb92" +dest_md5="3e01e0121cac8ed217ee2f1905b41b2f" diff --git a/.import/LT.png-625b794033c3146c354a9bff9bba5745.stex b/.import/LT.png-625b794033c3146c354a9bff9bba5745.stex index 0320139..a140981 100644 Binary files a/.import/LT.png-625b794033c3146c354a9bff9bba5745.stex and b/.import/LT.png-625b794033c3146c354a9bff9bba5745.stex differ diff --git a/.import/Lety Hashimoto clasista.jpg-de196f6fdf3365392822ebeea9a00433.md5 b/.import/Lety Hashimoto clasista.jpg-de196f6fdf3365392822ebeea9a00433.md5 new file mode 100644 index 0000000..b15ad96 --- /dev/null +++ b/.import/Lety Hashimoto clasista.jpg-de196f6fdf3365392822ebeea9a00433.md5 @@ -0,0 +1,3 @@ +source_md5="48dee5d4902b329be638748d9a4c960d" +dest_md5="f0c41f362a6a458037b4254de0429459" + diff --git a/.import/Lety Hashimoto clasista.jpg-de196f6fdf3365392822ebeea9a00433.stex b/.import/Lety Hashimoto clasista.jpg-de196f6fdf3365392822ebeea9a00433.stex new file mode 100644 index 0000000..39f32dc Binary files /dev/null and b/.import/Lety Hashimoto clasista.jpg-de196f6fdf3365392822ebeea9a00433.stex differ diff --git a/.import/Lety Hashimoto split.jpg-fe501e28f1a6afc6ae02d16c8a5fa2ee.md5 b/.import/Lety Hashimoto split.jpg-fe501e28f1a6afc6ae02d16c8a5fa2ee.md5 new file mode 100644 index 0000000..6b4074f --- /dev/null +++ b/.import/Lety Hashimoto split.jpg-fe501e28f1a6afc6ae02d16c8a5fa2ee.md5 @@ -0,0 +1,3 @@ +source_md5="a07f4e70ad311e9d34b3f32d14e4f962" +dest_md5="4499725abb6f5d93f23826e4850c25b1" + diff --git a/.import/Lety Hashimoto split.jpg-fe501e28f1a6afc6ae02d16c8a5fa2ee.stex b/.import/Lety Hashimoto split.jpg-fe501e28f1a6afc6ae02d16c8a5fa2ee.stex new file mode 100644 index 0000000..c0aacff Binary files /dev/null and b/.import/Lety Hashimoto split.jpg-fe501e28f1a6afc6ae02d16c8a5fa2ee.stex differ diff --git a/.import/Midori Asgardius split.jpg-acf8aea71a22e8d655c5b5cba0ffed75.md5 b/.import/Midori Asgardius split.jpg-acf8aea71a22e8d655c5b5cba0ffed75.md5 new file mode 100644 index 0000000..07a6237 --- /dev/null +++ b/.import/Midori Asgardius split.jpg-acf8aea71a22e8d655c5b5cba0ffed75.md5 @@ -0,0 +1,3 @@ +source_md5="d77681e580d648ff01b9852f6aef491e" +dest_md5="d500a199b468b13157d828ff7e572f24" + diff --git a/.import/Midori Asgardius split.jpg-acf8aea71a22e8d655c5b5cba0ffed75.stex b/.import/Midori Asgardius split.jpg-acf8aea71a22e8d655c5b5cba0ffed75.stex new file mode 100644 index 0000000..e1985d5 Binary files /dev/null and b/.import/Midori Asgardius split.jpg-acf8aea71a22e8d655c5b5cba0ffed75.stex differ diff --git a/.import/RB.png-9bfa19bd8ee72f92a34cc2cf0fa6a0e8.md5 b/.import/RB.png-9bfa19bd8ee72f92a34cc2cf0fa6a0e8.md5 index 12d0023..b92ed93 100644 --- a/.import/RB.png-9bfa19bd8ee72f92a34cc2cf0fa6a0e8.md5 +++ b/.import/RB.png-9bfa19bd8ee72f92a34cc2cf0fa6a0e8.md5 @@ -1,3 +1,3 @@ -source_md5="b9291d1167c25ea029a30e0e8d14b908" -dest_md5="51ce942991eb87e61b3eaa9b785b4d32" +source_md5="2de566f0b97ccabf3582c9496bd6a615" +dest_md5="2f30e5e81cb254c91596e95ccf88fbf7" diff --git a/.import/RB.png-9bfa19bd8ee72f92a34cc2cf0fa6a0e8.stex b/.import/RB.png-9bfa19bd8ee72f92a34cc2cf0fa6a0e8.stex index 0065e5f..2b5d169 100644 Binary files a/.import/RB.png-9bfa19bd8ee72f92a34cc2cf0fa6a0e8.stex and b/.import/RB.png-9bfa19bd8ee72f92a34cc2cf0fa6a0e8.stex differ diff --git a/.import/RT.png-4b41c129ee4b7ab06535a770c9bf6745.md5 b/.import/RT.png-4b41c129ee4b7ab06535a770c9bf6745.md5 index 6136a08..22fa870 100644 --- a/.import/RT.png-4b41c129ee4b7ab06535a770c9bf6745.md5 +++ b/.import/RT.png-4b41c129ee4b7ab06535a770c9bf6745.md5 @@ -1,3 +1,3 @@ -source_md5="bb1c9491a43245519dab7e16674996c0" -dest_md5="c71d4bb747790c118da7a3e32e5a9a6f" +source_md5="27af6f7c9a3d5c10be14eba5a78a3fe0" +dest_md5="e12b9e9ffacbc4f3b7117f32b7315c88" diff --git a/.import/RT.png-4b41c129ee4b7ab06535a770c9bf6745.stex b/.import/RT.png-4b41c129ee4b7ab06535a770c9bf6745.stex index 822a094..fb689f9 100644 Binary files a/.import/RT.png-4b41c129ee4b7ab06535a770c9bf6745.stex and b/.import/RT.png-4b41c129ee4b7ab06535a770c9bf6745.stex differ diff --git a/.import/Select.png-2951067d745bfd58a019bc8cfbc73aae.md5 b/.import/Select.png-2951067d745bfd58a019bc8cfbc73aae.md5 index f83dab1..5a3cb05 100644 --- a/.import/Select.png-2951067d745bfd58a019bc8cfbc73aae.md5 +++ b/.import/Select.png-2951067d745bfd58a019bc8cfbc73aae.md5 @@ -1,3 +1,3 @@ -source_md5="6c543278fca7dd655e993a600139a9f0" -dest_md5="d777372bad39f08f13166b5498d2b9a0" +source_md5="32ab532c0877cb17ed9f5d4d3aaaf808" +dest_md5="b931dae8a54c3f5727cf34ee6ca8e6bb" diff --git a/.import/Select.png-2951067d745bfd58a019bc8cfbc73aae.stex b/.import/Select.png-2951067d745bfd58a019bc8cfbc73aae.stex index eceeba6..d3debeb 100644 Binary files a/.import/Select.png-2951067d745bfd58a019bc8cfbc73aae.stex and b/.import/Select.png-2951067d745bfd58a019bc8cfbc73aae.stex differ diff --git a/.import/Start.png-49afd20a2a79c62edf7a20d57a620d7a.md5 b/.import/Start.png-49afd20a2a79c62edf7a20d57a620d7a.md5 index 605f11f..7c2914b 100644 --- a/.import/Start.png-49afd20a2a79c62edf7a20d57a620d7a.md5 +++ b/.import/Start.png-49afd20a2a79c62edf7a20d57a620d7a.md5 @@ -1,3 +1,3 @@ -source_md5="9ec879df51b1a4e02e2ac384fbfc69a4" -dest_md5="2f26e5673a5741d6a8c6fd1baae42fed" +source_md5="d3351662cae34486db843b537be1fcf0" +dest_md5="9d478f4a7abdeffe750d005e36b8afcd" diff --git a/.import/Start.png-49afd20a2a79c62edf7a20d57a620d7a.stex b/.import/Start.png-49afd20a2a79c62edf7a20d57a620d7a.stex index 40506ea..5096c02 100644 Binary files a/.import/Start.png-49afd20a2a79c62edf7a20d57a620d7a.stex and b/.import/Start.png-49afd20a2a79c62edf7a20d57a620d7a.stex differ diff --git a/.import/X.png-33658b17beabdb71e23c968c353ba50b.md5 b/.import/X.png-33658b17beabdb71e23c968c353ba50b.md5 index e74fa1e..8d1291c 100644 --- a/.import/X.png-33658b17beabdb71e23c968c353ba50b.md5 +++ b/.import/X.png-33658b17beabdb71e23c968c353ba50b.md5 @@ -1,3 +1,3 @@ -source_md5="51c96b6ea47fb7927f530094caf35adc" -dest_md5="d9f32baee2dbd67925a0d749622d4d8f" +source_md5="8404faa5f89d5f83a365d496ccb73d6c" +dest_md5="6f5be76d493b07877ff6960445317bf4" diff --git a/.import/X.png-33658b17beabdb71e23c968c353ba50b.stex b/.import/X.png-33658b17beabdb71e23c968c353ba50b.stex index 2259bd9..86a420e 100644 Binary files a/.import/X.png-33658b17beabdb71e23c968c353ba50b.stex and b/.import/X.png-33658b17beabdb71e23c968c353ba50b.stex differ diff --git a/.import/Y.png-4f6bbe77615952118d9ae8dad67f8070.md5 b/.import/Y.png-4f6bbe77615952118d9ae8dad67f8070.md5 index 76ba3af..d9ee8bc 100644 --- a/.import/Y.png-4f6bbe77615952118d9ae8dad67f8070.md5 +++ b/.import/Y.png-4f6bbe77615952118d9ae8dad67f8070.md5 @@ -1,3 +1,3 @@ -source_md5="caf7f492b490fdf64931bb2aedbc8032" -dest_md5="5696f05ce60a3de5a5f51cf1823b5c03" +source_md5="b61af5439a256768bd68504d3344d2fb" +dest_md5="9a0d0549358dda0132a401761745ab8b" diff --git a/.import/Y.png-4f6bbe77615952118d9ae8dad67f8070.stex b/.import/Y.png-4f6bbe77615952118d9ae8dad67f8070.stex index 37bb7d5..6361561 100644 Binary files a/.import/Y.png-4f6bbe77615952118d9ae8dad67f8070.stex and b/.import/Y.png-4f6bbe77615952118d9ae8dad67f8070.stex differ diff --git a/.import/harrow.png-cff9bb5d307937598b2441c7b05658fc.md5 b/.import/harrow.png-cff9bb5d307937598b2441c7b05658fc.md5 new file mode 100644 index 0000000..ba560b5 --- /dev/null +++ b/.import/harrow.png-cff9bb5d307937598b2441c7b05658fc.md5 @@ -0,0 +1,3 @@ +source_md5="81e19ea7fca28f432ca125a292baee52" +dest_md5="99b4aa2f99323306eb0f709b1b397cc9" + diff --git a/.import/harrow.png-cff9bb5d307937598b2441c7b05658fc.stex b/.import/harrow.png-cff9bb5d307937598b2441c7b05658fc.stex new file mode 100644 index 0000000..c3f5e55 Binary files /dev/null and b/.import/harrow.png-cff9bb5d307937598b2441c7b05658fc.stex differ diff --git a/.import/sprite.png-80203724d24c6794eeb42fd7263e8e36.md5 b/.import/sprite.png-80203724d24c6794eeb42fd7263e8e36.md5 index 043a279..4aa2e5a 100644 --- a/.import/sprite.png-80203724d24c6794eeb42fd7263e8e36.md5 +++ b/.import/sprite.png-80203724d24c6794eeb42fd7263e8e36.md5 @@ -1,3 +1,3 @@ -source_md5="408400fef05a72ba01a349330387a973" -dest_md5="276cbd3b4ca76f457019247b1398a39f" +source_md5="c98f60a4104f63fc40349664fcaa1122" +dest_md5="594e56cbb9f624f9b3118ad10cd61f5b" diff --git a/.import/sprite.png-80203724d24c6794eeb42fd7263e8e36.stex b/.import/sprite.png-80203724d24c6794eeb42fd7263e8e36.stex index e1345bf..5a4ae78 100644 Binary files a/.import/sprite.png-80203724d24c6794eeb42fd7263e8e36.stex and b/.import/sprite.png-80203724d24c6794eeb42fd7263e8e36.stex differ diff --git a/.import/text.csv-f7bafd51ed4405bc3f45b54fa34fb92c.md5 b/.import/text.csv-f7bafd51ed4405bc3f45b54fa34fb92c.md5 index 65d789f..4fc7098 100644 --- a/.import/text.csv-f7bafd51ed4405bc3f45b54fa34fb92c.md5 +++ b/.import/text.csv-f7bafd51ed4405bc3f45b54fa34fb92c.md5 @@ -1,3 +1,3 @@ -source_md5="b5c42211b198f831f844cd1975987cc8" -dest_md5="7f31c19ea2e353e911a4b7bdac1a3f1d" +source_md5="2d935fa5d1d456a3f00a0e14b4bbc357" +dest_md5="7ab40893d5ed7b615b9dca0635771d14" diff --git a/.import/varrow.png-85023a14abb22a04095d6b65c81ec838.md5 b/.import/varrow.png-85023a14abb22a04095d6b65c81ec838.md5 new file mode 100644 index 0000000..ec9e3f9 --- /dev/null +++ b/.import/varrow.png-85023a14abb22a04095d6b65c81ec838.md5 @@ -0,0 +1,3 @@ +source_md5="a13e4260feeab3371c98799d370bf5d2" +dest_md5="1cc669a26f577dd388d470ea78bfaa23" + diff --git a/.import/varrow.png-85023a14abb22a04095d6b65c81ec838.stex b/.import/varrow.png-85023a14abb22a04095d6b65c81ec838.stex new file mode 100644 index 0000000..8bbaa45 Binary files /dev/null and b/.import/varrow.png-85023a14abb22a04095d6b65c81ec838.stex differ diff --git a/backgounds/Lety Hashimoto clasista.jpg b/backgounds/Lety Hashimoto clasista.jpg new file mode 100644 index 0000000..0dd91ef Binary files /dev/null and b/backgounds/Lety Hashimoto clasista.jpg differ diff --git a/backgounds/Lety Hashimoto clasista.jpg.import b/backgounds/Lety Hashimoto clasista.jpg.import new file mode 100644 index 0000000..547842e --- /dev/null +++ b/backgounds/Lety Hashimoto clasista.jpg.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Lety Hashimoto clasista.jpg-de196f6fdf3365392822ebeea9a00433.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://backgounds/Lety Hashimoto clasista.jpg" +dest_files=[ "res://.import/Lety Hashimoto clasista.jpg-de196f6fdf3365392822ebeea9a00433.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=true +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/backgounds/Lety Hashimoto split.jpg b/backgounds/Lety Hashimoto split.jpg new file mode 100644 index 0000000..5ee9670 Binary files /dev/null and b/backgounds/Lety Hashimoto split.jpg differ diff --git a/backgounds/Lety Hashimoto split.jpg.import b/backgounds/Lety Hashimoto split.jpg.import new file mode 100644 index 0000000..a5debe5 --- /dev/null +++ b/backgounds/Lety Hashimoto split.jpg.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Lety Hashimoto split.jpg-fe501e28f1a6afc6ae02d16c8a5fa2ee.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://backgounds/Lety Hashimoto split.jpg" +dest_files=[ "res://.import/Lety Hashimoto split.jpg-fe501e28f1a6afc6ae02d16c8a5fa2ee.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=true +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/backgounds/Midori Asgardius split.jpg b/backgounds/Midori Asgardius split.jpg new file mode 100644 index 0000000..716eae6 Binary files /dev/null and b/backgounds/Midori Asgardius split.jpg differ diff --git a/backgounds/Midori Asgardius split.jpg.import b/backgounds/Midori Asgardius split.jpg.import new file mode 100644 index 0000000..a67ec8d --- /dev/null +++ b/backgounds/Midori Asgardius split.jpg.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Midori Asgardius split.jpg-acf8aea71a22e8d655c5b5cba0ffed75.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://backgounds/Midori Asgardius split.jpg" +dest_files=[ "res://.import/Midori Asgardius split.jpg-acf8aea71a22e8d655c5b5cba0ffed75.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=true +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/backgounds/result.gd b/backgounds/result.gd index 7687b55..30b4b1f 100644 --- a/backgounds/result.gd +++ b/backgounds/result.gd @@ -42,7 +42,7 @@ func _title(): if Global.debug: get_tree().change_scene("res://levels/ui/scene.tscn") else: - if Global.cplace == [1, 1, 17]: + if Global.cplace == [1, 2, 17]: Global.cplace = [0, 0, 0] get_tree().change_scene("res://backgounds/wip.tscn") else: diff --git a/global.gd b/global.gd index 5af37a5..a69df0d 100644 --- a/global.gd +++ b/global.gd @@ -13,7 +13,7 @@ var playerx var playery var ccutscene = null var difdamage = 0 -const cutscenes = [["res://levels/Cutscenes/opening/aboutkaizo.tscn", "res://levels/Cutscenes/opening/midorihello.tscn", 18, false], ["res://levels/Cutscenes/opening/midorihello.tscn", "res://levels/Cutscenes/opening/fearlessmidori.tscn", 18, false], ["res://levels/Cutscenes/opening/fearlessmidori.tscn", "res://levels/Cutscenes/opening/midoriwaterfall.tscn", 0, false], ["res://levels/Cutscenes/opening/midoriwaterfall.tscn", "res://levels/Cutscenes/opening/midorireading.tscn", 0, false], ["res://levels/Cutscenes/opening/midorireading.tscn", "res://levels/Cutscenes/opening/boomboomtorofi.tscn", 0, false], ["res://levels/Cutscenes/opening/boomboomtorofi.tscn", "res://levels/ui/gameplay.tscn", 0, true], ["res://levels/Cutscenes/unfunaversary/punishment.tscn", "res://levels/Cutscenes/unfunaversary/sadness.tscn", 1, false], ["res://levels/Cutscenes/unfunaversary/sadness.tscn", "res://levels/Cutscenes/unfunaversary/r3.tscn", 1, false], ["res://levels/Cutscenes/unfunaversary/r3.tscn", "res://levels/Cutscenes/unfunaversary/firstclass.tscn", 1, false], ["res://levels/Cutscenes/unfunaversary/firstclass.tscn", "res://backgounds/result.tscn", 5, true], ["res://levels/Cutscenes/Honker Railway/forest.tscn", "res://levels/Cutscenes/Honker Railway/lordlytrashcan.tscn", 19, false], ["res://levels/Cutscenes/Honker Railway/lordlytrashcan.tscn", "res://levels/Cutscenes/Honker Railway/railway.tscn", 19, false], ["res://levels/Cutscenes/Honker Railway/railway.tscn", "res://levels/ui/gameplay.tscn", 19, true], ["res://levels/Cutscenes/Troublemaker/buildings.tscn", "res://levels/Cutscenes/Troublemaker/pamela.tscn", 18, false], ["res://levels/Cutscenes/Troublemaker/pamela.tscn", "res://levels/Cutscenes/Troublemaker/kungfu.tscn", 18, false], ["res://levels/Cutscenes/Troublemaker/kungfu.tscn", "res://levels/ui/gameplay.tscn", 6, true]] +const cutscenes = [["res://levels/Cutscenes/opening/aboutkaizo.tscn", "res://levels/Cutscenes/opening/midorihello.tscn", 18, false], ["res://levels/Cutscenes/opening/midorihello.tscn", "res://levels/Cutscenes/opening/fearlessmidori.tscn", 18, false], ["res://levels/Cutscenes/opening/fearlessmidori.tscn", "res://levels/Cutscenes/opening/midoriwaterfall.tscn", 0, false], ["res://levels/Cutscenes/opening/midoriwaterfall.tscn", "res://levels/Cutscenes/opening/midorireading.tscn", 0, false], ["res://levels/Cutscenes/opening/midorireading.tscn", "res://levels/Cutscenes/opening/boomboomtorofi.tscn", 0, false], ["res://levels/Cutscenes/opening/boomboomtorofi.tscn", "res://levels/ui/gameplay.tscn", 0, true], ["res://levels/Cutscenes/unfunaversary/punishment.tscn", "res://levels/Cutscenes/unfunaversary/sadness.tscn", 1, false], ["res://levels/Cutscenes/unfunaversary/sadness.tscn", "res://levels/Cutscenes/unfunaversary/r3.tscn", 1, false], ["res://levels/Cutscenes/unfunaversary/r3.tscn", "res://levels/Cutscenes/unfunaversary/firstclass.tscn", 1, false], ["res://levels/Cutscenes/unfunaversary/firstclass.tscn", "res://backgounds/result.tscn", 5, true], ["res://levels/Cutscenes/Honker Railway/forest.tscn", "res://levels/Cutscenes/Honker Railway/lordlytrashcan.tscn", 19, false], ["res://levels/Cutscenes/Honker Railway/lordlytrashcan.tscn", "res://levels/Cutscenes/Honker Railway/railway.tscn", 19, false], ["res://levels/Cutscenes/Honker Railway/railway.tscn", "res://levels/ui/gameplay.tscn", 19, true], ["res://levels/Cutscenes/Troublemaker/buildings.tscn", "res://levels/Cutscenes/Troublemaker/pamela.tscn", 18, false], ["res://levels/Cutscenes/Troublemaker/pamela.tscn", "res://levels/Cutscenes/Troublemaker/kungfu.tscn", 18, false], ["res://levels/Cutscenes/Troublemaker/kungfu.tscn", "res://levels/ui/gameplay.tscn", 6, true], ["res://levels/Cutscenes/Troublemakerp2/Lety.tscn", "res://levels/Cutscenes/Troublemakerp2/Fall.tscn", 18, false], ["res://levels/Cutscenes/Troublemakerp2/Fall.tscn", "res://levels/Cutscenes/Troublemakerp2/midori.tscn", 6, false], ["res://levels/Cutscenes/Troublemakerp2/midori.tscn", "res://levels/ui/gameplay.tscn", 6, true]] const pcnames = ["Midori Asgardius", "Diana Asgardius", null, "Kimberly Arch", null, null, null, "Pamela Hashimoto", "Lety Hashimoto", "Natasha Dostoyevsky"] const npcnames = ["Lily", "Railway Girl", null, "Kimberly Arch", null, null, null, null, null, "Natasha Dostoyevsky"] const pcfaces = [["res://sprites/common/midori/face.png"], ["res://sprites/common/tuna/face.png"], [null], ["res://sprites/common/kimberly/face.png"], [null], [null], [null], ["res://sprites/ceres/pamela/face.png"], ["res://sprites/ceres/lety/face.png"], ["res://sprites/common/natasha/face.png"]] @@ -24,7 +24,7 @@ var cstats = [[800, 200, 52, 12, 136, 25, 800], [1094, 200, 54, 7, 106, 48, 600] var dstats = [[800, 200, 52, 12, 136, 25, 800], [1094, 200, 54, 7, 106, 48, 600], [null], [1143, 200, 59, 5, 117, 18, 650], [null], [null], [null], [null], [null], [1026, 200, 87, 7, 105, 49, 115]] var mstats = [[null, null, null, null, null, null, null], [null, null, null, null, null, null, null], [null, null, null, null, null, null, null], [null, null, null, null, null, null, null], [null, null, null, null, null, null, null], [null, null, null, null, null, null, null], [null, null, null, null, null, null, null], [null, null, null, null, null, null, null], [null, null, null, null, null, null, null], [null, null, null, null, null, null, null]] var cdialog = [] -const places = [[[["res://levels/Ceres/map.tscn", 5, false], [null, null, false]], [["res://levels/Testrooms/bullethell.tscn", 11, true], ["res://levels/Testrooms/lilytest.tscn", 6, false]], [["res://levels/Testrooms/dialogtest.tscn", 19, false], ["res://levels/Testrooms/testspawn.tscn", 2 ,false]]], [null, [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, ["res://levels/Ceres/troublemakers.tscn", 6, true]], null, null, null, null, null, null, [null, null, null, null, null, null, null, null, null, null, null, ["res://levels/Ceres/honkerrailway.tscn", 19, false]], null, null, [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, ["res://levels/Ceres/L20.tscn", 3, true]]]] +const places = [[[["res://levels/Ceres/map.tscn", 5, false], [null, null, false]], [["res://levels/Testrooms/bullethell.tscn", 11, true], ["res://levels/Testrooms/lilytest.tscn", 6, false]], [["res://levels/Testrooms/dialogtest.tscn", 19, false], ["res://levels/Testrooms/testspawn.tscn", 2 ,false]]], [null, [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, ["res://levels/Ceres/troublemakers.tscn", 6, true]], [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, ["res://levels/Ceres/troublemakersp2.tscn", 6, true]], null, null, null, null, null, [null, null, null, null, null, null, null, null, null, null, null, ["res://levels/Ceres/honkerrailway.tscn", 19, false]], null, null, [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, ["res://levels/Ceres/L20.tscn", 3, true]]]] var cplace = [0,2,1] var dplace = [null, null, null] const pbbullets = ["res://sprites/common/bullet/fireball.tscn", "res://sprites/common/bullet/aero.tscn", null, "res://sprites/common/bullet/arrow.tscn", null, null, null, null, null, "res://sprites/common/bullet/snowflake.tscn"] @@ -49,7 +49,7 @@ var owlocation = [[null, null], [null, null]] const musictracks = ["res://music/midorinoyume.ogg", "res://music/seahorse.ogg", "res://music/chinesegoat.ogg", "res://music/doyoufeelold.ogg", "res://music/doyiuneedahealer.ogg", "res://music/adayatceres.ogg", "res://music/twintroublemakers.ogg", "res://music/easyquiz.ogg", "res://music/neowave.ogg", "res://music/multivectorsubmarines.ogg", "res://music/halfgeniegirls.ogg", "res://music/rusianmaverickfairy.ogg", "res://music/blacksmithofdestruction.ogg", "res://music/shininglikefireworks.ogg", "res://music/sadtrashcan.ogg", "res://music/akikonotegami.ogg", "res://music/asadcat.ogg", "res://music/lilydesire.ogg", "res://music/scholartrip.ogg", "res://music/quantumice.ogg", "res://music/unreeeal.ogg", "res://music/alsa.ogg", "res://music/silverblue.ogg"] const sfxtracks = ["res://sfx/braindamage.wav", "res://sfx/gaugefill.wav", "res://sfx/boomboombakudan.wav"] var debug = false -const release = "R0.3.0-dev" +const release = "R0.3.1-beta" var sk = false var gamepad = 0 var quest = [0, 0, 0, 0, 0, 0] diff --git a/levels/Ceres/map.gd b/levels/Ceres/map.gd index 4efa9da..41058d5 100644 --- a/levels/Ceres/map.gd +++ b/levels/Ceres/map.gd @@ -23,7 +23,7 @@ func _process(delta): pass func _input(event): - if Input.is_action_just_pressed("ui_accept") && travel != null: + if Input.is_action_just_pressed("ui_accept") && travel != null && Global.live == 1: if Global.ccutscene == null: if Global.debug: Global.dplace = travel diff --git a/levels/Ceres/troublemakers.gd b/levels/Ceres/troublemakers.gd index 4c6574c..e85a74f 100644 --- a/levels/Ceres/troublemakers.gd +++ b/levels/Ceres/troublemakers.gd @@ -28,11 +28,9 @@ func _input(event): func _winner(): Global.result[0] = 1 - Global.quest[2] = 3 Global.cdialog = [[tr("DIALOG_TROUBLEMAKER_3"), true, 0, 0], [tr("DIALOG_TROUBLEMAKER_4"), true, 7, 0], [tr("DIALOG_TROUBLEMAKER_5"), true, 0, 0]] Global.live = 3 - #Global.ccutscene = 6 - Global.ccutscene = null + Global.ccutscene = 16 #talk.queue_free() talk = load("res://levels/ui/talk.tscn").instance() call_deferred("_talk") diff --git a/levels/Ceres/troublemakersp2.gd b/levels/Ceres/troublemakersp2.gd new file mode 100644 index 0000000..eb11488 --- /dev/null +++ b/levels/Ceres/troublemakersp2.gd @@ -0,0 +1,54 @@ +extends Node2D +var talk = load("res://levels/ui/talk.tscn").instance() +var boss +var player +# Called when the node enters the scene tree for the first time. +func _ready(): + boss = $Lety + player = $Player + boss.add_to_group("boss") + Global.cdialog = [[tr("DIALOG_TROUBLEMAKER_6"), true, 0, 0], ["...", true, 8, 0], ["...", true, 0, 0]] + Global.live = 0 + call_deferred("_talk") + + +# Called every frame. 'delta' is the elapsed time since the previous frame. +func _process(delta): + pass + +func _physics_process(delta): + pass + +func _input(event): + if Global.cboss[1] <= 0 && Global.live == 1: + _winner() + if Global.cdialog.size() != 0 && Global.live == 1: + get_tree().root.remove_child(talk) + Global.cdialog = [] + +func _winner(): + Global.result[0] = 1 + Global.quest[2] = 3 + Global.quest[3] = 1 + Global.cdialog = [[tr("DIALOG_TROUBLEMAKER_7"), true, 0, 0], ["...", true, 8, 0], ["...", true, 0, 0]] + Global.live = 3 + #Global.ccutscene = 6 + Global.ccutscene = null + #talk.queue_free() + talk = load("res://levels/ui/talk.tscn").instance() + call_deferred("_talk") + +func _statrebase(): + if Global.debug: + for i in 4: + if Global.dparty[i][0] != null: + for j in 7: + Global.mstats[Global.dparty[i][0]][j] = Global.basestats[Global.dparty[i][0]][j] * Global.dlevel[Global.dparty[i][0]] + else: + for i in 4: + if Global.party[i][0] != null: + for j in 7: + Global.mstats[Global.party[i][0]][j] = Global.basestats[Global.party[i][0]][j] * Global.level[Global.dparty[i][0]] + +func _talk(): + get_tree().root.add_child(talk) diff --git a/levels/Ceres/troublemakersp2.tscn b/levels/Ceres/troublemakersp2.tscn new file mode 100644 index 0000000..1c1e6c0 --- /dev/null +++ b/levels/Ceres/troublemakersp2.tscn @@ -0,0 +1,49 @@ +[gd_scene load_steps=6 format=2] + +[ext_resource path="res://levels/Ceres/troublemakersp2.gd" type="Script" id=1] +[ext_resource path="res://sprites/ceres/lety/lety.tscn" type="PackedScene" id=2] +[ext_resource path="res://sprites/common/player/player.tscn" type="PackedScene" id=3] + +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 18.5, 446.5 ) + +[sub_resource type="RectangleShape2D" id=2] +extents = Vector2( 676, 20.5 ) + +[node name="Troublemakers Part 2" type="Node2D"] +script = ExtResource( 1 ) + +[node name="ColorRect" type="ColorRect" parent="."] +margin_right = 1280.0 +margin_bottom = 720.0 +color = Color( 0, 0.619608, 0.270588, 1 ) + +[node name="StaticBody2D" type="StaticBody2D" parent="."] + +[node name="CollisionShape2D" type="CollisionShape2D" parent="StaticBody2D"] +position = Vector2( -18, 373.5 ) +shape = SubResource( 1 ) + +[node name="StaticBody2D2" type="StaticBody2D" parent="."] + +[node name="CollisionShape2D" type="CollisionShape2D" parent="StaticBody2D2"] +position = Vector2( 1299, 376 ) +shape = SubResource( 1 ) + +[node name="StaticBody2D3" type="StaticBody2D" parent="."] + +[node name="CollisionShape2D" type="CollisionShape2D" parent="StaticBody2D3"] +position = Vector2( 641, -21 ) +shape = SubResource( 2 ) + +[node name="StaticBody2D4" type="StaticBody2D" parent="."] + +[node name="CollisionShape2D" type="CollisionShape2D" parent="StaticBody2D4"] +position = Vector2( 640, 741 ) +shape = SubResource( 2 ) + +[node name="Lety" parent="." instance=ExtResource( 2 )] +position = Vector2( 644, 133 ) + +[node name="Player" parent="." instance=ExtResource( 3 )] +position = Vector2( 635, 586 ) diff --git a/levels/Cutscenes/Troublemakerp2/Fall.tscn b/levels/Cutscenes/Troublemakerp2/Fall.tscn new file mode 100644 index 0000000..585f2f2 --- /dev/null +++ b/levels/Cutscenes/Troublemakerp2/Fall.tscn @@ -0,0 +1,24 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://backgounds/Lety Hashimoto split.jpg" type="Texture" id=1] +[ext_resource path="res://fonts/start.tres" type="DynamicFont" id=2] +[ext_resource path="res://levels/bottomhud.tscn" type="PackedScene" id=3] + +[node name="Pamela" type="Node2D"] + +[node name="TextureRect" type="TextureRect" parent="."] +margin_right = 40.0 +margin_bottom = 40.0 +texture = ExtResource( 1 ) + +[node name="Label" type="Label" parent="."] +margin_left = 16.0 +margin_top = 598.0 +margin_right = 1263.0 +margin_bottom = 703.0 +custom_colors/font_color = Color( 0, 0, 0, 1 ) +custom_fonts/font = ExtResource( 2 ) +text = "CUTSCENE_4_1" +align = 1 + +[node name="Bottomhud" parent="." instance=ExtResource( 3 )] diff --git a/levels/Cutscenes/Troublemakerp2/Lety.tscn b/levels/Cutscenes/Troublemakerp2/Lety.tscn new file mode 100644 index 0000000..b4f7bad --- /dev/null +++ b/levels/Cutscenes/Troublemakerp2/Lety.tscn @@ -0,0 +1,23 @@ +[gd_scene load_steps=4 format=2] + +[ext_resource path="res://backgounds/Lety Hashimoto clasista.jpg" type="Texture" id=1] +[ext_resource path="res://fonts/start.tres" type="DynamicFont" id=2] +[ext_resource path="res://levels/bottomhud.tscn" type="PackedScene" id=3] + +[node name="Buildings" type="Node2D"] + +[node name="TextureRect" type="TextureRect" parent="."] +margin_right = 40.0 +margin_bottom = 40.0 +texture = ExtResource( 1 ) + +[node name="Label" type="Label" parent="."] +margin_left = 16.0 +margin_top = 598.0 +margin_right = 1263.0 +margin_bottom = 703.0 +custom_fonts/font = ExtResource( 2 ) +text = "CUTSCENE_4_0" +align = 1 + +[node name="Bottomhud" parent="." instance=ExtResource( 3 )] diff --git a/levels/Cutscenes/Troublemakerp2/midori.gd b/levels/Cutscenes/Troublemakerp2/midori.gd new file mode 100644 index 0000000..4743ff4 --- /dev/null +++ b/levels/Cutscenes/Troublemakerp2/midori.gd @@ -0,0 +1,12 @@ +extends Node2D + + +# Called when the node enters the scene tree for the first time. +func _ready() -> void: + if !Global.debug: + Global.cplace = [1, 2, 17] + + +# Called every frame. 'delta' is the elapsed time since the previous frame. +func _process(delta: float) -> void: + pass diff --git a/levels/Cutscenes/Troublemakerp2/midori.tscn b/levels/Cutscenes/Troublemakerp2/midori.tscn new file mode 100644 index 0000000..504fa84 --- /dev/null +++ b/levels/Cutscenes/Troublemakerp2/midori.tscn @@ -0,0 +1,26 @@ +[gd_scene load_steps=5 format=2] + +[ext_resource path="res://backgounds/Midori Asgardius split.jpg" type="Texture" id=1] +[ext_resource path="res://levels/bottomhud.tscn" type="PackedScene" id=2] +[ext_resource path="res://fonts/start.tres" type="DynamicFont" id=3] +[ext_resource path="res://levels/Cutscenes/Troublemakerp2/midori.gd" type="Script" id=4] + +[node name="Midori" type="Node2D"] +script = ExtResource( 4 ) + +[node name="TextureRect" type="TextureRect" parent="."] +margin_right = 40.0 +margin_bottom = 40.0 +texture = ExtResource( 1 ) + +[node name="Label" type="Label" parent="."] +margin_left = 16.0 +margin_top = 598.0 +margin_right = 1263.0 +margin_bottom = 703.0 +custom_colors/font_color = Color( 0, 0, 0, 1 ) +custom_fonts/font = ExtResource( 3 ) +text = "CUTSCENE_4_2" +align = 1 + +[node name="Bottomhud" parent="." instance=ExtResource( 2 )] diff --git a/levels/ui/Cutscenes.gd b/levels/ui/Cutscenes.gd index f3db030..d6bc943 100644 --- a/levels/ui/Cutscenes.gd +++ b/levels/ui/Cutscenes.gd @@ -57,7 +57,7 @@ func _input(event): get_tree().change_scene("res://levels/ui/scene.tscn") else: get_tree().change_scene("res://title.tscn") - if Input.is_action_just_pressed("ui_accept"): + if Input.is_action_just_pressed("ui_accept") || Input.is_action_just_pressed("mclick"): if Global.cutscenes[Global.ccutscene][3]: var ccutscene = Global.ccutscene Global.ccutscene = null diff --git a/levels/ui/ceres.gd b/levels/ui/ceres.gd index f58f05e..9d1f8be 100644 --- a/levels/ui/ceres.gd +++ b/levels/ui/ceres.gd @@ -70,3 +70,9 @@ func _on_bullethell_pressed() -> void: Global.dplace = [1, 1, 17] Global.live = 1 get_tree().change_scene("res://levels/ui/gameplay.tscn") + + +func _on_Credits_pressed(): + Global.dplace = [1, 2, 17] + Global.live = 1 + get_tree().change_scene("res://levels/ui/gameplay.tscn") diff --git a/levels/ui/ceres.tscn b/levels/ui/ceres.tscn index 4579d77..cdfa556 100644 --- a/levels/ui/ceres.tscn +++ b/levels/ui/ceres.tscn @@ -78,7 +78,7 @@ margin_right = 1017.0 margin_bottom = 286.0 custom_fonts/font = ExtResource( 2 ) custom_styles/focus = SubResource( 4 ) -text = "BUTTON_PLACEHOLDER" +text = "TWIN_TROUBLEMAKERS_P2" [node name="WIP" type="Button" parent="VBoxContainer"] margin_top = 290.0 @@ -100,4 +100,5 @@ text = "BUTTON_RETURN" [connection signal="pressed" from="VBoxContainer/Lilytest" to="." method="_on_lilytest_pressed"] [connection signal="pressed" from="VBoxContainer/Dialogtest" to="." method="_on_dialogtest_pressed"] [connection signal="pressed" from="VBoxContainer/Bullethell" to="." method="_on_bullethell_pressed"] +[connection signal="pressed" from="VBoxContainer/Credits" to="." method="_on_Credits_pressed"] [connection signal="pressed" from="VBoxContainer/Back" to="." method="_on_back_pressed"] diff --git a/levels/ui/cscene.gd b/levels/ui/cscene.gd index b60514e..079e368 100644 --- a/levels/ui/cscene.gd +++ b/levels/ui/cscene.gd @@ -79,3 +79,8 @@ func _on_ceres_pressed(): #get_tree().change_scene("res://levels/ui/ceres.tscn") Global.ccutscene = 10 get_tree().change_scene("res://levels/ui/Cutscenes.tscn") + + +func _on_Credits_pressed(): + Global.ccutscene = 16 + get_tree().change_scene("res://levels/ui/Cutscenes.tscn") diff --git a/levels/ui/cscene.tscn b/levels/ui/cscene.tscn index 7ec9f35..e2da4d1 100644 --- a/levels/ui/cscene.tscn +++ b/levels/ui/cscene.tscn @@ -75,7 +75,7 @@ margin_right = 1017.0 margin_bottom = 286.0 custom_fonts/font = ExtResource( 2 ) custom_styles/focus = SubResource( 1 ) -text = "BUTTON_PLACEHOLDER" +text = "TWIN_TROUBLEMAKERS_P2" [node name="WIP" type="Button" parent="VBoxContainer"] margin_top = 290.0 @@ -105,7 +105,7 @@ text = "BUTTON_RETURN" [connection signal="pressed" from="VBoxContainer/Testrooms" to="." method="_on_testrooms_pressed"] [connection signal="pressed" from="VBoxContainer/Ceres" to="." method="_on_ceres_pressed"] [connection signal="pressed" from="VBoxContainer/Results" to="." method="_on_results_pressed"] -[connection signal="pressed" from="VBoxContainer/Credits" to="." method="_on_credits_pressed"] +[connection signal="pressed" from="VBoxContainer/Credits" to="." method="_on_Credits_pressed"] [connection signal="pressed" from="VBoxContainer/WIP" to="." method="_on_wip_pressed"] [connection signal="pressed" from="VBoxContainer/Cutscene" to="." method="_on_cutscene_pressed"] [connection signal="pressed" from="VBoxContainer/Back" to="." method="_on_back_pressed"] diff --git a/levels/ui/gameplay.gd b/levels/ui/gameplay.gd index fe53cfa..c85c19a 100644 --- a/levels/ui/gameplay.gd +++ b/levels/ui/gameplay.gd @@ -21,7 +21,7 @@ func _ready(): if Global.difdamage != 0: print("Script Kiddie") Global.difdamage = Global.dparty/0 - elif Global.dificulty == 2: + elif Global.dificulty == 2 || Global.dificulty == 0: if Global.difdamage == 0 || Global.difdamage == 1: Global.difdamage = 1 else: @@ -81,6 +81,14 @@ func _ready(): # Called every frame. 'delta' is the elapsed time since the previous frame. func _process(delta): + if Global.live != 1 && ishud: + get_tree().root.remove_child(thud) + get_tree().root.remove_child(tcontrol) + ishud = false + elif Global.live == 1 && !ishud: + call_deferred("_thud") + call_deferred("_tcontrol") + ishud = true if Global.isresume: Global.isresume = false _pausemenu() @@ -96,7 +104,7 @@ func _input(event): Global.live = 1 gamepadtest.new(event) - if Input.is_action_just_pressed("Pause") && Global.live == 1: + if Input.is_action_just_pressed("Pause") && (Global.live == 1 || Global.live == 4): _pausemenu() #Global.exitgame = true if Global.live == 1 && Input.is_action_pressed("schar") && Input.is_action_just_pressed("ui_up"): @@ -132,14 +140,6 @@ func _input(event): sfx1.stream = load(Global.sfxtracks[1]) sfx1.play(0) bgsound.play(0) - if Global.live != 1 && ishud: - get_tree().root.remove_child(thud) - get_tree().root.remove_child(tcontrol) - ishud = false - elif Global.live == 1 && !ishud: - call_deferred("_thud") - call_deferred("_tcontrol") - ishud = true func _statrebase(): if Global.debug: for i in 4: diff --git a/levels/ui/talk.gd b/levels/ui/talk.gd index 7f15000..bc47fe6 100644 --- a/levels/ui/talk.gd +++ b/levels/ui/talk.gd @@ -24,9 +24,9 @@ func _process(delta): pass func _input(event): - if Input.is_action_just_pressed("ui_accept") && !press: + if (Input.is_action_just_pressed("ui_accept") || Input.is_action_just_pressed("mclick")) && !press: press = true - if Input.is_action_just_released("ui_accept") && press: + if (Input.is_action_just_released("ui_accept") || Input.is_action_just_released("mclick")) && press: dindex += 1 if dindex < Global.cdialog.size(): if Global.cdialog[dindex][1]: diff --git a/levels/ui/touchcontrols.gd b/levels/ui/touchcontrols.gd index b60fc09..3e30a76 100644 --- a/levels/ui/touchcontrols.gd +++ b/levels/ui/touchcontrols.gd @@ -62,3 +62,27 @@ func _on_Select_pressed(): func _on_Select_released(): Input.action_release("Pause") + + +func _on_R2_pressed(): + Input.action_press("run") + + +func _on_R2_released(): + Input.action_release("run") + + +func _on_R1_pressed(): + Input.action_press("schar") + + +func _on_R1_released(): + Input.action_release("schar") + + +func _on_B_pressed(): + Input.action_press("ui_accept") + + +func _on_B_released(): + Input.action_release("ui_accept") diff --git a/levels/ui/touchcontrols.tscn b/levels/ui/touchcontrols.tscn index aae3d4e..496a4b2 100644 --- a/levels/ui/touchcontrols.tscn +++ b/levels/ui/touchcontrols.tscn @@ -11,14 +11,8 @@ [ext_resource path="res://sprites/buttons/RT.png" type="Texture" id=9] [ext_resource path="res://sprites/buttons/Select.png" type="Texture" id=10] [ext_resource path="res://sprites/buttons/Start.png" type="Texture" id=11] - -[sub_resource type="Gradient" id=3] -offsets = PoolRealArray( 0.583333, 1 ) -colors = PoolColorArray( 1, 1, 1, 1, 1, 1, 1, 1 ) - -[sub_resource type="GradientTexture" id=4] -gradient = SubResource( 3 ) -width = 32 +[ext_resource path="res://sprites/buttons/varrow.png" type="Texture" id=12] +[ext_resource path="res://sprites/buttons/harrow.png" type="Texture" id=13] [node name="Touchcontrols" type="Node2D"] script = ExtResource( 1 ) @@ -54,28 +48,24 @@ position = Vector2( 20, 372 ) normal = ExtResource( 6 ) [node name="L2" type="TouchScreenButton" parent="CanvasLayer"] -position = Vector2( 155, 372 ) +position = Vector2( 157, 334 ) normal = ExtResource( 5 ) [node name="Up" type="TouchScreenButton" parent="CanvasLayer"] -position = Vector2( 139, 475 ) -scale = Vector2( 2, 55 ) -normal = SubResource( 4 ) +position = Vector2( 116, 438 ) +normal = ExtResource( 12 ) [node name="Down" type="TouchScreenButton" parent="CanvasLayer"] -position = Vector2( 139, 585 ) -scale = Vector2( 2, 55 ) -normal = SubResource( 4 ) +position = Vector2( 116, 582 ) +normal = ExtResource( 12 ) [node name="Left" type="TouchScreenButton" parent="CanvasLayer"] -position = Vector2( 75, 530 ) -scale = Vector2( 2, 54.9999 ) -normal = SubResource( 4 ) +position = Vector2( 20, 534 ) +normal = ExtResource( 13 ) [node name="Right" type="TouchScreenButton" parent="CanvasLayer"] -position = Vector2( 203, 530 ) -scale = Vector2( 2, 54.9999 ) -normal = SubResource( 4 ) +position = Vector2( 164, 534 ) +normal = ExtResource( 13 ) [node name="Select" type="TouchScreenButton" parent="CanvasLayer"] position = Vector2( 431, 526 ) @@ -85,8 +75,14 @@ normal = ExtResource( 10 ) position = Vector2( 743, 526 ) normal = ExtResource( 11 ) +[connection signal="pressed" from="CanvasLayer/B" to="." method="_on_B_pressed"] +[connection signal="released" from="CanvasLayer/B" to="." method="_on_B_released"] [connection signal="pressed" from="CanvasLayer/A" to="." method="_on_A_pressed"] [connection signal="released" from="CanvasLayer/A" to="." method="_on_A_released"] +[connection signal="pressed" from="CanvasLayer/R1" to="." method="_on_R1_pressed"] +[connection signal="released" from="CanvasLayer/R1" to="." method="_on_R1_released"] +[connection signal="pressed" from="CanvasLayer/R2" to="." method="_on_R2_pressed"] +[connection signal="released" from="CanvasLayer/R2" to="." method="_on_R2_released"] [connection signal="pressed" from="CanvasLayer/Up" to="." method="_on_Up_pressed"] [connection signal="released" from="CanvasLayer/Up" to="." method="_on_Up_released"] [connection signal="pressed" from="CanvasLayer/Down" to="." method="_on_Down_pressed"] diff --git a/sprites/buttons/A.png b/sprites/buttons/A.png index 09462d2..be1055c 100644 Binary files a/sprites/buttons/A.png and b/sprites/buttons/A.png differ diff --git a/sprites/buttons/B.png b/sprites/buttons/B.png index 5721c52..0cbbe9e 100644 Binary files a/sprites/buttons/B.png and b/sprites/buttons/B.png differ diff --git a/sprites/buttons/LB.png b/sprites/buttons/LB.png index 69e52d0..6fcb29c 100644 Binary files a/sprites/buttons/LB.png and b/sprites/buttons/LB.png differ diff --git a/sprites/buttons/LT.png b/sprites/buttons/LT.png index c7efdad..df3950b 100644 Binary files a/sprites/buttons/LT.png and b/sprites/buttons/LT.png differ diff --git a/sprites/buttons/RB.png b/sprites/buttons/RB.png index 44ac291..c9f1b48 100644 Binary files a/sprites/buttons/RB.png and b/sprites/buttons/RB.png differ diff --git a/sprites/buttons/RT.png b/sprites/buttons/RT.png index 69dc94f..5fffe66 100644 Binary files a/sprites/buttons/RT.png and b/sprites/buttons/RT.png differ diff --git a/sprites/buttons/Select.png b/sprites/buttons/Select.png index 4519dea..6bff461 100644 Binary files a/sprites/buttons/Select.png and b/sprites/buttons/Select.png differ diff --git a/sprites/buttons/Start.png b/sprites/buttons/Start.png index 3e91ef9..9c419ac 100644 Binary files a/sprites/buttons/Start.png and b/sprites/buttons/Start.png differ diff --git a/sprites/buttons/X.png b/sprites/buttons/X.png index 90a7b5f..52d7227 100644 Binary files a/sprites/buttons/X.png and b/sprites/buttons/X.png differ diff --git a/sprites/buttons/Y.png b/sprites/buttons/Y.png index 2244479..94be566 100644 Binary files a/sprites/buttons/Y.png and b/sprites/buttons/Y.png differ diff --git a/sprites/buttons/harrow.png b/sprites/buttons/harrow.png new file mode 100644 index 0000000..6f5459a Binary files /dev/null and b/sprites/buttons/harrow.png differ diff --git a/sprites/buttons/harrow.png.import b/sprites/buttons/harrow.png.import new file mode 100644 index 0000000..80f23c4 --- /dev/null +++ b/sprites/buttons/harrow.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/harrow.png-cff9bb5d307937598b2441c7b05658fc.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/buttons/harrow.png" +dest_files=[ "res://.import/harrow.png-cff9bb5d307937598b2441c7b05658fc.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=true +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/sprites/buttons/varrow.png b/sprites/buttons/varrow.png new file mode 100644 index 0000000..89f4a0d Binary files /dev/null and b/sprites/buttons/varrow.png differ diff --git a/sprites/buttons/varrow.png.import b/sprites/buttons/varrow.png.import new file mode 100644 index 0000000..31a318d --- /dev/null +++ b/sprites/buttons/varrow.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/varrow.png-85023a14abb22a04095d6b65c81ec838.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://sprites/buttons/varrow.png" +dest_files=[ "res://.import/varrow.png-85023a14abb22a04095d6b65c81ec838.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=true +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/sprites/ceres/lety/lety.gd b/sprites/ceres/lety/lety.gd new file mode 100644 index 0000000..08bc3b3 --- /dev/null +++ b/sprites/ceres/lety/lety.gd @@ -0,0 +1,116 @@ +extends KinematicBody2D + +var theta: float = 0.0 +export(float,6.2831853) var alpha: float = 1.5 +var bullet = load("res://sprites/common/bullet/fireball.tscn") + + + +const SPEED = 300.0 +const fspeed = 100.0 + +const JUMP_VELOCITY = -400.0 +var vangle = 2 +var weakness = 1 + + + + + + + + + + + +var movex = 0 +var movey = 0 +var attack = 59 +var crit = 5 +var velocity = Vector2(0,0) + + +func _ready(): + if Global.isboss: + Global.cboss = ["Pamela Hashimoto",800,800] + var stimer = $Speed + stimer.start(0.05) + +func get_vector(angle): + theta = angle + alpha + return Vector2(cos(theta),sin(theta)) + +# Get the gravity from the project settings to be synced with RigidBody nodes. +var gravity = ProjectSettings.get_setting("physics/2d/default_gravity") + +onready var anim := $AnimationPlayer + +func _physics_process(delta): + if Global.live == 1: + if Global.playerx < position.x && (position.x - Global.playerx) > 200: + movex = -1 + elif Global.playerx > position.x && (Global.playerx - position.x) > 200: + movex = 1 + else: + movex = 0 + if Global.playery < position.y && (position.y - Global.playery) > 200: + movey = -1 + elif Global.playery > position.y && (Global.playery - position.y) > 200: + movey = 1 + else: + movey = 0 + else: + movex = 0 + movey = 0 + velocity.x = movex * fspeed * delta + velocity.y = movey * fspeed * delta + # Add the gravity. + #var velocity = Vector2.ZERO + #if Global.live == 1: + #velocity = (Vector2.RIGHT.rotated(rotation) * 500 * Global.xm * delta)-Vector2.UP.rotated(rotation) * 500 * Global.ym * delta + #origmpos = get_viewport().get_mouse_position() + #if Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) != 0: + # velocity = Vector2.UP.rotated(rotation) * -400 * Input.get_joy_axis(0,JOY_AXIS_LEFT_Y) + #position += velocity + position += velocity + if velocity.y > 0.3: + vangle = 2 + elif velocity.y < -0.3: + vangle = 0 + elif velocity.x > 0.3: + vangle = 1 + elif velocity.x < -0.3: + vangle = 3 + if velocity.y != 0 || velocity.x != 0: + if vangle == 0: + anim.play("nwalk") + elif vangle == 1: + anim.play("ewalk") + elif vangle == 3: + anim.play("wwalk") + else: + anim.play("swalk") + else: + if vangle == 0: + anim.play("nidle") + elif vangle == 1: + anim.play("eidle") + elif vangle == 3: + anim.play("widle") + else: + anim.play("sidle") + #move_and_slide() +func shoot(angle): + var new_bullet = bullet.instance() + new_bullet.position = Vector2(position.x, position.y) + new_bullet.direction = get_vector(angle) + new_bullet.btype = "boss" + new_bullet.attack = attack + new_bullet.crit = crit + new_bullet.speciality = 3 + get_parent().call_deferred("add_child",new_bullet) + + +func _on_speed_timeout(): + if Global.live == 1: + shoot(theta) diff --git a/sprites/ceres/lety/lety.tscn b/sprites/ceres/lety/lety.tscn new file mode 100644 index 0000000..c8c8438 --- /dev/null +++ b/sprites/ceres/lety/lety.tscn @@ -0,0 +1,183 @@ +[gd_scene load_steps=13 format=2] + +[ext_resource path="res://sprites/ceres/lety/sprite.png" type="Texture" id=1] +[ext_resource path="res://sprites/ceres/lety/lety.gd" type="Script" id=2] + +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 45, 128 ) + +[sub_resource type="Animation" id=2] +length = 0.001 +tracks/0/type = "value" +tracks/0/path = NodePath("Sprite:frame") +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": 1, +"values": [ 0 ] +} + +[sub_resource type="Animation" id=3] +resource_name = "eidle" +loop = true +tracks/0/type = "value" +tracks/0/path = NodePath("Sprite:frame") +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": 1, +"values": [ 8 ] +} + +[sub_resource type="Animation" id=4] +resource_name = "ewalk" +length = 0.3 +loop = true +step = 0.033 +tracks/0/type = "value" +tracks/0/path = NodePath("Sprite:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 0.099, 0.198 ), +"transitions": PoolRealArray( 1, 1, 1 ), +"update": 1, +"values": [ 9, 8, 10 ] +} + +[sub_resource type="Animation" id=5] +resource_name = "nidle" +loop = true +tracks/0/type = "value" +tracks/0/path = NodePath("Sprite:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0.1 ), +"transitions": PoolRealArray( 1 ), +"update": 1, +"values": [ 4 ] +} + +[sub_resource type="Animation" id=6] +resource_name = "nwalk" +length = 0.3 +loop = true +tracks/0/type = "value" +tracks/0/path = NodePath("Sprite:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 0.1, 0.2 ), +"transitions": PoolRealArray( 1, 1, 1 ), +"update": 1, +"values": [ 5, 4, 6 ] +} + +[sub_resource type="Animation" id=7] +resource_name = "sidle" +loop = true +tracks/0/type = "value" +tracks/0/path = NodePath("Sprite:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0.5 ), +"transitions": PoolRealArray( 1 ), +"update": 1, +"values": [ 0 ] +} + +[sub_resource type="Animation" id=8] +resource_name = "swalk" +length = 0.3 +loop = true +tracks/0/type = "value" +tracks/0/path = NodePath("Sprite:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 0.1, 0.2 ), +"transitions": PoolRealArray( 1, 1, 1 ), +"update": 1, +"values": [ 1, 0, 2 ] +} + +[sub_resource type="Animation" id=9] +resource_name = "widle" +length = 0.3 +loop = true +tracks/0/type = "value" +tracks/0/path = NodePath("Sprite:frame") +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": 1, +"values": [ 12 ] +} + +[sub_resource type="Animation" id=10] +resource_name = "wwalk" +length = 0.3 +loop = true +tracks/0/type = "value" +tracks/0/path = NodePath("Sprite:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 0.1, 0.2 ), +"transitions": PoolRealArray( 1, 1, 1 ), +"update": 1, +"values": [ 13, 12, 14 ] +} + +[node name="Lety" type="KinematicBody2D"] +script = ExtResource( 2 ) + +[node name="Sprite" type="Sprite" parent="."] +texture = ExtResource( 1 ) +hframes = 4 +vframes = 4 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +shape = SubResource( 1 ) + +[node name="AnimationPlayer" type="AnimationPlayer" parent="."] +anims/RESET = SubResource( 2 ) +anims/eidle = SubResource( 3 ) +anims/ewalk = SubResource( 4 ) +anims/nidle = SubResource( 5 ) +anims/nwalk = SubResource( 6 ) +anims/sidle = SubResource( 7 ) +anims/swalk = SubResource( 8 ) +anims/widle = SubResource( 9 ) +anims/wwalk = SubResource( 10 ) + +[node name="Speed" type="Timer" parent="."] +wait_time = 0.1 + +[connection signal="timeout" from="Speed" to="." method="_on_speed_timeout"] diff --git a/sprites/ceres/lety/sprite.png b/sprites/ceres/lety/sprite.png index 07c8081..a8b6389 100644 Binary files a/sprites/ceres/lety/sprite.png and b/sprites/ceres/lety/sprite.png differ diff --git a/text.csv b/text.csv index d0a3a1f..4aee615 100644 --- a/text.csv +++ b/text.csv @@ -127,10 +127,13 @@ DIALOG_TROUBLEMAKER_2;I am not a terrorist;No soy una terrorista;私はテロリ DIALOG_TROUBLEMAKER_3;This is an Easy Quiz;Esto fue un examen fácil;これは簡単な試験でした DIALOG_TROUBLEMAKER_4;What hapened to my house?;¿Que le ocurrió a mi casa?;私の家に何が起こったのでしょうか? DIALOG_TROUBLEMAKER_5;Which house?;¿Cual casa?;どの家ですか? +DIALOG_TROUBLEMAKER_6;Are you OK?;¿Estás bien?;大丈夫ですか? +DIALOG_TROUBLEMAKER_7;It seems so;Eso parece;そうみたいです DIALOG_HKR_0;I hear a heartbeat coming from inside this trash can;Escucho un latido que proviene del interior de este \ncubo de basura;このゴミ箱の中から鼓動が聞こえる DIALOG_HKR_1;Don't underestimate the emotions of a trash can;No subestimes las emociones de un cubo de basura;ゴミ箱の感情を過小評価しないでください CERES_L20_DESC;Kimberly’s Challenge;Reto de Kimberly;キンバリーの挑戦 TWIN_TROUBLEMAKERS;Twin Troublemakers;Gemelas problématicas;双子のトラブルメーカー +TWIN_TROUBLEMAKERS_P2;Twin Troublemakers Part 2;Gemelas problématicas Parte 2;双子のトラブルメーカー パート2 MENU_CHARACTER;Character List;Lista de Personajes;キャラクター一覧 MENU_TEAM;Team List;Lista de Equipos;チーム MENU_MAP;World Map;Mapa Mundial;世界地図 @@ -157,3 +160,6 @@ CUTSCENE_2_2;Behind her I found a crashed railroad known as\nthe Honker Railway; CUTSCENE_3_0;I arrived a little late to school because I didn't know how to\nget there;Llegué un poco tarde a la escuela debido a que no sabía cómo\nllegar;学校への行き方がわからなかったので、学校に少し遅れました CUTSCENE_3_1;A girl was sitting cross-legged on the roof of a building;Una niña estaba sentada con las piernas cruzadas encima de\nla azotea de un edificio;女の子がビルの屋上で足を組んで座っていた CUTSCENE_3_2;She stole a candy that I was carrying in my hand using\nher Kung Fu powers, I don't know what she has against me;Ella me robó un dulce que llevaba en mi mano utilizando\nsus poderes de Kung Fu, no se que tendrá contra mi;彼女はカンフーの力を使って私が手に持っていたキャンディー\nを盗んだ、彼女が私に対して何をするか分からない +CUTSCENE_4_0;While Pamela and I were fighting,\nher sister was watching us from a rooftop;Mientras Pamela y yo estabamos peleando,\nsu hermana nos observaba desde una azotea;パメラと私が喧嘩している間、\n彼女の妹が屋上から私たちを見守っていました +CUTSCENE_4_1;Lety jumped from the roof and fell in a peculiar position;Lety saltó desde la azotea y cayó en una postura peculiar;レティは屋上から飛び降り、奇妙な位置に落ちた +CUTSCENE_4_2;She seemed to be challenging me,\nbut her facial expression worries me a little.;Al parecer me estaba retando,\npero su expresión facial me preocupa un poco;彼女は私に挑戦しているようだったが、\n彼女の表情が少し心配だった