updated data exports to match new icon paths

Author: MgAl2O4

datasource/!Start.bat

@@ -9,7 +9,7 @@ if %GamePath%=="" goto MISSING_PATH
 echo Game path: %GamePath%
 echo.
 echo Export data using commands:
-echo   ui 82100 82999
+echo   ui 87000 88999
 echo   allexd
 echo   exit
 echo.
@@ -30,7 +30,8 @@ echo Copying exported data from: %DataPath%
 xcopy SaintCoinach\%DataPath%\*.* export\ /e > nul
 
 del ..\assets\icons\*.png
-xcopy export\ui\icon\082000\*.png ..\assets\icons\ /s > nul
+xcopy export\ui\icon\087000\*.png ..\assets\icons\ /s > nul
+xcopy export\ui\icon\088000\*.png ..\assets\icons\ /s > nul
 
 rmdir SaintCoinach\%DataPath% /s /q > nul
 

sources/data/TriadCardDB.cs

@@ -18,7 +18,7 @@ public TriadCardDB()
         {
             DBPath = "data/cards.xml";
             cards = new List<TriadCard>();
-            hiddenCard = new TriadCard(0, null, ETriadCardRarity.Common, ETriadCardType.None, 0, 0, 0, 0, 0, 0);
+            hiddenCard = new TriadCard(0, ETriadCardRarity.Common, ETriadCardType.None, 0, 0, 0, 0, 0, 0);
             hiddenCard.Name.Text[LocalizationDB.CodeLanguageIdx] = "(hidden)";
 
             sameNumberMap = new Dictionary<int, List<TriadCard>>();
@@ -51,7 +51,6 @@ public bool Load()
 
                             TriadCard newCard = new TriadCard(
                                 int.Parse(cardElem.GetAttribute("id")),
-                                cardElem.GetAttribute("icon"),
                                 cardRarity,
                                 cardType,
                                 ParseCardSideNum(cardElem.GetAttribute("up")),
@@ -144,7 +143,6 @@ public void Save()
                     {
                         xmlWriter.WriteStartElement("card");
                         xmlWriter.WriteAttributeString("id", card.Id.ToString());
-                        xmlWriter.WriteAttributeString("icon", card.IconPath);
                         xmlWriter.WriteAttributeString("rarity", ((int)card.Rarity).ToString());
                         xmlWriter.WriteAttributeString("type", ((int)card.Type).ToString());
                         xmlWriter.WriteAttributeString("up", card.Sides[(int)ETriadGameSide.Up].ToString());

sources/gamelogic/TriadCard.cs

@@ -39,7 +39,6 @@ public class TriadCard : IEquatable<TriadCard>
     {
         public int Id;
         public LocString Name;
-        public string IconPath;
         public ETriadCardRarity Rarity;
         public ETriadCardType Type;
         public int[] Sides;
@@ -48,6 +47,9 @@ public class TriadCard : IEquatable<TriadCard>
         public int Group;
         public float OptimizerScore;
 
+        public int SmallIconId => 88000 + Id;
+        public int BigIconId => 87000 + Id;
+
         public TriadCard()
         {
             Id = -1;
@@ -58,11 +60,10 @@ public TriadCard()
             OptimizerScore = 0.0f;
         }
 
-        public TriadCard(int id, string iconPath, ETriadCardRarity rarity, ETriadCardType type, int numUp, int numDown, int numLeft, int numRight, int sortOrder, int group)
+        public TriadCard(int id, ETriadCardRarity rarity, ETriadCardType type, int numUp, int numDown, int numLeft, int numRight, int sortOrder, int group)
         {
             Id = id;
             Name = LocalizationDB.Get().FindOrAddLocString(ELocStringType.CardName, id);
-            IconPath = iconPath;
             Rarity = rarity;
             Type = type;
             Sides = new int[4] { numUp, numLeft, numDown, numRight };

sources/ui/modelproxy/IconDB.cs

@@ -53,10 +53,10 @@ private void LoadCardImages()
             mapCardImages = new List<BitmapImage>();
             mapCardImagesBig = new List<BitmapImage>();
 
-            string nullImagePath = "icons/082500.png";
+            string nullImagePath = "icons/088001.png";
             var nullImg = LoadImageFromAsset(nullImagePath);
 
-            string nullImageBigPath = "icons/082100.png";
+            string nullImageBigPath = "icons/087000.png";
             var nullImgBig = LoadImageFromAsset(nullImageBigPath);
 
             TriadCardDB cardDB = TriadCardDB.Get();
@@ -65,16 +65,11 @@ private void LoadCardImages()
                 var cardOb = cardDB.cards[idx];
                 if (cardOb != null && cardOb.IsValid())
                 {
-                    string loadPath = "icons/" + cardOb.IconPath;
-                    var loadedImage = LoadImageFromAsset(loadPath);
+                    string loadPathSmall = "icons/" + cardOb.SmallIconId.ToString("000000") + ".png";
+                    var loadedImage = LoadImageFromAsset(loadPathSmall);
                     mapCardImages.Add(loadedImage);
 
-                    var loadPathIdStr = loadPath.Substring(loadPath.Length - 7, 3);
-                    int loadPathId = int.Parse(loadPathIdStr);
-
-                    string loadPathBig = loadPath.Substring(0, loadPath.Length - 7);
-                    loadPathBig += (loadPathId - 400);
-                    loadPathBig += ".png";
+                    string loadPathBig = "icons/" + cardOb.BigIconId.ToString("000000") + ".png";
                     loadedImage = LoadImageFromAsset(loadPathBig);
                     mapCardImagesBig.Add(loadedImage);
                 }

sources/utils/DataCoverter.cs

@@ -169,11 +169,7 @@ private bool UpdateCards(GameDataLists gameDataLists, Dictionary<string, ETriadC
                         cardDB.cards.Add(null);
                     }
 
-                    int iconId = 82500 + cardData.Id;
-                    string iconPath = iconId.ToString("000000") + ".png";
-
                     cardOb = new TriadCard(cardData.Id,
-                        iconPath,
                         (ETriadCardRarity)(cardData.rarityIdx - 1),
                         mapCardTypes[cardData.LinkedType == null ? "" : cardData.LinkedType.Type.GetCodeName()],
                         cardData.sideTop,
@@ -275,7 +271,7 @@ private bool UpdateNpcs(GameDataLists gameDataLists, Dictionary<string, TriadGam
                     var listRewards = new List<TriadCard>();
                     foreach (var rewardData in npcData.LinkedRewards)
                     {
-                        listRewards.Add(cardDB.cards[rewardData.LinkedCard.Id]);
+                        listRewards.Add(cardDB.cards[rewardData.Id]);
                     }
 
                     npcOb = new TriadNpc(npcId, listMods, listRewards, npcDataDeck);

sources/utils/datamine/GameData.cs

@@ -237,12 +237,6 @@ public override bool Link(GameDataLists lists)
                 return false;
             }
 
-            if (LinkedName.Name.GetCodeName().StartsWith("Wyra"))
-            {
-                int a = 1;
-                a++;
-            }
-
             return true;
         }
     }
@@ -331,7 +325,7 @@ public class GameDataNpc : GameData
         public List<GameDataCard> LinkedCardsFixed;
         public List<GameDataCard> LinkedCardsVariable;
         public List<GameDataRule> LinkedRules;
-        public List<GameDataReward> LinkedRewards;
+        public List<GameDataCard> LinkedRewards;
 
         public override string ToString() { return string.Format("{0}: {1}", Id.ToString(), LinkedNpcId != null && LinkedNpcId.LinkedName != null ? LinkedNpcId.LinkedName.Name.GetCodeName() : ""); }
         public override bool IsRawDataValid(CsvLocalizedData rawData) { return rawData.GetNumColumns() == 31; }
@@ -482,19 +476,19 @@ public override bool Link(GameDataLists lists)
                 LinkedRules.Add(LinkedRule);
             }
 
-            LinkedRewards = new List<GameDataReward>();
+            LinkedRewards = new List<GameDataCard>();
             foreach (var itemName in Rewards)
             {
-                var LinkedReward = lists.rewards.Find(x => (x.CardName == itemName));
+                var LinkedReward = lists.cards.Find(x => (x.LinkedName.Name.GetCodeName() == itemName));
                 if (LinkedReward == null && itemName.EndsWith(" Card"))
                 {
                     var itemName2 = itemName.Substring(0, itemName.Length - 5);
 
-                    LinkedReward = lists.rewards.Find(x => (x.CardName == itemName2));
+                    LinkedReward = lists.cards.Find(x => (x.LinkedName.Name.GetCodeName() == itemName2));
                     if (LinkedReward == null)
                     {
                         var itemName3 = "The " + itemName2;
-                        LinkedReward = lists.rewards.Find(x => (x.CardName == itemName3));
+                        LinkedReward = lists.cards.Find(x => (x.LinkedName.Name.GetCodeName() == itemName3));
                     }
                 }
 
@@ -511,42 +505,6 @@ public override bool Link(GameDataLists lists)
         }
     }
 
-    public class GameDataReward : GameData
-    {
-        public static readonly string CardItemType = "Triple Triad Card";
-
-        public string CardName;
-
-        public GameDataCard LinkedCard;
-
-        public override string ToString() { return Id + ": " + CardName; }
-        public override bool IsRawDataValid(CsvLocalizedData rawData) { return rawData.GetNumColumns() >= 90; }
-        public override bool IsValid() { return CardName != null; }
-
-        public override void Parse(CsvLocalizedData rawData, int rowIdx)
-        {
-            string[] defRow = rawData.data.rows[rowIdx];
-
-            if (defRow[16] == CardItemType)
-            {
-                Id = int.Parse(defRow[0]);
-                CardName = defRow[15];
-            }
-        }
-
-        public override bool Link(GameDataLists lists)
-        {
-            LinkedCard = lists.cards.Find(x => (x.LinkedName.Name.GetCodeName() == CardName));
-            if (LinkedCard == null)
-            {
-                Logger.WriteLine("FAILED link: GameDataReward, Id:{0}, Card:{1}, no matching card name", Id, CardName);
-                return false;
-            }
-
-            return true;
-        }
-    }
-
     public class GameDataMap : GameData
     {
         public string Name;
@@ -708,7 +666,6 @@ public class GameDataLists
         public List<GameDataNpcName> npcNames;
         public List<GameDataNpcLocation> npcLocations;
         public List<GameDataNpc> npcs;
-        public List<GameDataReward> rewards;
         public List<GameDataMap> maps;
         public List<GameDataPlaceName> placeNames;
         public List<GameDataTournamentName> tournamentNames;
@@ -726,7 +683,6 @@ public void Load(string folderPath)
             npcNames = LoadGameData<GameDataNpcName>(folderPath, "ENpcResident");
             npcLocations = LoadGameData<GameDataNpcLocation>(folderPath, "Level");
             npcs = LoadGameData<GameDataNpc>(folderPath, "TripleTriad");
-            rewards = LoadGameData<GameDataReward>(folderPath, "Item");
             maps = LoadGameData<GameDataMap>(folderPath, "Map");
             placeNames = LoadGameData<GameDataPlaceName>(folderPath, "PlaceName");
 
@@ -747,7 +703,6 @@ public bool Link()
             result = result && LinkGameData(npcTriadIds);
             result = result && LinkGameData(npcNames);
             result = result && LinkGameData(npcs);
-            result = result && LinkGameData(rewards);
             result = result && LinkGameData(npcLocations); // must be after npcs
             result = result && LinkGameData(maps);
             result = result && LinkGameData(placeNames);