diff --git a/Code/FLCC/CustomPuffer.cs b/Code/FLCC/CustomPuffer.cs index cac56b8..558c67c 100644 --- a/Code/FLCC/CustomPuffer.cs +++ b/Code/FLCC/CustomPuffer.cs @@ -82,7 +82,7 @@ public enum BoostModes private bool tangible = true; private bool renderEye = true; - public CustomPuffer(Vector2 position, bool faceRight, float angle = 0f, float radius = 32f, float launchSpeed = 280f, string spriteName = "pufferFish") + public CustomPuffer(Vector2 position, bool faceRight, float angle = 0f, float radius = 32f, float launchSpeed = 280f, string spriteName = "pufferFish", bool isStatic = false) : base(position) { Collider = new Hitbox(12f, 10f, -6f, -5f); @@ -98,8 +98,12 @@ public CustomPuffer(Vector2 position, bool faceRight, float angle = 0f, float ra Facing.X = -1f; } idleSine = new SineWave(0.5f, 0f); - idleSine.Randomize(); - Add(idleSine); + if(!isStatic) + { + idleSine.Randomize(); + } + this.isStatic = isStatic; + Add(idleSine); anchorPosition = Position; Position += new Vector2(idleSine.Value * 3f, idleSine.ValueOverTwo * 2f); State = States.Idle; @@ -122,13 +126,12 @@ public CustomPuffer(Vector2 position, bool faceRight, float angle = 0f, float ra } public CustomPuffer(EntityData data, Vector2 offset, EntityID id) - : this(data.Position + offset, data.Bool("right", false), data.Float("angle", 0f), data.Float("radius", 32f), data.Float("launchSpeed", 280f), data.Attr("sprite", "pufferFish")) + : this(data.Position + offset, data.Bool("right", false), data.Float("angle", 0f), data.Float("radius", 32f), data.Float("launchSpeed", 280f), data.Attr("sprite", "pufferFish"), data.Bool("static",false)) { ID = id; respawnTime = data.Float("respawnTime", 2.5f); alwaysShowOutline = data.Bool("alwaysShowOutline"); - isStatic = data.Bool("static"); pushAny = data.Bool("pushAnyDir"); oneUse = data.Bool("oneUse"); deathFlag = data.Attr("deathFlag");