Merge pull request #17 from shadowfox87/master

Added type5+English text fixes

DataEditorX/Core/Mse/MseMaker.cs

@@ -42,6 +42,7 @@ public class MseMaker
 		public const string TAG_TYPE3 = "type 3";
 		/// <summary>效果3</summary>
 		public const string TAG_TYPE4 = "type 4";
+		public const string TAG_TYPE5 = "type 5";
 		public const string TAG_TEXT = "rule text";
 		public const string TAG_ATK = "attack";
 		public const string TAG_DEF = "defense";
@@ -416,6 +417,7 @@ string getMonster(Card c, string img, bool isPendulum,CardPack cardpack=null,boo
 			sb.AppendLine(GetLine(TAG_TYPE2, cn2tw(types[1])));
 			sb.AppendLine(GetLine(TAG_TYPE3, cn2tw(types[2])));
 			sb.AppendLine(GetLine(TAG_TYPE4, cn2tw(types[3])));
+			sb.AppendLine(GetLine(TAG_TYPE5, cn2tw(types[4])));
 			if(cardpack!=null){
 				sb.AppendLine(GetLine(TAG_NUMBER, cardpack.pack_id));
 				if(rarity){
@@ -650,7 +652,8 @@ public Card ReadCard(string content, out string img)
 			c.type = GetCardType(GetValue(content, TAG_CARDTYPE), tmp,
 			                     GetValue(content, TAG_TYPE2),
 			                     GetValue(content, TAG_TYPE3),
-			                     GetValue(content, TAG_TYPE4));
+			                     GetValue(content, TAG_TYPE4),
+								 GetValue(content, TAG_TYPE5));
 			long t = GetSpellTrapType(GetValue(content, TAG_LEVEL));
 			//不是魔法，陷阱卡片的星数
 			if (!(c.IsType(CardType.TYPE_SPELL)

win32/data/cardinfo_english.txt

@@ -5,17 +5,20 @@
 0x2	TCG
 0x3	OCG&TCG
 0x4	Anime/DIY
+0x8 Illegal
+0x16 VG
+0x32 Custom
 ##attribute
 0x0	Attribute
 0x1	EARTH
 0x2	WATER
 0x4	FIRE
 0x8	WIND
-0x10	LIGHT
-0x20	DARK
-0x40	DIVINE
+0x10 LIGHT
+0x20 DARK
+0x40 DIVINE
 ##level
-0x0	Level/Rank/Link
+0x0	Level/Rank
 0x1	1★
 0x2	2★
 0x3	3★
@@ -97,7 +100,7 @@
 0x200000	Divine-Beast
 0x400000	Creator God
 0x800000	Wyrm
-0x1000000	Cybers
+0x1000000	Cyberse
 ##type
 0x1	Monster   
 0x2	Spell     

win32/data/mse_English.txt

@@ -5,7 +5,7 @@
 ########################### Chs 2 Cht 
 cn2tw = false
 ########################### Setting
-maxcount = 200
+maxcount = 0
 imagepath = ./Images
 ########################### Artwork
 reimage = false
@@ -14,10 +14,10 @@ height = 317
 pwidth = 363
 pheight= 275
 ########################### Spell/Trap
-spell = [Spell Card%%]
-trap = [Trap Card%%]
+spell = %%
+trap = %%
 ############################ language,style,other setting
-head = mse version: 0.3.8\r\ngame: yugioh\r\nstylesheet: standard\r\nset info:\r\n\tlanguage: EN\r\n\tedition: \r\n\tST mark is text: no\r\n\tpendulum image is small: yes
+head = mse version: 0.3.8\r\ngame: yugioh\r\nstylesheet: standard\r\nset info:\r\n\tlanguage: EN\r\n\tedition: \r\n\tST mark is text: yes\r\n\tpendulum image is small: no
 end = version control:\n\ttype: none\napprentice code: 
 ############################ Text
 text = Pendulum Text :\n%ptext%\nMonster Text :\n%text%\n

win32/data/mse_Italian.txt

+###########################
+# Magic Set Editor 2
+# Italian
+# \t = Tab \n = Enter [:space:] = Space
+########################### Chs 2 Cht 
+cn2tw = false
+########################### Setting
+maxcount = 0
+imagepath = ./Images
+########################### 中间图
+width = 544
+height = 544
+pwidth = 544
+pheight= 544
+########################### Spell/Trap
+spell = [Carta Magia%%]
+trap = [Carta Trappola%%]
+############################ language,style,other setting
+head = mse version: 0.3.8\r\ngame: yugioh\r\nstylesheet: standard\r\nset info:\r\n\tlanguage: IT\r\n\tedition: \r\n\tST mark is text: yes\r\n\tpendulum image is small: no
+end = version control:\n\ttype: none\napprentice code: 
+############################ Text
+text = Pendulum Text :\n%ptext%\nMonster Text :\n%text%\n
+############################
+pendulum-text = \[ Effetto Pendulum \]\s*\n(?:-n/a-)*([\S\s]*?)\n---
+monster-text = (?:Effetto Mostro|Testo Carta) \]\s*\n([\S\s]*)
+########################### Replace
+#replace = \s <sym-auto>^</sym-auto>
+#replace = ([A-Z]) <i>$1</i>
+###########################
+##race
+race 0x1 Guerriero
+race 0x2 Incantatore
+race 0x4 Fata
+race 0x8 Demone
+race 0x10 Zombie
+race 0x20 Macchina
+race 0x40 Acqua
+race 0x80 Pyro
+race 0x100 Roccia
+race 0x200 Bestia Alata
+race 0x400 Pianta
+race 0x800 Insetto
+race 0x1000 Tuono
+race 0x2000 Drago
+race 0x4000 Bestia
+race 0x8000 Guerriero-Bestia
+race 0x10000 Dinosauro
+race 0x20000 Pesce
+race 0x40000 Serpente Marino
+race 0x80000 Rettile
+race 0x100000 Psichico
+race 0x200000 Bestia-Divinità
+race 0x400000 Creatore Divino
+race 0x800000 Wyrm
+###########################
+##type
+type 0x1 Mostro   
+type 0x2 Magia     
+type 0x4 Trappola     
+type 0x8 N/A
+type 0x10 Normale   
+type 0x20 Effetto    
+type 0x40 Fusione    
+type 0x80 Rituale   
+type 0x100 T-Monster 
+type 0x200 Spirit
+type 0x400 Union	
+type 0x800 Gemello    
+type 0x1000 Tuner     
+type 0x2000 Synchro   
+type 0x4000 Segna-Mostro   
+type 0x8000 N/A
+type 0x10000 Quick-Play
+type 0x20000 Continuous
+type 0x40000 Equip     
+type 0x80000 Field     
+type 0x100000 Counter   
+type 0x200000 Scoperta      
+type 0x400000 Toon      
+type 0x800000 Xyz       
+type 0x1000000 Pendulum 
+##########################
\ No newline at end of file