From e0016817dd5379831c4fa80bd494837d853c678f Mon Sep 17 00:00:00 2001 From: Asuro Date: Mon, 7 Apr 2025 01:32:07 +0200 Subject: [PATCH] card assets --- assets/blender/cards.blend | 3 +++ assets/textures/w corner long.png | 3 +++ assets/textures/w straight.png | 4 ++-- assets/textures/w! corner short.png | 3 +++ assets/textures/w+ corner short.png | 3 +++ src/game/Puzzle.cpp | 5 +++++ src/game/data/puzzles/0.pzl | 4 ++-- src/game/data/static/puzzle.dat | Bin 6554 -> 7030 bytes src/textures/w corner long.ktx | 3 +++ src/textures/w straight.ktx | 2 +- src/textures/w! corner short.ktx | 3 +++ src/textures/w+ corner short.ktx | 3 +++ 12 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 assets/blender/cards.blend create mode 100644 assets/textures/w corner long.png create mode 100644 assets/textures/w! corner short.png create mode 100644 assets/textures/w+ corner short.png create mode 100644 src/textures/w corner long.ktx create mode 100644 src/textures/w! corner short.ktx create mode 100644 src/textures/w+ corner short.ktx diff --git a/assets/blender/cards.blend b/assets/blender/cards.blend new file mode 100644 index 0000000..cd35574 --- /dev/null +++ b/assets/blender/cards.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5c694d48be28ff1600bf3f0fc13d239775274f0136456cf80882a009bd48bf8d +size 1168093 diff --git a/assets/textures/w corner long.png b/assets/textures/w corner long.png new file mode 100644 index 0000000..05fecac --- /dev/null +++ b/assets/textures/w corner long.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:102bfe15c0831db61376b851b5f1b6af1665a9ff4d6c468476d8e5552ba14a1f +size 175919 diff --git a/assets/textures/w straight.png b/assets/textures/w straight.png index 4533c28..8403e52 100644 --- a/assets/textures/w straight.png +++ b/assets/textures/w straight.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eadbbab5dbe448a8aaefbc3ec9d8af1786b76e1e301dfca0b8bc72ebad5b739d -size 12000 +oid sha256:75c1669953ed096d471f0152c4f3e89e97bf487517478b8654e91ad76f4db846 +size 269005 diff --git a/assets/textures/w! corner short.png b/assets/textures/w! corner short.png new file mode 100644 index 0000000..49c953f --- /dev/null +++ b/assets/textures/w! corner short.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:41394f4058ae86303a803e3ae2a45cdf3421824fdb0d69c47bc48178ae6dfe9e +size 154930 diff --git a/assets/textures/w+ corner short.png b/assets/textures/w+ corner short.png new file mode 100644 index 0000000..9a92c51 --- /dev/null +++ b/assets/textures/w+ corner short.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8db386761b3f4feb9dbd3449e98d67683d181b61d1327477c8253ef3a0aa988a +size 167054 diff --git a/src/game/Puzzle.cpp b/src/game/Puzzle.cpp index 38a82c9..37324c0 100644 --- a/src/game/Puzzle.cpp +++ b/src/game/Puzzle.cpp @@ -173,6 +173,11 @@ namespace Puzzle bool PuzzleSolver::IsExitSatisfied(const PuzzleData& puzzle, PuzPos pos) { PuzzleElementType::Enum goalType = GetNodeAt(puzzle, pos); + if (goalType == PuzzleElementType::None) + { + WARN_ONCE("TODO!"); + return false; + } uint32_t currentPositionQueueIdx = 0; uint32_t positionQueueCount = 0; diff --git a/src/game/data/puzzles/0.pzl b/src/game/data/puzzles/0.pzl index 9cc6241..c2eca47 100644 --- a/src/game/data/puzzles/0.pzl +++ b/src/game/data/puzzles/0.pzl @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ca6a40c1c01e7b8af1f496e0f1d6608a267ce9eabc320bdef9267cc342137a2d -size 8214 +oid sha256:fe8d68629c8e86ce1e7c8fe604089bec3c1cb1d3b9868f74cb9baf967bb7e3aa +size 8218 diff --git a/src/game/data/static/puzzle.dat b/src/game/data/static/puzzle.dat index 0b34d838e61b1441e88004fd493a96e41b714999..9a46e66337c6e7020e7d507c506b3c56677ba184 100644 GIT binary patch delta 335 zcmbPb{LM@uI3P5Nk%56>+7*SijkcU!IjEB(=C?bD{_*V*&#M0|O(&j^~?G z85x*4Q&gE5m>IYk9?Z64VrJMA~K1K!x16GLGM1@1_QyEwpW-+i&p2+%p z^ApB1j2s3G3=Gq%um767gV}+dnSl)iCw{D+T*bo0C@^^<>-WtytYS>e>hTPSRn=AOlm>9VxeyrcjCn(Rl*-(s=QGl75nSqgE$Memp jj10`2DXN=ii7#NDyh=P^vX!)gz=d6o_At!Az`y_imya}C diff --git a/src/textures/w corner long.ktx b/src/textures/w corner long.ktx new file mode 100644 index 0000000..c0ba125 --- /dev/null +++ b/src/textures/w corner long.ktx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a5634d0a3109f42421c5bbc5cfa377b7472102fc6120226dfa550c8ed6c17bc3 +size 1048644 diff --git a/src/textures/w straight.ktx b/src/textures/w straight.ktx index f505d25..9731165 100644 --- a/src/textures/w straight.ktx +++ b/src/textures/w straight.ktx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dab0fcd7ecb89dfe1ec2faeb8e1222dace3330c1494463ebf7a8c0dea7d7c894 +oid sha256:7fad9faf7f8cf3873ba4f92abba9a6e23102b78368db87956f27b2ffdc7cd016 size 1048644 diff --git a/src/textures/w! corner short.ktx b/src/textures/w! corner short.ktx new file mode 100644 index 0000000..0fc4136 --- /dev/null +++ b/src/textures/w! corner short.ktx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3ffc10f1db985fb69825bc27c39573a33b79647aa29459aa04adb8858c3b56a6 +size 1048644 diff --git a/src/textures/w+ corner short.ktx b/src/textures/w+ corner short.ktx new file mode 100644 index 0000000..578d5d0 --- /dev/null +++ b/src/textures/w+ corner short.ktx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4d774e48308b04cff8e5174ea7a84fb73f246f735572e7d2bb0ba68da3a27fa9 +size 1048644