From 69c019b3a56753b57218a4449ddbb134554ea054 Mon Sep 17 00:00:00 2001 From: Luke Hubmayer-Werner Date: Wed, 26 Jun 2024 19:52:38 +0930 Subject: [PATCH] Reorganize data folder some more --- .../glyph_tables/Glyphs_dialog_RPGe.txt | 0 .../glyph_tables/Glyphs_dialog_SNES.txt | 0 .../glyph_tables/Glyphs_dialog_kanji_SNES.txt | 0 .../glyph_tables/Glyphs_small_RPGe.txt | 0 .../glyph_tables/Glyphs_small_SNES.txt | 0 .../Glyphs_small_dakuten_SNES.txt | 0 data/{ => 5}/sprite_blocks.json | 0 data/{ => 5}/string_blocks.tsv | 0 export_presets.cfg | 27 ++++++++++++++++++- scripts/loaders/SpriteLoader.gd | 2 +- scripts/loaders/StringLoader.gd | 12 ++++----- scripts/managers/HTML5.gd | 2 +- {data => web}/html5_file_picker.js | 0 13 files changed, 34 insertions(+), 9 deletions(-) rename data/{ => 5}/glyph_tables/Glyphs_dialog_RPGe.txt (100%) rename data/{ => 5}/glyph_tables/Glyphs_dialog_SNES.txt (100%) rename data/{ => 5}/glyph_tables/Glyphs_dialog_kanji_SNES.txt (100%) rename data/{ => 5}/glyph_tables/Glyphs_small_RPGe.txt (100%) rename data/{ => 5}/glyph_tables/Glyphs_small_SNES.txt (100%) rename data/{ => 5}/glyph_tables/Glyphs_small_dakuten_SNES.txt (100%) rename data/{ => 5}/sprite_blocks.json (100%) rename data/{ => 5}/string_blocks.tsv (100%) rename {data => web}/html5_file_picker.js (100%) diff --git a/data/glyph_tables/Glyphs_dialog_RPGe.txt b/data/5/glyph_tables/Glyphs_dialog_RPGe.txt similarity index 100% rename from data/glyph_tables/Glyphs_dialog_RPGe.txt rename to data/5/glyph_tables/Glyphs_dialog_RPGe.txt diff --git a/data/glyph_tables/Glyphs_dialog_SNES.txt b/data/5/glyph_tables/Glyphs_dialog_SNES.txt similarity index 100% rename from data/glyph_tables/Glyphs_dialog_SNES.txt rename to data/5/glyph_tables/Glyphs_dialog_SNES.txt diff --git a/data/glyph_tables/Glyphs_dialog_kanji_SNES.txt b/data/5/glyph_tables/Glyphs_dialog_kanji_SNES.txt similarity index 100% rename from data/glyph_tables/Glyphs_dialog_kanji_SNES.txt rename to data/5/glyph_tables/Glyphs_dialog_kanji_SNES.txt diff --git a/data/glyph_tables/Glyphs_small_RPGe.txt b/data/5/glyph_tables/Glyphs_small_RPGe.txt similarity index 100% rename from data/glyph_tables/Glyphs_small_RPGe.txt rename to data/5/glyph_tables/Glyphs_small_RPGe.txt diff --git a/data/glyph_tables/Glyphs_small_SNES.txt b/data/5/glyph_tables/Glyphs_small_SNES.txt similarity index 100% rename from data/glyph_tables/Glyphs_small_SNES.txt rename to data/5/glyph_tables/Glyphs_small_SNES.txt diff --git a/data/glyph_tables/Glyphs_small_dakuten_SNES.txt b/data/5/glyph_tables/Glyphs_small_dakuten_SNES.txt similarity index 100% rename from data/glyph_tables/Glyphs_small_dakuten_SNES.txt rename to data/5/glyph_tables/Glyphs_small_dakuten_SNES.txt diff --git a/data/sprite_blocks.json b/data/5/sprite_blocks.json similarity index 100% rename from data/sprite_blocks.json rename to data/5/sprite_blocks.json diff --git a/data/string_blocks.tsv b/data/5/string_blocks.tsv similarity index 100% rename from data/string_blocks.tsv rename to data/5/string_blocks.tsv diff --git a/export_presets.cfg b/export_presets.cfg index 5dd398d..9222d8d 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -5,7 +5,7 @@ platform="HTML5" runnable=true custom_features="" export_filter="all_resources" -include_filter="data/*" +include_filter="data/*,web/*" exclude_filter="" export_path="output/ChocolateBird.html" script_export_mode=1 @@ -32,3 +32,28 @@ progressive_web_app/icon_144x144="" progressive_web_app/icon_180x180="" progressive_web_app/icon_512x512="" progressive_web_app/background_color=Color( 0, 0, 0, 1 ) + +[preset.1] + +name="Linux/X11" +platform="Linux/X11" +runnable=true +custom_features="" +export_filter="all_resources" +include_filter="data/*" +exclude_filter="" +export_path="build/ChocolateBird.x86_64" +script_export_mode=1 +script_encryption_key="" + +[preset.1.options] + +custom_template/debug="" +custom_template/release="" +binary_format/architecture="x86_64" +binary_format/embed_pck=false +texture_format/bptc=false +texture_format/s3tc=true +texture_format/etc=false +texture_format/etc2=false +texture_format/no_bptc_fallbacks=true diff --git a/scripts/loaders/SpriteLoader.gd b/scripts/loaders/SpriteLoader.gd index ae253d9..695d805 100644 --- a/scripts/loaders/SpriteLoader.gd +++ b/scripts/loaders/SpriteLoader.gd @@ -270,7 +270,7 @@ static func make_font_glyph_atlas(small_glyph_indexed_images, dialog_glyph_image # weapon_textures['Fist'] = texture_from_image(snes_graphics.get_tile(rom, Common.SNES_PSX_addresses['tiles_fist']['SNES'], 24)) -# var json_sprite_blocks: Dictionary = Common.load_json('res://data/sprite_blocks.json') # This needs error handling later +# var json_sprite_blocks: Dictionary = Common.load_json('res://data/5/sprite_blocks.json') # This needs error handling later # var sprite_blocks := {} # func snes_load_map_sprites(rom: File): # # Main palettes diff --git a/scripts/loaders/StringLoader.gd b/scripts/loaders/StringLoader.gd index 39821c5..5236f7c 100644 --- a/scripts/loaders/StringLoader.gd +++ b/scripts/loaders/StringLoader.gd @@ -3,16 +3,16 @@ signal loading_stage_updated(stage) # String const ff5_dialog := preload('res://scripts/loaders/snes/ff5_dialog.gd') -var SNES_block_addresses := Common.load_tsv('res://data/string_blocks.tsv') +var SNES_block_addresses := Common.load_tsv('res://data/5/string_blocks.tsv') var tables_raw = {} var tables = {} var glyph_tables := { - 'RPGe_dialog': Common.load_glyph_table('res://data/glyph_tables/Glyphs_dialog_RPGe.txt'), - 'RPGe_small': Common.load_glyph_table('res://data/glyph_tables/Glyphs_small_RPGe.txt'), - 'SNES_dialog': Common.load_glyph_table('res://data/glyph_tables/Glyphs_dialog_SNES.txt'), - 'SNES_kanji': Common.load_glyph_table('res://data/glyph_tables/Glyphs_dialog_kanji_SNES.txt'), - 'SNES_small': Common.load_glyph_table('res://data/glyph_tables/Glyphs_small_SNES.txt'), + 'RPGe_dialog': Common.load_glyph_table('res://data/5/glyph_tables/Glyphs_dialog_RPGe.txt'), + 'RPGe_small': Common.load_glyph_table('res://data/5/glyph_tables/Glyphs_small_RPGe.txt'), + 'SNES_dialog': Common.load_glyph_table('res://data/5/glyph_tables/Glyphs_dialog_SNES.txt'), + 'SNES_kanji': Common.load_glyph_table('res://data/5/glyph_tables/Glyphs_dialog_kanji_SNES.txt'), + 'SNES_small': Common.load_glyph_table('res://data/5/glyph_tables/Glyphs_small_SNES.txt'), } static func decode_string(bytes, glyph_table: PoolStringArray, trim_trailing_whitespace: bool = true) -> String: diff --git a/scripts/managers/HTML5.gd b/scripts/managers/HTML5.gd index d212152..b47f112 100644 --- a/scripts/managers/HTML5.gd +++ b/scripts/managers/HTML5.gd @@ -10,7 +10,7 @@ func _ready() -> void: return var file := File.new() - match file.open('res://data/html5_file_picker.js', File.READ): + match file.open('res://web/html5_file_picker.js', File.READ): OK: JavaScript.eval(file.get_as_text(), true) var error: diff --git a/data/html5_file_picker.js b/web/html5_file_picker.js similarity index 100% rename from data/html5_file_picker.js rename to web/html5_file_picker.js