Skip to content

Commit

Permalink
fixed anims
Browse files Browse the repository at this point in the history
  • Loading branch information
@rainlizard
rainlizard committed Dec 3, 2023
1 parent 8ce060a commit 0399088
Show file tree
Hide file tree
Showing 46 changed files with 57 additions and 101 deletions.
111 changes: 55 additions & 56 deletions addons/animated_texture_but_better/animated_texture_but_better.gd
View file
Original file line number Diff line number Diff line change
@@ -1,58 +1,57 @@
tool
extends AnimatedTexture

const ALLOWED_FILE_EXTENSIONS: PoolStringArray = PoolStringArray([
"png", "jpg", "jpeg", "gif", "tiff", "tif"
])

export(String, DIR) var sprites_dir: String setget set_sprites_dir

#func _init():
# set_sprites_dir_automatically()

func set_sprites_dir(new_sprites_dir: String):
sprites_dir = new_sprites_dir
update_sprites()

#func set_sprites_dir_automatically():
# var plugin = Engine.get_main_loop().find_node("AnimatedTextureButBetterPlugin", true, false)
# if plugin:
# sprites_dir = plugin.get_current_resource_directory()
# update_sprites()

func update_sprites():
frames = 1

if not sprites_dir:
set_frame_texture(0, null)

var dir: Directory = Directory.new()
if dir.open(sprites_dir) == OK:
dir.list_dir_begin()

var file_name: String = dir.get_next()
var texture_id: int = -1
while file_name:
var name_extension_split: PoolStringArray = (
file_name.rsplit(".", true, 1)
)

if name_extension_split.size() >= 2 and name_extension_split[1] in ALLOWED_FILE_EXTENSIONS:
var texture_id_split: Array = name_extension_split[0].rsplit("_", true, 1)

if texture_id_split.size() >= 2 and texture_id_split[1].is_valid_integer():
texture_id = int(texture_id_split[1])
else:
texture_id += 1

if texture_id + 1 > frames:
frames = texture_id + 1

set_frame_texture(
texture_id,
load("%s/%s" % [sprites_dir, file_name])
)

file_name = dir.get_next()

dir.list_dir_end()
#const ALLOWED_FILE_EXTENSIONS: PoolStringArray = PoolStringArray([
# "png", "jpg", "jpeg", "gif", "tiff", "tif"
#])
#
#export(String, DIR) var sprites_dir: String setget set_sprites_dir
#
##func _init():
## set_sprites_dir_automatically()
#
#func set_sprites_dir(new_sprites_dir: String):
# sprites_dir = new_sprites_dir
# update_sprites()
#
##func set_sprites_dir_automatically():
## var plugin = Engine.get_main_loop().find_node("AnimatedTextureButBetterPlugin", true, false)
## if plugin:
## sprites_dir = plugin.get_current_resource_directory()
## update_sprites()
#
#func update_sprites():
# frames = 1
#
# if not sprites_dir:
# set_frame_texture(0, null)
#
# var dir: Directory = Directory.new()
# if dir.open(sprites_dir) == OK:
# dir.list_dir_begin()
#
# var file_name: String = dir.get_next()
# var texture_id: int = -1
# while file_name:
# var name_extension_split: PoolStringArray = (
# file_name.rsplit(".", true, 1)
# )
#
# if name_extension_split.size() >= 2 and name_extension_split[1] in ALLOWED_FILE_EXTENSIONS:
# var texture_id_split: Array = name_extension_split[0].rsplit("_", true, 1)
#
# if texture_id_split.size() >= 2 and texture_id_split[1].is_valid_integer():
# texture_id = int(texture_id_split[1])
# else:
# texture_id += 1
#
# if texture_id + 1 > frames:
# frames = texture_id + 1
#
# set_frame_texture(
# texture_id,
# load("%s/%s" % [sprites_dir, file_name])
# )
#
# file_name = dir.get_next()
#
# dir.list_dir_end()
1 change: 0 additions & 1 deletion dk_images/crucials/anim0780/AnimHeroGate.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,3 @@ frame_14/delay_sec = 0.0
frame_15/texture = ExtResource( 15 )
frame_15/delay_sec = 0.0
script = ExtResource( 1 )
sprites_dir = "res://dk_images/crucials/anim0780/"
1 change: 0 additions & 1 deletion dk_images/crucials/anim0950/AnimDungeonHeart.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,3 @@ frame_10/delay_sec = 0.0
frame_11/texture = ExtResource( 4 )
frame_11/delay_sec = 0.0
script = ExtResource( 1 )
sprites_dir = "res://dk_images/crucials/anim0950/"
1 change: 0 additions & 1 deletion dk_images/food/anim0822/AnimChicken.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,4 +96,3 @@ frame_28/delay_sec = 0.0
frame_29/texture = ExtResource( 10 )
frame_29/delay_sec = 0.0
script = ExtResource( 1 )
sprites_dir = "res://dk_images/food/anim0822/"
1 change: 0 additions & 1 deletion dk_images/food/anim0898/AnimEggGrowing1.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,3 @@ frame_3/delay_sec = 0.0
frame_4/texture = ExtResource( 5 )
frame_4/delay_sec = 0.0
script = ExtResource( 1 )
sprites_dir = "res://dk_images/food/anim0898/"
1 change: 0 additions & 1 deletion dk_images/food/anim0900/AnimEggWobbling3.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,3 @@ frame_2/delay_sec = 0.0
frame_3/texture = ExtResource( 5 )
frame_3/delay_sec = 0.0
script = ExtResource( 1 )
sprites_dir = "res://dk_images/food/anim0900/"
1 change: 0 additions & 1 deletion dk_images/food/anim0901/AnimEggCracking4.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,3 @@ frame_19/delay_sec = 0.0
frame_20/texture = ExtResource( 10 )
frame_20/delay_sec = 0.0
script = ExtResource( 1 )
sprites_dir = "res://dk_images/food/anim0901/"
1 change: 0 additions & 1 deletion dk_images/furniture/anim0892/AnimSpike.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,3 @@ frame_14/delay_sec = 0.0
frame_15/texture = ExtResource( 4 )
frame_15/delay_sec = 0.0
script = ExtResource( 1 )
sprites_dir = "res://dk_images/furniture/anim0892/"
1 change: 0 additions & 1 deletion dk_images/furniture/flagpole_blueflag_tp/AnimFlagpoleBlue.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,3 @@ frame_6/delay_sec = 0.0
frame_7/texture = ExtResource( 9 )
frame_7/delay_sec = 0.0
script = ExtResource( 1 )
sprites_dir = "res://dk_images/furniture/flagpole_blueflag_tp/"
1 change: 0 additions & 1 deletion dk_images/furniture/flagpole_greenflag_tp/AnimFlagpoleGreen.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,3 @@ frame_6/delay_sec = 0.0
frame_7/texture = ExtResource( 7 )
frame_7/delay_sec = 0.0
script = ExtResource( 1 )
sprites_dir = "res://dk_images/furniture/flagpole_greenflag_tp/"
1 change: 0 additions & 1 deletion dk_images/furniture/flagpole_redflag_tp/AnimFlagpoleRed.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,3 @@ frame_6/delay_sec = 0.0
frame_7/texture = ExtResource( 6 )
frame_7/delay_sec = 0.0
script = ExtResource( 1 )
sprites_dir = "res://dk_images/furniture/flagpole_redflag_tp/"
1 change: 0 additions & 1 deletion dk_images/furniture/flagpole_yellowflag_tp/AnimFlagpoleYellow.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,3 @@ frame_6/delay_sec = 0.0
frame_7/texture = ExtResource( 6 )
frame_7/delay_sec = 0.0
script = ExtResource( 1 )
sprites_dir = "res://dk_images/furniture/flagpole_yellowflag_tp/"
1 change: 0 additions & 1 deletion dk_images/furniture/scavenge_eye_tp/AnimScavengerEye.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,3 @@ frame_6/delay_sec = 0.0
frame_7/texture = ExtResource( 6 )
frame_7/delay_sec = 0.0
script = ExtResource( 1 )
sprites_dir = "res://dk_images/furniture/scavenge_eye_tp/"
1 change: 0 additions & 1 deletion dk_images/furniture/training_machine_tp/AnimTrainingMachine.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,3 @@ frame_10/delay_sec = 0.0
frame_11/texture = ExtResource( 5 )
frame_11/delay_sec = 0.0
script = ExtResource( 1 )
sprites_dir = "res://dk_images/furniture/training_machine_tp/"
1 change: 0 additions & 1 deletion dk_images/furniture/workshop_machine_tp/AnimWorkshopMachine.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,3 @@ frame_6/delay_sec = 0.0
frame_7/texture = ExtResource( 3 )
frame_7/delay_sec = 0.0
script = ExtResource( 1 )
sprites_dir = "res://dk_images/furniture/workshop_machine_tp/"
1 change: 0 additions & 1 deletion dk_images/magic_fogs/anim0798/AnimTempleSpangle.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,3 @@ frame_6/delay_sec = 0.0
frame_7/texture = ExtResource( 3 )
frame_7/delay_sec = 0.0
script = ExtResource( 1 )
sprites_dir = "res://dk_images/magic_fogs/anim0798/"
1 change: 0 additions & 1 deletion dk_images/magic_fogs/anim0799/AnimYellowHeartFlame.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,3 @@ frame_14/delay_sec = 0.0
frame_15/texture = ExtResource( 6 )
frame_15/delay_sec = 0.0
script = ExtResource( 1 )
sprites_dir = "res://dk_images/magic_fogs/anim0799"
1 change: 0 additions & 1 deletion dk_images/magic_fogs/anim0800/AnimGreenHeartFlame.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,3 @@ frame_14/delay_sec = 0.0
frame_15/texture = ExtResource( 9 )
frame_15/delay_sec = 0.0
script = ExtResource( 1 )
sprites_dir = "res://dk_images/magic_fogs/anim0800/"
1 change: 0 additions & 1 deletion dk_images/magic_fogs/anim0801/AnimRedHeartFlame.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,3 @@ frame_14/delay_sec = 0.0
frame_15/texture = ExtResource( 7 )
frame_15/delay_sec = 0.0
script = ExtResource( 1 )
sprites_dir = "res://dk_images/magic_fogs/anim0801/"
1 change: 0 additions & 1 deletion dk_images/magic_fogs/anim0802/AnimBlueHeartFlame.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,3 @@ frame_14/delay_sec = 0.0
frame_15/texture = ExtResource( 7 )
frame_15/delay_sec = 0.0
script = ExtResource( 1 )
sprites_dir = "res://dk_images/magic_fogs/anim0802/"
1 change: 0 additions & 1 deletion dk_images/magic_fogs/anim0854/AnimCastedSight.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,3 @@ frame_10/delay_sec = 0.0
frame_11/texture = ExtResource( 13 )
frame_11/delay_sec = 0.0
script = ExtResource( 1 )
sprites_dir = "res://dk_images/magic_fogs/anim0854/"
1 change: 0 additions & 1 deletion dk_images/power_hand/anim0782/AnimePowerHandGold.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,3 @@ frame_2/delay_sec = 0.0
frame_3/texture = ExtResource( 2 )
frame_3/delay_sec = 0.0
script = ExtResource( 1 )
sprites_dir = "res://dk_images/power_hand/anim0782/"
1 change: 0 additions & 1 deletion dk_images/power_hand/anim0783/AnimePowerHand.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,3 @@ frame_6/delay_sec = 0.0
frame_7/texture = ExtResource( 6 )
frame_7/delay_sec = 0.0
script = ExtResource( 1 )
sprites_dir = "res://dk_images/power_hand/anim0783/"
1 change: 0 additions & 1 deletion dk_images/power_hand/anim0784/AnimePowerHandGrab.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,3 @@ frame_2/delay_sec = 0.0
frame_3/texture = ExtResource( 5 )
frame_3/delay_sec = 0.0
script = ExtResource( 1 )
sprites_dir = "res://dk_images/power_hand/anim0784/"
1 change: 0 additions & 1 deletion dk_images/power_hand/anim0786/AnimePowerHandWhip.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,3 @@ frame_6/delay_sec = 0.0
frame_7/texture = ExtResource( 7 )
frame_7/delay_sec = 0.0
script = ExtResource( 1 )
sprites_dir = "res://dk_images/power_hand/anim0786/"
1 change: 0 additions & 1 deletion dk_images/statues/anim0952/AnimLitStatue.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,3 @@ frame_2/delay_sec = 0.0
frame_3/texture = ExtResource( 2 )
frame_3/delay_sec = 0.0
script = ExtResource( 1 )
sprites_dir = "res://dk_images/statues/anim0952/"
1 change: 0 additions & 1 deletion dk_images/traps_doors/anim0116/AnimBox.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,3 @@ frame_14/delay_sec = 0.0
frame_15/texture = ExtResource( 8 )
frame_15/delay_sec = 0.0
script = ExtResource( 1 )
sprites_dir = "res://dk_images/traps_doors/anim0116/"
1 change: 0 additions & 1 deletion dk_images/traps_doors/anim0811/AnimSpinningKey.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,3 @@ frame_14/delay_sec = 0.0
frame_15/texture = ExtResource( 5 )
frame_15/delay_sec = 0.0
script = ExtResource( 1 )
sprites_dir = "res://dk_images/traps_doors/anim0811/"
1 change: 0 additions & 1 deletion dk_images/valuables/gold_hoard1_tp/AnimGoldHoard1.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,3 @@ frame_2/delay_sec = 0.0
frame_3/texture = ExtResource( 5 )
frame_3/delay_sec = 0.0
script = ExtResource( 1 )
sprites_dir = "res://dk_images/valuables/gold_hoard1_tp/"
1 change: 0 additions & 1 deletion dk_images/valuables/gold_hoard2_tp/AnimGoldHoard2.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,3 @@ frame_2/delay_sec = 0.0
frame_3/texture = ExtResource( 3 )
frame_3/delay_sec = 0.0
script = ExtResource( 1 )
sprites_dir = "res://dk_images/valuables/gold_hoard2_tp/"
1 change: 0 additions & 1 deletion dk_images/valuables/gold_hoard3_tp/AnimGoldHoard3.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,3 @@ frame_2/delay_sec = 0.0
frame_3/texture = ExtResource( 5 )
frame_3/delay_sec = 0.0
script = ExtResource( 1 )
sprites_dir = "res://dk_images/valuables/gold_hoard3_tp/"
1 change: 0 additions & 1 deletion dk_images/valuables/gold_hoard4_tp/AnimGoldHoard4.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,3 @@ frame_2/delay_sec = 0.0
frame_3/texture = ExtResource( 4 )
frame_3/delay_sec = 0.0
script = ExtResource( 1 )
sprites_dir = "res://dk_images/valuables/gold_hoard4_tp/"
1 change: 0 additions & 1 deletion dk_images/valuables/gold_hoard5_tp/AnimGoldHoard5.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,3 @@ frame_2/delay_sec = 0.0
frame_3/texture = ExtResource( 2 )
frame_3/delay_sec = 0.0
script = ExtResource( 1 )
sprites_dir = "res://dk_images/valuables/gold_hoard5_tp/"
1 change: 0 additions & 1 deletion dk_images/valuables/gold_pot_tp/AnimGoldPot.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,3 @@ frame_4/delay_sec = 0.0
frame_5/texture = ExtResource( 2 )
frame_5/delay_sec = 0.0
script = ExtResource( 1 )
sprites_dir = "res://dk_images/valuables/gold_pot_tp/"
1 change: 0 additions & 1 deletion edited_images/lair/creature_biledemon/anim0144/AnimLairBileDemon.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,3 @@ frame_6/delay_sec = 0.0
frame_7/texture = ExtResource( 2 )
frame_7/delay_sec = 0.0
script = ExtResource( 1 )
sprites_dir = "res://edited_images/lair/creature_biledemon/anim0144/"
1 change: 0 additions & 1 deletion edited_images/lair/creature_bug/anim0142/AnimLairBeetle.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,3 @@ frame_6/delay_sec = 0.0
frame_7/texture = ExtResource( 8 )
frame_7/delay_sec = 0.0
script = ExtResource( 1 )
sprites_dir = "res://edited_images/lair/creature_bug/anim0142/"
1 change: 0 additions & 1 deletion edited_images/lair/creature_dkmistress/anim0148/AnimLairMistress.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,3 @@ frame_2/delay_sec = 0.0
frame_3/texture = ExtResource( 3 )
frame_3/delay_sec = 0.0
script = ExtResource( 1 )
sprites_dir = "res://edited_images/lair/creature_dkmistress/anim0148/"
1 change: 0 additions & 1 deletion edited_images/lair/creature_dragon/anim0154/AnimLairDragon.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,3 @@ frame_2/delay_sec = 0.0
frame_3/texture = ExtResource( 3 )
frame_3/delay_sec = 0.0
script = ExtResource( 1 )
sprites_dir = "res://edited_images/lair/creature_dragon/anim0154/"
1 change: 0 additions & 1 deletion edited_images/lair/creature_fly/anim0150/AnimLairFly.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,3 @@ frame_2/delay_sec = 0.0
frame_3/texture = ExtResource( 3 )
frame_3/delay_sec = 0.0
script = ExtResource( 1 )
sprites_dir = "res://edited_images/lair/creature_fly/anim0150/"
1 change: 0 additions & 1 deletion edited_images/lair/creature_generic/anim0126/AnimLairGeneric.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,3 @@ frame_2/delay_sec = 0.0
frame_3/texture = ExtResource( 2 )
frame_3/delay_sec = 0.0
script = ExtResource( 1 )
sprites_dir = "res://edited_images/lair/creature_generic/anim0126/"
1 change: 0 additions & 1 deletion edited_images/lair/creature_horny/anim0160/AnimLairHornedReaper.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,3 @@ frame_2/delay_sec = 0.0
frame_3/texture = ExtResource( 2 )
frame_3/delay_sec = 0.0
script = ExtResource( 1 )
sprites_dir = "res://edited_images/lair/creature_horny/anim0160/"
1 change: 0 additions & 1 deletion edited_images/lair/creature_skeleton/anim0158/AnimLairSkeleton.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,3 @@ frame_2/delay_sec = 0.0
frame_3/texture = ExtResource( 5 )
frame_3/delay_sec = 0.0
script = ExtResource( 1 )
sprites_dir = "res://edited_images/lair/creature_skeleton/anim0158/"
1 change: 0 additions & 1 deletion edited_images/lair/creature_spider/anim0138/AnimLairSpider.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,3 @@ frame_2/delay_sec = 0.0
frame_3/texture = ExtResource( 5 )
frame_3/delay_sec = 0.0
script = ExtResource( 1 )
sprites_dir = "res://edited_images/lair/creature_spider/anim0138/"
1 change: 0 additions & 1 deletion edited_images/lair/creature_warlock/anim0146/AnimLairWarlock.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,3 @@ frame_2/delay_sec = 0.0
frame_3/texture = ExtResource( 3 )
frame_3/delay_sec = 0.0
script = ExtResource( 1 )
sprites_dir = "res://edited_images/lair/creature_warlock/anim0146/"
2 changes: 1 addition & 1 deletion export_presets.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ custom_features=""
export_filter="all_resources"
include_filter="unearthdata/*"
exclude_filter="*.cfg, unearthdata/tmapa*"
export_path="/bin/ExportWindows/Unearth/Unearth.exe"
export_path="../../../AI/Unearth.exe"
script_export_mode=1
script_encryption_key=""

Expand Down
2 changes: 1 addition & 1 deletion project.godot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ window/dpi/allow_hidpi=true

[editor_plugins]

enabled=PoolStringArray( "res://addons/GDScriptMacros/plugin.cfg", "res://addons/IncludeOnExport/plugin.cfg", "res://addons/SingletonScriptsShortcut/plugin.cfg", "res://addons/UnearthEditorPlugin/plugin.cfg", "res://addons/animated_texture_but_better/plugin.cfg", "res://addons/godot-plugin-refresher/plugin.cfg" )
enabled=PoolStringArray( "res://addons/GDScriptMacros/plugin.cfg", "res://addons/IncludeOnExport/plugin.cfg", "res://addons/SingletonScriptsShortcut/plugin.cfg", "res://addons/UnearthEditorPlugin/plugin.cfg", "res://addons/godot-plugin-refresher/plugin.cfg" )

[gd2cs]

Expand Down

0 comments on commit 0399088

Please sign in to comment.