adjustments

rainlizard · Dec 2, 2023 · ab3bc74 · ab3bc74
1 parent 9fcb7c8
commit ab3bc74
Show file tree

Hide file tree

Showing 31 changed files with 30 additions and 52 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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