Add unreleased cards with flag to output

FlagBrew · Jun 4, 2020 · 67e27b6 · 67e27b6
1 parent a0789c1
commit 67e27b6
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 50 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@ build
 gallerypack
 gallerypack.exe
 .vscode
+out
diff --git a/core b/core
diff --git a/include/PKSMCORE_CONFIG.h b/include/PKSMCORE_CONFIG.h
@@ -1,43 +1,3 @@
-#ifndef _PKSMCORE_DISABLE_ABILITY_STRINGS
-#define _PKSMCORE_DISABLE_ABILITY_STRINGS
-#endif
-
-#ifndef _PKSMCORE_DISABLE_BALL_STRINGS
-#define _PKSMCORE_DISABLE_BALL_STRINGS
-#endif
-
-#ifndef _PKSMCORE_DISABLE_FORM_STRINGS
-#define _PKSMCORE_DISABLE_FORM_STRINGS
-#endif
-
-#ifndef _PKSMCORE_DISABLE_HIDDEN_POWER_STRINGS
-#define _PKSMCORE_DISABLE_HIDDEN_POWER_STRINGS
-#endif
-
-#ifndef _PKSMCORE_DISABLE_ITEM_STRINGS
-#define _PKSMCORE_DISABLE_ITEM_STRINGS
-#endif
-
-#ifndef _PKSMCORE_DISABLE_MOVE_STRINGS
-#define _PKSMCORE_DISABLE_MOVE_STRINGS
-#endif
-
-#ifndef _PKSMCORE_DISABLE_NATURE_STRINGS
-#define _PKSMCORE_DISABLE_NATURE_STRINGS
-#endif
-
-#ifndef _PKSMCORE_DISABLE_GAME_STRINGS
-#define _PKSMCORE_DISABLE_GAME_STRINGS
-#endif
-
-#ifndef _PKSMCORE_DISABLE_LOCATION_STRINGS
-#define _PKSMCORE_DISABLE_LOCATION_STRINGS
-#endif
-
-#ifndef _PKSMCORE_DISABLE_GEO_STRINGS
-#define _PKSMCORE_DISABLE_GEO_STRINGS
-#endif
-
 #ifndef _PKSMCORE_LANG_FOLDER
 #define _PKSMCORE_LANG_FOLDER ""
 #endif

diff --git a/source/main.cpp b/source/main.cpp
@@ -19,7 +19,7 @@
 static const std::string langs[]      = {"CHS", "CHT", "ENG", "FRE", "GER", "ITA", "JPN", "KOR", "SPA"};
 static const std::string extensions[] = {"wc7", "wc6", "wc7full", "wc6full", "pgf", "wc4", "pgt", "pcd"};
 
-void scanDir(std::vector<u8>& outData, nlohmann::json& outSheet, std::filesystem::path root)
+void scanDir(std::vector<u8>& outData, nlohmann::json& outSheet, const std::filesystem::path& root, bool released)
 {
     for (auto& file : std::filesystem::recursive_directory_iterator{root})
     {
@@ -48,10 +48,6 @@ void scanDir(std::vector<u8>& outData, nlohmann::json& outSheet, std::filesystem
                     lang = l;
                 }
             }
-            if (lang.empty())
-            {
-                lang = "ENG";
-            }
             entry["game"]   = game.substr(0, game.find(' '));
             entry["size"]   = fileSize;
             entry["type"]   = type;
@@ -96,7 +92,6 @@ void scanDir(std::vector<u8>& outData, nlohmann::json& outSheet, std::filesystem
                 printf("Bad: %lu read of %lu", read, fileSize);
                 continue;
             }
-            outData.insert(outData.end(), data, data + fileSize);
             std::unique_ptr<WCX> wc;
             if (type == "wc7" || type == "wc7full")
             {
@@ -123,6 +118,51 @@ void scanDir(std::vector<u8>& outData, nlohmann::json& outSheet, std::filesystem
                 wc = std::make_unique<WC4>((u8*)data);
             }
 
+            if (lang.empty())
+            {
+                switch (wc->language())
+                {
+                    case Language::CHS:
+                        lang = "CHS";
+                        break;
+                    case Language::CHT:
+                        lang = "CHT";
+                        break;
+                    case Language::ENG:
+                        lang = "ENG";
+                        break;
+                    case Language::FRE:
+                        lang = "FRE";
+                        break;
+                    case Language::GER:
+                        lang = "GER";
+                        break;
+                    case Language::ITA:
+                        lang = "ITA";
+                        break;
+                    case Language::JPN:
+                        lang = "JPN";
+                        break;
+                    case Language::KOR:
+                        lang = "KOR";
+                        break;
+                    case Language::SPA:
+                        lang = "SPA";
+                        break;
+                    default:
+                        lang = "ENG";
+                        break;
+                }
+            }
+
+            // There's a dumb WC6 that requires this special case. Whee
+            if (wc->pokemon() && wc->species() == Species::None)
+            {
+                continue;
+            }
+
+            outData.insert(outData.end(), data, data + fileSize);
+
             delete[] data;
 
             if (wc->pokemon())
@@ -169,7 +209,8 @@ void scanDir(std::vector<u8>& outData, nlohmann::json& outSheet, std::filesystem
                 name = id + name;
             }
 
-            entry["name"] = name;
+            entry["name"]     = name;
+            entry["released"] = released;
 
             outSheet["wondercards"].emplace_back(entry);
 
@@ -238,10 +279,16 @@ int main(int argc, char** argv)
         sheet["matches"]     = nlohmann::json::array();
 
         std::vector<u8> data;
-        scanDir(data, sheet, dir);
+        scanDir(data, sheet, dir, true);
         if (gen == 4)
         {
-            scanDir(data, sheet, gallery / "Released" / "Gen 4" / "Pokemon Ranger Manaphy Egg");
+            scanDir(data, sheet, gallery / "Released" / "Gen 4" / "Pokemon Ranger Manaphy Egg", true);
+        }
+
+        dir = gallery / "Unreleased" / ("Gen " + std::to_string(gen));
+        if (std::filesystem::exists(dir))
+        {
+            scanDir(data, sheet, dir, false);
         }
 
         std::sort(sheet["matches"].begin(), sheet["matches"].end(),
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,3 +2,4 @@ build @@
     gallerypack
     gallerypack.exe
     .vscode
+    out
+1 −0		include/pkx/PK3.hpp
+1 −1		include/pkx/PKX.hpp
+2 −1		include/sav/Item.hpp
+9 −0		include/sav/Sav4.hpp
+5 −0		include/utils/i18n.hpp
+2 −0		include/utils/utils.hpp
+5 −23		source/i18n/i18n.cpp
+1 −2		source/i18n/i18n_internal.hpp
+37 −0		source/i18n/i18n_item.cpp
+47 −47		source/personal/personal_swsh.h
+16 −4		source/pkx/PK3.cpp
+8 −2		source/pkx/PKX.cpp
+2 −2		source/sav/Sav3.cpp
+60 −35		source/sav/Sav4.cpp
+1 −5		source/sav/SavB2W2.cpp
+1 −5		source/sav/SavBW.cpp
+2 −2		source/sav/SavDP.cpp
+2 −2		source/sav/SavHGSS.cpp
+1 −5		source/sav/SavLGPE.cpp
+1 −5		source/sav/SavORAS.cpp
+2 −2		source/sav/SavPT.cpp
+2 −5		source/sav/SavSUMO.cpp
+2 −5		source/sav/SavUSUM.cpp
+1 −5		source/sav/SavXY.cpp
+1 −1		source/utils/VersionTables.cpp
+12 −0		source/utils/utils.cpp
+1 −2		source/wcx/PGF.cpp
+1 −1		source/wcx/PGT.cpp
+1 −1		source/wcx/WC6.cpp
+1 −1		source/wcx/WC7.cpp
+ −		strings/chs/items3.txt
+ −		strings/cht/items3.txt
+ −		strings/eng/items3.txt
+377 −0		strings/ger/items3.txt
+ −		strings/spa/items3.txt