2.4.1.9 update data

jacmaz · Aug 7, 2016 · 874843a · 874843a
1 parent 5af4d56
commit 874843a
Show file tree

Hide file tree

Showing 20 changed files with 154 additions and 98 deletions.
diff --git a/DataEditorX/Properties/AssemblyInfo.cs b/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.8")]
+[assembly: AssemblyVersion("2.4.1.9")]
diff --git a/DataEditorX/app.config b/DataEditorX/app.config
@@ -33,7 +33,7 @@
 		<add key="image" value="44,64,177,254" />
 		<add key="image_other" value="25,54,128,128" />
 		<add key="image_xyz" value="24,51,128,128" />
-		<add key="image_pendulum" value="14,46,149,120" />
+		<add key="image_pendulum" value="16,50,147,109" />
 		<!-- CodeEdiotr Setting
       IME = true  使用輸入法，正常顯示文字，反應變慢 
       IME = false English

diff --git a/DataEditorX/changed.txt b/DataEditorX/changed.txt
@@ -1,4 +1,6 @@
 ★更新历史
+2.4.1.9
+更新数据
 2.4.1.8
 更新数据
 2.4.1.7

diff --git a/DataEditorX/data/_functions.txt b/DataEditorX/data/_functions.txt
@@ -1231,7 +1231,7 @@ available是所有可选属性的组合值
 ●bool Duel.IsPlayerCanFlipSummon(int player, Card c)
 检查玩家player是否可以反转召唤c
 ●bool Duel.IsPlayerCanSpecialSummonMonster(int player, int code, int setcode, int type, int atk, int def, int level, int race, int attribute
-[, integer pos=POS_FACEUP, integer target_player=player])
+[, integer pos=POS_FACEUP, integer target_player=player, int sumtype])
 检查玩家player是否可以以pos的表示形式特殊召唤给定参数的怪兽到target_player场上
 此函数通常用于判定是否可以特招token和陷阱怪兽
 ●bool Duel.IsPlayerCanSpecialSummonCount(int player, int count)

diff --git a/DataEditorX/data/cardinfo_chinese.txt b/DataEditorX/data/cardinfo_chinese.txt
@@ -407,4 +407,15 @@
 0xe6	花札卫	花札衛
 0xe7	沉默剑士	サイレント・ソードマン
 0xe8	沉默魔术师	サイレント・マジシャン
+0xe9	磁石战士	磁石の戦士(じしゃくのせんし)
+0xea	水晶机巧	クリストロン
+0xeb	化合兽	化合獣
+0xec	N/A	魔界	魔界
+0x10ec	魔界剧团	魔界劇団
+0x20ec	魔界台本	魔界台本
+0xed	地底恐魔	Subterror
+0x10ed	地底恐魔 巨魔	Subterror Behemoth
+0xee	秘旋谍	SPYRAL
+0x10ee	秘旋谍装备	SPYRAL GEAR
+0xef	堕天使
 #end
diff --git a/DataEditorX/data/cardinfo_english.txt b/DataEditorX/data/cardinfo_english.txt
@@ -396,12 +396,23 @@
 0xde	Exodia	エクゾディア
 0xdf	Lunalight	ムーンライト
 0xe0	Amorphage	アモルファージ
-0xe1	Metalphosis	メタルフォーゼ
+0xe1	Metalfoes	メタルフォーゼ
 0xe2	Tramid	トラミッド
 0xe3	Cubic	方界
 0xe4	Celtic Guard	エルフの剣士
 0xe5	Cipher	サイファー
 0xe6	Cardian	花札衛
 0xe7	Silent Swordsman	サイレント・ソードマン
 0xe8	Silent Magician	サイレント・マジシャン
+0xe9	Magna Warrior	磁石の戦士(じしゃくのせんし)
+0xea	Crystron	クリストロン
+0xeb	Chemical Beast	化合獣
+0xec	N/A	Abyss	魔界
+0x10ec	Abyss Actor	魔界劇団
+0x20ec	Abyss Script	魔界台本
+0xed	地底恐魔	Subterror
+0x10ed	地底恐魔 巨魔	Subterror Behemoth
+0xee	秘旋谍	SPYRAL
+0x10ee	秘旋谍装备	SPYRAL GEAR
+0xef	堕天使	Darklord
 #end
diff --git a/DataEditorX/data/constant.lua b/DataEditorX/data/constant.lua
@@ -95,7 +95,7 @@ REASON_BATTLE		=0x20		--战斗破坏
 REASON_EFFECT		=0x40		--效果
 REASON_COST			=0x80		--用於代價或無法支付代價而破壞
 REASON_ADJUST		=0x100		--调整（御前试合）
-REASON_LOST_TARGET	=0x200		--失去效果对象
+REASON_LOST_TARGET	=0x200		--失去装备对象（被破坏）/失去叠放对象（不是被破坏）
 REASON_RULE			=0x400		--规则
 REASON_SPSUMMON		=0x800		--特殊召唤
 REASON_DISSUMMON	=0x1000		--召唤失败
@@ -137,7 +137,7 @@ STATUS_BATTLE_RESULT		=0x0040		--傷害計算結果預計要破壞的怪獸
 STATUS_SPSUMMON_STEP		=0x0080		--效果特召處理中
 STATUS_FORM_CHANGED			=0x0100		--改变过表示形式
 STATUS_SUMMONING			=0x0200		--召唤中
-STATUS_EFFECT_ENABLED		=0x0400		--效果有效
+STATUS_EFFECT_ENABLED		=0x0400		--卡片準備就緒(不在移動、召喚、連鎖中)
 STATUS_SUMMON_TURN			=0x0800		--在本回合召喚/SET
 STATUS_DESTROY_CONFIRMED	=0x1000		--破坏确定
 STATUS_LEAVE_CONFIRMED		=0x2000		--連鎖處理完後送去墓地的魔法陷阱
@@ -366,8 +366,10 @@ EFFECT_SET_DEFENSE				=105	--设置防御力
 EFFECT_SET_DEFENSE_FINAL		=106	--设置最终防御力
 EFFECT_SET_BASE_DEFENSE			=107	--设置原本防御力
 EFFECT_REVERSE_UPDATE			=108	--倒置改变攻击力、防御力（天邪鬼）
-EFFECT_SWAP_AD					=109	--交换攻防
+EFFECT_SWAP_AD					=109	--交换攻防(超級漏洞人)
 EFFECT_SWAP_BASE_AD				=110	--交换原本攻防
+EFFECT_SWAP_ATTACK_FINAL		=111	--設定最終攻擊力(用於交換攻防)
+EFFECT_SWAP_DEFENSE_FINAL		=112	--設定最終防禦力(用於交換攻防)
 EFFECT_ADD_CODE					=113	--增加卡名
 EFFECT_CHANGE_CODE				=114	--改变卡名
 EFFECT_ADD_TYPE					=115	--增加卡片种类（types）
@@ -396,6 +398,7 @@ EFFECT_DECREASE_TRIBUTE_SET		=152	--减少放置怪兽的祭品
 EFFECT_EXTRA_RELEASE			=153	--代替解放（灵魂交错）
 EFFECT_TRIBUTE_LIMIT			=154	--祭品限制
 EFFECT_EXTRA_RELEASE_SUM		=155	--代替召唤解放（帝王的烈旋）
+EFFECT_TRIPLE_TRIBUTE			=156
 EFFECT_PUBLIC					=160	--公开手牌
 EFFECT_COUNTER_PERMIT			=0x10000--允许放置指示物类型
 EFFECT_COUNTER_LIMIT			=0x20000--允许放置指示物数量

diff --git a/DataEditorX/data/strings.conf b/DataEditorX/data/strings.conf
@@ -447,3 +447,4 @@
 !counter 0x1038	方界指示物
 !counter 0x1039 咕咚指示物
 !counter 0x40 指示物（No.51 怪腕之必杀摔角手）
+!counter 0x1041 捕食指示物
diff --git a/DataEditorX/readme.txt b/DataEditorX/readme.txt
@@ -1,4 +1,4 @@
-[DataEditorX]2.4.1.8[DataEditorX]
+[DataEditorX]2.4.1.9[DataEditorX]
 [URL]https://github.com/247321453/DataEditorX/raw/master/win32/win32.zip[URL]
 
 ★运行环境(Environment)

diff --git a/win32/DataEditorX.exe b/win32/DataEditorX.exe
diff --git a/win32/DataEditorX.exe.config b/win32/DataEditorX.exe.config
@@ -1,52 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-	<connectionStrings>
-		<!-- Example connection to a SQL Server Database on localhost. -->
-		<!-- <add name="ExampleConnectionString"
+  <connectionStrings>
+    <!-- Example connection to a SQL Server Database on localhost. -->
+    <!-- <add name="ExampleConnectionString"
             connectionString="Data Source=.;Initial Catalog=DBName;Integrated Security=True"
             providerName="System.Data.SqlClient" /> -->
-	</connectionStrings>
-	<appSettings>
-		<!-- access these values via the property:
+  </connectionStrings>
+  <appSettings>
+    <!-- access these values via the property:
             System.Configuration.ConfigurationManager.AppSettings[key]
         -->
-		<!-- MSE language  data/mse_xxx.txt -->
-		<add key="mse" value="Chinese-Simplified" />
-		<!-- Language data/cardinfo_xxxx.txt  data/language_xxx.txt -->
-		<add key="language" value="english" />
-		<!-- Check system language when running program first time -->
-		<add key="check_system_language" value="true" />
-		<!-- async load data -->
-		<add key="async" value="false" />
-		<!-- DataEditorX source code -->
-		<add key="sourceURL" value="https://github.com/247321453/DataEditorX" />
-		<!-- DataEditorX update url-->
-		<add key="updateURL" value="https://github.com/247321453/DataEditorX/tree/master/win32/readme.txt" />
-		<!-- delete,modify with card's files image script -->
-		<add key="opera_with_cards_file" value="true" />
-		<!-- open file in this.such as lua -->
-		<add key="open_file_in_this" value="true" />
-		<!-- check update when opening application automatically -->
-		<add key="auto_check_update" value="true" />
-		<!-- Cut Images Setting -->
-		<add key="image_quilty" value="100" />
-		<add key="image" value="44,64,177,254" />
-		<add key="image_other" value="25,54,128,128" />
-		<add key="image_xyz" value="24,51,128,128" />
-		<add key="image_pendulum" value="14,46,149,120" />
-		<!-- CodeEdiotr Setting
+    <!-- MSE language  data/mse_xxx.txt -->
+    <add key="mse" value="Chinese-Simplified" />
+    <!-- Language data/cardinfo_xxxx.txt  data/language_xxx.txt -->
+    <add key="language" value="Chinese" />
+    <!-- Check system language when running program first time -->
+    <add key="check_system_language" value="false" />
+    <!-- async load data -->
+    <add key="async" value="false" />
+    <!-- DataEditorX source code -->
+    <add key="sourceURL" value="https://github.com/247321453/DataEditorX" />
+    <!-- DataEditorX update url-->
+    <add key="updateURL" value="https://github.com/247321453/DataEditorX/tree/master/win32/readme.txt" />
+    <!-- delete,modify with card's files image script -->
+    <add key="opera_with_cards_file" value="true" />
+    <!-- open file in this.such as lua -->
+    <add key="open_file_in_this" value="true" />
+    <!-- check update when opening application automatically -->
+    <add key="auto_check_update" value="true" />
+    <!-- Cut Images Setting -->
+    <add key="image_quilty" value="100" />
+    <add key="image" value="44,64,177,254" />
+    <add key="image_other" value="25,54,128,128" />
+    <add key="image_xyz" value="24,51,128,128" />
+    <add key="image_pendulum" value="16,50,147,109" />
+    <!-- CodeEdiotr Setting
       IME = true  使用輸入法，正常顯示文字，反應變慢 
       IME = false English
     -->
-		<add key="IME" value="false" />
-		<add key="wordwrap" value="true" />
-		<add key="tabisspace" value="false" />
-		<add key="fontname" value="Consolas" />
-		<add key="fontsize" value="14.5" />
-		<!-- 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.db"/>
-	</appSettings>
+    <add key="IME" value="false" />
+    <add key="wordwrap" value="true" />
+    <add key="tabisspace" value="false" />
+    <add key="fontname" value="Consolas" />
+    <add key="fontsize" value="14.5" />
+    <!-- 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.db" />
+  </appSettings>
 </configuration>
diff --git a/win32/DataEditorX.vshost.exe.config b/win32/DataEditorX.vshost.exe.config
@@ -1,52 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-	<connectionStrings>
-		<!-- Example connection to a SQL Server Database on localhost. -->
-		<!-- <add name="ExampleConnectionString"
+  <connectionStrings>
+    <!-- Example connection to a SQL Server Database on localhost. -->
+    <!-- <add name="ExampleConnectionString"
             connectionString="Data Source=.;Initial Catalog=DBName;Integrated Security=True"
             providerName="System.Data.SqlClient" /> -->
-	</connectionStrings>
-	<appSettings>
-		<!-- access these values via the property:
+  </connectionStrings>
+  <appSettings>
+    <!-- access these values via the property:
             System.Configuration.ConfigurationManager.AppSettings[key]
         -->
-		<!-- MSE language  data/mse_xxx.txt -->
-		<add key="mse" value="Chinese-Simplified" />
-		<!-- Language data/cardinfo_xxxx.txt  data/language_xxx.txt -->
-		<add key="language" value="english" />
-		<!-- Check system language when running program first time -->
-		<add key="check_system_language" value="true" />
-		<!-- async load data -->
-		<add key="async" value="false" />
-		<!-- DataEditorX source code -->
-		<add key="sourceURL" value="https://github.com/247321453/DataEditorX" />
-		<!-- DataEditorX update url-->
-		<add key="updateURL" value="https://github.com/247321453/DataEditorX/tree/master/win32/readme.txt" />
-		<!-- delete,modify with card's files image script -->
-		<add key="opera_with_cards_file" value="true" />
-		<!-- open file in this.such as lua -->
-		<add key="open_file_in_this" value="true" />
-		<!-- check update when opening application automatically -->
-		<add key="auto_check_update" value="true" />
-		<!-- Cut Images Setting -->
-		<add key="image_quilty" value="100" />
-		<add key="image" value="44,64,177,254" />
-		<add key="image_other" value="25,54,128,128" />
-		<add key="image_xyz" value="24,51,128,128" />
-		<add key="image_pendulum" value="14,46,149,120" />
-		<!-- CodeEdiotr Setting
+    <!-- MSE language  data/mse_xxx.txt -->
+    <add key="mse" value="Chinese-Simplified" />
+    <!-- Language data/cardinfo_xxxx.txt  data/language_xxx.txt -->
+    <add key="language" value="Chinese" />
+    <!-- Check system language when running program first time -->
+    <add key="check_system_language" value="false" />
+    <!-- async load data -->
+    <add key="async" value="false" />
+    <!-- DataEditorX source code -->
+    <add key="sourceURL" value="https://github.com/247321453/DataEditorX" />
+    <!-- DataEditorX update url-->
+    <add key="updateURL" value="https://github.com/247321453/DataEditorX/tree/master/win32/readme.txt" />
+    <!-- delete,modify with card's files image script -->
+    <add key="opera_with_cards_file" value="true" />
+    <!-- open file in this.such as lua -->
+    <add key="open_file_in_this" value="true" />
+    <!-- check update when opening application automatically -->
+    <add key="auto_check_update" value="true" />
+    <!-- Cut Images Setting -->
+    <add key="image_quilty" value="100" />
+    <add key="image" value="44,64,177,254" />
+    <add key="image_other" value="25,54,128,128" />
+    <add key="image_xyz" value="24,51,128,128" />
+    <add key="image_pendulum" value="16,50,147,109" />
+    <!-- CodeEdiotr Setting
       IME = true  使用輸入法，正常顯示文字，反應變慢 
       IME = false English
     -->
-		<add key="IME" value="false" />
-		<add key="wordwrap" value="true" />
-		<add key="tabisspace" value="false" />
-		<add key="fontname" value="Consolas" />
-		<add key="fontsize" value="14.5" />
-		<!-- 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.db"/>
-	</appSettings>
+    <add key="IME" value="false" />
+    <add key="wordwrap" value="true" />
+    <add key="tabisspace" value="false" />
+    <add key="fontname" value="Consolas" />
+    <add key="fontsize" value="14.5" />
+    <!-- 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.db" />
+  </appSettings>
 </configuration>
diff --git a/win32/changed.txt b/win32/changed.txt
@@ -1,4 +1,6 @@
 ★更新历史
+2.4.1.9
+更新数据
 2.4.1.8
 更新数据
 2.4.1.7

diff --git a/win32/data/_functions.txt b/win32/data/_functions.txt
@@ -1231,7 +1231,7 @@ available是所有可选属性的组合值
 ●bool Duel.IsPlayerCanFlipSummon(int player, Card c)
 检查玩家player是否可以反转召唤c
 ●bool Duel.IsPlayerCanSpecialSummonMonster(int player, int code, int setcode, int type, int atk, int def, int level, int race, int attribute
-[, integer pos=POS_FACEUP, integer target_player=player])
+[, integer pos=POS_FACEUP, integer target_player=player, int sumtype])
 检查玩家player是否可以以pos的表示形式特殊召唤给定参数的怪兽到target_player场上
 此函数通常用于判定是否可以特招token和陷阱怪兽
 ●bool Duel.IsPlayerCanSpecialSummonCount(int player, int count)

diff --git a/win32/data/cardinfo_chinese.txt b/win32/data/cardinfo_chinese.txt
@@ -407,4 +407,15 @@
 0xe6	花札卫	花札衛
 0xe7	沉默剑士	サイレント・ソードマン
 0xe8	沉默魔术师	サイレント・マジシャン
+0xe9	磁石战士	磁石の戦士(じしゃくのせんし)
+0xea	水晶机巧	クリストロン
+0xeb	化合兽	化合獣
+0xec	N/A	魔界	魔界
+0x10ec	魔界剧团	魔界劇団
+0x20ec	魔界台本	魔界台本
+0xed	地底恐魔	Subterror
+0x10ed	地底恐魔 巨魔	Subterror Behemoth
+0xee	秘旋谍	SPYRAL
+0x10ee	秘旋谍装备	SPYRAL GEAR
+0xef	堕天使
 #end
diff --git a/win32/data/cardinfo_english.txt b/win32/data/cardinfo_english.txt
@@ -396,12 +396,23 @@
 0xde	Exodia	エクゾディア
 0xdf	Lunalight	ムーンライト
 0xe0	Amorphage	アモルファージ
-0xe1	Metalphosis	メタルフォーゼ
+0xe1	Metalfoes	メタルフォーゼ
 0xe2	Tramid	トラミッド
 0xe3	Cubic	方界
 0xe4	Celtic Guard	エルフの剣士
 0xe5	Cipher	サイファー
 0xe6	Cardian	花札衛
 0xe7	Silent Swordsman	サイレント・ソードマン
 0xe8	Silent Magician	サイレント・マジシャン
+0xe9	Magna Warrior	磁石の戦士(じしゃくのせんし)
+0xea	Crystron	クリストロン
+0xeb	Chemical Beast	化合獣
+0xec	N/A	Abyss	魔界
+0x10ec	Abyss Actor	魔界劇団
+0x20ec	Abyss Script	魔界台本
+0xed	地底恐魔	Subterror
+0x10ed	地底恐魔 巨魔	Subterror Behemoth
+0xee	秘旋谍	SPYRAL
+0x10ee	秘旋谍装备	SPYRAL GEAR
+0xef	堕天使	Darklord
 #end