Commit fe724234 authored by nanahira's avatar nanahira

add expansions back

parent 81dbad28
...@@ -379,6 +379,10 @@ public class Program : MonoBehaviour ...@@ -379,6 +379,10 @@ public class Program : MonoBehaviour
{ {
string_ok = GameStringManager.initialize("strings.conf"); string_ok = GameStringManager.initialize("strings.conf");
} }
if (File.Exists("expansions/lflist.conf")) // expansions lflist first
{
YGOSharp.BanlistManager.initialize("expansions/lflist.conf");
}
if (!lflist_ok && File.Exists("cdb/lflist.conf")) if (!lflist_ok && File.Exists("cdb/lflist.conf"))
{ {
lflist_ok = YGOSharp.BanlistManager.initialize("cdb/lflist.conf"); lflist_ok = YGOSharp.BanlistManager.initialize("cdb/lflist.conf");
...@@ -388,12 +392,8 @@ public class Program : MonoBehaviour ...@@ -388,12 +392,8 @@ public class Program : MonoBehaviour
lflist_ok = YGOSharp.BanlistManager.initialize("lflist.conf"); lflist_ok = YGOSharp.BanlistManager.initialize("lflist.conf");
} }
/* Expansions folder is not currently used, so not loading. YGOSharp.BanlistManager.initializeComplete();
if (File.Exists("expansions/lflist.conf"))
{
YGOSharp.BanlistManager.initialize("expansions/lflist.conf");
}
if (File.Exists("expansions/strings.conf")) if (File.Exists("expansions/strings.conf"))
{ {
GameStringManager.initialize("expansions/strings.conf"); GameStringManager.initialize("expansions/strings.conf");
...@@ -413,7 +413,6 @@ public class Program : MonoBehaviour ...@@ -413,7 +413,6 @@ public class Program : MonoBehaviour
} }
} }
} }
*/
if (Directory.Exists("pack")) if (Directory.Exists("pack"))
{ {
...@@ -953,8 +952,8 @@ public class Program : MonoBehaviour ...@@ -953,8 +952,8 @@ public class Program : MonoBehaviour
public DeckManager deckManager; public DeckManager deckManager;
public Ocgcore ocgcore; public Ocgcore ocgcore;
public SelectServer selectServer; public SelectServer selectServer;
public MyCard mycard; public MyCard mycard;
public RoomList roomList; public RoomList roomList;
public Book book; public Book book;
public puzzleMode puzzleMode; public puzzleMode puzzleMode;
public AIRoom aiRoom; public AIRoom aiRoom;
......
...@@ -45,15 +45,19 @@ namespace YGOSharp ...@@ -45,15 +45,19 @@ namespace YGOSharp
UnityEngine.Debug.Log(e); UnityEngine.Debug.Log(e);
} }
} }
current = new Banlist();
current.Name ="N/A";
new_list.Add(current);
if(!test) { if(!test) {
Banlists = new_list; foreach (var item in new_list) {
Banlists.Add(item);
}
} }
return (success && new_list.Count > 1); return (success && new_list.Count > 1);
} }
public static void initializeComplete() {
Banlist blank = new Banlist();
blank.Name = "N/A";
Banlists.Add(item);
}
public static int GetIndex(uint hash) public static int GetIndex(uint hash)
{ {
for (int i = 0; i < Banlists.Count; i++) for (int i = 0; i < Banlists.Count; i++)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment