From ab3bc74284215b87deab694b51b9cc1db6dcb17d Mon Sep 17 00:00:00 2001
From: rainlizard <15337628+rainlizard@users.noreply.github.com>
Date: Sat, 2 Dec 2023 15:18:20 +1100
Subject: [PATCH] adjustments

---
 Autoload/Things.gd                            | 22 -------------------
 .../crucials/anim0950/AnimDungeonHeart.tres   |  2 +-
 dk_images/food/anim0822/AnimChicken.tres      |  2 +-
 dk_images/food/anim0898/AnimEggGrowing1.tres  |  2 +-
 dk_images/food/anim0900/AnimEggWobbling3.tres |  2 +-
 dk_images/food/anim0901/AnimEggCracking4.tres |  2 +-
 dk_images/furniture/anim0791/AnimCandle.tres  |  2 +-
 .../AnimFlagpoleBlue.tres                     |  2 +-
 .../AnimFlagpoleGreen.tres                    |  2 +-
 .../flagpole_redflag_tp/AnimFlagpoleRed.tres  |  2 +-
 .../AnimFlagpoleWhite.tres                    |  2 +-
 .../AnimFlagpoleYellow.tres                   |  2 +-
 .../scavenge_eye_tp/AnimScavengerEye.tres     |  2 +-
 .../AnimTrainingMachine.tres                  |  2 +-
 .../AnimWorkshopMachine.tres                  |  2 +-
 .../anim0798/AnimTempleSpangle.tres           |  2 +-
 .../anim0799/AnimYellowHeartFlame.tres        |  2 +-
 .../anim0800/AnimGreenHeartFlame.tres         |  2 +-
 .../anim0801/AnimRedHeartFlame.tres           |  2 +-
 .../anim0802/AnimBlueHeartFlame.tres          |  2 +-
 .../magic_fogs/anim0854/AnimCastedSight.tres  |  2 +-
 .../anim0782/AnimePowerHandGold.tres          |  2 +-
 .../power_hand/anim0783/AnimePowerHand.tres   |  2 +-
 .../anim0784/AnimePowerHandGrab.tres          |  2 +-
 .../anim0786/AnimePowerHandWhip.tres          |  2 +-
 dk_images/statues/anim0952/AnimLitStatue.tres |  2 +-
 dk_images/traps_doors/anim0116/AnimBox.tres   |  2 +-
 .../traps_doors/anim0811/AnimSpinningKey.tres |  2 +-
 .../valuables/gold_pot_tp/AnimGoldPot.tres    |  2 +-
 .../anim0144/AnimLairBileDemon.tres           |  2 +-
 .../creature_bug/anim0142/AnimLairBeetle.tres |  2 +-
 31 files changed, 30 insertions(+), 52 deletions(-)

diff --git a/Autoload/Things.gd b/Autoload/Things.gd
index e2fee9ad..c2e749d7 100644
--- a/Autoload/Things.gd
+++ b/Autoload/Things.gd
@@ -113,28 +113,6 @@ func _init():
 	default_data["DATA_EFFECTGEN"] = DATA_EFFECTGEN.duplicate(true)
 	default_data["DATA_CREATURE"] = DATA_CREATURE.duplicate(true)
 	default_data["DATA_OBJECT"] = DATA_OBJECT.duplicate(true)
-	
-	adjust_animated_texture_fps()
-
-func adjust_animated_texture_fps():
-	# Calculate the new FPS based on the number of frames
-	
-	for key in DATA_OBJECT.keys():
-		var object_data = DATA_OBJECT[key]
-		var aniTextureID = object_data[TEXTURE]
-		if aniTextureID is AnimatedTexture:
-			var frameCount = aniTextureID.frames  # For example, you could just use the frame count as FPS
-			var newFPS
-			if frameCount < 12:
-				newFPS = 10
-			if frameCount >= 12:
-				newFPS = 20
-			aniTextureID.fps = newFPS
-	
-	# Dungeon Heart FPS
-	DATA_OBJECT[5][TEXTURE].fps = 10
-
-
 
 
 func data_structure(thingType):
diff --git a/dk_images/crucials/anim0950/AnimDungeonHeart.tres b/dk_images/crucials/anim0950/AnimDungeonHeart.tres
index adfd6f20..4aa2506c 100644
--- a/dk_images/crucials/anim0950/AnimDungeonHeart.tres
+++ b/dk_images/crucials/anim0950/AnimDungeonHeart.tres
@@ -17,7 +17,7 @@
 [resource]
 flags = 9
 frames = 12
-fps = 15.0
+fps = 10.0
 frame_0/texture = ExtResource( 2 )
 frame_1/texture = ExtResource( 8 )
 frame_1/delay_sec = 0.0
diff --git a/dk_images/food/anim0822/AnimChicken.tres b/dk_images/food/anim0822/AnimChicken.tres
index 5ff62d88..ae0fa5d9 100644
--- a/dk_images/food/anim0822/AnimChicken.tres
+++ b/dk_images/food/anim0822/AnimChicken.tres
@@ -35,7 +35,7 @@
 [resource]
 flags = 9
 frames = 30
-fps = 15.0
+fps = 10.0
 frame_0/texture = ExtResource( 2 )
 frame_1/texture = ExtResource( 13 )
 frame_1/delay_sec = 0.0
diff --git a/dk_images/food/anim0898/AnimEggGrowing1.tres b/dk_images/food/anim0898/AnimEggGrowing1.tres
index d98a6407..c65b9ef6 100644
--- a/dk_images/food/anim0898/AnimEggGrowing1.tres
+++ b/dk_images/food/anim0898/AnimEggGrowing1.tres
@@ -10,7 +10,7 @@
 [resource]
 flags = 9
 frames = 5
-fps = 15.0
+fps = 10.0
 frame_0/texture = ExtResource( 4 )
 frame_1/texture = ExtResource( 2 )
 frame_1/delay_sec = 0.0
diff --git a/dk_images/food/anim0900/AnimEggWobbling3.tres b/dk_images/food/anim0900/AnimEggWobbling3.tres
index 9d397569..6af82d9c 100644
--- a/dk_images/food/anim0900/AnimEggWobbling3.tres
+++ b/dk_images/food/anim0900/AnimEggWobbling3.tres
@@ -9,7 +9,7 @@
 [resource]
 flags = 9
 frames = 4
-fps = 15.0
+fps = 10.0
 frame_0/texture = ExtResource( 3 )
 frame_1/texture = ExtResource( 2 )
 frame_1/delay_sec = 0.0
diff --git a/dk_images/food/anim0901/AnimEggCracking4.tres b/dk_images/food/anim0901/AnimEggCracking4.tres
index 0bf041ef..d07f1d0c 100644
--- a/dk_images/food/anim0901/AnimEggCracking4.tres
+++ b/dk_images/food/anim0901/AnimEggCracking4.tres
@@ -26,7 +26,7 @@
 [resource]
 flags = 9
 frames = 21
-fps = 15.0
+fps = 10.0
 frame_0/texture = ExtResource( 12 )
 frame_1/texture = ExtResource( 19 )
 frame_1/delay_sec = 0.0
diff --git a/dk_images/furniture/anim0791/AnimCandle.tres b/dk_images/furniture/anim0791/AnimCandle.tres
index 6ff6d1ef..f6eaf925 100644
--- a/dk_images/furniture/anim0791/AnimCandle.tres
+++ b/dk_images/furniture/anim0791/AnimCandle.tres
@@ -9,7 +9,7 @@
 [resource]
 flags = 9
 frames = 4
-fps = 15.0
+fps = 10.0
 frame_0/texture = ExtResource( 2 )
 frame_1/texture = ExtResource( 3 )
 frame_1/delay_sec = 0.0
diff --git a/dk_images/furniture/flagpole_blueflag_tp/AnimFlagpoleBlue.tres b/dk_images/furniture/flagpole_blueflag_tp/AnimFlagpoleBlue.tres
index e1fe7daf..b8a0c4ad 100644
--- a/dk_images/furniture/flagpole_blueflag_tp/AnimFlagpoleBlue.tres
+++ b/dk_images/furniture/flagpole_blueflag_tp/AnimFlagpoleBlue.tres
@@ -13,7 +13,7 @@
 [resource]
 flags = 9
 frames = 8
-fps = 15.0
+fps = 12.0
 frame_0/texture = ExtResource( 6 )
 frame_1/texture = ExtResource( 2 )
 frame_1/delay_sec = 0.0
diff --git a/dk_images/furniture/flagpole_greenflag_tp/AnimFlagpoleGreen.tres b/dk_images/furniture/flagpole_greenflag_tp/AnimFlagpoleGreen.tres
index c294a203..a0b938ba 100644
--- a/dk_images/furniture/flagpole_greenflag_tp/AnimFlagpoleGreen.tres
+++ b/dk_images/furniture/flagpole_greenflag_tp/AnimFlagpoleGreen.tres
@@ -13,7 +13,7 @@
 [resource]
 flags = 9
 frames = 8
-fps = 15.0
+fps = 12.0
 frame_0/texture = ExtResource( 5 )
 frame_1/texture = ExtResource( 4 )
 frame_1/delay_sec = 0.0
diff --git a/dk_images/furniture/flagpole_redflag_tp/AnimFlagpoleRed.tres b/dk_images/furniture/flagpole_redflag_tp/AnimFlagpoleRed.tres
index 7c5afc9e..fbfd1a3e 100644
--- a/dk_images/furniture/flagpole_redflag_tp/AnimFlagpoleRed.tres
+++ b/dk_images/furniture/flagpole_redflag_tp/AnimFlagpoleRed.tres
@@ -13,7 +13,7 @@
 [resource]
 flags = 9
 frames = 8
-fps = 15.0
+fps = 12.0
 frame_0/texture = ExtResource( 2 )
 frame_1/texture = ExtResource( 7 )
 frame_1/delay_sec = 0.0
diff --git a/dk_images/furniture/flagpole_whiteflag_tp/AnimFlagpoleWhite.tres b/dk_images/furniture/flagpole_whiteflag_tp/AnimFlagpoleWhite.tres
index c0b69a19..42235760 100644
--- a/dk_images/furniture/flagpole_whiteflag_tp/AnimFlagpoleWhite.tres
+++ b/dk_images/furniture/flagpole_whiteflag_tp/AnimFlagpoleWhite.tres
@@ -13,7 +13,7 @@
 [resource]
 flags = 9
 frames = 8
-fps = 15.0
+fps = 12.0
 frame_0/texture = ExtResource( 7 )
 frame_1/texture = ExtResource( 8 )
 frame_1/delay_sec = 0.0
diff --git a/dk_images/furniture/flagpole_yellowflag_tp/AnimFlagpoleYellow.tres b/dk_images/furniture/flagpole_yellowflag_tp/AnimFlagpoleYellow.tres
index ab099d47..09959c02 100644
--- a/dk_images/furniture/flagpole_yellowflag_tp/AnimFlagpoleYellow.tres
+++ b/dk_images/furniture/flagpole_yellowflag_tp/AnimFlagpoleYellow.tres
@@ -13,7 +13,7 @@
 [resource]
 flags = 9
 frames = 8
-fps = 15.0
+fps = 12.0
 frame_0/texture = ExtResource( 2 )
 frame_1/texture = ExtResource( 7 )
 frame_1/delay_sec = 0.0
diff --git a/dk_images/furniture/scavenge_eye_tp/AnimScavengerEye.tres b/dk_images/furniture/scavenge_eye_tp/AnimScavengerEye.tres
index 53bb18ec..733d34ba 100644
--- a/dk_images/furniture/scavenge_eye_tp/AnimScavengerEye.tres
+++ b/dk_images/furniture/scavenge_eye_tp/AnimScavengerEye.tres
@@ -13,7 +13,7 @@
 [resource]
 flags = 9
 frames = 8
-fps = 15.0
+fps = 12.0
 frame_0/texture = ExtResource( 3 )
 frame_1/texture = ExtResource( 9 )
 frame_1/delay_sec = 0.0
diff --git a/dk_images/furniture/training_machine_tp/AnimTrainingMachine.tres b/dk_images/furniture/training_machine_tp/AnimTrainingMachine.tres
index 62a933a2..9659c6fb 100644
--- a/dk_images/furniture/training_machine_tp/AnimTrainingMachine.tres
+++ b/dk_images/furniture/training_machine_tp/AnimTrainingMachine.tres
@@ -17,7 +17,7 @@
 [resource]
 flags = 9
 frames = 12
-fps = 20.0
+fps = 15.0
 frame_0/texture = ExtResource( 10 )
 frame_1/texture = ExtResource( 7 )
 frame_1/delay_sec = 0.0
diff --git a/dk_images/furniture/workshop_machine_tp/AnimWorkshopMachine.tres b/dk_images/furniture/workshop_machine_tp/AnimWorkshopMachine.tres
index 348c4649..89982796 100644
--- a/dk_images/furniture/workshop_machine_tp/AnimWorkshopMachine.tres
+++ b/dk_images/furniture/workshop_machine_tp/AnimWorkshopMachine.tres
@@ -13,7 +13,7 @@
 [resource]
 flags = 9
 frames = 8
-fps = 15.0
+fps = 12.0
 frame_0/texture = ExtResource( 6 )
 frame_1/texture = ExtResource( 9 )
 frame_1/delay_sec = 0.0
diff --git a/dk_images/magic_fogs/anim0798/AnimTempleSpangle.tres b/dk_images/magic_fogs/anim0798/AnimTempleSpangle.tres
index b3628f48..f13a4a84 100644
--- a/dk_images/magic_fogs/anim0798/AnimTempleSpangle.tres
+++ b/dk_images/magic_fogs/anim0798/AnimTempleSpangle.tres
@@ -13,7 +13,7 @@
 [resource]
 flags = 9
 frames = 8
-fps = 15.0
+fps = 20.0
 frame_0/texture = ExtResource( 2 )
 frame_1/texture = ExtResource( 7 )
 frame_1/delay_sec = 0.0
diff --git a/dk_images/magic_fogs/anim0799/AnimYellowHeartFlame.tres b/dk_images/magic_fogs/anim0799/AnimYellowHeartFlame.tres
index 6da426d7..6bb1af35 100644
--- a/dk_images/magic_fogs/anim0799/AnimYellowHeartFlame.tres
+++ b/dk_images/magic_fogs/anim0799/AnimYellowHeartFlame.tres
@@ -21,7 +21,7 @@
 [resource]
 flags = 9
 frames = 16
-fps = 15.0
+fps = 20.0
 frame_0/texture = ExtResource( 9 )
 frame_1/texture = ExtResource( 15 )
 frame_1/delay_sec = 0.0
diff --git a/dk_images/magic_fogs/anim0800/AnimGreenHeartFlame.tres b/dk_images/magic_fogs/anim0800/AnimGreenHeartFlame.tres
index 2c1e7760..780bf95e 100644
--- a/dk_images/magic_fogs/anim0800/AnimGreenHeartFlame.tres
+++ b/dk_images/magic_fogs/anim0800/AnimGreenHeartFlame.tres
@@ -21,7 +21,7 @@
 [resource]
 flags = 9
 frames = 16
-fps = 15.0
+fps = 20.0
 frame_0/texture = ExtResource( 10 )
 frame_1/texture = ExtResource( 2 )
 frame_1/delay_sec = 0.0
diff --git a/dk_images/magic_fogs/anim0801/AnimRedHeartFlame.tres b/dk_images/magic_fogs/anim0801/AnimRedHeartFlame.tres
index 1e4495ae..3aea9057 100644
--- a/dk_images/magic_fogs/anim0801/AnimRedHeartFlame.tres
+++ b/dk_images/magic_fogs/anim0801/AnimRedHeartFlame.tres
@@ -21,7 +21,7 @@
 [resource]
 flags = 9
 frames = 16
-fps = 15.0
+fps = 20.0
 frame_0/texture = ExtResource( 5 )
 frame_1/texture = ExtResource( 3 )
 frame_1/delay_sec = 0.0
diff --git a/dk_images/magic_fogs/anim0802/AnimBlueHeartFlame.tres b/dk_images/magic_fogs/anim0802/AnimBlueHeartFlame.tres
index 9900702a..3d55ceb9 100644
--- a/dk_images/magic_fogs/anim0802/AnimBlueHeartFlame.tres
+++ b/dk_images/magic_fogs/anim0802/AnimBlueHeartFlame.tres
@@ -21,7 +21,7 @@
 [resource]
 flags = 9
 frames = 16
-fps = 15.0
+fps = 20.0
 frame_0/texture = ExtResource( 2 )
 frame_1/texture = ExtResource( 14 )
 frame_1/delay_sec = 0.0
diff --git a/dk_images/magic_fogs/anim0854/AnimCastedSight.tres b/dk_images/magic_fogs/anim0854/AnimCastedSight.tres
index a08b2573..f030df7d 100644
--- a/dk_images/magic_fogs/anim0854/AnimCastedSight.tres
+++ b/dk_images/magic_fogs/anim0854/AnimCastedSight.tres
@@ -17,7 +17,7 @@
 [resource]
 flags = 9
 frames = 12
-fps = 15.0
+fps = 12.0
 frame_0/texture = ExtResource( 3 )
 frame_1/texture = ExtResource( 2 )
 frame_1/delay_sec = 0.0
diff --git a/dk_images/power_hand/anim0782/AnimePowerHandGold.tres b/dk_images/power_hand/anim0782/AnimePowerHandGold.tres
index 6166a4e6..c84649be 100644
--- a/dk_images/power_hand/anim0782/AnimePowerHandGold.tres
+++ b/dk_images/power_hand/anim0782/AnimePowerHandGold.tres
@@ -9,7 +9,7 @@
 [resource]
 flags = 9
 frames = 4
-fps = 15.0
+fps = 10.0
 frame_0/texture = ExtResource( 3 )
 frame_1/texture = ExtResource( 4 )
 frame_1/delay_sec = 0.0
diff --git a/dk_images/power_hand/anim0783/AnimePowerHand.tres b/dk_images/power_hand/anim0783/AnimePowerHand.tres
index 2458ff13..72932614 100644
--- a/dk_images/power_hand/anim0783/AnimePowerHand.tres
+++ b/dk_images/power_hand/anim0783/AnimePowerHand.tres
@@ -13,7 +13,7 @@
 [resource]
 flags = 9
 frames = 8
-fps = 15.0
+fps = 12.0
 frame_0/texture = ExtResource( 2 )
 frame_1/texture = ExtResource( 3 )
 frame_1/delay_sec = 0.0
diff --git a/dk_images/power_hand/anim0784/AnimePowerHandGrab.tres b/dk_images/power_hand/anim0784/AnimePowerHandGrab.tres
index e92f0d58..f4961f1f 100644
--- a/dk_images/power_hand/anim0784/AnimePowerHandGrab.tres
+++ b/dk_images/power_hand/anim0784/AnimePowerHandGrab.tres
@@ -9,7 +9,7 @@
 [resource]
 flags = 9
 frames = 4
-fps = 15.0
+fps = 12.0
 frame_0/texture = ExtResource( 3 )
 frame_1/texture = ExtResource( 2 )
 frame_1/delay_sec = 0.0
diff --git a/dk_images/power_hand/anim0786/AnimePowerHandWhip.tres b/dk_images/power_hand/anim0786/AnimePowerHandWhip.tres
index c38a0a4b..f19149c0 100644
--- a/dk_images/power_hand/anim0786/AnimePowerHandWhip.tres
+++ b/dk_images/power_hand/anim0786/AnimePowerHandWhip.tres
@@ -13,7 +13,7 @@
 [resource]
 flags = 9
 frames = 8
-fps = 15.0
+fps = 12.0
 frame_0/texture = ExtResource( 2 )
 frame_1/texture = ExtResource( 3 )
 frame_1/delay_sec = 0.0
diff --git a/dk_images/statues/anim0952/AnimLitStatue.tres b/dk_images/statues/anim0952/AnimLitStatue.tres
index af13eb7f..eda702db 100644
--- a/dk_images/statues/anim0952/AnimLitStatue.tres
+++ b/dk_images/statues/anim0952/AnimLitStatue.tres
@@ -9,7 +9,7 @@
 [resource]
 flags = 9
 frames = 4
-fps = 15.0
+fps = 10.0
 frame_0/texture = ExtResource( 5 )
 frame_1/texture = ExtResource( 3 )
 frame_1/delay_sec = 0.0
diff --git a/dk_images/traps_doors/anim0116/AnimBox.tres b/dk_images/traps_doors/anim0116/AnimBox.tres
index b5045ed3..ffef8bd0 100644
--- a/dk_images/traps_doors/anim0116/AnimBox.tres
+++ b/dk_images/traps_doors/anim0116/AnimBox.tres
@@ -21,7 +21,7 @@
 [resource]
 flags = 9
 frames = 16
-fps = 15.0
+fps = 20.0
 frame_0/texture = ExtResource( 16 )
 frame_1/texture = ExtResource( 12 )
 frame_1/delay_sec = 0.0
diff --git a/dk_images/traps_doors/anim0811/AnimSpinningKey.tres b/dk_images/traps_doors/anim0811/AnimSpinningKey.tres
index 96621dda..d9f7bafa 100644
--- a/dk_images/traps_doors/anim0811/AnimSpinningKey.tres
+++ b/dk_images/traps_doors/anim0811/AnimSpinningKey.tres
@@ -21,7 +21,7 @@
 [resource]
 flags = 9
 frames = 16
-fps = 15.0
+fps = 20.0
 frame_0/texture = ExtResource( 6 )
 frame_1/texture = ExtResource( 9 )
 frame_1/delay_sec = 0.0
diff --git a/dk_images/valuables/gold_pot_tp/AnimGoldPot.tres b/dk_images/valuables/gold_pot_tp/AnimGoldPot.tres
index def36515..0d001efc 100644
--- a/dk_images/valuables/gold_pot_tp/AnimGoldPot.tres
+++ b/dk_images/valuables/gold_pot_tp/AnimGoldPot.tres
@@ -11,7 +11,7 @@
 [resource]
 flags = 9
 frames = 6
-fps = 15.0
+fps = 10.0
 frame_0/texture = ExtResource( 5 )
 frame_1/texture = ExtResource( 7 )
 frame_1/delay_sec = 0.0
diff --git a/edited_images/lair/creature_biledemon/anim0144/AnimLairBileDemon.tres b/edited_images/lair/creature_biledemon/anim0144/AnimLairBileDemon.tres
index 2b5893dc..8e69aad6 100644
--- a/edited_images/lair/creature_biledemon/anim0144/AnimLairBileDemon.tres
+++ b/edited_images/lair/creature_biledemon/anim0144/AnimLairBileDemon.tres
@@ -13,7 +13,7 @@
 [resource]
 flags = 9
 frames = 8
-fps = 15.0
+fps = 12.0
 frame_0/texture = ExtResource( 7 )
 frame_1/texture = ExtResource( 6 )
 frame_1/delay_sec = 0.0
diff --git a/edited_images/lair/creature_bug/anim0142/AnimLairBeetle.tres b/edited_images/lair/creature_bug/anim0142/AnimLairBeetle.tres
index 432e18b6..b9710cbe 100644
--- a/edited_images/lair/creature_bug/anim0142/AnimLairBeetle.tres
+++ b/edited_images/lair/creature_bug/anim0142/AnimLairBeetle.tres
@@ -13,7 +13,7 @@
 [resource]
 flags = 9
 frames = 8
-fps = 15.0
+fps = 12.0
 frame_0/texture = ExtResource( 2 )
 frame_1/texture = ExtResource( 3 )
 frame_1/delay_sec = 0.0