diff --git a/.gitignore b/.gitignore index 63d8ad9f..04a9dcee 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ custom_slabs.cfg custom_objects.cfg unearthdata/tmapa0* +unearthdata/tmapb0* textures ### Godot ### diff --git a/Autoload/Constants.gd b/Autoload/Constants.gd index 01de71c7..143abc5a 100644 --- a/Autoload/Constants.gd +++ b/Autoload/Constants.gd @@ -1,10 +1,11 @@ extends Node const TILE_SIZE = 96 const SUBTILE_SIZE = 32 - -const ownerFloorCol = [Color8(132,44,0,255), Color8(136,112,148,255), Color8(52,92,4,255), Color8(188,156,0,255), Color8(207,207,207,255), Color8(52,36,4,255)] #Color8(180,160,124,255) -const ownerRoomCol = [Color8(156,48,0,255), Color8(160,136,180,255), Color8(56,112,12,255), Color8(228,212,0,255), Color8(242,242,242,255), Color8(0,0,0,0)] #Color8(188,168,132,255) -const ownershipNames = ["Red","Blue","Green","Yellow","White","None"] +const PLAYERS_COUNT = 9 +# red blue green yellow white neutral Purple Black Orange +const ownerFloorCol = [Color8(132,44,0,255), Color8(136,112,148,255), Color8(52, 92, 4,255), Color8(188,156,0,255), Color8(207,207,207,255), Color8(52,36,4,255), Color8(171, 80,120,255), Color8(32,32,32,255), Color8(188,108,53,255)] #Color8(180,160,124,255) +const ownerRoomCol = [Color8(156,48,0,255), Color8(160,136,180,255), Color8(56,112,12,255), Color8(228,212,0,255), Color8(242,242,242,255), Color8(0,0,0,0), Color8(200,104,164,255), Color8(1,1,1,255), Color8(211,132,72,255)] #Color8(188,168,132,255) +const ownershipNames = ["Red","Blue","Green","Yellow","White","None","Purple","Black","Orange"] const listOrientations = [ 0, # ANGLE_NORTH diff --git a/Autoload/Cube.gd b/Autoload/Cube.gd index 16391e72..52e73519 100644 --- a/Autoload/Cube.gd +++ b/Autoload/Cube.gd @@ -15,14 +15,14 @@ enum { NONE = 5 } const ownedCube = { - "FloorMarker" : [192,193,194,195,199,198], - "WallMarker" : [67,68,69,70,71,4], - "PortalMarker" : [382,422,423,424,426,425], - "HeartMarker" : [382,422,423,424,426,425], - "BarracksFlag" : [393,427,428,429,431,430], - "BannerLeft" : [160,410,413,416,419,77], - "BannerMiddle" : [161,411,414,417,420,77], - "BannerRight" : [162,412,415,418,421,77], + "FloorMarker" : [192,193,194,195,199,198,455,462,469], + "WallMarker" : [67, 68, 69, 70, 71, 448,454,461,468], + "PortalMarker" : [382,422,423,424,426,425,452,459,466], + "HeartMarker" : [382,422,423,424,426,425,452,459,466], + "BarracksFlag" : [393,427,428,429,431,430,453,460,467], + "BannerLeft" : [160,410,413,416,419,445,449,456,463], + "BannerMiddle" : [161,411,414,417,420,446,450,457,464], + "BannerRight" : [162,412,415,418,421,447,451,458,465], } const rngCube = { diff --git a/Autoload/Things.gd b/Autoload/Things.gd index bfa4eeb8..b72a98f6 100644 --- a/Autoload/Things.gd +++ b/Autoload/Things.gd @@ -332,6 +332,14 @@ var DATA_OBJECT = { 134 : ["Armageddon", null,null, preload("res://dk_images/keepower_64/armagedn_std.png"), null, TAB_SPELL], 135 : ["Possess", null,null, preload("res://dk_images/keepower_64/possess_std.png"), null, TAB_SPELL], 136 : ["Gold Bag (100)", null,null, preload("res://dk_images/valuables/gold_sack_tp/r1frame01.png"), null, TAB_GOLD], +161 : ["White Flag", null,null, preload("res://dk_images/furniture/flagpole_whiteflag_tp/AnimFlagpoleWhite.tres"), null, TAB_FURNITURE], +162 : ["White Heart Flame", null,null, preload("res://edited_images/heartflames/heartflame_white/AnimWhiteHeartFlame.tres"), null, TAB_FURNITURE], +164 : ["Purple Flag", null,null, preload("res://dk_images/furniture/flagpole_purpleflag_tp/AnimFlagpolePurple.tres"), null, TAB_FURNITURE], +165 : ["Purple Heart Flame", null,null, preload("res://edited_images/heartflames/heartflame_purple/AnimPurpleHeartFlame.tres"), null, TAB_FURNITURE], +166 : ["Black Flag", null,null, preload("res://dk_images/furniture/flagpole_blackflag_tp/AnimFlagpoleBlack.tres"), null, TAB_FURNITURE], +167 : ["Black Heart Flame", null,null, preload("res://edited_images/heartflames/heartflame_black/AnimBlackHeartFlame.tres"), null, TAB_FURNITURE], +168 : ["Orange Flag", null,null, preload("res://dk_images/furniture/flagpole_orangeflag_tp/AnimFlagpoleOrange.tres"), null, TAB_FURNITURE], +169 : ["Orange Heart Flame", null,null, preload("res://edited_images/heartflames/heartflame_orange/AnimOrangeHeartFlame.tres"), null, TAB_FURNITURE], } var LIST_OF_BOXES = { diff --git a/Autoload/Version.gd b/Autoload/Version.gd index 777c5d6c..43d9f939 100644 --- a/Autoload/Version.gd +++ b/Autoload/Version.gd @@ -1,6 +1,6 @@ extends Node -var major_minor = "0.44" +var major_minor = "0.45" var patch = "0000" var full = "" var unearth_map_format_version:float = 1.05 diff --git a/Scenes/CurrentTextures.gd b/Scenes/CurrentTextures.gd index 3aeac003..cad9511c 100644 --- a/Scenes/CurrentTextures.gd +++ b/Scenes/CurrentTextures.gd @@ -17,8 +17,7 @@ onready var oColumnEditorVoxelView = Nodelist.list["oColumnEditorVoxelView"] onready var oMapProperties = Nodelist.list["oMapProperties"] const IMAGE_FORMAT = Image.FORMAT_RGB8 -const textureWidth = 256 -const textureHeight = 2176 + enum { LOADING_NOT_STARTED LOADING_IN_PROGRESS @@ -45,6 +44,7 @@ func _notification(what: int): yield(get_tree(),'idle_frame') oMapProperties._on_MapProperties_visibility_changed() # Refresh list of styles if it's visible + func _on_ReloadTextureMapsButton_pressed(): if texturesLoadedState != LOADING_IN_PROGRESS: # Don't do anything if it's already doing something oMessage.quick("Reloading tilesets") @@ -96,6 +96,7 @@ func start(): if oDataSlab.get_cell(0,0) != -1: set_current_texture_pack() + func scan_dk_data_directory(): var path = oGame.DK_DATA_DIRECTORY var dictionary = {} @@ -105,7 +106,7 @@ func scan_dk_data_directory(): var fileName = dir.get_next() while fileName != "": if dir.current_is_dir() == false: - if fileName.to_upper().begins_with("TMAPA") == true: # Get file regardless of case (case insensitive) + if fileName.to_upper().begins_with("TMAP") == true: # Get file regardless of case (case insensitive) if fileName.to_upper().get_extension() == "DAT": if fileName.to_upper().begins_with("TMAPANIM") == false: var getModifiedTime = File.new().get_modified_time(path.plus_file(fileName)) @@ -121,25 +122,33 @@ func convert_tmapa_to_image(tmapaDatPath): var file = File.new() if file.open(tmapaDatPath, File.READ) == OK: CODETIME_START = OS.get_ticks_msec() + var imageSize = file.get_len() # (Width * Height) - var img = Image.new() - img.create(textureWidth, textureHeight, false, IMAGE_FORMAT) - file.seek(0) - img.lock() - for y in textureHeight: - for x in textureWidth: - var paletteIndex = file.get_8() - img.set_pixel(x,y,paletteData[paletteIndex]) - img.unlock() - - print('Converted tmapa*.dat to image in: '+str(OS.get_ticks_msec()-CODETIME_START)+'ms') + var dkTextureData = file.get_buffer(imageSize) file.close() + var data = PoolByteArray() + data.resize(256 * 2176 * 3) + data.fill(0) # Any space that goes beyond the size of tmapb will be set to black + + var idx = 0 + for i in imageSize: + var color = paletteData[dkTextureData[i]] + data[idx] = color.r8 + data[idx + 1] = color.g8 + data[idx + 2] = color.b8 + idx += 3 + + var img = Image.new() + img.create_from_data(256, 2176, false, IMAGE_FORMAT, data) + + print("Converted " + str(tmapaDatPath.get_file()) + " to image in: " + str(OS.get_ticks_msec() - CODETIME_START) + "ms") return img else: print("Failed to open file.") return null + func save_image_as_png(img, inputPath): var fileName = inputPath.get_file().get_basename().to_lower() + ".png" @@ -152,36 +161,49 @@ func save_image_as_png(img, inputPath): func load_cache_filename(path): var fileName = path.get_file().get_basename().to_lower() - var cachePath = Settings.unearthdata.plus_file(fileName + ".png") + + if(fileName.to_lower().find("tmapa") == -1): + return + + var cachePathtmapa = Settings.unearthdata.plus_file(fileName + ".png") + var cachePathtmapb = Settings.unearthdata.plus_file(fileName.replace("tmapa","tmapb") + ".png") var tmapaNumber = int(fileName.to_lower().trim_prefix("tmapa")) # Get the specific position to create within the array - - if File.new().file_exists(cachePath) == true: + + if File.new().file_exists(cachePathtmapa) == true: # Need to call load() on an Image class if I want the save and load to work correctly (otherwise it saves too fast and doesn't load or something) - var img = Image.new() - img.load(cachePath) - load_image_into_cache(img, tmapaNumber) + var imgA = Image.new() + imgA.load(cachePathtmapa) + var imgB = Image.new() + imgB.load(cachePathtmapb) + load_image_into_cache(imgA, imgB, tmapaNumber) #print('Loaded cache file: ' + cachePath) return OK else: - print('Cache file not found: ' + cachePath) + print('Cache file not found: ' + cachePathtmapa) cachedTextures.clear() return FAILED -func load_image_into_cache(img, tmapaNumber): + +func load_image_into_cache(imgA, imgB, tmapaNumber): tmapaNumber = int(tmapaNumber) while cachedTextures.size() <= tmapaNumber: # Fill all array positions, in case a tmapa00#.dat file inbetween is deleted cachedTextures.append([null, null]) - cachedTextures[tmapaNumber] = convert_img_to_two_texture_arrays(img) + cachedTextures[tmapaNumber] = convert_img_to_two_texture_arrays(imgA,imgB) + # SLICE COUNT being too high is the reason TextureArray doesn't work on old PC. (NOT IMAGE SIZE, NOT MIPMAPS EITHER) # RES files might actually take longer to generate a TextureArray from than PNG, not sure. -func convert_img_to_two_texture_arrays(img): - if img.get_format() != IMAGE_FORMAT: - img.convert(IMAGE_FORMAT) - +func convert_img_to_two_texture_arrays(imgA,imgB): + if imgA.get_format() != IMAGE_FORMAT: + imgA.convert(IMAGE_FORMAT) + if imgB.get_format() != IMAGE_FORMAT: + imgB.convert(IMAGE_FORMAT) + var twoTextureArrays = [ TextureArray.new(), TextureArray.new(), + TextureArray.new(), + TextureArray.new(), ] var xSlices = 8 var ySlices = 34 @@ -189,20 +211,27 @@ func convert_img_to_two_texture_arrays(img): var sliceHeight = 32 #img.get_height() / ySlices; twoTextureArrays[0].create(sliceWidth, sliceHeight, xSlices*ySlices, IMAGE_FORMAT, TextureLayered.FLAG_MIPMAPS+TextureLayered.FLAG_ANISOTROPIC_FILTER) twoTextureArrays[1].create(sliceWidth, sliceHeight, xSlices*ySlices, IMAGE_FORMAT, TextureLayered.FLAG_MIPMAPS+TextureLayered.FLAG_ANISOTROPIC_FILTER) + twoTextureArrays[2].create(sliceWidth, sliceHeight, xSlices*ySlices, IMAGE_FORMAT, TextureLayered.FLAG_MIPMAPS+TextureLayered.FLAG_ANISOTROPIC_FILTER) + twoTextureArrays[3].create(sliceWidth, sliceHeight, xSlices*ySlices, IMAGE_FORMAT, TextureLayered.FLAG_MIPMAPS+TextureLayered.FLAG_ANISOTROPIC_FILTER) - for i in 2: + for i in 4: var yOffset = 0 - if i == 1: + if i == 1 or i == 3: yOffset = 34 for y in ySlices: for x in xSlices: - var slice = img.get_rect(Rect2(x*sliceWidth, (y+yOffset)*sliceHeight, sliceWidth, sliceHeight)) + var slice + if i < 2: + slice = imgA.get_rect(Rect2(x*sliceWidth, (y+yOffset)*sliceHeight, sliceWidth, sliceHeight)) + else: + slice = imgB.get_rect(Rect2(x*sliceWidth, (y+yOffset)*sliceHeight, sliceWidth, sliceHeight)) slice.generate_mipmaps() #Important otherwise it's black when zoomed out twoTextureArrays[i].set_layer_data(slice, (y*xSlices)+x) return twoTextureArrays + func set_current_texture_pack(): var value = oDataLevelStyle.data @@ -215,29 +244,39 @@ func set_current_texture_pack(): # 2D if oOverheadGraphics.arrayOfColorRects.size() > 0: - oOverheadGraphics.arrayOfColorRects[0].get_material().set_shader_param("dkTextureMap_Split_A", cachedTextures[value][0]) - oOverheadGraphics.arrayOfColorRects[0].get_material().set_shader_param("dkTextureMap_Split_B", cachedTextures[value][1]) + oOverheadGraphics.arrayOfColorRects[0].get_material().set_shader_param("dkTextureMap_Split_A1", cachedTextures[value][0]) + oOverheadGraphics.arrayOfColorRects[0].get_material().set_shader_param("dkTextureMap_Split_A2", cachedTextures[value][1]) + oOverheadGraphics.arrayOfColorRects[0].get_material().set_shader_param("dkTextureMap_Split_B1", cachedTextures[value][2]) + oOverheadGraphics.arrayOfColorRects[0].get_material().set_shader_param("dkTextureMap_Split_B2", cachedTextures[value][3]) # 3D if oGame3D.materialArray.size() > 0: - oGame3D.materialArray[0].set_shader_param("dkTextureMap_Split_A", cachedTextures[value][0]) - oGame3D.materialArray[0].set_shader_param("dkTextureMap_Split_B", cachedTextures[value][1]) + oGame3D.materialArray[0].set_shader_param("dkTextureMap_Split_A1", cachedTextures[value][0]) + oGame3D.materialArray[0].set_shader_param("dkTextureMap_Split_A2", cachedTextures[value][1]) + oGame3D.materialArray[0].set_shader_param("dkTextureMap_Split_B1", cachedTextures[value][2]) + oGame3D.materialArray[0].set_shader_param("dkTextureMap_Split_B2", cachedTextures[value][3]) for nodeID in get_tree().get_nodes_in_group("VoxelViewer"): if nodeID.oAllVoxelObjects.mesh != null: - nodeID.oAllVoxelObjects.mesh.surface_get_material(0).set_shader_param("dkTextureMap_Split_A", cachedTextures[value][0]) - nodeID.oAllVoxelObjects.mesh.surface_get_material(0).set_shader_param("dkTextureMap_Split_B", cachedTextures[value][1]) + nodeID.oAllVoxelObjects.mesh.surface_get_material(0).set_shader_param("dkTextureMap_Split_A1", cachedTextures[value][0]) + nodeID.oAllVoxelObjects.mesh.surface_get_material(0).set_shader_param("dkTextureMap_Split_A2", cachedTextures[value][1]) + nodeID.oAllVoxelObjects.mesh.surface_get_material(0).set_shader_param("dkTextureMap_Split_B1", cachedTextures[value][2]) + nodeID.oAllVoxelObjects.mesh.surface_get_material(0).set_shader_param("dkTextureMap_Split_B2", cachedTextures[value][3]) if nodeID.oSelectedVoxelObject.mesh != null: - nodeID.oSelectedVoxelObject.mesh.surface_get_material(0).set_shader_param("dkTextureMap_Split_A", cachedTextures[value][0]) - nodeID.oSelectedVoxelObject.mesh.surface_get_material(0).set_shader_param("dkTextureMap_Split_B", cachedTextures[value][1]) + nodeID.oSelectedVoxelObject.mesh.surface_get_material(0).set_shader_param("dkTextureMap_Split_A1", cachedTextures[value][0]) + nodeID.oSelectedVoxelObject.mesh.surface_get_material(0).set_shader_param("dkTextureMap_Split_A2", cachedTextures[value][1]) + nodeID.oSelectedVoxelObject.mesh.surface_get_material(0).set_shader_param("dkTextureMap_Split_B1", cachedTextures[value][2]) + nodeID.oSelectedVoxelObject.mesh.surface_get_material(0).set_shader_param("dkTextureMap_Split_B2", cachedTextures[value][3]) assign_textures_to_slab_window(value) func assign_textures_to_slab_window(value): # Called by SlabStyleWindow for nodeID in get_tree().get_nodes_in_group("SlabDisplay"): - nodeID.get_material().set_shader_param("dkTextureMap_Split_A", cachedTextures[value][0]) - nodeID.get_material().set_shader_param("dkTextureMap_Split_B", cachedTextures[value][1]) + nodeID.get_material().set_shader_param("dkTextureMap_Split_A1", cachedTextures[value][0]) + nodeID.get_material().set_shader_param("dkTextureMap_Split_A2", cachedTextures[value][1]) + nodeID.get_material().set_shader_param("dkTextureMap_Split_B1", cachedTextures[value][2]) + nodeID.get_material().set_shader_param("dkTextureMap_Split_B2", cachedTextures[value][3]) diff --git a/Scenes/GenerateTerrainOLD.gd b/Scenes/GenerateTerrainOLD.gd index 7580fed6..4ec008c3 100644 --- a/Scenes/GenerateTerrainOLD.gd +++ b/Scenes/GenerateTerrainOLD.gd @@ -239,8 +239,10 @@ func create_surface_materials(): var mat = ShaderMaterial.new() mat.shader = preload("res://Shaders/display_texture_3d.shader") - mat.set_shader_param("dkTextureMap_Split_A", oTextureCache.cachedTextures[map][0]) - mat.set_shader_param("dkTextureMap_Split_B", oTextureCache.cachedTextures[map][1]) + mat.set_shader_param("dkTextureMap_Split_A1", oTextureCache.cachedTextures[map][0]) + mat.set_shader_param("dkTextureMap_Split_A2", oTextureCache.cachedTextures[map][1]) + mat.set_shader_param("dkTextureMap_Split_B1", oTextureCache.cachedTextures[map][2]) + mat.set_shader_param("dkTextureMap_Split_B2", oTextureCache.cachedTextures[map][3]) mat.set_shader_param("animationDatabase", preload("res://Shaders/textureanimationdatabase.png")) materialArray.append(mat) diff --git a/Scenes/GenericGridItem.gd b/Scenes/GenericGridItem.gd new file mode 100644 index 00000000..c5331446 --- /dev/null +++ b/Scenes/GenericGridItem.gd @@ -0,0 +1,45 @@ +extends PanelContainer + +signal pressed + +var img_normal setget set_image_normal +var img_pressed +var img_hover +var img_margin = 0 +var orig_backcol + +func _ready(): + if img_normal: + $TextureRect.texture = img_normal + orig_backcol = get_stylebox("panel").bg_color + + + get_stylebox("panel").content_margin_left = img_margin + get_stylebox("panel").content_margin_right = img_margin + get_stylebox("panel").content_margin_top = img_margin + get_stylebox("panel").content_margin_bottom = img_margin + +func _on_GenericGridItem_mouse_entered(): + if img_hover: + $TextureRect.texture = img_hover + + get_stylebox("panel").bg_color = orig_backcol * 1.25 + +func _on_GenericGridItem_mouse_exited(): + if img_normal: + $TextureRect.texture = img_normal + + get_stylebox("panel").bg_color = orig_backcol + +func _on_GenericGridItem_gui_input(event): + if event is InputEventMouseButton: + if event.pressed and event.button_index == BUTTON_LEFT: + if img_pressed: + $TextureRect.texture = img_pressed + emit_signal("pressed") + else: + $TextureRect.texture = img_normal + +func set_image_normal(setVal): + $TextureRect.texture = setVal + img_normal = setVal diff --git a/Scenes/GenericGridItem.tscn b/Scenes/GenericGridItem.tscn index e07b3901..381c5422 100644 --- a/Scenes/GenericGridItem.tscn +++ b/Scenes/GenericGridItem.tscn @@ -1,8 +1,37 @@ -[gd_scene format=2] +[gd_scene load_steps=3 format=2] -[node name="GenericGridItem" type="TextureButton"] -anchor_right = 1.0 -anchor_bottom = 1.0 -focus_mode = 0 +[ext_resource path="res://Scenes/GenericGridItem.gd" type="Script" id=1] + +[sub_resource type="StyleBoxFlat" id=1] +resource_local_to_scene = true +content_margin_left = 0.0 +content_margin_right = 0.0 +content_margin_top = 0.0 +content_margin_bottom = 0.0 +bg_color = Color( 0.20976, 0.1932, 0.23, 1 ) +border_width_left = 1 +border_width_top = 1 +border_width_right = 1 +border_width_bottom = 1 +border_color = Color( 1, 1, 1, 0.25098 ) +shadow_color = Color( 0.117647, 0.113725, 0.133333, 1 ) +shadow_size = 1 +shadow_offset = Vector2( 8, 8 ) + +[node name="GenericGridItem" type="PanelContainer"] +mouse_filter = 1 +size_flags_horizontal = 3 +size_flags_vertical = 3 +custom_styles/panel = SubResource( 1 ) +script = ExtResource( 1 ) + +[node name="TextureRect" type="TextureRect" parent="."] +mouse_filter = 2 +size_flags_horizontal = 3 +size_flags_vertical = 3 expand = true -stretch_mode = 5 +stretch_mode = 6 + +[connection signal="gui_input" from="." to="." method="_on_GenericGridItem_gui_input"] +[connection signal="mouse_entered" from="." to="." method="_on_GenericGridItem_mouse_entered"] +[connection signal="mouse_exited" from="." to="." method="_on_GenericGridItem_mouse_exited"] diff --git a/Scenes/Guidelines.gd b/Scenes/Guidelines.gd index 0bc9d4b2..c73681e2 100644 --- a/Scenes/Guidelines.gd +++ b/Scenes/Guidelines.gd @@ -16,7 +16,7 @@ func _draw(): var size2 = M.ySize if i == 0 else M.xSize var center = floor(size1 * 0.5) - var offset = 0.5 if size1 % 2 == 1 else 0 + var offset = 0.5 if size1 % 2 == 1 else 0.0 var thickness = 0.15 var start = Vector2(center + offset - thickness, 0) diff --git a/Scenes/InstanceOwnership.gd b/Scenes/InstanceOwnership.gd index d617c447..81809ca7 100644 --- a/Scenes/InstanceOwnership.gd +++ b/Scenes/InstanceOwnership.gd @@ -9,16 +9,19 @@ var materialInstanceOwnership = [ a.duplicate(), # 3 a.duplicate(), # 4 a.duplicate(), # 5 + a.duplicate(), # 6 + a.duplicate(), # 7 + a.duplicate(), # 8 ] func _ready(): #print(materialInstanceOwnership) - for i in 6: + for i in Constants.PLAYERS_COUNT: materialInstanceOwnership[i].set_shader_param("ownerCol", Constants.ownerRoomCol[i]) materialInstanceOwnership[i].set_shader_param("alphaFilled", 0.5) func _process(delta): - for i in 6: # 0 to 5 + for i in Constants.PLAYERS_COUNT: # 0 to 8 materialInstanceOwnership[i].set_shader_param("fadeAlpha", 1.0-oOverheadOwnership.alphaFadeColor[i]) if i == 5: materialInstanceOwnership[i].set_shader_param("ownerCol", Constants.ownerRoomCol[Random.choose([0,1,2,3])]) diff --git a/Scenes/Instances.gd b/Scenes/Instances.gd index 60b72006..8adc0a37 100644 --- a/Scenes/Instances.gd +++ b/Scenes/Instances.gd @@ -14,6 +14,7 @@ onready var oSelector = Nodelist.list["oSelector"] onready var oPlaceThingsAnywhere = Nodelist.list["oPlaceThingsAnywhere"] onready var oOnlyOwnership = Nodelist.list["oOnlyOwnership"] onready var oDataOwnership = Nodelist.list["oDataOwnership"] +onready var oCurrentFormat = Nodelist.list["oCurrentFormat"] var thingScn = preload("res://Scenes/ThingInstance.tscn") @@ -397,8 +398,11 @@ func spawn_attached(xSlab, ySlab, slabID, ownership, subtile, tngObj): # Spawns 1: id.subtype = 116 # Blue 2: id.subtype = 117 # Green 3: id.subtype = 118 # Yellow - 4: kill_instance(id) # White - 5: id.subtype = 119 # None + 4: id.subtype = 161 # White + 5:id.subtype = 119 # None + 6: id.subtype = 164 # Purple + 7: id.subtype = 166 # Black + 8: id.subtype = 168 # Orange elif slabID == Slabs.DUNGEON_HEART: if tngObj[Slabset.obj.THING_SUBTYPE] == 111: # Heart Flame (Red) match ownership: @@ -406,8 +410,15 @@ func spawn_attached(xSlab, ySlab, slabID, ownership, subtile, tngObj): # Spawns 1: id.subtype = 120 # Blue 2: id.subtype = 121 # Green 3: id.subtype = 122 # Yellow - 4: kill_instance(id) # White + 4: + if oCurrentFormat.selected == 0: # Classic + kill_instance(id) # White + else: + id.subtype = 162 # White 5: kill_instance(id) # None + 6: id.subtype = 165 # Purple + 7: id.subtype = 167 # Black + 8: id.subtype = 169 # Orange add_child(id) diff --git a/Scenes/Main.tscn b/Scenes/Main.tscn index dccca380..fb9bac32 100644 --- a/Scenes/Main.tscn +++ b/Scenes/Main.tscn @@ -203,12 +203,18 @@ shader_param/alphaFadeColor2 = 1.0 shader_param/alphaFadeColor3 = 1.0 shader_param/alphaFadeColor4 = 1.0 shader_param/alphaFadeColor5 = 1.0 +shader_param/alphaFadeColor6 = 1.0 +shader_param/alphaFadeColor7 = 1.0 +shader_param/alphaFadeColor8 = 1.0 shader_param/color0 = null shader_param/color1 = null shader_param/color2 = null shader_param/color3 = null shader_param/color4 = null shader_param/color5 = null +shader_param/color6 = null +shader_param/color7 = null +shader_param/color8 = null [sub_resource type="ShaderMaterial" id=23] shader = ExtResource( 150 ) @@ -696,6 +702,8 @@ margin_right = 151.0 margin_bottom = 302.0 size_flags_horizontal = 6 size_flags_vertical = 6 +custom_constants/vseparation = 0 +custom_constants/hseparation = 0 [node name="WallSlabs" type="PanelContainer" parent="Ui/UiTools/PickSlabWindow/VBoxContainer/SlabTabs/TabFolder"] visible = false @@ -717,6 +725,8 @@ margin_right = 464.0 margin_bottom = 85.0 size_flags_horizontal = 6 size_flags_vertical = 6 +custom_constants/vseparation = 0 +custom_constants/hseparation = 0 [node name="CustomSlabsTab" type="PanelContainer" parent="Ui/UiTools/PickSlabWindow/VBoxContainer/SlabTabs/TabFolder"] visible = false @@ -739,6 +749,8 @@ margin_right = 464.0 margin_bottom = 85.0 size_flags_horizontal = 6 size_flags_vertical = 6 +custom_constants/vseparation = 0 +custom_constants/hseparation = 0 [node name="SlabStyle" type="PanelContainer" parent="Ui/UiTools/PickSlabWindow/VBoxContainer/SlabTabs/TabFolder"] visible = false @@ -764,6 +776,8 @@ margin_right = 61.0 margin_bottom = 82.0 size_flags_horizontal = 6 size_flags_vertical = 6 +custom_constants/vseparation = 0 +custom_constants/hseparation = 0 [node name="OnlyOwnership" type="PanelContainer" parent="Ui/UiTools/PickSlabWindow/VBoxContainer/SlabTabs/TabFolder"] visible = false @@ -789,6 +803,8 @@ margin_right = 61.0 margin_bottom = 82.0 size_flags_horizontal = 6 size_flags_vertical = 6 +custom_constants/vseparation = 0 +custom_constants/hseparation = 0 [node name="Clippy" type="Control" parent="Ui/UiTools/PickSlabWindow"] anchor_right = 1.0 @@ -882,6 +898,8 @@ margin_right = 316.0 margin_bottom = 82.0 size_flags_horizontal = 6 size_flags_vertical = 6 +custom_constants/vseparation = 0 +custom_constants/hseparation = 0 [node name="Spell" type="PanelContainer" parent="Ui/UiTools/PickThingWindow/VBoxContainer/ThingTabs/TabFolder"] visible = false @@ -903,6 +921,8 @@ margin_right = 626.0 margin_bottom = 90.0 size_flags_horizontal = 6 size_flags_vertical = 6 +custom_constants/vseparation = 0 +custom_constants/hseparation = 0 [node name="Trap" type="PanelContainer" parent="Ui/UiTools/PickThingWindow/VBoxContainer/ThingTabs/TabFolder"] visible = false @@ -924,6 +944,8 @@ margin_right = 626.0 margin_bottom = 90.0 size_flags_horizontal = 6 size_flags_vertical = 6 +custom_constants/vseparation = 0 +custom_constants/hseparation = 0 [node name="Box" type="PanelContainer" parent="Ui/UiTools/PickThingWindow/VBoxContainer/ThingTabs/TabFolder"] visible = false @@ -945,6 +967,8 @@ margin_right = 626.0 margin_bottom = 90.0 size_flags_horizontal = 6 size_flags_vertical = 6 +custom_constants/vseparation = 0 +custom_constants/hseparation = 0 [node name="Special" type="PanelContainer" parent="Ui/UiTools/PickThingWindow/VBoxContainer/ThingTabs/TabFolder"] visible = false @@ -966,6 +990,8 @@ margin_right = 626.0 margin_bottom = 90.0 size_flags_horizontal = 6 size_flags_vertical = 6 +custom_constants/vseparation = 0 +custom_constants/hseparation = 0 [node name="Gold" type="PanelContainer" parent="Ui/UiTools/PickThingWindow/VBoxContainer/ThingTabs/TabFolder"] visible = false @@ -987,6 +1013,8 @@ margin_right = 626.0 margin_bottom = 90.0 size_flags_horizontal = 6 size_flags_vertical = 6 +custom_constants/vseparation = 0 +custom_constants/hseparation = 0 [node name="Decoration" type="PanelContainer" parent="Ui/UiTools/PickThingWindow/VBoxContainer/ThingTabs/TabFolder"] visible = false @@ -1008,6 +1036,8 @@ margin_right = 626.0 margin_bottom = 90.0 size_flags_horizontal = 6 size_flags_vertical = 6 +custom_constants/vseparation = 0 +custom_constants/hseparation = 0 [node name="Action" type="PanelContainer" parent="Ui/UiTools/PickThingWindow/VBoxContainer/ThingTabs/TabFolder"] visible = false @@ -1029,6 +1059,8 @@ margin_right = 565.0 margin_bottom = 54.0 size_flags_horizontal = 6 size_flags_vertical = 6 +custom_constants/vseparation = 0 +custom_constants/hseparation = 0 [node name="Effect" type="PanelContainer" parent="Ui/UiTools/PickThingWindow/VBoxContainer/ThingTabs/TabFolder"] visible = false @@ -1050,6 +1082,8 @@ margin_right = 626.0 margin_bottom = 90.0 size_flags_horizontal = 6 size_flags_vertical = 6 +custom_constants/vseparation = 0 +custom_constants/hseparation = 0 [node name="Furniture" type="PanelContainer" parent="Ui/UiTools/PickThingWindow/VBoxContainer/ThingTabs/TabFolder"] visible = false @@ -1071,6 +1105,8 @@ margin_right = 626.0 margin_bottom = 90.0 size_flags_horizontal = 6 size_flags_vertical = 6 +custom_constants/vseparation = 0 +custom_constants/hseparation = 0 [node name="Lair" type="PanelContainer" parent="Ui/UiTools/PickThingWindow/VBoxContainer/ThingTabs/TabFolder"] visible = false @@ -1092,6 +1128,8 @@ margin_right = 626.0 margin_bottom = 90.0 size_flags_horizontal = 6 size_flags_vertical = 6 +custom_constants/vseparation = 0 +custom_constants/hseparation = 0 [node name="Misc" type="PanelContainer" parent="Ui/UiTools/PickThingWindow/VBoxContainer/ThingTabs/TabFolder"] visible = false @@ -1113,6 +1151,8 @@ margin_right = 626.0 margin_bottom = 90.0 size_flags_horizontal = 6 size_flags_vertical = 6 +custom_constants/vseparation = 0 +custom_constants/hseparation = 0 [node name="Clippy" type="Control" parent="Ui/UiTools/PickThingWindow"] anchor_right = 1.0 @@ -1295,15 +1335,13 @@ margin_right = 276.0 margin_bottom = 46.0 script = ExtResource( 73 ) -[node name="HSeparator2" type="HSeparator" parent="Ui/UiTools/PropertiesWindow/VBoxContainer/PropertiesTabs/PlacingSettings/OwnerSelection"] -margin_right = 276.0 -margin_bottom = 1.0 - [node name="OwnershipGridContainer" type="GridContainer" parent="Ui/UiTools/PropertiesWindow/VBoxContainer/PropertiesTabs/PlacingSettings/OwnerSelection"] margin_top = 5.0 margin_right = 276.0 margin_bottom = 5.0 size_flags_horizontal = 3 +custom_constants/vseparation = 0 +custom_constants/hseparation = 0 columns = 6 [node name="UseSlabOwnerCheckBox" type="CheckBox" parent="Ui/UiTools/PropertiesWindow/VBoxContainer/PropertiesTabs/PlacingSettings/OwnerSelection"] @@ -4391,7 +4429,7 @@ size_flags_vertical = 3 [node name="VBoxContainer2" type="VBoxContainer" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/ScriptGenerator/GeneratorContainer"] margin_right = 825.0 -margin_bottom = 471.0 +margin_bottom = 570.0 size_flags_horizontal = 3 [node name="GridContainer" type="GridContainer" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/ScriptGenerator/GeneratorContainer/VBoxContainer2"] @@ -4547,6 +4585,36 @@ __meta__ = { "_edit_use_anchors_": false } +[node name="PurpleAICheckBox" type="CheckBox" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/ScriptGenerator/GeneratorContainer/VBoxContainer2/GridContainer/ScriptSection1"] +margin_top = 245.0 +margin_right = 335.0 +margin_bottom = 274.0 +hint_tooltip = "Computer PLAYER3" +text = "Purple keeper AI" +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="BlackAICheckBox" type="CheckBox" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/ScriptGenerator/GeneratorContainer/VBoxContainer2/GridContainer/ScriptSection1"] +margin_top = 245.0 +margin_right = 335.0 +margin_bottom = 274.0 +hint_tooltip = "Computer PLAYER3" +text = "Black keeper AI" +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="OrangeAICheckBox" type="CheckBox" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/ScriptGenerator/GeneratorContainer/VBoxContainer2/GridContainer/ScriptSection1"] +margin_top = 245.0 +margin_right = 335.0 +margin_bottom = 274.0 +hint_tooltip = "Computer PLAYER3" +text = "Orange keeper AI" +__meta__ = { +"_edit_use_anchors_": false +} + [node name="WinConditionCheckBox" type="CheckBox" parent="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/ScriptGenerator/GeneratorContainer/VBoxContainer2/GridContainer/ScriptSection1"] margin_top = 278.0 margin_right = 335.0 @@ -7307,7 +7375,6 @@ script = SubResource( 20 ) [connection signal="pressed" from="Ui/UiTools/PropertiesWindow/VBoxContainer/PropertiesTabs/ThingDetails/SelectionStatus/PanelContainer/SelectionStatusButton" to="Ui/UiTools/PropertiesWindow/VBoxContainer/PropertiesTabs/ThingDetails" method="_on_SelectionStatusButton_pressed"] [connection signal="pressed" from="Ui/UiTools/PropertiesWindow/VBoxContainer/PropertiesTabs/ThingDetails/SelectionStatus/PanelContainer2/DeleteSelectedButton" to="Ui/UiTools/PropertiesWindow/VBoxContainer/PropertiesTabs/ThingDetails" method="_on_DeleteSelectedButton_pressed"] [connection signal="toggled" from="Ui/UiTools/PropertiesWindow/VBoxContainer/PropertiesTabs/PlacingSettings/OwnerSelection/UseSlabOwnerCheckBox" to="Ui/UiTools/PropertiesWindow/VBoxContainer/PropertiesTabs/PlacingSettings/OwnerSelection/UseSlabOwnerCheckBox" method="_on_UseSlabOwnerCheckBox_toggled"] -[connection signal="visibility_changed" from="Ui/UiTools/PropertiesWindow/VBoxContainer/PropertiesTabs/PlacingSettings/OwnerSelection/UseSlabOwnerCheckBox" to="Ui/UiTools/PropertiesWindow/VBoxContainer/PropertiesTabs/PlacingSettings/OwnerSelection/UseSlabOwnerCheckBox" method="_on_UseSlabOwnerCheckBox_visibility_changed"] [connection signal="toggled" from="Ui/UiTools/PropertiesWindow/VBoxContainer/PropertiesTabs/PlacingSettings/EditingTools/HBoxContainer/ToolPencil" to="Ui/UiTools/PropertiesWindow/VBoxContainer/PropertiesTabs/PlacingSettings/EditingTools" method="_on_ToolPencil_toggled"] [connection signal="toggled" from="Ui/UiTools/PropertiesWindow/VBoxContainer/PropertiesTabs/PlacingSettings/EditingTools/HBoxContainer/ToolBrush" to="Ui/UiTools/PropertiesWindow/VBoxContainer/PropertiesTabs/PlacingSettings/EditingTools" method="_on_ToolBrush_toggled"] [connection signal="toggled" from="Ui/UiTools/PropertiesWindow/VBoxContainer/PropertiesTabs/PlacingSettings/EditingTools/HBoxContainer/ToolRectangle" to="Ui/UiTools/PropertiesWindow/VBoxContainer/PropertiesTabs/PlacingSettings/EditingTools" method="_on_ToolRectangle_toggled"] @@ -7417,6 +7484,9 @@ script = SubResource( 20 ) [connection signal="toggled" from="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/ScriptGenerator/GeneratorContainer/VBoxContainer2/GridContainer/ScriptSection1/BlueAICheckBox" to="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/ScriptGenerator" method="_on_BlueAICheckBox_toggled"] [connection signal="toggled" from="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/ScriptGenerator/GeneratorContainer/VBoxContainer2/GridContainer/ScriptSection1/GreenAICheckBox" to="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/ScriptGenerator" method="_on_GreenAICheckBox_toggled"] [connection signal="toggled" from="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/ScriptGenerator/GeneratorContainer/VBoxContainer2/GridContainer/ScriptSection1/YellowAICheckBox" to="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/ScriptGenerator" method="_on_YellowAICheckBox_toggled"] +[connection signal="toggled" from="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/ScriptGenerator/GeneratorContainer/VBoxContainer2/GridContainer/ScriptSection1/PurpleAICheckBox" to="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/ScriptGenerator" method="_on_PurpleAICheckBox_toggled"] +[connection signal="toggled" from="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/ScriptGenerator/GeneratorContainer/VBoxContainer2/GridContainer/ScriptSection1/BlackAICheckBox" to="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/ScriptGenerator" method="_on_BlackAICheckBox_toggled"] +[connection signal="toggled" from="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/ScriptGenerator/GeneratorContainer/VBoxContainer2/GridContainer/ScriptSection1/OrangeAICheckBox" to="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/ScriptGenerator" method="_on_OrangeAICheckBox_toggled"] [connection signal="toggled" from="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/ScriptGenerator/GeneratorContainer/VBoxContainer2/AdjustResearchCheckBox" to="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/ScriptGenerator" method="_on_AdjustResearchCheckBox_toggled"] [connection signal="value_changed" from="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/ScriptGenerator/GeneratorContainer/VBoxContainer2/ResearchOrderCategory/HBoxContainer2/WarlockAmountSpinBox" to="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/ScriptGenerator" method="_on_WarlockAmountSpinBox_value_changed"] [connection signal="value_changed" from="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/ScriptGenerator/GeneratorContainer/VBoxContainer2/ResearchOrderCategory/HBoxContainer2/WarlockLevelSpinBox" to="Ui/UiSystem/MapSettingsWindow/MapSettingsTabs/ScriptGenerator" method="_on_WarlockLevelSpinBox_value_changed"] diff --git a/Scenes/OnlyOwnership.gd b/Scenes/OnlyOwnership.gd index 3d3d515d..8f07e13a 100644 --- a/Scenes/OnlyOwnership.gd +++ b/Scenes/OnlyOwnership.gd @@ -1,14 +1,22 @@ extends PanelContainer onready var oSelection = Nodelist.list["oSelection"] onready var oPickSlabWindow = Nodelist.list["oPickSlabWindow"] +onready var oCurrentFormat = Nodelist.list["oCurrentFormat"] var scnOwnerButton = preload("res://Scenes/OnlyOwnershipButton.tscn") onready var oSelectedRect = get_node("../../../../Clippy/SelectedRect") func initialize_grid_items(): var oGridContainer = current_grid_container() + + var owner_order + if oCurrentFormat.selected == 0: # Classic format + owner_order = [0,1,2,3,4,5] + else: + owner_order = [0,1,2,3,6,7,8,4,5] + # # Add children - for i in 6: # +1 is for "Default" + for i in owner_order: var id = scnOwnerButton.instance() id.connect("pressed", self, "_on_OwnerButtonPressed", [id]) @@ -30,8 +38,11 @@ func initialize_grid_items(): 1: keeperColourIconPic.texture = preload("res://edited_images/plyrsym_32/symbol_player_blue_std.png") 2: keeperColourIconPic.texture = preload("res://edited_images/plyrsym_32/symbol_player_green_std.png") 3: keeperColourIconPic.texture = preload("res://edited_images/plyrsym_32/symbol_player_yellow_std.png") - 4: keeperColourIconPic.texture = preload("res://edited_images/plyrsym_32/symbol_player_white_2.png") + 4: keeperColourIconPic.texture = preload("res://edited_images/plyrsym_32/symbol_player_white_std.png") 5: keeperColourIconPic.texture = preload("res://edited_images/plyrsym_32/symbol_player_any_dis.png") + 6: keeperColourIconPic.texture = preload("res://edited_images/plyrsym_32/symbol_player_purple_std.png") + 7: keeperColourIconPic.texture = preload("res://edited_images/plyrsym_32/symbol_player_black_std.png") + 8: keeperColourIconPic.texture = preload("res://edited_images/plyrsym_32/symbol_player_orange_std.png") oGridContainer.add_child(id) diff --git a/Scenes/OpenMap.gd b/Scenes/OpenMap.gd index f51f8c8c..f6b5c7e7 100644 --- a/Scenes/OpenMap.gd +++ b/Scenes/OpenMap.gd @@ -46,6 +46,8 @@ onready var oThingDetails = Nodelist.list["oThingDetails"] onready var oInspector = Nodelist.list["oInspector"] onready var oGuidelines = Nodelist.list["oGuidelines"] onready var oResizeCurrentMapSize = Nodelist.list["oResizeCurrentMapSize"] +onready var oOwnerSelection = Nodelist.list["oOwnerSelection"] +onready var oScriptGenerator = Nodelist.list["oScriptGenerator"] var TOTAL_TIME_TO_OPEN_MAP @@ -246,6 +248,8 @@ func continue_load(map): func continue_load_openmap(map): oEditor.mapHasBeenEdited = false + oOwnerSelection.update_ownership_head_icons() + oScriptGenerator.update_options_based_on_mapformat() oPickSlabWindow.add_slabs() oDynamicMapTree.highlight_current_map() oCurrentMap.set_path_and_title(map) diff --git a/Scenes/OverheadGraphics.gd b/Scenes/OverheadGraphics.gd index 338f76a9..0bc51b6b 100644 --- a/Scenes/OverheadGraphics.gd +++ b/Scenes/OverheadGraphics.gd @@ -137,8 +137,10 @@ func createDisplayField(setMap, showStyle): displayField.material = mat if showStyle != 0: # Do not change the texturemap for default style - mat.set_shader_param("dkTextureMap_Split_A", oTextureCache.cachedTextures[setMap][0]) - mat.set_shader_param("dkTextureMap_Split_B", oTextureCache.cachedTextures[setMap][1]) + mat.set_shader_param("dkTextureMap_Split_A1", oTextureCache.cachedTextures[setMap][0]) + mat.set_shader_param("dkTextureMap_Split_A2", oTextureCache.cachedTextures[setMap][1]) + mat.set_shader_param("dkTextureMap_Split_B1", oTextureCache.cachedTextures[setMap][2]) + mat.set_shader_param("dkTextureMap_Split_B2", oTextureCache.cachedTextures[setMap][3]) mat.set_shader_param("showOnlySpecificStyle", showStyle) mat.set_shader_param("fieldSizeInSubtiles", Vector2((M.xSize*3), (M.ySize*3))) @@ -153,3 +155,4 @@ func update_display_fields_size(): for displayField in arrayOfColorRects: displayField.rect_size = Vector2(M.xSize * 96, M.ySize * 96) displayField.material.set_shader_param("fieldSizeInSubtiles", Vector2((M.xSize*3), (M.ySize*3))) + diff --git a/Scenes/OverheadOwnership.gd b/Scenes/OverheadOwnership.gd index 747755da..dc2c8c4e 100644 --- a/Scenes/OverheadOwnership.gd +++ b/Scenes/OverheadOwnership.gd @@ -14,7 +14,7 @@ onready var TILE_SIZE = Constants.TILE_SIZE onready var SUBTILE_SIZE = Constants.SUBTILE_SIZE #Bright -var alphaFadeColor = [1.00,1.00,1.00,1.00,1.00,1.00] +var alphaFadeColor = [1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00,1.00] const fadeSpeed = 4 var slabOwnershipImage = Image.new() var slabOwnershipTexture = ImageTexture.new() @@ -28,6 +28,9 @@ func _ready(): mat.set_shader_param("color3", Constants.ownerRoomCol[3]) mat.set_shader_param("color4", Constants.ownerRoomCol[4]) mat.set_shader_param("color5", Constants.ownerRoomCol[5]) + mat.set_shader_param("color6", Constants.ownerRoomCol[6]) + mat.set_shader_param("color7", Constants.ownerRoomCol[7]) + mat.set_shader_param("color8", Constants.ownerRoomCol[8]) set_ownership_alpha_graphics(OWNERSHIP_ALPHA) @@ -36,7 +39,7 @@ func set_ownership_alpha_graphics(value): mat.set_shader_param("outlineThickness", 5.0) mat.set_shader_param("alphaOutline", clamp(OWNERSHIP_ALPHA*2.0, 0.0, 1.0)) mat.set_shader_param("alphaFilled", OWNERSHIP_ALPHA) - for i in 6: + for i in Constants.PLAYERS_COUNT: oInstanceOwnership.materialInstanceOwnership[i].set_shader_param("alphaFilled", value) func clear(): @@ -52,7 +55,7 @@ func start(): for ySlab in M.ySize: for xSlab in M.xSize: var getOwner = oDataOwnership.get_cell_ownership(xSlab,ySlab) - if getOwner <= 5: + if getOwner < Constants.PLAYERS_COUNT: slabOwnershipImage.set_pixel(xSlab, ySlab, Constants.ownerRoomCol[getOwner]) slabOwnershipImage.unlock() @@ -125,7 +128,7 @@ func _process(delta): slabOwnershipImage.unlock() mat.set_shader_param("cursorOnColor", cursorOnColor) - for i in 6: + for i in Constants.PLAYERS_COUNT: if cursorOnColor == Constants.ownerRoomCol[i]: alphaFadeColor[i] = lerp(alphaFadeColor[i], 1.00, fadeSpeed*delta) else: diff --git a/Scenes/OwnerSelection.gd b/Scenes/OwnerSelection.gd index 7a488186..95bb3d33 100644 --- a/Scenes/OwnerSelection.gd +++ b/Scenes/OwnerSelection.gd @@ -5,47 +5,67 @@ onready var oUseSlabOwnerCheckBox = Nodelist.list["oUseSlabOwnerCheckBox"] onready var oOwnershipGridContainer = Nodelist.list["oOwnershipGridContainer"] onready var oMirrorOptions = Nodelist.list["oMirrorOptions"] onready var oCollectibleLabel = Nodelist.list["oCollectibleLabel"] - -#onready var oEditor = Nodelist.list["oEditor"] +onready var oCurrentFormat = Nodelist.list["oCurrentFormat"] onready var gridItemScene = preload("res://Scenes/GenericGridItem.tscn") -#onready var $GridContainer = $VBoxContainer/ScrollContainer/GridContainer onready var oSelectedRect = $Control/SelectedRect onready var oCenteredLabel = $Control/CenteredLabel -#export var grid_item_size : Vector2 -#export var grid_window_scale : float setget update_scale -# -var owner_order = [0,1,2,3,4,5] var ownership_available = true -func _ready(): + +func update_ownership_head_icons(): + for i in oOwnershipGridContainer.get_children(): + i.free() + + var iconSize + var owner_order + var setMargin + if oCurrentFormat.selected == 0: # Classic format + owner_order = [0,1,2,3,4,5] + oOwnershipGridContainer.columns = 6 + #oOwnershipGridContainer.set("custom_constants/hseparation", 4) + iconSize = Vector2(42, 42) + setMargin = 1 + else: + owner_order = [0,1,2,3,6,7,8,4,5] + oOwnershipGridContainer.columns = 5 + #oOwnershipGridContainer.set("custom_constants/hseparation", 10) #16 + iconSize = Vector2(46, 46) #Vector2(51, 51) + setMargin = 1 + + for i in owner_order: var id = gridItemScene.instance() id.set_meta("grid_value", i) - + id.img_margin = setMargin var setText = "" match i: - 0: id.texture_normal = preload("res://edited_images/plyrsym_32/symbol_player_red_std.png") - 1: id.texture_normal = preload("res://edited_images/plyrsym_32/symbol_player_blue_std.png") - 2: id.texture_normal = preload("res://edited_images/plyrsym_32/symbol_player_green_std.png") - 3: id.texture_normal = preload("res://edited_images/plyrsym_32/symbol_player_yellow_std.png") - 4: id.texture_normal = preload("res://edited_images/plyrsym_32/symbol_player_white_2.png") - 5: id.texture_normal = preload("res://edited_images/plyrsym_32/symbol_player_any_dis.png") + 0: id.img_normal = preload("res://edited_images/plyrsym_32/symbol_player_red_std.png") + 1: id.img_normal = preload("res://edited_images/plyrsym_32/symbol_player_blue_std.png") + 2: id.img_normal = preload("res://edited_images/plyrsym_32/symbol_player_green_std.png") + 3: id.img_normal = preload("res://edited_images/plyrsym_32/symbol_player_yellow_std.png") + 4: id.img_normal = preload("res://edited_images/plyrsym_32/symbol_player_white_std.png") + 5: id.img_normal = preload("res://edited_images/plyrsym_32/symbol_player_any_dis.png") + 6: id.img_normal = preload("res://edited_images/plyrsym_32/symbol_player_purple_std.png") + 7: id.img_normal = preload("res://edited_images/plyrsym_32/symbol_player_black_std.png") + 8: id.img_normal = preload("res://edited_images/plyrsym_32/symbol_player_orange_std.png") setText = Constants.ownershipNames[i] - - add_child_to_grid(id, setText) + + add_child_to_grid(id, setText, iconSize) set_selection(oSelection.paintOwnership) # Default initial selection -func add_child_to_grid(id, set_text): + +func add_child_to_grid(id, set_text, icon_size): oOwnershipGridContainer.add_child(id) set_text = set_text.replace(" ","\n") # Use "New lines" wherever there was a space. id.set_meta("grid_item_text", set_text) id.connect("mouse_entered", self, "_on_hovered_over_item", [id]) id.connect("mouse_exited", self, "_on_hovered_none") id.connect("pressed",self,"pressed",[id]) - id.rect_min_size = Vector2(42, 42) + id.rect_min_size = icon_size + func pressed(id): var setValue = id.get_meta("grid_value") @@ -57,9 +77,11 @@ func pressed(id): set_selection(setValue) oOnlyOwnership.select_appropriate_button() + func _process(delta): # It's necessary to use _process to update selection, because ScrollContainer won't fire a signal while you're scrolling. update_selection() + func update_selection(): if oSelectedRect == null: return if is_instance_valid(oSelectedRect.boundToItem) == false: return @@ -73,14 +95,17 @@ func update_selection(): oSelectedRect.rect_global_position = oSelectedRect.boundToItem.rect_global_position oSelectedRect.rect_size = oSelectedRect.boundToItem.rect_size + func _on_hovered_none(): oCenteredLabel.get_node("Label").text = "" + func _on_hovered_over_item(id): var offset = Vector2(id.rect_size.x * 0.5, id.rect_size.y * 0.5) oCenteredLabel.rect_global_position = id.rect_global_position + offset oCenteredLabel.get_node("Label").text = id.get_meta("grid_item_text") + func set_selection(value): oSelectedRect.visible = false @@ -92,27 +117,21 @@ func set_selection(value): for id in oOwnershipGridContainer.get_children(): if id.get_meta("grid_value") == value: oSelectedRect.boundToItem = id - -func collectible_ownership_mode(collMode): - if collMode == true: - oCollectibleLabel.visible = true - oUseSlabOwnerCheckBox.visible = false - else: - oCollectibleLabel.visible = false - oUseSlabOwnerCheckBox.visible = true - update_ownership_available() - -func update_ownership_available(): - ownership_available = true - oOwnershipGridContainer.modulate.a = 1.00 - - if oCollectibleLabel.visible == true: - ownership_available = false - oOwnershipGridContainer.modulate.a = 0.25 - elif oUseSlabOwnerCheckBox.visible == true and oUseSlabOwnerCheckBox.pressed == true: - ownership_available = false - oOwnershipGridContainer.modulate.a = 0.25 - +onready var oSelector = Nodelist.list["oSelector"] + +func update_ownership_options(): + match oSelector.mode: + oSelector.MODE_SUBTILE: + var is_collectible = oSelection.paintThingType == Things.TYPE.OBJECT and oSelection.paintSubtype in Things.DATA_OBJECT and Things.DATA_OBJECT[oSelection.paintSubtype][Things.EDITOR_TAB] in Things.collectible_belonging + oCollectibleLabel.visible = is_collectible + oUseSlabOwnerCheckBox.visible = !is_collectible + ownership_available = (!is_collectible and !oUseSlabOwnerCheckBox.pressed) + oOwnershipGridContainer.modulate.a = 0.25 if not ownership_available else 1.00 + oSelector.MODE_TILE: + oCollectibleLabel.visible = false + oUseSlabOwnerCheckBox.visible = false + ownership_available = true + oOwnershipGridContainer.modulate.a = 1.00 # #func clear_grid(): diff --git a/Scenes/PickSlabWindow.gd b/Scenes/PickSlabWindow.gd index 7622cd79..107f892f 100644 --- a/Scenes/PickSlabWindow.gd +++ b/Scenes/PickSlabWindow.gd @@ -128,9 +128,9 @@ func custom_slab_add_new_button(): var scene = preload('res://Scenes/GenericGridItem.tscn') var id = scene.instance() #id.set_meta("ID_of_slab", 0) - id.texture_normal = preload('res://Art/AddCustomSlab.png') - id.texture_hover = preload('res://Art/AddCustomSlabHover.png') - id.texture_pressed = preload('res://Art/AddCustomSlabPressed.png') + id.img_normal = preload('res://Art/AddCustomSlab.png') + id.img_hover = preload('res://Art/AddCustomSlabHover.png') + id.img_pressed = preload('res://Art/AddCustomSlabPressed.png') var set_text = "Add new" set_text = set_text.replace(" ","\n") # Use "New lines" wherever there was a space. diff --git a/Scenes/PickThingWindow.gd b/Scenes/PickThingWindow.gd index b7209466..356a9c7f 100644 --- a/Scenes/PickThingWindow.gd +++ b/Scenes/PickThingWindow.gd @@ -59,13 +59,12 @@ func _ready(): oThingTabs.initialize([]) + func initialize_thing_grid_items(): yield(get_tree(),'idle_frame') # Needed for loading animation IDs from call_deferred in Things singleton var CODETIME_START = OS.get_ticks_msec() remove_all_grid_items() - - for thingCategory in [Things.TYPE.OBJECT, Things.TYPE.CREATURE, Things.TYPE.TRAP, Things.TYPE.DOOR, Things.TYPE.EFFECTGEN, Things.TYPE.EXTRA]: match thingCategory: Things.TYPE.OBJECT: @@ -101,10 +100,12 @@ func initialize_thing_grid_items(): print('Initialized Things window: ' + str(OS.get_ticks_msec() - CODETIME_START) + 'ms') + func add_to_category(tabNode, thingsData, type, subtype): var gridcontainer = get_grid_container_node(tabNode) var id = scnGridItem.instance() + id.img_margin = 3 id.connect('mouse_entered',oThingDetails,"_on_thing_portrait_mouse_entered",[id]) id.connect('gui_input',self,"_on_thing_portrait_gui_input",[id]) id.set_meta("thingSubtype", subtype) @@ -113,13 +114,13 @@ func add_to_category(tabNode, thingsData, type, subtype): # Appearance prioritization: Portrait > Texture > ThingDarkened.png var portraitTex = thingsData[subtype][Things.PORTRAIT] if portraitTex != null: - id.texture_normal = portraitTex + id.img_normal = portraitTex else: var textureTex = thingsData[subtype][Things.TEXTURE] if textureTex != null: - id.texture_normal = textureTex + id.img_normal = textureTex else: - id.texture_normal = preload('res://Art/ThingDarkened.png') + id.img_normal = preload('res://Art/ThingDarkened.png') var setText = thingsData[subtype][Things.NAME] @@ -130,14 +131,17 @@ func add_to_category(tabNode, thingsData, type, subtype): yield(get_tree(),'idle_frame') oGridFunctions._on_GridWindow_resized(self) + func _process(delta): # It's necessary to use _process to update selection, because ScrollContainer won't fire a signal while you're scrolling. update_selection_position() + func update_selection_position(): if is_instance_valid(oSelectedRect.boundToItem) == true: oSelectedRect.rect_global_position = oSelectedRect.boundToItem.rect_global_position oSelectedRect.rect_size = oSelectedRect.boundToItem.rect_size + func _on_hovered_none(id): oCenteredLabel.get_node("Label").text = "" change_portrait_on_hover(id, Things.PORTRAIT) @@ -147,9 +151,9 @@ func _on_hovered_over_item(id): var offset = Vector2(id.rect_size.x * 0.5, id.rect_size.y * 0.5) oCenteredLabel.rect_global_position = id.rect_global_position + offset oCenteredLabel.get_node("Label").text = id.get_meta("grid_item_text") - change_portrait_on_hover(id, Things.TEXTURE) + func change_portrait_on_hover(id, textureOrPortrait): var portraitTex match id.get_meta("thingType"): @@ -160,7 +164,7 @@ func change_portrait_on_hover(id, textureOrPortrait): Things.TYPE.DOOR: portraitTex = Things.DATA_DOOR[id.get_meta("thingSubtype")][textureOrPortrait] Things.TYPE.EXTRA: portraitTex = Things.DATA_EXTRA[id.get_meta("thingSubtype")][textureOrPortrait] if portraitTex != null: - id.texture_normal = portraitTex + id.img_normal = portraitTex func add_item_to_grid(tabID, id, set_text): tabID.add_child(id) @@ -229,20 +233,19 @@ func add_workshop_item_sprite_overlay(textureParent, subtype): textureParent.add_child(workshopItemInTheBox) + func current_grid_container(): - return get_grid_container_node(oThingTabs.get_current_tab_control()) + func pressed(id): #oSelection.paintSlab = setValue # Set whatever this needs to be oPickSlabWindow.set_selection(null) - - set_selection(id.get_meta("thingType"), id.get_meta("thingSubtype")) - oPlacingSettings.set_placing_tab_and_update_it() oInspector.deselect() + func set_selection(setType, setSubtype): if setType == Things.TYPE.EXTRA and setSubtype == 1: oActionPointOptions.visible = true diff --git a/Scenes/Properties.gd b/Scenes/Properties.gd index 14fb54bd..ceb0bccd 100644 --- a/Scenes/Properties.gd +++ b/Scenes/Properties.gd @@ -23,13 +23,14 @@ onready var oOptionsOptionButton = Nodelist.list["oOptionsOptionButton"] onready var oEnsignPositionX = Nodelist.list["oEnsignPositionX"] onready var oEnsignPositionY = Nodelist.list["oEnsignPositionY"] onready var oMapCoordinatesWindow = Nodelist.list["oMapCoordinatesWindow"] - +onready var oOwnerSelection = Nodelist.list["oOwnerSelection"] onready var oHBoxPlayers = Nodelist.list["oHBoxPlayers"] onready var oHBoxSpeech = Nodelist.list["oHBoxSpeech"] onready var oHBoxEnsignPosition = Nodelist.list["oHBoxEnsignPosition"] onready var oHBoxOptions = Nodelist.list["oHBoxOptions"] onready var oHBoxLandView = Nodelist.list["oHBoxLandView"] onready var oHBoxNameID = Nodelist.list["oHBoxNameID"] +onready var oScriptGenerator = Nodelist.list["oScriptGenerator"] const kind_options = { "Solo" : "FREE", @@ -112,6 +113,8 @@ func set_format_selection(setFormat): # When you change format, the object settings that are available also change oPlacingSettings.update_placing_tab() oInspector.deselect() + oOwnerSelection.update_ownership_head_icons() + oScriptGenerator.update_options_based_on_mapformat() func refresh_dungeon_style_options(): oDungeonStyleList.clear() diff --git a/Scenes/QuickMapPreview.gd b/Scenes/QuickMapPreview.gd index 6540d944..660fce22 100644 --- a/Scenes/QuickMapPreview.gd +++ b/Scenes/QuickMapPreview.gd @@ -147,7 +147,7 @@ func update_img(slbFilePath): if colourDict.has(slabID): img.set_pixel(x,y,colourDict[slabID]) else: - if slabID == 11 and ownership != 255: # Is claimed floor + if slabID == Slabs.CLAIMED_GROUND and ownership != 255: img.set_pixel(x,y,Constants.ownerFloorCol[ownership]) else: if ownership == 5: @@ -162,7 +162,7 @@ func update_img(slbFilePath): pixelHasBeenSet = true else: if ownership == 0: - if slabID == 11 and ownership != 255 and ownership == 0: # Is claimed floor + if slabID == Slabs.CLAIMED_GROUND and ownership != 255 and ownership == 0: img.set_pixel(x, y, Constants.ownerFloorCol[ownership]) pixelHasBeenSet = true else: diff --git a/Scenes/ScriptGenerator.gd b/Scenes/ScriptGenerator.gd index 680013f0..570cda02 100644 --- a/Scenes/ScriptGenerator.gd +++ b/Scenes/ScriptGenerator.gd @@ -29,6 +29,10 @@ onready var oResearchables = Nodelist.list["oResearchables"] onready var oResearchOrderCategory = Nodelist.list["oResearchOrderCategory"] onready var oAdjustResearchCheckBox = Nodelist.list["oAdjustResearchCheckBox"] onready var oInstances = Nodelist.list["oInstances"] +onready var oPurpleAICheckBox = Nodelist.list["oPurpleAICheckBox"] +onready var oBlackAICheckBox = Nodelist.list["oBlackAICheckBox"] +onready var oOrangeAICheckBox = Nodelist.list["oOrangeAICheckBox"] +onready var oCurrentFormat = Nodelist.list["oCurrentFormat"] var scnAvailableButton = preload('res://Scenes/AvailableButton.tscn') @@ -172,6 +176,17 @@ func _ready(): # get_parent().current_tab = 1 # Utils.popup_centered(Nodelist.list["oMapSettingsWindow"]) +func update_options_based_on_mapformat(): + if oCurrentFormat.selected == 0: # classic format + oPurpleAICheckBox.visible = false + oBlackAICheckBox.visible = false + oOrangeAICheckBox.visible = false + else: + oPurpleAICheckBox.visible = true + oBlackAICheckBox.visible = true + oOrangeAICheckBox.visible = true + + func initialize_researchables(): var labelNumber = 0 for i in listResearchOrder: @@ -329,6 +344,18 @@ func _on_YellowAICheckBox_toggled(button_pressed): if button_pressed == true: if oInstances.check_for_dungeon_heart(3) == false: oMessage.quick("This player requires a Dungeon Heart! Otherwise their creatures will die after a few seconds.") +func _on_PurpleAICheckBox_toggled(button_pressed): + if button_pressed == true: + if oInstances.check_for_dungeon_heart(6) == false: + oMessage.quick("This player requires a Dungeon Heart! Otherwise their creatures will die after a few seconds.") +func _on_BlackAICheckBox_toggled(button_pressed): + if button_pressed == true: + if oInstances.check_for_dungeon_heart(7) == false: + oMessage.quick("This player requires a Dungeon Heart! Otherwise their creatures will die after a few seconds.") +func _on_OrangeAICheckBox_toggled(button_pressed): + if button_pressed == true: + if oInstances.check_for_dungeon_heart(8) == false: + oMessage.quick("This player requires a Dungeon Heart! Otherwise their creatures will die after a few seconds.") func _on_GenerateScriptButton_pressed(): @@ -361,10 +388,19 @@ func execute_gen(): generateString = add_one_extra_line(generateString) - if oBlueAICheckBox.pressed == true: generateString += "COMPUTER_PLAYER(PLAYER1,0)" + '\n' - if oGreenAICheckBox.pressed == true: generateString += "COMPUTER_PLAYER(PLAYER2,0)" + '\n' - if oYellowAICheckBox.pressed == true: generateString += "COMPUTER_PLAYER(PLAYER3,0)" + '\n' - + if oBlueAICheckBox.pressed == true and oBlueAICheckBox.visible == true: + generateString += "COMPUTER_PLAYER(PLAYER1,0)" + '\n' + if oGreenAICheckBox.pressed == true and oGreenAICheckBox.visible == true: + generateString += "COMPUTER_PLAYER(PLAYER2,0)" + '\n' + if oYellowAICheckBox.pressed == true and oYellowAICheckBox.visible == true: + generateString += "COMPUTER_PLAYER(PLAYER3,0)" + '\n' + if oPurpleAICheckBox.pressed == true and oPurpleAICheckBox.visible == true: + generateString += "COMPUTER_PLAYER(PLAYER4,0)" + '\n' + if oBlackAICheckBox.pressed == true and oBlackAICheckBox.visible == true: + generateString += "COMPUTER_PLAYER(PLAYER5,0)" + '\n' + if oOrangeAICheckBox.pressed == true and oOrangeAICheckBox.visible == true: + generateString += "COMPUTER_PLAYER(PLAYER6,0)" + '\n' + generateString = add_one_extra_line(generateString) for i in oCreaturePool.get_children(): diff --git a/Scenes/Selection.gd b/Scenes/Selection.gd index 01c83647..ba4c3fb2 100644 --- a/Scenes/Selection.gd +++ b/Scenes/Selection.gd @@ -82,12 +82,7 @@ func newPaintSubtype(value): oPickSlabWindow.set_selection(null) # Deselect anything in slab window paintSubtype = value - oOwnerSelection.collectible_ownership_mode(false) - if paintThingType == Things.TYPE.OBJECT: - if Things.DATA_OBJECT.has(paintSubtype): - var genre = Things.DATA_OBJECT[paintSubtype][Things.EDITOR_TAB] - if Things.collectible_belonging.has(genre): - oOwnerSelection.collectible_ownership_mode(true) + oOwnerSelection.update_ownership_options() func newOwnership(value): diff --git a/Scenes/Selector.gd b/Scenes/Selector.gd index b53d1453..d1489940 100644 --- a/Scenes/Selector.gd +++ b/Scenes/Selector.gd @@ -36,6 +36,7 @@ onready var oDataClmPos = Nodelist.list["oDataClmPos"] onready var oSlabSideViewer = Nodelist.list["oSlabSideViewer"] onready var oAddCustomSlabWindow = Nodelist.list["oAddCustomSlabWindow"] onready var oDisplaySlxNumbers = Nodelist.list["oDisplaySlxNumbers"] +onready var oOwnerSelection = Nodelist.list["oOwnerSelection"] onready var TILE_SIZE = Constants.TILE_SIZE onready var SUBTILE_SIZE = Constants.SUBTILE_SIZE @@ -318,7 +319,7 @@ func change_mode(changeModeTo): position = cursorTile * TILE_SIZE $SubtileSelector.visible = false $TileSelector.visible = true - oUseSlabOwnerCheckBox.visible = false + oOwnerSelection.call_deferred("update_ownership_options") oEditingMode.switch_mode("Slab") oEditingTools.switched_to_slab_mode() oInspector.deselect() @@ -328,7 +329,7 @@ func change_mode(changeModeTo): position = cursorSubtile * SUBTILE_SIZE $SubtileSelector.visible = true $TileSelector.visible = false - oUseSlabOwnerCheckBox.visible = true + oOwnerSelection.call_deferred("update_ownership_options") oEditingTools.switched_to_thing_mode() oEditingMode.switch_mode("Thing") oBrushPreview.update_img() diff --git a/Scenes/SlabOwnerCheckBox.gd b/Scenes/SlabOwnerCheckBox.gd index 308a3d62..57e9061a 100644 --- a/Scenes/SlabOwnerCheckBox.gd +++ b/Scenes/SlabOwnerCheckBox.gd @@ -3,8 +3,4 @@ onready var oOwnerSelection = Nodelist.list["oOwnerSelection"] onready var oOwnershipGridContainer = Nodelist.list["oOwnershipGridContainer"] func _on_UseSlabOwnerCheckBox_toggled(button_pressed): - oOwnerSelection.update_ownership_available() - -func _on_UseSlabOwnerCheckBox_visibility_changed(): - yield(get_tree(),'idle_frame') - oOwnerSelection.update_ownership_available() + oOwnerSelection.update_ownership_options() diff --git a/Scenes/TwoColumnData.gd b/Scenes/TwoColumnData.gd index 567d45de..2eeaf4c0 100644 --- a/Scenes/TwoColumnData.gd +++ b/Scenes/TwoColumnData.gd @@ -53,6 +53,9 @@ func add_item(leftString, rightString): nodeRightColumn.add_item("Yellow") nodeRightColumn.add_item("White") nodeRightColumn.add_item("None") + nodeRightColumn.add_item("Purple") + nodeRightColumn.add_item("Black") + nodeRightColumn.add_item("Orange") # print(nodeRightColumn.get_popup().mouse_filter) diff --git a/Scenes/View3D.gd b/Scenes/View3D.gd index 89a6cb1b..3e27bd53 100644 --- a/Scenes/View3D.gd +++ b/Scenes/View3D.gd @@ -18,8 +18,10 @@ func create_material_array(numberOfSlabStyles): func create_material(map): var mat = ShaderMaterial.new() mat.shader = preload("res://Shaders/display_texture_3d.shader") - mat.set_shader_param("dkTextureMap_Split_A", oTextureCache.cachedTextures[map][0]) - mat.set_shader_param("dkTextureMap_Split_B", oTextureCache.cachedTextures[map][1]) + mat.set_shader_param("dkTextureMap_Split_A1", oTextureCache.cachedTextures[map][0]) + mat.set_shader_param("dkTextureMap_Split_A2", oTextureCache.cachedTextures[map][1]) + mat.set_shader_param("dkTextureMap_Split_B1", oTextureCache.cachedTextures[map][2]) + mat.set_shader_param("dkTextureMap_Split_B2", oTextureCache.cachedTextures[map][3]) mat.set_shader_param("animationDatabase", preload("res://Shaders/textureanimationdatabase.png")) return mat diff --git a/Scenes/VoxelGen.gd b/Scenes/VoxelGen.gd index 89ec2e59..0d2a7737 100644 --- a/Scenes/VoxelGen.gd +++ b/Scenes/VoxelGen.gd @@ -26,12 +26,12 @@ func column_gen(genArray, x, z, clmIndex, surrClmIndex, generateBottomFace, sour # Top face if y == 7 or cubeArray[y+1] == 0: - var textureID = Cube.tex[cubeID][4] + var textureID = Cube.tex[cubeID][Cube.SIDE_TOP] add_face(genArray, pos, 4, textureID) # Bottom face if (y >= 1 and cubeArray[y-1] == 0) or (y == 0 and generateBottomFace == true): - var textureID = Cube.tex[cubeID][5] + var textureID = Cube.tex[cubeID][Cube.SIDE_BOTTOM] add_face(genArray, pos, 5, textureID) else: if y == 0: diff --git a/Shaders/display_texture_2d.shader b/Shaders/display_texture_2d.shader index 91ab93c6..fb1427ee 100644 --- a/Shaders/display_texture_2d.shader +++ b/Shaders/display_texture_2d.shader @@ -15,8 +15,10 @@ const vec2 oneTileSize = vec2(32,32); const float TEXTURE_ANIMATION_SPEED = 12.0; uniform int showOnlySpecificStyle = 77777; uniform sampler2D slxData; -uniform sampler2DArray dkTextureMap_Split_A; -uniform sampler2DArray dkTextureMap_Split_B; +uniform sampler2DArray dkTextureMap_Split_A1; +uniform sampler2DArray dkTextureMap_Split_A2; +uniform sampler2DArray dkTextureMap_Split_B1; +uniform sampler2DArray dkTextureMap_Split_B2; uniform vec2 fieldSizeInSubtiles = vec2(0.0, 0.0); @@ -61,7 +63,7 @@ void fragment() { } int index = getIndex(ivec2(subtileX,subtileY)); - if (index >= 544) { // 544 is the index where the TexAnims start (544 - 585) + if (index >= 544 && index < 1000) { // 544 is the index where the TexAnims start (544 - 999) int frame = int(mod(TIME * TEXTURE_ANIMATION_SPEED, 8)); index = getAnimationFrame(frame, index-544); } @@ -70,9 +72,13 @@ void fragment() { float mipmapLevel = calc_mip_level(UV * resolutionOfField); if (index < 272) { // Splitting the TextureArray into 2, so that it will work on older PCs. - COLOR = textureLod(dkTextureMap_Split_A, vec3((UV.x * fieldSizeInSubtiles.x)-float(subtileX), (UV.y * fieldSizeInSubtiles.y)-float(subtileY), float(index)), mipmapLevel); + COLOR = textureLod(dkTextureMap_Split_A1, vec3((UV.x * fieldSizeInSubtiles.x)-float(subtileX), (UV.y * fieldSizeInSubtiles.y)-float(subtileY), float(index)), mipmapLevel); + } else if (index < 544){ + COLOR = textureLod(dkTextureMap_Split_A2, vec3((UV.x * fieldSizeInSubtiles.x)-float(subtileX), (UV.y * fieldSizeInSubtiles.y)-float(subtileY), float(index-272)), mipmapLevel); + } else if (index < 1272){ + COLOR = textureLod(dkTextureMap_Split_B1, vec3((UV.x * fieldSizeInSubtiles.x)-float(subtileX), (UV.y * fieldSizeInSubtiles.y)-float(subtileY), float(index-1000)), mipmapLevel); } else { - COLOR = textureLod(dkTextureMap_Split_B, vec3((UV.x * fieldSizeInSubtiles.x)-float(subtileX), (UV.y * fieldSizeInSubtiles.y)-float(subtileY), float(index-272)), mipmapLevel); + COLOR = textureLod(dkTextureMap_Split_B2, vec3((UV.x * fieldSizeInSubtiles.x)-float(subtileX), (UV.y * fieldSizeInSubtiles.y)-float(subtileY), float(index-1272)), mipmapLevel); } } diff --git a/Shaders/display_texture_3d.shader b/Shaders/display_texture_3d.shader index f2064060..ef5aba21 100644 --- a/Shaders/display_texture_3d.shader +++ b/Shaders/display_texture_3d.shader @@ -1,7 +1,9 @@ shader_type spatial; render_mode blend_mix, cull_back, depth_draw_opaque, skip_vertex_transform; //for the sake of performance avoid enabling transparency on all your terrain. -uniform sampler2DArray dkTextureMap_Split_A; -uniform sampler2DArray dkTextureMap_Split_B; +uniform sampler2DArray dkTextureMap_Split_A1; +uniform sampler2DArray dkTextureMap_Split_A2; +uniform sampler2DArray dkTextureMap_Split_B1; +uniform sampler2DArray dkTextureMap_Split_B2; uniform int use_mipmaps = 1; @@ -50,7 +52,7 @@ void fragment() { // Adding 0.5 so the int() floor will be correct. int index = getIndex(UV2); - if (index >= 544) { // 544 is the index where the TexAnims start (544 - 585) + if (index >= 544 && index < 1000) { // 544 is the index where the TexAnims start (544 - 999) int frame = int(mod(TIME * TEXTURE_ANIMATION_SPEED, 8)); index = getAnimationFrame(frame, (index-544) ); } @@ -59,9 +61,13 @@ void fragment() { float mipmapLevel = calc_mip_level(UV * vec2(8.0,68.0)) * float(use_mipmaps); if (index < 272) { // Splitting the TextureArray into 2, so that it will work on older PCs. - ALBEDO = textureLod(dkTextureMap_Split_A, vec3(UV.x, UV.y, float(index)), mipmapLevel).rgb; - } else { - ALBEDO = textureLod(dkTextureMap_Split_B, vec3(UV.x, UV.y, float(index-272)), mipmapLevel).rgb; + ALBEDO = textureLod(dkTextureMap_Split_A1, vec3(UV.x, UV.y, float(index)), mipmapLevel).rgb; + } else if (index < 544) { + ALBEDO = textureLod(dkTextureMap_Split_A2, vec3(UV.x, UV.y, float(index-272)), mipmapLevel).rgb; + } else if (index < 1272) { // Splitting the TextureArray into 2, so that it will work on older PCs. + ALBEDO = textureLod(dkTextureMap_Split_B1, vec3(UV.x, UV.y, float(index-1000)), mipmapLevel).rgb; + } else { + ALBEDO = textureLod(dkTextureMap_Split_B2, vec3(UV.x, UV.y, float(index-1272)), mipmapLevel).rgb; } // Forces the shader to convert albedo from sRGB space to linear space. A problem when using the same TextureArray while mixing 2D and 3D shaders and displaying both 2D and 3D at the same time. diff --git a/Shaders/slab_ownership.shader b/Shaders/slab_ownership.shader index c9252ac4..560dc2fa 100644 --- a/Shaders/slab_ownership.shader +++ b/Shaders/slab_ownership.shader @@ -12,12 +12,18 @@ uniform float alphaFadeColor2 = 1.00; uniform float alphaFadeColor3 = 1.00; uniform float alphaFadeColor4 = 1.00; uniform float alphaFadeColor5 = 1.00; +uniform float alphaFadeColor6 = 1.00; +uniform float alphaFadeColor7 = 1.00; +uniform float alphaFadeColor8 = 1.00; uniform vec4 color0; uniform vec4 color1; uniform vec4 color2; uniform vec4 color3; uniform vec4 color4; uniform vec4 color5; +uniform vec4 color6; +uniform vec4 color7; +uniform vec4 color8; void fragment() { vec4 baseCol = texture(territoryTexture,UV); @@ -47,6 +53,9 @@ void fragment() { if (baseCol == color3) {fadeAlpha = alphaFadeColor3;} if (baseCol == color4) {fadeAlpha = alphaFadeColor4;} if (baseCol == color5) {fadeAlpha = alphaFadeColor5;} + if (baseCol == color6) {fadeAlpha = alphaFadeColor6;} + if (baseCol == color7) {fadeAlpha = alphaFadeColor7;} + if (baseCol == color8) {fadeAlpha = alphaFadeColor8;} modifiedCol.a = alphaFilled; diff --git a/dk_images/furniture/flagpole_blackflag_tp/AnimFlagpoleBlack.tres b/dk_images/furniture/flagpole_blackflag_tp/AnimFlagpoleBlack.tres new file mode 100644 index 00000000..488795bb --- /dev/null +++ b/dk_images/furniture/flagpole_blackflag_tp/AnimFlagpoleBlack.tres @@ -0,0 +1,32 @@ +[gd_resource type="AnimatedTexture" load_steps=10 format=2] + +[ext_resource path="res://addons/animated_texture_but_better/animated_texture_but_better.gd" type="Script" id=1] +[ext_resource path="res://dk_images/furniture/flagpole_blackflag_tp/r1frame03.png" type="Texture" id=2] +[ext_resource path="res://dk_images/furniture/flagpole_blackflag_tp/r1frame04.png" type="Texture" id=3] +[ext_resource path="res://dk_images/furniture/flagpole_blackflag_tp/r1frame02.png" type="Texture" id=4] +[ext_resource path="res://dk_images/furniture/flagpole_blackflag_tp/r1frame01.png" type="Texture" id=5] +[ext_resource path="res://dk_images/furniture/flagpole_blackflag_tp/r1frame05.png" type="Texture" id=6] +[ext_resource path="res://dk_images/furniture/flagpole_blackflag_tp/r1frame08.png" type="Texture" id=7] +[ext_resource path="res://dk_images/furniture/flagpole_blackflag_tp/r1frame07.png" type="Texture" id=8] +[ext_resource path="res://dk_images/furniture/flagpole_blackflag_tp/r1frame06.png" type="Texture" id=9] + +[resource] +flags = 9 +frames = 8 +fps = 12.0 +frame_0/texture = ExtResource( 5 ) +frame_1/texture = ExtResource( 4 ) +frame_1/delay_sec = 0.0 +frame_2/texture = ExtResource( 2 ) +frame_2/delay_sec = 0.0 +frame_3/texture = ExtResource( 3 ) +frame_3/delay_sec = 0.0 +frame_4/texture = ExtResource( 6 ) +frame_4/delay_sec = 0.0 +frame_5/texture = ExtResource( 9 ) +frame_5/delay_sec = 0.0 +frame_6/texture = ExtResource( 8 ) +frame_6/delay_sec = 0.0 +frame_7/texture = ExtResource( 7 ) +frame_7/delay_sec = 0.0 +script = ExtResource( 1 ) diff --git a/dk_images/furniture/flagpole_blueflag_fp/filelist_rot1.txt b/dk_images/furniture/flagpole_blackflag_tp/filelist_rot1.txt similarity index 77% rename from dk_images/furniture/flagpole_blueflag_fp/filelist_rot1.txt rename to dk_images/furniture/flagpole_blackflag_tp/filelist_rot1.txt index d26e05f7..0adbb344 100644 --- a/dk_images/furniture/flagpole_blueflag_fp/filelist_rot1.txt +++ b/dk_images/furniture/flagpole_blackflag_tp/filelist_rot1.txt @@ -1,4 +1,4 @@ -animation_197 0 8 -33 -94 +animation_202 0 8 -25 -60 r1frame01.png r1frame02.png r1frame03.png diff --git a/dk_images/furniture/flagpole_blackflag_tp/r1frame01.png b/dk_images/furniture/flagpole_blackflag_tp/r1frame01.png new file mode 100644 index 00000000..a364445a Binary files /dev/null and b/dk_images/furniture/flagpole_blackflag_tp/r1frame01.png differ diff --git a/dk_images/furniture/flagpole_greenflag_fp/r1frame01.png.import b/dk_images/furniture/flagpole_blackflag_tp/r1frame01.png.import similarity index 69% rename from dk_images/furniture/flagpole_greenflag_fp/r1frame01.png.import rename to dk_images/furniture/flagpole_blackflag_tp/r1frame01.png.import index 78e968fd..9c2ee99a 100644 --- a/dk_images/furniture/flagpole_greenflag_fp/r1frame01.png.import +++ b/dk_images/furniture/flagpole_blackflag_tp/r1frame01.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/r1frame01.png-58ba50f587d0a6494c16189332bd3a17.stex" +path="res://.import/r1frame01.png-7bb8a14b50e28158fd8f8a1b565cd772.stex" metadata={ "vram_texture": false } [deps] -source_file="res://dk_images/furniture/flagpole_greenflag_fp/r1frame01.png" -dest_files=[ "res://.import/r1frame01.png-58ba50f587d0a6494c16189332bd3a17.stex" ] +source_file="res://dk_images/furniture/flagpole_blackflag_tp/r1frame01.png" +dest_files=[ "res://.import/r1frame01.png-7bb8a14b50e28158fd8f8a1b565cd772.stex" ] [params] diff --git a/dk_images/furniture/flagpole_blackflag_tp/r1frame02.png b/dk_images/furniture/flagpole_blackflag_tp/r1frame02.png new file mode 100644 index 00000000..09f5c573 Binary files /dev/null and b/dk_images/furniture/flagpole_blackflag_tp/r1frame02.png differ diff --git a/dk_images/furniture/flagpole_greenflag_fp/r1frame02.png.import b/dk_images/furniture/flagpole_blackflag_tp/r1frame02.png.import similarity index 69% rename from dk_images/furniture/flagpole_greenflag_fp/r1frame02.png.import rename to dk_images/furniture/flagpole_blackflag_tp/r1frame02.png.import index 8767aa2d..e084b442 100644 --- a/dk_images/furniture/flagpole_greenflag_fp/r1frame02.png.import +++ b/dk_images/furniture/flagpole_blackflag_tp/r1frame02.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/r1frame02.png-79a18310ee9a3fed57de8fdadceb522c.stex" +path="res://.import/r1frame02.png-c053cbd8d0f2992aced2f31550030b37.stex" metadata={ "vram_texture": false } [deps] -source_file="res://dk_images/furniture/flagpole_greenflag_fp/r1frame02.png" -dest_files=[ "res://.import/r1frame02.png-79a18310ee9a3fed57de8fdadceb522c.stex" ] +source_file="res://dk_images/furniture/flagpole_blackflag_tp/r1frame02.png" +dest_files=[ "res://.import/r1frame02.png-c053cbd8d0f2992aced2f31550030b37.stex" ] [params] diff --git a/dk_images/furniture/flagpole_blackflag_tp/r1frame03.png b/dk_images/furniture/flagpole_blackflag_tp/r1frame03.png new file mode 100644 index 00000000..1adf7caa Binary files /dev/null and b/dk_images/furniture/flagpole_blackflag_tp/r1frame03.png differ diff --git a/dk_images/furniture/flagpole_greenflag_fp/r1frame03.png.import b/dk_images/furniture/flagpole_blackflag_tp/r1frame03.png.import similarity index 69% rename from dk_images/furniture/flagpole_greenflag_fp/r1frame03.png.import rename to dk_images/furniture/flagpole_blackflag_tp/r1frame03.png.import index 4ee1c151..78e79297 100644 --- a/dk_images/furniture/flagpole_greenflag_fp/r1frame03.png.import +++ b/dk_images/furniture/flagpole_blackflag_tp/r1frame03.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/r1frame03.png-e05ab68a2ec2ca62992d9aa1e7aba3dc.stex" +path="res://.import/r1frame03.png-d8c9276dc71cd976d52c8b193a4d775d.stex" metadata={ "vram_texture": false } [deps] -source_file="res://dk_images/furniture/flagpole_greenflag_fp/r1frame03.png" -dest_files=[ "res://.import/r1frame03.png-e05ab68a2ec2ca62992d9aa1e7aba3dc.stex" ] +source_file="res://dk_images/furniture/flagpole_blackflag_tp/r1frame03.png" +dest_files=[ "res://.import/r1frame03.png-d8c9276dc71cd976d52c8b193a4d775d.stex" ] [params] diff --git a/dk_images/furniture/flagpole_blackflag_tp/r1frame04.png b/dk_images/furniture/flagpole_blackflag_tp/r1frame04.png new file mode 100644 index 00000000..58789da5 Binary files /dev/null and b/dk_images/furniture/flagpole_blackflag_tp/r1frame04.png differ diff --git a/dk_images/furniture/flagpole_greenflag_fp/r1frame04.png.import b/dk_images/furniture/flagpole_blackflag_tp/r1frame04.png.import similarity index 69% rename from dk_images/furniture/flagpole_greenflag_fp/r1frame04.png.import rename to dk_images/furniture/flagpole_blackflag_tp/r1frame04.png.import index 002f12b0..21e0ea8d 100644 --- a/dk_images/furniture/flagpole_greenflag_fp/r1frame04.png.import +++ b/dk_images/furniture/flagpole_blackflag_tp/r1frame04.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/r1frame04.png-a1abb177e259cff8e3192a8c04e499cc.stex" +path="res://.import/r1frame04.png-cd7c0a5c6b8acfb6470e57068fb04e5e.stex" metadata={ "vram_texture": false } [deps] -source_file="res://dk_images/furniture/flagpole_greenflag_fp/r1frame04.png" -dest_files=[ "res://.import/r1frame04.png-a1abb177e259cff8e3192a8c04e499cc.stex" ] +source_file="res://dk_images/furniture/flagpole_blackflag_tp/r1frame04.png" +dest_files=[ "res://.import/r1frame04.png-cd7c0a5c6b8acfb6470e57068fb04e5e.stex" ] [params] diff --git a/dk_images/furniture/flagpole_blackflag_tp/r1frame05.png b/dk_images/furniture/flagpole_blackflag_tp/r1frame05.png new file mode 100644 index 00000000..d6a07720 Binary files /dev/null and b/dk_images/furniture/flagpole_blackflag_tp/r1frame05.png differ diff --git a/dk_images/furniture/flagpole_greenflag_fp/r1frame05.png.import b/dk_images/furniture/flagpole_blackflag_tp/r1frame05.png.import similarity index 69% rename from dk_images/furniture/flagpole_greenflag_fp/r1frame05.png.import rename to dk_images/furniture/flagpole_blackflag_tp/r1frame05.png.import index 0dd021ab..848b29f6 100644 --- a/dk_images/furniture/flagpole_greenflag_fp/r1frame05.png.import +++ b/dk_images/furniture/flagpole_blackflag_tp/r1frame05.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/r1frame05.png-a8ab8e4f338f5cd61a2500f3cec1a514.stex" +path="res://.import/r1frame05.png-494565da3d9ad366b134e7d0b1cf1f6a.stex" metadata={ "vram_texture": false } [deps] -source_file="res://dk_images/furniture/flagpole_greenflag_fp/r1frame05.png" -dest_files=[ "res://.import/r1frame05.png-a8ab8e4f338f5cd61a2500f3cec1a514.stex" ] +source_file="res://dk_images/furniture/flagpole_blackflag_tp/r1frame05.png" +dest_files=[ "res://.import/r1frame05.png-494565da3d9ad366b134e7d0b1cf1f6a.stex" ] [params] diff --git a/dk_images/furniture/flagpole_blackflag_tp/r1frame06.png b/dk_images/furniture/flagpole_blackflag_tp/r1frame06.png new file mode 100644 index 00000000..8d6acc55 Binary files /dev/null and b/dk_images/furniture/flagpole_blackflag_tp/r1frame06.png differ diff --git a/dk_images/furniture/flagpole_whiteflag_fp/r1frame06.png.import b/dk_images/furniture/flagpole_blackflag_tp/r1frame06.png.import similarity index 71% rename from dk_images/furniture/flagpole_whiteflag_fp/r1frame06.png.import rename to dk_images/furniture/flagpole_blackflag_tp/r1frame06.png.import index 6fd2d5aa..649f8d59 100644 --- a/dk_images/furniture/flagpole_whiteflag_fp/r1frame06.png.import +++ b/dk_images/furniture/flagpole_blackflag_tp/r1frame06.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/r1frame06.png-3dbf03cdd861fece07c5d40904b3fbf2.stex" +path="res://.import/r1frame06.png-f758a9630261502b04a17298d30d86f2.stex" metadata={ "vram_texture": false } [deps] -source_file="res://dk_images/furniture/flagpole_whiteflag_fp/r1frame06.png" -dest_files=[ "res://.import/r1frame06.png-3dbf03cdd861fece07c5d40904b3fbf2.stex" ] +source_file="res://dk_images/furniture/flagpole_blackflag_tp/r1frame06.png" +dest_files=[ "res://.import/r1frame06.png-f758a9630261502b04a17298d30d86f2.stex" ] [params] diff --git a/dk_images/furniture/flagpole_blackflag_tp/r1frame07.png b/dk_images/furniture/flagpole_blackflag_tp/r1frame07.png new file mode 100644 index 00000000..5180ad1a Binary files /dev/null and b/dk_images/furniture/flagpole_blackflag_tp/r1frame07.png differ diff --git a/dk_images/furniture/flagpole_greenflag_fp/r1frame07.png.import b/dk_images/furniture/flagpole_blackflag_tp/r1frame07.png.import similarity index 69% rename from dk_images/furniture/flagpole_greenflag_fp/r1frame07.png.import rename to dk_images/furniture/flagpole_blackflag_tp/r1frame07.png.import index 1a96ece3..08c14d66 100644 --- a/dk_images/furniture/flagpole_greenflag_fp/r1frame07.png.import +++ b/dk_images/furniture/flagpole_blackflag_tp/r1frame07.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/r1frame07.png-744d33c8dee8f78998185a065f64a797.stex" +path="res://.import/r1frame07.png-154e7e18697ee1224f434e9a0b74f3e0.stex" metadata={ "vram_texture": false } [deps] -source_file="res://dk_images/furniture/flagpole_greenflag_fp/r1frame07.png" -dest_files=[ "res://.import/r1frame07.png-744d33c8dee8f78998185a065f64a797.stex" ] +source_file="res://dk_images/furniture/flagpole_blackflag_tp/r1frame07.png" +dest_files=[ "res://.import/r1frame07.png-154e7e18697ee1224f434e9a0b74f3e0.stex" ] [params] diff --git a/dk_images/furniture/flagpole_blackflag_tp/r1frame08.png b/dk_images/furniture/flagpole_blackflag_tp/r1frame08.png new file mode 100644 index 00000000..1daf9d4c Binary files /dev/null and b/dk_images/furniture/flagpole_blackflag_tp/r1frame08.png differ diff --git a/dk_images/furniture/flagpole_greenflag_fp/r1frame08.png.import b/dk_images/furniture/flagpole_blackflag_tp/r1frame08.png.import similarity index 69% rename from dk_images/furniture/flagpole_greenflag_fp/r1frame08.png.import rename to dk_images/furniture/flagpole_blackflag_tp/r1frame08.png.import index 7e3862b3..0d277b59 100644 --- a/dk_images/furniture/flagpole_greenflag_fp/r1frame08.png.import +++ b/dk_images/furniture/flagpole_blackflag_tp/r1frame08.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/r1frame08.png-bc87cb52e3e2622d5144718ec0c2814e.stex" +path="res://.import/r1frame08.png-4e8e5c54138ed2d2dadbb72f7c33c68c.stex" metadata={ "vram_texture": false } [deps] -source_file="res://dk_images/furniture/flagpole_greenflag_fp/r1frame08.png" -dest_files=[ "res://.import/r1frame08.png-bc87cb52e3e2622d5144718ec0c2814e.stex" ] +source_file="res://dk_images/furniture/flagpole_blackflag_tp/r1frame08.png" +dest_files=[ "res://.import/r1frame08.png-4e8e5c54138ed2d2dadbb72f7c33c68c.stex" ] [params] diff --git a/dk_images/furniture/flagpole_blueflag_fp/r1frame01.png b/dk_images/furniture/flagpole_blueflag_fp/r1frame01.png deleted file mode 100644 index 1f92da95..00000000 Binary files a/dk_images/furniture/flagpole_blueflag_fp/r1frame01.png and /dev/null differ diff --git a/dk_images/furniture/flagpole_blueflag_fp/r1frame02.png b/dk_images/furniture/flagpole_blueflag_fp/r1frame02.png deleted file mode 100644 index f64f1c83..00000000 Binary files a/dk_images/furniture/flagpole_blueflag_fp/r1frame02.png and /dev/null differ diff --git a/dk_images/furniture/flagpole_blueflag_fp/r1frame03.png b/dk_images/furniture/flagpole_blueflag_fp/r1frame03.png deleted file mode 100644 index d13f2e15..00000000 Binary files a/dk_images/furniture/flagpole_blueflag_fp/r1frame03.png and /dev/null differ diff --git a/dk_images/furniture/flagpole_blueflag_fp/r1frame04.png b/dk_images/furniture/flagpole_blueflag_fp/r1frame04.png deleted file mode 100644 index f285315d..00000000 Binary files a/dk_images/furniture/flagpole_blueflag_fp/r1frame04.png and /dev/null differ diff --git a/dk_images/furniture/flagpole_blueflag_fp/r1frame05.png b/dk_images/furniture/flagpole_blueflag_fp/r1frame05.png deleted file mode 100644 index 3206613e..00000000 Binary files a/dk_images/furniture/flagpole_blueflag_fp/r1frame05.png and /dev/null differ diff --git a/dk_images/furniture/flagpole_blueflag_fp/r1frame06.png b/dk_images/furniture/flagpole_blueflag_fp/r1frame06.png deleted file mode 100644 index b3c7ae1a..00000000 Binary files a/dk_images/furniture/flagpole_blueflag_fp/r1frame06.png and /dev/null differ diff --git a/dk_images/furniture/flagpole_blueflag_fp/r1frame07.png b/dk_images/furniture/flagpole_blueflag_fp/r1frame07.png deleted file mode 100644 index e384f64b..00000000 Binary files a/dk_images/furniture/flagpole_blueflag_fp/r1frame07.png and /dev/null differ diff --git a/dk_images/furniture/flagpole_blueflag_fp/r1frame08.png b/dk_images/furniture/flagpole_blueflag_fp/r1frame08.png deleted file mode 100644 index fafa1a80..00000000 Binary files a/dk_images/furniture/flagpole_blueflag_fp/r1frame08.png and /dev/null differ diff --git a/dk_images/furniture/flagpole_empty_fp/filelist_rot1.txt b/dk_images/furniture/flagpole_empty_fp/filelist_rot1.txt deleted file mode 100644 index ee7709a0..00000000 --- a/dk_images/furniture/flagpole_empty_fp/filelist_rot1.txt +++ /dev/null @@ -1,2 +0,0 @@ -animation_193 0 1 -9 -94 -r1frame01.png diff --git a/dk_images/furniture/flagpole_empty_fp/r1frame01.png b/dk_images/furniture/flagpole_empty_fp/r1frame01.png deleted file mode 100644 index d3f247ff..00000000 Binary files a/dk_images/furniture/flagpole_empty_fp/r1frame01.png and /dev/null differ diff --git a/dk_images/furniture/flagpole_greenflag_fp/r1frame01.png b/dk_images/furniture/flagpole_greenflag_fp/r1frame01.png deleted file mode 100644 index 6a9608c0..00000000 Binary files a/dk_images/furniture/flagpole_greenflag_fp/r1frame01.png and /dev/null differ diff --git a/dk_images/furniture/flagpole_greenflag_fp/r1frame02.png b/dk_images/furniture/flagpole_greenflag_fp/r1frame02.png deleted file mode 100644 index 5d687911..00000000 Binary files a/dk_images/furniture/flagpole_greenflag_fp/r1frame02.png and /dev/null differ diff --git a/dk_images/furniture/flagpole_greenflag_fp/r1frame03.png b/dk_images/furniture/flagpole_greenflag_fp/r1frame03.png deleted file mode 100644 index 1a377bfa..00000000 Binary files a/dk_images/furniture/flagpole_greenflag_fp/r1frame03.png and /dev/null differ diff --git a/dk_images/furniture/flagpole_greenflag_fp/r1frame04.png b/dk_images/furniture/flagpole_greenflag_fp/r1frame04.png deleted file mode 100644 index 01fd0766..00000000 Binary files a/dk_images/furniture/flagpole_greenflag_fp/r1frame04.png and /dev/null differ diff --git a/dk_images/furniture/flagpole_greenflag_fp/r1frame05.png b/dk_images/furniture/flagpole_greenflag_fp/r1frame05.png deleted file mode 100644 index c948f76c..00000000 Binary files a/dk_images/furniture/flagpole_greenflag_fp/r1frame05.png and /dev/null differ diff --git a/dk_images/furniture/flagpole_greenflag_fp/r1frame06.png b/dk_images/furniture/flagpole_greenflag_fp/r1frame06.png deleted file mode 100644 index 2aaf20fc..00000000 Binary files a/dk_images/furniture/flagpole_greenflag_fp/r1frame06.png and /dev/null differ diff --git a/dk_images/furniture/flagpole_greenflag_fp/r1frame07.png b/dk_images/furniture/flagpole_greenflag_fp/r1frame07.png deleted file mode 100644 index 0e8aac06..00000000 Binary files a/dk_images/furniture/flagpole_greenflag_fp/r1frame07.png and /dev/null differ diff --git a/dk_images/furniture/flagpole_greenflag_fp/r1frame08.png b/dk_images/furniture/flagpole_greenflag_fp/r1frame08.png deleted file mode 100644 index af289fa7..00000000 Binary files a/dk_images/furniture/flagpole_greenflag_fp/r1frame08.png and /dev/null differ diff --git a/dk_images/furniture/flagpole_orangeflag_tp/AnimFlagpoleOrange.tres b/dk_images/furniture/flagpole_orangeflag_tp/AnimFlagpoleOrange.tres new file mode 100644 index 00000000..b1daea2a --- /dev/null +++ b/dk_images/furniture/flagpole_orangeflag_tp/AnimFlagpoleOrange.tres @@ -0,0 +1,32 @@ +[gd_resource type="AnimatedTexture" load_steps=10 format=2] + +[ext_resource path="res://addons/animated_texture_but_better/animated_texture_but_better.gd" type="Script" id=1] +[ext_resource path="res://dk_images/furniture/flagpole_orangeflag_tp/r1frame03.png" type="Texture" id=2] +[ext_resource path="res://dk_images/furniture/flagpole_orangeflag_tp/r1frame04.png" type="Texture" id=3] +[ext_resource path="res://dk_images/furniture/flagpole_orangeflag_tp/r1frame02.png" type="Texture" id=4] +[ext_resource path="res://dk_images/furniture/flagpole_orangeflag_tp/r1frame01.png" type="Texture" id=5] +[ext_resource path="res://dk_images/furniture/flagpole_orangeflag_tp/r1frame05.png" type="Texture" id=6] +[ext_resource path="res://dk_images/furniture/flagpole_orangeflag_tp/r1frame08.png" type="Texture" id=7] +[ext_resource path="res://dk_images/furniture/flagpole_orangeflag_tp/r1frame07.png" type="Texture" id=8] +[ext_resource path="res://dk_images/furniture/flagpole_orangeflag_tp/r1frame06.png" type="Texture" id=9] + +[resource] +flags = 9 +frames = 8 +fps = 12.0 +frame_0/texture = ExtResource( 5 ) +frame_1/texture = ExtResource( 4 ) +frame_1/delay_sec = 0.0 +frame_2/texture = ExtResource( 2 ) +frame_2/delay_sec = 0.0 +frame_3/texture = ExtResource( 3 ) +frame_3/delay_sec = 0.0 +frame_4/texture = ExtResource( 6 ) +frame_4/delay_sec = 0.0 +frame_5/texture = ExtResource( 9 ) +frame_5/delay_sec = 0.0 +frame_6/texture = ExtResource( 8 ) +frame_6/delay_sec = 0.0 +frame_7/texture = ExtResource( 7 ) +frame_7/delay_sec = 0.0 +script = ExtResource( 1 ) diff --git a/dk_images/furniture/flagpole_yellowflag_fp/filelist_rot1.txt b/dk_images/furniture/flagpole_orangeflag_tp/filelist_rot1.txt similarity index 77% rename from dk_images/furniture/flagpole_yellowflag_fp/filelist_rot1.txt rename to dk_images/furniture/flagpole_orangeflag_tp/filelist_rot1.txt index 6e333621..0adbb344 100644 --- a/dk_images/furniture/flagpole_yellowflag_fp/filelist_rot1.txt +++ b/dk_images/furniture/flagpole_orangeflag_tp/filelist_rot1.txt @@ -1,4 +1,4 @@ -animation_201 0 8 -33 -94 +animation_202 0 8 -25 -60 r1frame01.png r1frame02.png r1frame03.png diff --git a/dk_images/furniture/flagpole_orangeflag_tp/r1frame01.png b/dk_images/furniture/flagpole_orangeflag_tp/r1frame01.png new file mode 100644 index 00000000..c2d1aa0c Binary files /dev/null and b/dk_images/furniture/flagpole_orangeflag_tp/r1frame01.png differ diff --git a/dk_images/furniture/flagpole_yellowflag_fp/r1frame01.png.import b/dk_images/furniture/flagpole_orangeflag_tp/r1frame01.png.import similarity index 69% rename from dk_images/furniture/flagpole_yellowflag_fp/r1frame01.png.import rename to dk_images/furniture/flagpole_orangeflag_tp/r1frame01.png.import index af46baf0..b79fb2b2 100644 --- a/dk_images/furniture/flagpole_yellowflag_fp/r1frame01.png.import +++ b/dk_images/furniture/flagpole_orangeflag_tp/r1frame01.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/r1frame01.png-0c6e55875cdfe0521c849b5c14b467d9.stex" +path="res://.import/r1frame01.png-3a2f7c6ce2d5a6d79a70d70ea82f7975.stex" metadata={ "vram_texture": false } [deps] -source_file="res://dk_images/furniture/flagpole_yellowflag_fp/r1frame01.png" -dest_files=[ "res://.import/r1frame01.png-0c6e55875cdfe0521c849b5c14b467d9.stex" ] +source_file="res://dk_images/furniture/flagpole_orangeflag_tp/r1frame01.png" +dest_files=[ "res://.import/r1frame01.png-3a2f7c6ce2d5a6d79a70d70ea82f7975.stex" ] [params] diff --git a/dk_images/furniture/flagpole_orangeflag_tp/r1frame02.png b/dk_images/furniture/flagpole_orangeflag_tp/r1frame02.png new file mode 100644 index 00000000..f47ae3d7 Binary files /dev/null and b/dk_images/furniture/flagpole_orangeflag_tp/r1frame02.png differ diff --git a/dk_images/furniture/flagpole_yellowflag_fp/r1frame02.png.import b/dk_images/furniture/flagpole_orangeflag_tp/r1frame02.png.import similarity index 69% rename from dk_images/furniture/flagpole_yellowflag_fp/r1frame02.png.import rename to dk_images/furniture/flagpole_orangeflag_tp/r1frame02.png.import index c05a6ac8..e0f7d1fc 100644 --- a/dk_images/furniture/flagpole_yellowflag_fp/r1frame02.png.import +++ b/dk_images/furniture/flagpole_orangeflag_tp/r1frame02.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/r1frame02.png-6aca547f220d1d5530be5e4316a233b6.stex" +path="res://.import/r1frame02.png-aa458678400c538566abb72627c2e37a.stex" metadata={ "vram_texture": false } [deps] -source_file="res://dk_images/furniture/flagpole_yellowflag_fp/r1frame02.png" -dest_files=[ "res://.import/r1frame02.png-6aca547f220d1d5530be5e4316a233b6.stex" ] +source_file="res://dk_images/furniture/flagpole_orangeflag_tp/r1frame02.png" +dest_files=[ "res://.import/r1frame02.png-aa458678400c538566abb72627c2e37a.stex" ] [params] diff --git a/dk_images/furniture/flagpole_orangeflag_tp/r1frame03.png b/dk_images/furniture/flagpole_orangeflag_tp/r1frame03.png new file mode 100644 index 00000000..eadf79a0 Binary files /dev/null and b/dk_images/furniture/flagpole_orangeflag_tp/r1frame03.png differ diff --git a/dk_images/furniture/flagpole_yellowflag_fp/r1frame03.png.import b/dk_images/furniture/flagpole_orangeflag_tp/r1frame03.png.import similarity index 69% rename from dk_images/furniture/flagpole_yellowflag_fp/r1frame03.png.import rename to dk_images/furniture/flagpole_orangeflag_tp/r1frame03.png.import index 997f0e8b..1dd6cf80 100644 --- a/dk_images/furniture/flagpole_yellowflag_fp/r1frame03.png.import +++ b/dk_images/furniture/flagpole_orangeflag_tp/r1frame03.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/r1frame03.png-2a3dda8ff7fdec1a52f31a17184aa74f.stex" +path="res://.import/r1frame03.png-9189b86c74ee87b34cfad3ba9155f6a5.stex" metadata={ "vram_texture": false } [deps] -source_file="res://dk_images/furniture/flagpole_yellowflag_fp/r1frame03.png" -dest_files=[ "res://.import/r1frame03.png-2a3dda8ff7fdec1a52f31a17184aa74f.stex" ] +source_file="res://dk_images/furniture/flagpole_orangeflag_tp/r1frame03.png" +dest_files=[ "res://.import/r1frame03.png-9189b86c74ee87b34cfad3ba9155f6a5.stex" ] [params] diff --git a/dk_images/furniture/flagpole_orangeflag_tp/r1frame04.png b/dk_images/furniture/flagpole_orangeflag_tp/r1frame04.png new file mode 100644 index 00000000..a9c98d04 Binary files /dev/null and b/dk_images/furniture/flagpole_orangeflag_tp/r1frame04.png differ diff --git a/dk_images/furniture/flagpole_yellowflag_fp/r1frame04.png.import b/dk_images/furniture/flagpole_orangeflag_tp/r1frame04.png.import similarity index 69% rename from dk_images/furniture/flagpole_yellowflag_fp/r1frame04.png.import rename to dk_images/furniture/flagpole_orangeflag_tp/r1frame04.png.import index 7a8cad5d..070e1933 100644 --- a/dk_images/furniture/flagpole_yellowflag_fp/r1frame04.png.import +++ b/dk_images/furniture/flagpole_orangeflag_tp/r1frame04.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/r1frame04.png-7124cfa9afd3eb1d01e450062db3d443.stex" +path="res://.import/r1frame04.png-e596cf11c15f9d19a19cdcb221db0354.stex" metadata={ "vram_texture": false } [deps] -source_file="res://dk_images/furniture/flagpole_yellowflag_fp/r1frame04.png" -dest_files=[ "res://.import/r1frame04.png-7124cfa9afd3eb1d01e450062db3d443.stex" ] +source_file="res://dk_images/furniture/flagpole_orangeflag_tp/r1frame04.png" +dest_files=[ "res://.import/r1frame04.png-e596cf11c15f9d19a19cdcb221db0354.stex" ] [params] diff --git a/dk_images/furniture/flagpole_orangeflag_tp/r1frame05.png b/dk_images/furniture/flagpole_orangeflag_tp/r1frame05.png new file mode 100644 index 00000000..f920e64e Binary files /dev/null and b/dk_images/furniture/flagpole_orangeflag_tp/r1frame05.png differ diff --git a/dk_images/furniture/flagpole_yellowflag_fp/r1frame05.png.import b/dk_images/furniture/flagpole_orangeflag_tp/r1frame05.png.import similarity index 69% rename from dk_images/furniture/flagpole_yellowflag_fp/r1frame05.png.import rename to dk_images/furniture/flagpole_orangeflag_tp/r1frame05.png.import index 888fb1a5..578a8806 100644 --- a/dk_images/furniture/flagpole_yellowflag_fp/r1frame05.png.import +++ b/dk_images/furniture/flagpole_orangeflag_tp/r1frame05.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/r1frame05.png-72c9cdb7aa09f4f56a3a22056f47797f.stex" +path="res://.import/r1frame05.png-9b6646e6ff6611ef2f2c1f58f7e8124e.stex" metadata={ "vram_texture": false } [deps] -source_file="res://dk_images/furniture/flagpole_yellowflag_fp/r1frame05.png" -dest_files=[ "res://.import/r1frame05.png-72c9cdb7aa09f4f56a3a22056f47797f.stex" ] +source_file="res://dk_images/furniture/flagpole_orangeflag_tp/r1frame05.png" +dest_files=[ "res://.import/r1frame05.png-9b6646e6ff6611ef2f2c1f58f7e8124e.stex" ] [params] diff --git a/dk_images/furniture/flagpole_orangeflag_tp/r1frame06.png b/dk_images/furniture/flagpole_orangeflag_tp/r1frame06.png new file mode 100644 index 00000000..15f71313 Binary files /dev/null and b/dk_images/furniture/flagpole_orangeflag_tp/r1frame06.png differ diff --git a/dk_images/furniture/flagpole_yellowflag_fp/r1frame06.png.import b/dk_images/furniture/flagpole_orangeflag_tp/r1frame06.png.import similarity index 69% rename from dk_images/furniture/flagpole_yellowflag_fp/r1frame06.png.import rename to dk_images/furniture/flagpole_orangeflag_tp/r1frame06.png.import index e86a6108..57dcadd9 100644 --- a/dk_images/furniture/flagpole_yellowflag_fp/r1frame06.png.import +++ b/dk_images/furniture/flagpole_orangeflag_tp/r1frame06.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/r1frame06.png-746772209c865158dc8e9b1438e8fb44.stex" +path="res://.import/r1frame06.png-ba4c0d9b713a5a92a7405a3372178fd3.stex" metadata={ "vram_texture": false } [deps] -source_file="res://dk_images/furniture/flagpole_yellowflag_fp/r1frame06.png" -dest_files=[ "res://.import/r1frame06.png-746772209c865158dc8e9b1438e8fb44.stex" ] +source_file="res://dk_images/furniture/flagpole_orangeflag_tp/r1frame06.png" +dest_files=[ "res://.import/r1frame06.png-ba4c0d9b713a5a92a7405a3372178fd3.stex" ] [params] diff --git a/dk_images/furniture/flagpole_orangeflag_tp/r1frame07.png b/dk_images/furniture/flagpole_orangeflag_tp/r1frame07.png new file mode 100644 index 00000000..957d89e4 Binary files /dev/null and b/dk_images/furniture/flagpole_orangeflag_tp/r1frame07.png differ diff --git a/dk_images/furniture/flagpole_yellowflag_fp/r1frame07.png.import b/dk_images/furniture/flagpole_orangeflag_tp/r1frame07.png.import similarity index 69% rename from dk_images/furniture/flagpole_yellowflag_fp/r1frame07.png.import rename to dk_images/furniture/flagpole_orangeflag_tp/r1frame07.png.import index 797b3a3c..449f9000 100644 --- a/dk_images/furniture/flagpole_yellowflag_fp/r1frame07.png.import +++ b/dk_images/furniture/flagpole_orangeflag_tp/r1frame07.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/r1frame07.png-7690fac62be7a92a0b5838ad7ad54835.stex" +path="res://.import/r1frame07.png-d8e9ce3997e93163dd09cea025ad54e2.stex" metadata={ "vram_texture": false } [deps] -source_file="res://dk_images/furniture/flagpole_yellowflag_fp/r1frame07.png" -dest_files=[ "res://.import/r1frame07.png-7690fac62be7a92a0b5838ad7ad54835.stex" ] +source_file="res://dk_images/furniture/flagpole_orangeflag_tp/r1frame07.png" +dest_files=[ "res://.import/r1frame07.png-d8e9ce3997e93163dd09cea025ad54e2.stex" ] [params] diff --git a/dk_images/furniture/flagpole_orangeflag_tp/r1frame08.png b/dk_images/furniture/flagpole_orangeflag_tp/r1frame08.png new file mode 100644 index 00000000..703be56b Binary files /dev/null and b/dk_images/furniture/flagpole_orangeflag_tp/r1frame08.png differ diff --git a/dk_images/furniture/flagpole_yellowflag_fp/r1frame08.png.import b/dk_images/furniture/flagpole_orangeflag_tp/r1frame08.png.import similarity index 69% rename from dk_images/furniture/flagpole_yellowflag_fp/r1frame08.png.import rename to dk_images/furniture/flagpole_orangeflag_tp/r1frame08.png.import index ab615951..e4a89a23 100644 --- a/dk_images/furniture/flagpole_yellowflag_fp/r1frame08.png.import +++ b/dk_images/furniture/flagpole_orangeflag_tp/r1frame08.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/r1frame08.png-91d313173cccec80814d3c2c33528992.stex" +path="res://.import/r1frame08.png-a9b4d97bdc9d4ffb3ec2530fc0268710.stex" metadata={ "vram_texture": false } [deps] -source_file="res://dk_images/furniture/flagpole_yellowflag_fp/r1frame08.png" -dest_files=[ "res://.import/r1frame08.png-91d313173cccec80814d3c2c33528992.stex" ] +source_file="res://dk_images/furniture/flagpole_orangeflag_tp/r1frame08.png" +dest_files=[ "res://.import/r1frame08.png-a9b4d97bdc9d4ffb3ec2530fc0268710.stex" ] [params] diff --git a/dk_images/furniture/flagpole_purpleflag_tp/AnimFlagpolePurple.tres b/dk_images/furniture/flagpole_purpleflag_tp/AnimFlagpolePurple.tres new file mode 100644 index 00000000..7c7f357b --- /dev/null +++ b/dk_images/furniture/flagpole_purpleflag_tp/AnimFlagpolePurple.tres @@ -0,0 +1,32 @@ +[gd_resource type="AnimatedTexture" load_steps=10 format=2] + +[ext_resource path="res://addons/animated_texture_but_better/animated_texture_but_better.gd" type="Script" id=1] +[ext_resource path="res://dk_images/furniture/flagpole_purpleflag_tp/r1frame03.png" type="Texture" id=2] +[ext_resource path="res://dk_images/furniture/flagpole_purpleflag_tp/r1frame04.png" type="Texture" id=3] +[ext_resource path="res://dk_images/furniture/flagpole_purpleflag_tp/r1frame02.png" type="Texture" id=4] +[ext_resource path="res://dk_images/furniture/flagpole_purpleflag_tp/r1frame01.png" type="Texture" id=5] +[ext_resource path="res://dk_images/furniture/flagpole_purpleflag_tp/r1frame05.png" type="Texture" id=6] +[ext_resource path="res://dk_images/furniture/flagpole_purpleflag_tp/r1frame08.png" type="Texture" id=7] +[ext_resource path="res://dk_images/furniture/flagpole_purpleflag_tp/r1frame07.png" type="Texture" id=8] +[ext_resource path="res://dk_images/furniture/flagpole_purpleflag_tp/r1frame06.png" type="Texture" id=9] + +[resource] +flags = 9 +frames = 8 +fps = 12.0 +frame_0/texture = ExtResource( 5 ) +frame_1/texture = ExtResource( 4 ) +frame_1/delay_sec = 0.0 +frame_2/texture = ExtResource( 2 ) +frame_2/delay_sec = 0.0 +frame_3/texture = ExtResource( 3 ) +frame_3/delay_sec = 0.0 +frame_4/texture = ExtResource( 6 ) +frame_4/delay_sec = 0.0 +frame_5/texture = ExtResource( 9 ) +frame_5/delay_sec = 0.0 +frame_6/texture = ExtResource( 8 ) +frame_6/delay_sec = 0.0 +frame_7/texture = ExtResource( 7 ) +frame_7/delay_sec = 0.0 +script = ExtResource( 1 ) diff --git a/dk_images/furniture/flagpole_greenflag_fp/filelist_rot1.txt b/dk_images/furniture/flagpole_purpleflag_tp/filelist_rot1.txt similarity index 77% rename from dk_images/furniture/flagpole_greenflag_fp/filelist_rot1.txt rename to dk_images/furniture/flagpole_purpleflag_tp/filelist_rot1.txt index 0de5cf95..0adbb344 100644 --- a/dk_images/furniture/flagpole_greenflag_fp/filelist_rot1.txt +++ b/dk_images/furniture/flagpole_purpleflag_tp/filelist_rot1.txt @@ -1,4 +1,4 @@ -animation_199 0 8 -33 -94 +animation_202 0 8 -25 -60 r1frame01.png r1frame02.png r1frame03.png diff --git a/dk_images/furniture/flagpole_purpleflag_tp/r1frame01.png b/dk_images/furniture/flagpole_purpleflag_tp/r1frame01.png new file mode 100644 index 00000000..49b6224c Binary files /dev/null and b/dk_images/furniture/flagpole_purpleflag_tp/r1frame01.png differ diff --git a/dk_images/furniture/flagpole_whiteflag_fp/r1frame08.png.import b/dk_images/furniture/flagpole_purpleflag_tp/r1frame01.png.import similarity index 69% rename from dk_images/furniture/flagpole_whiteflag_fp/r1frame08.png.import rename to dk_images/furniture/flagpole_purpleflag_tp/r1frame01.png.import index 6fb908a5..183ede35 100644 --- a/dk_images/furniture/flagpole_whiteflag_fp/r1frame08.png.import +++ b/dk_images/furniture/flagpole_purpleflag_tp/r1frame01.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/r1frame08.png-e9288ec21b99a9b89ab16e86a19967dc.stex" +path="res://.import/r1frame01.png-01c13ea569ea3e449c8c8a53e1e249dc.stex" metadata={ "vram_texture": false } [deps] -source_file="res://dk_images/furniture/flagpole_whiteflag_fp/r1frame08.png" -dest_files=[ "res://.import/r1frame08.png-e9288ec21b99a9b89ab16e86a19967dc.stex" ] +source_file="res://dk_images/furniture/flagpole_purpleflag_tp/r1frame01.png" +dest_files=[ "res://.import/r1frame01.png-01c13ea569ea3e449c8c8a53e1e249dc.stex" ] [params] diff --git a/dk_images/furniture/flagpole_purpleflag_tp/r1frame02.png b/dk_images/furniture/flagpole_purpleflag_tp/r1frame02.png new file mode 100644 index 00000000..ded2bf91 Binary files /dev/null and b/dk_images/furniture/flagpole_purpleflag_tp/r1frame02.png differ diff --git a/dk_images/furniture/flagpole_blueflag_fp/r1frame02.png.import b/dk_images/furniture/flagpole_purpleflag_tp/r1frame02.png.import similarity index 68% rename from dk_images/furniture/flagpole_blueflag_fp/r1frame02.png.import rename to dk_images/furniture/flagpole_purpleflag_tp/r1frame02.png.import index 0f554eb9..33267976 100644 --- a/dk_images/furniture/flagpole_blueflag_fp/r1frame02.png.import +++ b/dk_images/furniture/flagpole_purpleflag_tp/r1frame02.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/r1frame02.png-3c9b064395cd044b49fbe6c88ee8fb47.stex" +path="res://.import/r1frame02.png-17ef933c75e198c200d36f2538552370.stex" metadata={ "vram_texture": false } [deps] -source_file="res://dk_images/furniture/flagpole_blueflag_fp/r1frame02.png" -dest_files=[ "res://.import/r1frame02.png-3c9b064395cd044b49fbe6c88ee8fb47.stex" ] +source_file="res://dk_images/furniture/flagpole_purpleflag_tp/r1frame02.png" +dest_files=[ "res://.import/r1frame02.png-17ef933c75e198c200d36f2538552370.stex" ] [params] diff --git a/dk_images/furniture/flagpole_purpleflag_tp/r1frame03.png b/dk_images/furniture/flagpole_purpleflag_tp/r1frame03.png new file mode 100644 index 00000000..8dada154 Binary files /dev/null and b/dk_images/furniture/flagpole_purpleflag_tp/r1frame03.png differ diff --git a/dk_images/furniture/flagpole_blueflag_fp/r1frame03.png.import b/dk_images/furniture/flagpole_purpleflag_tp/r1frame03.png.import similarity index 68% rename from dk_images/furniture/flagpole_blueflag_fp/r1frame03.png.import rename to dk_images/furniture/flagpole_purpleflag_tp/r1frame03.png.import index 25c0849d..0f1d032c 100644 --- a/dk_images/furniture/flagpole_blueflag_fp/r1frame03.png.import +++ b/dk_images/furniture/flagpole_purpleflag_tp/r1frame03.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/r1frame03.png-1c8241bc7b40ccb4b97c3394d14c15da.stex" +path="res://.import/r1frame03.png-30f686098d4c62772b59d6350fc32594.stex" metadata={ "vram_texture": false } [deps] -source_file="res://dk_images/furniture/flagpole_blueflag_fp/r1frame03.png" -dest_files=[ "res://.import/r1frame03.png-1c8241bc7b40ccb4b97c3394d14c15da.stex" ] +source_file="res://dk_images/furniture/flagpole_purpleflag_tp/r1frame03.png" +dest_files=[ "res://.import/r1frame03.png-30f686098d4c62772b59d6350fc32594.stex" ] [params] diff --git a/dk_images/furniture/flagpole_purpleflag_tp/r1frame04.png b/dk_images/furniture/flagpole_purpleflag_tp/r1frame04.png new file mode 100644 index 00000000..cae0bb45 Binary files /dev/null and b/dk_images/furniture/flagpole_purpleflag_tp/r1frame04.png differ diff --git a/dk_images/furniture/flagpole_whiteflag_fp/r1frame04.png.import b/dk_images/furniture/flagpole_purpleflag_tp/r1frame04.png.import similarity index 68% rename from dk_images/furniture/flagpole_whiteflag_fp/r1frame04.png.import rename to dk_images/furniture/flagpole_purpleflag_tp/r1frame04.png.import index 615e5612..bc0c175c 100644 --- a/dk_images/furniture/flagpole_whiteflag_fp/r1frame04.png.import +++ b/dk_images/furniture/flagpole_purpleflag_tp/r1frame04.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/r1frame04.png-48f9e8ac6668293a73cdc8403680e839.stex" +path="res://.import/r1frame04.png-60599d26ba25e35a74d130789c097015.stex" metadata={ "vram_texture": false } [deps] -source_file="res://dk_images/furniture/flagpole_whiteflag_fp/r1frame04.png" -dest_files=[ "res://.import/r1frame04.png-48f9e8ac6668293a73cdc8403680e839.stex" ] +source_file="res://dk_images/furniture/flagpole_purpleflag_tp/r1frame04.png" +dest_files=[ "res://.import/r1frame04.png-60599d26ba25e35a74d130789c097015.stex" ] [params] diff --git a/dk_images/furniture/flagpole_purpleflag_tp/r1frame05.png b/dk_images/furniture/flagpole_purpleflag_tp/r1frame05.png new file mode 100644 index 00000000..f94af7f1 Binary files /dev/null and b/dk_images/furniture/flagpole_purpleflag_tp/r1frame05.png differ diff --git a/dk_images/furniture/flagpole_whiteflag_fp/r1frame05.png.import b/dk_images/furniture/flagpole_purpleflag_tp/r1frame05.png.import similarity index 68% rename from dk_images/furniture/flagpole_whiteflag_fp/r1frame05.png.import rename to dk_images/furniture/flagpole_purpleflag_tp/r1frame05.png.import index 4b354c62..67c565f9 100644 --- a/dk_images/furniture/flagpole_whiteflag_fp/r1frame05.png.import +++ b/dk_images/furniture/flagpole_purpleflag_tp/r1frame05.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/r1frame05.png-19ea8204c36106af600b1c512e7b8692.stex" +path="res://.import/r1frame05.png-f0cf7fa5bfcf8302ebaf24082519638c.stex" metadata={ "vram_texture": false } [deps] -source_file="res://dk_images/furniture/flagpole_whiteflag_fp/r1frame05.png" -dest_files=[ "res://.import/r1frame05.png-19ea8204c36106af600b1c512e7b8692.stex" ] +source_file="res://dk_images/furniture/flagpole_purpleflag_tp/r1frame05.png" +dest_files=[ "res://.import/r1frame05.png-f0cf7fa5bfcf8302ebaf24082519638c.stex" ] [params] diff --git a/dk_images/furniture/flagpole_purpleflag_tp/r1frame06.png b/dk_images/furniture/flagpole_purpleflag_tp/r1frame06.png new file mode 100644 index 00000000..3de2ae6c Binary files /dev/null and b/dk_images/furniture/flagpole_purpleflag_tp/r1frame06.png differ diff --git a/dk_images/furniture/flagpole_blueflag_fp/r1frame07.png.import b/dk_images/furniture/flagpole_purpleflag_tp/r1frame06.png.import similarity index 69% rename from dk_images/furniture/flagpole_blueflag_fp/r1frame07.png.import rename to dk_images/furniture/flagpole_purpleflag_tp/r1frame06.png.import index 01a64cc4..497b2821 100644 --- a/dk_images/furniture/flagpole_blueflag_fp/r1frame07.png.import +++ b/dk_images/furniture/flagpole_purpleflag_tp/r1frame06.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/r1frame07.png-11e07a040bcefa29d2b2324fbf7b7da7.stex" +path="res://.import/r1frame06.png-f3121423812a6a6fc3929609edc627a7.stex" metadata={ "vram_texture": false } [deps] -source_file="res://dk_images/furniture/flagpole_blueflag_fp/r1frame07.png" -dest_files=[ "res://.import/r1frame07.png-11e07a040bcefa29d2b2324fbf7b7da7.stex" ] +source_file="res://dk_images/furniture/flagpole_purpleflag_tp/r1frame06.png" +dest_files=[ "res://.import/r1frame06.png-f3121423812a6a6fc3929609edc627a7.stex" ] [params] diff --git a/dk_images/furniture/flagpole_purpleflag_tp/r1frame07.png b/dk_images/furniture/flagpole_purpleflag_tp/r1frame07.png new file mode 100644 index 00000000..cca2503f Binary files /dev/null and b/dk_images/furniture/flagpole_purpleflag_tp/r1frame07.png differ diff --git a/dk_images/furniture/flagpole_whiteflag_fp/r1frame07.png.import b/dk_images/furniture/flagpole_purpleflag_tp/r1frame07.png.import similarity index 68% rename from dk_images/furniture/flagpole_whiteflag_fp/r1frame07.png.import rename to dk_images/furniture/flagpole_purpleflag_tp/r1frame07.png.import index bd3a7d6c..a1a94610 100644 --- a/dk_images/furniture/flagpole_whiteflag_fp/r1frame07.png.import +++ b/dk_images/furniture/flagpole_purpleflag_tp/r1frame07.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/r1frame07.png-aff802ca9451b975f500a36021cf3563.stex" +path="res://.import/r1frame07.png-d093d3882a0bb2f0b4b2871499652f23.stex" metadata={ "vram_texture": false } [deps] -source_file="res://dk_images/furniture/flagpole_whiteflag_fp/r1frame07.png" -dest_files=[ "res://.import/r1frame07.png-aff802ca9451b975f500a36021cf3563.stex" ] +source_file="res://dk_images/furniture/flagpole_purpleflag_tp/r1frame07.png" +dest_files=[ "res://.import/r1frame07.png-d093d3882a0bb2f0b4b2871499652f23.stex" ] [params] diff --git a/dk_images/furniture/flagpole_purpleflag_tp/r1frame08.png b/dk_images/furniture/flagpole_purpleflag_tp/r1frame08.png new file mode 100644 index 00000000..565b71bd Binary files /dev/null and b/dk_images/furniture/flagpole_purpleflag_tp/r1frame08.png differ diff --git a/dk_images/furniture/flagpole_purpleflag_tp/r1frame08.png.import b/dk_images/furniture/flagpole_purpleflag_tp/r1frame08.png.import new file mode 100644 index 00000000..1841a8aa --- /dev/null +++ b/dk_images/furniture/flagpole_purpleflag_tp/r1frame08.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame08.png-f018e1d69e16a099b6f4d94f6e160d11.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://dk_images/furniture/flagpole_purpleflag_tp/r1frame08.png" +dest_files=[ "res://.import/r1frame08.png-f018e1d69e16a099b6f4d94f6e160d11.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/dk_images/furniture/flagpole_whiteflag_fp/filelist_rot1.txt b/dk_images/furniture/flagpole_whiteflag_fp/filelist_rot1.txt deleted file mode 100644 index 6e333621..00000000 --- a/dk_images/furniture/flagpole_whiteflag_fp/filelist_rot1.txt +++ /dev/null @@ -1,9 +0,0 @@ -animation_201 0 8 -33 -94 -r1frame01.png -r1frame02.png -r1frame03.png -r1frame04.png -r1frame05.png -r1frame06.png -r1frame07.png -r1frame08.png diff --git a/dk_images/furniture/flagpole_whiteflag_fp/r1frame01.png b/dk_images/furniture/flagpole_whiteflag_fp/r1frame01.png deleted file mode 100644 index 93d71560..00000000 Binary files a/dk_images/furniture/flagpole_whiteflag_fp/r1frame01.png and /dev/null differ diff --git a/dk_images/furniture/flagpole_whiteflag_fp/r1frame02.png b/dk_images/furniture/flagpole_whiteflag_fp/r1frame02.png deleted file mode 100644 index 6bf61c83..00000000 Binary files a/dk_images/furniture/flagpole_whiteflag_fp/r1frame02.png and /dev/null differ diff --git a/dk_images/furniture/flagpole_whiteflag_fp/r1frame03.png b/dk_images/furniture/flagpole_whiteflag_fp/r1frame03.png deleted file mode 100644 index 2a3bef52..00000000 Binary files a/dk_images/furniture/flagpole_whiteflag_fp/r1frame03.png and /dev/null differ diff --git a/dk_images/furniture/flagpole_whiteflag_fp/r1frame04.png b/dk_images/furniture/flagpole_whiteflag_fp/r1frame04.png deleted file mode 100644 index 775c1bf8..00000000 Binary files a/dk_images/furniture/flagpole_whiteflag_fp/r1frame04.png and /dev/null differ diff --git a/dk_images/furniture/flagpole_whiteflag_fp/r1frame05.png b/dk_images/furniture/flagpole_whiteflag_fp/r1frame05.png deleted file mode 100644 index c2a5474f..00000000 Binary files a/dk_images/furniture/flagpole_whiteflag_fp/r1frame05.png and /dev/null differ diff --git a/dk_images/furniture/flagpole_whiteflag_fp/r1frame06.png b/dk_images/furniture/flagpole_whiteflag_fp/r1frame06.png deleted file mode 100644 index 0a1f705b..00000000 Binary files a/dk_images/furniture/flagpole_whiteflag_fp/r1frame06.png and /dev/null differ diff --git a/dk_images/furniture/flagpole_whiteflag_fp/r1frame07.png b/dk_images/furniture/flagpole_whiteflag_fp/r1frame07.png deleted file mode 100644 index 1e4709a9..00000000 Binary files a/dk_images/furniture/flagpole_whiteflag_fp/r1frame07.png and /dev/null differ diff --git a/dk_images/furniture/flagpole_whiteflag_fp/r1frame08.png b/dk_images/furniture/flagpole_whiteflag_fp/r1frame08.png deleted file mode 100644 index 916b5e80..00000000 Binary files a/dk_images/furniture/flagpole_whiteflag_fp/r1frame08.png and /dev/null differ diff --git a/dk_images/furniture/flagpole_whiteflag_tp/AnimFlagpoleWhite.tres b/dk_images/furniture/flagpole_whiteflag_tp/AnimFlagpoleWhite.tres index 42235760..a1ba1c85 100644 --- a/dk_images/furniture/flagpole_whiteflag_tp/AnimFlagpoleWhite.tres +++ b/dk_images/furniture/flagpole_whiteflag_tp/AnimFlagpoleWhite.tres @@ -30,4 +30,3 @@ frame_6/delay_sec = 0.0 frame_7/texture = ExtResource( 4 ) frame_7/delay_sec = 0.0 script = ExtResource( 1 ) -sprites_dir = "res://dk_images/furniture/flagpole_whiteflag_tp/" diff --git a/dk_images/furniture/flagpole_whiteflag_tp/r1frame01.png b/dk_images/furniture/flagpole_whiteflag_tp/r1frame01.png index 83ea9014..ad80ea41 100644 Binary files a/dk_images/furniture/flagpole_whiteflag_tp/r1frame01.png and b/dk_images/furniture/flagpole_whiteflag_tp/r1frame01.png differ diff --git a/dk_images/furniture/flagpole_whiteflag_tp/r1frame02.png b/dk_images/furniture/flagpole_whiteflag_tp/r1frame02.png index 1c1a5282..90ed5d55 100644 Binary files a/dk_images/furniture/flagpole_whiteflag_tp/r1frame02.png and b/dk_images/furniture/flagpole_whiteflag_tp/r1frame02.png differ diff --git a/dk_images/furniture/flagpole_whiteflag_tp/r1frame03.png b/dk_images/furniture/flagpole_whiteflag_tp/r1frame03.png index a3cd0c52..e92a9169 100644 Binary files a/dk_images/furniture/flagpole_whiteflag_tp/r1frame03.png and b/dk_images/furniture/flagpole_whiteflag_tp/r1frame03.png differ diff --git a/dk_images/furniture/flagpole_whiteflag_tp/r1frame04.png b/dk_images/furniture/flagpole_whiteflag_tp/r1frame04.png index 0f58a06d..9a0fcb1e 100644 Binary files a/dk_images/furniture/flagpole_whiteflag_tp/r1frame04.png and b/dk_images/furniture/flagpole_whiteflag_tp/r1frame04.png differ diff --git a/dk_images/furniture/flagpole_whiteflag_tp/r1frame05.png b/dk_images/furniture/flagpole_whiteflag_tp/r1frame05.png index d41bbb64..27022fe7 100644 Binary files a/dk_images/furniture/flagpole_whiteflag_tp/r1frame05.png and b/dk_images/furniture/flagpole_whiteflag_tp/r1frame05.png differ diff --git a/dk_images/furniture/flagpole_whiteflag_tp/r1frame06.png b/dk_images/furniture/flagpole_whiteflag_tp/r1frame06.png index 1503e0eb..d136ee76 100644 Binary files a/dk_images/furniture/flagpole_whiteflag_tp/r1frame06.png and b/dk_images/furniture/flagpole_whiteflag_tp/r1frame06.png differ diff --git a/dk_images/furniture/flagpole_whiteflag_tp/r1frame07.png b/dk_images/furniture/flagpole_whiteflag_tp/r1frame07.png index 1208e772..4ac8764f 100644 Binary files a/dk_images/furniture/flagpole_whiteflag_tp/r1frame07.png and b/dk_images/furniture/flagpole_whiteflag_tp/r1frame07.png differ diff --git a/dk_images/furniture/flagpole_whiteflag_tp/r1frame08.png b/dk_images/furniture/flagpole_whiteflag_tp/r1frame08.png index 8989f235..6f4ad577 100644 Binary files a/dk_images/furniture/flagpole_whiteflag_tp/r1frame08.png and b/dk_images/furniture/flagpole_whiteflag_tp/r1frame08.png differ diff --git a/dk_images/furniture/flagpole_yellowflag_fp/r1frame01.png b/dk_images/furniture/flagpole_yellowflag_fp/r1frame01.png deleted file mode 100644 index bd74006a..00000000 Binary files a/dk_images/furniture/flagpole_yellowflag_fp/r1frame01.png and /dev/null differ diff --git a/dk_images/furniture/flagpole_yellowflag_fp/r1frame02.png b/dk_images/furniture/flagpole_yellowflag_fp/r1frame02.png deleted file mode 100644 index d1825ce2..00000000 Binary files a/dk_images/furniture/flagpole_yellowflag_fp/r1frame02.png and /dev/null differ diff --git a/dk_images/furniture/flagpole_yellowflag_fp/r1frame03.png b/dk_images/furniture/flagpole_yellowflag_fp/r1frame03.png deleted file mode 100644 index 9a20a1d6..00000000 Binary files a/dk_images/furniture/flagpole_yellowflag_fp/r1frame03.png and /dev/null differ diff --git a/dk_images/furniture/flagpole_yellowflag_fp/r1frame04.png b/dk_images/furniture/flagpole_yellowflag_fp/r1frame04.png deleted file mode 100644 index 0e138344..00000000 Binary files a/dk_images/furniture/flagpole_yellowflag_fp/r1frame04.png and /dev/null differ diff --git a/dk_images/furniture/flagpole_yellowflag_fp/r1frame05.png b/dk_images/furniture/flagpole_yellowflag_fp/r1frame05.png deleted file mode 100644 index aee73161..00000000 Binary files a/dk_images/furniture/flagpole_yellowflag_fp/r1frame05.png and /dev/null differ diff --git a/dk_images/furniture/flagpole_yellowflag_fp/r1frame06.png b/dk_images/furniture/flagpole_yellowflag_fp/r1frame06.png deleted file mode 100644 index 27651f6e..00000000 Binary files a/dk_images/furniture/flagpole_yellowflag_fp/r1frame06.png and /dev/null differ diff --git a/dk_images/furniture/flagpole_yellowflag_fp/r1frame07.png b/dk_images/furniture/flagpole_yellowflag_fp/r1frame07.png deleted file mode 100644 index 25da6413..00000000 Binary files a/dk_images/furniture/flagpole_yellowflag_fp/r1frame07.png and /dev/null differ diff --git a/dk_images/furniture/flagpole_yellowflag_fp/r1frame08.png b/dk_images/furniture/flagpole_yellowflag_fp/r1frame08.png deleted file mode 100644 index 03de4a36..00000000 Binary files a/dk_images/furniture/flagpole_yellowflag_fp/r1frame08.png and /dev/null differ diff --git a/edited_images/heartflames/heartflame_black/AnimBlackHeartFlame.tres b/edited_images/heartflames/heartflame_black/AnimBlackHeartFlame.tres new file mode 100644 index 00000000..b66c5d0a --- /dev/null +++ b/edited_images/heartflames/heartflame_black/AnimBlackHeartFlame.tres @@ -0,0 +1,56 @@ +[gd_resource type="AnimatedTexture" load_steps=18 format=2] + +[ext_resource path="res://addons/animated_texture_but_better/animated_texture_but_better.gd" type="Script" id=1] +[ext_resource path="res://edited_images/heartflames/heartflame_black/r1frame03.png" type="Texture" id=2] +[ext_resource path="res://edited_images/heartflames/heartflame_black/r1frame05.png" type="Texture" id=3] +[ext_resource path="res://edited_images/heartflames/heartflame_black/r1frame10.png" type="Texture" id=4] +[ext_resource path="res://edited_images/heartflames/heartflame_black/r1frame14.png" type="Texture" id=5] +[ext_resource path="res://edited_images/heartflames/heartflame_black/r1frame16.png" type="Texture" id=6] +[ext_resource path="res://edited_images/heartflames/heartflame_black/r1frame09.png" type="Texture" id=7] +[ext_resource path="res://edited_images/heartflames/heartflame_black/r1frame12.png" type="Texture" id=8] +[ext_resource path="res://edited_images/heartflames/heartflame_black/r1frame01.png" type="Texture" id=9] +[ext_resource path="res://edited_images/heartflames/heartflame_black/r1frame08.png" type="Texture" id=10] +[ext_resource path="res://edited_images/heartflames/heartflame_black/r1frame07.png" type="Texture" id=11] +[ext_resource path="res://edited_images/heartflames/heartflame_black/r1frame06.png" type="Texture" id=12] +[ext_resource path="res://edited_images/heartflames/heartflame_black/r1frame13.png" type="Texture" id=13] +[ext_resource path="res://edited_images/heartflames/heartflame_black/r1frame15.png" type="Texture" id=14] +[ext_resource path="res://edited_images/heartflames/heartflame_black/r1frame02.png" type="Texture" id=15] +[ext_resource path="res://edited_images/heartflames/heartflame_black/r1frame04.png" type="Texture" id=16] +[ext_resource path="res://edited_images/heartflames/heartflame_black/r1frame11.png" type="Texture" id=17] + +[resource] +flags = 9 +frames = 16 +fps = 20.0 +frame_0/texture = ExtResource( 9 ) +frame_1/texture = ExtResource( 15 ) +frame_1/delay_sec = 0.0 +frame_2/texture = ExtResource( 2 ) +frame_2/delay_sec = 0.0 +frame_3/texture = ExtResource( 16 ) +frame_3/delay_sec = 0.0 +frame_4/texture = ExtResource( 3 ) +frame_4/delay_sec = 0.0 +frame_5/texture = ExtResource( 12 ) +frame_5/delay_sec = 0.0 +frame_6/texture = ExtResource( 11 ) +frame_6/delay_sec = 0.0 +frame_7/texture = ExtResource( 10 ) +frame_7/delay_sec = 0.0 +frame_8/texture = ExtResource( 7 ) +frame_8/delay_sec = 0.0 +frame_9/texture = ExtResource( 4 ) +frame_9/delay_sec = 0.0 +frame_10/texture = ExtResource( 17 ) +frame_10/delay_sec = 0.0 +frame_11/texture = ExtResource( 8 ) +frame_11/delay_sec = 0.0 +frame_12/texture = ExtResource( 13 ) +frame_12/delay_sec = 0.0 +frame_13/texture = ExtResource( 5 ) +frame_13/delay_sec = 0.0 +frame_14/texture = ExtResource( 14 ) +frame_14/delay_sec = 0.0 +frame_15/texture = ExtResource( 6 ) +frame_15/delay_sec = 0.0 +script = ExtResource( 1 ) diff --git a/edited_images/heartflames/heartflame_black/r1frame01.png b/edited_images/heartflames/heartflame_black/r1frame01.png new file mode 100644 index 00000000..e7591f20 Binary files /dev/null and b/edited_images/heartflames/heartflame_black/r1frame01.png differ diff --git a/dk_images/furniture/flagpole_blueflag_fp/r1frame01.png.import b/edited_images/heartflames/heartflame_black/r1frame01.png.import similarity index 68% rename from dk_images/furniture/flagpole_blueflag_fp/r1frame01.png.import rename to edited_images/heartflames/heartflame_black/r1frame01.png.import index e3cfe1f3..72665594 100644 --- a/dk_images/furniture/flagpole_blueflag_fp/r1frame01.png.import +++ b/edited_images/heartflames/heartflame_black/r1frame01.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/r1frame01.png-7c3571037fea162c4d348b2eaed4cffe.stex" +path="res://.import/r1frame01.png-e2759bc907e1f8a7136702db8e218416.stex" metadata={ "vram_texture": false } [deps] -source_file="res://dk_images/furniture/flagpole_blueflag_fp/r1frame01.png" -dest_files=[ "res://.import/r1frame01.png-7c3571037fea162c4d348b2eaed4cffe.stex" ] +source_file="res://edited_images/heartflames/heartflame_black/r1frame01.png" +dest_files=[ "res://.import/r1frame01.png-e2759bc907e1f8a7136702db8e218416.stex" ] [params] diff --git a/edited_images/heartflames/heartflame_black/r1frame02.png b/edited_images/heartflames/heartflame_black/r1frame02.png new file mode 100644 index 00000000..b1d6b77d Binary files /dev/null and b/edited_images/heartflames/heartflame_black/r1frame02.png differ diff --git a/dk_images/furniture/flagpole_whiteflag_fp/r1frame02.png.import b/edited_images/heartflames/heartflame_black/r1frame02.png.import similarity index 68% rename from dk_images/furniture/flagpole_whiteflag_fp/r1frame02.png.import rename to edited_images/heartflames/heartflame_black/r1frame02.png.import index 3a49f317..08f57e02 100644 --- a/dk_images/furniture/flagpole_whiteflag_fp/r1frame02.png.import +++ b/edited_images/heartflames/heartflame_black/r1frame02.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/r1frame02.png-0b7bfca186a0744ab3dc1979ae606571.stex" +path="res://.import/r1frame02.png-d2d4396a1fff3db606b641a101adbfc7.stex" metadata={ "vram_texture": false } [deps] -source_file="res://dk_images/furniture/flagpole_whiteflag_fp/r1frame02.png" -dest_files=[ "res://.import/r1frame02.png-0b7bfca186a0744ab3dc1979ae606571.stex" ] +source_file="res://edited_images/heartflames/heartflame_black/r1frame02.png" +dest_files=[ "res://.import/r1frame02.png-d2d4396a1fff3db606b641a101adbfc7.stex" ] [params] diff --git a/edited_images/heartflames/heartflame_black/r1frame03.png b/edited_images/heartflames/heartflame_black/r1frame03.png new file mode 100644 index 00000000..9b4761a9 Binary files /dev/null and b/edited_images/heartflames/heartflame_black/r1frame03.png differ diff --git a/dk_images/furniture/flagpole_whiteflag_fp/r1frame03.png.import b/edited_images/heartflames/heartflame_black/r1frame03.png.import similarity index 68% rename from dk_images/furniture/flagpole_whiteflag_fp/r1frame03.png.import rename to edited_images/heartflames/heartflame_black/r1frame03.png.import index 84cc9f37..95471642 100644 --- a/dk_images/furniture/flagpole_whiteflag_fp/r1frame03.png.import +++ b/edited_images/heartflames/heartflame_black/r1frame03.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/r1frame03.png-fef72603fcf6206fc2bf04e2cc18d5ae.stex" +path="res://.import/r1frame03.png-cdce458a8c1d9f57c01044ba7e1b50d6.stex" metadata={ "vram_texture": false } [deps] -source_file="res://dk_images/furniture/flagpole_whiteflag_fp/r1frame03.png" -dest_files=[ "res://.import/r1frame03.png-fef72603fcf6206fc2bf04e2cc18d5ae.stex" ] +source_file="res://edited_images/heartflames/heartflame_black/r1frame03.png" +dest_files=[ "res://.import/r1frame03.png-cdce458a8c1d9f57c01044ba7e1b50d6.stex" ] [params] diff --git a/edited_images/heartflames/heartflame_black/r1frame04.png b/edited_images/heartflames/heartflame_black/r1frame04.png new file mode 100644 index 00000000..891972ca Binary files /dev/null and b/edited_images/heartflames/heartflame_black/r1frame04.png differ diff --git a/dk_images/furniture/flagpole_blueflag_fp/r1frame04.png.import b/edited_images/heartflames/heartflame_black/r1frame04.png.import similarity index 68% rename from dk_images/furniture/flagpole_blueflag_fp/r1frame04.png.import rename to edited_images/heartflames/heartflame_black/r1frame04.png.import index 7afb48c7..eb454515 100644 --- a/dk_images/furniture/flagpole_blueflag_fp/r1frame04.png.import +++ b/edited_images/heartflames/heartflame_black/r1frame04.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/r1frame04.png-f847eb1dc80f40f78f3ed6ba60eefee9.stex" +path="res://.import/r1frame04.png-f1f6b86987cac8c3a2b2fe1bea86f96d.stex" metadata={ "vram_texture": false } [deps] -source_file="res://dk_images/furniture/flagpole_blueflag_fp/r1frame04.png" -dest_files=[ "res://.import/r1frame04.png-f847eb1dc80f40f78f3ed6ba60eefee9.stex" ] +source_file="res://edited_images/heartflames/heartflame_black/r1frame04.png" +dest_files=[ "res://.import/r1frame04.png-f1f6b86987cac8c3a2b2fe1bea86f96d.stex" ] [params] diff --git a/edited_images/heartflames/heartflame_black/r1frame05.png b/edited_images/heartflames/heartflame_black/r1frame05.png new file mode 100644 index 00000000..d2872ac5 Binary files /dev/null and b/edited_images/heartflames/heartflame_black/r1frame05.png differ diff --git a/edited_images/heartflames/heartflame_black/r1frame05.png.import b/edited_images/heartflames/heartflame_black/r1frame05.png.import new file mode 100644 index 00000000..1e12e094 --- /dev/null +++ b/edited_images/heartflames/heartflame_black/r1frame05.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame05.png-7959d9cef91b89e1fd2de996f1194ace.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_black/r1frame05.png" +dest_files=[ "res://.import/r1frame05.png-7959d9cef91b89e1fd2de996f1194ace.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_black/r1frame06.png b/edited_images/heartflames/heartflame_black/r1frame06.png new file mode 100644 index 00000000..bb32ed45 Binary files /dev/null and b/edited_images/heartflames/heartflame_black/r1frame06.png differ diff --git a/dk_images/furniture/flagpole_blueflag_fp/r1frame06.png.import b/edited_images/heartflames/heartflame_black/r1frame06.png.import similarity index 68% rename from dk_images/furniture/flagpole_blueflag_fp/r1frame06.png.import rename to edited_images/heartflames/heartflame_black/r1frame06.png.import index 49a4fabf..c31d29af 100644 --- a/dk_images/furniture/flagpole_blueflag_fp/r1frame06.png.import +++ b/edited_images/heartflames/heartflame_black/r1frame06.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/r1frame06.png-86e0d45e99b71befb28c7da939b6cf5c.stex" +path="res://.import/r1frame06.png-bfafa535e6494922a06de2baf355b0f8.stex" metadata={ "vram_texture": false } [deps] -source_file="res://dk_images/furniture/flagpole_blueflag_fp/r1frame06.png" -dest_files=[ "res://.import/r1frame06.png-86e0d45e99b71befb28c7da939b6cf5c.stex" ] +source_file="res://edited_images/heartflames/heartflame_black/r1frame06.png" +dest_files=[ "res://.import/r1frame06.png-bfafa535e6494922a06de2baf355b0f8.stex" ] [params] diff --git a/edited_images/heartflames/heartflame_black/r1frame07.png b/edited_images/heartflames/heartflame_black/r1frame07.png new file mode 100644 index 00000000..c1dd1d5f Binary files /dev/null and b/edited_images/heartflames/heartflame_black/r1frame07.png differ diff --git a/edited_images/heartflames/heartflame_black/r1frame07.png.import b/edited_images/heartflames/heartflame_black/r1frame07.png.import new file mode 100644 index 00000000..6bd9beb0 --- /dev/null +++ b/edited_images/heartflames/heartflame_black/r1frame07.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame07.png-aeec9eaf89a2a46853f3d3e358ec34e8.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_black/r1frame07.png" +dest_files=[ "res://.import/r1frame07.png-aeec9eaf89a2a46853f3d3e358ec34e8.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_black/r1frame08.png b/edited_images/heartflames/heartflame_black/r1frame08.png new file mode 100644 index 00000000..18256c2e Binary files /dev/null and b/edited_images/heartflames/heartflame_black/r1frame08.png differ diff --git a/edited_images/heartflames/heartflame_black/r1frame08.png.import b/edited_images/heartflames/heartflame_black/r1frame08.png.import new file mode 100644 index 00000000..e45fcb3d --- /dev/null +++ b/edited_images/heartflames/heartflame_black/r1frame08.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame08.png-4eb65eb2d787a4e28a97e31a0926911f.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_black/r1frame08.png" +dest_files=[ "res://.import/r1frame08.png-4eb65eb2d787a4e28a97e31a0926911f.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_black/r1frame09.png b/edited_images/heartflames/heartflame_black/r1frame09.png new file mode 100644 index 00000000..6ce5ca39 Binary files /dev/null and b/edited_images/heartflames/heartflame_black/r1frame09.png differ diff --git a/edited_images/heartflames/heartflame_black/r1frame09.png.import b/edited_images/heartflames/heartflame_black/r1frame09.png.import new file mode 100644 index 00000000..0444ec24 --- /dev/null +++ b/edited_images/heartflames/heartflame_black/r1frame09.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame09.png-fe6e37677b48a5afebf51a817eefaa5d.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_black/r1frame09.png" +dest_files=[ "res://.import/r1frame09.png-fe6e37677b48a5afebf51a817eefaa5d.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_black/r1frame10.png b/edited_images/heartflames/heartflame_black/r1frame10.png new file mode 100644 index 00000000..f04d8f48 Binary files /dev/null and b/edited_images/heartflames/heartflame_black/r1frame10.png differ diff --git a/edited_images/heartflames/heartflame_black/r1frame10.png.import b/edited_images/heartflames/heartflame_black/r1frame10.png.import new file mode 100644 index 00000000..5580b075 --- /dev/null +++ b/edited_images/heartflames/heartflame_black/r1frame10.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame10.png-ccf27997d6f7954d870ba08067234d0a.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_black/r1frame10.png" +dest_files=[ "res://.import/r1frame10.png-ccf27997d6f7954d870ba08067234d0a.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_black/r1frame11.png b/edited_images/heartflames/heartflame_black/r1frame11.png new file mode 100644 index 00000000..45b23316 Binary files /dev/null and b/edited_images/heartflames/heartflame_black/r1frame11.png differ diff --git a/edited_images/heartflames/heartflame_black/r1frame11.png.import b/edited_images/heartflames/heartflame_black/r1frame11.png.import new file mode 100644 index 00000000..ebefaf40 --- /dev/null +++ b/edited_images/heartflames/heartflame_black/r1frame11.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame11.png-88f47630d027845abad4724627437fc6.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_black/r1frame11.png" +dest_files=[ "res://.import/r1frame11.png-88f47630d027845abad4724627437fc6.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_black/r1frame12.png b/edited_images/heartflames/heartflame_black/r1frame12.png new file mode 100644 index 00000000..089c2622 Binary files /dev/null and b/edited_images/heartflames/heartflame_black/r1frame12.png differ diff --git a/edited_images/heartflames/heartflame_black/r1frame12.png.import b/edited_images/heartflames/heartflame_black/r1frame12.png.import new file mode 100644 index 00000000..2936a08e --- /dev/null +++ b/edited_images/heartflames/heartflame_black/r1frame12.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame12.png-9c366ee940aef5e5743de6de49917edc.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_black/r1frame12.png" +dest_files=[ "res://.import/r1frame12.png-9c366ee940aef5e5743de6de49917edc.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_black/r1frame13.png b/edited_images/heartflames/heartflame_black/r1frame13.png new file mode 100644 index 00000000..3750b2d1 Binary files /dev/null and b/edited_images/heartflames/heartflame_black/r1frame13.png differ diff --git a/edited_images/heartflames/heartflame_black/r1frame13.png.import b/edited_images/heartflames/heartflame_black/r1frame13.png.import new file mode 100644 index 00000000..39242cf2 --- /dev/null +++ b/edited_images/heartflames/heartflame_black/r1frame13.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame13.png-4671105a933bb7ba9a64ecd41c2d6b0c.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_black/r1frame13.png" +dest_files=[ "res://.import/r1frame13.png-4671105a933bb7ba9a64ecd41c2d6b0c.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_black/r1frame14.png b/edited_images/heartflames/heartflame_black/r1frame14.png new file mode 100644 index 00000000..b565a09d Binary files /dev/null and b/edited_images/heartflames/heartflame_black/r1frame14.png differ diff --git a/edited_images/heartflames/heartflame_black/r1frame14.png.import b/edited_images/heartflames/heartflame_black/r1frame14.png.import new file mode 100644 index 00000000..d6693ed5 --- /dev/null +++ b/edited_images/heartflames/heartflame_black/r1frame14.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame14.png-773bf3ec561921cf872fe8373aee71d6.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_black/r1frame14.png" +dest_files=[ "res://.import/r1frame14.png-773bf3ec561921cf872fe8373aee71d6.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_black/r1frame15.png b/edited_images/heartflames/heartflame_black/r1frame15.png new file mode 100644 index 00000000..8a924371 Binary files /dev/null and b/edited_images/heartflames/heartflame_black/r1frame15.png differ diff --git a/edited_images/heartflames/heartflame_black/r1frame15.png.import b/edited_images/heartflames/heartflame_black/r1frame15.png.import new file mode 100644 index 00000000..3ac01360 --- /dev/null +++ b/edited_images/heartflames/heartflame_black/r1frame15.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame15.png-919056e6f96e0ce3ca1689feaa62f767.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_black/r1frame15.png" +dest_files=[ "res://.import/r1frame15.png-919056e6f96e0ce3ca1689feaa62f767.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_black/r1frame16.png b/edited_images/heartflames/heartflame_black/r1frame16.png new file mode 100644 index 00000000..75700f37 Binary files /dev/null and b/edited_images/heartflames/heartflame_black/r1frame16.png differ diff --git a/edited_images/heartflames/heartflame_black/r1frame16.png.import b/edited_images/heartflames/heartflame_black/r1frame16.png.import new file mode 100644 index 00000000..ba062050 --- /dev/null +++ b/edited_images/heartflames/heartflame_black/r1frame16.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame16.png-52b8825f6140070814b0f092d53b802c.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_black/r1frame16.png" +dest_files=[ "res://.import/r1frame16.png-52b8825f6140070814b0f092d53b802c.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_orange/AnimOrangeHeartFlame.tres b/edited_images/heartflames/heartflame_orange/AnimOrangeHeartFlame.tres new file mode 100644 index 00000000..4e38656b --- /dev/null +++ b/edited_images/heartflames/heartflame_orange/AnimOrangeHeartFlame.tres @@ -0,0 +1,56 @@ +[gd_resource type="AnimatedTexture" load_steps=18 format=2] + +[ext_resource path="res://addons/animated_texture_but_better/animated_texture_but_better.gd" type="Script" id=1] +[ext_resource path="res://edited_images/heartflames/heartflame_orange/r1frame03.png" type="Texture" id=2] +[ext_resource path="res://edited_images/heartflames/heartflame_orange/r1frame05.png" type="Texture" id=3] +[ext_resource path="res://edited_images/heartflames/heartflame_orange/r1frame10.png" type="Texture" id=4] +[ext_resource path="res://edited_images/heartflames/heartflame_orange/r1frame14.png" type="Texture" id=5] +[ext_resource path="res://edited_images/heartflames/heartflame_orange/r1frame16.png" type="Texture" id=6] +[ext_resource path="res://edited_images/heartflames/heartflame_orange/r1frame09.png" type="Texture" id=7] +[ext_resource path="res://edited_images/heartflames/heartflame_orange/r1frame12.png" type="Texture" id=8] +[ext_resource path="res://edited_images/heartflames/heartflame_orange/r1frame01.png" type="Texture" id=9] +[ext_resource path="res://edited_images/heartflames/heartflame_orange/r1frame08.png" type="Texture" id=10] +[ext_resource path="res://edited_images/heartflames/heartflame_orange/r1frame07.png" type="Texture" id=11] +[ext_resource path="res://edited_images/heartflames/heartflame_orange/r1frame06.png" type="Texture" id=12] +[ext_resource path="res://edited_images/heartflames/heartflame_orange/r1frame13.png" type="Texture" id=13] +[ext_resource path="res://edited_images/heartflames/heartflame_orange/r1frame15.png" type="Texture" id=14] +[ext_resource path="res://edited_images/heartflames/heartflame_orange/r1frame02.png" type="Texture" id=15] +[ext_resource path="res://edited_images/heartflames/heartflame_orange/r1frame04.png" type="Texture" id=16] +[ext_resource path="res://edited_images/heartflames/heartflame_orange/r1frame11.png" type="Texture" id=17] + +[resource] +flags = 9 +frames = 16 +fps = 20.0 +frame_0/texture = ExtResource( 9 ) +frame_1/texture = ExtResource( 15 ) +frame_1/delay_sec = 0.0 +frame_2/texture = ExtResource( 2 ) +frame_2/delay_sec = 0.0 +frame_3/texture = ExtResource( 16 ) +frame_3/delay_sec = 0.0 +frame_4/texture = ExtResource( 3 ) +frame_4/delay_sec = 0.0 +frame_5/texture = ExtResource( 12 ) +frame_5/delay_sec = 0.0 +frame_6/texture = ExtResource( 11 ) +frame_6/delay_sec = 0.0 +frame_7/texture = ExtResource( 10 ) +frame_7/delay_sec = 0.0 +frame_8/texture = ExtResource( 7 ) +frame_8/delay_sec = 0.0 +frame_9/texture = ExtResource( 4 ) +frame_9/delay_sec = 0.0 +frame_10/texture = ExtResource( 17 ) +frame_10/delay_sec = 0.0 +frame_11/texture = ExtResource( 8 ) +frame_11/delay_sec = 0.0 +frame_12/texture = ExtResource( 13 ) +frame_12/delay_sec = 0.0 +frame_13/texture = ExtResource( 5 ) +frame_13/delay_sec = 0.0 +frame_14/texture = ExtResource( 14 ) +frame_14/delay_sec = 0.0 +frame_15/texture = ExtResource( 6 ) +frame_15/delay_sec = 0.0 +script = ExtResource( 1 ) diff --git a/edited_images/heartflames/heartflame_orange/r1frame01.png b/edited_images/heartflames/heartflame_orange/r1frame01.png new file mode 100644 index 00000000..f74d0b6e Binary files /dev/null and b/edited_images/heartflames/heartflame_orange/r1frame01.png differ diff --git a/dk_images/furniture/flagpole_empty_fp/r1frame01.png.import b/edited_images/heartflames/heartflame_orange/r1frame01.png.import similarity index 68% rename from dk_images/furniture/flagpole_empty_fp/r1frame01.png.import rename to edited_images/heartflames/heartflame_orange/r1frame01.png.import index 60e22c72..547710fd 100644 --- a/dk_images/furniture/flagpole_empty_fp/r1frame01.png.import +++ b/edited_images/heartflames/heartflame_orange/r1frame01.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/r1frame01.png-dae75e06bda29c3431c2e25551deb1e9.stex" +path="res://.import/r1frame01.png-c7aa58205fb77d15c10d3f4877d28921.stex" metadata={ "vram_texture": false } [deps] -source_file="res://dk_images/furniture/flagpole_empty_fp/r1frame01.png" -dest_files=[ "res://.import/r1frame01.png-dae75e06bda29c3431c2e25551deb1e9.stex" ] +source_file="res://edited_images/heartflames/heartflame_orange/r1frame01.png" +dest_files=[ "res://.import/r1frame01.png-c7aa58205fb77d15c10d3f4877d28921.stex" ] [params] diff --git a/edited_images/heartflames/heartflame_orange/r1frame02.png b/edited_images/heartflames/heartflame_orange/r1frame02.png new file mode 100644 index 00000000..35ab27a9 Binary files /dev/null and b/edited_images/heartflames/heartflame_orange/r1frame02.png differ diff --git a/edited_images/heartflames/heartflame_orange/r1frame02.png.import b/edited_images/heartflames/heartflame_orange/r1frame02.png.import new file mode 100644 index 00000000..dc302675 --- /dev/null +++ b/edited_images/heartflames/heartflame_orange/r1frame02.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame02.png-59f258b3df5b23a75a3b14bf2cc209ab.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_orange/r1frame02.png" +dest_files=[ "res://.import/r1frame02.png-59f258b3df5b23a75a3b14bf2cc209ab.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_orange/r1frame03.png b/edited_images/heartflames/heartflame_orange/r1frame03.png new file mode 100644 index 00000000..f0988fca Binary files /dev/null and b/edited_images/heartflames/heartflame_orange/r1frame03.png differ diff --git a/edited_images/heartflames/heartflame_orange/r1frame03.png.import b/edited_images/heartflames/heartflame_orange/r1frame03.png.import new file mode 100644 index 00000000..e7aaddae --- /dev/null +++ b/edited_images/heartflames/heartflame_orange/r1frame03.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame03.png-453070e6cc1b4639b00ec025021784a0.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_orange/r1frame03.png" +dest_files=[ "res://.import/r1frame03.png-453070e6cc1b4639b00ec025021784a0.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_orange/r1frame04.png b/edited_images/heartflames/heartflame_orange/r1frame04.png new file mode 100644 index 00000000..063446ef Binary files /dev/null and b/edited_images/heartflames/heartflame_orange/r1frame04.png differ diff --git a/edited_images/heartflames/heartflame_orange/r1frame04.png.import b/edited_images/heartflames/heartflame_orange/r1frame04.png.import new file mode 100644 index 00000000..2a8cf4ed --- /dev/null +++ b/edited_images/heartflames/heartflame_orange/r1frame04.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame04.png-3b3f8688aabaae861cdb0f34b7f84c96.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_orange/r1frame04.png" +dest_files=[ "res://.import/r1frame04.png-3b3f8688aabaae861cdb0f34b7f84c96.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_orange/r1frame05.png b/edited_images/heartflames/heartflame_orange/r1frame05.png new file mode 100644 index 00000000..30a2ceeb Binary files /dev/null and b/edited_images/heartflames/heartflame_orange/r1frame05.png differ diff --git a/edited_images/heartflames/heartflame_orange/r1frame05.png.import b/edited_images/heartflames/heartflame_orange/r1frame05.png.import new file mode 100644 index 00000000..34867beb --- /dev/null +++ b/edited_images/heartflames/heartflame_orange/r1frame05.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame05.png-d9ab2da8f9c379dadba65554e1172c5f.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_orange/r1frame05.png" +dest_files=[ "res://.import/r1frame05.png-d9ab2da8f9c379dadba65554e1172c5f.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_orange/r1frame06.png b/edited_images/heartflames/heartflame_orange/r1frame06.png new file mode 100644 index 00000000..2058412f Binary files /dev/null and b/edited_images/heartflames/heartflame_orange/r1frame06.png differ diff --git a/dk_images/furniture/flagpole_greenflag_fp/r1frame06.png.import b/edited_images/heartflames/heartflame_orange/r1frame06.png.import similarity index 68% rename from dk_images/furniture/flagpole_greenflag_fp/r1frame06.png.import rename to edited_images/heartflames/heartflame_orange/r1frame06.png.import index 08775327..ea5ca4d7 100644 --- a/dk_images/furniture/flagpole_greenflag_fp/r1frame06.png.import +++ b/edited_images/heartflames/heartflame_orange/r1frame06.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/r1frame06.png-aefb080ab2f14798419b124dd6d49fb9.stex" +path="res://.import/r1frame06.png-df4abe833be5abedd4a977e87b9a51be.stex" metadata={ "vram_texture": false } [deps] -source_file="res://dk_images/furniture/flagpole_greenflag_fp/r1frame06.png" -dest_files=[ "res://.import/r1frame06.png-aefb080ab2f14798419b124dd6d49fb9.stex" ] +source_file="res://edited_images/heartflames/heartflame_orange/r1frame06.png" +dest_files=[ "res://.import/r1frame06.png-df4abe833be5abedd4a977e87b9a51be.stex" ] [params] diff --git a/edited_images/heartflames/heartflame_orange/r1frame07.png b/edited_images/heartflames/heartflame_orange/r1frame07.png new file mode 100644 index 00000000..f9f93a7b Binary files /dev/null and b/edited_images/heartflames/heartflame_orange/r1frame07.png differ diff --git a/edited_images/heartflames/heartflame_orange/r1frame07.png.import b/edited_images/heartflames/heartflame_orange/r1frame07.png.import new file mode 100644 index 00000000..cafdff5a --- /dev/null +++ b/edited_images/heartflames/heartflame_orange/r1frame07.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame07.png-4fe60579d4422a29d98f9035d12aaaf0.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_orange/r1frame07.png" +dest_files=[ "res://.import/r1frame07.png-4fe60579d4422a29d98f9035d12aaaf0.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_orange/r1frame08.png b/edited_images/heartflames/heartflame_orange/r1frame08.png new file mode 100644 index 00000000..5688c1be Binary files /dev/null and b/edited_images/heartflames/heartflame_orange/r1frame08.png differ diff --git a/edited_images/heartflames/heartflame_orange/r1frame08.png.import b/edited_images/heartflames/heartflame_orange/r1frame08.png.import new file mode 100644 index 00000000..2291bd9c --- /dev/null +++ b/edited_images/heartflames/heartflame_orange/r1frame08.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame08.png-c290897ea1d03bc9c87dc3b722721cd4.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_orange/r1frame08.png" +dest_files=[ "res://.import/r1frame08.png-c290897ea1d03bc9c87dc3b722721cd4.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_orange/r1frame09.png b/edited_images/heartflames/heartflame_orange/r1frame09.png new file mode 100644 index 00000000..7ae1ee21 Binary files /dev/null and b/edited_images/heartflames/heartflame_orange/r1frame09.png differ diff --git a/edited_images/heartflames/heartflame_orange/r1frame09.png.import b/edited_images/heartflames/heartflame_orange/r1frame09.png.import new file mode 100644 index 00000000..05bca269 --- /dev/null +++ b/edited_images/heartflames/heartflame_orange/r1frame09.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame09.png-a6fff6a9ba0b433107cb07e55f8f01ab.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_orange/r1frame09.png" +dest_files=[ "res://.import/r1frame09.png-a6fff6a9ba0b433107cb07e55f8f01ab.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_orange/r1frame10.png b/edited_images/heartflames/heartflame_orange/r1frame10.png new file mode 100644 index 00000000..41d635e9 Binary files /dev/null and b/edited_images/heartflames/heartflame_orange/r1frame10.png differ diff --git a/edited_images/heartflames/heartflame_orange/r1frame10.png.import b/edited_images/heartflames/heartflame_orange/r1frame10.png.import new file mode 100644 index 00000000..9406709f --- /dev/null +++ b/edited_images/heartflames/heartflame_orange/r1frame10.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame10.png-1b2c92cd5f893fbeed1bc29814dfa838.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_orange/r1frame10.png" +dest_files=[ "res://.import/r1frame10.png-1b2c92cd5f893fbeed1bc29814dfa838.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_orange/r1frame11.png b/edited_images/heartflames/heartflame_orange/r1frame11.png new file mode 100644 index 00000000..ccc3a901 Binary files /dev/null and b/edited_images/heartflames/heartflame_orange/r1frame11.png differ diff --git a/edited_images/heartflames/heartflame_orange/r1frame11.png.import b/edited_images/heartflames/heartflame_orange/r1frame11.png.import new file mode 100644 index 00000000..fc743709 --- /dev/null +++ b/edited_images/heartflames/heartflame_orange/r1frame11.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame11.png-ca1309de03ca8c5e08c09e43a21ad57a.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_orange/r1frame11.png" +dest_files=[ "res://.import/r1frame11.png-ca1309de03ca8c5e08c09e43a21ad57a.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_orange/r1frame12.png b/edited_images/heartflames/heartflame_orange/r1frame12.png new file mode 100644 index 00000000..190ddcc6 Binary files /dev/null and b/edited_images/heartflames/heartflame_orange/r1frame12.png differ diff --git a/edited_images/heartflames/heartflame_orange/r1frame12.png.import b/edited_images/heartflames/heartflame_orange/r1frame12.png.import new file mode 100644 index 00000000..6b7615dd --- /dev/null +++ b/edited_images/heartflames/heartflame_orange/r1frame12.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame12.png-f0aba4982081a4c77346c6e7503ba0ed.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_orange/r1frame12.png" +dest_files=[ "res://.import/r1frame12.png-f0aba4982081a4c77346c6e7503ba0ed.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_orange/r1frame13.png b/edited_images/heartflames/heartflame_orange/r1frame13.png new file mode 100644 index 00000000..5ecf2b32 Binary files /dev/null and b/edited_images/heartflames/heartflame_orange/r1frame13.png differ diff --git a/edited_images/heartflames/heartflame_orange/r1frame13.png.import b/edited_images/heartflames/heartflame_orange/r1frame13.png.import new file mode 100644 index 00000000..5acd935b --- /dev/null +++ b/edited_images/heartflames/heartflame_orange/r1frame13.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame13.png-fe3b8cb7b7e727e315fe2b744609c235.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_orange/r1frame13.png" +dest_files=[ "res://.import/r1frame13.png-fe3b8cb7b7e727e315fe2b744609c235.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_orange/r1frame14.png b/edited_images/heartflames/heartflame_orange/r1frame14.png new file mode 100644 index 00000000..22ac4c9e Binary files /dev/null and b/edited_images/heartflames/heartflame_orange/r1frame14.png differ diff --git a/edited_images/heartflames/heartflame_orange/r1frame14.png.import b/edited_images/heartflames/heartflame_orange/r1frame14.png.import new file mode 100644 index 00000000..419e9cc2 --- /dev/null +++ b/edited_images/heartflames/heartflame_orange/r1frame14.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame14.png-912075a205df920f25dc6620f32a16fd.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_orange/r1frame14.png" +dest_files=[ "res://.import/r1frame14.png-912075a205df920f25dc6620f32a16fd.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_orange/r1frame15.png b/edited_images/heartflames/heartflame_orange/r1frame15.png new file mode 100644 index 00000000..7014d70f Binary files /dev/null and b/edited_images/heartflames/heartflame_orange/r1frame15.png differ diff --git a/edited_images/heartflames/heartflame_orange/r1frame15.png.import b/edited_images/heartflames/heartflame_orange/r1frame15.png.import new file mode 100644 index 00000000..52cf9b3b --- /dev/null +++ b/edited_images/heartflames/heartflame_orange/r1frame15.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame15.png-84e00d12858ba1b0bc606112f1e78873.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_orange/r1frame15.png" +dest_files=[ "res://.import/r1frame15.png-84e00d12858ba1b0bc606112f1e78873.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_orange/r1frame16.png b/edited_images/heartflames/heartflame_orange/r1frame16.png new file mode 100644 index 00000000..20338bce Binary files /dev/null and b/edited_images/heartflames/heartflame_orange/r1frame16.png differ diff --git a/edited_images/heartflames/heartflame_orange/r1frame16.png.import b/edited_images/heartflames/heartflame_orange/r1frame16.png.import new file mode 100644 index 00000000..bb3355e4 --- /dev/null +++ b/edited_images/heartflames/heartflame_orange/r1frame16.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame16.png-95e65697acd11f70e87bace8f7fc577e.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_orange/r1frame16.png" +dest_files=[ "res://.import/r1frame16.png-95e65697acd11f70e87bace8f7fc577e.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_purple/AnimPurpleHeartFlame.tres b/edited_images/heartflames/heartflame_purple/AnimPurpleHeartFlame.tres new file mode 100644 index 00000000..61af6277 --- /dev/null +++ b/edited_images/heartflames/heartflame_purple/AnimPurpleHeartFlame.tres @@ -0,0 +1,56 @@ +[gd_resource type="AnimatedTexture" load_steps=18 format=2] + +[ext_resource path="res://addons/animated_texture_but_better/animated_texture_but_better.gd" type="Script" id=1] +[ext_resource path="res://edited_images/heartflames/heartflame_purple/r1frame03.png" type="Texture" id=2] +[ext_resource path="res://edited_images/heartflames/heartflame_purple/r1frame05.png" type="Texture" id=3] +[ext_resource path="res://edited_images/heartflames/heartflame_purple/r1frame10.png" type="Texture" id=4] +[ext_resource path="res://edited_images/heartflames/heartflame_purple/r1frame14.png" type="Texture" id=5] +[ext_resource path="res://edited_images/heartflames/heartflame_purple/r1frame16.png" type="Texture" id=6] +[ext_resource path="res://edited_images/heartflames/heartflame_purple/r1frame09.png" type="Texture" id=7] +[ext_resource path="res://edited_images/heartflames/heartflame_purple/r1frame12.png" type="Texture" id=8] +[ext_resource path="res://edited_images/heartflames/heartflame_purple/r1frame01.png" type="Texture" id=9] +[ext_resource path="res://edited_images/heartflames/heartflame_purple/r1frame08.png" type="Texture" id=10] +[ext_resource path="res://edited_images/heartflames/heartflame_purple/r1frame07.png" type="Texture" id=11] +[ext_resource path="res://edited_images/heartflames/heartflame_purple/r1frame06.png" type="Texture" id=12] +[ext_resource path="res://edited_images/heartflames/heartflame_purple/r1frame13.png" type="Texture" id=13] +[ext_resource path="res://edited_images/heartflames/heartflame_purple/r1frame15.png" type="Texture" id=14] +[ext_resource path="res://edited_images/heartflames/heartflame_purple/r1frame02.png" type="Texture" id=15] +[ext_resource path="res://edited_images/heartflames/heartflame_purple/r1frame04.png" type="Texture" id=16] +[ext_resource path="res://edited_images/heartflames/heartflame_purple/r1frame11.png" type="Texture" id=17] + +[resource] +flags = 9 +frames = 16 +fps = 20.0 +frame_0/texture = ExtResource( 9 ) +frame_1/texture = ExtResource( 15 ) +frame_1/delay_sec = 0.0 +frame_2/texture = ExtResource( 2 ) +frame_2/delay_sec = 0.0 +frame_3/texture = ExtResource( 16 ) +frame_3/delay_sec = 0.0 +frame_4/texture = ExtResource( 3 ) +frame_4/delay_sec = 0.0 +frame_5/texture = ExtResource( 12 ) +frame_5/delay_sec = 0.0 +frame_6/texture = ExtResource( 11 ) +frame_6/delay_sec = 0.0 +frame_7/texture = ExtResource( 10 ) +frame_7/delay_sec = 0.0 +frame_8/texture = ExtResource( 7 ) +frame_8/delay_sec = 0.0 +frame_9/texture = ExtResource( 4 ) +frame_9/delay_sec = 0.0 +frame_10/texture = ExtResource( 17 ) +frame_10/delay_sec = 0.0 +frame_11/texture = ExtResource( 8 ) +frame_11/delay_sec = 0.0 +frame_12/texture = ExtResource( 13 ) +frame_12/delay_sec = 0.0 +frame_13/texture = ExtResource( 5 ) +frame_13/delay_sec = 0.0 +frame_14/texture = ExtResource( 14 ) +frame_14/delay_sec = 0.0 +frame_15/texture = ExtResource( 6 ) +frame_15/delay_sec = 0.0 +script = ExtResource( 1 ) diff --git a/edited_images/heartflames/heartflame_purple/r1frame01.png b/edited_images/heartflames/heartflame_purple/r1frame01.png new file mode 100644 index 00000000..7297eb08 Binary files /dev/null and b/edited_images/heartflames/heartflame_purple/r1frame01.png differ diff --git a/edited_images/heartflames/heartflame_purple/r1frame01.png.import b/edited_images/heartflames/heartflame_purple/r1frame01.png.import new file mode 100644 index 00000000..70f10aae --- /dev/null +++ b/edited_images/heartflames/heartflame_purple/r1frame01.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame01.png-c847897eb611843d62194e56ac72bef0.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_purple/r1frame01.png" +dest_files=[ "res://.import/r1frame01.png-c847897eb611843d62194e56ac72bef0.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_purple/r1frame02.png b/edited_images/heartflames/heartflame_purple/r1frame02.png new file mode 100644 index 00000000..25b4fcd7 Binary files /dev/null and b/edited_images/heartflames/heartflame_purple/r1frame02.png differ diff --git a/edited_images/heartflames/heartflame_purple/r1frame02.png.import b/edited_images/heartflames/heartflame_purple/r1frame02.png.import new file mode 100644 index 00000000..59dd5b06 --- /dev/null +++ b/edited_images/heartflames/heartflame_purple/r1frame02.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame02.png-28d114dfd399ee227b87d88f269e1ee6.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_purple/r1frame02.png" +dest_files=[ "res://.import/r1frame02.png-28d114dfd399ee227b87d88f269e1ee6.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_purple/r1frame03.png b/edited_images/heartflames/heartflame_purple/r1frame03.png new file mode 100644 index 00000000..e69dc2c7 Binary files /dev/null and b/edited_images/heartflames/heartflame_purple/r1frame03.png differ diff --git a/edited_images/heartflames/heartflame_purple/r1frame03.png.import b/edited_images/heartflames/heartflame_purple/r1frame03.png.import new file mode 100644 index 00000000..6d33c1b3 --- /dev/null +++ b/edited_images/heartflames/heartflame_purple/r1frame03.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame03.png-b534823551a9b025d769a55006fafb9e.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_purple/r1frame03.png" +dest_files=[ "res://.import/r1frame03.png-b534823551a9b025d769a55006fafb9e.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_purple/r1frame04.png b/edited_images/heartflames/heartflame_purple/r1frame04.png new file mode 100644 index 00000000..260b2220 Binary files /dev/null and b/edited_images/heartflames/heartflame_purple/r1frame04.png differ diff --git a/edited_images/heartflames/heartflame_purple/r1frame04.png.import b/edited_images/heartflames/heartflame_purple/r1frame04.png.import new file mode 100644 index 00000000..ddbda708 --- /dev/null +++ b/edited_images/heartflames/heartflame_purple/r1frame04.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame04.png-b907932eff8bbb10b2a45b363f831dc5.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_purple/r1frame04.png" +dest_files=[ "res://.import/r1frame04.png-b907932eff8bbb10b2a45b363f831dc5.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_purple/r1frame05.png b/edited_images/heartflames/heartflame_purple/r1frame05.png new file mode 100644 index 00000000..c7708409 Binary files /dev/null and b/edited_images/heartflames/heartflame_purple/r1frame05.png differ diff --git a/edited_images/heartflames/heartflame_purple/r1frame05.png.import b/edited_images/heartflames/heartflame_purple/r1frame05.png.import new file mode 100644 index 00000000..1a24574a --- /dev/null +++ b/edited_images/heartflames/heartflame_purple/r1frame05.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame05.png-aa47c0655efa413ace6002a291322282.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_purple/r1frame05.png" +dest_files=[ "res://.import/r1frame05.png-aa47c0655efa413ace6002a291322282.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_purple/r1frame06.png b/edited_images/heartflames/heartflame_purple/r1frame06.png new file mode 100644 index 00000000..acd9eac7 Binary files /dev/null and b/edited_images/heartflames/heartflame_purple/r1frame06.png differ diff --git a/edited_images/heartflames/heartflame_purple/r1frame06.png.import b/edited_images/heartflames/heartflame_purple/r1frame06.png.import new file mode 100644 index 00000000..30703fa4 --- /dev/null +++ b/edited_images/heartflames/heartflame_purple/r1frame06.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame06.png-b25036da6ddc49472985ed02a5219140.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_purple/r1frame06.png" +dest_files=[ "res://.import/r1frame06.png-b25036da6ddc49472985ed02a5219140.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_purple/r1frame07.png b/edited_images/heartflames/heartflame_purple/r1frame07.png new file mode 100644 index 00000000..670dbb86 Binary files /dev/null and b/edited_images/heartflames/heartflame_purple/r1frame07.png differ diff --git a/edited_images/heartflames/heartflame_purple/r1frame07.png.import b/edited_images/heartflames/heartflame_purple/r1frame07.png.import new file mode 100644 index 00000000..4a60626c --- /dev/null +++ b/edited_images/heartflames/heartflame_purple/r1frame07.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame07.png-43a7fb4b40bb45c123f599c227b37146.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_purple/r1frame07.png" +dest_files=[ "res://.import/r1frame07.png-43a7fb4b40bb45c123f599c227b37146.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_purple/r1frame08.png b/edited_images/heartflames/heartflame_purple/r1frame08.png new file mode 100644 index 00000000..cf296296 Binary files /dev/null and b/edited_images/heartflames/heartflame_purple/r1frame08.png differ diff --git a/edited_images/heartflames/heartflame_purple/r1frame08.png.import b/edited_images/heartflames/heartflame_purple/r1frame08.png.import new file mode 100644 index 00000000..5bf524a6 --- /dev/null +++ b/edited_images/heartflames/heartflame_purple/r1frame08.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame08.png-0b5f5a74119bab60a2d0316a64320341.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_purple/r1frame08.png" +dest_files=[ "res://.import/r1frame08.png-0b5f5a74119bab60a2d0316a64320341.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_purple/r1frame09.png b/edited_images/heartflames/heartflame_purple/r1frame09.png new file mode 100644 index 00000000..b5822fce Binary files /dev/null and b/edited_images/heartflames/heartflame_purple/r1frame09.png differ diff --git a/edited_images/heartflames/heartflame_purple/r1frame09.png.import b/edited_images/heartflames/heartflame_purple/r1frame09.png.import new file mode 100644 index 00000000..a1a3d82e --- /dev/null +++ b/edited_images/heartflames/heartflame_purple/r1frame09.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame09.png-9152c8bb9f005c41d1dcf3ad13d593fc.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_purple/r1frame09.png" +dest_files=[ "res://.import/r1frame09.png-9152c8bb9f005c41d1dcf3ad13d593fc.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_purple/r1frame10.png b/edited_images/heartflames/heartflame_purple/r1frame10.png new file mode 100644 index 00000000..5121b4c4 Binary files /dev/null and b/edited_images/heartflames/heartflame_purple/r1frame10.png differ diff --git a/edited_images/heartflames/heartflame_purple/r1frame10.png.import b/edited_images/heartflames/heartflame_purple/r1frame10.png.import new file mode 100644 index 00000000..2fab915d --- /dev/null +++ b/edited_images/heartflames/heartflame_purple/r1frame10.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame10.png-81c061fdae26a6a96876b2254ced97a1.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_purple/r1frame10.png" +dest_files=[ "res://.import/r1frame10.png-81c061fdae26a6a96876b2254ced97a1.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_purple/r1frame11.png b/edited_images/heartflames/heartflame_purple/r1frame11.png new file mode 100644 index 00000000..20e382eb Binary files /dev/null and b/edited_images/heartflames/heartflame_purple/r1frame11.png differ diff --git a/edited_images/heartflames/heartflame_purple/r1frame11.png.import b/edited_images/heartflames/heartflame_purple/r1frame11.png.import new file mode 100644 index 00000000..85b776c7 --- /dev/null +++ b/edited_images/heartflames/heartflame_purple/r1frame11.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame11.png-78d7d45eb936a4eb5f3ea20f9a6aac34.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_purple/r1frame11.png" +dest_files=[ "res://.import/r1frame11.png-78d7d45eb936a4eb5f3ea20f9a6aac34.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_purple/r1frame12.png b/edited_images/heartflames/heartflame_purple/r1frame12.png new file mode 100644 index 00000000..f65222ec Binary files /dev/null and b/edited_images/heartflames/heartflame_purple/r1frame12.png differ diff --git a/dk_images/furniture/flagpole_blueflag_fp/r1frame08.png.import b/edited_images/heartflames/heartflame_purple/r1frame12.png.import similarity index 69% rename from dk_images/furniture/flagpole_blueflag_fp/r1frame08.png.import rename to edited_images/heartflames/heartflame_purple/r1frame12.png.import index 63cbae5d..2d64564c 100644 --- a/dk_images/furniture/flagpole_blueflag_fp/r1frame08.png.import +++ b/edited_images/heartflames/heartflame_purple/r1frame12.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/r1frame08.png-3eee70e3e4e14f8ae5128d2aa1a8ea57.stex" +path="res://.import/r1frame12.png-1e65880f5295043bb381b1b55d7c1d57.stex" metadata={ "vram_texture": false } [deps] -source_file="res://dk_images/furniture/flagpole_blueflag_fp/r1frame08.png" -dest_files=[ "res://.import/r1frame08.png-3eee70e3e4e14f8ae5128d2aa1a8ea57.stex" ] +source_file="res://edited_images/heartflames/heartflame_purple/r1frame12.png" +dest_files=[ "res://.import/r1frame12.png-1e65880f5295043bb381b1b55d7c1d57.stex" ] [params] diff --git a/edited_images/heartflames/heartflame_purple/r1frame13.png b/edited_images/heartflames/heartflame_purple/r1frame13.png new file mode 100644 index 00000000..c5a7d531 Binary files /dev/null and b/edited_images/heartflames/heartflame_purple/r1frame13.png differ diff --git a/edited_images/heartflames/heartflame_purple/r1frame13.png.import b/edited_images/heartflames/heartflame_purple/r1frame13.png.import new file mode 100644 index 00000000..b3b32582 --- /dev/null +++ b/edited_images/heartflames/heartflame_purple/r1frame13.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame13.png-230949aa9e99162e348355b8d0c06d16.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_purple/r1frame13.png" +dest_files=[ "res://.import/r1frame13.png-230949aa9e99162e348355b8d0c06d16.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_purple/r1frame14.png b/edited_images/heartflames/heartflame_purple/r1frame14.png new file mode 100644 index 00000000..66ead80d Binary files /dev/null and b/edited_images/heartflames/heartflame_purple/r1frame14.png differ diff --git a/edited_images/heartflames/heartflame_purple/r1frame14.png.import b/edited_images/heartflames/heartflame_purple/r1frame14.png.import new file mode 100644 index 00000000..62f8e279 --- /dev/null +++ b/edited_images/heartflames/heartflame_purple/r1frame14.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame14.png-e3e39b6f234f3ec1f8e76aab95cd19e2.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_purple/r1frame14.png" +dest_files=[ "res://.import/r1frame14.png-e3e39b6f234f3ec1f8e76aab95cd19e2.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_purple/r1frame15.png b/edited_images/heartflames/heartflame_purple/r1frame15.png new file mode 100644 index 00000000..611fc404 Binary files /dev/null and b/edited_images/heartflames/heartflame_purple/r1frame15.png differ diff --git a/edited_images/heartflames/heartflame_purple/r1frame15.png.import b/edited_images/heartflames/heartflame_purple/r1frame15.png.import new file mode 100644 index 00000000..9da43a50 --- /dev/null +++ b/edited_images/heartflames/heartflame_purple/r1frame15.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame15.png-f222d311103b0bc8e8c6caa3d714e003.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_purple/r1frame15.png" +dest_files=[ "res://.import/r1frame15.png-f222d311103b0bc8e8c6caa3d714e003.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_purple/r1frame16.png b/edited_images/heartflames/heartflame_purple/r1frame16.png new file mode 100644 index 00000000..2e19eafb Binary files /dev/null and b/edited_images/heartflames/heartflame_purple/r1frame16.png differ diff --git a/edited_images/heartflames/heartflame_purple/r1frame16.png.import b/edited_images/heartflames/heartflame_purple/r1frame16.png.import new file mode 100644 index 00000000..1a8f96e6 --- /dev/null +++ b/edited_images/heartflames/heartflame_purple/r1frame16.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame16.png-ab89f657bd4fa926cf8381efc7cb2dde.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_purple/r1frame16.png" +dest_files=[ "res://.import/r1frame16.png-ab89f657bd4fa926cf8381efc7cb2dde.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_white/AnimWhiteHeartFlame.tres b/edited_images/heartflames/heartflame_white/AnimWhiteHeartFlame.tres new file mode 100644 index 00000000..0ce39305 --- /dev/null +++ b/edited_images/heartflames/heartflame_white/AnimWhiteHeartFlame.tres @@ -0,0 +1,56 @@ +[gd_resource type="AnimatedTexture" load_steps=18 format=2] + +[ext_resource path="res://addons/animated_texture_but_better/animated_texture_but_better.gd" type="Script" id=1] +[ext_resource path="res://edited_images/heartflames/heartflame_white/r1frame03.png" type="Texture" id=2] +[ext_resource path="res://edited_images/heartflames/heartflame_white/r1frame05.png" type="Texture" id=3] +[ext_resource path="res://edited_images/heartflames/heartflame_white/r1frame10.png" type="Texture" id=4] +[ext_resource path="res://edited_images/heartflames/heartflame_white/r1frame14.png" type="Texture" id=5] +[ext_resource path="res://edited_images/heartflames/heartflame_white/r1frame16.png" type="Texture" id=6] +[ext_resource path="res://edited_images/heartflames/heartflame_white/r1frame09.png" type="Texture" id=7] +[ext_resource path="res://edited_images/heartflames/heartflame_white/r1frame12.png" type="Texture" id=8] +[ext_resource path="res://edited_images/heartflames/heartflame_white/r1frame01.png" type="Texture" id=9] +[ext_resource path="res://edited_images/heartflames/heartflame_white/r1frame08.png" type="Texture" id=10] +[ext_resource path="res://edited_images/heartflames/heartflame_white/r1frame07.png" type="Texture" id=11] +[ext_resource path="res://edited_images/heartflames/heartflame_white/r1frame06.png" type="Texture" id=12] +[ext_resource path="res://edited_images/heartflames/heartflame_white/r1frame13.png" type="Texture" id=13] +[ext_resource path="res://edited_images/heartflames/heartflame_white/r1frame15.png" type="Texture" id=14] +[ext_resource path="res://edited_images/heartflames/heartflame_white/r1frame02.png" type="Texture" id=15] +[ext_resource path="res://edited_images/heartflames/heartflame_white/r1frame04.png" type="Texture" id=16] +[ext_resource path="res://edited_images/heartflames/heartflame_white/r1frame11.png" type="Texture" id=17] + +[resource] +flags = 9 +frames = 16 +fps = 20.0 +frame_0/texture = ExtResource( 9 ) +frame_1/texture = ExtResource( 15 ) +frame_1/delay_sec = 0.0 +frame_2/texture = ExtResource( 2 ) +frame_2/delay_sec = 0.0 +frame_3/texture = ExtResource( 16 ) +frame_3/delay_sec = 0.0 +frame_4/texture = ExtResource( 3 ) +frame_4/delay_sec = 0.0 +frame_5/texture = ExtResource( 12 ) +frame_5/delay_sec = 0.0 +frame_6/texture = ExtResource( 11 ) +frame_6/delay_sec = 0.0 +frame_7/texture = ExtResource( 10 ) +frame_7/delay_sec = 0.0 +frame_8/texture = ExtResource( 7 ) +frame_8/delay_sec = 0.0 +frame_9/texture = ExtResource( 4 ) +frame_9/delay_sec = 0.0 +frame_10/texture = ExtResource( 17 ) +frame_10/delay_sec = 0.0 +frame_11/texture = ExtResource( 8 ) +frame_11/delay_sec = 0.0 +frame_12/texture = ExtResource( 13 ) +frame_12/delay_sec = 0.0 +frame_13/texture = ExtResource( 5 ) +frame_13/delay_sec = 0.0 +frame_14/texture = ExtResource( 14 ) +frame_14/delay_sec = 0.0 +frame_15/texture = ExtResource( 6 ) +frame_15/delay_sec = 0.0 +script = ExtResource( 1 ) diff --git a/edited_images/heartflames/heartflame_white/r1frame01.png b/edited_images/heartflames/heartflame_white/r1frame01.png new file mode 100644 index 00000000..7dae6b7c Binary files /dev/null and b/edited_images/heartflames/heartflame_white/r1frame01.png differ diff --git a/edited_images/heartflames/heartflame_white/r1frame01.png.import b/edited_images/heartflames/heartflame_white/r1frame01.png.import new file mode 100644 index 00000000..8b5557ae --- /dev/null +++ b/edited_images/heartflames/heartflame_white/r1frame01.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame01.png-bce9c0ce90f9e2f730b2f9e3fa23a6a1.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_white/r1frame01.png" +dest_files=[ "res://.import/r1frame01.png-bce9c0ce90f9e2f730b2f9e3fa23a6a1.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_white/r1frame02.png b/edited_images/heartflames/heartflame_white/r1frame02.png new file mode 100644 index 00000000..c1da6655 Binary files /dev/null and b/edited_images/heartflames/heartflame_white/r1frame02.png differ diff --git a/dk_images/furniture/flagpole_whiteflag_fp/r1frame01.png.import b/edited_images/heartflames/heartflame_white/r1frame02.png.import similarity index 69% rename from dk_images/furniture/flagpole_whiteflag_fp/r1frame01.png.import rename to edited_images/heartflames/heartflame_white/r1frame02.png.import index 4f47bfb8..da657583 100644 --- a/dk_images/furniture/flagpole_whiteflag_fp/r1frame01.png.import +++ b/edited_images/heartflames/heartflame_white/r1frame02.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/r1frame01.png-f36dcebd07d3345336a797a54f27c8e1.stex" +path="res://.import/r1frame02.png-cd91aff64bb089a210a68bb0c096fbe1.stex" metadata={ "vram_texture": false } [deps] -source_file="res://dk_images/furniture/flagpole_whiteflag_fp/r1frame01.png" -dest_files=[ "res://.import/r1frame01.png-f36dcebd07d3345336a797a54f27c8e1.stex" ] +source_file="res://edited_images/heartflames/heartflame_white/r1frame02.png" +dest_files=[ "res://.import/r1frame02.png-cd91aff64bb089a210a68bb0c096fbe1.stex" ] [params] diff --git a/edited_images/heartflames/heartflame_white/r1frame03.png b/edited_images/heartflames/heartflame_white/r1frame03.png new file mode 100644 index 00000000..f4557aa6 Binary files /dev/null and b/edited_images/heartflames/heartflame_white/r1frame03.png differ diff --git a/edited_images/heartflames/heartflame_white/r1frame03.png.import b/edited_images/heartflames/heartflame_white/r1frame03.png.import new file mode 100644 index 00000000..49ab739b --- /dev/null +++ b/edited_images/heartflames/heartflame_white/r1frame03.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame03.png-51d912d921aec94687a43ba509eed228.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_white/r1frame03.png" +dest_files=[ "res://.import/r1frame03.png-51d912d921aec94687a43ba509eed228.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_white/r1frame04.png b/edited_images/heartflames/heartflame_white/r1frame04.png new file mode 100644 index 00000000..6fde9b54 Binary files /dev/null and b/edited_images/heartflames/heartflame_white/r1frame04.png differ diff --git a/edited_images/heartflames/heartflame_white/r1frame04.png.import b/edited_images/heartflames/heartflame_white/r1frame04.png.import new file mode 100644 index 00000000..e40de5c4 --- /dev/null +++ b/edited_images/heartflames/heartflame_white/r1frame04.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame04.png-9029da01dbd4a4a733e674dc3ee0d0ea.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_white/r1frame04.png" +dest_files=[ "res://.import/r1frame04.png-9029da01dbd4a4a733e674dc3ee0d0ea.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_white/r1frame05.png b/edited_images/heartflames/heartflame_white/r1frame05.png new file mode 100644 index 00000000..7a1fc820 Binary files /dev/null and b/edited_images/heartflames/heartflame_white/r1frame05.png differ diff --git a/edited_images/heartflames/heartflame_white/r1frame05.png.import b/edited_images/heartflames/heartflame_white/r1frame05.png.import new file mode 100644 index 00000000..c6eff315 --- /dev/null +++ b/edited_images/heartflames/heartflame_white/r1frame05.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame05.png-05c2a974b7f7b294f8e6c89ce929d9a6.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_white/r1frame05.png" +dest_files=[ "res://.import/r1frame05.png-05c2a974b7f7b294f8e6c89ce929d9a6.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_white/r1frame06.png b/edited_images/heartflames/heartflame_white/r1frame06.png new file mode 100644 index 00000000..66e58fe2 Binary files /dev/null and b/edited_images/heartflames/heartflame_white/r1frame06.png differ diff --git a/dk_images/furniture/flagpole_blueflag_fp/r1frame05.png.import b/edited_images/heartflames/heartflame_white/r1frame06.png.import similarity index 69% rename from dk_images/furniture/flagpole_blueflag_fp/r1frame05.png.import rename to edited_images/heartflames/heartflame_white/r1frame06.png.import index e07d30c8..5deb6bc9 100644 --- a/dk_images/furniture/flagpole_blueflag_fp/r1frame05.png.import +++ b/edited_images/heartflames/heartflame_white/r1frame06.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/r1frame05.png-de798d2b4d33ff2829ff856d64385208.stex" +path="res://.import/r1frame06.png-7356a08af4be3ae14e9f579d985e5808.stex" metadata={ "vram_texture": false } [deps] -source_file="res://dk_images/furniture/flagpole_blueflag_fp/r1frame05.png" -dest_files=[ "res://.import/r1frame05.png-de798d2b4d33ff2829ff856d64385208.stex" ] +source_file="res://edited_images/heartflames/heartflame_white/r1frame06.png" +dest_files=[ "res://.import/r1frame06.png-7356a08af4be3ae14e9f579d985e5808.stex" ] [params] diff --git a/edited_images/heartflames/heartflame_white/r1frame07.png b/edited_images/heartflames/heartflame_white/r1frame07.png new file mode 100644 index 00000000..b9128ff3 Binary files /dev/null and b/edited_images/heartflames/heartflame_white/r1frame07.png differ diff --git a/edited_images/heartflames/heartflame_white/r1frame07.png.import b/edited_images/heartflames/heartflame_white/r1frame07.png.import new file mode 100644 index 00000000..e628078e --- /dev/null +++ b/edited_images/heartflames/heartflame_white/r1frame07.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame07.png-c100837ed51f3036103e1f00d6e9fcc8.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_white/r1frame07.png" +dest_files=[ "res://.import/r1frame07.png-c100837ed51f3036103e1f00d6e9fcc8.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_white/r1frame08.png b/edited_images/heartflames/heartflame_white/r1frame08.png new file mode 100644 index 00000000..b47f13aa Binary files /dev/null and b/edited_images/heartflames/heartflame_white/r1frame08.png differ diff --git a/edited_images/heartflames/heartflame_white/r1frame08.png.import b/edited_images/heartflames/heartflame_white/r1frame08.png.import new file mode 100644 index 00000000..0605257c --- /dev/null +++ b/edited_images/heartflames/heartflame_white/r1frame08.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame08.png-cabc2a52c15674f6223a925d997bbf89.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_white/r1frame08.png" +dest_files=[ "res://.import/r1frame08.png-cabc2a52c15674f6223a925d997bbf89.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_white/r1frame09.png b/edited_images/heartflames/heartflame_white/r1frame09.png new file mode 100644 index 00000000..9ff7b31a Binary files /dev/null and b/edited_images/heartflames/heartflame_white/r1frame09.png differ diff --git a/edited_images/heartflames/heartflame_white/r1frame09.png.import b/edited_images/heartflames/heartflame_white/r1frame09.png.import new file mode 100644 index 00000000..24368c64 --- /dev/null +++ b/edited_images/heartflames/heartflame_white/r1frame09.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame09.png-496bb8d0cad2e00e1a3d72990eb9899a.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_white/r1frame09.png" +dest_files=[ "res://.import/r1frame09.png-496bb8d0cad2e00e1a3d72990eb9899a.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_white/r1frame10.png b/edited_images/heartflames/heartflame_white/r1frame10.png new file mode 100644 index 00000000..8fef5482 Binary files /dev/null and b/edited_images/heartflames/heartflame_white/r1frame10.png differ diff --git a/edited_images/heartflames/heartflame_white/r1frame10.png.import b/edited_images/heartflames/heartflame_white/r1frame10.png.import new file mode 100644 index 00000000..316fea5d --- /dev/null +++ b/edited_images/heartflames/heartflame_white/r1frame10.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame10.png-3bc32693308b230555124da3b02ddfe8.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_white/r1frame10.png" +dest_files=[ "res://.import/r1frame10.png-3bc32693308b230555124da3b02ddfe8.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_white/r1frame11.png b/edited_images/heartflames/heartflame_white/r1frame11.png new file mode 100644 index 00000000..980043eb Binary files /dev/null and b/edited_images/heartflames/heartflame_white/r1frame11.png differ diff --git a/edited_images/heartflames/heartflame_white/r1frame11.png.import b/edited_images/heartflames/heartflame_white/r1frame11.png.import new file mode 100644 index 00000000..3f471258 --- /dev/null +++ b/edited_images/heartflames/heartflame_white/r1frame11.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame11.png-1c3a8b175a16c753a54b19329b8b66e1.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_white/r1frame11.png" +dest_files=[ "res://.import/r1frame11.png-1c3a8b175a16c753a54b19329b8b66e1.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_white/r1frame12.png b/edited_images/heartflames/heartflame_white/r1frame12.png new file mode 100644 index 00000000..3a407bcd Binary files /dev/null and b/edited_images/heartflames/heartflame_white/r1frame12.png differ diff --git a/edited_images/heartflames/heartflame_white/r1frame12.png.import b/edited_images/heartflames/heartflame_white/r1frame12.png.import new file mode 100644 index 00000000..143d6146 --- /dev/null +++ b/edited_images/heartflames/heartflame_white/r1frame12.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame12.png-da640af4c15b203e223bc503b1aecb83.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_white/r1frame12.png" +dest_files=[ "res://.import/r1frame12.png-da640af4c15b203e223bc503b1aecb83.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_white/r1frame13.png b/edited_images/heartflames/heartflame_white/r1frame13.png new file mode 100644 index 00000000..1936e663 Binary files /dev/null and b/edited_images/heartflames/heartflame_white/r1frame13.png differ diff --git a/edited_images/heartflames/heartflame_white/r1frame13.png.import b/edited_images/heartflames/heartflame_white/r1frame13.png.import new file mode 100644 index 00000000..4bb3e737 --- /dev/null +++ b/edited_images/heartflames/heartflame_white/r1frame13.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame13.png-4696234bd4c839fd89347032cecefd1a.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_white/r1frame13.png" +dest_files=[ "res://.import/r1frame13.png-4696234bd4c839fd89347032cecefd1a.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_white/r1frame14.png b/edited_images/heartflames/heartflame_white/r1frame14.png new file mode 100644 index 00000000..5ce407ba Binary files /dev/null and b/edited_images/heartflames/heartflame_white/r1frame14.png differ diff --git a/edited_images/heartflames/heartflame_white/r1frame14.png.import b/edited_images/heartflames/heartflame_white/r1frame14.png.import new file mode 100644 index 00000000..8f8b155e --- /dev/null +++ b/edited_images/heartflames/heartflame_white/r1frame14.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame14.png-e43b1cd2d53b23b4a234a3e7c93edc81.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_white/r1frame14.png" +dest_files=[ "res://.import/r1frame14.png-e43b1cd2d53b23b4a234a3e7c93edc81.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_white/r1frame15.png b/edited_images/heartflames/heartflame_white/r1frame15.png new file mode 100644 index 00000000..a99f9bda Binary files /dev/null and b/edited_images/heartflames/heartflame_white/r1frame15.png differ diff --git a/edited_images/heartflames/heartflame_white/r1frame15.png.import b/edited_images/heartflames/heartflame_white/r1frame15.png.import new file mode 100644 index 00000000..d5218a08 --- /dev/null +++ b/edited_images/heartflames/heartflame_white/r1frame15.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame15.png-13c0695daa330eee4b57db9bce0d4704.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_white/r1frame15.png" +dest_files=[ "res://.import/r1frame15.png-13c0695daa330eee4b57db9bce0d4704.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/heartflames/heartflame_white/r1frame16.png b/edited_images/heartflames/heartflame_white/r1frame16.png new file mode 100644 index 00000000..f8e15a12 Binary files /dev/null and b/edited_images/heartflames/heartflame_white/r1frame16.png differ diff --git a/edited_images/heartflames/heartflame_white/r1frame16.png.import b/edited_images/heartflames/heartflame_white/r1frame16.png.import new file mode 100644 index 00000000..3a1557b6 --- /dev/null +++ b/edited_images/heartflames/heartflame_white/r1frame16.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/r1frame16.png-8cb37d7aec3b82538e6259a247e339f4.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/heartflames/heartflame_white/r1frame16.png" +dest_files=[ "res://.import/r1frame16.png-8cb37d7aec3b82538e6259a247e339f4.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/plyrsym_32/symbol_player_any_dis.png b/edited_images/plyrsym_32/symbol_player_any_dis.png index ff1572f8..11bebb94 100644 Binary files a/edited_images/plyrsym_32/symbol_player_any_dis.png and b/edited_images/plyrsym_32/symbol_player_any_dis.png differ diff --git a/edited_images/plyrsym_32/symbol_player_black_std - original.png b/edited_images/plyrsym_32/symbol_player_black_std - original.png new file mode 100644 index 00000000..03c81ecb Binary files /dev/null and b/edited_images/plyrsym_32/symbol_player_black_std - original.png differ diff --git a/edited_images/plyrsym_32/symbol_player_black_std - original.png.import b/edited_images/plyrsym_32/symbol_player_black_std - original.png.import new file mode 100644 index 00000000..403c6a15 --- /dev/null +++ b/edited_images/plyrsym_32/symbol_player_black_std - original.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/symbol_player_black_std - original.png-e886b4751de32498b091994dd2511da0.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/plyrsym_32/symbol_player_black_std - original.png" +dest_files=[ "res://.import/symbol_player_black_std - original.png-e886b4751de32498b091994dd2511da0.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/plyrsym_32/symbol_player_black_std.png b/edited_images/plyrsym_32/symbol_player_black_std.png new file mode 100644 index 00000000..afd55680 Binary files /dev/null and b/edited_images/plyrsym_32/symbol_player_black_std.png differ diff --git a/edited_images/plyrsym_32/symbol_player_black_std.png.import b/edited_images/plyrsym_32/symbol_player_black_std.png.import new file mode 100644 index 00000000..a2539c60 --- /dev/null +++ b/edited_images/plyrsym_32/symbol_player_black_std.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/symbol_player_black_std.png-6b4ee7e6b2505a534675ea12411071ab.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/plyrsym_32/symbol_player_black_std.png" +dest_files=[ "res://.import/symbol_player_black_std.png-6b4ee7e6b2505a534675ea12411071ab.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/plyrsym_32/symbol_player_orange_std.png b/edited_images/plyrsym_32/symbol_player_orange_std.png new file mode 100644 index 00000000..935fc417 Binary files /dev/null and b/edited_images/plyrsym_32/symbol_player_orange_std.png differ diff --git a/edited_images/plyrsym_32/symbol_player_orange_std.png.import b/edited_images/plyrsym_32/symbol_player_orange_std.png.import new file mode 100644 index 00000000..02fad32a --- /dev/null +++ b/edited_images/plyrsym_32/symbol_player_orange_std.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/symbol_player_orange_std.png-c3dfbc364bce55557fac7910ac08b1c8.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/plyrsym_32/symbol_player_orange_std.png" +dest_files=[ "res://.import/symbol_player_orange_std.png-c3dfbc364bce55557fac7910ac08b1c8.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/plyrsym_32/symbol_player_purple_std.png b/edited_images/plyrsym_32/symbol_player_purple_std.png new file mode 100644 index 00000000..edc85ad3 Binary files /dev/null and b/edited_images/plyrsym_32/symbol_player_purple_std.png differ diff --git a/edited_images/plyrsym_32/symbol_player_purple_std.png.import b/edited_images/plyrsym_32/symbol_player_purple_std.png.import new file mode 100644 index 00000000..97ec0e69 --- /dev/null +++ b/edited_images/plyrsym_32/symbol_player_purple_std.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/symbol_player_purple_std.png-f35c8131165aa9b614c346dcab983e49.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/plyrsym_32/symbol_player_purple_std.png" +dest_files=[ "res://.import/symbol_player_purple_std.png-f35c8131165aa9b614c346dcab983e49.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/plyrsym_32/symbol_player_white_1.png b/edited_images/plyrsym_32/symbol_player_white_1.png deleted file mode 100644 index 97d7fc43..00000000 Binary files a/edited_images/plyrsym_32/symbol_player_white_1.png and /dev/null differ diff --git a/edited_images/plyrsym_32/symbol_player_white_2.png b/edited_images/plyrsym_32/symbol_player_white_2.png deleted file mode 100644 index aba42e1b..00000000 Binary files a/edited_images/plyrsym_32/symbol_player_white_2.png and /dev/null differ diff --git a/edited_images/plyrsym_32/symbol_player_white_2.png.import b/edited_images/plyrsym_32/symbol_player_white_2.png.import deleted file mode 100644 index 9df87fbc..00000000 --- a/edited_images/plyrsym_32/symbol_player_white_2.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/symbol_player_white_2.png-064e3be1dcebf796f531313c4b728974.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://edited_images/plyrsym_32/symbol_player_white_2.png" -dest_files=[ "res://.import/symbol_player_white_2.png-064e3be1dcebf796f531313c4b728974.stex" ] - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=0 -compress/bptc_ldr=0 -compress/normal_map=0 -flags/repeat=0 -flags/filter=false -flags/mipmaps=true -flags/anisotropic=true -flags/srgb=2 -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=false -svg/scale=1.0 diff --git a/edited_images/plyrsym_32/symbol_player_white_std.png b/edited_images/plyrsym_32/symbol_player_white_std.png new file mode 100644 index 00000000..039a2cd8 Binary files /dev/null and b/edited_images/plyrsym_32/symbol_player_white_std.png differ diff --git a/edited_images/plyrsym_32/symbol_player_white_1.png.import b/edited_images/plyrsym_32/symbol_player_white_std.png.import similarity index 74% rename from edited_images/plyrsym_32/symbol_player_white_1.png.import rename to edited_images/plyrsym_32/symbol_player_white_std.png.import index 3ab156b7..1dcfd4c2 100644 --- a/edited_images/plyrsym_32/symbol_player_white_1.png.import +++ b/edited_images/plyrsym_32/symbol_player_white_std.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/symbol_player_white_1.png-c8af607a659a47fd79c9e9301eccfd9f.stex" +path="res://.import/symbol_player_white_std.png-f05cf19e00728b8e284826ac9cf60b65.stex" metadata={ "vram_texture": false } [deps] -source_file="res://edited_images/plyrsym_32/symbol_player_white_1.png" -dest_files=[ "res://.import/symbol_player_white_1.png-c8af607a659a47fd79c9e9301eccfd9f.stex" ] +source_file="res://edited_images/plyrsym_32/symbol_player_white_std.png" +dest_files=[ "res://.import/symbol_player_white_std.png-f05cf19e00728b8e284826ac9cf60b65.stex" ] [params] diff --git a/edited_images/plyrsym_32/symbol_room_black_std.png b/edited_images/plyrsym_32/symbol_room_black_std.png new file mode 100644 index 00000000..6d20d39e Binary files /dev/null and b/edited_images/plyrsym_32/symbol_room_black_std.png differ diff --git a/edited_images/plyrsym_32/symbol_room_black_std.png.import b/edited_images/plyrsym_32/symbol_room_black_std.png.import new file mode 100644 index 00000000..9d02a62b --- /dev/null +++ b/edited_images/plyrsym_32/symbol_room_black_std.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/symbol_room_black_std.png-c086e7df5e51465ccf669aea0c0dcb99.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/plyrsym_32/symbol_room_black_std.png" +dest_files=[ "res://.import/symbol_room_black_std.png-c086e7df5e51465ccf669aea0c0dcb99.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/plyrsym_32/symbol_room_orange_std.png b/edited_images/plyrsym_32/symbol_room_orange_std.png new file mode 100644 index 00000000..c5d92b85 Binary files /dev/null and b/edited_images/plyrsym_32/symbol_room_orange_std.png differ diff --git a/edited_images/plyrsym_32/symbol_room_orange_std.png.import b/edited_images/plyrsym_32/symbol_room_orange_std.png.import new file mode 100644 index 00000000..b09dd93f --- /dev/null +++ b/edited_images/plyrsym_32/symbol_room_orange_std.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/symbol_room_orange_std.png-62eab45cecf13d5a83ed253340feb10b.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/plyrsym_32/symbol_room_orange_std.png" +dest_files=[ "res://.import/symbol_room_orange_std.png-62eab45cecf13d5a83ed253340feb10b.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0 diff --git a/edited_images/plyrsym_32/symbol_room_purple_std.png b/edited_images/plyrsym_32/symbol_room_purple_std.png new file mode 100644 index 00000000..e26ae205 Binary files /dev/null and b/edited_images/plyrsym_32/symbol_room_purple_std.png differ diff --git a/edited_images/plyrsym_32/symbol_room_purple_std.png.import b/edited_images/plyrsym_32/symbol_room_purple_std.png.import new file mode 100644 index 00000000..21a2d96f --- /dev/null +++ b/edited_images/plyrsym_32/symbol_room_purple_std.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/symbol_room_purple_std.png-4432334ec746de755e525a2d1e93d219.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://edited_images/plyrsym_32/symbol_room_purple_std.png" +dest_files=[ "res://.import/symbol_room_purple_std.png-4432334ec746de755e525a2d1e93d219.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=true +flags/anisotropic=true +flags/srgb=2 +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=false +svg/scale=1.0