Merge pull request #179 from EverestAPI/lightning_enhancements

Lightning strike additions

Author: Cruor

Ahorn/lang/en_gb.lang

@@ -25,10 +25,13 @@ placements.entities.SpringCollab2020/caveWall.tooltips.disableTransitionFading=I
 
 # Lightning Strike Trigger
 placements.triggers.SpringCollab2020/LightningStrikeTrigger.tooltips.playerOffset=The X offset of the lightning relative to the player's position.
+placements.triggers.SpringCollab2020/LightningStrikeTrigger.tooltips.verticalOffset=The Y offset of the lightning relative to the player's position.
+placements.triggers.SpringCollab2020/LightningStrikeTrigger.tooltips.strikeHeight=The height of the lightning strike. If set to 0, the height will be the screen's height.
 placements.triggers.SpringCollab2020/LightningStrikeTrigger.tooltips.seed=The seed for the randomizer which generates the lightning strike.
 placements.triggers.SpringCollab2020/LightningStrikeTrigger.tooltips.delay=The delay, in seconds, between the player entering the trigger and the appearance of the lightning strike.
 placements.triggers.SpringCollab2020/LightningStrikeTrigger.tooltips.rain=Upon lightning strike, rain will begin falling in the level.
 placements.triggers.SpringCollab2020/LightningStrikeTrigger.tooltips.flash=Upon lightning strike, the screen will flash white.
+placements.triggers.SpringCollab2020/LightningStrikeTrigger.tooltips.constant=If lightning should constantly strike while the player is inside the trigger.
 
 # Variable Crumble Blocks
 placements.entities.SpringCollab2020/variableCrumbleBlock.tooltips.texture=The texture of the blocks that are crumbling.2

Ahorn/triggers/lightningStrikeTrigger.jl

@@ -2,7 +2,7 @@
 
 using ..Ahorn, Maple
 
-@mapdef Trigger "SpringCollab2020/LightningStrikeTrigger" LightningStrikeTrigger(x::Integer, y::Integer, width::Integer=Maple.defaultTriggerWidth, height::Integer=Maple.defaultTriggerHeight, playerOffset::Number=0.0, seed::Integer=0, delay::Number=0.0, rain::Bool=true, flash::Bool=true)
+@mapdef Trigger "SpringCollab2020/LightningStrikeTrigger" LightningStrikeTrigger(x::Integer, y::Integer, width::Integer=Maple.defaultTriggerWidth, height::Integer=Maple.defaultTriggerHeight, playerOffset::Number=0.0, verticalOffset::Number=0.0, strikeHeight::Number=0.0, seed::Integer=0, delay::Number=0.0, rain::Bool=true, flash::Bool=true, constant::Bool=false)
 
 const placements = Ahorn.PlacementDict(
     "Lightning Strike (Spring Collab 2020)" => Ahorn.EntityPlacement(

Triggers/LightningStrikeTrigger.cs

@@ -4,6 +4,7 @@
 using System.Linq;
 using Monocle;
 using System.Collections;
+using System;
 
 namespace Celeste.Mod.SpringCollab2020.Triggers {
     [CustomEntity("SpringCollab2020/LightningStrikeTrigger")]
@@ -12,40 +13,75 @@ class LightningStrikeTrigger : Trigger {
 
         private float PlayerOffset;
 
+        private float VerticalOffset;
+
+        private float StrikeHeight;
+
         private int Seed;
 
         private float Delay;
 
         private bool Raining;
 
         private bool Flash;
+
+        private bool Constant;
+
+        private int ConstantTimer = 10;
+
+        private Random rand;
 
-        public LightningStrikeTrigger(EntityData data, Vector2 offset) : this(data, offset, data.Float("playerOffset", 0f), data.Int("seed", 0), data.Float("delay", 0f), data.Bool("rain", true), data.Bool("flash", true)) { }
+        public LightningStrikeTrigger(EntityData data, Vector2 offset) : this(data, offset, data.Float("playerOffset", 0f), data.Float("verticalOffset", 0), data.Float("strikeHeight", 0), data.Int("seed", 0), data.Float("delay", 0f), data.Bool("rain", true), data.Bool("flash", true), data.Bool("constant", false)) { }
 
-        public LightningStrikeTrigger(EntityData data, Vector2 offset, float playerOffset, int seed, float delay, bool raining, bool flash) : base (data, offset) {
+        public LightningStrikeTrigger(EntityData data, Vector2 offset, float playerOffset, float verticalOffset, float height, int seed, float delay, bool raining, bool flash, bool constant) : base (data, offset) {
             PlayerOffset = playerOffset;
+            VerticalOffset = verticalOffset;
+            StrikeHeight = height;
             Seed = seed;
             Delay = delay;
             Raining = raining;
             Flash = flash;
+            Constant = constant;
+
+            rand = new Random(seed);
         }
 
         public override void OnEnter(Player player) {
             base.OnEnter(player);
+            if (!Activated && !Constant) {
+                Activated = true;
 
-            Level level = player.SceneAs<Level>();
+                Strike(player);
+            }
+        }
 
-            if (!Activated) {
-                Activated = true;
-                level.Add(new LightningStrike(new Vector2(player.X + PlayerOffset, level.Bounds.Top), Seed, level.Bounds.Height, Delay));
-                Add(new Coroutine(ThunderEffect(level), true));
+        public override void OnStay(Player player) {
+            base.OnStay(player);
+
+            if (Constant) {
+                ConstantTimer -= 1;
 
-                if (Raining && !level.Background.Backdrops.OfType<RainFG>().Any()) {
-                    level.Background.Backdrops.Add(new RainFG());
+                if (ConstantTimer <= 0) {
+                    Strike(player);
+                    ConstantTimer = rand.Next(40, 60);
                 }
             }
         }
 
+        public void Strike(Player player) {
+            Level level = player.SceneAs<Level>();
+            if (StrikeHeight == 0)
+                level.Add(new LightningStrike(new Vector2(player.X + PlayerOffset, level.Bounds.Top), Seed, level.Bounds.Height, Delay));
+            else
+                level.Add(new LightningStrike(new Vector2(player.X + PlayerOffset, player.Y + VerticalOffset), rand.Next(1, 100), StrikeHeight, Delay));
+
+            Add(new Coroutine(ThunderEffect(level), true));
+
+            if (Raining && !level.Background.Backdrops.OfType<RainFG>().Any()) {
+                level.Background.Backdrops.Add(new RainFG());
+            }
+        }
+
         private IEnumerator ThunderEffect(Level level) {
             yield return Delay;
             Audio.Play("event:/new_content/game/10_farewell/lightning_strike");