Merge pull request #2 from 247321453/master

Merge From Source.

.gitignore

+/update/version_new.txt

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.mse-game/card_fields

@@ -12,6 +12,7 @@ card field:
 	choice: fusion monster
 	choice: token monster
 	choice:	xyz monster
+	choice: link monster
 	choice: obelisk
 	choice: slifer
 	choice: ra
@@ -130,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
@@ -147,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
 		)
@@ -159,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,
@@ -237,6 +247,63 @@ card field:
 	name: pendulum scale 2
 	save value: true
 	show statistics: false
+############################# Link Markers
+card field:
+	type: choice
+	name: Link Marker Up
+	choice: none
+	choice: yes
+	save value: yes
+	show statistics: false
+card field:
+	type: choice
+	name: Link Marker UL
+	choice: none
+	choice: yes
+	save value: yes
+	show statistics: false
+card field:
+	type: choice
+	name: Link Marker UR
+	choice: none
+	choice: yes
+	save value: yes
+	show statistics: false
+card field:
+	type: choice
+	name: Link Marker Down
+	choice: none
+	choice: yes
+	save value: yes
+	show statistics: false
+card field:
+	type: choice
+	name: Link Marker DL
+	choice: none
+	choice: yes
+	save value: yes
+	show statistics: false
+card field:
+	type: choice
+	name: Link Marker DR
+	choice: none
+	choice: yes
+	save value: yes
+	show statistics: false
+card field:
+	type: choice
+	name: Link Marker Left
+	choice: none
+	choice: yes
+	save value: yes
+	show statistics: false
+card field:
+	type: choice
+	name: Link Marker Right
+	choice: none
+	choice: yes
+	save value: yes
+	show statistics: false
 ############################# Attack/Defense
 card field:
 	type: text
@@ -258,6 +325,16 @@ card field:
 	card list width: 33
 	card list name: DEF
 	description: & = unlimited 无限
+############################ Link
+card field:
+	type: text
+	name: link number
+	save value: true
+	script: a_and_d_filter(value)
+	card list visible: true
+	card list column: 5
+	card list name: Link
+	card list width: 33
 ############################# Copyright stuff
 card field:
 	type: choice
@@ -278,7 +355,7 @@ card field:
 	choice: promo
 	card list visible: true
 	card list column: 7
-	description: Ratity.罕见度
+	description: Rarity.罕见度
 card field:
 	type: choice
 	name: corner foil
@@ -324,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

@@ -3,6 +3,7 @@
 	is_12star :={ remove_tags(card.level) == "************" }
 	is_13star :={ remove_tags(card.level) == "*************" }	
 	is_blmonster := {card.card_type == "dark synchro monster" or card.card_type == "xyz monster"}
+	is_link := {card.card_type == "link monster"}
 	is_tw := { set.language == "TW" }
 	is_cn := { set.language == "CN" }
 	is_en := { set.language == "EN" }
@@ -10,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,18 +22,13 @@ set field:
 set field:
 	type: text
 	name: edition
-	default: "MSE 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
-	name: description
-	multi line: true
-	description: This information will not appear on the card.
 set field:
 	type: text
 	name: copyright
@@ -56,11 +51,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 +85,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,6 +33,7 @@ word list:
 	word: 融合
 	word: 仪式
 	word: 效果
+	word: 连接
 	word: 调整
 	word: 灵魂
 	word: 卡通

data/yugioh.mse-game/word/word_lists_en

@@ -25,11 +25,14 @@ word list:
 	word: Divine-Beast
 	word: Created-Divine
 	word: Wyrm
+	word: Cyberse
+	word: Charisma
 word list:
 	name: ENeffect
 	word: Synchro
 	word: Xyz
 	word: Fusion
+	word: Link
 	word: Ritual
 	word: Effect
 	word: Tuner