Merge pull request #3 from shadowfox87/master

Upgrade to 421x614+Link fixes

data/yugioh-standard-levels.mse-symbol-font/symbol-font

@@ -7,7 +7,7 @@ installer group: Yugioh/Symbol Fonts/Level Symbols
 # Symbol font for level symbols
 
 image font size: 16
-horizontal space: 0
+horizontal space: 3
 
 symbol:
 	code: %
@@ -74,7 +74,7 @@ symbol:
 	code: *
 	image: dstar.png
 	enabled: {card.card_type == "dark synchro monster"}
-	image font size: 17.95
+	image font size: 16.5
 symbol:
 	code: *
 	image: xyzstar.png

data/yugioh-standard.mse-style/style

@@ -11,7 +11,7 @@ depends on:
 	version: 2009-08-08
 
 card width: 421
-card height: 610
+card height: 614
 card dpi: 178.0156
 
 # 5.9 8.6
@@ -126,7 +126,7 @@ card style:
 		left: 0
 		top: 0
 		width: 421
-		height: 610
+		height: 614
 		z index: -2
 		render style: image
 		popup style: in place
@@ -151,32 +151,32 @@ card style:
 			script:
 				if foil_is_full() then 0 
 				else if is_transparent() then 14
-				else if image_noframe() and is_nopendulum() then 44
-				else if is_nopendulum() then 51.6
-				else 29.5
+				else if image_noframe() and is_nopendulum() then 45.5
+				else if is_nopendulum() then 50
+				else 29
 		top:
 			script:
 				if foil_is_full() then 0 
 				else if is_transparent() then 14
-				else if image_noframe() and is_nopendulum() then 105
-				else if is_nopendulum() then 113
-				else 107
+				else if image_noframe() and is_nopendulum() then 107.5
+				else if is_nopendulum() then 112
+				else 112
 		width:
 			script:
 				if foil_is_full() then 421
 				else if is_transparent() then 393
 				else if image_noframe() and is_nopendulum() then 332
-				else if is_nopendulum() then 319
-				else 363
+				else if is_nopendulum() then 320
+				else 365.5
 		height:
 			script:
-				if foil_is_full() then 610
-				else if is_transparent() then 610
-				else if image_noframe() and is_nopendulum() then 330
+				if foil_is_full() then 614
+				else if is_transparent() then 586
+				else if image_noframe() and is_nopendulum() then 332
 				else if is_big_pend() then  273
 				else if is_medium_pend() then  273
-				else if is_small_pend() then  293
-				else 317
+				else if is_small_pend() then  293.5
+				else 320
 		z index: 5
 		render style: image
 		popup style: in place
@@ -195,10 +195,10 @@ card style:
 	############################# Name line
 	name:
 		left: 31.5
-		top: {if is_jp() then 30 else if is_tw() then 30 else 31.5 }
-		width: 315
-		height: script: if is_jp() then 36 else 37
-		alignment: middle shrink-overflow
+		top: 31.5
+		width: 314.5
+		height: 38
+		alignment: left middle shrink-overflow
 		padding bottom: 0
 		z index: 2
 		font:
@@ -210,40 +210,39 @@ card style:
 					else if is_cn() then "方正隶变_GBK" 
 					else "MatrixRegularSmallCaps"
 			italic name: { if is_tw() then "Yu-Gi-Oh! DFG Leisho 5" else "Yu-Gi-Oh! DFG Leisho 4" }
-			size: { if is_tw() or is_cn() or is_jp() then 24 else if is_ko() then 27 else 29 }
+			size: { if is_tw() or is_cn() or is_jp() then 24 else if is_ko() then 27 else 38	 }
 			color:
-				script: if use_name_color() then styling.name_color
-				else if card.rarity=="rare" then rgb(206,212,217)
-				else if card.rarity=="star rare" and is_blmonster() then rgb(255,255,255)
-				else if card.rarity=="star rare" then rgb(35,40,49)
-				else if card.rarity=="mosaic rare" and is_blmonster() then rgb(255,255,255)
-				else if card.rarity=="mosaic rare" then rgb(10,10,10)
-				else if card.rarity=="promo" then rgb(60,0,0)
-				else if card.rarity=="secret rare" then rgb(102,255,255)
-				else if card.rarity=="ghost rare (No foil)" then rgb(133,168,169)
-				else if card.rarity=="ultra rare" then rgb(255,240,0)
+				script: 
+					if use_name_color() then styling.name_color
+					else if hide_foil() and is_blmonster() or is_nmonster() then rgb(255,255,255)
+					else if hide_foil() and not is_blmonster() then rgb(0,0,0)
+					else if card.card_type=="normal monster" and card.rarity=="ultra rare" then rgb(231,204,1)
+					else if card.card_type=="synchro monster" and card.rarity=="secret rare" then rgb(0,0,0)
+					else if card.card_type=="synchro monster" and card.rarity=="collectors rare" then rgb(0,0,0)
+					else if card.card_type=="synchro monster" and card.rarity=="ghost rare" then rgb(0,0,0)
+					else if card.card_type=="synchro monster" and card.rarity=="rare" then rgb(0,0,0)
+					else if card.rarity=="rare" then rgb(188,198,204) ##silver text if enable then disable shadow
+					else if card.card_type=="synchro monster" and card.rarity=="ultra rare" then rgb(158,141,33)
+					else if card.rarity=="secret rare" then rgb(211,252,252)
+					else if card.rarity=="collectors rare" then rgb(211,252,252)
+					else if card.rarity=="ghost rare" then rgb(211,252,252)
+					##else if card.rarity=="ultra rare" then rgb(88,76,12)
+					else if card.rarity=="ultra rare" then rgb(228,190,5) ##yellow text if enable disable shadow
+					##else if card.rarity=="ultra rare" then rgb(231,204,1)
 					else if card.rarity=="ultimate rare" then rgb(88,76,12)
-				else if card.rarity=="ultimate rare (No foil)" then rgb(69,60,0)
-				else if card.rarity=="parallel rare" then rgb(88,76,12)
 					else if card.rarity=="gold rare" then rgb(88,76,12)
 					else if is_blmonster() then rgb(255,255,255) 
 					else if is_nmonster() then rgb(255,255,255) 
 					else rgb(0,0,0)
 			shadow color: 
 				script: 
-					if no_shadow() then rgba(0,0,0,0) #没阴影
+					if no_shadow() or hide_foil() then rgba(0,0,0,0) #没阴影
 					else if set_shadow() then  styling.shadow_color  #自定义阴影颜色
-					else if card.rarity=="star rare" and is_blmonster() then rgb(255,255,255)
-					else if card.rarity=="star rare" then rgb(255,255,255)
-					else if card.rarity=="mosaic rare" and is_blmonster() then rgb(255,255,255)
-					else if card.rarity=="mosaic rare" then rgb(255,255,255)
-					else if card.rarity=="promo" then rgb(255,200,210)
-					###else if card.rarity=="secret rare" then rgb(182,162,255)
-					else if card.rarity=="ghost rare (No foil)" then rgb(234,255,255)
-					###else if card.rarity=="ultra rare" then rgb(255,215,0)
+					else if card.rarity=="ultra rare" and card.card_type=="normal monster" then rgba(0,0,0,0)
+					##else if card.rarity=="rare" then rgb(188,198,204) ##silver shadow
+					##else if card.rarity=="rare" then rgb(180,175,172)
+					##else if card.rarity=="ultra rare" then rgb(255,215,0)
 					else if card.rarity=="ultimate rare" then rgb(255,215,0)
-					else if card.rarity=="ultimate rare (No foil)" then rgb(255,243,110)
-					else if card.rarity=="parallel rare" then rgb(255,215,0)
 					else if card.rarity=="gold rare" then rgb(255,215,0)
 					else rgba(0,0,0,0)
 			shadow displacement x: 0.3
@@ -251,14 +250,14 @@ card style:
 			shadow blur: 2
 		symbol font:
 			name: yugioh-text-replacements
-			alignment: middle center
+			alignment: right middle center
 			scale down to: 1
 			size: 6
 	attribute:
-		left: 350
-		top : 29
-		width: 38.5
-		height: 38.5
+		left: 352
+		top : 29.5
+		width: 39
+		height: 39
 		z index: 2
 		render style: image
 		popup style: in place
@@ -273,21 +272,12 @@ card style:
 			spell: { "attribute/spell_"+get_lang_ex()+".png"}
 			trap: { "attribute/trap_"+get_lang_ex()+".png"}
 	level:
-		left: 
-			script:
-			if is_12star() then if card.card_type == "dark synchro monster" then "36" else "41" 
-			else if is_13star() then if card.card_type == "dark synchro monster" then "22" else "27" 
-			else "44"
-		top : 72
-		height: 32.5
-		width:
-			script:
-				if is_nmonster() then "331"
-				else if is_12star() then if card.card_type == "dark synchro monster" then "348" else "338" 
-				else if is_13star() then if card.card_type == "dark synchro monster" then "376" else "366" 
-				else "334.5"
+		left: 44.5
+		top : 76.5
+		height: 26
+		width: 331.5
 		z index: 3
-		alignment: { if is_blmonster() then "middle left" else "middle right" }
+		alignment: { if is_blmonster() then "middle left shrink-overflow" else "middle right shrink-overflow" }
 		font:
 			name: 
 				script:
@@ -324,9 +314,21 @@ card style:
 	image:
 		left:
 			script:
+
+				if is_transparent() then if is_pendulum() then 29 else 14
+				else if image_noframe() and is_nopendulum() then 45.5
+				else if is_nopendulum() then 51
+				else 28
+		top:
+			script:
+				if is_transparent() then if is_pendulum() then 110 else 14
+				else if image_noframe() and is_nopendulum() then 107.5
+				else if is_nopendulum() then 112.5
+				else 109.5
+
 				if is_transparent() then if is_pendulum() then 28.5 else 14
 				else if image_noframe() and is_nopendulum() then 44
-				else if is_nopendulum() then 51
+				else if is_nopendulum() then 50
 				else 28.5
 		top:
 			script:
@@ -334,38 +336,35 @@ card style:
 				else if image_noframe() and is_nopendulum() then 105
 				else if is_nopendulum() then 112
 				else 106.5
+
 		width:
 			script:
-				if is_transparent() then if is_pendulum() then 363 else 393
+				if is_transparent() then if is_pendulum() then 365.5 else 392
 				else if image_noframe() and is_nopendulum() then 332
 				else if is_nopendulum() then 320
-				else 363
+
+				else 365.5
 		height:
 			script:
-				if is_transparent() then if is_pendulum() then 466 else 582
-				else if image_noframe() and is_nopendulum() then 330
+				if is_transparent() then if is_pendulum() then 466 else 585
+				else if image_noframe() and is_nopendulum() then 332
 				else if is_nopendulum() then 320
-				else if pend_image_is_small() and is_big_pend() then  275
-				else if pend_image_is_small() and is_medium_pend() then  275
-				else if pend_image_is_small() and is_small_pend() then  298
-				else if is_big_pend() then  360
-				else if is_medium_pend() then  345
-				else if is_small_pend() then  345
+				else if pend_image_is_small() and is_big_pend() then  273
+				else if pend_image_is_small() and is_medium_pend() then  273
+				else if pend_image_is_small() and is_small_pend() then  293.5
+				else if is_big_pend() then  360.5
+				else if is_medium_pend() then  344.5
+				else if is_small_pend() then  344.5
 				else 320
-		z index: 1
+		z index: -1
 		mask: {if is_link() then "mask-link.png"}
 	############################# Card type
 	monster type:
-		left: { if is_jp() then 32 else 34 }
-		top :
-			script:
-				if is_big_pend() then 
-					if is_en() then 477 else 479
-				else
-					if is_en() then 460 else 463
-		width: { card_style.monster_type.content_width + 8 }
+		left: 33
+		top: script: if is_big_pend() then 479.5 else 464.5
+		width: 353
 		height: 14
-		alignment: middle left
+		alignment: middle left shrink-overflow
 		z index: 2
 		font:
 			name:
@@ -376,7 +375,7 @@ card style:
 					else if is_cn() then "方正隶变_GBK" 
 					else "Yu-Gi-Oh!ITCStoneSerifSmallCapsBold"
 			italic name: { if is_en() or is_ko() then "ITC Stone Serif" else if is_cn() then "DFPLiShuW5-B5" else "Yu-Gi-Oh! DFG Leisho 4" }
-			size: { if is_cn() then 13.5 else if is_jp() or is_tw() then 13 else 12.5 }
+			size: { if is_cn() then 13.5 else if is_jp() or is_tw() then 13 else 14 }
 			color: rgb(0,0,0)
 		symbol font:
 			name: yugioh-text-replacements
@@ -385,35 +384,35 @@ card style:
 		visible: script: if is_nmonster() then false else true
 	############################# Edition and Card ID
 	number:
-		left: script: if is_nopendulum() then 261 else 38
-		top : script: if is_nopendulum() then 437 else 556
-		width: 116
-		height: 16
+		left: script: if is_transparent() then 302 else if is_link() then 269.5 else if is_nopendulum() then 302 else 35
+		top : script: if is_nopendulum() then 442 else 563
+		width: 74
+		height: 10
 		z index: 2
-		alignment: script: if is_nopendulum() then "top right" else "top left"
+		alignment: {if is_pendulum() then "shrink-overflow left middle" else "shrink-overflow right middle"}
 		font:
 			name: ITC Stone Serif
 			size: 10
-			color: script: if is_pendulum() then rgb(0,0,0) else if is_blmonster() or is_transparent() then rgb(255,255,255)else rgb(0,0,0)
+			color: script: if is_pendulum() then rgb(0,0,0) else if is_blmonster() then rgb(255,255,255)else rgb(0,0,0)
 	edition:
-		left: 80
-		top : script: if is_nopendulum() then 579 else 580
-		width: 116
-		height: 16
+		left: 84.5
+		top : {if is_transparent() then 586 else 587}
+		width: 90
+		height: 9
 		z index: 2
-		alignment: top left
+		alignment: left middle
 		font:
 			name: { if card.edition=="DUEL TERMINAL" then "BankGothic Md BT" else "Palatino Linotype Bold" }
-			size: { if card.edition=="DUEL TERMINAL" then "12" else "10" }
-			color: script: if is_pendulum() then rgb(0,0,0) else if is_blmonster() or is_transparent() then rgb(255,255,255)else rgb(0,0,0)
+			size: { if card.edition=="DUEL TERMINAL" then "12" else "9" }
+			color: script: if is_pendulum() then rgb(0,0,0) else if is_blmonster() then rgb(255,255,255) else rgb(0,0,0)
 	############################# Text box
 	rule text:
 		left: 34
 		top :
-			script: if is_nmonster() then 461 else  if is_big_pend() then 496 else 479
+			script: if is_nmonster() then 466 else if is_big_pend() then 495.5 else 480.5
 		width: 353
 		height:
-			script: if is_nmonster() then 110 else  if is_big_pend() then 57 else 73
+			script: if is_nmonster() then 107.5 else if is_big_pend() then 59 else 77
 		font:
 			name: 
 				script:
@@ -423,7 +422,7 @@ card style:
 					else if is_cn() then "方正隶变_GBK"
 					else "MatrixBook"
 			italic name: { if is_en() then "ITC Stone Serif Italic" else if is_tw() then "Yu-Gi-Oh! DFG Leisho 5" else "Yu-Gi-Oh! DFG Leisho 4" }
-			size: { if is_ko() then "10.5" else if is_en() then "12" else if is_tw() then "12" else "11.5"}
+			size: { if is_ko() then "10.5" else if is_en() then "11.5" else if is_tw() then "12" else "11.5"}
 			scale down to: 3
 			color: rgb(0,0,0)
 		symbol font:
@@ -443,16 +442,16 @@ card style:
 		line height line max: 1.1
 	############################# Attack/Defense
 	attack:
-		left: 263.5
-		top: 554
-		width: 38
-		height: 21.5
+		left: 265
+		top: 562
+		width: 37
+		height: 13
 		z index: 3
-		alignment: right middle
+		alignment: right middle shrink-overflow
 		font:
 			name: MatrixBoldSmallCaps
 			italic name: Matrix-Bold
-			size: 14.5
+			size: 14
 			color: rgb(32,32,32)
 		symbol font:
 			name: yugioh-text-replacements
@@ -460,16 +459,16 @@ card style:
 			size: 3
 		visible: script: if is_nmonster() then false else true
 	defense:
-		left: 350
-		top: 554
-		width: 38
-		height: 21.5
+		left: 349
+		top: 562
+		width: 37
+		height: 13
 		z index: 3
-		alignment: right middle
+		alignment: right middle shrink-overflow
 		font:
 			name: MatrixBoldSmallCaps
 			italic name: Matrix-Bold
-			size: 14.5
+			size: 14
 			color: rgb(32,32,32)
 		symbol font:
 			name: yugioh-text-replacements
@@ -479,14 +478,14 @@ card style:
 	###################### Link
 	link number:
 		left: 375.5
-		top: 553.6
-		height: 21.5
+		top: 562
+		height: 11.5
 		width: 12
 		z index: 3
 		alignment: right middle
 		font:
 			name: Eurostile Candy W01 Semibold
-			size: 12.5
+			size: 11.5
 			color: rgb(20,20,20)
 		symbol font:
 			name: yugioh-text-replacements
@@ -528,8 +527,13 @@ card style:
 			yes: link_marker_ur.png
 		visible: script: if is_link() then true else false
 	Link Marker Down:
+<<<<<<< HEAD
+		left: 165
+		top: 433
+=======
 		left: 163.5
-		top: 435
+		top: 430
+>>>>>>> origin/master
 		width: 91.5
 		height: {if is_link() then 22.5 else 0}
 		z index: 5
@@ -585,10 +589,10 @@ card style:
 	############################# Card sorting / numbering
 	############################# Copyright stuff
 	rarity:
-		left: 388
-		top : script: if is_nopendulum() then 575 else 576.5
-		height: 21
-		width: 21
+		left: 384
+		top : 577
+		height: 22.5
+		width: 22.5
 		z index: 3
 		render style: image
 		popup style: in place
@@ -603,10 +607,10 @@ card style:
 			gold tech: blank2.png
 			promo: blank2.png
 	corner foil:
-		left: 388
-		top : script: if is_nopendulum() then 575 else 576.5
-		height: 21
-		width: 21
+		left: 384
+		top : 577
+		height: 22.5
+		width: 22.5
 		z index: 6
 		render style: image list
 		choice images:
@@ -616,15 +620,15 @@ card style:
 				else if card.rarity=="common" then "cornerdefault.png"
 				else "cornerunlimited.png"
 	copyright:
-		left: 216
-		top : script: if is_nopendulum() then 577 else 578.5
-		width: 169
-		height: 21
+		left: 223
+		top : {if is_transparent() then 586 else 588}
+		width: 149.5
+		height: 9
 		z index: 4
 		alignment: middle right
 		font:
 			name: {if is_en() or is_ko() then "ITC Stone Serif" else "FOT-Rodin Pro M" }
-			size: {if is_en() then 9 else 7.4 }
+			size: 9
 			color: script: if is_pendulum() then rgb(0,0,0) else if is_blmonster() then rgb(255,255,255) else rgb(0,0,0)
 	###################### pendulum
 	pendulum:
@@ -637,10 +641,10 @@ card style:
 		popup style: in place
 		choice images:
 	pendulum text:
-		left: 67
-		top: script: if is_small_pend() then 408 else 387
-		width: script: if is_nopendulum() then 0 else 288
-		height: script: if is_small_pend() then 42 else if is_big_pend() then 79 else 63
+		left: 66
+		top: script: if is_small_pend() then 404.5 else 391.5
+		width: script: if is_nopendulum() then 0 else 286.5
+		height: script: if is_small_pend() then 47 else if is_big_pend() then 76 else 60
 		font:
 			name: 
 				script:
@@ -649,8 +653,8 @@ card style:
 					else if is_ko() then "SD Book-L"
 					else if is_cn() then "方正隶变_GBK"					
 					else "MatrixBook" 
-			size: { if is_ko() then "8" else if is_en() then "10" else "9" }
-			scale down to: 5
+			size: 8
+			scale down to: 3
 			color: rgb(0,0,0)
 		symbol font:
 			name: yugioh-text-replacements
@@ -670,41 +674,41 @@ card style:
 		line height line max: 1.1
 		visible: script: if is_nopendulum() then false else true
 	pendulum scale 1:
-		left: 32.5
-		top: script: if is_big_pend() then 415 else if is_small_pend() then 417 else 408
-		width: 28
-		height:   script: if is_big_pend() then 38 else if is_small_pend() then 34 else 36
+		left: 31.5
+		top: script: if is_big_pend() then 430.5 else if is_small_pend() then 432.5 else 421.5
+		width: 25
+		height: 19
 		z index: 3
-		alignment: bottom center
+		alignment: center middle shrink-overflow
 		font:
 			name: MatrixBoldSmallCaps
 			italic name: Matrix-Bold
-			size: 21
+			size: 19
 			color: rgb(0,0,0)
 		visible: script: if is_nopendulum() then false else true
 	pendulum scale 2:
-		left: 361.5
-		top: script: if is_big_pend() then 415 else if is_small_pend() then 417 else 408
-		width: 28
-		height:  script: if is_big_pend() then 38 else if is_small_pend() then 34 else 36
+		left: 364.5
+		top: script: if is_big_pend() then 430.5 else if is_small_pend() then 432.5 else 421.5
+		width: 25
+		height: 19
 		z index: 3
-		alignment: bottom center
+		alignment: center middle shrink-overflow
 		font:
 			name: MatrixBoldSmallCaps
 			italic name: Matrix-Bold
-			size: 21
+			size: 19
 			color: rgb(0,0,0)
 		visible: script: if is_nopendulum() then false else true
 	gamecode:
-		left: 18.5
-		top : 578
-		width: 56
-		height: 21
+		left: 18
+		top : {if is_transparent() then 586 else 587.5}
+		width: 60.5
+		height: 9
 		alignment: middle left
 		z index: 2
 		font:
 			name: ITC Stone Serif
-			size: 8.5
+			size: 9
 			color: script: if is_pendulum() then rgb(0,0,0) else if is_blmonster() then rgb(255,255,255) else rgb(0,0,0)
 		visible: script: not hide_gamecode()
 	######################
@@ -886,7 +890,7 @@ extra card style:
 		visible:script: if is_pendulum() then false else if is_transparent() then true else false
 	desc bg:
 		left: 23
-		top: 451.5
+		top: 455
 		width: 373
 		height: 126
 		z index: 1
@@ -894,16 +898,6 @@ extra card style:
 		choice images:
 			bg:desc.png
 		visible:script: if is_pendulum() then false else if is_transparent() then true else false
-	pendulum bg:
-		left: 14.5
-		top: 273
-		width: 392
-		height: 324
-		z index: -1
-		render style:image list
-		choice images:
-			bg: pendulum/pendulum.png
-		visible: script: if is_nopendulum() or is_link() then false else true
 	bar:
 		left: 35
 		top : 554
@@ -915,10 +909,10 @@ extra card style:
 			bar: bar.png
 		visible: script: if is_pendulum() then false else if is_transparent() then true else false
 	atkoverlay:
-		left: 204.5
-		top: 554
+		left: 209
+		top: 562
 		width: 56
-		height: 21
+		height: 13
 		z index: 2
 		alignment: right middle
 		font:
@@ -928,10 +922,10 @@ extra card style:
 			color: rgb(32,32,32)
 		visible: script: if is_pendulum() then false else if is_transparent() then true else false
 	defoverlay:
-		left: 290.5
-		top: 554
+		left: 294
+		top: 562
 		width: 56
-		height: 21
+		height: 13
 		z index: 2
 		alignment: right middle
 		font:
@@ -992,10 +986,10 @@ extra card style:
 		z index: 0
 		visible: script: if is_nopendulum() then false else if pend_image_is_small() then true else false	
 	pendulum border:
-		left: 19
-		top: 100
-		width: 383
-		height: 484
+		left: 0
+		top: 0
+		width: 421
+		height: 614
 		z index: 1
 		render style:image
 		choice images:

data/yugioh.mse-game/card_fields

@@ -131,6 +131,11 @@ card field:
 	name: type 4
 	script: card_class_filter(value)
 	default: if contains(card.type2, match:get_sep()) then split_text(match:get_sep(), card.type2).2 else "" # Remove when card.type2 is removed.
+card field:
+	type: text
+	name: type 5
+	script: card_class_filter(value)
+	default: if contains(card.type2, match:get_sep()) then split_text(match:get_sep(), card.type3).3 else "" # Remove when card.type2 is removed.
 card field:
 	type: text
 	name: monster type
@@ -148,6 +153,8 @@ card field:
 			field3: card.type_3,
 			separator3: get_sep(),
 			field4: card.type_4,
+			separator4: get_sep(),
+			field5: card.type_5,
 			soft_before_empty: true,
 			hide_when_empty: true
 		)
@@ -160,6 +167,8 @@ card field:
 			field3: card.type_3,
 			separator3: get_sepex(card.type_4),
 			field4: card.type_4,
+			separator4: get_sepex(card.type_5),
+			field5: card.type_5,
 			prefix: if remove_tags(card.type_1)=="    " then "" else if is_jp() then "【" else if is_en() then "[" else "<sym-auto>[</sym-auto>",
 			suffix: if remove_tags(card.type_1)=="    " then "" else if is_jp() then "】" else if is_en() then "]" else "<sym-auto>]</sym-auto>",
 			soft_before_empty: true,
@@ -392,6 +401,13 @@ card field:
 	editable: false
 	default: small_type(card.type_4)
 	save value: false
+card field:
+	type: text
+	name: small type 5
+	show statistics: false
+	editable: false
+	default: small_type(card.type_5)
+	save value: false
 ############################
 card field:
 	type: text

data/yugioh.mse-game/script

@@ -11,6 +11,7 @@
 	is_ko := { set.language == "KO" }
 
 	hide_gamecode := {set.hide_gamecode == "yes"}
+	hide_foil := {set.hide_foil == "yes"}
 	st_has_text :={ set.ST_mark_is_text=="yes"}
 	
 	get_sep := {if is_en() or is_ko() then " / " else if is_cn()then "<i>／</i>" else "／" }

data/yugioh.mse-game/set_fields

@@ -12,7 +12,7 @@ set field:
 set field:
 	type: choice
 	name: language
-	initial: TW
+	initial: EN
 	choice: CN
 	choice: TW
 	choice: JP
@@ -22,12 +22,12 @@ set field:
 set field:
 	type: text
 	name: edition
-	default: "AM Edition"
+	default: "LIMITED Edition"
 	description: such as "DUEL TERMINAL"
 set field:
 	type: text
 	name: author
-	default: "Your Name"
+	default: "AntiMetaman"
 	description: 247321453
 set field:
 	type: text
@@ -56,11 +56,31 @@ set field:
 	name: hide gamecode
 	description: 隐藏密码，最好先写好密码，再导出的时候再设置这个
 	initial: no
+set field:
+	type: boolean
+	name: hide copyright
+	description: 隐藏密码，最好先写好密码，再导出的时候再设置这个
+	initial: no
+set field:
+	type: boolean
+	name: hide edition
+	description: 隐藏密码，最好先写好密码，再导出的时候再设置这个
+	initial: no
+set field:
+	type: boolean
+	name: hide number
+	description: 隐藏密码，最好先写好密码，再导出的时候再设置这个
+	initial: false
+set field:
+	type: boolean
+	name: hide foil
+	description: 隐藏密码，最好先写好密码，再导出的时候再设置这个
+	initial: false
 set field:
 	type: boolean
 	name: ST mark is text
 	description: 魔法陷阱的符号带标志文字？用于OCG制作
-	initial: no
+	initial: yes
 set field:
 	type: boolean
 	name: copyright images
@@ -70,7 +90,7 @@ set field:
 	type: boolean
 	name: pendulum image is small
 	description: pendulum image is small? Pendulum怪兽的中间图，不包含P的描述区域？用于YGOCORE
-	initial: no
+	initial: yes
 ############################# Default style
 default set style:
 	Set Options:

data/yugioh.mse-game/word/word_lists_chs

@@ -25,6 +25,7 @@ word list:
 	word: 幻神兽族
 	word: 创造神族
 	word: 幻龙族
+	word: 电子界
 word list:
 	name: CNeffect
 	word: 同调
@@ -32,7 +33,9 @@ word list:
 	word: 融合
 	word: 仪式
 	word: 效果
+	word: 连接
 	word: 调整
+	word: 连接
 	word: 灵魂
 	word: 卡通
 	word: 二重

download.bat

 @echo off
-cd update
-echo check...
+cd /d "%~dp0/update"
 if exist update_new.exe move /y update_new.exe update.exe
-echo start download
-update.exe
-pause
+start update.exe -d "%~dp0" "https://github.com/247321453/MagicSetEditor2/raw/master/"
+exit
\ No newline at end of file
\ No newline at end of file

update/filelist.txt

-download.bat	d1c992076cc70ef6b984e9673b70d514
+download.bat	b1f5d2f80a611e8b612f84773536c772
 fix don't open.bat	50e92b9e76dec9b7eeba085185aa800d
-magicseteditor	532d2ad3e8b44bee4d7f51e8c42fe306
 mse.com	703a80e5519325d46a1775417bda8ded
 mse.exe	bea83bc4fcfc6d5921f8998ebb269bcd
-README.linux	c43d903b6ef360548385769f9c74ba5a
 README.md	79f3902019ef9eb8f1e3d92cf7c15f2c
 readme.txt	114b30d482bc91f22aad6a3778f960dd
 data/packages	0625d9dfab1f6c1c6356721c5ac7c55f
@@ -96,7 +94,6 @@ data/yugioh-standard.mse-style/border.png	63146d0944af09d295c94ef770a8d352
 data/yugioh-standard.mse-style/card-dsynchro.png	02a541cbb363474b9ec884163451a9b2
 data/yugioh-standard.mse-style/card-effect.png	d7f1bfd8f29f012c1817060977a3b689
 data/yugioh-standard.mse-style/card-fusion.png	bb89ddac6ac62a8f7f6b8c2f5250076e
-data/yugioh-standard.mse-style/card-link.png	9bdc0462333753545685d0e314a8a83d
 data/yugioh-standard.mse-style/card-normal.png	601504a7dc2303aeb4cd87a01d3453c6
 data/yugioh-standard.mse-style/card-obelisk.png	1b0c491f2c3ae8cc432000bff3979121
 data/yugioh-standard.mse-style/card-ra.png	3b453654fa29c92f2642656f3623b1f2
@@ -118,17 +115,8 @@ data/yugioh-standard.mse-style/enCopyrihtBlack.png	c7454029ef82b8a3804257315d858
 data/yugioh-standard.mse-style/enCopyrihtWhite.png	82714c71a8275a5e58014cf767100d18
 data/yugioh-standard.mse-style/jpCopyrihtBlack.png	9b26d7003c7cb1f2b2299837334f4820
 data/yugioh-standard.mse-style/jpCopyrihtWhite.png	08469c8beb5d749eab8a84bc4c61a27b
-data/yugioh-standard.mse-style/link_marker_d.png	35d8dc58c2019a50eb5063f491521f18
-data/yugioh-standard.mse-style/link_marker_dl.png	a14c107a4fb8982cd83e32f372f920e6
-data/yugioh-standard.mse-style/link_marker_dr.png	39ab62754faaa191aff3ff06bd9fdcb6
-data/yugioh-standard.mse-style/link_marker_l.png	c1ffb821f04f48e7b283841e03587473
-data/yugioh-standard.mse-style/link_marker_r.png	2ee728a4c65d8209cd6cfcf072d1b016
-data/yugioh-standard.mse-style/link_marker_u.png	a398d4ef22710e955af2937b62b87d12
-data/yugioh-standard.mse-style/link_marker_ul.png	ccd25c0ca28bd5f1cd93ac5fae14f167
-data/yugioh-standard.mse-style/link_marker_ur.png	4673ab996638299dada08aa4ae06ab33
-data/yugioh-standard.mse-style/mask-link.png	dacf92de79b118299e0d15fbdc766072
 data/yugioh-standard.mse-style/name.png	2c58ba411d6615829fb2a313c7f7a33b
-data/yugioh-standard.mse-style/style	d44133af150dd750575defc04ddbe289
+data/yugioh-standard.mse-style/style	73b27cd9fcd7ff3b70ccd70788a0853a
 data/yugioh-standard.mse-style/attribute/dark_cn.png	3c9548650ef3952fce81cda050089ca9
 data/yugioh-standard.mse-style/attribute/dark_en.png	475f0048280e1b2d8239285a902ad9c8
 data/yugioh-standard.mse-style/attribute/dark_jp.png	724e65c91c1fc2d1fae24f7786dcba99
@@ -210,12 +198,12 @@ data/yugioh-Toimage.mse-export-template/icon.jpg	0697fc11b6deba62ac366e699dbddb7
 data/yugioh-ToText.mse-export-template/export-template	692e98a855f18b59ce94a5c74eb69ada
 data/yugioh-ToText.mse-export-template/icon.jpg	3f6d275f8f537b3a45058db91dd65345
 data/yugioh.mse-game/auto_replace	e320dbf87ccce914bdcf82d29e858308
-data/yugioh.mse-game/card_fields	3b5c608beaabd95539ce5c9bee1d4479
+data/yugioh.mse-game/card_fields	450af3823c359883054ff1863968ea67
 data/yugioh.mse-game/game	32271e19abcc8f33ea81e42880f3d1f5
 data/yugioh.mse-game/icon.png	287a236e1dab6ed9e7fa97a0e7c0ce19
 data/yugioh.mse-game/packs	f7f8e490c4e1db6b775a485a00b351ce
-data/yugioh.mse-game/script	88155cb3d19aa95f16791b6a4d1b9c7e
-data/yugioh.mse-game/set_fields	be62e9c75710520095d79cd4fa993e87
+data/yugioh.mse-game/script	57129226b588fcefccb44df87342cce1
+data/yugioh.mse-game/set_fields	a7b7d838d9555c9eb04c87173dc12785
 data/yugioh.mse-game/icons/cn.png	dacb2ca8023c862a31db15312ae2b4c5
 data/yugioh.mse-game/icons/image.png	06b9eb5362a3410417fa3bf5cdc19f6b
 data/yugioh.mse-game/icons/jp.png	663f109575265802a8fae68d36e75cab
@@ -225,7 +213,7 @@ data/yugioh.mse-game/icons/text.png	393c4a1e99594cad2c7fac4bfca877d3
 data/yugioh.mse-game/icons/usgb.png	e3a48d8c5f720f59bf5f4b96aec47cb2
 data/yugioh.mse-game/word/word_lists_chs	f884c830811ae2c93255445c4b04d17b
 data/yugioh.mse-game/word/word_lists_cht	32cadc8dc24064bc57c16439f5f13a22
-data/yugioh.mse-game/word/word_lists_en	415509037330010a5756dac1fa73d605
+data/yugioh.mse-game/word/word_lists_en	ba51723c0b5ed79295b14ab55d87cf63
 data/yugioh.mse-game/word/word_lists_jp	5fac8b1cd087e1799f833c5a61e5a233
 data/yugioh.mse-game/word/word_lists_ko	8fd901bd0161fd944eeb154f978a8062
 develop/doc.zip	26594409f30690dae12eaf02eaec92ed
@@ -233,161 +221,13 @@ develop/libhunspell.dll	923d76f2d59faa62da25f9769bc4ce3c
 develop/mse2.0.1.exe	3b128f8952c5ac67a8a0066553b56be2
 develop/msvcp120.dll	fd5cabbe52272bd76007b68186ebaf00
 develop/msvcr120.dll	034ccadc1c073e4216e9466b720f9849
-font/Eurostile Candy W01 Semibold.ttf	5e7704e23815aa7ad1b3332bfd199719
 font/fonts-cn.zip	59eb6d02fff325351eb98ea10575cc7d
 font/fonts-common.zip	09586aeb09ad47a744632a934b2a4b09
 font/fonts-jp.zip	1cd5aa21f90c7a463e52938c039f19d1
 font/fonts-tw.zip	d4ca4f877edcd92433e78d8b4c5f2960
-resource/about.png	0b526487ddf53366981131539fa05814
-resource/bool_no.png	7c8606f58274302cf2aa65166a82e1eb
-resource/bool_yes.png	e821145b2f41dc991a2b5d0f62d352fc
-resource/btn_clear_filter_down.png	e9957a1c1be1fa3a7ba3ba6d7cead9bd
-resource/btn_clear_filter_focus.png	02f23eb085c9e9d001f55e33c29b380f
-resource/btn_clear_filter_hover.png	02f23eb085c9e9d001f55e33c29b380f
-resource/btn_clear_filter_normal.png	5dd80962e34a11fb3be4c431552db75b
-resource/btn_collapse_down.png	ee1bfd10d6f5d4609201c0f6cc48fc08
-resource/btn_collapse_focus.png	59ba4a7752db2a92e4b892020b05712b
-resource/btn_collapse_hover.png	59ba4a7752db2a92e4b892020b05712b
-resource/btn_collapse_normal.png	6a1ab31dfe03503ffd9e55605cb7ed72
-resource/btn_down.png	5f442d2b06182f0fd0d8ef284f0792b8
-resource/btn_expand_down.png	b8e2d2c2cb9510e57d214a13195a648e
-resource/btn_expand_focus.png	b1810338cb911a8706cc638881f1ad97
-resource/btn_expand_hover.png	b1810338cb911a8706cc638881f1ad97
-resource/btn_expand_normal.png	85130653396cc37ba22075444c9134a4
-resource/btn_focus.png	ed7e87cabde72e85ba46fbda7dd9401b
-resource/btn_hover.png	21d0d0480750f506c0ce5162fbee00bd
-resource/btn_normal.png	d90c9d4cd4cf5c5106bb9a16f0b3974a
-resource/btn_ok_down.png	74532795c4e75e90c9336e4846057dbd
-resource/btn_ok_focus.png	507c6d38755d41926810278d074c22ed
-resource/btn_ok_hover.png	96da68b9c13a1dc165f44255703ad8ed
-resource/btn_ok_normal.png	69c876a07177c667366ee2d127719a07
-resource/combine_and.png	efa3c5c1e3936c748bb025b9ba7d5f82
-resource/combine_and_dark.png	c8c3cf0fa351add77d411edf28f4fefe
-resource/combine_border.png	2a592050ee7d35b8f6c77013ae759cfa
-resource/combine_or.png	caa7ab0c5d1bf06790e5e4bac55e9a5a
-resource/combine_over.png	9c0fe65865f2a94df7a2a5df94e08d4d
-resource/combine_sub.png	af70230f03e9a54b9646c62be13502a1
-resource/combine_sub_dark.png	7d17d714f03b0aa468b7e4639efdd503
-resource/combine_xor.png	27d42718e5a28c28223515638bd86c7d
-resource/edit_symbol.png	dbc0b0690b14b5cde239cc22c948b501
-resource/expected_locale_keys	827ea88f9262d6b900b3196a57d5882e
-resource/handle_center.png	97e93908b2f6bbd6933e35a25acb70f9
-resource/handle_rotate.png	4ed7ef1964d06c508c050889b356ba6a
-resource/handle_shear_x.png	216ca810defeefa3acbea8a9fef1e3a0
-resource/icon_combine_border.png	a32c29e44f62f5d58f36d2e9511b120d
-resource/icon_combine_difference.png	0ca68ccf2b40dacf39c4eca6397ef8ed
-resource/icon_combine_intersection.png	478dcbf3b9e0c14eb2a70bb3a4d07d6b
-resource/icon_combine_merge.png	aec7ba6a488000ce168e4d4806faf14c
-resource/icon_combine_overlap.png	75ad7f3251c20351aba74ec2b7234442
-resource/icon_combine_subtract.png	247e47add0d374d72cf9d3b02dc6d382
-resource/icon_symbol_group.png	f93bd99ecbbd66052dcc2b0be1959357
-resource/icon_symmetry_reflection.png	df6b212fdb173c1b1e3a63560a0f963d
-resource/icon_symmetry_rotation.png	e0ff6fc492d08575af70c5f1e84249b1
-resource/installer_font.png	f93890e540101b00c545f9a80ffbbb3a
-resource/installer_group.png	5def38bf13b5437d656f372e68050bf9
-resource/installer_locales.png	0601f6d379ef0f95c00e6dee0613ca0d
-resource/installer_package.png	36843f392db8f2573ea5e58e30703e4d
-resource/installer_program.png	7268cc9defbdb2480831bf8fac4d60d5
-resource/message_error.png	e4dd51f46566ed3ceacdc900bf2fdf01
-resource/message_information.png	3750c701d2ec35a45d289b9b9c1a0667
-resource/message_input.png	7526e6cda76be1f1d9fccc476c44ec20
-resource/message_warning.png	c847e1076da70df83ef5284622b82a74
-resource/minus.png	635ae4ea9a51c69afd0264bd904aa667
-resource/plus.png	4b7f9605f0e10ab38ef2c3942fe37d72
-resource/selected_no.png	74918a5b509cdaca69d0eb6b74cee73c
-resource/selected_yes.png	6149e59da66c0a451d0db0098ac74e5a
-resource/sort_asc.png	07a800c42d8ca8d3f96e271147a864ad
-resource/sort_desc.png	48d52e25a9d41a48090afb7f5c6764fd
-resource/symbol_group.png	4ba6f16b94376c55e7751aa03b3286ca
-resource/symmetry_reflection.png	b98570eed9827f7d1d34497b13b7476f
-resource/symmetry_rotation.png	0b62d05b1a66a945f738a2a3ca56dce4
-resource/two_beta.png	2349d72ce0a207bd96691d0dab2af166
-resource/welcome_last.png	c486c390b0b645330a97c0952648735c
-resource/welcome_new.png	79f14421185c224acfb59e7ba1b4edd5
-resource/welcome_open.png	aaa5389a5e1b81bbee6c008960ae518e
-resource/welcome_updates.png	7a7d5d4585e009608ca835a868b254b0
-resource/cursor/curve.cur	c8807d83def9a8ede5f3f89c6c4c775b
-resource/cursor/point.cur	7ee6451552be18f961509add54c079f9
-resource/cursor/point_add.cur	bf9654114d201dbabea0434c66bb1e18
-resource/cursor/point_move.cur	981c764b9f0d6cfc169b54cb8c602576
-resource/cursor/rotate.cur	5c345d25909ffbf0a0098bf27a6e6bdb
-resource/cursor/rot_text.cur	ad36c8518963845dfc0d2ab71ed15c40
-resource/cursor/shear_x.cur	fcd47581438945274c4e68914ed52374
-resource/cursor/shear_y.cur	0162841d288c0e1b42abf886a3bbae77
-resource/icon/app.ico	b4c3e3576ce063c5b7c939f7e2646410
-resource/icon/installer.ico	1bb3c58066f68177f03113e82bed26a4
-resource/icon/set.ico	1942e65f0fbf2950683b6869d11ce917
-resource/icon/symbol.ico	b449a9a2b03c97dc59764ae9cc473089
-resource/tool/apply.png	6f3f4bbfcd4a3b17beeb5754a7c38ffd
-resource/tool/bold.png	8d27e2abf305890854ca9d1ca8755eab
-resource/tool/card_add.png	8c822a5a525df1fb8c181e4e2965fac4
-resource/tool/card_add_multiple.png	425f9f86db58ddb368976529c8b2f6a4
-resource/tool/card_del.png	5a706f7d672af1bdaeaf69b5f49b5847
-resource/tool/card_rotate.png	1b2c8fb59507bf5c95fe76914d510254
-resource/tool/card_rotate_0.png	51ee0fb7f85b9c250240833be9044c93
-resource/tool/card_rotate_180.png	8e1087af551b9f794d87698c19ac1213
-resource/tool/card_rotate_270.png	b42072266298ddfca55f50c345549f5b
-resource/tool/card_rotate_90.png	2a3becb80cc6fe9ea2aaf9ab6302bd8c
-resource/tool/circle.png	6698cbed885328d3d5ef2ca058a4d1f4
-resource/tool/copy.png	6c28c28fe9282086184e8fabf09e8628
-resource/tool/curve.png	d6f325667a2383d2fbe8bd056bde90b5
-resource/tool/cut.png	e50459ffb3d82791968c7b5ab0e3ede3
-resource/tool/duplicate.png	98123452d07c969c47382e246ff17e1c
-resource/tool/export.png	5e8d97df1361c927d3b939847088c935
-resource/tool/export_apprentice.png	480fb28126827431c505f6a2ffe29500
-resource/tool/export_html.png	29e7317fa8e03d7cb02ac7cfd8c3bb8e
-resource/tool/export_image.png	e2a8f71dcb1ff32fa86cf8cdcc82d1e3
-resource/tool/export_images.png	5e1583270ca6f97727053cc84f0990dd
-resource/tool/export_mws.png	4ff034b526ba3e0b2cce65c21457b4bb
-resource/tool/find.png	752c75cdf8e25d5b81cf554f0d14e9d9
-resource/tool/graph_bar.png	a11eed0bf96e8ac43c62790654329d58
-resource/tool/graph_pie.png	93659d1c0e1734fd3dd4ca7157c6db84
-resource/tool/graph_scatter.png	e699a76529cc90f9c7bb127c549b4f04
-resource/tool/graph_scatter_pie.png	f46448ccd2c22fbd7bd96f8163a58ea2
-resource/tool/graph_stack.png	8ae69c835514981881b816db9655e3df
-resource/tool/grid.png	66a33bc10a220a48f9fdaa8ff9bc1e13
-resource/tool/grid_snap.png	e49db05e8c1d0ae80c0fbc8288417639
-resource/tool/group.png	4ba6f16b94376c55e7751aa03b3286ca
-resource/tool/help.png	87fc74dab332a1c620c61ad07cec885e
-resource/tool/italic.png	37c9fcc345f11da5d48995bd4dada857
-resource/tool/keyword_add.png	8198ff5372a5186c4c965e5f189ed175
-resource/tool/keyword_del.png	711b6f5511dc00874e0a1a308c3eec21
-resource/tool/line.png	1d5f4a7af0bb19e9ad1691962442464c
-resource/tool/lock_dir.png	9edde1570a48083931ce4bc953445a8f
-resource/tool/lock_free.png	f6b352a3eeaa48cedb7410b1bfc7237a
-resource/tool/lock_size.png	d85834672580f1d6cb934bf79f878cae
-resource/tool/mode_curve.png	ac87bddbdb1531a327bb37b3b0b308e2
-resource/tool/mode_paint.png	75063cef3c67493254b3ef1b26109efc
-resource/tool/mode_rotate.png	996cf5458895b85117e54c7fd7085445
-resource/tool/mode_select.png	316b40786e558deec16c95064f62505e
-resource/tool/mode_symmetry.png	52894d297d52b103e4cfb2590ec46ce1
-resource/tool/new.png	e0fad1d489ecf735331e2dbfb9513b2c
-resource/tool/no_auto.png	248b9106b36993a3fee459e164aab349
-resource/tool/open.png	f4af73db2d1830c12543a9e01a919ccc
-resource/tool/paste.png	ca4358e01f36608e023e38b04efd554c
-resource/tool/print.png	47e69467d7dffaa8eea8ac2fe893b93a
-resource/tool/print_preview.png	c696083d183df4278277a2fcb4af4933
-resource/tool/rectangle.png	8817d53abe928d9b4ea41436d67311ba
-resource/tool/redo.png	0b512f92a26aa56dc0d27ecd333cea9b
-resource/tool/reminder.png	f56142a8beafa296a72011ba7d791b6a
-resource/tool/save.png	77cac6a37203a34341cc75fc1bf2e0bb
-resource/tool/star.png	a352098c9a9685bb858793fd01891b0e
-resource/tool/symbol.png	da1a1b0a00ee74c6c997ef0e8be2dfb1
-resource/tool/symmetry_add.png	1f2b41bad73037fb54c24bc6159a404f
-resource/tool/symmetry_remove.png	0dd576ee3824c2b9c7862691022690b1
-resource/tool/triangle.png	32368420900951978149ce71487f7b30
-resource/tool/undo.png	0e988a7efb7a3be8f2c1a0426021120b
-resource/tool/ungroup.png	1e66a138bdb0d4de8c783b7aee9b99b2
-resource/tool/window_cards.png	19ddc79f39a7c7f2ead6a2f06683ffe3
-resource/tool/window_console.png	4bc06030a9e7cc9fa185e7cd5f1b77ce
-resource/tool/window_keywords.png	133d386932df8bce6c65c58858655350
-resource/tool/window_random_pack.png	b6c434504907f490998bdae59b909e1d
-resource/tool/window_set_info.png	53246caa0e7a22a7e152770c94c07246
-resource/tool/window_statistics.png	a11eed0bf96e8ac43c62790654329d58
-resource/tool/window_style.png	3e18ec926d15c2a6e6b7aae59b2f5273
 update/delete.txt	c9b2ae557a77257e12e9a5599336afeb
-update/filelist.txt	f49db27d0aa490e0b5cbc7c8635c9ef2
+update/filelist.txt	9d35b2044c4864a18b007c4e82c39fd6
 update/readme.txt	e1555d90b56d941bcc2187baf892e071
 update/rename.txt	cbfaccc657e73040ec051233017b2c4d
 update/update-server.bat	906682e2c43e33f9f06a058cea7da7bf
-update/version.txt	2609daee8db563aebe3a396aa5ef4783
+update/version.txt	876168d5dd48e1c76e5413a551d66815

update/version.txt

-2017/3/30 13:39:55
+2015-5-24 9:52:20
\ No newline at end of file