From 8f3fc9d45d4146645e96003564c882fce4225f62 Mon Sep 17 00:00:00 2001 From: Page Asgardius Date: Wed, 17 Apr 2024 13:00:30 -0700 Subject: [PATCH] player's paranoia --- global.gd | 2 ++ levels/Ceres/L20.tscn | 6 ++++++ levels/ui/ceres.tscn | 12 ++++++------ levels/ui/musictest.tscn | 9 +++++---- levels/ui/scene.tscn | 12 ++++++------ levels/ui/sfxtest.tscn | 6 +++--- levels/ui/soundtest.tscn | 10 +++++----- levels/ui/testrooms.tscn | 12 ++++++------ sprites/common/kimberly/kimberly.gd | 23 +++++++++++++++++++++-- sprites/common/natasha/natasha.gd | 25 +++++++++++++++++++++++-- sprites/common/player/player.gd | 2 ++ title.gd | 4 ++-- 12 files changed, 87 insertions(+), 36 deletions(-) diff --git a/global.gd b/global.gd index 219fbcb..9eebbd0 100644 --- a/global.gd +++ b/global.gd @@ -7,6 +7,8 @@ var mousepos var timelimit = 15000 var wait var bossready = false +var playerx +var playery const pcnames = ["Midori Asgardius", "Diana Asgardius", null, "Kimberly Arch", null, null, null, null, null, "Natasha Dostoyevsky"] const npcnames = ["Lily", null, 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], [null], [null], ["res://sprites/common/natasha/face.png"]] diff --git a/levels/Ceres/L20.tscn b/levels/Ceres/L20.tscn index b20e1a7..e3478c1 100644 --- a/levels/Ceres/L20.tscn +++ b/levels/Ceres/L20.tscn @@ -14,6 +14,12 @@ size = Vector2(1283, 20) [node name="L20" type="Node2D"] script = ExtResource("1_cjbjq") +[node name="ColorRect" type="ColorRect" parent="."] +custom_minimum_size = Vector2(1280, 720) +offset_right = 40.0 +offset_bottom = 40.0 +color = Color(0, 0.619608, 0.270588, 1) + [node name="TextureRect" type="TextureRect" parent="."] offset_left = 583.0 offset_top = 4.0 diff --git a/levels/ui/ceres.tscn b/levels/ui/ceres.tscn index 5e8517b..5f45ee3 100644 --- a/levels/ui/ceres.tscn +++ b/levels/ui/ceres.tscn @@ -34,6 +34,9 @@ offset_bottom = 73.0 theme_override_font_sizes/font_size = 40 text = "Shrine of the doomed souls" +[node name="Bottomhud" parent="." instance=ExtResource("3_uojcp")] +layout_mode = 1 + [node name="VBoxContainer" type="VBoxContainer" parent="."] layout_mode = 1 anchors_preset = 7 @@ -41,9 +44,9 @@ anchor_left = 0.5 anchor_top = 1.0 anchor_right = 0.5 anchor_bottom = 1.0 -offset_left = -129.5 -offset_top = -362.0 -offset_right = 129.5 +offset_left = -139.0 +offset_top = -395.0 +offset_right = 139.0 grow_horizontal = 2 grow_vertical = 0 @@ -91,8 +94,5 @@ theme_override_font_sizes/font_size = 32 theme_override_styles/focus = SubResource("StyleBoxFlat_r2qrn") text = "BUTTON_RETURN" -[node name="Bottomhud" parent="." instance=ExtResource("3_uojcp")] -layout_mode = 1 - [connection signal="pressed" from="VBoxContainer/L20" to="." method="_on_l_20_pressed"] [connection signal="pressed" from="VBoxContainer/Back" to="." method="_on_back_pressed"] diff --git a/levels/ui/musictest.tscn b/levels/ui/musictest.tscn index 1a2f857..f407cf5 100644 --- a/levels/ui/musictest.tscn +++ b/levels/ui/musictest.tscn @@ -59,6 +59,9 @@ offset_bottom = 708.0 theme_override_font_sizes/font_size = 22 text = "Press X to stop playback" +[node name="Bottomhud" parent="." instance=ExtResource("4_a1ux8")] +layout_mode = 1 + [node name="BoxContainer" type="BoxContainer" parent="."] layout_mode = 1 anchors_preset = 3 @@ -67,7 +70,8 @@ anchor_top = 1.0 anchor_right = 1.0 anchor_bottom = 1.0 offset_left = -640.0 -offset_top = -419.0 +offset_top = -582.0 +offset_bottom = -69.0 grow_horizontal = 0 grow_vertical = 0 @@ -209,9 +213,6 @@ theme_override_font_sizes/font_size = 25 theme_override_styles/focus = SubResource("StyleBoxFlat_0dqsq") text = "BUTTON_RETURN" -[node name="Bottomhud" parent="." instance=ExtResource("4_a1ux8")] -layout_mode = 1 - [connection signal="pressed" from="BoxContainer/VBoxContainer/Title Screen" to="." method="_on_title_screen_pressed"] [connection signal="pressed" from="BoxContainer/VBoxContainer/Disclaimer, Settings, Stores" to="." method="_on_disclaimer_settings_stores_pressed"] [connection signal="pressed" from="BoxContainer/VBoxContainer/Testrooms" to="." method="_on_testrooms_pressed"] diff --git a/levels/ui/scene.tscn b/levels/ui/scene.tscn index 1597a8f..b6344be 100644 --- a/levels/ui/scene.tscn +++ b/levels/ui/scene.tscn @@ -34,6 +34,9 @@ offset_bottom = 73.0 theme_override_font_sizes/font_size = 40 text = "Scene selector" +[node name="Bottomhud" parent="." instance=ExtResource("4_2y7h7")] +layout_mode = 1 + [node name="VBoxContainer" type="VBoxContainer" parent="."] layout_mode = 1 anchors_preset = 7 @@ -41,9 +44,9 @@ anchor_left = 0.5 anchor_top = 1.0 anchor_right = 0.5 anchor_bottom = 1.0 -offset_left = -129.5 -offset_top = -362.0 -offset_right = 129.5 +offset_left = -238.5 +offset_top = -395.0 +offset_right = 238.5 grow_horizontal = 2 grow_vertical = 0 @@ -89,9 +92,6 @@ theme_override_font_sizes/font_size = 32 theme_override_styles/focus = SubResource("StyleBoxFlat_r2qrn") text = "BUTTON_RETURN" -[node name="Bottomhud" parent="." instance=ExtResource("4_2y7h7")] -layout_mode = 1 - [connection signal="pressed" from="VBoxContainer/Disclaimer" to="." method="_on_disclaimer_pressed"] [connection signal="pressed" from="VBoxContainer/Testrooms" to="." method="_on_testrooms_pressed"] [connection signal="pressed" from="VBoxContainer/Ceres" to="." method="_on_ceres_pressed"] diff --git a/levels/ui/sfxtest.tscn b/levels/ui/sfxtest.tscn index 3960f27..d546d73 100644 --- a/levels/ui/sfxtest.tscn +++ b/levels/ui/sfxtest.tscn @@ -43,6 +43,9 @@ offset_bottom = 708.0 theme_override_font_sizes/font_size = 22 text = "Press X to stop playback" +[node name="Bottomhud" parent="." instance=ExtResource("4_xxv3m")] +layout_mode = 1 + [node name="BoxContainer" type="BoxContainer" parent="."] layout_mode = 1 anchors_preset = 3 @@ -85,9 +88,6 @@ theme_override_font_sizes/font_size = 25 theme_override_styles/focus = SubResource("StyleBoxFlat_0dqsq") text = "BUTTON_RETURN" -[node name="Bottomhud" parent="." instance=ExtResource("4_xxv3m")] -layout_mode = 1 - [connection signal="pressed" from="BoxContainer/VBoxContainer/Game Over" to="." method="_on_game_over_pressed"] [connection signal="pressed" from="BoxContainer/VBoxContainer/Gauge Fill" to="." method="_on_gauge_fill_pressed"] [connection signal="pressed" from="BoxContainer/VBoxContainer2/Explosion" to="." method="_on_explosion_pressed"] diff --git a/levels/ui/soundtest.tscn b/levels/ui/soundtest.tscn index edcd647..e3107b3 100644 --- a/levels/ui/soundtest.tscn +++ b/levels/ui/soundtest.tscn @@ -37,6 +37,9 @@ offset_bottom = 73.0 theme_override_font_sizes/font_size = 40 text = "Sound Test" +[node name="Bottomhud" parent="." instance=ExtResource("4_2a53a")] +layout_mode = 1 + [node name="VBoxContainer" type="VBoxContainer" parent="."] layout_mode = 1 anchors_preset = 7 @@ -44,9 +47,9 @@ anchor_left = 0.5 anchor_top = 1.0 anchor_right = 0.5 anchor_bottom = 1.0 -offset_left = -129.5 +offset_left = -342.0 offset_top = -362.0 -offset_right = 129.5 +offset_right = 342.0 grow_horizontal = 2 grow_vertical = 0 @@ -68,9 +71,6 @@ theme_override_font_sizes/font_size = 80 theme_override_styles/focus = SubResource("StyleBoxFlat_wro6j") text = "BUTTON_RETURN" -[node name="Bottomhud" parent="." instance=ExtResource("4_2a53a")] -layout_mode = 1 - [connection signal="pressed" from="VBoxContainer/Music" to="." method="_on_music_pressed"] [connection signal="pressed" from="VBoxContainer/Sfx" to="." method="_on_sfx_pressed"] [connection signal="pressed" from="VBoxContainer/Back" to="." method="_on_back_pressed"] diff --git a/levels/ui/testrooms.tscn b/levels/ui/testrooms.tscn index 76e5a91..64ba945 100644 --- a/levels/ui/testrooms.tscn +++ b/levels/ui/testrooms.tscn @@ -34,6 +34,9 @@ offset_bottom = 73.0 theme_override_font_sizes/font_size = 40 text = "Shrine of the doomed souls" +[node name="Bottomhud" parent="." instance=ExtResource("4_jvl8w")] +layout_mode = 1 + [node name="VBoxContainer" type="VBoxContainer" parent="."] layout_mode = 1 anchors_preset = 7 @@ -41,9 +44,9 @@ anchor_left = 0.5 anchor_top = 1.0 anchor_right = 0.5 anchor_bottom = 1.0 -offset_left = -129.5 -offset_top = -362.0 -offset_right = 129.5 +offset_left = -194.5 +offset_top = -395.0 +offset_right = 194.5 grow_horizontal = 2 grow_vertical = 0 @@ -91,9 +94,6 @@ theme_override_font_sizes/font_size = 32 theme_override_styles/focus = SubResource("StyleBoxFlat_r2qrn") text = "BUTTON_RETURN" -[node name="Bottomhud" parent="." instance=ExtResource("4_jvl8w")] -layout_mode = 1 - [connection signal="pressed" from="VBoxContainer/Testspawn" to="." method="_on_testspawn_pressed"] [connection signal="pressed" from="VBoxContainer/Lilytest" to="." method="_on_lilytest_pressed"] [connection signal="pressed" from="VBoxContainer/Dialogtest" to="." method="_on_dialogtest_pressed"] diff --git a/sprites/common/kimberly/kimberly.gd b/sprites/common/kimberly/kimberly.gd index c2b073d..ffeb659 100644 --- a/sprites/common/kimberly/kimberly.gd +++ b/sprites/common/kimberly/kimberly.gd @@ -5,9 +5,12 @@ var theta: float = 0.0 var bullet = load("res://sprites/common/bullet/arrow.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 func _ready(): @@ -24,8 +27,24 @@ var gravity = ProjectSettings.get_setting("physics/2d/default_gravity") @onready var anim := $AnimationPlayer func _physics_process(delta): - velocity.x = 0 - velocity.y = 0 + 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: diff --git a/sprites/common/natasha/natasha.gd b/sprites/common/natasha/natasha.gd index 0af76c2..8e8f590 100644 --- a/sprites/common/natasha/natasha.gd +++ b/sprites/common/natasha/natasha.gd @@ -5,14 +5,19 @@ var theta: float = 0.0 var bullet = load("res://sprites/common/bullet/snowflake.tscn") const SPEED = 300.0 +const fspeed = 100.0 const JUMP_VELOCITY = -400.0 var vangle = 2 var weakness = 2 +var player +var movex = 0 +var movey = 0 func _ready(): var stimer = $Speed stimer.start(0.05) + #player = get_parent().root.get_node("Player") func get_vector(angle): theta = angle + alpha @@ -24,8 +29,24 @@ var gravity = ProjectSettings.get_setting("physics/2d/default_gravity") @onready var anim := $AnimationPlayer func _physics_process(delta): - velocity.x = 0 - velocity.y = 0 + 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: diff --git a/sprites/common/player/player.gd b/sprites/common/player/player.gd index 124ce2d..77ce5ef 100644 --- a/sprites/common/player/player.gd +++ b/sprites/common/player/player.gd @@ -29,6 +29,8 @@ func _physics_process(delta): #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 + Global.playerx = position.x + Global.playery = position.y if Global.ym > 0.3: angle = 2 elif Global.ym < -0.3: diff --git a/title.gd b/title.gd index f4fcdbf..2986e32 100644 --- a/title.gd +++ b/title.gd @@ -9,8 +9,8 @@ var wait func _ready(): Input.set_mouse_mode(Input.MOUSE_MODE_HIDDEN) - 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: - Global.sk = true + #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: + # Global.sk = true Global.gamelevel = null add_child(bgsound) var titlemusic = load(Global.musictracks[0])