From 0a474dde903270bb278e2595c78025b54bfdac5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emily=20Hl=C3=ADf=20Carozzini?= Date: Fri, 27 Feb 2026 17:13:20 +0100 Subject: [PATCH] fixed bug where animation function wouldn't animate properly --- ...state-4cf50cd9a8d1b3b52855d4125361d3ba.cfg | 4 +- .../.godot/editor/editor_layout.cfg | 28 +++-- .../.godot/editor/editor_script_doc_cache.res | Bin 10443 -> 0 bytes .../.godot/editor/filesystem_cache10 | 22 ++-- .../.godot/editor/filesystem_update4 | 5 +- .../.godot/editor/project_metadata.cfg | 3 +- .../.godot/editor/script_editor_cache.cfg | 16 +-- .../.godot/global_script_class_cache.cfg | 100 +++++++++--------- rougelikeaboutmechs/.godot/uid_cache.bin | Bin 7536 -> 7456 bytes .../Resources/Abstracts/drone_machine.gd | 2 + .../Resources/Abstracts/machine_abstract.gd | 28 +++-- .../Machines/Resources/Machine_Globals.gd | 4 +- .../Models/Drones/BaseDrone/base_drone.tscn | 37 ++++--- 13 files changed, 144 insertions(+), 105 deletions(-) delete mode 100644 rougelikeaboutmechs/.godot/editor/editor_script_doc_cache.res diff --git a/rougelikeaboutmechs/.godot/editor/base_drone.tscn-editstate-4cf50cd9a8d1b3b52855d4125361d3ba.cfg b/rougelikeaboutmechs/.godot/editor/base_drone.tscn-editstate-4cf50cd9a8d1b3b52855d4125361d3ba.cfg index f39c65c..2894737 100644 --- a/rougelikeaboutmechs/.godot/editor/base_drone.tscn-editstate-4cf50cd9a8d1b3b52855d4125361d3ba.cfg +++ b/rougelikeaboutmechs/.godot/editor/base_drone.tscn-editstate-4cf50cd9a8d1b3b52855d4125361d3ba.cfg @@ -5,7 +5,7 @@ "grid_snap_active": false, "grid_step": Vector2(8, 8), "grid_visibility": 1, -"ofs": Vector2(-37.48983, -19.11514), +"ofs": Vector2(-38.48983, -29.11514), "primary_grid_step": Vector2i(8, 8), "show_group_gizmos": true, "show_guides": true, @@ -189,4 +189,4 @@ Anim={ "visible": false } -selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@18065/@Panel@14/@VBoxContainer@15/DockHSplitMain/@VBoxContainer@28/DockVSplitCenter/@VSplitContainer@70/@VBoxContainer@71/@EditorMainScreen@125/MainScreen/@CanvasItemEditor@9318/@VSplitContainer@9101/@HSplitContainer@9103/@HSplitContainer@9105/@Control@9106/@SubViewportContainer@9107/@SubViewport@9108/BaseDrone/Fueltank")]) +selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@18065/@Panel@14/@VBoxContainer@15/DockHSplitMain/@VBoxContainer@28/DockVSplitCenter/@VSplitContainer@70/@VBoxContainer@71/@EditorMainScreen@125/MainScreen/@CanvasItemEditor@9318/@VSplitContainer@9101/@HSplitContainer@9103/@HSplitContainer@9105/@Control@9106/@SubViewportContainer@9107/@SubViewport@9108/BaseDrone/Body")]) diff --git a/rougelikeaboutmechs/.godot/editor/editor_layout.cfg b/rougelikeaboutmechs/.godot/editor/editor_layout.cfg index 5e8836d..f86ccdd 100644 --- a/rougelikeaboutmechs/.godot/editor/editor_layout.cfg +++ b/rougelikeaboutmechs/.godot/editor/editor_layout.cfg @@ -9,9 +9,9 @@ dock_split_2=0 dock_split_3=0 dock_hsplit_1=0 dock_hsplit_2=420 -dock_hsplit_3=-230 +dock_hsplit_3=-220 dock_hsplit_4=0 -dock_9_selected_tab_idx=5 +dock_9_selected_tab_idx=0 dock_3="Scene,Import" dock_4="FileSystem,History" dock_5="Inspector,Signals,Groups" @@ -34,14 +34,14 @@ include_global=true [EditorNode] -open_scenes=PackedStringArray("res://core/gamemanager.tscn", "res://levels/main_level.tscn", "res://ui/screens/title-screen/title_screen.tscn", "res://Machines/Resources/Models/Drones/drone_model_scene.tscn", "res://Machines/Resources/Models/Drones/BaseDrone/base_drone.tscn", "res://levels/level_1.tscn", "res://Machines/Resources/Models/Drones/BodyParts/BodyPart.tscn") +open_scenes=PackedStringArray("res://levels/main_level.tscn", "res://ui/screens/title-screen/title_screen.tscn", "res://Machines/Resources/Models/Drones/drone_model_scene.tscn", "res://Machines/Resources/Models/Drones/BodyParts/BodyPart.tscn", "res://Machines/Resources/Models/Drones/BaseDrone/base_drone.tscn") current_scene="res://Machines/Resources/Models/Drones/BaseDrone/base_drone.tscn" bottom_panel_offsets={ "Animation": 0, "AnimationTree": 0, "Audio": -450, "Debugger": 0, -"Output": 0, +"Output": -270, "Search Results": 0, "Shader Editor": 0, "SpriteFrames": -346, @@ -49,20 +49,20 @@ bottom_panel_offsets={ "TileSet": -597 } selected_default_debugger_tab_idx=0 -selected_main_editor_idx=0 +selected_main_editor_idx=2 [EditorWindow] screen=0 mode="maximized" -position=Vector2i(1986, 69) +position=Vector2i(66, 69) [ScriptEditor] -open_scripts=["res://Machines/Resources/Models/Drones/BaseDrone/base_drone.gd", "res://Machines/Resources/Models/Drones/BodyParts/body_part.gd", "res://Machines/Resources/Abstracts/drone_machine.gd", "res://Machines/Resources/Abstracts/machine_abstract.gd", "res://Machines/Resources/Abstracts/mech_machine.gd"] +open_scripts=["res://Machines/Resources/Models/Drones/BaseDrone/base_drone.gd", "res://Machines/Resources/Models/Drones/BodyParts/body_part.gd", "res://Machines/Resources/Abstracts/drone_machine.gd", "res://Machines/Resources/Abstracts/machine_abstract.gd", "res://Machines/Resources/Machine_Globals.gd", "res://Machines/Resources/Abstracts/mech_machine.gd"] selected_script="res://Machines/Resources/Abstracts/machine_abstract.gd" -open_help=[] -script_split_offset=453 +open_help=["String"] +script_split_offset=150 list_split_offset=0 zoom_factor=1.0 @@ -77,3 +77,13 @@ open_shaders=[] split_offset=200 selected_shader="" text_shader_zoom_factor=1.0 + +[editor_log] + +log_filter_0=true +log_filter_2=true +log_filter_1=true +log_filter_3=true +log_filter_4=true +collapse=true +show_search=true diff --git a/rougelikeaboutmechs/.godot/editor/editor_script_doc_cache.res b/rougelikeaboutmechs/.godot/editor/editor_script_doc_cache.res deleted file mode 100644 index d02e84c2eedbf49f78b999c582d73c81e1414341..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10443 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://.godot/imported/icon.svg-218a8f2b3041327d8a5756f3a245f83b.ctex:: ::res://autoloads/::1771841784 debug_global.gd::GDScript::3519651180120881073::1771841784::0::1::::<>Node<><>0<>0<><>:: @@ -67,17 +67,17 @@ main_level.tscn::PackedScene::6468975218303303874::1771872092::0::1::::<><><>0<> ::res://Machines/::1771857941 ::res://Machines/Resources/::1771878239 Machine_Globals.gd::GDScript::2525448592130895831::1771878239::0::1::::MachineGlobals<>RefCounted<><>0<>0<><>:: -::res://Machines/Resources/Abstracts/::1771930120 -drone_machine.gd::GDScript::6346044854333652239::1771929643::0::1::::Drone<>Machine<><>1<>0<><>:: -machine_abstract.gd::GDScript::8886170484691869618::1771930120::0::1::::Machine<>CharacterBody2D<><>1<>0<><>:: +::res://Machines/Resources/Abstracts/::1772092275 +drone_machine.gd::GDScript::6346044854333652239::1772091217::0::1::::Drone<>Machine<><>1<>0<><>:: +machine_abstract.gd::GDScript::8886170484691869618::1772092275::0::1::::Machine<>CharacterBody2D<><>1<>0<><>:: mech_machine.gd::GDScript::7297000423558208560::1771871981::0::1::::Mech<>Machine<><>1<>0<><>:: suit_machine.gd::GDScript::8590081693937044336::1771857121::0::1::::Suit<>Machine<><>1<>0<><>:: ::res://Machines/Resources/Models/::1771858031 -::res://Machines/Resources/Models/Drones/::1771928659 -drone_model_scene.tscn::PackedScene::6165765690837776200::1771928659::0::1::::<><><>0<>0<><>::uid://dts1g1ow3at0c::::res://Machines/Resources/Models/Drones/BodyParts/BodyPart.tscn -::res://Machines/Resources/Models/Drones/BaseDrone/::1772040895 +::res://Machines/Resources/Models/Drones/::1772042189 +drone_model_scene.tscn::PackedScene::6165765690837776200::1772042189::0::1::::<><><>0<>0<><>::uid://dts1g1ow3at0c::::res://Machines/Resources/Models/Drones/BodyParts/BodyPart.tscn +::res://Machines/Resources/Models/Drones/BaseDrone/::1772096360 base_drone.gd::GDScript::7816552958950085701::1771877129::0::1::::<>Drone<><>0<>0<><>:: -base_drone.tscn::PackedScene::376028589443558970::1772040895::0::1::::<><><>0<>0<><>::uid://ct30i3w56w0lo::::res://Machines/Resources/Models/Drones/drone_model_scene.tscn<>uid://c3ks2krvhbeyx::::res://Machines/Sprites/Drones/BaseDrone/BaseDroneBodyIdleFrontAndBack.png<>uid://djmnqq6euiic8::::res://Machines/Resources/Models/Drones/BaseDrone/base_drone.gd<>uid://dayqx8tgi4fj8::::res://Machines/Sprites/Drones/BaseDrone/BaseDronBrain.png<>uid://b8cx4fmrgb83::::res://Machines/Sprites/Drones/BaseDrone/base_drone_head_front_idle.png<>uid://bgr6yq60l5mjt::::res://Machines/Sprites/Drones/BaseDrone/DefaultFuelTank.png<>uid://dnthmyuq5e54::::res://Machines/Sprites/Drones/BaseDrone/BaseDroneLegsFrontWalk.png<>uid://ctio2sfemdbag::::res://Machines/Sprites/Drones/BaseDrone/BaseDroneLegsIdleFront.png<>res://Machines/Sprites/Drones/BaseDrone/BaseDroneLegsWalkingSide.png<>uid://yi1h6ghnf5ey::::res://Machines/Sprites/Drones/BaseDrone/BaseDroneLegsWalkingRight.png +base_drone.tscn::PackedScene::376028589443558970::1772096360::0::1::::<><><>0<>0<><>::uid://ct30i3w56w0lo::::res://Machines/Resources/Models/Drones/drone_model_scene.tscn<>uid://c3ks2krvhbeyx::::res://Machines/Sprites/Drones/BaseDrone/BaseDroneBodyIdleFrontAndBack.png<>uid://djmnqq6euiic8::::res://Machines/Resources/Models/Drones/BaseDrone/base_drone.gd<>uid://dayqx8tgi4fj8::::res://Machines/Sprites/Drones/BaseDrone/BaseDronBrain.png<>uid://cyvlqch8bby0v::::res://Machines/Sprites/Drones/BaseDrone/BaseDroneBodyIdleLeft.png<>uid://b8cx4fmrgb83::::res://Machines/Sprites/Drones/BaseDrone/base_drone_head_front_idle.png<>uid://bgr6yq60l5mjt::::res://Machines/Sprites/Drones/BaseDrone/DefaultFuelTank.png<>uid://bdngqb6c81hm7::::res://Machines/Sprites/Drones/BaseDrone/BaseDroneBodyIdleRight.png<>uid://dnthmyuq5e54::::res://Machines/Sprites/Drones/BaseDrone/BaseDroneLegsFrontWalk.png<>uid://ctio2sfemdbag::::res://Machines/Sprites/Drones/BaseDrone/BaseDroneLegsIdleFront.png<>uid://dx2dpf8hvj8wa::::res://Machines/Sprites/Drones/BaseDrone/BaseDroneHeadLeft.png<>uid://yi1h6ghnf5ey::::res://Machines/Sprites/Drones/BaseDrone/BaseDroneLegsWalkingRight.png<>uid://bb04dercpqua1::::res://Machines/Sprites/Drones/BaseDrone/BaseDroneHeadRight.png<>uid://cy6nappb0yf0x::::res://Machines/Sprites/Drones/BaseDrone/BaseDroneLegsWalkingLeft.png ::res://Machines/Resources/Models/Drones/BodyParts/::1771930440 BodyPart.tscn::PackedScene::8531599624621736992::1771930440::0::1::::<><><>0<>0<><>::uid://wrdpxgpad8n4::::res://Machines/Resources/Models/Drones/BodyParts/body_part.gd body_part.gd::GDScript::1579459137730169171::1771930395::0::1::::BodyPart<>AnimatedSprite2D<><>0<>0<><>:: @@ -85,7 +85,7 @@ body_part.gd::GDScript::1579459137730169171::1771930395::0::1::::BodyPart<>Anima ::res://Machines/Resources/Models/Suits/::1771858007 ::res://Machines/Sprites/::1771858875 ::res://Machines/Sprites/Drones/::1771858873 -::res://Machines/Sprites/Drones/BaseDrone/::1772041872 +::res://Machines/Sprites/Drones/BaseDrone/::1772041876 BaseDronBrain.png::CompressedTexture2D::7209821425227101647::1771858823::1771858879::1::::<><><>0<>0<>19402d728acbc708baae32a51b5d3ad6<>res://.godot/imported/BaseDronBrain.png-c9c4f0b9e1320143cd50756749197369.ctex:: BaseDroneBodyIdleFrontAndBack.png::CompressedTexture2D::6759914441555654703::1771860416::1771860438::1::::<><><>0<>0<>25b59fdbf46d28bb55915b64b60e3804<>res://.godot/imported/BaseDroneBodyIdleFrontAndBack.png-afb1715d542e69fbefccd17214efcbb6.ctex:: BaseDroneBodyIdleLeft.png::CompressedTexture2D::6501422124518248511::1772041539::1772041542::1::::<><><>0<>0<>8005bc2c2b83dedb1fe3cda5f9dbfb57<>res://.godot/imported/BaseDroneBodyIdleLeft.png-a9d2faef0d719ba6fcd0c7f4f8d570db.ctex:: @@ -139,5 +139,5 @@ title_screen.tscn::PackedScene::7375686277331198226::1771858880::0::1::::<><><>0 ::res://ui/screens/win-screen/::1771841784 win_screen.gd::GDScript::7620355351831359998::1771841784::0::1::::<>Control<><>0<>0<><>:: win_screen.tscn::PackedScene::477294899242648607::1771841784::0::1::::<><><>0<>0<><>::uid://dgtme0a6lym5c::::res://ui/screens/win-screen/win_screen.gd -::res://ui/themes/::1772040846 -your_theme.tres::Theme::506038871261939837::1772040846::0::1::::<><><>0<>0<><>::uid://b23e4kqj4o6dv::::res://ui/components/settings-menu/Revert.svg +::res://ui/themes/::1772090919 +your_theme.tres::Theme::506038871261939837::1772090919::0::1::::<><><>0<>0<><>::uid://b23e4kqj4o6dv::::res://ui/components/settings-menu/Revert.svg diff --git a/rougelikeaboutmechs/.godot/editor/filesystem_update4 b/rougelikeaboutmechs/.godot/editor/filesystem_update4 index f25b28f..66a5664 100644 --- a/rougelikeaboutmechs/.godot/editor/filesystem_update4 +++ b/rougelikeaboutmechs/.godot/editor/filesystem_update4 @@ -1,4 +1,5 @@ res://Machines/Resources/Models/Drones/BaseDrone/base_drone.tscn res://ui/themes/your_theme.tres -res://core/main_environment.tres -res://Machines/Resources/Models/Drones/drone_model_scene.tscn +res://Machines/Resources/Abstracts/machine_abstract.gd +res://Machines/Resources/Abstracts/drone_machine.gd +res://Machines/Resources/Machine_Globals.gd diff --git a/rougelikeaboutmechs/.godot/editor/project_metadata.cfg b/rougelikeaboutmechs/.godot/editor/project_metadata.cfg index 851202b..7948117 100644 --- a/rougelikeaboutmechs/.godot/editor/project_metadata.cfg +++ b/rougelikeaboutmechs/.godot/editor/project_metadata.cfg @@ -5,11 +5,12 @@ select_mode=0 [editor_metadata] executable_path="/home/emily/Desktop/Godot_v4.5.1-stable_mono_linux_x86_64/Godot_v4.6-stable_linux.x86_64" +use_advanced_connections=false [recent_files] scenes=["res://Machines/Resources/Models/Drones/BaseDrone/base_drone.tscn", "res://Machines/Resources/Models/Drones/drone_model_scene.tscn", "res://ui/screens/title-screen/title_screen.tscn", "res://levels/main_level.tscn", "res://core/gamemanager.tscn"] -scripts=["String", "res://Machines/Resources/Models/Drones/BodyParts/body_part.gd", "res://custom_plugins/Animator/Animator.gd", "CharacterBody2D", "AnimatedSprite2D", "res://autoloads/settings/settings.gd", "res://autoloads/settings/user_defined_settings.gd", "res://core/gamemanager.gd", "res://levels/levels_readme.md", "res://Machines/Resources/Models/Drones/BaseDrone/base_drone.gd"] +scripts=["res://Machines/Resources/Machine_Globals.gd", "String", "res://Machines/Resources/Models/Drones/BodyParts/body_part.gd", "res://custom_plugins/Animator/Animator.gd", "CharacterBody2D", "AnimatedSprite2D", "res://autoloads/settings/settings.gd", "res://autoloads/settings/user_defined_settings.gd", "res://core/gamemanager.gd", "res://levels/levels_readme.md"] [script_setup] diff --git a/rougelikeaboutmechs/.godot/editor/script_editor_cache.cfg b/rougelikeaboutmechs/.godot/editor/script_editor_cache.cfg index 5aa6521..a06f7bf 100644 --- a/rougelikeaboutmechs/.godot/editor/script_editor_cache.cfg +++ b/rougelikeaboutmechs/.godot/editor/script_editor_cache.cfg @@ -3,11 +3,11 @@ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 1, +"column": 6, "folded_lines": PackedInt32Array(), "h_scroll_position": 0, "row": 45, -"scroll_position": 18.0, +"scroll_position": 28.0, "selection": false, "syntax_highlighter": "GDScript" } @@ -17,10 +17,10 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 0, +"column": 11, "folded_lines": PackedInt32Array(), "h_scroll_position": 0, -"row": 27, +"row": 1, "scroll_position": 0.0, "selection": false, "syntax_highlighter": "GDScript" @@ -31,11 +31,11 @@ state={ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 0, +"column": 18, "folded_lines": PackedInt32Array(), -"h_scroll_position": 0, -"row": 77, -"scroll_position": 33.0, +"h_scroll_position": 176, +"row": 79, +"scroll_position": 71.0, "selection": false, "syntax_highlighter": "GDScript" } diff --git a/rougelikeaboutmechs/.godot/global_script_class_cache.cfg b/rougelikeaboutmechs/.godot/global_script_class_cache.cfg index af97f9e..1f439fd 100644 --- a/rougelikeaboutmechs/.godot/global_script_class_cache.cfg +++ b/rougelikeaboutmechs/.godot/global_script_class_cache.cfg @@ -1,19 +1,59 @@ list=[{ -"base": &"AnimatedSprite2D", -"class": &"BodyPart", +"base": &"RefCounted", +"class": &"MachineGlobals", "icon": "", "is_abstract": false, "is_tool": false, "language": &"GDScript", -"path": "res://Machines/Resources/Models/Drones/BodyParts/body_part.gd" +"path": "res://Machines/Resources/Machine_Globals.gd" +}, { +"base": &"Button", +"class": &"LevelButton", +"icon": "", +"is_abstract": false, +"is_tool": false, +"language": &"GDScript", +"path": "res://ui/screens/level-select-screen/level_button.gd" +}, { +"base": &"Resource", +"class": &"CreditEntry", +"icon": "", +"is_abstract": false, +"is_tool": false, +"language": &"GDScript", +"path": "res://ui/screens/credit-screen/credit_entry.gd" +}, { +"base": &"VBoxContainer", +"class": &"CreditButton", +"icon": "", +"is_abstract": false, +"is_tool": false, +"language": &"GDScript", +"path": "res://ui/screens/credit-screen/credit_element.gd" +}, { +"base": &"Node", +"class": &"GameManager", +"icon": "", +"is_abstract": false, +"is_tool": false, +"language": &"GDScript", +"path": "res://core/gamemanager.gd" +}, { +"base": &"RefCounted", +"class": &"UserDefinedSettings", +"icon": "", +"is_abstract": false, +"is_tool": false, +"language": &"GDScript", +"path": "res://autoloads/settings/user_defined_settings.gd" }, { "base": &"Machine", -"class": &"Mech", +"class": &"Suit", "icon": "", "is_abstract": true, "is_tool": false, "language": &"GDScript", -"path": "res://Machines/Resources/Abstracts/mech_machine.gd" +"path": "res://Machines/Resources/Abstracts/suit_machine.gd" }, { "base": &"Machine", "class": &"Drone", @@ -24,12 +64,12 @@ list=[{ "path": "res://Machines/Resources/Abstracts/drone_machine.gd" }, { "base": &"Machine", -"class": &"Suit", +"class": &"Mech", "icon": "", "is_abstract": true, "is_tool": false, "language": &"GDScript", -"path": "res://Machines/Resources/Abstracts/suit_machine.gd" +"path": "res://Machines/Resources/Abstracts/mech_machine.gd" }, { "base": &"CharacterBody2D", "class": &"Machine", @@ -39,51 +79,11 @@ list=[{ "language": &"GDScript", "path": "res://Machines/Resources/Abstracts/machine_abstract.gd" }, { -"base": &"RefCounted", -"class": &"UserDefinedSettings", +"base": &"AnimatedSprite2D", +"class": &"BodyPart", "icon": "", "is_abstract": false, "is_tool": false, "language": &"GDScript", -"path": "res://autoloads/settings/user_defined_settings.gd" -}, { -"base": &"Node", -"class": &"GameManager", -"icon": "", -"is_abstract": false, -"is_tool": false, -"language": &"GDScript", -"path": "res://core/gamemanager.gd" -}, { -"base": &"VBoxContainer", -"class": &"CreditButton", -"icon": "", -"is_abstract": false, -"is_tool": false, -"language": &"GDScript", -"path": "res://ui/screens/credit-screen/credit_element.gd" -}, { -"base": &"Resource", -"class": &"CreditEntry", -"icon": "", -"is_abstract": false, -"is_tool": false, -"language": &"GDScript", -"path": "res://ui/screens/credit-screen/credit_entry.gd" -}, { -"base": &"Button", -"class": &"LevelButton", -"icon": "", -"is_abstract": false, -"is_tool": false, -"language": &"GDScript", -"path": "res://ui/screens/level-select-screen/level_button.gd" -}, { -"base": &"RefCounted", -"class": &"MachineGlobals", -"icon": "", -"is_abstract": false, -"is_tool": false, -"language": &"GDScript", -"path": "res://Machines/Resources/Machine_Globals.gd" +"path": "res://Machines/Resources/Models/Drones/BodyParts/body_part.gd" }] diff --git a/rougelikeaboutmechs/.godot/uid_cache.bin b/rougelikeaboutmechs/.godot/uid_cache.bin index 62fd4871dd8dc8591937c05a63623bec1434b29c..06a2df5ac9ca667ff0ebb4dc8177c05771c622ce 100644 GIT binary patch delta 39 xcmV+?0NDTVI-oiMW3d6|6O)h}O_M?#PLtgnlauEYoRjh!P?Mn>QL}>-&IV4@5Y+$x delta 69 zcmV-L0J{I6I`BFHWU&F}6O$DcoU>9E&ISpHI7z%4=o)=QlkgKXlb{s@3s+%mYiVw0 bQ)y&nll>J{ld%<0lQa}gljjpnlY$hJr9K+o diff --git a/rougelikeaboutmechs/Machines/Resources/Abstracts/drone_machine.gd b/rougelikeaboutmechs/Machines/Resources/Abstracts/drone_machine.gd index 22eecb3..fdf056f 100644 --- a/rougelikeaboutmechs/Machines/Resources/Abstracts/drone_machine.gd +++ b/rougelikeaboutmechs/Machines/Resources/Abstracts/drone_machine.gd @@ -9,6 +9,7 @@ class_name Drone var dodge_duration_timer : Timer func _ready() -> void: + _animate(self.get_child(4,false),"walking") add_on_slots = 1 for a in self.get_children() : if a.name == "DodgeDurationTimer" : @@ -19,6 +20,7 @@ func _ready() -> void: func class_ability() -> float: #do dash + animation_state_machine = MachineGlobals.regular_states.DASHING return dodge_cd func listen_to_animation_signals(next_anim_state : MachineGlobals.regular_states) -> void: diff --git a/rougelikeaboutmechs/Machines/Resources/Abstracts/machine_abstract.gd b/rougelikeaboutmechs/Machines/Resources/Abstracts/machine_abstract.gd index 2c494df..7ccf787 100644 --- a/rougelikeaboutmechs/Machines/Resources/Abstracts/machine_abstract.gd +++ b/rougelikeaboutmechs/Machines/Resources/Abstracts/machine_abstract.gd @@ -9,6 +9,7 @@ extends CharacterBody2D @export var movement_speed : float signal change_animation(anim_to_change_to) var animation_state_machine : MachineGlobals.regular_states +var last_state : MachineGlobals.regular_states var look_dir : MachineGlobals.look_direction var effects : Array var add_on_slots : int @@ -25,33 +26,40 @@ var current_fuel_in_tank : float @abstract func listen_to_animation_signals(next_anim_state : MachineGlobals.regular_states) -> void -func _ready() -> void: - connect("change_animation",listen_to_animation_signals) - func interact() -> void : pass func _physics_process(delta: float) -> void: + DebugGlobal.set_debug_info("State machine:",str(MachineGlobals.regular_states.keys()[animation_state_machine])) _movement(delta) _ability_process(delta) _action_process(delta) + _animate_according_to_state_machine() move_and_slide() +func _animate_according_to_state_machine() -> void : + DebugGlobal.set_debug_info("last state: ", str(MachineGlobals.regular_states.keys()[last_state])) + if animation_state_machine != last_state : + print_debug("Emitting signal to change animation to "+str(MachineGlobals.regular_states.keys()[animation_state_machine])) + change_animation.emit(animation_state_machine) + last_state = animation_state_machine + func _movement(delta: float) -> void : - DebugGlobal.set_debug_info("Velocity", self.velocity ) + DebugGlobal.set_debug_info("Velocity", self.velocity) + DebugGlobal.set_debug_info("Looking ", MachineGlobals.look_direction.keys()[look_dir ]) var input_direction = Input.get_vector("move_left", "move_right", "move_up", "move_down") self.velocity = input_direction * movement_speed if self.velocity != Vector2.ZERO && animation_state_machine in [MachineGlobals.regular_states.IDLING,MachineGlobals.regular_states.INTERACTING] : animation_state_machine = MachineGlobals.regular_states.WALKING if self.velocity.y < 0 : - look_dir = MachineGlobals.look_direction.UP + look_dir = MachineGlobals.look_direction.BACK elif self.velocity.y > 0 : - look_dir = MachineGlobals.look_direction.DOWN + look_dir = MachineGlobals.look_direction.FRONT elif self.velocity.x > 0 : look_dir = MachineGlobals.look_direction.RIGHT elif self.velocity.x < 0 : look_dir = MachineGlobals.look_direction.LEFT - else : + elif velocity.length() == 0 : animation_state_machine = MachineGlobals.regular_states.IDLING func _action_process(delta:float) -> void : @@ -77,5 +85,9 @@ func _get_body_parts() -> Array : func _animate(b : BodyPart, animation_type : String) -> void : for anim_name : String in b.sprite_frames.get_animation_names() : - if anim_name.contains(animation_type) && anim_name.contains(model_name) && anim_name.contains(str(MachineGlobals.look_direction.keys()[look_dir])) : + #print_debug("Trying to play animation for: "+model_name+"_"+b.name+"_"+animation_type+"_"+str(MachineGlobals.look_direction.keys()[look_dir])) + print_debug(b.sprite_frames.get_animation_names()) + print_debug("Anim name: "+anim_name+" Anim type: "+str(animation_type)+" Model name: "+str(model_name)+" Look direction: "+str(MachineGlobals.look_direction.keys()[look_dir])+" body part: "+b.name) + if anim_name.containsn(animation_type) && anim_name.containsn(model_name) && anim_name.containsn(str(MachineGlobals.look_direction.keys()[look_dir])) && anim_name.containsn(b.name) : + print_debug("Animation name found: "+anim_name) b.play(anim_name) diff --git a/rougelikeaboutmechs/Machines/Resources/Machine_Globals.gd b/rougelikeaboutmechs/Machines/Resources/Machine_Globals.gd index a3275b7..d6bb336 100644 --- a/rougelikeaboutmechs/Machines/Resources/Machine_Globals.gd +++ b/rougelikeaboutmechs/Machines/Resources/Machine_Globals.gd @@ -43,8 +43,8 @@ enum irregular_states{ } enum look_direction{ - UP, - DOWN, + BACK, + FRONT, LEFT, RIGHT } diff --git a/rougelikeaboutmechs/Machines/Resources/Models/Drones/BaseDrone/base_drone.tscn b/rougelikeaboutmechs/Machines/Resources/Models/Drones/BaseDrone/base_drone.tscn index c2c2794..e6213ab 100644 --- a/rougelikeaboutmechs/Machines/Resources/Models/Drones/BaseDrone/base_drone.tscn +++ b/rougelikeaboutmechs/Machines/Resources/Models/Drones/BaseDrone/base_drone.tscn @@ -11,9 +11,9 @@ [ext_resource type="Texture2D" uid="uid://dnthmyuq5e54" path="res://Machines/Sprites/Drones/BaseDrone/BaseDroneLegsFrontWalk.png" id="7_fkyu2"] [ext_resource type="Texture2D" uid="uid://ctio2sfemdbag" path="res://Machines/Sprites/Drones/BaseDrone/BaseDroneLegsIdleFront.png" id="7_ogmjm"] [ext_resource type="Texture2D" uid="uid://dx2dpf8hvj8wa" path="res://Machines/Sprites/Drones/BaseDrone/BaseDroneHeadLeft.png" id="9_h54wi"] -[ext_resource type="Texture2D" path="res://Machines/Sprites/Drones/BaseDrone/BaseDroneLegsWalkingSide.png" id="9_hvx52"] [ext_resource type="Texture2D" uid="uid://yi1h6ghnf5ey" path="res://Machines/Sprites/Drones/BaseDrone/BaseDroneLegsWalkingRight.png" id="10_20g50"] [ext_resource type="Texture2D" uid="uid://bb04dercpqua1" path="res://Machines/Sprites/Drones/BaseDrone/BaseDroneHeadRight.png" id="10_ua5ps"] +[ext_resource type="Texture2D" uid="uid://cy6nappb0yf0x" path="res://Machines/Sprites/Drones/BaseDrone/BaseDroneLegsWalkingLeft.png" id="13_2wo2i"] [sub_resource type="AtlasTexture" id="AtlasTexture_wbero"] atlas = ExtResource("2_1r2y7") @@ -144,27 +144,27 @@ atlas = ExtResource("7_fkyu2") region = Rect2(80, 5, 16, 11) [sub_resource type="AtlasTexture" id="AtlasTexture_b1o6v"] -atlas = ExtResource("9_hvx52") +atlas = ExtResource("13_2wo2i") region = Rect2(0, 0, 16, 16) [sub_resource type="AtlasTexture" id="AtlasTexture_8eqbb"] -atlas = ExtResource("9_hvx52") +atlas = ExtResource("13_2wo2i") region = Rect2(16, 0, 16, 16) [sub_resource type="AtlasTexture" id="AtlasTexture_ope2v"] -atlas = ExtResource("9_hvx52") +atlas = ExtResource("13_2wo2i") region = Rect2(32, 0, 16, 16) [sub_resource type="AtlasTexture" id="AtlasTexture_k67wn"] -atlas = ExtResource("9_hvx52") +atlas = ExtResource("13_2wo2i") region = Rect2(48, 0, 16, 16) [sub_resource type="AtlasTexture" id="AtlasTexture_lxr7j"] -atlas = ExtResource("9_hvx52") +atlas = ExtResource("13_2wo2i") region = Rect2(64, 0, 16, 16) [sub_resource type="AtlasTexture" id="AtlasTexture_5toxo"] -atlas = ExtResource("9_hvx52") +atlas = ExtResource("13_2wo2i") region = Rect2(80, 0, 16, 16) [sub_resource type="AtlasTexture" id="AtlasTexture_gjxbl"] @@ -201,7 +201,18 @@ animations = [{ "texture": SubResource("AtlasTexture_ny81s") }], "loop": true, -"name": &"dbase_body_idle_up_and_down", +"name": &"dbase_body_idle_back", +"speed": 1.5 +}, { +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_wbero") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_ny81s") +}], +"loop": true, +"name": &"dbase_body_idle_front", "speed": 1.5 }, { "frames": [{ @@ -410,7 +421,7 @@ animations = [{ [node name="BaseDrone" unique_id=872770085 instance=ExtResource("1_j7lnw")] script = ExtResource("2_njeil") -model_name = &"Base" +model_name = &"dbase" movement_speed = 150.0 [node name="Camera2D" parent="." index="1" unique_id=2079743221] @@ -421,12 +432,12 @@ position = Vector2(-1, -1) scale = Vector2(0.75, 0.875) sprite_frames = SubResource("SpriteFrames_wbero") animation = &"dbase_fueltank_idle" +frame_progress = 0.6998867 [node name="Body" parent="." index="4" unique_id=1950083426] position = Vector2(-1, 1) sprite_frames = SubResource("SpriteFrames_wbero") -animation = &"dbase_body_walking_right" -frame_progress = 0.7253901 +animation = &"dbase_body_idle_back" [node name="Head" parent="." index="5" unique_id=1860680538] position = Vector2(-6, 0) @@ -439,4 +450,6 @@ frame_progress = 0.95167845 position = Vector2(0, 3) sprite_frames = SubResource("SpriteFrames_wbero") animation = &"dbase_legs_walking_left" -frame_progress = 0.3296052 +frame_progress = 0.040086176 + +[connection signal="change_animation" from="." to="." method="listen_to_animation_signals"]