diff --git a/CMake/Assets.cmake b/CMake/Assets.cmake index 0e5e2b556..20cd4ff36 100644 --- a/CMake/Assets.cmake +++ b/CMake/Assets.cmake @@ -182,7 +182,7 @@ endif() if(APPLE) foreach(asset_file ${devilutionx_assets}) - set(src "${CMAKE_CURRENT_SOURCE_DIR}/Packaging/resources/assets/${asset_file}") + set(src "${CMAKE_CURRENT_SOURCE_DIR}/assets/${asset_file}") get_filename_component(_asset_dir "${asset_file}" DIRECTORY) set_source_files_properties("${src}" PROPERTIES MACOSX_PACKAGE_LOCATION "Resources/${_asset_dir}" @@ -194,7 +194,7 @@ else() # - If smpq is installed, devilutionx.mpq is built from these files. # - If smpq is not installed, the game will load the assets directly from this directoy. foreach(asset_file ${devilutionx_assets}) - set(src "${CMAKE_CURRENT_SOURCE_DIR}/Packaging/resources/assets/${asset_file}") + set(src "${CMAKE_CURRENT_SOURCE_DIR}/assets/${asset_file}") set(dst "${DEVILUTIONX_ASSETS_OUTPUT_DIRECTORY}/${asset_file}") list(APPEND DEVILUTIONX_MPQ_FILES "${asset_file}") list(APPEND DEVILUTIONX_OUTPUT_ASSETS_FILES "${dst}") diff --git a/CMakeLists.txt b/CMakeLists.txt index 08d483f2b..6477cb9ca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -447,7 +447,7 @@ if(VITA) VERSION ${VITA_VERSION} NAME ${VITA_APP_NAME} FILE Packaging/vita/sce_sys sce_sys - FILE Packaging/resources/assets assets + FILE assets assets ${VITA_TRANSLATIONS_LIST} ) endif() diff --git a/Packaging/resources/assets/arena/church.dun b/assets/arena/church.dun similarity index 100% rename from Packaging/resources/assets/arena/church.dun rename to assets/arena/church.dun diff --git a/Packaging/resources/assets/arena/circle_of_death.dun b/assets/arena/circle_of_death.dun similarity index 100% rename from Packaging/resources/assets/arena/circle_of_death.dun rename to assets/arena/circle_of_death.dun diff --git a/Packaging/resources/assets/arena/hell.dun b/assets/arena/hell.dun similarity index 100% rename from Packaging/resources/assets/arena/hell.dun rename to assets/arena/hell.dun diff --git a/Packaging/resources/assets/data/boxleftend.clx b/assets/data/boxleftend.clx similarity index 100% rename from Packaging/resources/assets/data/boxleftend.clx rename to assets/data/boxleftend.clx diff --git a/Packaging/resources/assets/data/boxmiddle.clx b/assets/data/boxmiddle.clx similarity index 100% rename from Packaging/resources/assets/data/boxmiddle.clx rename to assets/data/boxmiddle.clx diff --git a/Packaging/resources/assets/data/boxrightend.clx b/assets/data/boxrightend.clx similarity index 100% rename from Packaging/resources/assets/data/boxrightend.clx rename to assets/data/boxrightend.clx diff --git a/Packaging/resources/assets/data/charbg.clx b/assets/data/charbg.clx similarity index 100% rename from Packaging/resources/assets/data/charbg.clx rename to assets/data/charbg.clx diff --git a/Packaging/resources/assets/data/dirtybuc.clx b/assets/data/dirtybuc.clx similarity index 100% rename from Packaging/resources/assets/data/dirtybuc.clx rename to assets/data/dirtybuc.clx diff --git a/Packaging/resources/assets/data/dirtybucp.clx b/assets/data/dirtybucp.clx similarity index 100% rename from Packaging/resources/assets/data/dirtybucp.clx rename to assets/data/dirtybucp.clx diff --git a/Packaging/resources/assets/data/health.clx b/assets/data/health.clx similarity index 100% rename from Packaging/resources/assets/data/health.clx rename to assets/data/health.clx diff --git a/Packaging/resources/assets/data/healthbox.clx b/assets/data/healthbox.clx similarity index 100% rename from Packaging/resources/assets/data/healthbox.clx rename to assets/data/healthbox.clx diff --git a/Packaging/resources/assets/data/hintbox.clx b/assets/data/hintbox.clx similarity index 100% rename from Packaging/resources/assets/data/hintbox.clx rename to assets/data/hintbox.clx diff --git a/Packaging/resources/assets/data/hintboxbackground.clx b/assets/data/hintboxbackground.clx similarity index 100% rename from Packaging/resources/assets/data/hintboxbackground.clx rename to assets/data/hintboxbackground.clx diff --git a/Packaging/resources/assets/data/hinticons.clx b/assets/data/hinticons.clx similarity index 100% rename from Packaging/resources/assets/data/hinticons.clx rename to assets/data/hinticons.clx diff --git a/Packaging/resources/assets/data/monstertags.clx b/assets/data/monstertags.clx similarity index 100% rename from Packaging/resources/assets/data/monstertags.clx rename to assets/data/monstertags.clx diff --git a/Packaging/resources/assets/data/panel8buc.clx b/assets/data/panel8buc.clx similarity index 100% rename from Packaging/resources/assets/data/panel8buc.clx rename to assets/data/panel8buc.clx diff --git a/Packaging/resources/assets/data/panel8bucp.clx b/assets/data/panel8bucp.clx similarity index 100% rename from Packaging/resources/assets/data/panel8bucp.clx rename to assets/data/panel8bucp.clx diff --git a/Packaging/resources/assets/data/resistance.clx b/assets/data/resistance.clx similarity index 100% rename from Packaging/resources/assets/data/resistance.clx rename to assets/data/resistance.clx diff --git a/Packaging/resources/assets/data/stash.clx b/assets/data/stash.clx similarity index 100% rename from Packaging/resources/assets/data/stash.clx rename to assets/data/stash.clx diff --git a/Packaging/resources/assets/data/stashnavbtns.clx b/assets/data/stashnavbtns.clx similarity index 100% rename from Packaging/resources/assets/data/stashnavbtns.clx rename to assets/data/stashnavbtns.clx diff --git a/Packaging/resources/assets/data/talkbutton.clx b/assets/data/talkbutton.clx similarity index 100% rename from Packaging/resources/assets/data/talkbutton.clx rename to assets/data/talkbutton.clx diff --git a/Packaging/resources/assets/data/xpbar.clx b/assets/data/xpbar.clx similarity index 100% rename from Packaging/resources/assets/data/xpbar.clx rename to assets/data/xpbar.clx diff --git a/Packaging/resources/assets/fonts/12-00.clx b/assets/fonts/12-00.clx similarity index 100% rename from Packaging/resources/assets/fonts/12-00.clx rename to assets/fonts/12-00.clx diff --git a/Packaging/resources/assets/fonts/12-01.clx b/assets/fonts/12-01.clx similarity index 100% rename from Packaging/resources/assets/fonts/12-01.clx rename to assets/fonts/12-01.clx diff --git a/Packaging/resources/assets/fonts/12-02.clx b/assets/fonts/12-02.clx similarity index 100% rename from Packaging/resources/assets/fonts/12-02.clx rename to assets/fonts/12-02.clx diff --git a/Packaging/resources/assets/fonts/12-03.clx b/assets/fonts/12-03.clx similarity index 100% rename from Packaging/resources/assets/fonts/12-03.clx rename to assets/fonts/12-03.clx diff --git a/Packaging/resources/assets/fonts/12-04.clx b/assets/fonts/12-04.clx similarity index 100% rename from Packaging/resources/assets/fonts/12-04.clx rename to assets/fonts/12-04.clx diff --git a/Packaging/resources/assets/fonts/12-1f1.clx b/assets/fonts/12-1f1.clx similarity index 100% rename from Packaging/resources/assets/fonts/12-1f1.clx rename to assets/fonts/12-1f1.clx diff --git a/Packaging/resources/assets/fonts/12-1f3.clx b/assets/fonts/12-1f3.clx similarity index 100% rename from Packaging/resources/assets/fonts/12-1f3.clx rename to assets/fonts/12-1f3.clx diff --git a/Packaging/resources/assets/fonts/12-1f4.clx b/assets/fonts/12-1f4.clx similarity index 100% rename from Packaging/resources/assets/fonts/12-1f4.clx rename to assets/fonts/12-1f4.clx diff --git a/Packaging/resources/assets/fonts/12-1f5.clx b/assets/fonts/12-1f5.clx similarity index 100% rename from Packaging/resources/assets/fonts/12-1f5.clx rename to assets/fonts/12-1f5.clx diff --git a/Packaging/resources/assets/fonts/12-1f6.clx b/assets/fonts/12-1f6.clx similarity index 100% rename from Packaging/resources/assets/fonts/12-1f6.clx rename to assets/fonts/12-1f6.clx diff --git a/Packaging/resources/assets/fonts/12-1f9.clx b/assets/fonts/12-1f9.clx similarity index 100% rename from Packaging/resources/assets/fonts/12-1f9.clx rename to assets/fonts/12-1f9.clx diff --git a/Packaging/resources/assets/fonts/12-20.clx b/assets/fonts/12-20.clx similarity index 100% rename from Packaging/resources/assets/fonts/12-20.clx rename to assets/fonts/12-20.clx diff --git a/Packaging/resources/assets/fonts/12-26.clx b/assets/fonts/12-26.clx similarity index 100% rename from Packaging/resources/assets/fonts/12-26.clx rename to assets/fonts/12-26.clx diff --git a/Packaging/resources/assets/fonts/12-e0.clx b/assets/fonts/12-e0.clx similarity index 100% rename from Packaging/resources/assets/fonts/12-e0.clx rename to assets/fonts/12-e0.clx diff --git a/Packaging/resources/assets/fonts/22-00.clx b/assets/fonts/22-00.clx similarity index 100% rename from Packaging/resources/assets/fonts/22-00.clx rename to assets/fonts/22-00.clx diff --git a/Packaging/resources/assets/fonts/22-01.clx b/assets/fonts/22-01.clx similarity index 100% rename from Packaging/resources/assets/fonts/22-01.clx rename to assets/fonts/22-01.clx diff --git a/Packaging/resources/assets/fonts/22-02.clx b/assets/fonts/22-02.clx similarity index 100% rename from Packaging/resources/assets/fonts/22-02.clx rename to assets/fonts/22-02.clx diff --git a/Packaging/resources/assets/fonts/22-03.clx b/assets/fonts/22-03.clx similarity index 100% rename from Packaging/resources/assets/fonts/22-03.clx rename to assets/fonts/22-03.clx diff --git a/Packaging/resources/assets/fonts/22-04.clx b/assets/fonts/22-04.clx similarity index 100% rename from Packaging/resources/assets/fonts/22-04.clx rename to assets/fonts/22-04.clx diff --git a/Packaging/resources/assets/fonts/22-05.clx b/assets/fonts/22-05.clx similarity index 100% rename from Packaging/resources/assets/fonts/22-05.clx rename to assets/fonts/22-05.clx diff --git a/Packaging/resources/assets/fonts/22-20.clx b/assets/fonts/22-20.clx similarity index 100% rename from Packaging/resources/assets/fonts/22-20.clx rename to assets/fonts/22-20.clx diff --git a/Packaging/resources/assets/fonts/24-00.clx b/assets/fonts/24-00.clx similarity index 100% rename from Packaging/resources/assets/fonts/24-00.clx rename to assets/fonts/24-00.clx diff --git a/Packaging/resources/assets/fonts/24-01.clx b/assets/fonts/24-01.clx similarity index 100% rename from Packaging/resources/assets/fonts/24-01.clx rename to assets/fonts/24-01.clx diff --git a/Packaging/resources/assets/fonts/24-02.clx b/assets/fonts/24-02.clx similarity index 100% rename from Packaging/resources/assets/fonts/24-02.clx rename to assets/fonts/24-02.clx diff --git a/Packaging/resources/assets/fonts/24-03.clx b/assets/fonts/24-03.clx similarity index 100% rename from Packaging/resources/assets/fonts/24-03.clx rename to assets/fonts/24-03.clx diff --git a/Packaging/resources/assets/fonts/24-04.clx b/assets/fonts/24-04.clx similarity index 100% rename from Packaging/resources/assets/fonts/24-04.clx rename to assets/fonts/24-04.clx diff --git a/Packaging/resources/assets/fonts/24-1f1.clx b/assets/fonts/24-1f1.clx similarity index 100% rename from Packaging/resources/assets/fonts/24-1f1.clx rename to assets/fonts/24-1f1.clx diff --git a/Packaging/resources/assets/fonts/24-1f3.clx b/assets/fonts/24-1f3.clx similarity index 100% rename from Packaging/resources/assets/fonts/24-1f3.clx rename to assets/fonts/24-1f3.clx diff --git a/Packaging/resources/assets/fonts/24-1f4.clx b/assets/fonts/24-1f4.clx similarity index 100% rename from Packaging/resources/assets/fonts/24-1f4.clx rename to assets/fonts/24-1f4.clx diff --git a/Packaging/resources/assets/fonts/24-1f5.clx b/assets/fonts/24-1f5.clx similarity index 100% rename from Packaging/resources/assets/fonts/24-1f5.clx rename to assets/fonts/24-1f5.clx diff --git a/Packaging/resources/assets/fonts/24-1f6.clx b/assets/fonts/24-1f6.clx similarity index 100% rename from Packaging/resources/assets/fonts/24-1f6.clx rename to assets/fonts/24-1f6.clx diff --git a/Packaging/resources/assets/fonts/24-1f9.clx b/assets/fonts/24-1f9.clx similarity index 100% rename from Packaging/resources/assets/fonts/24-1f9.clx rename to assets/fonts/24-1f9.clx diff --git a/Packaging/resources/assets/fonts/24-20.clx b/assets/fonts/24-20.clx similarity index 100% rename from Packaging/resources/assets/fonts/24-20.clx rename to assets/fonts/24-20.clx diff --git a/Packaging/resources/assets/fonts/24-26.clx b/assets/fonts/24-26.clx similarity index 100% rename from Packaging/resources/assets/fonts/24-26.clx rename to assets/fonts/24-26.clx diff --git a/Packaging/resources/assets/fonts/24-e0.clx b/assets/fonts/24-e0.clx similarity index 100% rename from Packaging/resources/assets/fonts/24-e0.clx rename to assets/fonts/24-e0.clx diff --git a/Packaging/resources/assets/fonts/30-00.clx b/assets/fonts/30-00.clx similarity index 100% rename from Packaging/resources/assets/fonts/30-00.clx rename to assets/fonts/30-00.clx diff --git a/Packaging/resources/assets/fonts/30-01.clx b/assets/fonts/30-01.clx similarity index 100% rename from Packaging/resources/assets/fonts/30-01.clx rename to assets/fonts/30-01.clx diff --git a/Packaging/resources/assets/fonts/30-02.clx b/assets/fonts/30-02.clx similarity index 100% rename from Packaging/resources/assets/fonts/30-02.clx rename to assets/fonts/30-02.clx diff --git a/Packaging/resources/assets/fonts/30-03.clx b/assets/fonts/30-03.clx similarity index 100% rename from Packaging/resources/assets/fonts/30-03.clx rename to assets/fonts/30-03.clx diff --git a/Packaging/resources/assets/fonts/30-04.clx b/assets/fonts/30-04.clx similarity index 100% rename from Packaging/resources/assets/fonts/30-04.clx rename to assets/fonts/30-04.clx diff --git a/Packaging/resources/assets/fonts/30-20.clx b/assets/fonts/30-20.clx similarity index 100% rename from Packaging/resources/assets/fonts/30-20.clx rename to assets/fonts/30-20.clx diff --git a/Packaging/resources/assets/fonts/42-00.clx b/assets/fonts/42-00.clx similarity index 100% rename from Packaging/resources/assets/fonts/42-00.clx rename to assets/fonts/42-00.clx diff --git a/Packaging/resources/assets/fonts/42-01.clx b/assets/fonts/42-01.clx similarity index 100% rename from Packaging/resources/assets/fonts/42-01.clx rename to assets/fonts/42-01.clx diff --git a/Packaging/resources/assets/fonts/42-02.clx b/assets/fonts/42-02.clx similarity index 100% rename from Packaging/resources/assets/fonts/42-02.clx rename to assets/fonts/42-02.clx diff --git a/Packaging/resources/assets/fonts/42-03.clx b/assets/fonts/42-03.clx similarity index 100% rename from Packaging/resources/assets/fonts/42-03.clx rename to assets/fonts/42-03.clx diff --git a/Packaging/resources/assets/fonts/42-04.clx b/assets/fonts/42-04.clx similarity index 100% rename from Packaging/resources/assets/fonts/42-04.clx rename to assets/fonts/42-04.clx diff --git a/Packaging/resources/assets/fonts/42-20.clx b/assets/fonts/42-20.clx similarity index 100% rename from Packaging/resources/assets/fonts/42-20.clx rename to assets/fonts/42-20.clx diff --git a/Packaging/resources/assets/fonts/46-00.clx b/assets/fonts/46-00.clx similarity index 100% rename from Packaging/resources/assets/fonts/46-00.clx rename to assets/fonts/46-00.clx diff --git a/Packaging/resources/assets/fonts/46-01.clx b/assets/fonts/46-01.clx similarity index 100% rename from Packaging/resources/assets/fonts/46-01.clx rename to assets/fonts/46-01.clx diff --git a/Packaging/resources/assets/fonts/46-02.clx b/assets/fonts/46-02.clx similarity index 100% rename from Packaging/resources/assets/fonts/46-02.clx rename to assets/fonts/46-02.clx diff --git a/Packaging/resources/assets/fonts/46-03.clx b/assets/fonts/46-03.clx similarity index 100% rename from Packaging/resources/assets/fonts/46-03.clx rename to assets/fonts/46-03.clx diff --git a/Packaging/resources/assets/fonts/46-04.clx b/assets/fonts/46-04.clx similarity index 100% rename from Packaging/resources/assets/fonts/46-04.clx rename to assets/fonts/46-04.clx diff --git a/Packaging/resources/assets/fonts/46-20.clx b/assets/fonts/46-20.clx similarity index 100% rename from Packaging/resources/assets/fonts/46-20.clx rename to assets/fonts/46-20.clx diff --git a/Packaging/resources/assets/fonts/black.trn b/assets/fonts/black.trn similarity index 100% rename from Packaging/resources/assets/fonts/black.trn rename to assets/fonts/black.trn diff --git a/Packaging/resources/assets/fonts/blue.trn b/assets/fonts/blue.trn similarity index 100% rename from Packaging/resources/assets/fonts/blue.trn rename to assets/fonts/blue.trn diff --git a/Packaging/resources/assets/fonts/buttonface.trn b/assets/fonts/buttonface.trn similarity index 100% rename from Packaging/resources/assets/fonts/buttonface.trn rename to assets/fonts/buttonface.trn diff --git a/Packaging/resources/assets/fonts/buttonpushed.trn b/assets/fonts/buttonpushed.trn similarity index 100% rename from Packaging/resources/assets/fonts/buttonpushed.trn rename to assets/fonts/buttonpushed.trn diff --git a/Packaging/resources/assets/fonts/gamedialogred.trn b/assets/fonts/gamedialogred.trn similarity index 100% rename from Packaging/resources/assets/fonts/gamedialogred.trn rename to assets/fonts/gamedialogred.trn diff --git a/Packaging/resources/assets/fonts/gamedialogwhite.trn b/assets/fonts/gamedialogwhite.trn similarity index 100% rename from Packaging/resources/assets/fonts/gamedialogwhite.trn rename to assets/fonts/gamedialogwhite.trn diff --git a/Packaging/resources/assets/fonts/gamedialogyellow.trn b/assets/fonts/gamedialogyellow.trn similarity index 100% rename from Packaging/resources/assets/fonts/gamedialogyellow.trn rename to assets/fonts/gamedialogyellow.trn diff --git a/Packaging/resources/assets/fonts/goldui.trn b/assets/fonts/goldui.trn similarity index 100% rename from Packaging/resources/assets/fonts/goldui.trn rename to assets/fonts/goldui.trn diff --git a/Packaging/resources/assets/fonts/golduis.trn b/assets/fonts/golduis.trn similarity index 100% rename from Packaging/resources/assets/fonts/golduis.trn rename to assets/fonts/golduis.trn diff --git a/Packaging/resources/assets/fonts/grayui.trn b/assets/fonts/grayui.trn similarity index 100% rename from Packaging/resources/assets/fonts/grayui.trn rename to assets/fonts/grayui.trn diff --git a/Packaging/resources/assets/fonts/grayuis.trn b/assets/fonts/grayuis.trn similarity index 100% rename from Packaging/resources/assets/fonts/grayuis.trn rename to assets/fonts/grayuis.trn diff --git a/Packaging/resources/assets/fonts/orange.trn b/assets/fonts/orange.trn similarity index 100% rename from Packaging/resources/assets/fonts/orange.trn rename to assets/fonts/orange.trn diff --git a/Packaging/resources/assets/fonts/red.trn b/assets/fonts/red.trn similarity index 100% rename from Packaging/resources/assets/fonts/red.trn rename to assets/fonts/red.trn diff --git a/Packaging/resources/assets/fonts/white.trn b/assets/fonts/white.trn similarity index 100% rename from Packaging/resources/assets/fonts/white.trn rename to assets/fonts/white.trn diff --git a/Packaging/resources/assets/fonts/whitegold.trn b/assets/fonts/whitegold.trn similarity index 100% rename from Packaging/resources/assets/fonts/whitegold.trn rename to assets/fonts/whitegold.trn diff --git a/Packaging/resources/assets/fonts/yellow.trn b/assets/fonts/yellow.trn similarity index 100% rename from Packaging/resources/assets/fonts/yellow.trn rename to assets/fonts/yellow.trn diff --git a/Packaging/resources/assets/gendata/cut2w.clx b/assets/gendata/cut2w.clx similarity index 100% rename from Packaging/resources/assets/gendata/cut2w.clx rename to assets/gendata/cut2w.clx diff --git a/Packaging/resources/assets/gendata/cut3w.clx b/assets/gendata/cut3w.clx similarity index 100% rename from Packaging/resources/assets/gendata/cut3w.clx rename to assets/gendata/cut3w.clx diff --git a/Packaging/resources/assets/gendata/cut4w.clx b/assets/gendata/cut4w.clx similarity index 100% rename from Packaging/resources/assets/gendata/cut4w.clx rename to assets/gendata/cut4w.clx diff --git a/Packaging/resources/assets/gendata/cutgatew.clx b/assets/gendata/cutgatew.clx similarity index 100% rename from Packaging/resources/assets/gendata/cutgatew.clx rename to assets/gendata/cutgatew.clx diff --git a/Packaging/resources/assets/gendata/cutl1dw.clx b/assets/gendata/cutl1dw.clx similarity index 100% rename from Packaging/resources/assets/gendata/cutl1dw.clx rename to assets/gendata/cutl1dw.clx diff --git a/Packaging/resources/assets/gendata/cutportlw.clx b/assets/gendata/cutportlw.clx similarity index 100% rename from Packaging/resources/assets/gendata/cutportlw.clx rename to assets/gendata/cutportlw.clx diff --git a/Packaging/resources/assets/gendata/cutportrw.clx b/assets/gendata/cutportrw.clx similarity index 100% rename from Packaging/resources/assets/gendata/cutportrw.clx rename to assets/gendata/cutportrw.clx diff --git a/Packaging/resources/assets/gendata/cutstartw.clx b/assets/gendata/cutstartw.clx similarity index 100% rename from Packaging/resources/assets/gendata/cutstartw.clx rename to assets/gendata/cutstartw.clx diff --git a/Packaging/resources/assets/gendata/cutttw.clx b/assets/gendata/cutttw.clx similarity index 100% rename from Packaging/resources/assets/gendata/cutttw.clx rename to assets/gendata/cutttw.clx diff --git a/Packaging/resources/assets/gendata/pause.trn b/assets/gendata/pause.trn similarity index 100% rename from Packaging/resources/assets/gendata/pause.trn rename to assets/gendata/pause.trn diff --git a/Packaging/resources/assets/levels/l1data/sklkngt.dun b/assets/levels/l1data/sklkngt.dun similarity index 100% rename from Packaging/resources/assets/levels/l1data/sklkngt.dun rename to assets/levels/l1data/sklkngt.dun diff --git a/Packaging/resources/assets/levels/l2data/bonechat.dun b/assets/levels/l2data/bonechat.dun similarity index 100% rename from Packaging/resources/assets/levels/l2data/bonechat.dun rename to assets/levels/l2data/bonechat.dun diff --git a/Packaging/resources/assets/levels/towndata/automap.amp b/assets/levels/towndata/automap.amp similarity index 100% rename from Packaging/resources/assets/levels/towndata/automap.amp rename to assets/levels/towndata/automap.amp diff --git a/Packaging/resources/assets/levels/towndata/automap.dun b/assets/levels/towndata/automap.dun similarity index 100% rename from Packaging/resources/assets/levels/towndata/automap.dun rename to assets/levels/towndata/automap.dun diff --git a/Packaging/resources/assets/lua/devilutionx/events.lua b/assets/lua/devilutionx/events.lua similarity index 100% rename from Packaging/resources/assets/lua/devilutionx/events.lua rename to assets/lua/devilutionx/events.lua diff --git a/Packaging/resources/assets/lua/inspect.lua b/assets/lua/inspect.lua similarity index 100% rename from Packaging/resources/assets/lua/inspect.lua rename to assets/lua/inspect.lua diff --git a/Packaging/resources/assets/lua/repl_prelude.lua b/assets/lua/repl_prelude.lua similarity index 100% rename from Packaging/resources/assets/lua/repl_prelude.lua rename to assets/lua/repl_prelude.lua diff --git a/Packaging/resources/assets/lua_internal/get_lua_function_signature.lua b/assets/lua_internal/get_lua_function_signature.lua similarity index 100% rename from Packaging/resources/assets/lua_internal/get_lua_function_signature.lua rename to assets/lua_internal/get_lua_function_signature.lua diff --git a/Packaging/resources/assets/nlevels/cutl5w.clx b/assets/nlevels/cutl5w.clx similarity index 100% rename from Packaging/resources/assets/nlevels/cutl5w.clx rename to assets/nlevels/cutl5w.clx diff --git a/Packaging/resources/assets/nlevels/cutl6w.clx b/assets/nlevels/cutl6w.clx similarity index 100% rename from Packaging/resources/assets/nlevels/cutl6w.clx rename to assets/nlevels/cutl6w.clx diff --git a/Packaging/resources/assets/nlevels/l5data/cornerstone.dun b/assets/nlevels/l5data/cornerstone.dun similarity index 100% rename from Packaging/resources/assets/nlevels/l5data/cornerstone.dun rename to assets/nlevels/l5data/cornerstone.dun diff --git a/Packaging/resources/assets/nlevels/l5data/uberroom.dun b/assets/nlevels/l5data/uberroom.dun similarity index 100% rename from Packaging/resources/assets/nlevels/l5data/uberroom.dun rename to assets/nlevels/l5data/uberroom.dun diff --git a/Packaging/resources/assets/txtdata/Experience.tsv b/assets/txtdata/Experience.tsv similarity index 100% rename from Packaging/resources/assets/txtdata/Experience.tsv rename to assets/txtdata/Experience.tsv diff --git a/Packaging/resources/assets/txtdata/Readme.md b/assets/txtdata/Readme.md similarity index 100% rename from Packaging/resources/assets/txtdata/Readme.md rename to assets/txtdata/Readme.md diff --git a/Packaging/resources/assets/txtdata/classes/README.md b/assets/txtdata/classes/README.md similarity index 100% rename from Packaging/resources/assets/txtdata/classes/README.md rename to assets/txtdata/classes/README.md diff --git a/Packaging/resources/assets/txtdata/classes/barbarian/attributes.tsv b/assets/txtdata/classes/barbarian/attributes.tsv similarity index 100% rename from Packaging/resources/assets/txtdata/classes/barbarian/attributes.tsv rename to assets/txtdata/classes/barbarian/attributes.tsv diff --git a/Packaging/resources/assets/txtdata/classes/bard/attributes.tsv b/assets/txtdata/classes/bard/attributes.tsv similarity index 100% rename from Packaging/resources/assets/txtdata/classes/bard/attributes.tsv rename to assets/txtdata/classes/bard/attributes.tsv diff --git a/Packaging/resources/assets/txtdata/classes/monk/attributes.tsv b/assets/txtdata/classes/monk/attributes.tsv similarity index 100% rename from Packaging/resources/assets/txtdata/classes/monk/attributes.tsv rename to assets/txtdata/classes/monk/attributes.tsv diff --git a/Packaging/resources/assets/txtdata/classes/rogue/attributes.tsv b/assets/txtdata/classes/rogue/attributes.tsv similarity index 100% rename from Packaging/resources/assets/txtdata/classes/rogue/attributes.tsv rename to assets/txtdata/classes/rogue/attributes.tsv diff --git a/Packaging/resources/assets/txtdata/classes/sorcerer/attributes.tsv b/assets/txtdata/classes/sorcerer/attributes.tsv similarity index 100% rename from Packaging/resources/assets/txtdata/classes/sorcerer/attributes.tsv rename to assets/txtdata/classes/sorcerer/attributes.tsv diff --git a/Packaging/resources/assets/txtdata/classes/warrior/attributes.tsv b/assets/txtdata/classes/warrior/attributes.tsv similarity index 100% rename from Packaging/resources/assets/txtdata/classes/warrior/attributes.tsv rename to assets/txtdata/classes/warrior/attributes.tsv diff --git a/Packaging/resources/assets/txtdata/items/item_prefixes.tsv b/assets/txtdata/items/item_prefixes.tsv similarity index 100% rename from Packaging/resources/assets/txtdata/items/item_prefixes.tsv rename to assets/txtdata/items/item_prefixes.tsv diff --git a/Packaging/resources/assets/txtdata/items/item_suffixes.tsv b/assets/txtdata/items/item_suffixes.tsv similarity index 100% rename from Packaging/resources/assets/txtdata/items/item_suffixes.tsv rename to assets/txtdata/items/item_suffixes.tsv diff --git a/Packaging/resources/assets/txtdata/items/itemdat.tsv b/assets/txtdata/items/itemdat.tsv similarity index 100% rename from Packaging/resources/assets/txtdata/items/itemdat.tsv rename to assets/txtdata/items/itemdat.tsv diff --git a/Packaging/resources/assets/txtdata/items/unique_itemdat.tsv b/assets/txtdata/items/unique_itemdat.tsv similarity index 100% rename from Packaging/resources/assets/txtdata/items/unique_itemdat.tsv rename to assets/txtdata/items/unique_itemdat.tsv diff --git a/Packaging/resources/assets/txtdata/monsters/monstdat.tsv b/assets/txtdata/monsters/monstdat.tsv similarity index 100% rename from Packaging/resources/assets/txtdata/monsters/monstdat.tsv rename to assets/txtdata/monsters/monstdat.tsv diff --git a/Packaging/resources/assets/txtdata/monsters/unique_monstdat.tsv b/assets/txtdata/monsters/unique_monstdat.tsv similarity index 100% rename from Packaging/resources/assets/txtdata/monsters/unique_monstdat.tsv rename to assets/txtdata/monsters/unique_monstdat.tsv diff --git a/Packaging/resources/assets/txtdata/sound/effects.tsv b/assets/txtdata/sound/effects.tsv similarity index 100% rename from Packaging/resources/assets/txtdata/sound/effects.tsv rename to assets/txtdata/sound/effects.tsv diff --git a/Packaging/resources/assets/ui_art/button.png b/assets/ui_art/button.png similarity index 100% rename from Packaging/resources/assets/ui_art/button.png rename to assets/ui_art/button.png diff --git a/Packaging/resources/assets/ui_art/creditsw.clx b/assets/ui_art/creditsw.clx similarity index 100% rename from Packaging/resources/assets/ui_art/creditsw.clx rename to assets/ui_art/creditsw.clx diff --git a/Packaging/resources/assets/ui_art/diablo.pal b/assets/ui_art/diablo.pal similarity index 100% rename from Packaging/resources/assets/ui_art/diablo.pal rename to assets/ui_art/diablo.pal diff --git a/Packaging/resources/assets/ui_art/directions.png b/assets/ui_art/directions.png similarity index 100% rename from Packaging/resources/assets/ui_art/directions.png rename to assets/ui_art/directions.png diff --git a/Packaging/resources/assets/ui_art/directions2.png b/assets/ui_art/directions2.png similarity index 100% rename from Packaging/resources/assets/ui_art/directions2.png rename to assets/ui_art/directions2.png diff --git a/Packaging/resources/assets/ui_art/dvl_but_sml.clx b/assets/ui_art/dvl_but_sml.clx similarity index 100% rename from Packaging/resources/assets/ui_art/dvl_but_sml.clx rename to assets/ui_art/dvl_but_sml.clx diff --git a/Packaging/resources/assets/ui_art/dvl_lrpopup.clx b/assets/ui_art/dvl_lrpopup.clx similarity index 100% rename from Packaging/resources/assets/ui_art/dvl_lrpopup.clx rename to assets/ui_art/dvl_lrpopup.clx diff --git a/Packaging/resources/assets/ui_art/hellfire.pal b/assets/ui_art/hellfire.pal similarity index 100% rename from Packaging/resources/assets/ui_art/hellfire.pal rename to assets/ui_art/hellfire.pal diff --git a/Packaging/resources/assets/ui_art/hf_titlew.clx b/assets/ui_art/hf_titlew.clx similarity index 100% rename from Packaging/resources/assets/ui_art/hf_titlew.clx rename to assets/ui_art/hf_titlew.clx diff --git a/Packaging/resources/assets/ui_art/mainmenuw.clx b/assets/ui_art/mainmenuw.clx similarity index 100% rename from Packaging/resources/assets/ui_art/mainmenuw.clx rename to assets/ui_art/mainmenuw.clx diff --git a/Packaging/resources/assets/ui_art/menu-levelup.png b/assets/ui_art/menu-levelup.png similarity index 100% rename from Packaging/resources/assets/ui_art/menu-levelup.png rename to assets/ui_art/menu-levelup.png diff --git a/Packaging/resources/assets/ui_art/menu.png b/assets/ui_art/menu.png similarity index 100% rename from Packaging/resources/assets/ui_art/menu.png rename to assets/ui_art/menu.png diff --git a/Packaging/resources/assets/ui_art/supportw.clx b/assets/ui_art/supportw.clx similarity index 100% rename from Packaging/resources/assets/ui_art/supportw.clx rename to assets/ui_art/supportw.clx diff --git a/tools/extract_translation_data.py b/tools/extract_translation_data.py index 283bf77c9..f22c3575f 100755 --- a/tools/extract_translation_data.py +++ b/tools/extract_translation_data.py @@ -4,12 +4,12 @@ import pathlib root = pathlib.Path(__file__).resolve().parent.parent translation_dummy_path = root.joinpath("Source/translation_dummy.cpp") -monstdat_path = root.joinpath("Packaging/resources/assets/txtdata/monsters/monstdat.tsv") -unique_monstdat_path = root.joinpath("Packaging/resources/assets/txtdata/monsters/unique_monstdat.tsv") -itemdat_path = root.joinpath("Packaging/resources/assets/txtdata/items/itemdat.tsv") -unique_itemdat_path = root.joinpath("Packaging/resources/assets/txtdata/items/unique_itemdat.tsv") -item_prefixes_path = root.joinpath("Packaging/resources/assets/txtdata/items/item_prefixes.tsv") -item_suffixes_path = root.joinpath("Packaging/resources/assets/txtdata/items/item_suffixes.tsv") +monstdat_path = root.joinpath("assets/txtdata/monsters/monstdat.tsv") +unique_monstdat_path = root.joinpath("assets/txtdata/monsters/unique_monstdat.tsv") +itemdat_path = root.joinpath("assets/txtdata/items/itemdat.tsv") +unique_itemdat_path = root.joinpath("assets/txtdata/items/unique_itemdat.tsv") +item_prefixes_path = root.joinpath("assets/txtdata/items/item_prefixes.tsv") +item_suffixes_path = root.joinpath("assets/txtdata/items/item_suffixes.tsv") with open(translation_dummy_path, 'w') as temp_source: temp_source.write(f'/**\n') diff --git a/tools/update_bundled_assets.sh b/tools/update_bundled_assets.sh index 1c8d766dc..86ba48ecd 100755 --- a/tools/update_bundled_assets.sh +++ b/tools/update_bundled_assets.sh @@ -7,7 +7,7 @@ if [[ $# -eq 0 ]]; then fi ASSETS_REPO_DIR="$1" -OUTPUT_DIR="${PWD}/Packaging/resources/assets" +OUTPUT_DIR="${PWD}/assets" set -x cd "${ASSETS_REPO_DIR}/bundled-assets"