2.4.1.1

.gitignore

@@ -228,3 +228,4 @@ pip-log.txt
 
 #Mr Developer
 .mr.developer.cfg
+/win32/*.cdb

DataEditorX/Config/MyConfig.cs

@@ -246,13 +246,17 @@ public static Area readArea(string key)
         /// </summary>
         /// <param name="key"></param>
         /// <returns></returns>
-        public static bool readBoolean(string key)
+        public static bool readBoolean(string key,bool def=false)
         {
-            if (readString(key).ToLower() == "true")
+        	string val= readString(key);
+        	if("true".Equals(val, StringComparison.OrdinalIgnoreCase)){
         		return true;
-            else
+        	}
+        	if("false".Equals(val, StringComparison.OrdinalIgnoreCase)){
         		return false;
         	}
+            return def;
+        }
         #endregion 
 
         

DataEditorX/Core/DataBase.cs

@@ -492,5 +492,34 @@ public static string GetDeleteSQL(Card c)
 				sw.Close();
 			}
 		}
+		
+		public static CardPack findPack(string db, long id){
+			CardPack cardpack=null;
+			if ( File.Exists(db) && id>=0)
+			{
+				using ( SQLiteConnection sqliteconn = new SQLiteConnection(@"Data Source=" + db) )
+				{
+					sqliteconn.Open();
+					using ( SQLiteCommand sqlitecommand = new SQLiteCommand(sqliteconn) )
+					{
+						sqlitecommand.CommandText = "select id,pack_id,pack,rarity,date from pack where id="+id+" order by date desc";
+						using ( SQLiteDataReader reader = sqlitecommand.ExecuteReader() )
+						{
+							if(reader.Read())
+							{
+								cardpack=new CardPack(id);
+								cardpack.pack_id=reader.GetString(1);
+								cardpack.pack_name=reader.GetString(2);
+								cardpack.rarity=reader.GetString(3);
+								cardpack.date=reader.GetString(4);
+							}
+							reader.Close();
+						}
+					}
+					sqliteconn.Close();
+				}
+			}
+			return cardpack;
+		}
 	}
 }

DataEditorX/Core/Mse/CardPack.cs

+/*
+ * 由SharpDevelop创建。
+ * 用户： Hasee
+ * 日期: 2016/2/27
+ * 时间: 7:55
+ * 
+ * 要改变这种模板请点击 工具|选项|代码编写|编辑标准头文件
+ */
+using System;
+
+namespace DataEditorX.Core
+{
+	/// <summary>
+	/// Description of CardPack.
+	/// </summary>
+	public class CardPack
+	{
+		public CardPack(long id)
+		{
+			this.card_id=id;
+		}
+		
+		public long card_id{
+			get;
+			private set;
+		}
+		public string pack_id;
+		public string pack_name;
+		public string rarity;
+		public string date;
+		
+		public string getMseRarity(){
+			if(rarity==null)
+				return "common";
+			rarity=rarity.Trim().ToLower();
+			if(rarity.Equals("common")){
+				return "common";
+			}
+			if(rarity.Equals("rare")){
+				return "rare";
+			}
+			if(rarity.Equals("super") ||rarity.Equals("super rare")){
+				return "super rare";
+			}
+			if(rarity.Contains("secret")){
+				return "secret rare";
+			}
+			if(rarity.Contains("parallel")){
+				return "parallel rare";
+			}
+			if(rarity.Contains("ultimate")){
+				return "ultimate rare";
+			}
+			if(rarity.Contains("ultra")){
+				return "ultra rare";
+			}
+			if(rarity.Contains("gold")){
+				return "gold tech";
+			}
+			if(rarity.Contains("promo")){
+				return "promo";
+			}
+			return "common";
+		}
+	}
+}

DataEditorX/Core/Mse/MseMaker.cs

@@ -45,6 +45,8 @@ public class MseMaker
 		public const string TAG_TEXT = "rule text";
 		public const string TAG_ATK = "attack";
 		public const string TAG_DEF = "defense";
+		public const string TAG_NUMBER = "number";
+		public const string TAG_RARITY = "rarity";
 		public const string TAG_PENDULUM = "pendulum";
 		public const string TAG_PSCALE1 = "pendulum scale 1";
 		public const string TAG_PSCALE2 = "pendulum scale 2";
@@ -368,7 +370,7 @@ public string[] GetTypes(Card c)
 
 		#region 写存档
 		//写存档
-		public Dictionary<Card, string> WriteSet(string file, Card[] cards)
+		public Dictionary<Card, string> WriteSet(string file, Card[] cards,string cardpack_db,bool rarity=true)
 		{
 //			MessageBox.Show(""+cfg.replaces.Keys[0]+"/"+cfg.replaces[cfg.replaces.Keys[0]]);
 			Dictionary<Card, string> list = new Dictionary<Card, string>();
@@ -386,10 +388,11 @@ public string[] GetTypes(Card c)
 						list.Add(c, jpg);
 						jpg = Path.GetFileName(jpg);
 					}
+					CardPack cardpack=DataBase.findPack(cardpack_db, c.id);
 					if (c.IsType(CardType.TYPE_SPELL) || c.IsType(CardType.TYPE_TRAP))
-						sw.WriteLine(getSpellTrap(c, jpg, c.IsType(CardType.TYPE_SPELL)));
+						sw.WriteLine(getSpellTrap(c, jpg, c.IsType(CardType.TYPE_SPELL), cardpack,rarity));
 					else
-						sw.WriteLine(getMonster(c, jpg, c.IsType(CardType.TYPE_PENDULUM)));
+						sw.WriteLine(getMonster(c, jpg, c.IsType(CardType.TYPE_PENDULUM),cardpack,rarity));
 				}
 				sw.WriteLine(cfg.end);
 				sw.Close();
@@ -398,7 +401,7 @@ public string[] GetTypes(Card c)
 			return list;
 		}
 		//怪兽，pendulum怪兽
-		string getMonster(Card c, string img, bool isPendulum)
+		string getMonster(Card c, string img, bool isPendulum,CardPack cardpack=null,bool rarity=true)
 		{
 			StringBuilder sb = new StringBuilder();
 			string[] types = GetTypes(c);
@@ -413,6 +416,12 @@ string getMonster(Card c, string img, bool isPendulum)
 			sb.AppendLine(GetLine(TAG_TYPE2, cn2tw(types[1])));
 			sb.AppendLine(GetLine(TAG_TYPE3, cn2tw(types[2])));
 			sb.AppendLine(GetLine(TAG_TYPE4, cn2tw(types[3])));
+			if(cardpack!=null){
+				sb.AppendLine(GetLine(TAG_NUMBER, cardpack.pack_id));
+				if(rarity){
+					sb.AppendLine(GetLine(TAG_RARITY, cardpack.getMseRarity()));
+				}
+			}
 			if (isPendulum)//P怪兽
 			{
 				string text = GetDesc(c.desc, cfg.regx_monster);
@@ -439,7 +448,7 @@ string getMonster(Card c, string img, bool isPendulum)
 			return sb.ToString();
 		}
 		//魔法陷阱
-		string getSpellTrap(Card c, string img, bool isSpell)
+		string getSpellTrap(Card c, string img, bool isSpell,CardPack cardpack=null,bool rarity=true)
 		{
 			StringBuilder sb = new StringBuilder();
 			sb.AppendLine(TAG_CARD + ":");
@@ -448,6 +457,12 @@ string getSpellTrap(Card c, string img, bool isSpell)
 			sb.AppendLine(GetLine(TAG_ATTRIBUTE, isSpell ? "spell" : "trap"));
 			sb.AppendLine(GetLine(TAG_LEVEL, GetSpellTrapSymbol(c, isSpell)));
 			sb.AppendLine(GetLine(TAG_IMAGE, img));
+			if(cardpack!=null){
+				sb.AppendLine(GetLine(TAG_NUMBER, cardpack.pack_id));
+				if(rarity){
+					sb.AppendLine(GetLine(TAG_RARITY, cardpack.getMseRarity()));
+				}
+			}
 			sb.AppendLine("	" + TAG_TEXT + ":");
 			sb.AppendLine("		" + ReText(reItalic(c.desc)));
 			sb.AppendLine(GetLine(TAG_CODE, c.idString));

DataEditorX/Core/TaskHelper.cs

@@ -20,6 +20,7 @@
 using DataEditorX.Config;
 using DataEditorX.Core.Mse;
 using DataEditorX.Core.Info;
+using System.Xml;
 
 namespace DataEditorX.Core
 {
@@ -251,14 +252,19 @@ public string MSEImagePath
 		{
 			get { return mseHelper.ImagePath; }
 		}
-        public void SaveMSEs(string file, Card[] cards, bool isUpdate)
+		public void SaveMSEs(string file, Card[] cards,bool isUpdate)
 		{
 			if(cards == null)
 				return;
+			string pack_db=MyPath.GetRealPath(MyConfig.readString("pack_db"));
+			bool rarity=MyConfig.readBoolean("mse_auto_rarity", false);
+			#if DEBUG
+			MessageBox.Show("db = "+pack_db+",auto rarity="+rarity);
+			#endif
 			int c = cards.Length;
 			//不分开，或者卡片数小于单个存档的最大值
 			if (mseHelper.MaxNum == 0 || c < mseHelper.MaxNum)
-                SaveMSE(1, file, cards, isUpdate);
+				SaveMSE(1, file, cards,pack_db, rarity, isUpdate);
 			else
 			{
 				int nums = c / mseHelper.MaxNum;
@@ -277,14 +283,14 @@ public void SaveMSEs(string file, Card[] cards, bool isUpdate)
 					int t = file.LastIndexOf(".mse-set");
 					string fname = (t > 0) ? file.Substring(0, t) : file;
 					fname = fname + string.Format("_{0}.mse-set", i + 1);
-                    SaveMSE(i + 1, fname, clist.ToArray(), isUpdate);
+					SaveMSE(i + 1, fname, clist.ToArray(),pack_db, rarity, isUpdate);
 				}
 			}
 		}
-        public void SaveMSE(int num, string file, Card[] cards, bool isUpdate)
+		public void SaveMSE(int num, string file, Card[] cards,string pack_db,bool rarity, bool isUpdate)
 		{
 			string setFile = file + ".txt";
-            Dictionary<Card, string> images = mseHelper.WriteSet(setFile, cards);
+			Dictionary<Card, string> images = mseHelper.WriteSet(setFile, cards,pack_db,rarity);
 			if (isUpdate)//仅更新文字
 				return;
 			int i = 0;

DataEditorX/DataEditorX.csproj

@@ -108,6 +108,7 @@
     <Compile Include="Config\DataManager.cs" />
     <Compile Include="Config\ImageSet.cs" />
     <Compile Include="Core\LuaFunction.cs" />
+    <Compile Include="Core\Mse\CardPack.cs" />
     <Compile Include="Core\Mse\MSECons.cs" />
     <Compile Include="Core\Mse\MseMaker.cs" />
     <Compile Include="Core\Mse\MSEConfig.cs" />

DataEditorX/Properties/AssemblyInfo.cs

@@ -28,4 +28,4 @@
 //
 // You can specify all the values or you can use the default the Revision and 
 // Build Numbers by using the '*' as shown below:
-[assembly: AssemblyVersion("2.4.1.0")]
+[assembly: AssemblyVersion("2.4.1.1")]

DataEditorX/app.config

@@ -46,5 +46,7 @@
 		<!-- MSE path-->
 		<add key="mse_path" value="./MagicSetEditor2/mse.exe"/>
 		<add key="mse_exprotpath" value="./exprot"/>
+		<add key="mse_auto_rarity" value="true"/>
+		<add key="pack_db" value="./pack.cdb"/>
 	</appSettings>
 </configuration>
\ No newline at end of file

DataEditorX/changed.txt

 ★更新历史
+2.4.1.1
+新增卡包数据库，支持导出带卡包信息和rarity
 2.4.1.0
 更新数据
 2.4.0.9

DataEditorX/readme.txt

-[DataEditorX]2.4.1.0[DataEditorX]
+[DataEditorX]2.4.1.1[DataEditorX]
 [URL]https://github.com/247321453/DataEditorX/raw/master/win32/win32.zip[URL]
 
 ★运行环境(Environment)

win32/DataEditorX.exe.config

@@ -46,5 +46,7 @@
 		<!-- MSE path-->
 		<add key="mse_path" value="./MagicSetEditor2/mse.exe"/>
 		<add key="mse_exprotpath" value="./exprot"/>
+		<add key="mse_auto_rarity" value="true"/>
+		<add key="pack_db" value="./pack.cdb"/>
 	</appSettings>
 </configuration>
\ No newline at end of file

win32/changed.txt

 ★更新历史
+2.4.1.1
+新增卡包数据库，支持导出带卡包信息和rarity
 2.4.1.0
 更新数据
 2.4.0.9

win32/data/history.txt

-# database history
-D:\code\a.cdb
-D:\code\italian.cdb
-# script history
\ No newline at end of file

win32/readme.txt

-[DataEditorX]2.4.1.0[DataEditorX]
+[DataEditorX]2.4.1.1[DataEditorX]
 [URL]https://github.com/247321453/DataEditorX/raw/master/win32/win32.zip[URL]
 
 ★运行环境(Environment)