Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/impacto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ jobs:
mkdir -p "release/ci-release"
cp impacto.nro "release/ci-release"
cp -r profiles "release/ci-release"
cp -r games "release/ci-release"
cp -r resources "release/ci-release"
- name: Copy Shaders
run: cp -r src/shaders "release/ci-release"
shell: bash
Expand Down
7 changes: 4 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -284,9 +284,10 @@ compile_commands.json
CMakeUserPresets.json
vendor/avcpp

games/*/gamedata
games/*/savedata
games/*/trophydata
resources/*/gamedata
resources/*/savedata
resources/*/trophydata

gamedata
saves
patches
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1557,7 +1557,7 @@ elseif(APPLE)
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/src/shaders"
DESTINATION "Impacto.app/Contents/Resources/"
)
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/games"
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/resources"
DESTINATION "Impacto.app/Contents/Resources/"
)
install(TARGETS atrac9
Expand Down Expand Up @@ -1588,7 +1588,7 @@ endif ()
if (NOT ANDROID)
if(NOT APPLE)
install(DIRECTORY src/shaders DESTINATION .)
install(DIRECTORY games DESTINATION .)
install(DIRECTORY resources DESTINATION .)
endif()
install(DIRECTORY profiles DESTINATION .)
install(FILES basepaths.lua DESTINATION .)
Expand All @@ -1597,7 +1597,7 @@ if (NOT ANDROID)
else()
install(DIRECTORY src/shaders DESTINATION ${CMAKE_SOURCE_DIR}/android/app/src/main/assets)
install(DIRECTORY profiles DESTINATION ${CMAKE_SOURCE_DIR}/android/app/src/main/assets)
install(DIRECTORY games DESTINATION ${CMAKE_SOURCE_DIR}/android/app/src/main/assets PATTERN "*/gamedata/*" EXCLUDE)
install(DIRECTORY resources DESTINATION ${CMAKE_SOURCE_DIR}/android/app/src/main/assets PATTERN "*/gamedata/*" EXCLUDE)
endif()


63 changes: 0 additions & 63 deletions games/cclcc/gamedata/movie.cls

This file was deleted.

101 changes: 0 additions & 101 deletions games/cclcc/gamedata/script.cls

This file was deleted.

6 changes: 3 additions & 3 deletions profiles/cc/font.lua
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ root.Fonts = {
OutlineSheet = "FontLBOutline",
ForegroundGridSize = { X = 64, Y = 125 },
AdvanceWidthsBinary = {
Path = "games/cc/font-lb/widths.bin",
Path = "resources/cc/font-lb/widths.bin",
BytesPerGlyph = 1,
EmWidth = 48,
},
Expand All @@ -22,13 +22,13 @@ root.Fonts = {
};

root.SpriteSheets["FontLBForeground"] = {
Path = "games/cc/font-lb/foreground.png",
Path = "resources/cc/font-lb/foreground.png",
DesignWidth = 3072,
DesignHeight = 6000
};

root.SpriteSheets["FontLBOutline"] = {
Path = "games/cc/font-lb/outline.png",
Path = "resources/cc/font-lb/outline.png",
DesignWidth = 3648,
DesignHeight = 7128
};
Expand Down
6 changes: 3 additions & 3 deletions profiles/cc/game.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ root.DesignWidth = 1920;
root.DesignHeight = 1080;

root.WindowName = "CHAOS;CHILD";
root.WindowIconPath = "games/cc/icondata/icon.png";
root.CursorArrowPath = "games/cc/icondata/cursor_arrow.png";
root.CursorPointerPath = "games/cc/icondata/cursor_pointer.png";
root.WindowIconPath = "resources/cc/icondata/icon.png";
root.CursorArrowPath = "resources/cc/icondata/cursor_arrow.png";
root.CursorPointerPath = "resources/cc/icondata/cursor_pointer.png";
root.UseMoviePriority = true;
root.UseWaveEffects = true;

Expand Down
6 changes: 3 additions & 3 deletions profiles/cclcc/font.lua
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ root.Fonts = {
OutlineSheet = "FontLBOutline",
ForegroundGridSize = { X = 64, Y = 125 },
AdvanceWidthsBinary = {
Path = "games/cclcc/font-lb-italic/widths.bin",
Path = "resources/cclcc/font-lb-italic/widths.bin",
BytesPerGlyph = 1,
EmWidth = 48,
},
Expand All @@ -41,13 +41,13 @@ root.Fonts = {
};

root.SpriteSheets["FontLBForeground"] = {
Path = "games/cclcc/font-lb-italic/foreground.png",
Path = "resources/cclcc/font-lb-italic/foreground.png",
DesignWidth = 4096,
DesignHeight = 8000
};

root.SpriteSheets["FontLBOutline"] = {
Path = "games/cclcc/font-lb-italic/outline.png",
Path = "resources/cclcc/font-lb-italic/outline.png",
DesignWidth = 4096,
DesignHeight = 8000
};
6 changes: 3 additions & 3 deletions profiles/cclcc/game.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ root.DesignWidth = 1920;
root.DesignHeight = 1080;

root.WindowName = "CHAOS;CHILD Love Chu☆Chu!!";
root.WindowIconPath = "games/cclcc/icondata/icon.png";
root.CursorArrowPath = "games/cclcc/icondata/cursor_arrow.png";
root.CursorPointerPath = "games/cclcc/icondata/cursor_pointer.png";
root.WindowIconPath = "resources/cclcc/icondata/icon.png";
root.CursorArrowPath = "resources/cclcc/icondata/cursor_arrow.png";
root.CursorPointerPath = "resources/cclcc/icondata/cursor_pointer.png";

root.CharaIsMvl = true;
root.UseMoviePriority = true;
Expand Down
2 changes: 1 addition & 1 deletion profiles/chlcc/achievementsystem.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
root.AchievementData = {
Type = AchievementDataType.PS3,
AchievementDataPath = "games/chlcc/trophydata/TROPHY.TRP"
AchievementDataPath = "resources/chlcc/trophydata/TROPHY.TRP"
}
6 changes: 3 additions & 3 deletions profiles/chlcc/font.lua
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ root.Fonts = {
OutlineSheet = "FontLBOutline",
ForegroundGridSize = { X = 64, Y = 39 },
AdvanceWidthsBinary = {
Path = "games/chlcc/font-lb/widths.bin",
Path = "resources/chlcc/font-lb/widths.bin",
BytesPerGlyph = 1,
EmWidth = 60,
},
Expand All @@ -26,13 +26,13 @@ root.Fonts = {
};

root.SpriteSheets["FontLBForeground"] = {
Path = "games/chlcc/font-lb/foreground.png",
Path = "resources/chlcc/font-lb/foreground.png",
DesignWidth = 4096,
DesignHeight = 2496
};

root.SpriteSheets["FontLBOutline"] = {
Path = "games/chlcc/font-lb/outline.png",
Path = "resources/chlcc/font-lb/outline.png",
DesignWidth = 4096,
DesignHeight = 2496
};
Expand Down
6 changes: 3 additions & 3 deletions profiles/chlcc/game.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ root.DesignWidth = 1280;
root.DesignHeight = 720;

root.WindowName = "CHAOS;HEAD Love Chu☆Chu!";
root.WindowIconPath = "games/chlcc/icondata/icon.png";
root.CursorArrowPath = "games/chlcc/icondata/cursor_arrow.png";
root.CursorPointerPath = "games/chlcc/icondata/cursor_pointer.png";
root.WindowIconPath = "resources/chlcc/icondata/icon.png";
root.CursorArrowPath = "resources/chlcc/icondata/cursor_arrow.png";
root.CursorPointerPath = "resources/chlcc/icondata/cursor_pointer.png";

root.CharaIsMvl = false;
root.UseMoviePriority = true;
Expand Down
2 changes: 1 addition & 1 deletion profiles/chlcc/savedata.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
root.SaveData = {
Type = SaveDataType.CHLCC,
SaveFilePath = root.BasePaths.RootSavesDir .. "/chlcc/jpn/SYSTEM.DAT",
ThumbnailFilePath = "games/chlcc/savedata/THUMNAIL.DAT",
ThumbnailFilePath = "resources/chlcc/savedata/THUMNAIL.DAT",

ScriptMessageData = { -- Pairs of line count and offset into read flag array
{0x008f, 0x0000}, {0x00a5, 0x008f}, {0x01fe, 0x0134}, {0x0000, 0x0332}, {0x00d2, 0x0332}, {0x01b4, 0x0404},
Expand Down
6 changes: 3 additions & 3 deletions profiles/chn/font.lua
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ root.Fonts = {
OutlineSheet = "FontLBOutline",
ForegroundGridSize = { X = 64, Y = 50 },
AdvanceWidthsBinary = {
Path = "games/rne/font-lb/widths.bin",
Path = "resources/rne/font-lb/widths.bin",
BytesPerGlyph = 1,
EmWidth = 48,
},
Expand All @@ -22,13 +22,13 @@ root.Fonts = {
};

root.SpriteSheets["FontLBForeground"] = {
Path = "games/rne/font-lb/foreground.png",
Path = "resources/rne/font-lb/foreground.png",
DesignWidth = 3072,
DesignHeight = 2400
};

root.SpriteSheets["FontLBOutline"] = {
Path = "games/rne/font-lb/outline.png",
Path = "resources/rne/font-lb/outline.png",
DesignWidth = 3648,
DesignHeight = 2852
};
Expand Down
6 changes: 3 additions & 3 deletions profiles/chn/game.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ root.DesignWidth = 1920;
root.DesignHeight = 1080;

root.WindowName = "CHAOS;HEAD NOAH";
root.WindowIconPath = "games/chn/icondata/icon.png";
root.CursorArrowPath = "games/chn/icondata/cursor_arrow.png";
root.CursorPointerPath = "games/chn/icondata/cursor_pointer.png";
root.WindowIconPath = "resources/chn/icondata/icon.png";
root.CursorArrowPath = "resources/chn/icondata/cursor_arrow.png";
root.CursorPointerPath = "resources/chn/icondata/cursor_pointer.png";

root.CharaIsMvl = true;

Expand Down
6 changes: 3 additions & 3 deletions profiles/darling/game.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ root.DesignWidth = 1280;
root.DesignHeight = 720;

root.WindowName = "STEINS;GATE: My Darling's Embrace";
root.WindowIconPath = "games/darling/icondata/icon.png";
root.CursorArrowPath = "games/darling/icondata/cursor_arrow.png";
root.CursorPointerPath = "games/darling/icondata/cursor_pointer.png";
root.WindowIconPath = "resources/darling/icondata/icon.png";
root.CursorArrowPath = "resources/darling/icondata/cursor_arrow.png";
root.CursorPointerPath = "resources/darling/icondata/cursor_pointer.png";

root.CharaIsMvl = false;
root.LayFileBigEndian = true;
Expand Down
Loading
Loading