diff --git a/.import/icon_switch.jpg-4577640d648ca62b3725b80debcb834f.md5 b/.import/icon_switch.jpg-4577640d648ca62b3725b80debcb834f.md5 new file mode 100644 index 0000000..33a7da7 --- /dev/null +++ b/.import/icon_switch.jpg-4577640d648ca62b3725b80debcb834f.md5 @@ -0,0 +1,3 @@ +source_md5="2b1d2bd126f10c9b262cfd9b0dad8f07" +dest_md5="ea6e90c7b83e1551590d4db83cb4b71c" + diff --git a/.import/icon_switch.jpg-4577640d648ca62b3725b80debcb834f.stex b/.import/icon_switch.jpg-4577640d648ca62b3725b80debcb834f.stex new file mode 100644 index 0000000..ebf0d51 Binary files /dev/null and b/.import/icon_switch.jpg-4577640d648ca62b3725b80debcb834f.stex differ diff --git a/Scripts/Demo.gd b/Scripts/Demo.gd index e56624f..6261102 100644 --- a/Scripts/Demo.gd +++ b/Scripts/Demo.gd @@ -5,6 +5,8 @@ var playing_op func _ready(): $Pot/Pot/MinigamesPlayed.hide() + if len(Input.get_connected_joypads()) != 0: + $OSC.hide() playing_op = true $OP/AnimationPlayer.play("OP") $Pot/Pot/AnimationPlayer.play("OP") diff --git a/Scripts/Game.gd b/Scripts/Game.gd index 8a3c10c..324a300 100644 --- a/Scripts/Game.gd +++ b/Scripts/Game.gd @@ -21,6 +21,8 @@ func set_speed(x): func _ready(): playing_op = true + if len(Input.get_connected_joypads()) != 0: + $OSC.hide() $OP/AnimationPlayer.play("OP") $Pot/Pot/AnimationPlayer.play("OP") var _i = $Pot/Pot/AnimationPlayer.connect("animation_finished",self,"anim_finish") diff --git a/export_presets.cfg b/export_presets.cfg index 09b0fed..7eea5ac 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -289,3 +289,25 @@ texture_format/s3tc=true texture_format/etc=false texture_format/etc2=false texture_format/no_bptc_fallbacks=true + +[preset.4] + +name="Switch (nro)" +platform="Switch" +runnable=true +custom_features="" +export_filter="all_resources" +include_filter="" +exclude_filter="bin/*" +export_path="bin/HaachamaWare.nro" +script_export_mode=1 +script_encryption_key="" + +[preset.4.options] + +application/fused_build=true +application/custom_editor_id="" +application/title="Haachama Ware" +application/author="CenTdemeern1" +application/version="1.0.0" +application/icon_256x256="icon_switch.jpg" diff --git a/icon_switch.jpg b/icon_switch.jpg new file mode 100644 index 0000000..570b0fc Binary files /dev/null and b/icon_switch.jpg differ diff --git a/icon_switch.jpg.import b/icon_switch.jpg.import new file mode 100644 index 0000000..711f1fa --- /dev/null +++ b/icon_switch.jpg.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/icon_switch.jpg-4577640d648ca62b3725b80debcb834f.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://icon_switch.jpg" +dest_files=[ "res://.import/icon_switch.jpg-4577640d648ca62b3725b80debcb834f.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 +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/project.godot b/project.godot index 4a5bc82..132dc48 100644 --- a/project.godot +++ b/project.godot @@ -94,15 +94,15 @@ right={ button1={ "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":88,"unicode":0,"echo":false,"script":null) -, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":0,"pressure":0.0,"pressed":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":1,"pressure":0.0,"pressed":false,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":3,"pressure":0.0,"pressed":false,"script":null) ] } button2={ "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":90,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":2,"pressure":0.0,"pressed":false,"script":null) -, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":3,"pressure":0.0,"pressed":false,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":0,"pressure":0.0,"pressed":false,"script":null) ] }