diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b2f2429..5dc84ce1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,8 +28,9 @@ project(${TARGET_NAME} VERSION 1.0) add_executable(${PROJECT_NAME}) # Variables -SET(ROOT_DIR "${CMAKE_SOURCE_DIR}") +set(ROOT_DIR "${CMAKE_SOURCE_DIR}") set(TOOLS_DIR "${ROOT_DIR}/tools") +set(ASSETS_DIR "assets") # Include tools add_subdirectory(tools) @@ -48,13 +49,31 @@ elseif(TARGET_TYPE STREQUAL game) GAME_DISPOSE=pokerGameDispose GAME_VERSION=1.0 ) + + set(DIR_CHARS poker/characters) + tool_vn_character(penny + ${DIR_CHARS}/penny/character.xml ${DIR_CHARS}/penny.png + ) + tool_vn_character(lucy + ${DIR_CHARS}/lucy/character.xml ${DIR_CHARS}/lucy.png + ) + tool_vn_character(jenny + ${DIR_CHARS}/jenny/character.xml ${DIR_CHARS}/jenny.png + ) + tool_vn_character(sammy + ${DIR_CHARS}/sammy/character.xml ${DIR_CHARS}/sammy.png + ) - set(DIR_CHARS assets/poker/characters/penny) - - tool_vn_character(penny ${DIR_CHARS}/character.xml ${DIR_CHARS}/bruh.png) - - add_dependencies(${PROJECT_NAME} penny) + tool_assets( + penny + lucy + jenny + sammy + ) endif() + + # Common Game Dependencies. + add_dependencies(${PROJECT_NAME} assets) add_subdirectory(client) endif() diff --git a/assets/poker/CMakeLists.txt b/assets/poker/CMakeLists.txt deleted file mode 100644 index 46fefe35..00000000 --- a/assets/poker/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*/character.xml) \ No newline at end of file diff --git a/assets/poker/characters/jenny/character.xml b/assets/poker/characters/jenny/character.xml new file mode 100644 index 00000000..71e24032 --- /dev/null +++ b/assets/poker/characters/jenny/character.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/assets/poker/characters/jenny/sprites/base.png b/assets/poker/characters/jenny/sprites/base.png new file mode 100644 index 00000000..11582655 Binary files /dev/null and b/assets/poker/characters/jenny/sprites/base.png differ diff --git a/assets/poker/characters/jenny/sprites/eyebrows/eyebrows_0.png b/assets/poker/characters/jenny/sprites/eyebrows/eyebrows_0.png new file mode 100644 index 00000000..130afd26 Binary files /dev/null and b/assets/poker/characters/jenny/sprites/eyebrows/eyebrows_0.png differ diff --git a/assets/poker/characters/jenny/sprites/eyebrows/eyebrows_1.png b/assets/poker/characters/jenny/sprites/eyebrows/eyebrows_1.png new file mode 100644 index 00000000..5d6b48c4 Binary files /dev/null and b/assets/poker/characters/jenny/sprites/eyebrows/eyebrows_1.png differ diff --git a/assets/poker/characters/jenny/sprites/eyebrows/eyebrows_2.png b/assets/poker/characters/jenny/sprites/eyebrows/eyebrows_2.png new file mode 100644 index 00000000..a3559ced Binary files /dev/null and b/assets/poker/characters/jenny/sprites/eyebrows/eyebrows_2.png differ diff --git a/assets/poker/characters/jenny/sprites/eyebrows/eyebrows_3.png b/assets/poker/characters/jenny/sprites/eyebrows/eyebrows_3.png new file mode 100644 index 00000000..bd13ddac Binary files /dev/null and b/assets/poker/characters/jenny/sprites/eyebrows/eyebrows_3.png differ diff --git a/assets/poker/characters/jenny/sprites/eyes/eyes_0.png b/assets/poker/characters/jenny/sprites/eyes/eyes_0.png new file mode 100644 index 00000000..ee222b57 Binary files /dev/null and b/assets/poker/characters/jenny/sprites/eyes/eyes_0.png differ diff --git a/assets/poker/characters/jenny/sprites/eyes/eyes_1.png b/assets/poker/characters/jenny/sprites/eyes/eyes_1.png new file mode 100644 index 00000000..ee48136c Binary files /dev/null and b/assets/poker/characters/jenny/sprites/eyes/eyes_1.png differ diff --git a/assets/poker/characters/jenny/sprites/eyes/eyes_2.png b/assets/poker/characters/jenny/sprites/eyes/eyes_2.png new file mode 100644 index 00000000..47cd673c Binary files /dev/null and b/assets/poker/characters/jenny/sprites/eyes/eyes_2.png differ diff --git a/assets/poker/characters/jenny/sprites/eyes/eyes_3.png b/assets/poker/characters/jenny/sprites/eyes/eyes_3.png new file mode 100644 index 00000000..b0409c86 Binary files /dev/null and b/assets/poker/characters/jenny/sprites/eyes/eyes_3.png differ diff --git a/assets/poker/characters/jenny/sprites/mouth/mouth_0_0.png b/assets/poker/characters/jenny/sprites/mouth/mouth_0_0.png new file mode 100644 index 00000000..10e4fd59 Binary files /dev/null and b/assets/poker/characters/jenny/sprites/mouth/mouth_0_0.png differ diff --git a/assets/poker/characters/jenny/sprites/mouth/mouth_0_1.png b/assets/poker/characters/jenny/sprites/mouth/mouth_0_1.png new file mode 100644 index 00000000..53485b46 Binary files /dev/null and b/assets/poker/characters/jenny/sprites/mouth/mouth_0_1.png differ diff --git a/assets/poker/characters/jenny/sprites/mouth/mouth_0_2.png b/assets/poker/characters/jenny/sprites/mouth/mouth_0_2.png new file mode 100644 index 00000000..732bed69 Binary files /dev/null and b/assets/poker/characters/jenny/sprites/mouth/mouth_0_2.png differ diff --git a/assets/poker/characters/jenny/sprites/mouth/mouth_1_0.png b/assets/poker/characters/jenny/sprites/mouth/mouth_1_0.png new file mode 100644 index 00000000..31ab8ce2 Binary files /dev/null and b/assets/poker/characters/jenny/sprites/mouth/mouth_1_0.png differ diff --git a/assets/poker/characters/jenny/sprites/mouth/mouth_1_1.png b/assets/poker/characters/jenny/sprites/mouth/mouth_1_1.png new file mode 100644 index 00000000..c2bef6af Binary files /dev/null and b/assets/poker/characters/jenny/sprites/mouth/mouth_1_1.png differ diff --git a/assets/poker/characters/jenny/sprites/mouth/mouth_1_2.png b/assets/poker/characters/jenny/sprites/mouth/mouth_1_2.png new file mode 100644 index 00000000..b3f70d30 Binary files /dev/null and b/assets/poker/characters/jenny/sprites/mouth/mouth_1_2.png differ diff --git a/assets/poker/characters/jenny/sprites/mouth/mouth_2_0.png b/assets/poker/characters/jenny/sprites/mouth/mouth_2_0.png new file mode 100644 index 00000000..4cf339f3 Binary files /dev/null and b/assets/poker/characters/jenny/sprites/mouth/mouth_2_0.png differ diff --git a/assets/poker/characters/jenny/sprites/mouth/mouth_2_1.png b/assets/poker/characters/jenny/sprites/mouth/mouth_2_1.png new file mode 100644 index 00000000..88fc5e58 Binary files /dev/null and b/assets/poker/characters/jenny/sprites/mouth/mouth_2_1.png differ diff --git a/assets/poker/characters/jenny/sprites/mouth/mouth_2_2.png b/assets/poker/characters/jenny/sprites/mouth/mouth_2_2.png new file mode 100644 index 00000000..81464e2c Binary files /dev/null and b/assets/poker/characters/jenny/sprites/mouth/mouth_2_2.png differ diff --git a/assets/poker/characters/jenny/sprites/mouth/mouth_3_0.png b/assets/poker/characters/jenny/sprites/mouth/mouth_3_0.png new file mode 100644 index 00000000..ac904c29 Binary files /dev/null and b/assets/poker/characters/jenny/sprites/mouth/mouth_3_0.png differ diff --git a/assets/poker/characters/jenny/sprites/mouth/mouth_3_1.png b/assets/poker/characters/jenny/sprites/mouth/mouth_3_1.png new file mode 100644 index 00000000..748ac3bb Binary files /dev/null and b/assets/poker/characters/jenny/sprites/mouth/mouth_3_1.png differ diff --git a/assets/poker/characters/jenny/sprites/mouth/mouth_3_2.png b/assets/poker/characters/jenny/sprites/mouth/mouth_3_2.png new file mode 100644 index 00000000..ab0aea3a Binary files /dev/null and b/assets/poker/characters/jenny/sprites/mouth/mouth_3_2.png differ diff --git a/assets/poker/characters/jenny/sprites/sunglasses/sunglasses_0.png b/assets/poker/characters/jenny/sprites/sunglasses/sunglasses_0.png new file mode 100644 index 00000000..7ce0d26c Binary files /dev/null and b/assets/poker/characters/jenny/sprites/sunglasses/sunglasses_0.png differ diff --git a/assets/poker/characters/jenny/sprites/sunglasses/sunglasses_1.png b/assets/poker/characters/jenny/sprites/sunglasses/sunglasses_1.png new file mode 100644 index 00000000..a2fc84fc Binary files /dev/null and b/assets/poker/characters/jenny/sprites/sunglasses/sunglasses_1.png differ diff --git a/assets/poker/characters/lucy/character.xml b/assets/poker/characters/lucy/character.xml new file mode 100644 index 00000000..dd27af37 --- /dev/null +++ b/assets/poker/characters/lucy/character.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/assets/poker/characters/lucy/sprites/base.png b/assets/poker/characters/lucy/sprites/base.png new file mode 100644 index 00000000..329c536e Binary files /dev/null and b/assets/poker/characters/lucy/sprites/base.png differ diff --git a/assets/poker/characters/lucy/sprites/eyebrows/eyebrows_0.png b/assets/poker/characters/lucy/sprites/eyebrows/eyebrows_0.png new file mode 100644 index 00000000..c63ae489 Binary files /dev/null and b/assets/poker/characters/lucy/sprites/eyebrows/eyebrows_0.png differ diff --git a/assets/poker/characters/lucy/sprites/eyebrows/eyebrows_1.png b/assets/poker/characters/lucy/sprites/eyebrows/eyebrows_1.png new file mode 100644 index 00000000..af487d30 Binary files /dev/null and b/assets/poker/characters/lucy/sprites/eyebrows/eyebrows_1.png differ diff --git a/assets/poker/characters/lucy/sprites/eyebrows/eyebrows_2.png b/assets/poker/characters/lucy/sprites/eyebrows/eyebrows_2.png new file mode 100644 index 00000000..8bec3762 Binary files /dev/null and b/assets/poker/characters/lucy/sprites/eyebrows/eyebrows_2.png differ diff --git a/assets/poker/characters/lucy/sprites/eyebrows/eyebrows_3.png b/assets/poker/characters/lucy/sprites/eyebrows/eyebrows_3.png new file mode 100644 index 00000000..ca5ebb41 Binary files /dev/null and b/assets/poker/characters/lucy/sprites/eyebrows/eyebrows_3.png differ diff --git a/assets/poker/characters/lucy/sprites/eyebrows/eyebrows_4.png b/assets/poker/characters/lucy/sprites/eyebrows/eyebrows_4.png new file mode 100644 index 00000000..f440907d Binary files /dev/null and b/assets/poker/characters/lucy/sprites/eyebrows/eyebrows_4.png differ diff --git a/assets/poker/characters/lucy/sprites/eyes/eyes_0.png b/assets/poker/characters/lucy/sprites/eyes/eyes_0.png new file mode 100644 index 00000000..792c4a30 Binary files /dev/null and b/assets/poker/characters/lucy/sprites/eyes/eyes_0.png differ diff --git a/assets/poker/characters/lucy/sprites/eyes/eyes_1.png b/assets/poker/characters/lucy/sprites/eyes/eyes_1.png new file mode 100644 index 00000000..9c6ee233 Binary files /dev/null and b/assets/poker/characters/lucy/sprites/eyes/eyes_1.png differ diff --git a/assets/poker/characters/lucy/sprites/eyes/eyes_2.png b/assets/poker/characters/lucy/sprites/eyes/eyes_2.png new file mode 100644 index 00000000..19d2dbbd Binary files /dev/null and b/assets/poker/characters/lucy/sprites/eyes/eyes_2.png differ diff --git a/assets/poker/characters/lucy/sprites/eyes/eyes_3.png b/assets/poker/characters/lucy/sprites/eyes/eyes_3.png new file mode 100644 index 00000000..f953d3d0 Binary files /dev/null and b/assets/poker/characters/lucy/sprites/eyes/eyes_3.png differ diff --git a/assets/poker/characters/lucy/sprites/eyes/eyes_4.png b/assets/poker/characters/lucy/sprites/eyes/eyes_4.png new file mode 100644 index 00000000..214f464c Binary files /dev/null and b/assets/poker/characters/lucy/sprites/eyes/eyes_4.png differ diff --git a/assets/poker/characters/lucy/sprites/mouth/mouth_0_0.png b/assets/poker/characters/lucy/sprites/mouth/mouth_0_0.png new file mode 100644 index 00000000..cb5f1b12 Binary files /dev/null and b/assets/poker/characters/lucy/sprites/mouth/mouth_0_0.png differ diff --git a/assets/poker/characters/lucy/sprites/mouth/mouth_0_1.png b/assets/poker/characters/lucy/sprites/mouth/mouth_0_1.png new file mode 100644 index 00000000..ecabb948 Binary files /dev/null and b/assets/poker/characters/lucy/sprites/mouth/mouth_0_1.png differ diff --git a/assets/poker/characters/lucy/sprites/mouth/mouth_0_2.png b/assets/poker/characters/lucy/sprites/mouth/mouth_0_2.png new file mode 100644 index 00000000..b0ded85c Binary files /dev/null and b/assets/poker/characters/lucy/sprites/mouth/mouth_0_2.png differ diff --git a/assets/poker/characters/lucy/sprites/mouth/mouth_1_0.png b/assets/poker/characters/lucy/sprites/mouth/mouth_1_0.png new file mode 100644 index 00000000..6d0cf153 Binary files /dev/null and b/assets/poker/characters/lucy/sprites/mouth/mouth_1_0.png differ diff --git a/assets/poker/characters/lucy/sprites/mouth/mouth_1_1.png b/assets/poker/characters/lucy/sprites/mouth/mouth_1_1.png new file mode 100644 index 00000000..73466535 Binary files /dev/null and b/assets/poker/characters/lucy/sprites/mouth/mouth_1_1.png differ diff --git a/assets/poker/characters/lucy/sprites/mouth/mouth_1_2.png b/assets/poker/characters/lucy/sprites/mouth/mouth_1_2.png new file mode 100644 index 00000000..6de33ef9 Binary files /dev/null and b/assets/poker/characters/lucy/sprites/mouth/mouth_1_2.png differ diff --git a/assets/poker/characters/lucy/sprites/mouth/mouth_2_0.png b/assets/poker/characters/lucy/sprites/mouth/mouth_2_0.png new file mode 100644 index 00000000..b2325045 Binary files /dev/null and b/assets/poker/characters/lucy/sprites/mouth/mouth_2_0.png differ diff --git a/assets/poker/characters/lucy/sprites/mouth/mouth_2_1.png b/assets/poker/characters/lucy/sprites/mouth/mouth_2_1.png new file mode 100644 index 00000000..53ad75b0 Binary files /dev/null and b/assets/poker/characters/lucy/sprites/mouth/mouth_2_1.png differ diff --git a/assets/poker/characters/lucy/sprites/mouth/mouth_2_2.png b/assets/poker/characters/lucy/sprites/mouth/mouth_2_2.png new file mode 100644 index 00000000..6dacf0a2 Binary files /dev/null and b/assets/poker/characters/lucy/sprites/mouth/mouth_2_2.png differ diff --git a/assets/poker/characters/lucy/sprites/mouth/mouth_3_0.png b/assets/poker/characters/lucy/sprites/mouth/mouth_3_0.png new file mode 100644 index 00000000..b64e3e68 Binary files /dev/null and b/assets/poker/characters/lucy/sprites/mouth/mouth_3_0.png differ diff --git a/assets/poker/characters/lucy/sprites/mouth/mouth_3_1.png b/assets/poker/characters/lucy/sprites/mouth/mouth_3_1.png new file mode 100644 index 00000000..a2a69e24 Binary files /dev/null and b/assets/poker/characters/lucy/sprites/mouth/mouth_3_1.png differ diff --git a/assets/poker/characters/lucy/sprites/mouth/mouth_3_2.png b/assets/poker/characters/lucy/sprites/mouth/mouth_3_2.png new file mode 100644 index 00000000..14f7ba82 Binary files /dev/null and b/assets/poker/characters/lucy/sprites/mouth/mouth_3_2.png differ diff --git a/assets/poker/characters/sammy/character.xml b/assets/poker/characters/sammy/character.xml new file mode 100644 index 00000000..7bf9c0a6 --- /dev/null +++ b/assets/poker/characters/sammy/character.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/assets/poker/characters/sammy/sprites/base.png b/assets/poker/characters/sammy/sprites/base.png new file mode 100644 index 00000000..53cb206e Binary files /dev/null and b/assets/poker/characters/sammy/sprites/base.png differ diff --git a/assets/poker/characters/sammy/sprites/eyebrows/eyebrows_0.png b/assets/poker/characters/sammy/sprites/eyebrows/eyebrows_0.png new file mode 100644 index 00000000..ddcc1818 Binary files /dev/null and b/assets/poker/characters/sammy/sprites/eyebrows/eyebrows_0.png differ diff --git a/assets/poker/characters/sammy/sprites/eyebrows/eyebrows_1.png b/assets/poker/characters/sammy/sprites/eyebrows/eyebrows_1.png new file mode 100644 index 00000000..93a55231 Binary files /dev/null and b/assets/poker/characters/sammy/sprites/eyebrows/eyebrows_1.png differ diff --git a/assets/poker/characters/sammy/sprites/eyebrows/eyebrows_2.png b/assets/poker/characters/sammy/sprites/eyebrows/eyebrows_2.png new file mode 100644 index 00000000..d5f8c294 Binary files /dev/null and b/assets/poker/characters/sammy/sprites/eyebrows/eyebrows_2.png differ diff --git a/assets/poker/characters/sammy/sprites/eyebrows/eyebrows_3.png b/assets/poker/characters/sammy/sprites/eyebrows/eyebrows_3.png new file mode 100644 index 00000000..63a65c47 Binary files /dev/null and b/assets/poker/characters/sammy/sprites/eyebrows/eyebrows_3.png differ diff --git a/assets/poker/characters/sammy/sprites/eyebrows/eyebrows_4.png b/assets/poker/characters/sammy/sprites/eyebrows/eyebrows_4.png new file mode 100644 index 00000000..05037da9 Binary files /dev/null and b/assets/poker/characters/sammy/sprites/eyebrows/eyebrows_4.png differ diff --git a/assets/poker/characters/sammy/sprites/eyes/eyes_0.png b/assets/poker/characters/sammy/sprites/eyes/eyes_0.png new file mode 100644 index 00000000..b8b91ad7 Binary files /dev/null and b/assets/poker/characters/sammy/sprites/eyes/eyes_0.png differ diff --git a/assets/poker/characters/sammy/sprites/eyes/eyes_1.png b/assets/poker/characters/sammy/sprites/eyes/eyes_1.png new file mode 100644 index 00000000..562b53cb Binary files /dev/null and b/assets/poker/characters/sammy/sprites/eyes/eyes_1.png differ diff --git a/assets/poker/characters/sammy/sprites/eyes/eyes_2.png b/assets/poker/characters/sammy/sprites/eyes/eyes_2.png new file mode 100644 index 00000000..35218dc6 Binary files /dev/null and b/assets/poker/characters/sammy/sprites/eyes/eyes_2.png differ diff --git a/assets/poker/characters/sammy/sprites/eyes/eyes_3.png b/assets/poker/characters/sammy/sprites/eyes/eyes_3.png new file mode 100644 index 00000000..29fa5c47 Binary files /dev/null and b/assets/poker/characters/sammy/sprites/eyes/eyes_3.png differ diff --git a/assets/poker/characters/sammy/sprites/mouth/mouth_0_0.png b/assets/poker/characters/sammy/sprites/mouth/mouth_0_0.png new file mode 100644 index 00000000..2687bbe1 Binary files /dev/null and b/assets/poker/characters/sammy/sprites/mouth/mouth_0_0.png differ diff --git a/assets/poker/characters/sammy/sprites/mouth/mouth_0_1.png b/assets/poker/characters/sammy/sprites/mouth/mouth_0_1.png new file mode 100644 index 00000000..01d3aeb7 Binary files /dev/null and b/assets/poker/characters/sammy/sprites/mouth/mouth_0_1.png differ diff --git a/assets/poker/characters/sammy/sprites/mouth/mouth_0_2.png b/assets/poker/characters/sammy/sprites/mouth/mouth_0_2.png new file mode 100644 index 00000000..08346cd5 Binary files /dev/null and b/assets/poker/characters/sammy/sprites/mouth/mouth_0_2.png differ diff --git a/assets/poker/characters/sammy/sprites/mouth/mouth_1_0.png b/assets/poker/characters/sammy/sprites/mouth/mouth_1_0.png new file mode 100644 index 00000000..b645c4a4 Binary files /dev/null and b/assets/poker/characters/sammy/sprites/mouth/mouth_1_0.png differ diff --git a/assets/poker/characters/sammy/sprites/mouth/mouth_1_1.png b/assets/poker/characters/sammy/sprites/mouth/mouth_1_1.png new file mode 100644 index 00000000..52d6344f Binary files /dev/null and b/assets/poker/characters/sammy/sprites/mouth/mouth_1_1.png differ diff --git a/assets/poker/characters/sammy/sprites/mouth/mouth_1_2.png b/assets/poker/characters/sammy/sprites/mouth/mouth_1_2.png new file mode 100644 index 00000000..849fca1c Binary files /dev/null and b/assets/poker/characters/sammy/sprites/mouth/mouth_1_2.png differ diff --git a/assets/poker/characters/sammy/sprites/mouth/mouth_2_0.png b/assets/poker/characters/sammy/sprites/mouth/mouth_2_0.png new file mode 100644 index 00000000..abc5fe3f Binary files /dev/null and b/assets/poker/characters/sammy/sprites/mouth/mouth_2_0.png differ diff --git a/assets/poker/characters/sammy/sprites/mouth/mouth_2_1.png b/assets/poker/characters/sammy/sprites/mouth/mouth_2_1.png new file mode 100644 index 00000000..407de584 Binary files /dev/null and b/assets/poker/characters/sammy/sprites/mouth/mouth_2_1.png differ diff --git a/assets/poker/characters/sammy/sprites/mouth/mouth_2_2.png b/assets/poker/characters/sammy/sprites/mouth/mouth_2_2.png new file mode 100644 index 00000000..34078376 Binary files /dev/null and b/assets/poker/characters/sammy/sprites/mouth/mouth_2_2.png differ diff --git a/assets/poker/characters/sammy/sprites/mouth/mouth_3_0.png b/assets/poker/characters/sammy/sprites/mouth/mouth_3_0.png new file mode 100644 index 00000000..74157e7a Binary files /dev/null and b/assets/poker/characters/sammy/sprites/mouth/mouth_3_0.png differ diff --git a/assets/poker/characters/sammy/sprites/mouth/mouth_3_1.png b/assets/poker/characters/sammy/sprites/mouth/mouth_3_1.png new file mode 100644 index 00000000..30fab80d Binary files /dev/null and b/assets/poker/characters/sammy/sprites/mouth/mouth_3_1.png differ diff --git a/assets/poker/characters/sammy/sprites/mouth/mouth_3_2.png b/assets/poker/characters/sammy/sprites/mouth/mouth_3_2.png new file mode 100644 index 00000000..3916423f Binary files /dev/null and b/assets/poker/characters/sammy/sprites/mouth/mouth_3_2.png differ diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index d6419e6e..32b68141 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -3,4 +3,5 @@ # This software is released under the MIT License. # https://opensource.org/licenses/MIT +add_subdirectory(file) add_subdirectory(vn) \ No newline at end of file diff --git a/tools/file/CMakeLists.txt b/tools/file/CMakeLists.txt new file mode 100644 index 00000000..63d7caa9 --- /dev/null +++ b/tools/file/CMakeLists.txt @@ -0,0 +1,12 @@ +# Copyright (c) 2021 Dominic Msters +# +# This software is released under the MIT License. +# https://opensource.org/licenses/MIT + +function(tool_assets args) + add_custom_target(assets + COMMAND tar -C ./assets -cvf test.zip * + DEPENDS ${ARGV} + COMMENT "Compressing Assets" + ) +endfunction() \ No newline at end of file diff --git a/tools/vn/CMakeLists.txt b/tools/vn/CMakeLists.txt index f3c7b44e..e5d52625 100644 --- a/tools/vn/CMakeLists.txt +++ b/tools/vn/CMakeLists.txt @@ -3,10 +3,9 @@ # This software is released under the MIT License. # https://opensource.org/licenses/MIT - function(tool_vn_character DEP_NAME IN OUT) add_custom_target(${DEP_NAME} - COMMAND node ${TOOLS_DIR}/vn/character-sheet-generator.js --root="${ROOT_DIR}" --in="${ROOT_DIR}/${IN}" --out="${OUT}" + COMMAND node ${TOOLS_DIR}/vn/character-sheet-generator.js --assets="${ASSETS_DIR}" --root="${ROOT_DIR}" --in="${IN}" --out="${OUT}" COMMENT "Adding VN Character ${FILE_NAME}" ) endfunction() \ No newline at end of file diff --git a/tools/vn/character-sheet-generator.js b/tools/vn/character-sheet-generator.js index b0f010e8..48e888cc 100644 --- a/tools/vn/character-sheet-generator.js +++ b/tools/vn/character-sheet-generator.js @@ -7,6 +7,7 @@ const { mkdirp } = require('../utils/file'); // Parse Args if(!args.root) throw new Error(`Missing root argument`); +if(!args.assets) throw new Error(`Missing assets argument`); if(!args.in) throw new Error(`Missing in argument`); if(!args.out) throw new Error(`Missing out argument`); if(!args.in.endsWith('xml')) throw new Error(`Invalid in XML`); @@ -14,9 +15,9 @@ if(!args.out.endsWith('png')) throw new Error(`Invalid out PNG`); // Determine in and out. const root = path.resolve(args.root); -const file = path.resolve(args.in); +const file = path.resolve(args.root, args.assets, args.in); if(!fs.existsSync(file)) throw new Error(`Could not find ${file}`); -const outFile = path.resolve(args.out); +const outFile = path.resolve(args.assets, args.out); if(fs.existsSync(outFile)) return; // Load XML @@ -25,7 +26,7 @@ const [ character ] = data.elements; // Validate file. if(!character.attributes.context) throw new Error(`Missing context`) -const dir = path.resolve(root, 'assets', character.attributes.context); +const dir = path.resolve(root, args.assets, character.attributes.context); // Parse base and layers const base = character.elements.find(e => e.name == 'base').attributes;