diff --git a/backgounds/abstract.gd b/backgounds/abstract.gd index 1609c4d..2ae9221 100644 --- a/backgounds/abstract.gd +++ b/backgounds/abstract.gd @@ -14,7 +14,7 @@ func _ready(): func _process(delta): if Time.get_ticks_msec() - Global.wait > Global.timelimit: Global.live = 2 - if Global.live == 1 && (Time.get_ticks_msec() - Global.wait) >= 1000 && (Input.is_key_pressed(KEY_ESCAPE) || Input.is_joy_button_pressed(0,JOY_BUTTON_B)): + if Global.live == 1 && (Time.get_ticks_msec() - Global.wait) >= 1000 && (Input.is_key_pressed(KEY_ESCAPE) || Input.is_joy_button_pressed(0,JOY_BUTTON_A)): #print("Mouse Click/Unclick at: ", event.position) _title() if Global.live == 0: diff --git a/backgounds/galaxy.gd b/backgounds/galaxy.gd index 0f309b3..c92a61d 100644 --- a/backgounds/galaxy.gd +++ b/backgounds/galaxy.gd @@ -14,7 +14,7 @@ func _ready(): func _process(delta): if Time.get_ticks_msec() - Global.wait > Global.timelimit: Global.live = 2 - if Global.live == 1 && (Time.get_ticks_msec() - Global.wait) >= 1000 && (Input.is_key_pressed(KEY_ESCAPE) || Input.is_joy_button_pressed(0,JOY_BUTTON_B)): + if Global.live == 1 && (Time.get_ticks_msec() - Global.wait) >= 1000 && (Input.is_key_pressed(KEY_ESCAPE) || Input.is_joy_button_pressed(0,JOY_BUTTON_A)): #print("Mouse Click/Unclick at: ", event.position) _title() if Global.live == 0: diff --git a/backgounds/radio.tscn b/backgounds/radio.tscn index 4bbab68..5127385 100644 --- a/backgounds/radio.tscn +++ b/backgounds/radio.tscn @@ -30,7 +30,7 @@ offset_top = 361.0 offset_right = 602.0 offset_bottom = 387.0 scale = Vector2(2.92998, 7.01768) -text = "Press Enter or A to return to title" +text = "Press Enter or B to return to title" [node name="Label3" type="Label" parent="."] offset_left = 158.0 diff --git a/backgounds/supernova.gd b/backgounds/supernova.gd index ddba5be..248ae9d 100644 --- a/backgounds/supernova.gd +++ b/backgounds/supernova.gd @@ -19,7 +19,7 @@ func _process(delta): func _input(event): # Mouse in viewport coordinates. - if (Time.get_ticks_msec() - wait) >= 1000 && (event is InputEventMouseButton || Input.is_joy_button_pressed(0,JOY_BUTTON_A) || Input.is_key_pressed(KEY_ENTER)): + if (Time.get_ticks_msec() - wait) >= 1000 && (event is InputEventMouseButton || Input.is_joy_button_pressed(0,JOY_BUTTON_B) || Input.is_key_pressed(KEY_ENTER)): #print("Mouse Click/Unclick at: ", event.position) _title() diff --git a/backgounds/supernova.tscn b/backgounds/supernova.tscn index bef8e3e..fef39f2 100644 --- a/backgounds/supernova.tscn +++ b/backgounds/supernova.tscn @@ -30,7 +30,7 @@ offset_top = 361.0 offset_right = 488.0 offset_bottom = 387.0 scale = Vector2(2.92998, 7.01768) -text = "Press Enter or A to return to title" +text = "Press Enter or B to return to title" [node name="Label3" type="Label" parent="."] offset_left = 158.0 diff --git a/backgounds/wormhole.gd b/backgounds/wormhole.gd index b12275a..c994731 100644 --- a/backgounds/wormhole.gd +++ b/backgounds/wormhole.gd @@ -14,7 +14,7 @@ func _ready(): func _process(delta): if Time.get_ticks_msec() - Global.wait > Global.timelimit: Global.live = 2 - if Global.live == 1 && (Time.get_ticks_msec() - Global.wait) >= 1000 && (Input.is_key_pressed(KEY_ESCAPE) || Input.is_joy_button_pressed(0,JOY_BUTTON_B)): + if Global.live == 1 && (Time.get_ticks_msec() - Global.wait) >= 1000 && (Input.is_key_pressed(KEY_ESCAPE) || Input.is_joy_button_pressed(0,JOY_BUTTON_A)): #print("Mouse Click/Unclick at: ", event.position) _title() if Global.live == 0: diff --git a/bootclick.tscn b/bootclick.tscn index db70a8d..a6698a2 100644 --- a/bootclick.tscn +++ b/bootclick.tscn @@ -1,8 +1,8 @@ -[gd_scene load_steps=4 format=3 uid="uid://dp6xt67ch512j"] +[gd_scene load_steps=4 format=3 uid="uid://cb0ku0ohti11n"] [ext_resource type="Script" path="res://bootclick.gd" id="1_52bti"] [ext_resource type="PackedScene" uid="uid://dblfov80ngodu" path="res://selftest.tscn" id="3_jtnh5"] -[ext_resource type="PackedScene" uid="uid://d31udhuuwrajn" path="res://levels/bottomhud.tscn" id="3_lnkl4"] +[ext_resource type="PackedScene" uid="uid://d31udhuuwrajn" path="res://levels/bottomhud.tscn" id="3_wfymi"] [node name="bootclick" type="Control"] layout_mode = 3 @@ -29,5 +29,5 @@ offset_top = 112.0 offset_right = 97.0 offset_bottom = 135.0 -[node name="Bottomhud" parent="." instance=ExtResource("3_lnkl4")] +[node name="Bottomhud" parent="." instance=ExtResource("3_wfymi")] layout_mode = 1 diff --git a/levels/bottomhud.tscn b/levels/bottomhud.tscn index ee00465..04241a5 100644 --- a/levels/bottomhud.tscn +++ b/levels/bottomhud.tscn @@ -11,6 +11,7 @@ grow_horizontal = 2 grow_vertical = 2 [node name="fps" type="Label" parent="."] +layout_mode = 0 offset_left = 5.0 offset_top = 697.0 offset_right = 45.0 @@ -23,4 +24,4 @@ offset_left = 1191.0 offset_top = 691.0 offset_right = 1271.0 offset_bottom = 714.0 -text = "R0.1.2-beta" +text = "R0.1.3-dev" diff --git a/levels/credits.gd b/levels/credits.gd index b0ee948..bfd7e2c 100644 --- a/levels/credits.gd +++ b/levels/credits.gd @@ -51,6 +51,6 @@ func _complete(): func _input(event): # Mouse in viewport coordinates. - if bgsound.get_playback_position() > 1 && event is InputEventMouseButton || Input.is_joy_button_pressed(0,JOY_BUTTON_A) || Input.is_key_pressed(KEY_ENTER): + if bgsound.get_playback_position() > 1 && event is InputEventMouseButton || Input.is_joy_button_pressed(0,JOY_BUTTON_B) || Input.is_key_pressed(KEY_ENTER): #print("Mouse Click/Unclick at: ", event.position) _complete() diff --git a/music/alien-bulls.wav b/music/alien-bulls.wav index 6730f19..0b310b8 100644 Binary files a/music/alien-bulls.wav and b/music/alien-bulls.wav differ diff --git a/music/alien-bulls.wav.import b/music/alien-bulls.wav.import index e51333f..f422df0 100644 --- a/music/alien-bulls.wav.import +++ b/music/alien-bulls.wav.import @@ -15,7 +15,7 @@ dest_files=["res://.godot/imported/alien-bulls.wav-27f490a7169aff761fa58c12e1135 force/8_bit=false force/mono=false force/max_rate=false -force/max_rate_hz=44100 +force/max_rate_hz=22050 edit/trim=false edit/normalize=false edit/loop_mode=2 diff --git a/music/broken.wav b/music/broken.wav index 8b74222..9f89f29 100644 Binary files a/music/broken.wav and b/music/broken.wav differ diff --git a/music/broken.wav.import b/music/broken.wav.import index 453f07b..462297c 100644 --- a/music/broken.wav.import +++ b/music/broken.wav.import @@ -15,7 +15,7 @@ dest_files=["res://.godot/imported/broken.wav-9bf1c8f23bb1769fd0b99ca8bdfd60ea.s force/8_bit=false force/mono=false force/max_rate=false -force/max_rate_hz=44100 +force/max_rate_hz=22050 edit/trim=false edit/normalize=false edit/loop_mode=2 diff --git a/music/eternity.wav b/music/eternity.wav index fe6ffe6..ac24e77 100644 Binary files a/music/eternity.wav and b/music/eternity.wav differ diff --git a/music/maran.wav b/music/maran.wav index 4df61cb..09fb006 100644 Binary files a/music/maran.wav and b/music/maran.wav differ diff --git a/music/maran.wav.import b/music/maran.wav.import index c234cfe..e338d51 100644 --- a/music/maran.wav.import +++ b/music/maran.wav.import @@ -15,7 +15,7 @@ dest_files=["res://.godot/imported/maran.wav-f360fc74f16659b57ef865dcd8adc07d.sa force/8_bit=false force/mono=false force/max_rate=false -force/max_rate_hz=44100 +force/max_rate_hz=22050 edit/trim=false edit/normalize=false edit/loop_mode=2 diff --git a/music/orion.wav b/music/orion.wav index 593e84b..12e7d67 100644 Binary files a/music/orion.wav and b/music/orion.wav differ diff --git a/music/orion.wav.import b/music/orion.wav.import index ac6a20c..10d0d8f 100644 --- a/music/orion.wav.import +++ b/music/orion.wav.import @@ -15,7 +15,7 @@ dest_files=["res://.godot/imported/orion.wav-830743a5cd9d83c39bca0bd8a69bb580.sa force/8_bit=false force/mono=false force/max_rate=false -force/max_rate_hz=44100 +force/max_rate_hz=22050 edit/trim=false edit/normalize=false edit/loop_mode=2 diff --git a/music/oskars.wav b/music/oskars.wav index 4e0e932..a6ebe57 100644 Binary files a/music/oskars.wav and b/music/oskars.wav differ diff --git a/music/oskars.wav.import b/music/oskars.wav.import index f8656f1..110ac59 100644 --- a/music/oskars.wav.import +++ b/music/oskars.wav.import @@ -15,7 +15,7 @@ dest_files=["res://.godot/imported/oskars.wav-748b759985aeacf983ebbe58e2f4b438.s force/8_bit=false force/mono=false force/max_rate=false -force/max_rate_hz=44100 +force/max_rate_hz=22050 edit/trim=false edit/normalize=false edit/loop_mode=2 diff --git a/music/rock.wav b/music/rock.wav index 9f14b46..4bb8239 100644 Binary files a/music/rock.wav and b/music/rock.wav differ diff --git a/music/rock.wav.import b/music/rock.wav.import index 9b67752..b8919b2 100644 --- a/music/rock.wav.import +++ b/music/rock.wav.import @@ -15,7 +15,7 @@ dest_files=["res://.godot/imported/rock.wav-e3359062c3afe81a0bdd88a06dc6cd71.sam force/8_bit=false force/mono=false force/max_rate=false -force/max_rate_hz=44100 +force/max_rate_hz=22050 edit/trim=false edit/normalize=false edit/loop_mode=2 diff --git a/music/rose.wav b/music/rose.wav index 0592976..cb1cf27 100644 Binary files a/music/rose.wav and b/music/rose.wav differ diff --git a/music/rose.wav.import b/music/rose.wav.import index 5148920..0373823 100644 --- a/music/rose.wav.import +++ b/music/rose.wav.import @@ -15,7 +15,7 @@ dest_files=["res://.godot/imported/rose.wav-9b898aaccf9d9f9b5c2e0e05e5953beb.sam force/8_bit=false force/mono=false force/max_rate=false -force/max_rate_hz=44100 +force/max_rate_hz=22050 edit/trim=false edit/normalize=false edit/loop_mode=2 diff --git a/music/sweetest-sin.wav b/music/sweetest-sin.wav index 76176cd..233c3b6 100644 Binary files a/music/sweetest-sin.wav and b/music/sweetest-sin.wav differ diff --git a/music/sweetest-sin.wav.import b/music/sweetest-sin.wav.import index 4bbc9fa..02d25a7 100644 --- a/music/sweetest-sin.wav.import +++ b/music/sweetest-sin.wav.import @@ -15,7 +15,7 @@ dest_files=["res://.godot/imported/sweetest-sin.wav-4e7d01168ced3b8235a0dd32fe19 force/8_bit=false force/mono=false force/max_rate=false -force/max_rate_hz=44100 +force/max_rate_hz=22050 edit/trim=false edit/normalize=false edit/loop_mode=0 diff --git a/music/tekilla.wav b/music/tekilla.wav index 7af9f63..1c4d037 100644 Binary files a/music/tekilla.wav and b/music/tekilla.wav differ diff --git a/music/tekilla.wav.import b/music/tekilla.wav.import index 2675345..38d03c0 100644 --- a/music/tekilla.wav.import +++ b/music/tekilla.wav.import @@ -15,7 +15,7 @@ dest_files=["res://.godot/imported/tekilla.wav-f7a8ab6752ff0d2dc125b980e5d5d6bb. force/8_bit=false force/mono=false force/max_rate=false -force/max_rate_hz=44100 +force/max_rate_hz=22050 edit/trim=false edit/normalize=false edit/loop_mode=0 diff --git a/music/truth.wav b/music/truth.wav index 7267daa..8e93c9c 100644 Binary files a/music/truth.wav and b/music/truth.wav differ diff --git a/music/truth.wav.import b/music/truth.wav.import index dc3cd9f..22aa21d 100644 --- a/music/truth.wav.import +++ b/music/truth.wav.import @@ -15,7 +15,7 @@ dest_files=["res://.godot/imported/truth.wav-2d7a70053b9de8eed2f2707e82d6d709.sa force/8_bit=false force/mono=false force/max_rate=false -force/max_rate_hz=44100 +force/max_rate_hz=22050 edit/trim=false edit/normalize=false edit/loop_mode=2 diff --git a/music/x-force.wav b/music/x-force.wav index ee18e91..1373ab1 100644 Binary files a/music/x-force.wav and b/music/x-force.wav differ diff --git a/music/x-force.wav.import b/music/x-force.wav.import index 56e52f4..62fdc55 100644 --- a/music/x-force.wav.import +++ b/music/x-force.wav.import @@ -15,7 +15,7 @@ dest_files=["res://.godot/imported/x-force.wav-d6207f01f4c5fbb8ab4f6b0684fc6d51. force/8_bit=false force/mono=false force/max_rate=false -force/max_rate_hz=44100 +force/max_rate_hz=22050 edit/trim=false edit/normalize=false edit/loop_mode=2 diff --git a/music/yes-i-see.wav b/music/yes-i-see.wav index 15d6967..a9fc706 100644 Binary files a/music/yes-i-see.wav and b/music/yes-i-see.wav differ diff --git a/music/yes-i-see.wav.import b/music/yes-i-see.wav.import index bfe13d2..049bb9c 100644 --- a/music/yes-i-see.wav.import +++ b/music/yes-i-see.wav.import @@ -15,7 +15,7 @@ dest_files=["res://.godot/imported/yes-i-see.wav-31e9ccf9a202515f358fba3cf93c2d8 force/8_bit=false force/mono=false force/max_rate=false -force/max_rate_hz=44100 +force/max_rate_hz=22050 edit/trim=false edit/normalize=false edit/loop_mode=0 diff --git a/sfx/title.wav b/sfx/title.wav index d689fad..cf6c528 100644 Binary files a/sfx/title.wav and b/sfx/title.wav differ diff --git a/sfx/title.wav.import b/sfx/title.wav.import index f6d2e82..0422396 100644 --- a/sfx/title.wav.import +++ b/sfx/title.wav.import @@ -2,7 +2,7 @@ importer="wav" type="AudioStreamWAV" -uid="uid://c0bfrdoajy2if" +uid="uid://orgd37oidsd2" path="res://.godot/imported/title.wav-50daaedcfc0f868fd49d8ccc454658d8.sample" [deps] diff --git a/steamgrid/h-grid.jpg.import b/steamgrid/h-grid.jpg.import new file mode 100644 index 0000000..cb2a9d7 --- /dev/null +++ b/steamgrid/h-grid.jpg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b1vtpqa3x5bya" +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.import b/steamgrid/hero.jpg.import new file mode 100644 index 0000000..f1c963b --- /dev/null +++ b/steamgrid/hero.jpg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c5i7xmfe1121x" +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.import b/steamgrid/v-grid.jpg.import new file mode 100644 index 0000000..671613d --- /dev/null +++ b/steamgrid/v-grid.jpg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dnt1fqd5jv8sc" +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 diff --git a/title.gd b/title.gd index 100ce67..a9976b8 100644 --- a/title.gd +++ b/title.gd @@ -31,10 +31,10 @@ func _process(delta): func _input(event): # Mouse in viewport coordinates. - if (Time.get_ticks_msec() - wait) >= 1000 && (event is InputEventMouseButton || Input.is_key_pressed(KEY_ENTER) || Input.is_joy_button_pressed(0,JOY_BUTTON_A)): + if (Time.get_ticks_msec() - wait) >= 1000 && (event is InputEventMouseButton || Input.is_key_pressed(KEY_ENTER) || Input.is_joy_button_pressed(0,JOY_BUTTON_B)): #print("Mouse Click/Unclick at: ", event.position) _level() - elif (Time.get_ticks_msec() - wait) >= 1000 && (Input.is_key_pressed(KEY_ESCAPE) || Input.is_joy_button_pressed(0,JOY_BUTTON_B)): + elif (Time.get_ticks_msec() - wait) >= 1000 && (Input.is_key_pressed(KEY_ESCAPE) || Input.is_joy_button_pressed(0,JOY_BUTTON_A)): get_tree().quit() func _level(): diff --git a/title.tscn b/title.tscn index 43b5db7..0129834 100644 --- a/title.tscn +++ b/title.tscn @@ -51,7 +51,7 @@ offset_top = 92.0 offset_right = 610.0 offset_bottom = 118.0 scale = Vector2(2.61468, 1.57466) -text = "Press A or Enter start" +text = "Press B or Enter start" script = ExtResource("4_cc41w") [node name="exit" type="Label" parent="."] @@ -61,7 +61,7 @@ offset_top = 602.0 offset_right = 568.0 offset_bottom = 628.0 scale = Vector2(2.61468, 1.57466) -text = "Press escape or B to exit" +text = "Press escape or A to exit" script = ExtResource("5_scoec") [node name="Label" type="Label" parent="."]