Merge branch 'main' of https://github.com/RyannThi/LuaSTG-Editor-Sharp-X

RulHolos · RulHolos · commit e49eab0642be · 2022-09-15T17:00:15.000+02:00
diff --git a/LuaSTGEditorSharp.Core/EditorData/Node/ProjSettings.cs b/LuaSTGEditorSharp.Core/EditorData/Node/ProjSettings.cs
@@ -94,7 +94,7 @@ public override string ToString()
         public override IEnumerable<string> ToLua(int spacing)
         {
             string modvera = Macrolize(4) == "" ? "4096" : Macrolize(4);
-            yield return "-- Generated by LuaSTG Editor Sharp X 0.74.1\n-- Mod name: " + NonMacrolize(0) + "\n_author = \"" +
+            yield return "-- Generated by LuaSTG Editor Sharp X 0.74.2\n-- Mod name: " + NonMacrolize(0) + "\n_author = \"" +
                 Macrolize(1) + "\"\n_mod_version = " + modvera + "\n_allow_practice = " + Macrolize(2) +
                 "\n_allow_sc_practice = " + Macrolize(3) + "\n";
         }
diff --git a/LuaSTGEditorSharp/MainWindow.xaml b/LuaSTGEditorSharp/MainWindow.xaml
@@ -9,7 +9,7 @@
         xmlns:tb="clr-namespace:LuaSTGEditorSharp.Plugin;assembly=LuaSTGEditorSharp.Core"
         xmlns:om="clr-namespace:System.Collections.Generic;assembly=mscorlib"
         mc:Ignorable="d"
-        Title="LuaSTG Editor Sharp X v0.74.1"
+        Title="LuaSTG Editor Sharp X v0.74.2"
         Height="679.6"
         Width="800"
         WindowState="Maximized"
diff --git a/LuaSTGEditorSharp/Properties/AssemblyInfo.cs b/LuaSTGEditorSharp/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.74.1")]
-[assembly: AssemblyFileVersion("0.74.1")]
+[assembly: AssemblyVersion("0.74.2")]
+[assembly: AssemblyFileVersion("0.74.2")]
diff --git a/LuaSTGEditorSharp/Templates/Empty File.lstges b/LuaSTGEditorSharp/Templates/Empty File.lstges
@@ -1,3 +1,3 @@
 ﻿0,{"$type":"LuaSTGEditorSharp.EditorData.Node.RootFolder, LuaSTGEditorSharp","Attributes":[{"attrCap":"Name","attrInput":"File","EditWindow":""}],"IsExpanded":true,"IsSelected":true}
 1,{"$type":"LuaSTGEditorSharp.EditorData.Node.ProjSettings, LuaSTGEditorSharp","Attributes":[{"attrCap":"Output Name","attrInput":"","EditWindow":""},{"attrCap":"Author","attrInput":"LuaSTG User","EditWindow":""},{"attrCap":"Allow practice","attrInput":"true","EditWindow":"bool"},{"attrCap":"Allow sc practice","attrInput":"true","EditWindow":"bool"}, {"attrCap":"Mod version","attrInput":"true","EditWindow":""}],"IsExpanded":true,"IsSelected":false}
-1,{"$type":"LuaSTGEditorSharp.EditorData.Node.EditorVersion, LuaSTGEditorSharp","Attributes":[{"attrCap":"Editor version","attrInput":"0.74.1","EditWindow":""}],"IsExpanded":true,"IsSelected":false}
+1,{"$type":"LuaSTGEditorSharp.EditorData.Node.EditorVersion, LuaSTGEditorSharp","Attributes":[{"attrCap":"Editor version","attrInput":"0.74.2","EditWindow":""}],"IsExpanded":true,"IsSelected":false}
diff --git a/LuaSTGEditorSharp/Templates/Empty Project.lstgproj b/LuaSTGEditorSharp/Templates/Empty Project.lstgproj
@@ -1,3 +1,3 @@
 ﻿0,{"$type":"LuaSTGEditorSharp.EditorData.Node.Project.ProjectRoot, LuaSTGEditorSharp","Attributes":[{"attrCap":"Name","attrInput":"Project","EditWindow":""}],"IsExpanded":true,"IsSelected":true}
 1,{"$type":"LuaSTGEditorSharp.EditorData.Node.ProjSettings, LuaSTGEditorSharp","Attributes":[{"attrCap":"Output Name","attrInput":"","EditWindow":""},{"attrCap":"Author","attrInput":"LuaSTG User","EditWindow":""},{"attrCap":"Allow practice","attrInput":"true","EditWindow":"bool"},{"attrCap":"Allow sc practice","attrInput":"true","EditWindow":"bool"},{"attrCap":"Mod version","attrInput":"true","EditWindow":""}],"IsExpanded":true,"IsSelected":false}
-1,{"$type":"LuaSTGEditorSharp.EditorData.Node.EditorVersion, LuaSTGEditorSharp","Attributes":[{"attrCap":"Editor version","attrInput":"0.74.1","EditWindow":""}],"IsExpanded":true,"IsSelected":false}
+1,{"$type":"LuaSTGEditorSharp.EditorData.Node.EditorVersion, LuaSTGEditorSharp","Attributes":[{"attrCap":"Editor version","attrInput":"0.74.2","EditWindow":""}],"IsExpanded":true,"IsSelected":false}
diff --git a/LuaSTGEditorSharp/Templates/Extra.lstges b/LuaSTGEditorSharp/Templates/Extra.lstges
@@ -1,6 +1,6 @@
 ﻿0,{"$type":"LuaSTGEditorSharp.EditorData.Node.RootFolder, LuaSTGEditorSharp","Attributes":[{"attrCap":"Name","attrInput":"File","EditWindow":""}],"IsExpanded":true,"IsSelected":false}
 1,{"$type":"LuaSTGEditorSharp.EditorData.Node.ProjSettings, LuaSTGEditorSharp","Attributes":[{"attrCap":"Output Name","attrInput":"","EditWindow":""},{"attrCap":"Author","attrInput":"LuaSTG User","EditWindow":""},{"attrCap":"Allow practice","attrInput":"true","EditWindow":"bool"},{"attrCap":"Allow sc practice","attrInput":"true","EditWindow":"bool"},{"attrCap":"Mod version","attrInput":"true","EditWindow":""}],"IsExpanded":true,"IsSelected":false}
-1,{"$type":"LuaSTGEditorSharp.EditorData.Node.EditorVersion, LuaSTGEditorSharp","Attributes":[{"attrCap":"Editor version","attrInput":"0.74.1","EditWindow":""}],"IsExpanded":true,"IsSelected":false}
+1,{"$type":"LuaSTGEditorSharp.EditorData.Node.EditorVersion, LuaSTGEditorSharp","Attributes":[{"attrCap":"Editor version","attrInput":"0.74.2","EditWindow":""}],"IsExpanded":true,"IsSelected":false}
 1,{"$type":"LuaSTGEditorSharp.EditorData.Node.General.Folder, LuaSTGEditorSharp","Attributes":[{"attrCap":"Name","attrInput":"Resources","EditWindow":""}],"IsExpanded":true,"IsSelected":false}
 1,{"$type":"LuaSTGEditorSharp.EditorData.Node.General.Folder, LuaSTGEditorSharp","Attributes":[{"attrCap":"Name","attrInput":"Classes","EditWindow":""}],"IsExpanded":true,"IsSelected":false}
 2,{"$type":"LuaSTGEditorSharp.EditorData.Node.Stage.StageGroup, LuaSTGNodeLib","Attributes":[{"attrCap":"Name","attrInput":"Extra","EditWindow":"stageGroup"},{"attrCap":"Start life","attrInput":"7","EditWindow":""},{"attrCap":"Start power","attrInput":"400","EditWindow":""},{"attrCap":"Start faith","attrInput":"50000","EditWindow":""},{"attrCap":"Start bomb","attrInput":"3","EditWindow":""},{"attrCap":"Allow practice","attrInput":"true","EditWindow":"bool"},{"attrCap":"Difficulty value","attrInput":"1","EditWindow":"difficulty"}],"IsExpanded":true,"IsSelected":false}
diff --git a/LuaSTGEditorSharp/Templates/Raw Resources & Classes.lstges b/LuaSTGEditorSharp/Templates/Raw Resources & Classes.lstges
@@ -1,5 +1,5 @@
 ﻿0,{"$type":"LuaSTGEditorSharp.EditorData.Node.RootFolder, LuaSTGEditorSharp","Attributes":[{"attrCap":"Name","attrInput":"File","EditWindow":""}],"IsExpanded":true,"IsSelected":true}
 1,{"$type":"LuaSTGEditorSharp.EditorData.Node.ProjSettings, LuaSTGEditorSharp","Attributes":[{"attrCap":"Output Name","attrInput":"","EditWindow":""},{"attrCap":"Author","attrInput":"","EditWindow":""},{"attrCap":"Allow practice","attrInput":"true","EditWindow":"bool"},{"attrCap":"Allow sc practice","attrInput":"true","EditWindow":"bool"},{"attrCap":"Mod version","attrInput":"true","EditWindow":""}],"IsExpanded":true,"IsSelected":false}
-1,{"$type":"LuaSTGEditorSharp.EditorData.Node.EditorVersion, LuaSTGEditorSharp","Attributes":[{"attrCap":"Editor version","attrInput":"0.74.1","EditWindow":""}],"IsExpanded":true,"IsSelected":false}
+1,{"$type":"LuaSTGEditorSharp.EditorData.Node.EditorVersion, LuaSTGEditorSharp","Attributes":[{"attrCap":"Editor version","attrInput":"0.74.2","EditWindow":""}],"IsExpanded":true,"IsSelected":false}
 1,{"$type":"LuaSTGEditorSharp.EditorData.Node.General.Folder, LuaSTGEditorSharp","Attributes":[{"attrCap":"Name","attrInput":"Resources","EditWindow":""}],"IsExpanded":true,"IsSelected":false}
 1,{"$type":"LuaSTGEditorSharp.EditorData.Node.General.Folder, LuaSTGEditorSharp","Attributes":[{"attrCap":"Name","attrInput":"Classes","EditWindow":""}],"IsExpanded":true,"IsSelected":false}
diff --git a/LuaSTGEditorSharp/Templates/Spell Card.lstges b/LuaSTGEditorSharp/Templates/Spell Card.lstges
@@ -1,6 +1,6 @@
 ﻿0,{"$type":".RootFolder, LuaSTGEditorSharp","Attributes":[{"attrCap":"Name","attrInput":"File","EditWindow":""}],"AttributeCount":1}
 1,{"$type":".ProjSettings, LuaSTGEditorSharp","Attributes":[{"attrCap":"Output Name","attrInput":"","EditWindow":""},{"attrCap":"Author","attrInput":"LuaSTG User","EditWindow":""},{"attrCap":"Allow practice","attrInput":"true","EditWindow":"bool"},{"attrCap":"Allow sc practice","attrInput":"true","EditWindow":"bool"},{"attrCap":"Mod version","attrInput":"true","EditWindow":""}],"AttributeCount":4}
-1,{"$type":".EditorVersion, LuaSTGEditorSharp","Attributes":[{"attrCap":"Editor version","attrInput":"0.74.1","EditWindow":""}],"AttributeCount":1}
+1,{"$type":".EditorVersion, LuaSTGEditorSharp","Attributes":[{"attrCap":"Editor version","attrInput":"0.74.2","EditWindow":""}],"AttributeCount":1}
 1,{"$type":".General.Folder, LuaSTGEditorSharp","Attributes":[{"attrCap":"Name","attrInput":"Resources","EditWindow":""}],"AttributeCount":1}
 1,{"$type":".General.Folder, LuaSTGEditorSharp","Attributes":[{"attrCap":"Name","attrInput":"Classes","EditWindow":""}],"AttributeCount":1}
 2,{"$type":".Boss.BossDefine, ","Attributes":[{"attrCap":"Name","attrInput":"Boss","EditWindow":""},{"attrCap":"Difficulty","attrInput":"All","EditWindow":"objDifficulty"},{"attrCap":"Displayed name","attrInput":"Name","EditWindow":""},{"attrCap":"Background","attrInput":"","EditWindow":"BG"},{"attrCap":"Background Music","attrInput":"\"\"","EditWindow":"BGM"}],"AttributeCount":5}
diff --git a/LuaSTGEditorSharp/Update Log.txt b/LuaSTGEditorSharp/Update Log.txt
@@ -1,4 +1,8 @@
-﻿-- Update Log（2022-07-30）
+﻿-- Update Log（2022-08-22）
+
+v0.74.2:
+-Fixed fatal behavior on defined player bullets (uninitialized default procedure for _object type class)
+-Added show mouse node (game data tab)
 
 v0.74.1:
 -Added event type parameter for default action node
diff --git a/LuaSTGNode.Legacy/EditorData/Node/GameData/SetSplash.cs b/LuaSTGNode.Legacy/EditorData/Node/GameData/SetSplash.cs
@@ -0,0 +1,64 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using LuaSTGEditorSharp.EditorData.Message;
+using LuaSTGEditorSharp.EditorData.Document;
+using LuaSTGEditorSharp.EditorData.Node.NodeAttributes;
+using Newtonsoft.Json;
+
+namespace LuaSTGEditorSharp.EditorData.Node.Object
+{
+    [Serializable, NodeIcon("setsplash.png")]
+    [LeafNode]
+    [CreateInvoke(0), RCInvoke(1)]
+    class SetSplash : TreeNode
+    {
+        [JsonConstructor]
+        private SetSplash() : base() { }
+
+        public SetSplash(DocumentData workSpaceData)
+            : this(workSpaceData, "true") { }
+
+        public SetSplash(DocumentData workSpaceData, string show)
+            : base(workSpaceData)
+        {
+            ShowMouse = show;
+        }
+
+        [JsonIgnore, NodeAttribute]
+        public string ShowMouse
+        {
+            get => DoubleCheckAttr(0, "bool", "Display mouse on screen").attrInput;
+            set => DoubleCheckAttr(0, "bool", "Display mouse on screen").attrInput = value;
+        }
+
+        public override IEnumerable<string> ToLua(int spacing)
+        {
+            string sp = Indent(spacing);
+            yield return sp + $"SetSplash({Macrolize(0)})";
+        }
+
+        public override string ToString()
+        {
+            if (NonMacrolize(0) == "true")
+                return "Show the mouse on game screen";
+            else
+                return "Don't show the mouse on game screen";
+        }
+
+        public override IEnumerable<Tuple<int, TreeNode>> GetLines()
+        {
+            yield return new Tuple<int, TreeNode>(1, this);
+        }
+
+        public override object Clone()
+        {
+            var n = new SetSplash(parentWorkSpace);
+            n.DeepCopyFrom(this);
+            return n;
+        }
+    }
+}
diff --git a/LuaSTGNode.Legacy/EditorData/Node/Player/PlayerBulletInit.cs b/LuaSTGNode.Legacy/EditorData/Node/Player/PlayerBulletInit.cs
@@ -87,7 +87,10 @@ public override IEnumerable<string> ToLua(int spacing)
             }
             string p = (!string.IsNullOrEmpty(NonMacrolize(0)) ? NonMacrolize(0) : "_");
             yield return sp + "_editor_class[\"" + parentName + "\"].init=function(self,_x,_y," + p + ")\n"
-                         + sp + s1 + "player_bullet_straight.init(self," + Macrolize(1) + ",_x,_y," + Macrolize(2) + "," + Macrolize(3) + "," + Macrolize(4) + ")\n";
+                         + sp + s1 + "player_bullet_straight.init(self," + Macrolize(1) + ",_x,_y," + Macrolize(2) + "," + Macrolize(3) + "," + Macrolize(4) + ")\n"
+                         + sp + s1 + "self.hp = 10\n"
+                         + sp + s1 + "self._blend, self._a, self._r, self._g, self._b = \"\", 255, 255, 255, 255\n"
+                         + sp + s1 + "self._servants = {}\n";
             foreach (var a in base.ToLua(spacing + 1))
             {
                 yield return a;
diff --git a/LuaSTGNode.Legacy/LuaSTGNode.Legacy.csproj b/LuaSTGNode.Legacy/LuaSTGNode.Legacy.csproj
@@ -135,6 +135,7 @@
     <Compile Include="EditorData\Node\GameData\SetGameBomb.cs" />
     <Compile Include="EditorData\Node\GameData\SetGameBombPiece.cs" />
     <Compile Include="EditorData\Node\GameData\SetGameKillPlayer.cs" />
+    <Compile Include="EditorData\Node\GameData\SetSplash.cs" />
     <Compile Include="EditorData\Node\GameData\SetGameScore.cs" />
     <Compile Include="EditorData\Node\GameData\SetGameGraze.cs" />
     <Compile Include="EditorData\Node\GameData\SetGamePoint.cs" />
@@ -2184,5 +2185,11 @@
   <ItemGroup>
     <Resource Include="images\16x16\createitem.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="images\setsplash.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="images\16x16\setsplash.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/LuaSTGNode.Legacy/PluginToolbox.cs b/LuaSTGNode.Legacy/PluginToolbox.cs
@@ -521,6 +521,8 @@ public override void InitFunc()
                 , new AddNode(AddRaiseError));
             gdata.Add(new ToolboxItemData("raisewarning", "/LuaSTGNode.Legacy;component/images/raisewarning.png", "Raise Warning")
                 , new AddNode(AddRaiseWarning));
+            gdata.Add(new ToolboxItemData("setsplash", "/LuaSTGNode.Legacy;component/images/setsplash.png", "Show Mouse")
+                , new AddNode(AddSetSplash));
             #endregion
             ToolInfo.Add("Game Data", gdata);
         }
@@ -1557,7 +1559,8 @@ private void AddPlayerDefineBulletNode()
             pl4.AddChild(new DefaultAction(parent.ActivatedWorkSpaceData, "colli"));
             pl.AddChild(new PlayerBulletKill(parent.ActivatedWorkSpaceData));
             var pl5 = pl.Children.Last();
-            pl5.AddChild(new DefaultAction(parent.ActivatedWorkSpaceData, "kill"));
+            //pl5.AddChild(new DefaultAction(parent.ActivatedWorkSpaceData, "kill"));
+            //pl5.AddChild(new Del(parent.ActivatedWorkSpaceData, "self", "false"));
             pl.AddChild(new PlayerBulletDel(parent.ActivatedWorkSpaceData));
             var pl6 = pl.Children.Last();
             pl6.AddChild(new DefaultAction(parent.ActivatedWorkSpaceData, "del"));
@@ -1611,6 +1614,10 @@ private void AddSetGameKillPlayerNode()
         {
             parent.Insert(new SetGameKillPlayer(parent.ActivatedWorkSpaceData));
         }
+        private void AddSetSplash()
+        {
+            parent.Insert(new SetSplash(parent.ActivatedWorkSpaceData));
+        }
         #endregion
     }
 }
diff --git a/LuaSTGNode.Legacy/images/16x16/setsplash.png b/LuaSTGNode.Legacy/images/16x16/setsplash.png
diff --git a/LuaSTGNode.Legacy/images/setsplash.png b/LuaSTGNode.Legacy/images/setsplash.png
diff --git a/NodeTest/HugeFileTest.cs b/NodeTest/HugeFileTest.cs
@@ -22,7 +22,7 @@ public void CreateHugeFile()
             Random random = new Random();
             sw.WriteLine("0,{\"$type\":\"LuaSTGEditorSharp.EditorData.Node.RootFolder, LuaSTGEditorSharp\",\"attributes\":[{\"attrCap\":\"Name\",\"attrInput\":\"File\",\"EditWindow\":\"\"}],\"IsExpanded\":true,\"IsSelected\":false}");
             sw.WriteLine("1,{\"$type\":\"LuaSTGEditorSharp.EditorData.Node.ProjSettings, LuaSTGEditorSharp\",\"attributes\":[{\"attrCap\":\"Output Name\",\"attrInput\":\"\",\"EditWindow\":\"\"},{\"attrCap\":\"Author\",\"attrInput\":\"LuaSTG User\",\"EditWindow\":\"\"},{\"attrCap\":\"Allow practice\",\"attrInput\":\"true\",\"EditWindow\":\"bool\"},{\"attrCap\":\"Allow sc practice\",\"attrInput\":\"true\",\"EditWindow\":\"bool\"}],\"IsExpanded\":true,\"IsSelected\":false}");
-            sw.WriteLine("1,{\"$type\":\"LuaSTGEditorSharp.EditorData.Node.EditorVersion, LuaSTGEditorSharp\",\"attributes\":[{\"attrCap\":\"Editor version\",\"attrInput\":\"0.74.1\",\"EditWindow\":\"\"}],\"IsExpanded\":true,\"IsSelected\":false}");
+            sw.WriteLine("1,{\"$type\":\"LuaSTGEditorSharp.EditorData.Node.EditorVersion, LuaSTGEditorSharp\",\"attributes\":[{\"attrCap\":\"Editor version\",\"attrInput\":\"0.74.2\",\"EditWindow\":\"\"}],\"IsExpanded\":true,\"IsSelected\":false}");
             for(int i = 0; i < 65536; i++)
             {
                 sw.WriteLine(last + ",{\"$type\":\"LuaSTGEditorSharp.EditorData.Node.General.Folder, LuaSTGEditorSharp\",\"attributes\":[{\"attrCap\":\"Name\",\"attrInput\":\""+ Guid.NewGuid().ToString() + "\",\"EditWindow\":\"\"}],\"IsExpanded\":true,\"IsSelected\":false}");
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 LuaSTG Editor Sharp X
 ====
-![](https://cdn.discordapp.com/emojis/871436538087624805.png?v=1) (Current version (in dev/released): 0.74.1)
+![](https://cdn.discordapp.com/emojis/871436538087624805.png?v=1) (Current version (in dev/released): 0.74.2)
 
 This is a clone of the [LuaSTG Editor Sharp](https://github.com/czh098tom/LuaSTG-Editor-Sharp) repository with making more features that are compatible with LuaSTG-x.
 

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public override string ToString()`
`94`	`94`	`public override IEnumerable<string> ToLua(int spacing)`
`95`	`95`	`{`
`96`	`96`	`string modvera = Macrolize(4) == "" ? "4096" : Macrolize(4);`
`97`		`- yield return "-- Generated by LuaSTG Editor Sharp X 0.74.1\n-- Mod name: " + NonMacrolize(0) + "\n_author = \"" +`
	`97`	`+ yield return "-- Generated by LuaSTG Editor Sharp X 0.74.2\n-- Mod name: " + NonMacrolize(0) + "\n_author = \"" +`
`98`	`98`	`Macrolize(1) + "\"\n_mod_version = " + modvera + "\n_allow_practice = " + Macrolize(2) +`
`99`	`99`	`"\n_allow_sc_practice = " + Macrolize(3) + "\n";`
`100`	`100`	`}`