fix

jacmaz · Apr 2, 2017 · ca7c981 · ca7c981
1 parent 95f85bc
commit ca7c981
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/DataEditorX/Core/Mse/MseMaker.cs b/DataEditorX/Core/Mse/MseMaker.cs
@@ -615,18 +615,16 @@ long GetMonsterType(string cardtype)
 			return type;
 		}
 		//卡片类型
-		long GetCardType(string cardtype, string level, string type1,
-		                 string type2, string type3)
+		long GetCardType(string cardtype, string level, params string[] types)
 		{
 			long type = 0;
 			//魔法陷阱
 			type |= GetSpellTrapType(level);
 			//怪兽
 			type |= GetMonsterType(cardtype);
-			//type2-4是识别怪兽效果类型
-			type |= GetTypeInt(type1);
-			type |= GetTypeInt(type2);
-			type |= GetTypeInt(type3);
+			//types是识别怪兽效果类型
+			foreach(string typ in types)
+				type |= GetTypeInt(typ);
 			return type;
 		}
 

diff --git a/DataEditorX/data/cardinfo_english.txt b/DataEditorX/data/cardinfo_english.txt
@@ -1,4 +1,4 @@
-################ use tab
+################ use tab
 ##rule
 0x0	Rule
 0x1	OCG
@@ -97,7 +97,7 @@
 0x200000	Divine-Beast
 0x400000	Creator God
 0x800000	Wyrm
-0x1000000	Cybers
+0x1000000	Cyverse
 ##type
 0x1	Monster   
 0x2	Spell     

diff --git a/win32/DataEditorX.exe b/win32/DataEditorX.exe
diff --git a/_function_english → win32/data/_function_english.txt b/_function_english → win32/data/_function_english.txt
diff --git a/_scripts_english → win32/data/_scripts_english.txt b/_scripts_english → win32/data/_scripts_english.txt