From 44270981beaf505558c9b3d50ba8bbf4f96ee3bc Mon Sep 17 00:00:00 2001 From: HasJamOn <82700061+HasJamOn@users.noreply.github.com> Date: Wed, 16 Mar 2022 20:56:09 +0800 Subject: [PATCH] Minor improvements for Controller Support Fire2 Controller mapping. - I recommend dragging fire2 up directly below fire1 in the Input Map. Assign Focused texture for upgrade menu so there are indicators for controllers. Reset Minor improvements for Controller Support Fire2 Controller mapping. - I recommend dragging fire2 up directly below fire1 in the Input Map. Assign Focused texture for upgrade menu so there are indicators for controllers. --- .../Ships/Enemies/topdown-enemy.svg.import | 1 + .../Ships/Guns/projectile-enemy.svg.import | 1 + .../Ships/Player/topdown-player.svg.import | 1 + project/Ships/spike.svg.import | 1 + project/UI/HUD/cargo_fill.svg.import | 1 + project/UI/HUD/cargo_outer.svg.import | 1 + project/UI/HUD/shield_bar_over.svg.import | 1 + project/UI/HUD/shield_bar_progress.svg.import | 1 + project/UI/HUD/shield_bar_under.svg.import | 1 + .../gamepads/nintendob_button.svg.import | 1 + .../playstation_cross_buttton.svg.import | 1 + .../gamepads/xbox_a_button.svg.import | 1 + .../Upgrades/Icons/cargo_upgrade.svg.import | 1 + .../Upgrades/Icons/health_upgrade.svg.import | 1 + .../Upgrades/Icons/mining_upgrade.svg.import | 1 + .../Upgrades/Icons/speed_upgrade.svg.import | 1 + .../Upgrades/Icons/weapon_upgrade.svg.import | 1 + project/UI/Menus/Upgrades/UpgradeMenu.tscn | 11 +- project/UI/Menus/Upgrades/hover.svg.import | 1 + project/UI/Menus/Upgrades/normal.svg.import | 1 + project/UI/Menus/Upgrades/pressed.svg.import | 1 + project/VFX/dust.svg.import | 1 + .../DockingPoint/asteroid-round.svg.import | 1 + project/World/DockingPoint/coin.svg.import | 1 + .../World/DockingPoint/dock-aura.svg.import | 1 + project/World/DockingPoint/signal.svg.import | 1 + .../DockingPoint/space-station.svg.import | 1 + .../topdown-portal-blue.svg.import | 1 + project/World/Ores/iron_ore.svg.import | 1 + project/project.godot | 123 +++++++++--------- 30 files changed, 97 insertions(+), 65 deletions(-) diff --git a/project/Ships/Enemies/topdown-enemy.svg.import b/project/Ships/Enemies/topdown-enemy.svg.import index 7ab324e..bbfb4c0 100644 --- a/project/Ships/Enemies/topdown-enemy.svg.import +++ b/project/Ships/Enemies/topdown-enemy.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/project/Ships/Guns/projectile-enemy.svg.import b/project/Ships/Guns/projectile-enemy.svg.import index 137665b..0911766 100644 --- a/project/Ships/Guns/projectile-enemy.svg.import +++ b/project/Ships/Guns/projectile-enemy.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/project/Ships/Player/topdown-player.svg.import b/project/Ships/Player/topdown-player.svg.import index 167a692..d42c42e 100644 --- a/project/Ships/Player/topdown-player.svg.import +++ b/project/Ships/Player/topdown-player.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/project/Ships/spike.svg.import b/project/Ships/spike.svg.import index 69f7c30..0a3f61c 100644 --- a/project/Ships/spike.svg.import +++ b/project/Ships/spike.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/project/UI/HUD/cargo_fill.svg.import b/project/UI/HUD/cargo_fill.svg.import index 0652357..b24e04d 100644 --- a/project/UI/HUD/cargo_fill.svg.import +++ b/project/UI/HUD/cargo_fill.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/project/UI/HUD/cargo_outer.svg.import b/project/UI/HUD/cargo_outer.svg.import index 6a70f66..f10aba5 100644 --- a/project/UI/HUD/cargo_outer.svg.import +++ b/project/UI/HUD/cargo_outer.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/project/UI/HUD/shield_bar_over.svg.import b/project/UI/HUD/shield_bar_over.svg.import index ce0e01e..a8d21ee 100644 --- a/project/UI/HUD/shield_bar_over.svg.import +++ b/project/UI/HUD/shield_bar_over.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/project/UI/HUD/shield_bar_progress.svg.import b/project/UI/HUD/shield_bar_progress.svg.import index 98baf54..5463537 100644 --- a/project/UI/HUD/shield_bar_progress.svg.import +++ b/project/UI/HUD/shield_bar_progress.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/project/UI/HUD/shield_bar_under.svg.import b/project/UI/HUD/shield_bar_under.svg.import index 2abe06a..e5ea71c 100644 --- a/project/UI/HUD/shield_bar_under.svg.import +++ b/project/UI/HUD/shield_bar_under.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/project/UI/MainScreen/gamepads/nintendob_button.svg.import b/project/UI/MainScreen/gamepads/nintendob_button.svg.import index 7eb5682..954faf4 100644 --- a/project/UI/MainScreen/gamepads/nintendob_button.svg.import +++ b/project/UI/MainScreen/gamepads/nintendob_button.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/project/UI/MainScreen/gamepads/playstation_cross_buttton.svg.import b/project/UI/MainScreen/gamepads/playstation_cross_buttton.svg.import index cb584bb..70cb0e4 100644 --- a/project/UI/MainScreen/gamepads/playstation_cross_buttton.svg.import +++ b/project/UI/MainScreen/gamepads/playstation_cross_buttton.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/project/UI/MainScreen/gamepads/xbox_a_button.svg.import b/project/UI/MainScreen/gamepads/xbox_a_button.svg.import index aebbb9d..3501259 100644 --- a/project/UI/MainScreen/gamepads/xbox_a_button.svg.import +++ b/project/UI/MainScreen/gamepads/xbox_a_button.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/project/UI/Menus/Upgrades/Icons/cargo_upgrade.svg.import b/project/UI/Menus/Upgrades/Icons/cargo_upgrade.svg.import index 70c891e..61538bb 100644 --- a/project/UI/Menus/Upgrades/Icons/cargo_upgrade.svg.import +++ b/project/UI/Menus/Upgrades/Icons/cargo_upgrade.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/project/UI/Menus/Upgrades/Icons/health_upgrade.svg.import b/project/UI/Menus/Upgrades/Icons/health_upgrade.svg.import index 68063af..86780b8 100644 --- a/project/UI/Menus/Upgrades/Icons/health_upgrade.svg.import +++ b/project/UI/Menus/Upgrades/Icons/health_upgrade.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/project/UI/Menus/Upgrades/Icons/mining_upgrade.svg.import b/project/UI/Menus/Upgrades/Icons/mining_upgrade.svg.import index 6293202..091e7ac 100644 --- a/project/UI/Menus/Upgrades/Icons/mining_upgrade.svg.import +++ b/project/UI/Menus/Upgrades/Icons/mining_upgrade.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/project/UI/Menus/Upgrades/Icons/speed_upgrade.svg.import b/project/UI/Menus/Upgrades/Icons/speed_upgrade.svg.import index 65cc844..c4b7b78 100644 --- a/project/UI/Menus/Upgrades/Icons/speed_upgrade.svg.import +++ b/project/UI/Menus/Upgrades/Icons/speed_upgrade.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/project/UI/Menus/Upgrades/Icons/weapon_upgrade.svg.import b/project/UI/Menus/Upgrades/Icons/weapon_upgrade.svg.import index b4cb608..5ac0c19 100644 --- a/project/UI/Menus/Upgrades/Icons/weapon_upgrade.svg.import +++ b/project/UI/Menus/Upgrades/Icons/weapon_upgrade.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/project/UI/Menus/Upgrades/UpgradeMenu.tscn b/project/UI/Menus/Upgrades/UpgradeMenu.tscn index 51fe032..26ba19f 100644 --- a/project/UI/Menus/Upgrades/UpgradeMenu.tscn +++ b/project/UI/Menus/Upgrades/UpgradeMenu.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=9 format=2] +[gd_scene load_steps=10 format=2] [ext_resource path="res://UI/Menus/Upgrades/Icons/health_upgrade.svg" type="Texture" id=1] [ext_resource path="res://UI/Menus/Upgrades/Icons/cargo_upgrade.svg" type="Texture" id=2] @@ -8,9 +8,7 @@ [ext_resource path="res://UI/Menus/Upgrades/UpgradeButton.tscn" type="PackedScene" id=6] [ext_resource path="res://UI/Menus/Upgrades/Icons/mining_upgrade.svg" type="Texture" id=7] [ext_resource path="res://UI/Menus/Sounds/MenuSoundPlayer.tscn" type="PackedScene" id=8] - - - +[ext_resource path="res://UI/Menus/Upgrades/hover.svg" type="Texture" id=9] [node name="UpgradeMenu" type="Control"] anchor_right = 1.0 @@ -35,30 +33,35 @@ __meta__ = { } [node name="HealthUpgrade" parent="HBoxContainer" instance=ExtResource( 6 )] +texture_focused = ExtResource( 9 ) texture = ExtResource( 1 ) text = "Health" [node name="SpeedUpgrade" parent="HBoxContainer" instance=ExtResource( 6 )] margin_left = 132.0 margin_right = 260.0 +texture_focused = ExtResource( 9 ) texture = ExtResource( 3 ) text = "Speed" [node name="CargoUpgrade" parent="HBoxContainer" instance=ExtResource( 6 )] margin_left = 264.0 margin_right = 392.0 +texture_focused = ExtResource( 9 ) texture = ExtResource( 2 ) text = "Cargo" [node name="MiningUpgrade" parent="HBoxContainer" instance=ExtResource( 6 )] margin_left = 396.0 margin_right = 524.0 +texture_focused = ExtResource( 9 ) texture = ExtResource( 7 ) text = "Mining" [node name="WeaponUpgrade" parent="HBoxContainer" instance=ExtResource( 6 )] margin_left = 528.0 margin_right = 656.0 +texture_focused = ExtResource( 9 ) texture = ExtResource( 5 ) text = "Weapon" diff --git a/project/UI/Menus/Upgrades/hover.svg.import b/project/UI/Menus/Upgrades/hover.svg.import index 86d9ccd..742b24b 100644 --- a/project/UI/Menus/Upgrades/hover.svg.import +++ b/project/UI/Menus/Upgrades/hover.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/project/UI/Menus/Upgrades/normal.svg.import b/project/UI/Menus/Upgrades/normal.svg.import index b954534..e514eda 100644 --- a/project/UI/Menus/Upgrades/normal.svg.import +++ b/project/UI/Menus/Upgrades/normal.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/project/UI/Menus/Upgrades/pressed.svg.import b/project/UI/Menus/Upgrades/pressed.svg.import index 4fd4e5c..7a78000 100644 --- a/project/UI/Menus/Upgrades/pressed.svg.import +++ b/project/UI/Menus/Upgrades/pressed.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/project/VFX/dust.svg.import b/project/VFX/dust.svg.import index 4bed0d8..f5e8d4d 100644 --- a/project/VFX/dust.svg.import +++ b/project/VFX/dust.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/project/World/DockingPoint/asteroid-round.svg.import b/project/World/DockingPoint/asteroid-round.svg.import index 51bd781..62b21b7 100644 --- a/project/World/DockingPoint/asteroid-round.svg.import +++ b/project/World/DockingPoint/asteroid-round.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/project/World/DockingPoint/coin.svg.import b/project/World/DockingPoint/coin.svg.import index 1980192..47e8e35 100644 --- a/project/World/DockingPoint/coin.svg.import +++ b/project/World/DockingPoint/coin.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/project/World/DockingPoint/dock-aura.svg.import b/project/World/DockingPoint/dock-aura.svg.import index 46fc3fe..f050a74 100644 --- a/project/World/DockingPoint/dock-aura.svg.import +++ b/project/World/DockingPoint/dock-aura.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/project/World/DockingPoint/signal.svg.import b/project/World/DockingPoint/signal.svg.import index 16ca536..b1c1e13 100644 --- a/project/World/DockingPoint/signal.svg.import +++ b/project/World/DockingPoint/signal.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/project/World/DockingPoint/space-station.svg.import b/project/World/DockingPoint/space-station.svg.import index 8ec91dc..9c30aa6 100644 --- a/project/World/DockingPoint/space-station.svg.import +++ b/project/World/DockingPoint/space-station.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/project/World/DockingPoint/topdown-portal-blue.svg.import b/project/World/DockingPoint/topdown-portal-blue.svg.import index 7eead08..3559360 100644 --- a/project/World/DockingPoint/topdown-portal-blue.svg.import +++ b/project/World/DockingPoint/topdown-portal-blue.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/project/World/Ores/iron_ore.svg.import b/project/World/Ores/iron_ore.svg.import index f938df6..a8a6337 100644 --- a/project/World/Ores/iron_ore.svg.import +++ b/project/World/Ores/iron_ore.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/project/project.godot b/project/project.godot index 7e840f7..6d3615c 100644 --- a/project/project.godot +++ b/project/project.godot @@ -9,12 +9,12 @@ config_version=4 _global_script_classes=[ { -"base": "Reference", +"base": "Range", "class": "AnimatedBar", "language": "GDScript", "path": "res://Ships/Player/AnimatedBar.gd" }, { -"base": "Reference", +"base": "DockingPoint", "class": "Asteroid", "language": "GDScript", "path": "res://World/DockingPoint/Asteroid.gd" @@ -24,7 +24,7 @@ _global_script_classes=[ { "language": "GDScript", "path": "res://World/Spawners/AsteroidCluster.gd" }, { -"base": "Reference", +"base": "Node2D", "class": "AsteroidSpawner", "language": "GDScript", "path": "res://World/Spawners/AsteroidSpawner.gd" @@ -34,7 +34,7 @@ _global_script_classes=[ { "language": "GDScript", "path": "res://Ships/Player/Cargo.gd" }, { -"base": "Reference", +"base": "Node2D", "class": "DockingPoint", "language": "GDScript", "path": "res://World/DockingPoint/DockingPoint.gd" @@ -44,47 +44,47 @@ _global_script_classes=[ { "language": "GDScript", "path": "res://Libraries/godot-steering-ai-framework/GSAIAgentLocation.gd" }, { -"base": "Reference", +"base": "GSAISteeringBehavior", "class": "GSAIArrive", "language": "GDScript", "path": "res://Libraries/godot-steering-ai-framework/Behaviors/GSAIArrive.gd" }, { -"base": "Reference", +"base": "GSAIGroupBehavior", "class": "GSAIAvoidCollisions", "language": "GDScript", "path": "res://Libraries/godot-steering-ai-framework/Behaviors/GSAIAvoidCollisions.gd" }, { -"base": "Reference", +"base": "GSAISteeringBehavior", "class": "GSAIBlend", "language": "GDScript", "path": "res://Libraries/godot-steering-ai-framework/Behaviors/GSAIBlend.gd" }, { -"base": "Reference", +"base": "GSAIGroupBehavior", "class": "GSAICohesion", "language": "GDScript", "path": "res://Libraries/godot-steering-ai-framework/Behaviors/GSAICohesion.gd" }, { -"base": "Reference", +"base": "GSAIPursue", "class": "GSAIEvade", "language": "GDScript", "path": "res://Libraries/godot-steering-ai-framework/Behaviors/GSAIEvade.gd" }, { -"base": "Reference", +"base": "GSAIMatchOrientation", "class": "GSAIFace", "language": "GDScript", "path": "res://Libraries/godot-steering-ai-framework/Behaviors/GSAIFace.gd" }, { -"base": "Reference", +"base": "GSAISeek", "class": "GSAIFlee", "language": "GDScript", "path": "res://Libraries/godot-steering-ai-framework/Behaviors/GSAIFlee.gd" }, { -"base": "Reference", +"base": "GSAIArrive", "class": "GSAIFollowPath", "language": "GDScript", "path": "res://Libraries/godot-steering-ai-framework/Behaviors/GSAIFollowPath.gd" }, { -"base": "Reference", +"base": "GSAISteeringBehavior", "class": "GSAIGroupBehavior", "language": "GDScript", "path": "res://Libraries/godot-steering-ai-framework/GSAIGroupBehavior.gd" @@ -104,12 +104,12 @@ _global_script_classes=[ { "language": "GDScript", "path": "res://Libraries/godot-steering-ai-framework/Agents/GSAIKinematicBody3DAgent.gd" }, { -"base": "Reference", +"base": "GSAIMatchOrientation", "class": "GSAILookWhereYouGo", "language": "GDScript", "path": "res://Libraries/godot-steering-ai-framework/Behaviors/GSAILookWhereYouGo.gd" }, { -"base": "Reference", +"base": "GSAISteeringBehavior", "class": "GSAIMatchOrientation", "language": "GDScript", "path": "res://Libraries/godot-steering-ai-framework/Behaviors/GSAIMatchOrientation.gd" @@ -119,7 +119,7 @@ _global_script_classes=[ { "language": "GDScript", "path": "res://Libraries/godot-steering-ai-framework/GSAIPath.gd" }, { -"base": "Reference", +"base": "GSAISteeringBehavior", "class": "GSAIPriority", "language": "GDScript", "path": "res://Libraries/godot-steering-ai-framework/Behaviors/GSAIPriority.gd" @@ -129,7 +129,7 @@ _global_script_classes=[ { "language": "GDScript", "path": "res://Libraries/godot-steering-ai-framework/Proximities/GSAIProximity.gd" }, { -"base": "Reference", +"base": "GSAISteeringBehavior", "class": "GSAIPursue", "language": "GDScript", "path": "res://Libraries/godot-steering-ai-framework/Behaviors/GSAIPursue.gd" @@ -149,12 +149,12 @@ _global_script_classes=[ { "language": "GDScript", "path": "res://Libraries/godot-steering-ai-framework/Agents/GSAIRigidBody3DAgent.gd" }, { -"base": "Reference", +"base": "GSAISteeringBehavior", "class": "GSAISeek", "language": "GDScript", "path": "res://Libraries/godot-steering-ai-framework/Behaviors/GSAISeek.gd" }, { -"base": "Reference", +"base": "GSAIGroupBehavior", "class": "GSAISeparation", "language": "GDScript", "path": "res://Libraries/godot-steering-ai-framework/Behaviors/GSAISeparation.gd" @@ -184,7 +184,7 @@ _global_script_classes=[ { "language": "GDScript", "path": "res://Libraries/godot-steering-ai-framework/GSAIUtils.gd" }, { -"base": "Reference", +"base": "Node2D", "class": "GameWorld", "language": "GDScript", "path": "res://World/GameWorld.gd" @@ -204,12 +204,12 @@ _global_script_classes=[ { "language": "GDScript", "path": "res://Common/LoopingAudioStreamPlayer2D.gd" }, { -"base": "Reference", +"base": "Resource", "class": "MapIcon", "language": "GDScript", "path": "res://UI/Minimap/MapIcon.gd" }, { -"base": "Reference", +"base": "Sprite", "class": "MapSprite", "language": "GDScript", "path": "res://UI/Minimap/MapSprite.gd" @@ -219,7 +219,7 @@ _global_script_classes=[ { "language": "GDScript", "path": "res://UI/Minimap/MapView.gd" }, { -"base": "Reference", +"base": "Node", "class": "MathUtils", "language": "GDScript", "path": "res://Utils/MathUtils.gd" @@ -229,17 +229,17 @@ _global_script_classes=[ { "language": "GDScript", "path": "res://UI/Menus/Sounds/MenuSoundPlayer.gd" }, { -"base": "Reference", +"base": "KinematicBody2D", "class": "PirateShip", "language": "GDScript", "path": "res://Ships/Enemies/Pirate/PirateShip.gd" }, { -"base": "Reference", +"base": "Node2D", "class": "PirateSpawner", "language": "GDScript", "path": "res://World/Spawners/PirateSpawner.gd" }, { -"base": "Reference", +"base": "State", "class": "PirateState", "language": "GDScript", "path": "res://Ships/Enemies/Pirate/PirateState.gd" @@ -249,12 +249,12 @@ _global_script_classes=[ { "language": "GDScript", "path": "res://Ships/Player/PlayerShip.gd" }, { -"base": "Reference", +"base": "State", "class": "PlayerState", "language": "GDScript", "path": "res://Ships/Player/PlayerState.gd" }, { -"base": "Reference", +"base": "KinematicBody2D", "class": "Projectile", "language": "GDScript", "path": "res://Ships/Guns/Projectiles/Projectile.gd" @@ -269,37 +269,37 @@ _global_script_classes=[ { "language": "GDScript", "path": "res://Libraries/StateMachine/StateMachine.gd" }, { -"base": "Reference", +"base": "DockingPoint", "class": "Station", "language": "GDScript", "path": "res://World/DockingPoint/Station.gd" }, { -"base": "Reference", +"base": "Node2D", "class": "StationSpawner", "language": "GDScript", "path": "res://World/Spawners/StationSpawner.gd" }, { -"base": "Reference", +"base": "Resource", "class": "Stats", "language": "GDScript", "path": "res://Ships/Stats.gd" }, { -"base": "Reference", +"base": "Stats", "class": "StatsCargo", "language": "GDScript", "path": "res://Ships/Player/StatsCargo.gd" }, { -"base": "Reference", +"base": "Stats", "class": "StatsGun", "language": "GDScript", "path": "res://Ships/Player/StatsGun.gd" }, { -"base": "Reference", +"base": "Stats", "class": "StatsShip", "language": "GDScript", "path": "res://Ships/Player/StatsShip.gd" }, { -"base": "Reference", +"base": "Tween", "class": "TweenAura", "language": "GDScript", "path": "res://World/DockingPoint/TweenAura.gd" @@ -394,96 +394,102 @@ window/stretch/aspect="keep_width" ui_accept={ "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":16777221,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777222,"unicode":0,"echo":false,"script":null) +"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":16777221,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777222,"physical_scancode":0,"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) ] } ui_cancel={ "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":16777217,"unicode":0,"echo":false,"script":null) +"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":16777217,"physical_scancode":0,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":10,"pressure":0.0,"pressed":false,"script":null) ] } ui_left={ "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":16777231,"unicode":0,"echo":false,"script":null) +"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":16777231,"physical_scancode":0,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":14,"pressure":0.0,"pressed":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":65,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":65,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } ui_right={ "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":16777233,"unicode":0,"echo":false,"script":null) +"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":16777233,"physical_scancode":0,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":15,"pressure":0.0,"pressed":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":68,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":68,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } ui_up={ "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":16777232,"unicode":0,"echo":false,"script":null) +"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":16777232,"physical_scancode":0,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":12,"pressure":0.0,"pressed":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":87,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":87,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } ui_down={ "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":16777234,"unicode":0,"echo":false,"script":null) +"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":16777234,"physical_scancode":0,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":13,"pressure":0.0,"pressed":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":83,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":83,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } thrust_forwards={ "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":87,"unicode":0,"echo":false,"script":null) +"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":87,"physical_scancode":0,"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) ] } thrust_back={ "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":83,"unicode":0,"echo":false,"script":null) +"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":83,"physical_scancode":0,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":1,"pressure":0.0,"pressed":false,"script":null) ] } left={ "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":65,"unicode":0,"echo":false,"script":null) +"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":65,"physical_scancode":0,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":0,"axis_value":-1.0,"script":null) ] } right={ "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":68,"unicode":0,"echo":false,"script":null) +"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":68,"physical_scancode":0,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":0,"axis_value":1.0,"script":null) ] } fire={ "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":32,"unicode":0,"echo":false,"script":null) +"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":32,"physical_scancode":0,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":7,"pressure":0.0,"pressed":false,"script":null) ] } +fire2={ +"deadzone": 0.5, +"events": [ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":1,"pressed":false,"doubleclick":false,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":2,"pressure":0.0,"pressed":false,"script":null) + ] +} toggle_dock={ "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":69,"unicode":0,"echo":false,"script":null) +"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":69,"physical_scancode":0,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":12,"pressure":0.0,"pressed":false,"script":null) ] } toggle_map={ "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":77,"unicode":0,"echo":false,"script":null) +"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":77,"physical_scancode":0,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":3,"pressure":0.0,"pressed":false,"script":null) ] } up={ "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":87,"unicode":0,"echo":false,"script":null) +"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":87,"physical_scancode":0,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":1,"axis_value":-1.0,"script":null) ] } down={ "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":83,"unicode":0,"echo":false,"script":null) +"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":83,"physical_scancode":0,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":1,"axis_value":1.0,"script":null) ] } @@ -519,12 +525,7 @@ face_down={ } toggle_fullscreen={ "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":16777254,"unicode":0,"echo":false,"script":null) - ] -} -fire2={ -"deadzone": 0.5, -"events": [ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":1,"pressed":false,"doubleclick":false,"script":null) +"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":16777254,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] }