2.2.3.3

DataEditorX/CodeEditForm.Designer.cs

@@ -178,7 +178,7 @@ private void InitializeComponent()
 			// menuitem_about
 			// 
 			this.menuitem_about.Name = "menuitem_about";
-			this.menuitem_about.Size = new System.Drawing.Size(111, 22);
+			this.menuitem_about.Size = new System.Drawing.Size(152, 22);
 			this.menuitem_about.Text = "About";
 			this.menuitem_about.Click += new System.EventHandler(this.AboutToolStripMenuItemClick);
 			// 
@@ -222,14 +222,15 @@ private void InitializeComponent()
 			this.fctb.RightBracket = ')';
 			this.fctb.RightBracket2 = '}';
 			this.fctb.SelectionColor = System.Drawing.Color.FromArgb(((int)(((byte)(60)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(255)))));
-			this.fctb.Size = new System.Drawing.Size(695, 390);
+			this.fctb.Size = new System.Drawing.Size(504, 369);
 			this.fctb.TabIndex = 0;
 			this.fctb.WordWrap = true;
 			this.fctb.Zoom = 100;
 			this.fctb.ToolTipNeeded += new System.EventHandler<FastColoredTextBoxNS.ToolTipNeededEventArgs>(this.FctbToolTipNeeded);
-			this.fctb.SelectionChanged += new System.EventHandler(this.FctbSelectionChanged);
 			this.fctb.TextChangedDelayed += new System.EventHandler<FastColoredTextBoxNS.TextChangedEventArgs>(this.FctbTextChangedDelayed);
+			this.fctb.SelectionChangedDelayed += new System.EventHandler(this.FctbSelectionChangedDelayed);
 			this.fctb.KeyDown += new System.Windows.Forms.KeyEventHandler(this.FctbKeyDown);
+			this.fctb.MouseClick += new System.Windows.Forms.MouseEventHandler(this.FctbMouseClick);
 			// 
 			// documentMap1
 			// 
@@ -238,7 +239,7 @@ private void InitializeComponent()
 			this.documentMap1.ForeColor = System.Drawing.Color.Maroon;
 			this.documentMap1.Location = new System.Drawing.Point(504, 25);
 			this.documentMap1.Name = "documentMap1";
-			this.documentMap1.Size = new System.Drawing.Size(191, 369);
+			this.documentMap1.Size = new System.Drawing.Size(191, 390);
 			this.documentMap1.TabIndex = 5;
 			this.documentMap1.Target = this.fctb;
 			this.documentMap1.Text = "documentMap1";
@@ -251,7 +252,7 @@ private void InitializeComponent()
 			this.tb_input.Location = new System.Drawing.Point(0, 394);
 			this.tb_input.Margin = new System.Windows.Forms.Padding(0);
 			this.tb_input.Name = "tb_input";
-			this.tb_input.Size = new System.Drawing.Size(695, 21);
+			this.tb_input.Size = new System.Drawing.Size(504, 21);
 			this.tb_input.TabIndex = 1;
 			this.tb_input.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Tb_inputKeyDown);
 			// 
@@ -295,5 +296,7 @@ private void InitializeComponent()
 		private System.Windows.Forms.ToolStripMenuItem menuitem_open;
 		private System.Windows.Forms.ToolStripMenuItem menuitem_file;
 		private System.Windows.Forms.MenuStrip menuStrip1;
+		
+
 	}
 }

DataEditorX/CodeEditForm.cs

@@ -87,7 +87,7 @@ void InitForm()
 				fctb.Font=new Font(fontname,fontsize);
 			if(ConfigurationManager.AppSettings["IME"].ToLower()=="true")
 				fctb.ImeMode=ImeMode.On;
-				
+			
 		}
 
 		public void LoadXml(string xmlfile)
@@ -273,27 +273,11 @@ void FctbKeyDown(object sender, KeyEventArgs e)
 				popupMenu_con.Show(true);
 				e.Handled = true;
 			}
+			//else if(e.KeyData == Keys(Keys.Control | Keys
 		}
 		#endregion
 		
 		#region input
-		void FctbSelectionChanged(object sender, EventArgs e)
-		{
-			tb_input.Text=fctb.SelectedText;
-			fctb.VisibleRange.ClearStyle(SameWordsStyle);
-			if (!fctb.Selection.IsEmpty)
-				return;//user selected diapason
-
-			//get fragment around caret
-			var fragment = fctb.Selection.GetFragment(@"\w");
-			string text = fragment.Text;
-			if (text.Length == 0)
-				return;
-			//highlight same words
-			var ranges = fctb.VisibleRange.GetRanges("\\b" + text + "\\b");
-			foreach(var r in ranges)
-				r.SetStyle(SameWordsStyle);
-		}
 		
 		void Menuitem_showinputClick(object sender, EventArgs e)
 		{
@@ -465,24 +449,34 @@ public void SetCards(Card[] cards)
 			}
 		}
 		
-		/*
-		void UseIMEToolStripMenuItemClick(object sender, EventArgs e)
+		void FctbSelectionChangedDelayed(object sender, EventArgs e)
+		{
+			tb_input.Text=fctb.SelectedText;
+			fctb.VisibleRange.ClearStyle(SameWordsStyle);
+			if (!fctb.Selection.IsEmpty)
+				return;//user selected diapason
+
+			//get fragment around caret
+			var fragment = fctb.Selection.GetFragment(@"\w");
+			string text = fragment.Text;
+			if (text.Length == 0)
+				return;
+			//highlight same words
+			var ranges = fctb.VisibleRange.GetRanges("\\b" + text + "\\b");
+			foreach(var r in ranges)
+				r.SetStyle(SameWordsStyle);
+		}
+		void FctbMouseClick(object sender, MouseEventArgs e)
 		{
-			ToolStripMenuItem tsmi =sender as ToolStripMenuItem;
-			if(tsmi!=null)
+			var fragment = fctb.Selection.GetFragment(@"\w");
+			string text = fragment.Text;
+			if (text.Length == 0)
+				return;
+			if(e.Button == MouseButtons.Left && Control.ModifierKeys == Keys.Control)
 			{
-				
-				if(tsmi.Checked)
-				{
-					fctb.ImeMode= ImeMode.Inherit;
-				}
-				else{
-					fctb.ImeMode= ImeMode.On;
-				}
-				tsmi.Checked=!tsmi.Checked;
-				fctb.Invalidate();
+				//MessageBox.Show("GO");
+				fctb.SelectNext(@"function\s+?\S+?\."+text+@"\(",false,RegexOptions.Singleline);
 			}
 		}
-		 */
 	}
 }

DataEditorX/Common/MySyntaxHighlighter.cs

@@ -56,6 +56,7 @@ public override void LuaSyntaxHighlight(Range range)
 			range.SetStyle(mGrayStyle, base.LuaCommentRegex3);
 			//number highlighting
 			range.SetStyle(mNumberStyle, base.LuaNumberRegex);
+			range.SetStyle(mNumberStyle, @"\bc\d+\b");
 			//keyword highlighting
 			range.SetStyle(mKeywordStyle, base.LuaKeywordRegex);
 			//functions highlighting

DataEditorX/Core/Card.cs

@@ -95,11 +95,11 @@ public override string ToString()
 		}
 		string levelString()
 		{
-			string star="";
+			string star="[";
 			long i=0,j=level&0xff;
 			for(i=0;i<j;i++)
 				star +="★";
-			return star+Environment.NewLine;
+			return star+"] "+j.ToString()+" ";
 		}
 		string redesc()
 		{

DataEditorX/Core/MSEConvert.cs

@@ -180,6 +180,12 @@ public string[] GetTypes(Card c)
 				}
 				
 			}
+			if(c.race==0)
+			{
+				types[0]="";
+				types[1]="";
+				types[2]="";
+			}
 			return types;
 		}
 		

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.2.3.3")]
+[assembly: AssemblyVersion("2.2.3.4")]

DataEditorX/english/mse-config.txt

@@ -6,10 +6,7 @@ cn2tw = true
 spell = [Sepll Card%%]
 trap = [Trap Card%%]
 ############################ Text
-pendulum-text = Text:\n([\S\s]*?)\n[\S\s]*?Text:
-monster-text = Text:[\s\S]*?Text:\n([\S\s]*)
-# pendulum-text = Pendulum Effect[\S\s]*?\n([\S\s]*?)\n=================
-# pendulum-text = Pendulum Effect\n([\S\s]*?)\n\n
-# monster-text = Monster Effect\n([\S\s]*)
+pendulum-text = Pendulum Text :\n([\S\s]*?)\n\n
+monster-text = Monster Text :\n([\S\s]*)
 ########################### Replace
 # replace = ([A-Z]) <i>$1</i>
\ No newline at end of file

DataEditorX/readme.txt

-[DataEditorX]2.2.3.3[DataEditorX]
+[DataEditorX]2.2.3.4[DataEditorX]
 [URL]https://github.com/247321453/DataEditorX/raw/master/win32/win32.zip[URL]
 
 ★使用前，请关联lua的打开方式，例如记事本，notepad++，等。
@@ -43,6 +43,8 @@ mse-config		设置pendulum文本和普通文本的正则正则表达式，用来
 
 ★lua编辑器 函数搜索
 在下面的文本框输入关键字，按Enter
+Ctrl+鼠标左键 	跳转到函数定义
+Ctrl+鼠标滑轮 	缩放文字
 
 ★支持 新建文本文档.txt 直接改名 新建文本文档.cdb
 
@@ -71,6 +73,8 @@ DataEditorX.exe.config
 描述不详细的bug，我修复不了。（都不知道是bug是什么）
 
 ★更新历史
+2.2.3.4
+english pengulum text
 2.2.3.3
 修复lua编辑器的控件遮挡问题
 2.2.3.2

win32/chinese/history.txt

@@ -4,16 +4,18 @@ F:\games\ygopro\script\c32864.lua
 E:\github\DataEditorX\DataEditorX\chinese\constant.lua
 F:\games\ygocore\script\constant.lua
 F:\games\ygocore\script\utility.lua
-F:\games\ygopro\script\c191749.lua
-F:\games\ygopro\script\c102380.lua
-F:\games\ygocore\script\c131182.lua
-F:\games\ygopro\script\c126218.lua
-F:\games\ygocore\script\c114932.lua
 F:\games\ygocore\script\c99995595.lua
-F:\games\ygocore\single\[sample]BerserkDragon.lua
 F:\games\ygopro\cards.cdb
-F:\games\ygopro\script\c168917.lua
-F:\games\ygopro\script\c123709.lua
 F:\games\ygocore\script\c135598.lua
+F:\games\ygocore\single\[sample]BerserkDragon.lua
+F:\games\ygopro\script\c102380.lua
+F:\c14513016.lua
+F:\games\ygocore\script\c114932.lua
+F:\games\ygocore\script\c131182.lua
+F:\games\ygopro\script\c123709.lua
+F:\games\ygopro\script\c168917.lua
 F:\games\ygocore\script\c900787.lua
-F:\games\ygocore\script\c126218.lua
+F:\games\ygocore\script\c126218.lua
\ No newline at end of file
+F:\games\ygopro\script\c126218.lua
+F:\games\ygopro\script\c191749.lua
+F:\Propro的翻译\EN的cards.cdb
\ No newline at end of file

win32/english/history.txt

 # history
 F:\games\ygocore\cards.cdb
-F:\cards.cdb
-F:\cards2.cdb
+F:\Propro的翻译\EN的cards.cdb
+F:\Propro的翻译\test.cdb
\ No newline at end of file

win32/english/mse-config.txt

@@ -6,10 +6,7 @@ cn2tw = true
 spell = [Sepll Card%%]
 trap = [Trap Card%%]
 ############################ Text
-pendulum-text = Text:\n([\S\s]*?)\n[\S\s]*?Text:
-monster-text = Text:[\s\S]*?Text:\n([\S\s]*)
-# pendulum-text = Pendulum Effect[\S\s]*?\n([\S\s]*?)\n=================
-# pendulum-text = Pendulum Effect\n([\S\s]*?)\n\n
-# monster-text = Monster Effect\n([\S\s]*)
+pendulum-text = Pendulum Text :\n([\S\s]*?)\n\n
+monster-text = Monster Text :\n([\S\s]*)
 ########################### Replace
 # replace = ([A-Z]) <i>$1</i>
\ No newline at end of file

win32/english_readme.txt

+1.pendulum 请统一卡片的描述，目前cdb里面的太乱了。
+
+Pendulum Scale = 10
+Pendulum Text :
+xxxxxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxxxxxxxxxx
+
+Monster Text :
+xxxxxxxxxxxxxxxxxxxxxxxx
+xxxxxxxxxxxxxxxxxx
+
+
+
+2.english/mse-config.txt
+
+pendulum-text = Pendulum Text :\n([\S\s]*?)\n\n
+monster-text = Monster Text :\n([\S\s]*)
\ No newline at end of file

win32/readme.txt

-[DataEditorX]2.2.3.3[DataEditorX]
+[DataEditorX]2.2.3.4[DataEditorX]
 [URL]https://github.com/247321453/DataEditorX/raw/master/win32/win32.zip[URL]
 
 ★使用前，请关联lua的打开方式，例如记事本，notepad++，等。
@@ -43,6 +43,8 @@ mse-config		设置pendulum文本和普通文本的正则正则表达式，用来
 
 ★lua编辑器 函数搜索
 在下面的文本框输入关键字，按Enter
+Ctrl+鼠标左键 	跳转到函数定义
+Ctrl+鼠标滑轮 	缩放文字
 
 ★支持 新建文本文档.txt 直接改名 新建文本文档.cdb
 
@@ -71,6 +73,8 @@ DataEditorX.exe.config
 描述不详细的bug，我修复不了。（都不知道是bug是什么）
 
 ★更新历史
+2.2.3.4
+english pengulum text
 2.2.3.3
 修复lua编辑器的控件遮挡问题
 2.2.3.2