From 18012d04ec2973dd7882d344a481fe6ce8e4197e Mon Sep 17 00:00:00 2001 From: ultrablob Date: Wed, 5 Feb 2025 18:02:08 -0500 Subject: [PATCH 1/2] update gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 99fdb3f..14e4a9e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ # Godot 4+ specific ignores Build/ .godot/ +addons/ From 8cb01d7918354d55850431dc09e72b71e5b06aea Mon Sep 17 00:00:00 2001 From: ultrablob Date: Wed, 5 Feb 2025 18:20:26 -0500 Subject: [PATCH 2/2] ite update --- Settings.gd | 2 +- Turret.gd | 2 +- main.tscn | 5 +- main_menu.tscn | 10 ++- monogram-extended.ttf.import | 1 + player-apezoid.gd => player-ite.gd | 8 +-- player-apezoid.tscn => player-ite.tscn | 84 +++++++++++++------------- project.godot | 32 +++++----- tar.gd | 3 +- tar.tscn | 2 +- 10 files changed, 75 insertions(+), 74 deletions(-) rename player-apezoid.gd => player-ite.gd (93%) rename player-apezoid.tscn => player-ite.tscn (81%) diff --git a/Settings.gd b/Settings.gd index 1c5230c..7e5163c 100644 --- a/Settings.gd +++ b/Settings.gd @@ -2,7 +2,7 @@ extends Node var config = ConfigFile.new() -const CHARACTERS = ["res://player-row.tscn", "res://player-apezoid.tscn", "res://player-iamond.tscn"] +const CHARACTERS = ["res://player-row.tscn", "res://player-ite.tscn", "res://player-iamond.tscn"] func _ready(): var has_config = config.load("user://settings.cfg") == OK diff --git a/Turret.gd b/Turret.gd index e850a84..c9da595 100644 --- a/Turret.gd +++ b/Turret.gd @@ -4,4 +4,4 @@ var target: Node2D func _process(delta): if target: - look_at(target.global_position) + look_at(target.global_position + target.linear_velocity) diff --git a/main.tscn b/main.tscn index e7562ee..01639cd 100644 --- a/main.tscn +++ b/main.tscn @@ -12,11 +12,11 @@ [ext_resource type="Texture2D" uid="uid://yvrhlh04k8w1" path="res://background space.png" id="6_yg4g1"] [ext_resource type="Script" path="res://wave_enemy.gd" id="7_54h7d"] [ext_resource type="Texture2D" uid="uid://cwquv3mq5kk1d" path="res://countdown-spritesheet.png" id="8_e1eub"] -[ext_resource type="Resource" uid="uid://ba01r62bwm6av" path="res://eptagon_enemy.tres" id="9_q67ak"] +[ext_resource type="Resource" uid="uid://dd8me0deake37" path="res://eptagon_enemy.tres" id="9_q67ak"] [ext_resource type="AudioStream" uid="uid://dn65uapn0wsok" path="res://impactMetal_002.ogg" id="11_acuni"] [ext_resource type="Script" path="res://CollisionCheck.gd" id="11_ryeyk"] [ext_resource type="FontFile" uid="uid://bnguin7bsyx6e" path="res://Kenney Future.ttf" id="11_s4q6p"] -[ext_resource type="Texture2D" uid="uid://cso5ufbf7u7oj" path="res://Circle.png" id="13_318fy"] +[ext_resource type="Texture2D" uid="uid://bvpoajwx0yw3y" path="res://Circle.png" id="13_318fy"] [ext_resource type="Script" path="res://Notification.gd" id="13_lkv81"] [ext_resource type="Script" path="res://Stopwatch.gd" id="13_xhnp2"] [ext_resource type="Script" path="res://Leaderboard.gd" id="14_v1elq"] @@ -669,7 +669,6 @@ script = ExtResource("1_3dydx") script = ExtResource("1_ifu8g") waves = Array[ExtResource("4_um0x7")]([SubResource("Resource_ur7l5"), SubResource("Resource_kupyp"), SubResource("Resource_o8cet"), SubResource("Resource_0cevq"), SubResource("Resource_eppj0"), SubResource("Resource_rpu1y"), SubResource("Resource_4b1vo"), SubResource("Resource_gg7kj"), SubResource("Resource_fjkob"), SubResource("Resource_5sdy5"), SubResource("Resource_61v84"), SubResource("Resource_82qld"), SubResource("Resource_2j32b")]) wave_label = NodePath("../UI/Wave Count") -start_wave = 9 [node name="Timer" type="Timer" parent="Spawner"] wait_time = 0.1 diff --git a/main_menu.tscn b/main_menu.tscn index 129fb70..37e837c 100644 --- a/main_menu.tscn +++ b/main_menu.tscn @@ -161,10 +161,9 @@ text = "Movement " layout_mode = 2 theme_override_fonts/font = ExtResource("4_ybv7t") theme_override_font_sizes/font_size = 54 -item_count = 2 selected = 0 +item_count = 2 popup/item_0/text = "Relative" -popup/item_0/id = 0 popup/item_1/text = "Absolute" popup/item_1/id = 1 @@ -180,11 +179,10 @@ text = "CLASS" layout_mode = 2 theme_override_fonts/font = ExtResource("4_ybv7t") theme_override_font_sizes/font_size = 54 -item_count = 3 selected = 0 +item_count = 3 popup/item_0/text = "Row" -popup/item_0/id = 0 -popup/item_1/text = "Apezoid" +popup/item_1/text = "Ite" popup/item_1/id = 1 popup/item_2/text = "Iamond" popup/item_2/id = 2 @@ -327,8 +325,8 @@ bus = &"Music" [connection signal="pressed" from="Layout/Play" to="." method="play"] [connection signal="pressed" from="Layout/Settings" to="Settings Panel" method="show"] [connection signal="pressed" from="Layout/Tutorial" to="Tutorial Text" method="show"] -[connection signal="pressed" from="Settings Panel/Close" to="Settings Panel" method="hide"] [connection signal="pressed" from="Settings Panel/Close" to="Settings Panel" method="save"] +[connection signal="pressed" from="Settings Panel/Close" to="Settings Panel" method="hide"] [connection signal="text_changed" from="Settings Panel/Menu/Username" to="Settings Panel" method="check_valid"] [connection signal="text_changed" from="Settings Panel/Menu/Username" to="Settings Panel/Menu/Username" method="check"] [connection signal="value_changed" from="Settings Panel/Menu/MusicVolume" to="Settings Panel/Menu/MusicVolume" method="_on_value_changed"] diff --git a/monogram-extended.ttf.import b/monogram-extended.ttf.import index bdc1eb1..e3a9551 100644 --- a/monogram-extended.ttf.import +++ b/monogram-extended.ttf.import @@ -15,6 +15,7 @@ dest_files=["res://.godot/imported/monogram-extended.ttf-b3178c0bc97888526af1218 Rendering=null antialiasing=1 generate_mipmaps=false +disable_embedded_bitmaps=true multichannel_signed_distance_field=false msdf_pixel_range=8 msdf_size=48 diff --git a/player-apezoid.gd b/player-ite.gd similarity index 93% rename from player-apezoid.gd rename to player-ite.gd index 0432f07..75aa6a5 100644 --- a/player-apezoid.gd +++ b/player-ite.gd @@ -28,7 +28,7 @@ func _process(delta): if can_damage: var body = $Laser/RayCast2D.get_collider() - if body != null and (body.is_in_group("destructible") or body.name == "Entagon"): + if body != null and body.is_in_group("destructible"): if body.has_method("destroy"): body.destroy() else: @@ -36,7 +36,7 @@ func _process(delta): func fire_laser(): var tween = get_tree().create_tween() - speed = 0 + speed = 250 $"../".get_node("%Ability/Laser").start_countup(1) $Body.play("shoot") tween.set_parallel(true) @@ -46,11 +46,11 @@ func fire_laser(): tween.set_parallel(false) tween.tween_callback(set_laser_texture.bind(active_texture)) tween.tween_property(self, "can_damage", true, 0) - tween.tween_interval(0.2) + tween.tween_interval(0.5) tween.tween_property(self, "can_damage", false, 0) tween.tween_callback(set_laser_texture.bind(aiming_texture)) tween.set_parallel(true) - tween.tween_callback($"../".get_node("%Ability/Laser").start_countdown.bind(0.2)) + tween.tween_callback($"../".get_node("%Ability/Laser").start_countdown.bind(2)) tween.tween_property($Laser, "modulate", Color(Color.WHITE, 0.2), 0.2).set_ease(Tween.EASE_OUT) tween.set_parallel(false) tween.tween_callback(set_laser_texture.bind(idle_texture)) diff --git a/player-apezoid.tscn b/player-ite.tscn similarity index 81% rename from player-apezoid.tscn rename to player-ite.tscn index 510756f..7b2a01f 100644 --- a/player-apezoid.tscn +++ b/player-ite.tscn @@ -1,45 +1,45 @@ [gd_scene load_steps=40 format=3 uid="uid://ctyntcrw0qf6w"] -[ext_resource type="PackedScene" uid="uid://cgcjicue76wsr" path="res://player.tscn" id="1_4dgnt"] -[ext_resource type="Script" path="res://player-apezoid.gd" id="2_axxxt"] -[ext_resource type="Texture2D" uid="uid://br5lt5658ioy3" path="res://apezoid_engine.png" id="3_paps8"] -[ext_resource type="Texture2D" uid="uid://1jurox63577w" path="res://apezoid-engine-idle.png" id="4_0rv3w"] -[ext_resource type="Texture2D" uid="uid://2e78kvd8ksav" path="res://ite-idle.png" id="5_nvcp3"] -[ext_resource type="Texture2D" uid="uid://djfjdlri5xdkn" path="res://dotted line.png" id="6_05kle"] -[ext_resource type="Texture2D" uid="uid://bpbhq4d37n7xa" path="res://ite-fire.png" id="6_dsto0"] -[ext_resource type="Script" path="res://Laser.gd" id="7_otdmu"] -[ext_resource type="AudioStream" uid="uid://4ou7posn1vbd" path="res://laserSmall_004.ogg" id="8_6whae"] +[ext_resource type="PackedScene" uid="uid://cgcjicue76wsr" path="res://player.tscn" id="1_iw03x"] +[ext_resource type="Script" path="res://player-ite.gd" id="2_bi2a0"] +[ext_resource type="Texture2D" uid="uid://br5lt5658ioy3" path="res://apezoid_engine.png" id="3_8rprd"] +[ext_resource type="Texture2D" uid="uid://1jurox63577w" path="res://apezoid-engine-idle.png" id="4_wcegf"] +[ext_resource type="Texture2D" uid="uid://2e78kvd8ksav" path="res://ite-idle.png" id="5_n6ban"] +[ext_resource type="Texture2D" uid="uid://bpbhq4d37n7xa" path="res://ite-fire.png" id="6_pdh00"] +[ext_resource type="Texture2D" uid="uid://djfjdlri5xdkn" path="res://dotted line.png" id="7_lcm2p"] +[ext_resource type="Script" path="res://Laser.gd" id="8_xpjph"] +[ext_resource type="AudioStream" uid="uid://4ou7posn1vbd" path="res://laserSmall_004.ogg" id="9_thl05"] [sub_resource type="AtlasTexture" id="AtlasTexture_8qb1c"] -atlas = ExtResource("3_paps8") +atlas = ExtResource("3_8rprd") region = Rect2(0, 0, 64, 64) [sub_resource type="AtlasTexture" id="AtlasTexture_i14ah"] -atlas = ExtResource("3_paps8") +atlas = ExtResource("3_8rprd") region = Rect2(64, 0, 64, 64) [sub_resource type="AtlasTexture" id="AtlasTexture_0y7yb"] -atlas = ExtResource("3_paps8") +atlas = ExtResource("3_8rprd") region = Rect2(128, 0, 64, 64) [sub_resource type="AtlasTexture" id="AtlasTexture_4tt11"] -atlas = ExtResource("3_paps8") +atlas = ExtResource("3_8rprd") region = Rect2(0, 64, 64, 64) [sub_resource type="AtlasTexture" id="AtlasTexture_7enh4"] -atlas = ExtResource("3_paps8") +atlas = ExtResource("3_8rprd") region = Rect2(64, 64, 64, 64) [sub_resource type="AtlasTexture" id="AtlasTexture_3u4ij"] -atlas = ExtResource("3_paps8") +atlas = ExtResource("3_8rprd") region = Rect2(128, 64, 64, 64) [sub_resource type="AtlasTexture" id="AtlasTexture_wnc5h"] -atlas = ExtResource("3_paps8") +atlas = ExtResource("3_8rprd") region = Rect2(0, 128, 64, 64) [sub_resource type="AtlasTexture" id="AtlasTexture_mt75u"] -atlas = ExtResource("3_paps8") +atlas = ExtResource("3_8rprd") region = Rect2(64, 128, 64, 64) [sub_resource type="SpriteFrames" id="SpriteFrames_lx4pn"] @@ -75,7 +75,7 @@ animations = [{ }, { "frames": [{ "duration": 1.0, -"texture": ExtResource("4_0rv3w") +"texture": ExtResource("4_wcegf") }], "loop": true, "name": &"idle", @@ -83,79 +83,79 @@ animations = [{ }] [sub_resource type="AtlasTexture" id="AtlasTexture_mvgkf"] -atlas = ExtResource("5_nvcp3") +atlas = ExtResource("5_n6ban") region = Rect2(0, 0, 128, 128) [sub_resource type="AtlasTexture" id="AtlasTexture_ikckq"] -atlas = ExtResource("5_nvcp3") +atlas = ExtResource("5_n6ban") region = Rect2(128, 0, 128, 128) [sub_resource type="AtlasTexture" id="AtlasTexture_vq3iw"] -atlas = ExtResource("5_nvcp3") +atlas = ExtResource("5_n6ban") region = Rect2(256, 0, 128, 128) [sub_resource type="AtlasTexture" id="AtlasTexture_jrk45"] -atlas = ExtResource("5_nvcp3") +atlas = ExtResource("5_n6ban") region = Rect2(384, 0, 128, 128) [sub_resource type="AtlasTexture" id="AtlasTexture_etscb"] -atlas = ExtResource("5_nvcp3") +atlas = ExtResource("5_n6ban") region = Rect2(512, 0, 128, 128) [sub_resource type="AtlasTexture" id="AtlasTexture_2wryh"] -atlas = ExtResource("5_nvcp3") +atlas = ExtResource("5_n6ban") region = Rect2(640, 0, 128, 128) [sub_resource type="AtlasTexture" id="AtlasTexture_vf2w7"] -atlas = ExtResource("5_nvcp3") +atlas = ExtResource("5_n6ban") region = Rect2(768, 0, 128, 128) [sub_resource type="AtlasTexture" id="AtlasTexture_5itcx"] -atlas = ExtResource("5_nvcp3") +atlas = ExtResource("5_n6ban") region = Rect2(896, 0, 128, 128) [sub_resource type="AtlasTexture" id="AtlasTexture_vqfpi"] -atlas = ExtResource("6_dsto0") +atlas = ExtResource("6_pdh00") region = Rect2(0, 0, 128, 128) [sub_resource type="AtlasTexture" id="AtlasTexture_afwpo"] -atlas = ExtResource("6_dsto0") +atlas = ExtResource("6_pdh00") region = Rect2(128, 0, 128, 128) [sub_resource type="AtlasTexture" id="AtlasTexture_odt5w"] -atlas = ExtResource("6_dsto0") +atlas = ExtResource("6_pdh00") region = Rect2(256, 0, 128, 128) [sub_resource type="AtlasTexture" id="AtlasTexture_df613"] -atlas = ExtResource("6_dsto0") +atlas = ExtResource("6_pdh00") region = Rect2(384, 0, 128, 128) [sub_resource type="AtlasTexture" id="AtlasTexture_ed1r1"] -atlas = ExtResource("6_dsto0") +atlas = ExtResource("6_pdh00") region = Rect2(512, 0, 128, 128) [sub_resource type="AtlasTexture" id="AtlasTexture_1hvxs"] -atlas = ExtResource("6_dsto0") +atlas = ExtResource("6_pdh00") region = Rect2(640, 0, 128, 128) [sub_resource type="AtlasTexture" id="AtlasTexture_5me2y"] -atlas = ExtResource("6_dsto0") +atlas = ExtResource("6_pdh00") region = Rect2(768, 0, 128, 128) [sub_resource type="AtlasTexture" id="AtlasTexture_udqx1"] -atlas = ExtResource("6_dsto0") +atlas = ExtResource("6_pdh00") region = Rect2(896, 0, 128, 128) [sub_resource type="AtlasTexture" id="AtlasTexture_gwo8l"] -atlas = ExtResource("6_dsto0") +atlas = ExtResource("6_pdh00") region = Rect2(1024, 0, 128, 128) [sub_resource type="AtlasTexture" id="AtlasTexture_bdlvk"] -atlas = ExtResource("6_dsto0") +atlas = ExtResource("6_pdh00") region = Rect2(1152, 0, 128, 128) [sub_resource type="AtlasTexture" id="AtlasTexture_gmcjb"] -atlas = ExtResource("6_dsto0") +atlas = ExtResource("6_pdh00") region = Rect2(1280, 0, 128, 128) [sub_resource type="SpriteFrames" id="SpriteFrames_wl3m1"] @@ -232,10 +232,10 @@ animations = [{ radius = 19.9939 height = 71.0167 -[node name="Player" instance=ExtResource("1_4dgnt")] +[node name="Player" instance=ExtResource("1_iw03x")] scale = Vector2(2, 2) lock_rotation = true -script = ExtResource("2_axxxt") +script = ExtResource("2_bi2a0") [node name="DeathFX" parent="." index="0"] bus = &"SFX" @@ -265,14 +265,14 @@ texture_repeat = 2 position = Vector2(-3, 1) points = PackedVector2Array(0, 0, 1075, 0) width = 30.0 -texture = ExtResource("6_05kle") +texture = ExtResource("7_lcm2p") texture_mode = 1 -script = ExtResource("7_otdmu") +script = ExtResource("8_xpjph") [node name="RayCast2D" type="RayCast2D" parent="Laser" index="0"] target_position = Vector2(50000, 2.08165e-12) collision_mask = 3 [node name="LaserFX" type="AudioStreamPlayer2D" parent="." index="5"] -stream = ExtResource("8_6whae") +stream = ExtResource("9_thl05") bus = &"SFX" diff --git a/project.godot b/project.godot index c11837e..5a3cce2 100644 --- a/project.godot +++ b/project.godot @@ -12,7 +12,8 @@ config_version=5 config/name="Countdown" run/main_scene="res://main_menu.tscn" -config/features=PackedStringArray("4.2", "GL Compatibility") +config/features=PackedStringArray("4.3", "GL Compatibility") +run/max_fps=60 config/icon="res://icon.svg" [display] @@ -20,6 +21,7 @@ config/icon="res://icon.svg" window/size/viewport_width=1920 window/size/viewport_height=1080 window/stretch/mode="viewport" +window/vsync/vsync_mode=2 [editor] @@ -30,58 +32,58 @@ version_control/autoload_on_startup=true up={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194320,"key_label":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":119,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194320,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":119,"location":0,"echo":false,"script":null) ] } down={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194322,"key_label":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"key_label":0,"unicode":115,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194322,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"key_label":0,"unicode":115,"location":0,"echo":false,"script":null) ] } left={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194319,"key_label":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"key_label":0,"unicode":97,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194319,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"key_label":0,"unicode":97,"location":0,"echo":false,"script":null) ] } right={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194321,"key_label":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"key_label":0,"unicode":100,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194321,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"key_label":0,"unicode":100,"location":0,"echo":false,"script":null) ] } restart={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":82,"key_label":0,"unicode":114,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":82,"key_label":0,"unicode":114,"location":0,"echo":false,"script":null) ] } jump={ "deadzone": 0.5, "events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":1,"position":Vector2(130, 40),"global_position":Vector2(138, 120),"factor":1.0,"button_index":1,"canceled":false,"pressed":true,"double_click":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":32,"key_label":0,"unicode":32,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":32,"key_label":0,"unicode":32,"location":0,"echo":false,"script":null) ] } quare={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":81,"key_label":0,"unicode":113,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":81,"key_label":0,"unicode":113,"location":0,"echo":false,"script":null) ] } exagon={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":69,"key_label":0,"unicode":101,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":69,"key_label":0,"unicode":101,"location":0,"echo":false,"script":null) ] } quit={ "deadzone": 0.5, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194305,"key_label":0,"unicode":0,"echo":false,"script":null) +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194305,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) ] } shoot={ "deadzone": 0.5, "events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":1,"position":Vector2(91, 32),"global_position":Vector2(99, 112),"factor":1.0,"button_index":1,"canceled":false,"pressed":true,"double_click":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":32,"key_label":0,"unicode":32,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":32,"key_label":0,"unicode":32,"location":0,"echo":false,"script":null) ] } diff --git a/tar.gd b/tar.gd index 8720a07..cb33b46 100644 --- a/tar.gd +++ b/tar.gd @@ -28,7 +28,8 @@ func _ready(): func _physics_process(delta): if phase2_active: - apply_central_force((global_position - player.global_position).normalized() * -1600 * (player.speed / 1000)) + #print((global_position - player.global_position).normalized()) + apply_central_force((global_position - (player.global_position + player.linear_velocity * 1)).normalized() * -1600 * (player.speed / 1000.0)) func phase(): if phase2_active: diff --git a/tar.tscn b/tar.tscn index d5593c0..4044f7a 100644 --- a/tar.tscn +++ b/tar.tscn @@ -467,8 +467,8 @@ animations = [{ position = Vector2(386, 292) gravity_scale = 1.66533e-16 freeze = true -max_contacts_reported = 5 contact_monitor = true +max_contacts_reported = 5 linear_damp = 2.0 script = ExtResource("1_7s3by")