From ba77f8e2aa41db388932289c94742408bfc17060 Mon Sep 17 00:00:00 2001
From: Leonwang4234 <62972692+Leonwang4234@users.noreply.github.com>
Date: Thu, 15 Oct 2020 17:59:03 -0700
Subject: [PATCH] implement content

---
 core/src/mindustry/content/UnitTypes.java     | 20 +++++++++++++++++++
 core/src/mindustry/entities/Damage.java       |  4 ++++
 core/src/mindustry/entities/Lightning.java    |  8 +++++++-
 .../mindustry/entities/bullet/BulletType.java |  2 ++
 4 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
index 9a1b851118..4849940423 100644
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -330,6 +330,17 @@ public class UnitTypes implements ContentList{
                     lightningLength = 7;
                     lightningLengthRand = 7;
                     shootEffect = Fx.shootHeal;
+
+                    lightningHitter = new BulletType(0.0001f, 0f){{
+                        lifetime = Fx.lightning.lifetime;
+                        hitEffect = Fx.hitLancer;
+                        despawnEffect = Fx.none;
+                        status = StatusEffects.shocked;
+                        statusDuration = 10f;
+                        hittable = false;
+                        healPercent = 5f;
+                        collidesTeam = true;
+                    }};
                 }};
             }});
         }};
@@ -371,6 +382,8 @@ public class UnitTypes implements ContentList{
                     sideAngle = 45f;
                     sideWidth = 1f;
                     sideLength = 70f;
+                    healPercent = 10f;
+                    collidesTeam = true;
                     colors = new Color[]{Pal.heal.cpy().a(0.4f), Pal.heal, Color.white};
                 }};
             }});
@@ -430,6 +443,10 @@ public class UnitTypes implements ContentList{
                     incendSpread = 5f;
                     incendAmount = 1;
 
+                    //constant healing
+                    healPercent = 0.5f;
+                    collidesTeam = true;
+
                     colors = new Color[]{Pal.heal.cpy().a(.2f), Pal.heal.cpy().a(.5f), Pal.heal.cpy().mul(1.2f), Color.white};
                 }};
 
@@ -500,6 +517,9 @@ public class UnitTypes implements ContentList{
 
                     shootEffect = Fx.greenLaserCharge;
 
+                    healPercent = 20f;
+                    collidesTeam = true;
+
                     sideAngle = 15f;
                     sideWidth = 0f;
                     sideLength = 0f;
diff --git a/core/src/mindustry/entities/Damage.java b/core/src/mindustry/entities/Damage.java
index e22891eba5..04d0ad55c6 100644
--- a/core/src/mindustry/entities/Damage.java
+++ b/core/src/mindustry/entities/Damage.java
@@ -119,6 +119,10 @@ public class Damage{
                 collidedBlocks.add(tile.pos());
                 hitter.type.hit(hitter, tile.x, tile.y);
             }
+            //can heal?
+            if(tile != null && !collidedBlocks.contains(tile.pos()) && hitter.type.collides(hitter, tile)){
+                hitter.type.hitTile(hitter, tile, 0f);
+            }
         };
 
         if(hitter.type.collidesGround){
diff --git a/core/src/mindustry/entities/Lightning.java b/core/src/mindustry/entities/Lightning.java
index 738bfa1f1e..300c151ef1 100644
--- a/core/src/mindustry/entities/Lightning.java
+++ b/core/src/mindustry/entities/Lightning.java
@@ -36,7 +36,13 @@ public class Lightning{
         random.setSeed(seed);
         hit.clear();
 
-        BulletType bulletType = hitter != null && !hitter.type.collidesAir ? Bullets.damageLightningGround : Bullets.damageLightning;
+        BulletType bulletType;
+        if(hitter != null && hitter.type.lightningHitter != null) {
+            bulletType = hitter.type.lightningHitter;
+        } else {
+            bulletType = hitter != null && !hitter.type.collidesAir ? Bullets.damageLightningGround : Bullets.damageLightning;
+        }
+
         Seq<Vec2> lines = new Seq<>();
         bhit = false;
 
diff --git a/core/src/mindustry/entities/bullet/BulletType.java b/core/src/mindustry/entities/bullet/BulletType.java
index 0c3a605f1b..dd49a6c0a4 100644
--- a/core/src/mindustry/entities/bullet/BulletType.java
+++ b/core/src/mindustry/entities/bullet/BulletType.java
@@ -112,6 +112,8 @@ public abstract class BulletType extends Content{
     public float lightningDamage = -1;
     public float lightningCone = 360f;
     public float lightningAngle = 0f;
+    /** The lighting "hitter"; Use when trying to implement special lightning. */
+    public BulletType lightningHitter;
 
     public float weaveScale = 1f;
     public float weaveMag = -1f;