diff --git a/Midori in the Magic School.sh b/Midori in the Magic School.sh new file mode 100755 index 0000000..38467da --- /dev/null +++ b/Midori in the Magic School.sh @@ -0,0 +1,4 @@ +#!/bin/sh +echo -ne '\033c\033]0;Midori in the Magic School\a' +base_path="$(dirname "$(realpath "$0")")" +"$base_path/Midori in the Magic School.x86_64" "$@" diff --git a/backgounds/wip.jpg b/backgounds/wip.jpg new file mode 100644 index 0000000..4779c96 Binary files /dev/null and b/backgounds/wip.jpg differ diff --git a/backgounds/wip.jpg.import b/backgounds/wip.jpg.import new file mode 100644 index 0000000..418250e --- /dev/null +++ b/backgounds/wip.jpg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://kxvipok4tnuw" +path="res://.godot/imported/wip.jpg-8bbcf0b02a4682c61d05a220685ee80d.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://backgounds/wip.jpg" +dest_files=["res://.godot/imported/wip.jpg-8bbcf0b02a4682c61d05a220685ee80d.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/global.gd b/global.gd index 53c0eda..ca12cc0 100644 --- a/global.gd +++ b/global.gd @@ -10,7 +10,7 @@ var hiscoresfile = "user://hiscores.save" var gamelevel var levelmax var firstrun -var musictracks = ["res://music/reloaded.wav", "res://music/Jellies.wav", "res://music/getabrain.wav", "res://music/oskars.wav", "res://music/extralife.wav", "res://music/layers.wav", "res://music/caramel.wav", "res://music/XsEdzesSs.wav", "res://music/shakeshark.wav", "res://music/zubmarine.wav", "res://music/crammin.wav", "res://music/func.wav", "res://music/kaveh.wav", "res://music/rock.wav", "res://music/milkyway.wav", "res://music/sweetener.wav", "res://music/tooold.wav", "res://music/portello.wav"] +var musictracks = ["res://music/reloaded.wav", "res://music/Jellies.wav", "res://music/getabrain.wav", "res://music/oskars.wav", "res://music/extralife.wav", "res://music/layers.wav", "res://music/caramel.wav", "res://music/XsEdzesSs.wav", "res://music/shakeshark.wav", "res://music/zubmarine.wav", "res://music/crammin.wav", "res://music/func.wav", "res://music/kaveh.wav", "res://music/rock.wav", "res://music/milkyway.wav", "res://music/sweetener.wav", "res://music/tooold.wav", "res://music/portello.wav", "res://music/songbirds.wav", "res://music/Gotanda.wav", "res://music/unreeeal.wav"] var sfxtracks = [] var debug = false var release = "R0.0.0-dev" diff --git a/levels/musictest.gd b/levels/musictest.gd index 4e5eb3a..49e0495 100644 --- a/levels/musictest.gd +++ b/levels/musictest.gd @@ -106,8 +106,7 @@ func _on_radioactive_desert_pressed(): player.stream = load(Global.musictracks[10]) player.play(0) - -func _on_boss_fight_earth_pressed(): +func _on_natashas_theme_pressed(): player.stream = load(Global.musictracks[11]) player.play(0) @@ -140,3 +139,20 @@ func _on_credits_2_pressed(): func _on_credits_3_pressed(): player.stream = load(Global.musictracks[17]) player.play(0) + + + + +func _on_the_magic_school_pressed(): + player.stream = load(Global.musictracks[18]) + player.play(0) + + +func _on_deep_forest_pressed(): + player.stream = load(Global.musictracks[19]) + player.play(0) + + +func _on_boss_fight_earth_pressed(): + player.stream = load(Global.musictracks[20]) + player.play(0) diff --git a/levels/musictest.tscn b/levels/musictest.tscn index a703a86..018c7e7 100644 --- a/levels/musictest.tscn +++ b/levels/musictest.tscn @@ -74,7 +74,7 @@ layout_mode = 2 layout_mode = 2 theme_override_font_sizes/font_size = 25 theme_override_styles/focus = SubResource("StyleBoxFlat_cprm3") -text = "Title Screen: X-Force Theme" +text = "Title Screen" [node name="Disclaimer, Settings, Stores" type="Button" parent="BoxContainer/VBoxContainer"] layout_mode = 2 @@ -124,26 +124,26 @@ theme_override_font_sizes/font_size = 25 theme_override_styles/focus = SubResource("StyleBoxFlat_alctd") text = "Overworld (Earth)" -[node name="VBoxContainer2" type="VBoxContainer" parent="BoxContainer"] -layout_mode = 2 - -[node name="The Zubmarine Zone" type="Button" parent="BoxContainer/VBoxContainer2"] +[node name="The Zubmarine Zone" type="Button" parent="BoxContainer/VBoxContainer"] layout_mode = 2 theme_override_font_sizes/font_size = 25 theme_override_styles/focus = SubResource("StyleBoxFlat_alctd") text = "The Zubmarine Zone" -[node name="Radioactive Desert" type="Button" parent="BoxContainer/VBoxContainer2"] +[node name="Radioactive Desert" type="Button" parent="BoxContainer/VBoxContainer"] layout_mode = 2 theme_override_font_sizes/font_size = 25 theme_override_styles/focus = SubResource("StyleBoxFlat_alctd") text = "Radioactive Desert" -[node name="Boss Fight (Earth)" type="Button" parent="BoxContainer/VBoxContainer2"] +[node name="VBoxContainer2" type="VBoxContainer" parent="BoxContainer"] +layout_mode = 2 + +[node name="Natasha’s Theme" type="Button" parent="BoxContainer/VBoxContainer2"] layout_mode = 2 theme_override_font_sizes/font_size = 25 theme_override_styles/focus = SubResource("StyleBoxFlat_alctd") -text = "Boss Fight (Earth)" +text = "Natasha’s Theme" [node name="Dungeon of Destruction" type="Button" parent="BoxContainer/VBoxContainer2"] layout_mode = 2 @@ -181,6 +181,24 @@ theme_override_font_sizes/font_size = 25 theme_override_styles/focus = SubResource("StyleBoxFlat_alctd") text = "Credits 3" +[node name="The Magic School" type="Button" parent="BoxContainer/VBoxContainer2"] +layout_mode = 2 +theme_override_font_sizes/font_size = 25 +theme_override_styles/focus = SubResource("StyleBoxFlat_alctd") +text = "The Magic School" + +[node name="Deep Forest" type="Button" parent="BoxContainer/VBoxContainer2"] +layout_mode = 2 +theme_override_font_sizes/font_size = 25 +theme_override_styles/focus = SubResource("StyleBoxFlat_alctd") +text = "Deep Forest" + +[node name="Boss Fight (Earth)" type="Button" parent="BoxContainer/VBoxContainer2"] +layout_mode = 2 +theme_override_font_sizes/font_size = 25 +theme_override_styles/focus = SubResource("StyleBoxFlat_alctd") +text = "Boss Fight (Earth)" + [node name="Back" type="Button" parent="BoxContainer/VBoxContainer2"] layout_mode = 2 theme_override_font_sizes/font_size = 25 @@ -200,13 +218,16 @@ layout_mode = 1 [connection signal="pressed" from="BoxContainer/VBoxContainer/Boss fight (Ceres)" to="." method="_on_boss_fight_ceres_pressed"] [connection signal="pressed" from="BoxContainer/VBoxContainer/Result" to="." method="_on_result_pressed"] [connection signal="pressed" from="BoxContainer/VBoxContainer/Overworld (Earth)" to="." method="_on_overworld_earth_pressed"] -[connection signal="pressed" from="BoxContainer/VBoxContainer2/The Zubmarine Zone" to="." method="_on_the_zubmarine_zone_pressed"] -[connection signal="pressed" from="BoxContainer/VBoxContainer2/Radioactive Desert" to="." method="_on_radioactive_desert_pressed"] -[connection signal="pressed" from="BoxContainer/VBoxContainer2/Boss Fight (Earth)" to="." method="_on_boss_fight_earth_pressed"] +[connection signal="pressed" from="BoxContainer/VBoxContainer/The Zubmarine Zone" to="." method="_on_the_zubmarine_zone_pressed"] +[connection signal="pressed" from="BoxContainer/VBoxContainer/Radioactive Desert" to="." method="_on_radioactive_desert_pressed"] +[connection signal="pressed" from="BoxContainer/VBoxContainer2/Natasha’s Theme" to="." method="_on_natashas_theme_pressed"] [connection signal="pressed" from="BoxContainer/VBoxContainer2/Dungeon of Destruction" to="." method="_on_dungeon_of_destruction_pressed"] [connection signal="pressed" from="BoxContainer/VBoxContainer2/Final Boss Fight" to="." method="_on_final_boss_fight_pressed"] [connection signal="pressed" from="BoxContainer/VBoxContainer2/Ending Theme" to="." method="_on_ending_theme_pressed"] [connection signal="pressed" from="BoxContainer/VBoxContainer2/Credits 1" to="." method="_on_credits_1_pressed"] [connection signal="pressed" from="BoxContainer/VBoxContainer2/Credits 2" to="." method="_on_credits_2_pressed"] [connection signal="pressed" from="BoxContainer/VBoxContainer2/Credits 3" to="." method="_on_credits_3_pressed"] +[connection signal="pressed" from="BoxContainer/VBoxContainer2/The Magic School" to="." method="_on_the_magic_school_pressed"] +[connection signal="pressed" from="BoxContainer/VBoxContainer2/Deep Forest" to="." method="_on_deep_forest_pressed"] +[connection signal="pressed" from="BoxContainer/VBoxContainer2/Boss Fight (Earth)" to="." method="_on_boss_fight_earth_pressed"] [connection signal="pressed" from="BoxContainer/VBoxContainer2/Back" to="." method="_on_back_pressed"] diff --git a/music/Gotanda.wav b/music/Gotanda.wav new file mode 100644 index 0000000..cd570b3 Binary files /dev/null and b/music/Gotanda.wav differ diff --git a/music/Gotanda.wav.import b/music/Gotanda.wav.import new file mode 100644 index 0000000..0ee7492 --- /dev/null +++ b/music/Gotanda.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://cuvc7s4s80e0q" +path="res://.godot/imported/Gotanda.wav-9ef6718aa1352ebf24ac7407350ab283.sample" + +[deps] + +source_file="res://music/Gotanda.wav" +dest_files=["res://.godot/imported/Gotanda.wav-9ef6718aa1352ebf24ac7407350ab283.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/music/songbirds.wav b/music/songbirds.wav new file mode 100644 index 0000000..5b6be24 Binary files /dev/null and b/music/songbirds.wav differ diff --git a/music/songbirds.wav.import b/music/songbirds.wav.import new file mode 100644 index 0000000..035016b --- /dev/null +++ b/music/songbirds.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://bybb3yylajldm" +path="res://.godot/imported/songbirds.wav-2402e1d5321f34e2b712bc819898a849.sample" + +[deps] + +source_file="res://music/songbirds.wav" +dest_files=["res://.godot/imported/songbirds.wav-2402e1d5321f34e2b712bc819898a849.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/music/unreeeal.wav b/music/unreeeal.wav new file mode 100644 index 0000000..a945d54 Binary files /dev/null and b/music/unreeeal.wav differ diff --git a/music/unreeeal.wav.import b/music/unreeeal.wav.import new file mode 100644 index 0000000..9f19b6a --- /dev/null +++ b/music/unreeeal.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://bee27qsaseuvo" +path="res://.godot/imported/unreeeal.wav-801b8c3bffb84bccbb57e25938f90ec7.sample" + +[deps] + +source_file="res://music/unreeeal.wav" +dest_files=["res://.godot/imported/unreeeal.wav-801b8c3bffb84bccbb57e25938f90ec7.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/steamgrid/h-grid.jpg b/steamgrid/h-grid.jpg new file mode 100644 index 0000000..415cec4 Binary files /dev/null and b/steamgrid/h-grid.jpg differ diff --git a/steamgrid/h-grid.jpg.import b/steamgrid/h-grid.jpg.import new file mode 100644 index 0000000..4763fe0 --- /dev/null +++ b/steamgrid/h-grid.jpg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cvcraqv6iqsrf" +path="res://.godot/imported/h-grid.jpg-8d2a0dfe0fa4c3f1d8d80aa5163252dd.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://steamgrid/h-grid.jpg" +dest_files=["res://.godot/imported/h-grid.jpg-8d2a0dfe0fa4c3f1d8d80aa5163252dd.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/steamgrid/hero.jpg b/steamgrid/hero.jpg new file mode 100644 index 0000000..0e39c7c Binary files /dev/null and b/steamgrid/hero.jpg differ diff --git a/steamgrid/hero.jpg.import b/steamgrid/hero.jpg.import new file mode 100644 index 0000000..c33c31b --- /dev/null +++ b/steamgrid/hero.jpg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://6lc0bahwa6d3" +path="res://.godot/imported/hero.jpg-1dbc52503612e6d786c6b74587e7bc0f.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://steamgrid/hero.jpg" +dest_files=["res://.godot/imported/hero.jpg-1dbc52503612e6d786c6b74587e7bc0f.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/steamgrid/v-grid.jpg b/steamgrid/v-grid.jpg new file mode 100644 index 0000000..2cfda51 Binary files /dev/null and b/steamgrid/v-grid.jpg differ diff --git a/steamgrid/v-grid.jpg.import b/steamgrid/v-grid.jpg.import new file mode 100644 index 0000000..0f3e92c --- /dev/null +++ b/steamgrid/v-grid.jpg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bfvw7ikjuktxj" +path="res://.godot/imported/v-grid.jpg-5d2fcc6c35a337113d7dbc0765b394be.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://steamgrid/v-grid.jpg" +dest_files=["res://.godot/imported/v-grid.jpg-5d2fcc6c35a337113d7dbc0765b394be.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1