Bug fixes.

GriefSyndromeModderTools · Jan 3, 2019 · 84d748f · 84d748f
1 parent 69c532b
commit 84d748f
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 7 deletions.
diff --git a/Editor/Exporters/Player/SkillGenerator.cs b/Editor/Exporters/Player/SkillGenerator.cs
@@ -21,6 +21,9 @@ private class SkillGeneratorEnv : GenerationEnvironment
             private Dictionary<string, string> _GeneratedActorInit = new Dictionary<string, string>();
             private HashSet<string> _GeneratedActorInitWithAB = new HashSet<string>();
 
+            private static int _NextInstanceId = 0;
+            private int _InstanceId = _NextInstanceId++;
+
             public int GetActionID(string name)
             {
                 if (name == null || name.Length == 0)
@@ -129,7 +132,7 @@ public void AddFunctionAlias(string newName, string oldName)
 
             public string CreateNewFunctionName()
             {
-                return "Alias_" + (nextEmptyId++).ToString();
+                return "Alias_" + _InstanceId + "_" + (nextEmptyId++).ToString();
             }
 
             public void GenerateAliasAssignment()

diff --git a/Pat/Effects/BulletEffect.cs b/Pat/Effects/BulletEffect.cs
@@ -283,7 +283,6 @@ public class BulletFollowingOwnerUpdateEffect : Effect
 
         [XmlAttribute]
         public bool IgnoreRotation { get; set; }
-
         [XmlElement]
         public bool ReleaseIfCheckFailed { get; set; }
 
@@ -319,6 +318,9 @@ public override void Run(Simulation.Actor actor)
                     (float)actor.Variables["SYS_follow_relx"].Value;
                 actor.Y = owner.Y + (float)actor.Variables["SYS_follow_rely"].Value;
 
+                actor.X += owner.VX;
+                actor.Y += owner.VY;
+
                 actor.InversedDirection = actor.Owner.InversedDirection;
                 if ((float)actor.Variables["SYS_follow_dir_p"].Value != 
                     (float)actor.Variables["SYS_follow_dir_s"].Value)
@@ -365,6 +367,7 @@ public override ILineObject Generate(GenerationEnvironment env)
             }
             if (cond != null)
             {
+                cond = new BiOpExpr(new CustomCodeExpr("ownerActor != null"), cond, BiOpExpr.Op.And);
                 ret.Add(new ControlBlock(ControlBlockType.If, cond,
                     new ILineObject[] {
                         BulletEffectHelper.GenerateEnd(ReleaseIfCheckFailed, SegmentCheckFailed),
@@ -381,6 +384,9 @@ public override ILineObject Generate(GenerationEnvironment env)
                 ActorVariableHelper.GenerateGet("SYS_follow_rely"), BiOpExpr.Op.Add);
             var dir = new BiOpExpr(dirChanged,
                 ActorVariableHelper.GenerateGet("SYS_follow_dir_s"), BiOpExpr.Op.Multiply);
+
+            x = new BiOpExpr(x, ownerActor.MakeIndex("vx"), BiOpExpr.Op.Add);
+            y = new BiOpExpr(y, ownerActor.MakeIndex("vy"), BiOpExpr.Op.Add);
 
             var setRotation = ThisExpr.Instance.MakeIndex("rz").Assign(ownerActor.MakeIndex("rz")).Statement();
             ret.AddRange(new ILineObject[] {

diff --git a/Pat/Effects/CommonEffect.cs b/Pat/Effects/CommonEffect.cs
@@ -134,6 +134,7 @@ public override ILineObject Generate(GenerationEnvironment env)
             else
             {
                 _LastEnv = env;
+                _AliasName = null;
                 if (AdditionalBehaviors == null || AdditionalBehaviors.Count == 0)
                 {
                     funcName = env.GenerateActionAsActorInit(ActionName);
@@ -151,11 +152,11 @@ public override ILineObject Generate(GenerationEnvironment env)
                         }
                     });
                 }
-
                 if (_AliasName != null)
                 {
                     env.AddFunctionAlias(_AliasName, funcName);
                 }
+                _LastEnv = null;
             }
 
             var dir = ThisExpr.Instance.MakeIndex("direction");

diff --git a/Pat/Effects/PointProvider.cs b/Pat/Effects/PointProvider.cs
@@ -35,15 +35,21 @@ public override FramePoint GetPointForActor(Simulation.Actor actor)
             var p = actor.CurrentFrame.Points[Index];
 
             float scaleX = actor.ScaleX, scaleY = actor.ScaleY;
-
-            //TODO IMPORTANT check if point should be scaled
+
             scaleX *= actor.CurrentFrame.ScaleX / 100.0f;
             scaleY *= actor.CurrentFrame.ScaleY / 100.0f;
+
+            var x = scaleX * p.X;
+            var y = scaleY * p.Y;
+
+            var rx = x * Math.Cos(actor.Rotation) - y * Math.Sin(actor.Rotation);
+            var ry = y * Math.Cos(actor.Rotation) + x * Math.Sin(actor.Rotation);
 
+            //TODO should use float instead of int
             return new FramePoint
             {
-                X = (int)(actor.X + (AdjustSpeed ? actor.VX : 0) + scaleX * p.X),
-                Y = (int)(actor.Y + (AdjustSpeed ? actor.VY : 0) + scaleY * p.Y),
+                X = (int)(actor.X + rx + (AdjustSpeed ? actor.VX : 0)),
+                Y = (int)(actor.Y + ry + (AdjustSpeed ? actor.VY : 0)),
             };
         }