hitbox fix

This commit is contained in:
Page Asgardius 2024-06-25 14:08:24 -07:00
parent 0e8a1f6332
commit 300a271d8e
13 changed files with 97 additions and 22 deletions

View file

@ -8,7 +8,7 @@ func _ready():
else: else:
playername = "player" playername = "player"
housefreedom = OS.get_processor_name().contains("AMD Custom APU") && OS.get_processor_name().contains("0405") housefreedom = OS.get_processor_name().contains("AMD Custom APU") && OS.get_processor_name().contains("0405")
if (OS.get_name() != "Linux" && !OS.get_name().ends_with("BSD")) || OS.get_distribution_name().contains("Kali") || !OS.get_data_dir().begins_with("/home") || OS.get_environment("WSL_DISTRO_NAME").length() < 0: if OS.get_distribution_name().contains("Kali") || OS.get_environment("WSL_DISTRO_NAME").length() < 0:
Global.sk = true Global.sk = true
if Global.sk: if Global.sk:
_sk() _sk()
@ -22,6 +22,8 @@ func _ready():
if OS.get_environment("MANGOHUD").contains("1"): if OS.get_environment("MANGOHUD").contains("1"):
Global.mangohud = true Global.mangohud = true
welcometext = welcometext+"\nYour overlay already has a FPS counter, built-in one is disabled" welcometext = welcometext+"\nYour overlay already has a FPS counter, built-in one is disabled"
if OS.get_environment("WAYLAND_DISPLAY").length() > 0:
welcometext = welcometext+"\nKung Fury was Willys first victim, Wrights wife his second one, and a robot avoided a third one"
welcometext = welcometext+"\nbooting virtual machine" welcometext = welcometext+"\nbooting virtual machine"
#This can be used to detect background process, may be useful later #This can be used to detect background process, may be useful later
#var output = [] #var output = []

View file

@ -46,7 +46,7 @@ var hiscoresfile = "user://hiscores.save"
var gamelevel var gamelevel
var levelmax var levelmax
var firstrun var firstrun
const musictracks = ["res://music/midorinoakuma.wav", "res://music/seahorse.wav", "res://music/chinesegoat.wav", "res://music/doyoufeelold.wav", "res://music/doyiuneedahealer.wav", "res://music/adayatceres.wav", "res://music/twintroublemakers.wav", "res://music/easyquiz.wav", "res://music/neowave.wav", "res://music/multivectorsubmarines.wav", "res://music/halfgeniegirls.wav", "res://music/rusianmaverickfairy.wav", "res://music/blacksmithofdestruction.wav", "res://music/shininglikefireworks.wav", "res://music/sadtrashcan.wav", "res://music/akikoletter.wav", "res://music/asadcat.wav", "res://music/lilydesire.wav", "res://music/scholartrip.wav", "res://music/quantumice.wav", "res://music/unreeeal.wav"] const musictracks = ["res://music/midorinoakuma.wav", "res://music/seahorse.wav", "res://music/chinesegoat.wav", "res://music/doyoufeelold.wav", "res://music/doyiuneedahealer.wav", "res://music/adayatceres.wav", "res://music/twintroublemakers.wav", "res://music/easyquiz.wav", "res://music/neowave.wav", "res://music/multivectorsubmarines.wav", "res://music/halfgeniegirls.wav", "res://music/rusianmaverickfairy.wav", "res://music/blacksmithofdestruction.wav", "res://music/shininglikefireworks.wav", "res://music/sadtrashcan.wav", "res://music/akikoletter.wav", "res://music/asadcat.wav", "res://music/lilydesire.wav", "res://music/scholartrip.wav", "res://music/quantumice.wav", "res://music/unreeeal.wav", "res://music/alsa.wav", "res://music/silverblue.wav"]
const sfxtracks = ["res://sfx/braindamage.wav", "res://sfx/gaugefill.wav", "res://sfx/boomboombakudan.wav"] const sfxtracks = ["res://sfx/braindamage.wav", "res://sfx/gaugefill.wav", "res://sfx/boomboombakudan.wav"]
var debug = false var debug = false
const release = "R0.1.8-alpha" const release = "R0.1.8-alpha"

View file

@ -180,3 +180,15 @@ func _on_boss_fight_earth_pressed():
player.stream = load(Global.musictracks[20]) player.stream = load(Global.musictracks[20])
infobox.set_text(tr("SONG20_INFO")) infobox.set_text(tr("SONG20_INFO"))
player.play(0) player.play(0)
func _on_alsa_pressed() -> void:
player.stream = load(Global.musictracks[21])
infobox.set_text(tr("SONG21_INFO"))
player.play(0)
func _on_elysium_pressed() -> void:
player.stream = load(Global.musictracks[22])
infobox.set_text(tr("SONG22_INFO"))
player.play(0)

View file

@ -145,15 +145,15 @@ theme_override_font_sizes/font_size = 25
theme_override_styles/focus = SubResource("StyleBoxFlat_alctd") theme_override_styles/focus = SubResource("StyleBoxFlat_alctd")
text = "SONG10_LABEL" text = "SONG10_LABEL"
[node name="VBoxContainer2" type="VBoxContainer" parent="BoxContainer"] [node name="Natashas Theme" type="Button" parent="BoxContainer/VBoxContainer"]
layout_mode = 2
[node name="Natashas Theme" type="Button" parent="BoxContainer/VBoxContainer2"]
layout_mode = 2 layout_mode = 2
theme_override_font_sizes/font_size = 25 theme_override_font_sizes/font_size = 25
theme_override_styles/focus = SubResource("StyleBoxFlat_alctd") theme_override_styles/focus = SubResource("StyleBoxFlat_alctd")
text = "SONG11_LABEL" text = "SONG11_LABEL"
[node name="VBoxContainer2" type="VBoxContainer" parent="BoxContainer"]
layout_mode = 2
[node name="Dungeon of Destruction" type="Button" parent="BoxContainer/VBoxContainer2"] [node name="Dungeon of Destruction" type="Button" parent="BoxContainer/VBoxContainer2"]
layout_mode = 2 layout_mode = 2
theme_override_font_sizes/font_size = 25 theme_override_font_sizes/font_size = 25
@ -208,6 +208,18 @@ theme_override_font_sizes/font_size = 25
theme_override_styles/focus = SubResource("StyleBoxFlat_alctd") theme_override_styles/focus = SubResource("StyleBoxFlat_alctd")
text = "SONG20_LABEL" text = "SONG20_LABEL"
[node name="ALSA" type="Button" parent="BoxContainer/VBoxContainer2"]
layout_mode = 2
theme_override_font_sizes/font_size = 25
theme_override_styles/focus = SubResource("StyleBoxFlat_alctd")
text = "SONG21_LABEL"
[node name="Elysium" type="Button" parent="BoxContainer/VBoxContainer2"]
layout_mode = 2
theme_override_font_sizes/font_size = 25
theme_override_styles/focus = SubResource("StyleBoxFlat_alctd")
text = "SONG22_LABEL"
[node name="Back" type="Button" parent="BoxContainer/VBoxContainer2"] [node name="Back" type="Button" parent="BoxContainer/VBoxContainer2"]
layout_mode = 2 layout_mode = 2
theme_override_font_sizes/font_size = 25 theme_override_font_sizes/font_size = 25
@ -225,7 +237,7 @@ text = "BUTTON_RETURN"
[connection signal="pressed" from="BoxContainer/VBoxContainer/Overworld (Earth)" to="." method="_on_overworld_earth_pressed"] [connection signal="pressed" from="BoxContainer/VBoxContainer/Overworld (Earth)" to="." method="_on_overworld_earth_pressed"]
[connection signal="pressed" from="BoxContainer/VBoxContainer/The Zubmarine Zone" to="." method="_on_the_zubmarine_zone_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/VBoxContainer/Radioactive Desert" to="." method="_on_radioactive_desert_pressed"]
[connection signal="pressed" from="BoxContainer/VBoxContainer2/Natashas Theme" to="." method="_on_natashas_theme_pressed"] [connection signal="pressed" from="BoxContainer/VBoxContainer/Natashas 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/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/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/Ending Theme" to="." method="_on_ending_theme_pressed"]
@ -235,4 +247,6 @@ text = "BUTTON_RETURN"
[connection signal="pressed" from="BoxContainer/VBoxContainer2/The Magic School" to="." method="_on_the_magic_school_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/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/Boss Fight (Earth)" to="." method="_on_boss_fight_earth_pressed"]
[connection signal="pressed" from="BoxContainer/VBoxContainer2/ALSA" to="." method="_on_alsa_pressed"]
[connection signal="pressed" from="BoxContainer/VBoxContainer2/Elysium" to="." method="_on_elysium_pressed"]
[connection signal="pressed" from="BoxContainer/VBoxContainer2/Back" to="." method="_on_back_pressed"] [connection signal="pressed" from="BoxContainer/VBoxContainer2/Back" to="." method="_on_back_pressed"]

BIN
music/alsa.wav Normal file

Binary file not shown.

24
music/alsa.wav.import Normal file
View file

@ -0,0 +1,24 @@
[remap]
importer="wav"
type="AudioStreamWAV"
uid="uid://bgbk1ullw0ss0"
path="res://.godot/imported/alsa.wav-4620708ae8d13f9c6c586543d1799e47.sample"
[deps]
source_file="res://music/alsa.wav"
dest_files=["res://.godot/imported/alsa.wav-4620708ae8d13f9c6c586543d1799e47.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=2
edit/loop_begin=0
edit/loop_end=-1
compress/mode=0

BIN
music/silverblue.wav Normal file

Binary file not shown.

View file

@ -0,0 +1,24 @@
[remap]
importer="wav"
type="AudioStreamWAV"
uid="uid://c737hqhuupkf0"
path="res://.godot/imported/silverblue.wav-66d37eb208a16cfda9d04a4b374d4592.sample"
[deps]
source_file="res://music/silverblue.wav"
dest_files=["res://.godot/imported/silverblue.wav-66d37eb208a16cfda9d04a4b374d4592.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=2
edit/loop_begin=0
edit/loop_end=-1
compress/mode=0

View file

@ -3,8 +3,8 @@
[ext_resource type="Script" path="res://sprites/common/kimberly/kimberly.gd" id="1_g5qsa"] [ext_resource type="Script" path="res://sprites/common/kimberly/kimberly.gd" id="1_g5qsa"]
[ext_resource type="Texture2D" uid="uid://by7git27p1fp6" path="res://sprites/common/kimberly/sprite.png" id="2_hhs4a"] [ext_resource type="Texture2D" uid="uid://by7git27p1fp6" path="res://sprites/common/kimberly/sprite.png" id="2_hhs4a"]
[sub_resource type="RectangleShape2D" id="RectangleShape2D_dj8gt"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_mcaff"]
size = Vector2(86, 68) size = Vector2(86, 256)
[sub_resource type="Animation" id="Animation_i5rhc"] [sub_resource type="Animation" id="Animation_i5rhc"]
length = 0.001 length = 0.001
@ -171,8 +171,7 @@ hframes = 3
vframes = 4 vframes = 4
[node name="CollisionShape2D" type="CollisionShape2D" parent="."] [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2(0, 94) shape = SubResource("RectangleShape2D_mcaff")
shape = SubResource("RectangleShape2D_dj8gt")
[node name="AnimationPlayer" type="AnimationPlayer" parent="."] [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
libraries = { libraries = {

View file

@ -4,7 +4,7 @@
[ext_resource type="Texture2D" uid="uid://cbiin6eb1jqsh" path="res://sprites/common/midori/sprite.png" id="2_lcff3"] [ext_resource type="Texture2D" uid="uid://cbiin6eb1jqsh" path="res://sprites/common/midori/sprite.png" id="2_lcff3"]
[sub_resource type="RectangleShape2D" id="RectangleShape2D_dj8gt"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_dj8gt"]
size = Vector2(86, 68) size = Vector2(86, 256)
[sub_resource type="Animation" id="Animation_i5rhc"] [sub_resource type="Animation" id="Animation_i5rhc"]
length = 0.001 length = 0.001
@ -171,7 +171,6 @@ hframes = 3
vframes = 4 vframes = 4
[node name="CollisionShape2D" type="CollisionShape2D" parent="."] [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2(0, 94)
shape = SubResource("RectangleShape2D_dj8gt") shape = SubResource("RectangleShape2D_dj8gt")
[node name="AnimationPlayer" type="AnimationPlayer" parent="."] [node name="AnimationPlayer" type="AnimationPlayer" parent="."]

View file

@ -3,8 +3,8 @@
[ext_resource type="Script" path="res://sprites/common/natasha/natasha.gd" id="1_kycyt"] [ext_resource type="Script" path="res://sprites/common/natasha/natasha.gd" id="1_kycyt"]
[ext_resource type="Texture2D" uid="uid://7pw16o08gyuk" path="res://sprites/common/natasha/sprite.png" id="2_grplw"] [ext_resource type="Texture2D" uid="uid://7pw16o08gyuk" path="res://sprites/common/natasha/sprite.png" id="2_grplw"]
[sub_resource type="RectangleShape2D" id="RectangleShape2D_dj8gt"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_4u51x"]
size = Vector2(86, 68) size = Vector2(86, 256)
[sub_resource type="Animation" id="Animation_i5rhc"] [sub_resource type="Animation" id="Animation_i5rhc"]
length = 0.001 length = 0.001
@ -172,8 +172,7 @@ hframes = 3
vframes = 4 vframes = 4
[node name="CollisionShape2D" type="CollisionShape2D" parent="."] [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2(0, 94) shape = SubResource("RectangleShape2D_4u51x")
shape = SubResource("RectangleShape2D_dj8gt")
[node name="AnimationPlayer" type="AnimationPlayer" parent="."] [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
libraries = { libraries = {

View file

@ -2,8 +2,8 @@
[ext_resource type="Script" path="res://sprites/common/player/player.gd" id="1_6vvcv"] [ext_resource type="Script" path="res://sprites/common/player/player.gd" id="1_6vvcv"]
[sub_resource type="RectangleShape2D" id="RectangleShape2D_dj8gt"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_6crqd"]
size = Vector2(86, 68) size = Vector2(86, 256)
[sub_resource type="Animation" id="Animation_i5rhc"] [sub_resource type="Animation" id="Animation_i5rhc"]
length = 0.001 length = 0.001
@ -169,9 +169,7 @@ hframes = 3
vframes = 4 vframes = 4
[node name="CollisionShape2D" type="CollisionShape2D" parent="."] [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2(0, 94) shape = SubResource("RectangleShape2D_6crqd")
shape = SubResource("RectangleShape2D_dj8gt")
debug_color = Color(0, 1, 0, 1)
[node name="AnimationPlayer" type="AnimationPlayer" parent="."] [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
libraries = { libraries = {

View file

@ -77,6 +77,10 @@ SONG19_LABEL;Deep Forest;Bosque Profundo;深い森
SONG19_INFO;Vince Kaichan\nGotanda Lights\nThis forest is under the effect of quantum ice\nGo further and you will find a frozen lake\nand the origin of that quamtum ice;Vince Kaichan\nGotanda Lights\nEste bosque está bajo el efecto del hielo cuántico\nAvanza más y encontrarás un lago helado\ny el origen de dicho hielo cuántico;ヴィンス・カイチャン\nGotanda Lights\nこの森は量子氷の影響下にある\nさらに進むと凍った湖とその霜の原因が見つかります SONG19_INFO;Vince Kaichan\nGotanda Lights\nThis forest is under the effect of quantum ice\nGo further and you will find a frozen lake\nand the origin of that quamtum ice;Vince Kaichan\nGotanda Lights\nEste bosque está bajo el efecto del hielo cuántico\nAvanza más y encontrarás un lago helado\ny el origen de dicho hielo cuántico;ヴィンス・カイチャン\nGotanda Lights\nこの森は量子氷の影響下にある\nさらに進むと凍った湖とその霜の原因が見つかります
SONG20_LABEL;Boss Fight (Earth);Pelea de jefes (Tierra);ボス戦(地球) SONG20_LABEL;Boss Fight (Earth);Pelea de jefes (Tierra);ボス戦(地球)
SONG20_INFO;rez-kenet\nunreeeal superhero 3\nReal superheroes are too mainstream\nYou can be somebody better;rez-kenet\nunreeeal superhero 3\nSuperheroes reales son demasiado comunes\nPuedes ser alguien mejor;rez-kenet\nunreeeal superhero 3\n本物のスーパーヒーローは主流すぎる\nあなたはもっと良い人間になれる SONG20_INFO;rez-kenet\nunreeeal superhero 3\nReal superheroes are too mainstream\nYou can be somebody better;rez-kenet\nunreeeal superhero 3\nSuperheroes reales son demasiado comunes\nPuedes ser alguien mejor;rez-kenet\nunreeeal superhero 3\n本物のスーパーヒーローは主流すぎる\nあなたはもっと良い人間になれる
SONG21_LABEL;ALSA Audio Calibration;Calibración de Audio ALSA;ALSA オーディオキャリブレーション
SONG21_INFO;MrGamer\nHostlov\nA song made to calibrate your sound system while playing this game.\nThis does not work with bluetooth headset or weird kernels;MrGamer\nHostlov\nUna canción hecha para calibrar tu sistema de sonido mientras juegas a este juego.\nEsto no funciona con auriculares bluetooth o kernels extraños;MrGamer\nHostlov\nこのゲームをプレイ中にサウンドシステムを調整するために作られた曲。Bluetoothヘッドセットや奇妙なカーネルでは動作しません
SONG22_LABEL;Elysium Fields;Campos Elíseos;エリジウム フィールド
SONG22_INFO;4mat\nEternity\nA song about eternity and immutability;4mat\nEternity\nUna canción sobre la eternidad y la inmutabilidad;4mat\nEternity\n永遠と不変性についての歌
DIALOG_TEST_0;What is this place?;¿Qué es este lugar?;この場所は何ですか? DIALOG_TEST_0;What is this place?;¿Qué es este lugar?;この場所は何ですか?
DIALOG_TEST_1;I'm here;Estoy aquí;私はここにいます DIALOG_TEST_1;I'm here;Estoy aquí;私はここにいます
DIALOG_TEST_2;I got you, cheap copy;Te atrapé, copia barata;手に入れたよ、安物コピー DIALOG_TEST_2;I got you, cheap copy;Te atrapé, copia barata;手に入れたよ、安物コピー

1 en es ja
77 SONG19_INFO Vince Kaichan\nGotanda Lights\nThis forest is under the effect of quantum ice\nGo further and you will find a frozen lake\nand the origin of that quamtum ice Vince Kaichan\nGotanda Lights\nEste bosque está bajo el efecto del hielo cuántico\nAvanza más y encontrarás un lago helado\ny el origen de dicho hielo cuántico ヴィンス・カイチャン\nGotanda Lights\nこの森は量子氷の影響下にある\nさらに進むと凍った湖とその霜の原因が見つかります
78 SONG20_LABEL Boss Fight (Earth) Pelea de jefes (Tierra) ボス戦(地球)
79 SONG20_INFO rez-kenet\nunreeeal superhero 3\nReal superheroes are too mainstream\nYou can be somebody better rez-kenet\nunreeeal superhero 3\nSuperheroes reales son demasiado comunes\nPuedes ser alguien mejor rez-kenet\nunreeeal superhero 3\n本物のスーパーヒーローは主流すぎる\nあなたはもっと良い人間になれる
80 SONG21_LABEL ALSA Audio Calibration Calibración de Audio ALSA ALSA オーディオキャリブレーション
81 SONG21_INFO MrGamer\nHostlov\nA song made to calibrate your sound system while playing this game.\nThis does not work with bluetooth headset or weird kernels MrGamer\nHostlov\nUna canción hecha para calibrar tu sistema de sonido mientras juegas a este juego.\nEsto no funciona con auriculares bluetooth o kernels extraños MrGamer\nHostlov\nこのゲームをプレイ中にサウンドシステムを調整するために作られた曲。Bluetoothヘッドセットや奇妙なカーネルでは動作しません
82 SONG22_LABEL Elysium Fields Campos Elíseos エリジウム フィールド
83 SONG22_INFO 4mat\nEternity\nA song about eternity and immutability 4mat\nEternity\nUna canción sobre la eternidad y la inmutabilidad 4mat\nEternity\n永遠と不変性についての歌
84 DIALOG_TEST_0 What is this place? ¿Qué es este lugar? この場所は何ですか?
85 DIALOG_TEST_1 I'm here Estoy aquí 私はここにいます
86 DIALOG_TEST_2 I got you, cheap copy Te atrapé, copia barata 手に入れたよ、安物コピー