From e7f98c3607c553faa526ed31e7e3d3cf3e891682 Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Mon, 9 Mar 2020 20:06:18 -0700
Subject: [PATCH 01/56] Put my Solarflare here for now. I still don't know how
 to script a beam tho

---
 content/blocks/turrets/solarflare.hjson | 21 +++++++++++++++++++++
 scripts/blocks/solarflare.js            | 19 +++++++++++++++++++
 scripts/main.js                         |  1 +
 3 files changed, 41 insertions(+)
 create mode 100644 content/blocks/turrets/solarflare.hjson
 create mode 100644 scripts/blocks/solarflare.js
 create mode 100644 scripts/main.js

diff --git a/content/blocks/turrets/solarflare.hjson b/content/blocks/turrets/solarflare.hjson
new file mode 100644
index 0000000..759e099
--- /dev/null
+++ b/content/blocks/turrets/solarflare.hjson
@@ -0,0 +1,21 @@
+name: Solar Flare
+description: A cousin of the meltdown. Focused more on burning enemies than damaging blocks.
+size: 4
+range: 500
+reload: 80
+shootSound: laserbig
+activeSound:beam
+activeSoundVolume: 2
+powerUse: 15
+rotatespeed: 0.5
+shootCone: 35
+targetAir: true
+targetGround: true
+heatColor: e3b464
+recoil: 5
+cooldown: 0.0133333333
+restitution: 0.0133333333
+requirements: [
+]
+category: turret
+research: meltdown
\ No newline at end of file
diff --git a/scripts/blocks/solarflare.js b/scripts/blocks/solarflare.js
new file mode 100644
index 0000000..3f596ed
--- /dev/null
+++ b/scripts/blocks/solarflare.js
@@ -0,0 +1,19 @@
+const solarflare = new LaserTurret("solarflare");
+
+
+solarflare.shootType = extend(BulletType{
+    Color tmpColor = new Color();
+    colors = [Color.valueOf("e6c04555"), Color.valueOf("f7d95eaa"), Color.valueOf("ffec6e"), Color.white]
+    tscales = [1, 0.7, 0.5, 0.2]
+    strokes = [2, 1.5, 1, 0.3]
+    lenscales = [1, 1.12, 1.15, 1.17]
+    float length = 560
+});
+
+solarflare.shootType.lifetime = 16;
+solarflare.shootType.damage = 5;
+solarflare.shootType.despawnEffect = Fx.none;
+solarflare.shootType.hitEffect = Fx.hitMeltdown;
+solarflare.shootType.pierce = true;
+solarflare.shootType.drawSize = 420;
+solarflare.shootType.hitSize = 4;
diff --git a/scripts/main.js b/scripts/main.js
new file mode 100644
index 0000000..fe1756f
--- /dev/null
+++ b/scripts/main.js
@@ -0,0 +1 @@
+require("blocks/solarflare")
\ No newline at end of file

From 2fcc55c48e33a13e1712a06cf47cde29b1c6a38b Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Mon, 9 Mar 2020 20:10:21 -0700
Subject: [PATCH 02/56] add some ; and see what happens...

---
 scripts/blocks/solarflare.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/blocks/solarflare.js b/scripts/blocks/solarflare.js
index 3f596ed..7da9a23 100644
--- a/scripts/blocks/solarflare.js
+++ b/scripts/blocks/solarflare.js
@@ -3,11 +3,11 @@ const solarflare = new LaserTurret("solarflare");
 
 solarflare.shootType = extend(BulletType{
     Color tmpColor = new Color();
-    colors = [Color.valueOf("e6c04555"), Color.valueOf("f7d95eaa"), Color.valueOf("ffec6e"), Color.white]
-    tscales = [1, 0.7, 0.5, 0.2]
-    strokes = [2, 1.5, 1, 0.3]
-    lenscales = [1, 1.12, 1.15, 1.17]
-    float length = 560
+    colors = [Color.valueOf("e6c04555"), Color.valueOf("f7d95eaa"), Color.valueOf("ffec6e"), Color.white];
+    tscales = [1, 0.7, 0.5, 0.2];
+    strokes = [2, 1.5, 1, 0.3];
+    lenscales = [1, 1.12, 1.15, 1.17];
+    float length = 560;
 });
 
 solarflare.shootType.lifetime = 16;

From b2a26b6db5ef5eb979de227ab6e914e15ad3677f Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Mon, 9 Mar 2020 20:13:29 -0700
Subject: [PATCH 03/56] used to be {}, try that

---
 mod.hjson                    | 2 +-
 scripts/blocks/solarflare.js | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mod.hjson b/mod.hjson
index 2db80db..0578d0c 100644
--- a/mod.hjson
+++ b/mod.hjson
@@ -8,5 +8,5 @@ description:
   '''
   Just a testing mod, might have twitchy things
   '''
-version: 0.1
+version: 0.3
 minGameVersion: 103
diff --git a/scripts/blocks/solarflare.js b/scripts/blocks/solarflare.js
index 7da9a23..1df6d7c 100644
--- a/scripts/blocks/solarflare.js
+++ b/scripts/blocks/solarflare.js
@@ -3,10 +3,10 @@ const solarflare = new LaserTurret("solarflare");
 
 solarflare.shootType = extend(BulletType{
     Color tmpColor = new Color();
-    colors = [Color.valueOf("e6c04555"), Color.valueOf("f7d95eaa"), Color.valueOf("ffec6e"), Color.white];
-    tscales = [1, 0.7, 0.5, 0.2];
-    strokes = [2, 1.5, 1, 0.3];
-    lenscales = [1, 1.12, 1.15, 1.17];
+    colors = {Color.valueOf("e6c04555"), Color.valueOf("f7d95eaa"), Color.valueOf("ffec6e"), Color.white};
+    tscales = {1, 0.7, 0.5, 0.2};
+    strokes = {2, 1.5, 1, 0.3};
+    lenscales = {1, 1.12, 1.15, 1.17};
     float length = 560;
 });
 

From c1c95719a81d2d44659b3bf6b1a233b859d421ab Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Mon, 9 Mar 2020 20:16:30 -0700
Subject: [PATCH 04/56] Dont wory, i have no idea what im doing

---
 mod.hjson                    | 4 ++--
 scripts/blocks/solarflare.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mod.hjson b/mod.hjson
index 0578d0c..c6d2d3a 100644
--- a/mod.hjson
+++ b/mod.hjson
@@ -8,5 +8,5 @@ description:
   '''
   Just a testing mod, might have twitchy things
   '''
-version: 0.3
-minGameVersion: 103
+version: 0.4
+minGameVersion: 103
\ No newline at end of file
diff --git a/scripts/blocks/solarflare.js b/scripts/blocks/solarflare.js
index 1df6d7c..d5fd290 100644
--- a/scripts/blocks/solarflare.js
+++ b/scripts/blocks/solarflare.js
@@ -1,7 +1,7 @@
 const solarflare = new LaserTurret("solarflare");
 
 
-solarflare.shootType = extend(BulletType{
+solarflare.shootType = extend(BulletType, {
     Color tmpColor = new Color();
     colors = {Color.valueOf("e6c04555"), Color.valueOf("f7d95eaa"), Color.valueOf("ffec6e"), Color.white};
     tscales = {1, 0.7, 0.5, 0.2};

From be360d09cc73bfd265f5fd9579fc2267b8bc4c3d Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Mon, 9 Mar 2020 20:16:59 -0700
Subject: [PATCH 05/56] temp

---
 content/blocks/turrets/solarflare.hjson | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/blocks/turrets/solarflare.hjson b/content/blocks/turrets/solarflare.hjson
index 759e099..680ab65 100644
--- a/content/blocks/turrets/solarflare.hjson
+++ b/content/blocks/turrets/solarflare.hjson
@@ -18,4 +18,4 @@ restitution: 0.0133333333
 requirements: [
 ]
 category: turret
-research: meltdown
\ No newline at end of file
+research: duo
\ No newline at end of file

From e1113da98eb0e731abe0758fc5c521009a2070f6 Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Mon, 9 Mar 2020 20:25:53 -0700
Subject: [PATCH 06/56] copy/paste in the rest of the meltdonw code

---
 mod.hjson                    |  2 +-
 scripts/blocks/solarflare.js | 46 ++++++++++++++++++++++++++++++------
 2 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/mod.hjson b/mod.hjson
index c6d2d3a..9e88a3e 100644
--- a/mod.hjson
+++ b/mod.hjson
@@ -8,5 +8,5 @@ description:
   '''
   Just a testing mod, might have twitchy things
   '''
-version: 0.4
+version: 0.5
 minGameVersion: 103
\ No newline at end of file
diff --git a/scripts/blocks/solarflare.js b/scripts/blocks/solarflare.js
index d5fd290..4a63c73 100644
--- a/scripts/blocks/solarflare.js
+++ b/scripts/blocks/solarflare.js
@@ -8,12 +8,44 @@ solarflare.shootType = extend(BulletType, {
     strokes = {2, 1.5, 1, 0.3};
     lenscales = {1, 1.12, 1.15, 1.17};
     float length = 560;
+    
+    {
+        hitEffect = Fx.hitMeltdown;
+        despawnEffect = Fx.none;
+        hitSize = 4;
+        drawSize = 420;
+        lifetime = 16;
+        pierce = true;
+    }
+    
+    public void update(Bullet b){
+        if(b.timer.get(1, 5f)){
+            Damage.collideLine(b, b.getTeam(), hitEffect, b.x, b.y, b.rot(), length, true);
+        }
+        Effects.shake(1f, 1f, b.x, b.y);
+    }
+    
+    public void hit(Bullet b, float hitx, float hity){
+        Effects.effect(hitEffect, colors[2], hitx, hity);
+        if(Mathf.chance(0.4)){
+            Fire.create(world.tileWorld(hitx + Mathf.range(5f), hity + Mathf.range(5f)));
+        }
+    }
+    
+    public void draw(Bullet b){
+        float baseLen = (length) * b.fout();
+
+        Lines.lineAngle(b.x, b.y, b.rot(), baseLen);
+        for(int s = 0; s < colors.length; s++){
+            Draw.color(tmpColor.set(colors[s]).mul(1f + Mathf.absin(Time.time(), 1f, 0.1f)));
+            for(int i = 0; i < tscales.length; i++){
+                Tmp.v1.trns(b.rot() + 180f, (lenscales[i] - 1f) * 35f);
+                Lines.stroke((9f + Mathf.absin(Time.time(), 0.8f, 1.5f)) * b.fout() * strokes[s] * tscales[i]);
+                Lines.lineAngle(b.x + Tmp.v1.x, b.y + Tmp.v1.y, b.rot(), baseLen * lenscales[i], CapStyle.none);
+            }
+        }
+    Draw.reset();
+    }
 });
 
-solarflare.shootType.lifetime = 16;
-solarflare.shootType.damage = 5;
-solarflare.shootType.despawnEffect = Fx.none;
-solarflare.shootType.hitEffect = Fx.hitMeltdown;
-solarflare.shootType.pierce = true;
-solarflare.shootType.drawSize = 420;
-solarflare.shootType.hitSize = 4;
+solarflare.shootType.damage = 2;
\ No newline at end of file

From 07de872a83d948bc8c666719b9fe323959acd319 Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Mon, 9 Mar 2020 20:34:16 -0700
Subject: [PATCH 07/56] remove float f's, delete the "public void"s

---
 mod.hjson                    |  2 +-
 scripts/blocks/solarflare.js | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/mod.hjson b/mod.hjson
index 9e88a3e..e7514a8 100644
--- a/mod.hjson
+++ b/mod.hjson
@@ -8,5 +8,5 @@ description:
   '''
   Just a testing mod, might have twitchy things
   '''
-version: 0.5
+version: 0.6
 minGameVersion: 103
\ No newline at end of file
diff --git a/scripts/blocks/solarflare.js b/scripts/blocks/solarflare.js
index 4a63c73..b579a07 100644
--- a/scripts/blocks/solarflare.js
+++ b/scripts/blocks/solarflare.js
@@ -18,29 +18,29 @@ solarflare.shootType = extend(BulletType, {
         pierce = true;
     }
     
-    public void update(Bullet b){
-        if(b.timer.get(1, 5f)){
+    update(Bullet b){
+        if(b.timer.get(1, 5)){
             Damage.collideLine(b, b.getTeam(), hitEffect, b.x, b.y, b.rot(), length, true);
         }
-        Effects.shake(1f, 1f, b.x, b.y);
+        Effects.shake(1, 1, b.x, b.y);
     }
     
-    public void hit(Bullet b, float hitx, float hity){
+    hit(Bullet b, float hitx, float hity){
         Effects.effect(hitEffect, colors[2], hitx, hity);
         if(Mathf.chance(0.4)){
-            Fire.create(world.tileWorld(hitx + Mathf.range(5f), hity + Mathf.range(5f)));
+            Fire.create(world.tileWorld(hitx + Mathf.range(5), hity + Mathf.range(5)));
         }
     }
     
-    public void draw(Bullet b){
+    draw(Bullet b){
         float baseLen = (length) * b.fout();
 
         Lines.lineAngle(b.x, b.y, b.rot(), baseLen);
         for(int s = 0; s < colors.length; s++){
             Draw.color(tmpColor.set(colors[s]).mul(1f + Mathf.absin(Time.time(), 1f, 0.1f)));
             for(int i = 0; i < tscales.length; i++){
-                Tmp.v1.trns(b.rot() + 180f, (lenscales[i] - 1f) * 35f);
-                Lines.stroke((9f + Mathf.absin(Time.time(), 0.8f, 1.5f)) * b.fout() * strokes[s] * tscales[i]);
+                Tmp.v1.trns(b.rot() + 180, (lenscales[i] - 1) * 35);
+                Lines.stroke((9 + Mathf.absin(Time.time(), 0.8, 1.5)) * b.fout() * strokes[s] * tscales[i]);
                 Lines.lineAngle(b.x + Tmp.v1.x, b.y + Tmp.v1.y, b.rot(), baseLen * lenscales[i], CapStyle.none);
             }
         }

From e1dd85b93272ed3ce17f8b64ede16531d729baa9 Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Mon, 9 Mar 2020 21:09:07 -0700
Subject: [PATCH 08/56] "Bullet b" to "b"

---
 mod.hjson                    | 2 +-
 scripts/blocks/solarflare.js | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mod.hjson b/mod.hjson
index e7514a8..d120a16 100644
--- a/mod.hjson
+++ b/mod.hjson
@@ -8,5 +8,5 @@ description:
   '''
   Just a testing mod, might have twitchy things
   '''
-version: 0.6
+version: 0.7
 minGameVersion: 103
\ No newline at end of file
diff --git a/scripts/blocks/solarflare.js b/scripts/blocks/solarflare.js
index b579a07..a6cc871 100644
--- a/scripts/blocks/solarflare.js
+++ b/scripts/blocks/solarflare.js
@@ -7,7 +7,7 @@ solarflare.shootType = extend(BulletType, {
     tscales = {1, 0.7, 0.5, 0.2};
     strokes = {2, 1.5, 1, 0.3};
     lenscales = {1, 1.12, 1.15, 1.17};
-    float length = 560;
+    length = 560;
     
     {
         hitEffect = Fx.hitMeltdown;
@@ -18,21 +18,21 @@ solarflare.shootType = extend(BulletType, {
         pierce = true;
     }
     
-    update(Bullet b){
+    update(b){
         if(b.timer.get(1, 5)){
             Damage.collideLine(b, b.getTeam(), hitEffect, b.x, b.y, b.rot(), length, true);
         }
         Effects.shake(1, 1, b.x, b.y);
     }
     
-    hit(Bullet b, float hitx, float hity){
+    hit(b, float hitx, float hity){
         Effects.effect(hitEffect, colors[2], hitx, hity);
         if(Mathf.chance(0.4)){
             Fire.create(world.tileWorld(hitx + Mathf.range(5), hity + Mathf.range(5)));
         }
     }
     
-    draw(Bullet b){
+    draw(b){
         float baseLen = (length) * b.fout();
 
         Lines.lineAngle(b.x, b.y, b.rot(), baseLen);

From 18c6fb24083e1ebb8fad61e90fce456849164270 Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Tue, 10 Mar 2020 20:39:09 -0700
Subject: [PATCH 09/56] suggestoins

---
 mod.hjson                    |  2 +-
 scripts/blocks/solarflare.js | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/mod.hjson b/mod.hjson
index d120a16..aeb3921 100644
--- a/mod.hjson
+++ b/mod.hjson
@@ -8,5 +8,5 @@ description:
   '''
   Just a testing mod, might have twitchy things
   '''
-version: 0.7
+version: 0.8
 minGameVersion: 103
\ No newline at end of file
diff --git a/scripts/blocks/solarflare.js b/scripts/blocks/solarflare.js
index a6cc871..a8ac13b 100644
--- a/scripts/blocks/solarflare.js
+++ b/scripts/blocks/solarflare.js
@@ -3,10 +3,10 @@ const solarflare = new LaserTurret("solarflare");
 
 solarflare.shootType = extend(BulletType, {
     Color tmpColor = new Color();
-    colors = {Color.valueOf("e6c04555"), Color.valueOf("f7d95eaa"), Color.valueOf("ffec6e"), Color.white};
-    tscales = {1, 0.7, 0.5, 0.2};
-    strokes = {2, 1.5, 1, 0.3};
-    lenscales = {1, 1.12, 1.15, 1.17};
+    colors = [Color.valueOf("e6c04555"), Color.valueOf("f7d95eaa"), Color.valueOf("ffec6e"), Color.white];
+    tscales = [1, 0.7, 0.5, 0.2];
+    strokes = [2, 1.5, 1, 0.3];
+    lenscales = [1, 1.12, 1.15, 1.17];
     length = 560;
     
     {
@@ -25,7 +25,7 @@ solarflare.shootType = extend(BulletType, {
         Effects.shake(1, 1, b.x, b.y);
     }
     
-    hit(b, float hitx, float hity){
+    hit(b, var hitx, var hity){
         Effects.effect(hitEffect, colors[2], hitx, hity);
         if(Mathf.chance(0.4)){
             Fire.create(world.tileWorld(hitx + Mathf.range(5), hity + Mathf.range(5)));
@@ -33,7 +33,7 @@ solarflare.shootType = extend(BulletType, {
     }
     
     draw(b){
-        float baseLen = (length) * b.fout();
+        var baseLen = (length) * b.fout();
 
         Lines.lineAngle(b.x, b.y, b.rot(), baseLen);
         for(int s = 0; s < colors.length; s++){

From 0bb8874e0f9c41c042d99da82fb2e64221a3ac33 Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Tue, 10 Mar 2020 21:00:53 -0700
Subject: [PATCH 10/56] add osme ;

---
 mod.hjson                    | 2 +-
 scripts/blocks/solarflare.js | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/mod.hjson b/mod.hjson
index aeb3921..4d1dffa 100644
--- a/mod.hjson
+++ b/mod.hjson
@@ -8,5 +8,5 @@ description:
   '''
   Just a testing mod, might have twitchy things
   '''
-version: 0.8
+version: 0.9
 minGameVersion: 103
\ No newline at end of file
diff --git a/scripts/blocks/solarflare.js b/scripts/blocks/solarflare.js
index a8ac13b..1f83a92 100644
--- a/scripts/blocks/solarflare.js
+++ b/scripts/blocks/solarflare.js
@@ -1,6 +1,5 @@
 const solarflare = new LaserTurret("solarflare");
 
-
 solarflare.shootType = extend(BulletType, {
     Color tmpColor = new Color();
     colors = [Color.valueOf("e6c04555"), Color.valueOf("f7d95eaa"), Color.valueOf("ffec6e"), Color.white];
@@ -21,7 +20,7 @@ solarflare.shootType = extend(BulletType, {
     update(b){
         if(b.timer.get(1, 5)){
             Damage.collideLine(b, b.getTeam(), hitEffect, b.x, b.y, b.rot(), length, true);
-        }
+        };
         Effects.shake(1, 1, b.x, b.y);
     }
     
@@ -29,12 +28,11 @@ solarflare.shootType = extend(BulletType, {
         Effects.effect(hitEffect, colors[2], hitx, hity);
         if(Mathf.chance(0.4)){
             Fire.create(world.tileWorld(hitx + Mathf.range(5), hity + Mathf.range(5)));
-        }
+        };
     }
     
     draw(b){
         var baseLen = (length) * b.fout();
-
         Lines.lineAngle(b.x, b.y, b.rot(), baseLen);
         for(int s = 0; s < colors.length; s++){
             Draw.color(tmpColor.set(colors[s]).mul(1f + Mathf.absin(Time.time(), 1f, 0.1f)));
@@ -42,7 +40,7 @@ solarflare.shootType = extend(BulletType, {
                 Tmp.v1.trns(b.rot() + 180, (lenscales[i] - 1) * 35);
                 Lines.stroke((9 + Mathf.absin(Time.time(), 0.8, 1.5)) * b.fout() * strokes[s] * tscales[i]);
                 Lines.lineAngle(b.x + Tmp.v1.x, b.y + Tmp.v1.y, b.rot(), baseLen * lenscales[i], CapStyle.none);
-            }
+            };
         }
     Draw.reset();
     }

From c4ccc50d4b92c0be7ad7779baa109faaacd90eab Mon Sep 17 00:00:00 2001
From: MEEP of Faith <54301439+MEEPofFaith@users.noreply.github.com>
Date: Thu, 12 Mar 2020 09:39:57 -0700
Subject: [PATCH 11/56] IDK what I'm doing at this point.

---
 scripts/blocks/solarflare.js | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/scripts/blocks/solarflare.js b/scripts/blocks/solarflare.js
index 1f83a92..cdc807b 100644
--- a/scripts/blocks/solarflare.js
+++ b/scripts/blocks/solarflare.js
@@ -1,12 +1,14 @@
 const solarflare = new LaserTurret("solarflare");
 
 solarflare.shootType = extend(BulletType, {
-    Color tmpColor = new Color();
-    colors = [Color.valueOf("e6c04555"), Color.valueOf("f7d95eaa"), Color.valueOf("ffec6e"), Color.white];
-    tscales = [1, 0.7, 0.5, 0.2];
-    strokes = [2, 1.5, 1, 0.3];
-    lenscales = [1, 1.12, 1.15, 1.17];
-    length = 560;
+    {
+        Color tmpColor = new Color();
+        colors = [Color.valueOf("e6c04555"), Color.valueOf("f7d95eaa"), Color.valueOf("ffec6e"), Color.white];
+        tscales = [1, 0.7, 0.5, 0.2];
+        strokes = [2, 1.5, 1, 0.3];
+        lenscales = [1, 1.12, 1.15, 1.17];
+        length = 560;
+    },
     
     {
         hitEffect = Fx.hitMeltdown;
@@ -15,21 +17,21 @@ solarflare.shootType = extend(BulletType, {
         drawSize = 420;
         lifetime = 16;
         pierce = true;
-    }
+    },
     
     update(b){
         if(b.timer.get(1, 5)){
             Damage.collideLine(b, b.getTeam(), hitEffect, b.x, b.y, b.rot(), length, true);
         };
         Effects.shake(1, 1, b.x, b.y);
-    }
+    },
     
     hit(b, var hitx, var hity){
         Effects.effect(hitEffect, colors[2], hitx, hity);
         if(Mathf.chance(0.4)){
             Fire.create(world.tileWorld(hitx + Mathf.range(5), hity + Mathf.range(5)));
         };
-    }
+    },
     
     draw(b){
         var baseLen = (length) * b.fout();
@@ -41,9 +43,9 @@ solarflare.shootType = extend(BulletType, {
                 Lines.stroke((9 + Mathf.absin(Time.time(), 0.8, 1.5)) * b.fout() * strokes[s] * tscales[i]);
                 Lines.lineAngle(b.x + Tmp.v1.x, b.y + Tmp.v1.y, b.rot(), baseLen * lenscales[i], CapStyle.none);
             };
-        }
+        },
     Draw.reset();
-    }
+    },
 });
 
-solarflare.shootType.damage = 2;
\ No newline at end of file
+solarflare.shootType.damage = 2;

From 74b2e877eae593528076d923035938140dd66283 Mon Sep 17 00:00:00 2001
From: MEEP of Faith <54301439+MEEPofFaith@users.noreply.github.com>
Date: Fri, 3 Apr 2020 01:12:13 -0700
Subject: [PATCH 12/56] Ive learned z bit

---
 scripts/blocks/solarflare.js | 59 +++++++++---------------------------
 1 file changed, 15 insertions(+), 44 deletions(-)

diff --git a/scripts/blocks/solarflare.js b/scripts/blocks/solarflare.js
index cdc807b..0aef605 100644
--- a/scripts/blocks/solarflare.js
+++ b/scripts/blocks/solarflare.js
@@ -1,51 +1,22 @@
 const solarflare = new LaserTurret("solarflare");
 
-solarflare.shootType = extend(BulletType, {
+const solarflare.shootType = extendContent(meltdownLaser, "solar-beam", {
     {
-        Color tmpColor = new Color();
-        colors = [Color.valueOf("e6c04555"), Color.valueOf("f7d95eaa"), Color.valueOf("ffec6e"), Color.white];
-        tscales = [1, 0.7, 0.5, 0.2];
-        strokes = [2, 1.5, 1, 0.3];
-        lenscales = [1, 1.12, 1.15, 1.17];
-        length = 560;
+        this.Color tmpColor = new Color();
+        this.colors = [Color.valueOf("e6c04555"), Color.valueOf("f7d95eaa"), Color.valueOf("ffec6e"), Color.white];
+        this.tscales = [1, 0.7, 0.5, 0.2];
+        this.strokes = [2, 1.5, 1, 0.3];
+        this.lenscales = [1, 1.12, 1.15, 1.17];
+        this.length = 560;
     },
     
     {
-        hitEffect = Fx.hitMeltdown;
-        despawnEffect = Fx.none;
-        hitSize = 4;
-        drawSize = 420;
-        lifetime = 16;
-        pierce = true;
-    },
-    
-    update(b){
-        if(b.timer.get(1, 5)){
-            Damage.collideLine(b, b.getTeam(), hitEffect, b.x, b.y, b.rot(), length, true);
-        };
-        Effects.shake(1, 1, b.x, b.y);
-    },
-    
-    hit(b, var hitx, var hity){
-        Effects.effect(hitEffect, colors[2], hitx, hity);
-        if(Mathf.chance(0.4)){
-            Fire.create(world.tileWorld(hitx + Mathf.range(5), hity + Mathf.range(5)));
-        };
-    },
-    
-    draw(b){
-        var baseLen = (length) * b.fout();
-        Lines.lineAngle(b.x, b.y, b.rot(), baseLen);
-        for(int s = 0; s < colors.length; s++){
-            Draw.color(tmpColor.set(colors[s]).mul(1f + Mathf.absin(Time.time(), 1f, 0.1f)));
-            for(int i = 0; i < tscales.length; i++){
-                Tmp.v1.trns(b.rot() + 180, (lenscales[i] - 1) * 35);
-                Lines.stroke((9 + Mathf.absin(Time.time(), 0.8, 1.5)) * b.fout() * strokes[s] * tscales[i]);
-                Lines.lineAngle(b.x + Tmp.v1.x, b.y + Tmp.v1.y, b.rot(), baseLen * lenscales[i], CapStyle.none);
-            };
-        },
-    Draw.reset();
-    },
+        this.hitEffect = Fx.hitMeltdown;
+        this.damage = 2;
+        this.despawnEffect = Fx.none;
+        this.hitSize = 4;
+        this.drawSize = 420;
+        this.lifetime = 16;
+        this.pierce = true;
+    }
 });
-
-solarflare.shootType.damage = 2;

From 31dc420d53c16cc8ecd6af2ddc2fcdc32628cb8a Mon Sep 17 00:00:00 2001
From: MEEP of Faith <54301439+MEEPofFaith@users.noreply.github.com>
Date: Fri, 3 Apr 2020 01:12:56 -0700
Subject: [PATCH 13/56] Update mod.hjson

---
 mod.hjson | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mod.hjson b/mod.hjson
index 4d1dffa..431a299 100644
--- a/mod.hjson
+++ b/mod.hjson
@@ -8,5 +8,5 @@ description:
   '''
   Just a testing mod, might have twitchy things
   '''
-version: 0.9
-minGameVersion: 103
\ No newline at end of file
+version: 0.10
+minGameVersion: 103

From fae2fa9f5bff1f6d8c88abae36038a79e48d3b2a Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Fri, 3 Apr 2020 22:34:17 -0700
Subject: [PATCH 14/56] delete

---
 mod.hjson                    |  2 +-
 scripts/blocks/solarflare.js | 21 +++++++++------------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/mod.hjson b/mod.hjson
index 4d1dffa..7e28ead 100644
--- a/mod.hjson
+++ b/mod.hjson
@@ -8,5 +8,5 @@ description:
   '''
   Just a testing mod, might have twitchy things
   '''
-version: 0.9
+version: 0.10
 minGameVersion: 103
\ No newline at end of file
diff --git a/scripts/blocks/solarflare.js b/scripts/blocks/solarflare.js
index cdc807b..a3a18ae 100644
--- a/scripts/blocks/solarflare.js
+++ b/scripts/blocks/solarflare.js
@@ -10,19 +10,10 @@ solarflare.shootType = extend(BulletType, {
         length = 560;
     },
     
-    {
-        hitEffect = Fx.hitMeltdown;
-        despawnEffect = Fx.none;
-        hitSize = 4;
-        drawSize = 420;
-        lifetime = 16;
-        pierce = true;
-    },
-    
     update(b){
         if(b.timer.get(1, 5)){
             Damage.collideLine(b, b.getTeam(), hitEffect, b.x, b.y, b.rot(), length, true);
-        };
+        }
         Effects.shake(1, 1, b.x, b.y);
     },
     
@@ -30,7 +21,7 @@ solarflare.shootType = extend(BulletType, {
         Effects.effect(hitEffect, colors[2], hitx, hity);
         if(Mathf.chance(0.4)){
             Fire.create(world.tileWorld(hitx + Mathf.range(5), hity + Mathf.range(5)));
-        };
+        }
     },
     
     draw(b){
@@ -43,9 +34,15 @@ solarflare.shootType = extend(BulletType, {
                 Lines.stroke((9 + Mathf.absin(Time.time(), 0.8, 1.5)) * b.fout() * strokes[s] * tscales[i]);
                 Lines.lineAngle(b.x + Tmp.v1.x, b.y + Tmp.v1.y, b.rot(), baseLen * lenscales[i], CapStyle.none);
             };
-        },
+        };
     Draw.reset();
     },
 });
 
 solarflare.shootType.damage = 2;
+solarflare.shootType.hitEffect = Fx.hitMeltdown;
+solarflare.shootType.despawnEffect = Fx.none;
+solarflare.shootType.hitSize = 4;
+solarflare.shootType.drawSize = 420;
+solarflare.shootType.pierce = true;
+solarflare.shootType.lifetime = 16;
\ No newline at end of file

From e354a66112393ee1e83183a9a4683a2b57f831f8 Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Fri, 3 Apr 2020 22:34:22 -0700
Subject: [PATCH 15/56] Revert "delete"

This reverts commit fae2fa9f5bff1f6d8c88abae36038a79e48d3b2a.
---
 mod.hjson                    |  2 +-
 scripts/blocks/solarflare.js | 21 ++++++++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/mod.hjson b/mod.hjson
index 7e28ead..4d1dffa 100644
--- a/mod.hjson
+++ b/mod.hjson
@@ -8,5 +8,5 @@ description:
   '''
   Just a testing mod, might have twitchy things
   '''
-version: 0.10
+version: 0.9
 minGameVersion: 103
\ No newline at end of file
diff --git a/scripts/blocks/solarflare.js b/scripts/blocks/solarflare.js
index a3a18ae..cdc807b 100644
--- a/scripts/blocks/solarflare.js
+++ b/scripts/blocks/solarflare.js
@@ -10,10 +10,19 @@ solarflare.shootType = extend(BulletType, {
         length = 560;
     },
     
+    {
+        hitEffect = Fx.hitMeltdown;
+        despawnEffect = Fx.none;
+        hitSize = 4;
+        drawSize = 420;
+        lifetime = 16;
+        pierce = true;
+    },
+    
     update(b){
         if(b.timer.get(1, 5)){
             Damage.collideLine(b, b.getTeam(), hitEffect, b.x, b.y, b.rot(), length, true);
-        }
+        };
         Effects.shake(1, 1, b.x, b.y);
     },
     
@@ -21,7 +30,7 @@ solarflare.shootType = extend(BulletType, {
         Effects.effect(hitEffect, colors[2], hitx, hity);
         if(Mathf.chance(0.4)){
             Fire.create(world.tileWorld(hitx + Mathf.range(5), hity + Mathf.range(5)));
-        }
+        };
     },
     
     draw(b){
@@ -34,15 +43,9 @@ solarflare.shootType = extend(BulletType, {
                 Lines.stroke((9 + Mathf.absin(Time.time(), 0.8, 1.5)) * b.fout() * strokes[s] * tscales[i]);
                 Lines.lineAngle(b.x + Tmp.v1.x, b.y + Tmp.v1.y, b.rot(), baseLen * lenscales[i], CapStyle.none);
             };
-        };
+        },
     Draw.reset();
     },
 });
 
 solarflare.shootType.damage = 2;
-solarflare.shootType.hitEffect = Fx.hitMeltdown;
-solarflare.shootType.despawnEffect = Fx.none;
-solarflare.shootType.hitSize = 4;
-solarflare.shootType.drawSize = 420;
-solarflare.shootType.pierce = true;
-solarflare.shootType.lifetime = 16;
\ No newline at end of file

From 6292369e9fbfb13c39914716f706d9ed2d67ca96 Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Fri, 3 Apr 2020 22:36:27 -0700
Subject: [PATCH 16/56] Try this

---
 mod.hjson                    |  2 +-
 scripts/blocks/solarflare.js | 18 ++++++++----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/mod.hjson b/mod.hjson
index 431a299..7135f31 100644
--- a/mod.hjson
+++ b/mod.hjson
@@ -8,5 +8,5 @@ description:
   '''
   Just a testing mod, might have twitchy things
   '''
-version: 0.10
+version: 0.11
 minGameVersion: 103
diff --git a/scripts/blocks/solarflare.js b/scripts/blocks/solarflare.js
index 0aef605..c07299f 100644
--- a/scripts/blocks/solarflare.js
+++ b/scripts/blocks/solarflare.js
@@ -8,15 +8,13 @@ const solarflare.shootType = extendContent(meltdownLaser, "solar-beam", {
         this.strokes = [2, 1.5, 1, 0.3];
         this.lenscales = [1, 1.12, 1.15, 1.17];
         this.length = 560;
-    },
-    
-    {
-        this.hitEffect = Fx.hitMeltdown;
-        this.damage = 2;
-        this.despawnEffect = Fx.none;
-        this.hitSize = 4;
-        this.drawSize = 420;
-        this.lifetime = 16;
-        this.pierce = true;
     }
 });
+
+solarflare.shootType.hitEffect = Fx.hitMeltdown;
+solarflare.shootType.damage = 2;
+solarflare.shootType.despawnEffect = Fx.none;
+solarflare.shootType.hitSize = 4;
+solarflare.shootType.drawSize = 420;
+solarflare.shootType.lifetime = 16;
+solarflare.shootType.pierce = true;
\ No newline at end of file

From e619e90253ce7f43be13b2c89fb752384d53e656 Mon Sep 17 00:00:00 2001
From: MEEP of Faith <54301439+MEEPofFaith@users.noreply.github.com>
Date: Sun, 12 Apr 2020 06:03:53 -0700
Subject: [PATCH 17/56] Makes sense to me

---
 scripts/blocks/solarflare.js | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/scripts/blocks/solarflare.js b/scripts/blocks/solarflare.js
index c07299f..c30650d 100644
--- a/scripts/blocks/solarflare.js
+++ b/scripts/blocks/solarflare.js
@@ -1,6 +1,6 @@
 const solarflare = new LaserTurret("solarflare");
 
-const solarflare.shootType = extendContent(meltdownLaser, "solar-beam", {
+const solarflare.shootType = extend(meltdownLaser, {
     {
         this.Color tmpColor = new Color();
         this.colors = [Color.valueOf("e6c04555"), Color.valueOf("f7d95eaa"), Color.valueOf("ffec6e"), Color.white];
@@ -8,13 +8,15 @@ const solarflare.shootType = extendContent(meltdownLaser, "solar-beam", {
         this.strokes = [2, 1.5, 1, 0.3];
         this.lenscales = [1, 1.12, 1.15, 1.17];
         this.length = 560;
+        
+        {
+            this.hitEffect = Fx.hitMeltdown;
+            this.despawnEffect = Fx.none;
+            this.damage = 2;
+            this.hitSize = 4;
+            this.drawSize = 420;
+            this.lifetime = 16
+            this.pierce = true;
+        }
     }
 });
-
-solarflare.shootType.hitEffect = Fx.hitMeltdown;
-solarflare.shootType.damage = 2;
-solarflare.shootType.despawnEffect = Fx.none;
-solarflare.shootType.hitSize = 4;
-solarflare.shootType.drawSize = 420;
-solarflare.shootType.lifetime = 16;
-solarflare.shootType.pierce = true;
\ No newline at end of file

From 5b9f269233a0becd95f5cbe929b2890e0237ba4f Mon Sep 17 00:00:00 2001
From: MEEP of Faith <54301439+MEEPofFaith@users.noreply.github.com>
Date: Sun, 12 Apr 2020 06:05:55 -0700
Subject: [PATCH 18/56] Makes sense to me

---
 mod.hjson | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mod.hjson b/mod.hjson
index 7135f31..7037584 100644
--- a/mod.hjson
+++ b/mod.hjson
@@ -2,11 +2,11 @@ name: Testing Ground
 displayName: "[gold]Mod [red]Testing [blue]Ground"
 author:
   '''
-  [red]K103908 
+  [yellow]MEEP of Faith
   '''
 description:
   '''
-  Just a testing mod, might have twitchy things
+  Just a testing mod, nothing in here works properly.
   '''
-version: 0.11
+version: 0.12
 minGameVersion: 103

From 17879536bec5f10d017c7a9e5228207f7f09dc01 Mon Sep 17 00:00:00 2001
From: MEEP of Faith <54301439+MEEPofFaith@users.noreply.github.com>
Date: Sun, 12 Apr 2020 06:20:10 -0700
Subject: [PATCH 19/56] Half an  undo

---
 scripts/blocks/solarflare.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/scripts/blocks/solarflare.js b/scripts/blocks/solarflare.js
index c30650d..8573f00 100644
--- a/scripts/blocks/solarflare.js
+++ b/scripts/blocks/solarflare.js
@@ -20,3 +20,11 @@ const solarflare.shootType = extend(meltdownLaser, {
         }
     }
 });
+
+solarflare.shootType.hitEffect = Fx.hitMeltdown;
+solarflare.shootType.despawnEffect = Fx.none;
+solarflare.shootType.damage = 1;
+solarflare.shootType.hitSize = 4;
+solarflare.shootType.lifetime = 16;
+solarflare.shootType.drawSize = 420;
+solarflare.shootType.pierce = true;

From 9ddc7482ec68eb87fa7887ea9659c6c12af5e896 Mon Sep 17 00:00:00 2001
From: MEEP of Faith <54301439+MEEPofFaith@users.noreply.github.com>
Date: Sun, 12 Apr 2020 06:20:31 -0700
Subject: [PATCH 20/56] Half an undo

---
 mod.hjson | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod.hjson b/mod.hjson
index 7037584..f05338d 100644
--- a/mod.hjson
+++ b/mod.hjson
@@ -8,5 +8,5 @@ description:
   '''
   Just a testing mod, nothing in here works properly.
   '''
-version: 0.12
+version: 0.13
 minGameVersion: 103

From b7196ab961596b9df3416afebd1ce2232c1b2663 Mon Sep 17 00:00:00 2001
From: MEEP of Faith <54301439+MEEPofFaith@users.noreply.github.com>
Date: Sun, 12 Apr 2020 06:22:41 -0700
Subject: [PATCH 21/56] Might help if it weren't doible

---
 scripts/blocks/solarflare.js | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/scripts/blocks/solarflare.js b/scripts/blocks/solarflare.js
index 8573f00..aac64d0 100644
--- a/scripts/blocks/solarflare.js
+++ b/scripts/blocks/solarflare.js
@@ -8,16 +8,6 @@ const solarflare.shootType = extend(meltdownLaser, {
         this.strokes = [2, 1.5, 1, 0.3];
         this.lenscales = [1, 1.12, 1.15, 1.17];
         this.length = 560;
-        
-        {
-            this.hitEffect = Fx.hitMeltdown;
-            this.despawnEffect = Fx.none;
-            this.damage = 2;
-            this.hitSize = 4;
-            this.drawSize = 420;
-            this.lifetime = 16
-            this.pierce = true;
-        }
     }
 });
 

From 1382a66036ca7c186f1b18075bec57627b195226 Mon Sep 17 00:00:00 2001
From: MEEP of Faith <54301439+MEEPofFaith@users.noreply.github.com>
Date: Sun, 12 Apr 2020 06:23:11 -0700
Subject: [PATCH 22/56] Update mod.hjson

---
 mod.hjson | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod.hjson b/mod.hjson
index f05338d..69c22e6 100644
--- a/mod.hjson
+++ b/mod.hjson
@@ -8,5 +8,5 @@ description:
   '''
   Just a testing mod, nothing in here works properly.
   '''
-version: 0.13
+version: 0.13-2
 minGameVersion: 103

From c138efe591385091bcb7fde982d7af1997d715b9 Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Sun, 12 Apr 2020 15:30:13 -0700
Subject: [PATCH 23/56] [var] instead of [this.]

---
 mod.hjson                    |  2 +-
 scripts/blocks/solarflare.js | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/mod.hjson b/mod.hjson
index 69c22e6..8d3b036 100644
--- a/mod.hjson
+++ b/mod.hjson
@@ -8,5 +8,5 @@ description:
   '''
   Just a testing mod, nothing in here works properly.
   '''
-version: 0.13-2
+version: 0.13-3
 minGameVersion: 103
diff --git a/scripts/blocks/solarflare.js b/scripts/blocks/solarflare.js
index aac64d0..ce88385 100644
--- a/scripts/blocks/solarflare.js
+++ b/scripts/blocks/solarflare.js
@@ -2,12 +2,12 @@ const solarflare = new LaserTurret("solarflare");
 
 const solarflare.shootType = extend(meltdownLaser, {
     {
-        this.Color tmpColor = new Color();
-        this.colors = [Color.valueOf("e6c04555"), Color.valueOf("f7d95eaa"), Color.valueOf("ffec6e"), Color.white];
-        this.tscales = [1, 0.7, 0.5, 0.2];
-        this.strokes = [2, 1.5, 1, 0.3];
-        this.lenscales = [1, 1.12, 1.15, 1.17];
-        this.length = 560;
+        var Color tmpColor = new Color();
+        var colors = [Color.valueOf("e6c04555"), Color.valueOf("f7d95eaa"), Color.valueOf("ffec6e"), Color.white];
+        var tscales = [1, 0.7, 0.5, 0.2];
+        var strokes = [2, 1.5, 1, 0.3];
+        var lenscales = [1, 1.12, 1.15, 1.17];
+        var length = 560;
     }
 });
 

From 2fcee299fc08b76ff962ec99a13cfd0984604850 Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Sun, 12 Apr 2020 15:33:41 -0700
Subject: [PATCH 24/56] What about this

---
 mod.hjson                    |  2 +-
 scripts/blocks/solarflare.js | 14 ++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/mod.hjson b/mod.hjson
index 8d3b036..974a729 100644
--- a/mod.hjson
+++ b/mod.hjson
@@ -8,5 +8,5 @@ description:
   '''
   Just a testing mod, nothing in here works properly.
   '''
-version: 0.13-3
+version: 0.13-4
 minGameVersion: 103
diff --git a/scripts/blocks/solarflare.js b/scripts/blocks/solarflare.js
index ce88385..5c2d803 100644
--- a/scripts/blocks/solarflare.js
+++ b/scripts/blocks/solarflare.js
@@ -1,14 +1,12 @@
 const solarflare = new LaserTurret("solarflare");
 
 const solarflare.shootType = extend(meltdownLaser, {
-    {
-        var Color tmpColor = new Color();
-        var colors = [Color.valueOf("e6c04555"), Color.valueOf("f7d95eaa"), Color.valueOf("ffec6e"), Color.white];
-        var tscales = [1, 0.7, 0.5, 0.2];
-        var strokes = [2, 1.5, 1, 0.3];
-        var lenscales = [1, 1.12, 1.15, 1.17];
-        var length = 560;
-    }
+    var Color tmpColor = new Color();
+    var colors = [Color.valueOf("e6c04555"), Color.valueOf("f7d95eaa"), Color.valueOf("ffec6e"), Color.white];
+    var tscales = [1, 0.7, 0.5, 0.2];
+    var strokes = [2, 1.5, 1, 0.3];
+    var lenscales = [1, 1.12, 1.15, 1.17];
+    var length = 560;
 });
 
 solarflare.shootType.hitEffect = Fx.hitMeltdown;

From a1160564dbecbbb65cccbaaa4859fe1c920b09cc Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Sun, 12 Apr 2020 15:35:14 -0700
Subject: [PATCH 25/56] Fix version number

---
 mod.hjson | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod.hjson b/mod.hjson
index 974a729..6fdb0ab 100644
--- a/mod.hjson
+++ b/mod.hjson
@@ -8,5 +8,5 @@ description:
   '''
   Just a testing mod, nothing in here works properly.
   '''
-version: 0.13-4
+version: 0.17
 minGameVersion: 103

From 77feaa2e87795f84bd5e724de8a37fa9b40a81ed Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Sun, 12 Apr 2020 15:35:51 -0700
Subject: [PATCH 26/56] Update solarflare.hjson

---
 content/blocks/turrets/solarflare.hjson | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/content/blocks/turrets/solarflare.hjson b/content/blocks/turrets/solarflare.hjson
index 680ab65..19cdd69 100644
--- a/content/blocks/turrets/solarflare.hjson
+++ b/content/blocks/turrets/solarflare.hjson
@@ -4,7 +4,7 @@ size: 4
 range: 500
 reload: 80
 shootSound: laserbig
-activeSound:beam
+activeSound: beam
 activeSoundVolume: 2
 powerUse: 15
 rotatespeed: 0.5
@@ -13,8 +13,8 @@ targetAir: true
 targetGround: true
 heatColor: e3b464
 recoil: 5
-cooldown: 0.0133333333
-restitution: 0.0133333333
+cooldown: 0.014
+restitution: 0.014
 requirements: [
 ]
 category: turret

From 9b5b8478734129edc53f0d62085c69880850d7eb Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Sun, 12 Apr 2020 15:42:19 -0700
Subject: [PATCH 27/56] Try this

---
 mod.hjson                    | 2 +-
 scripts/blocks/solarflare.js | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/mod.hjson b/mod.hjson
index 6fdb0ab..425516d 100644
--- a/mod.hjson
+++ b/mod.hjson
@@ -8,5 +8,5 @@ description:
   '''
   Just a testing mod, nothing in here works properly.
   '''
-version: 0.17
+version: 0.18
 minGameVersion: 103
diff --git a/scripts/blocks/solarflare.js b/scripts/blocks/solarflare.js
index 5c2d803..b99c422 100644
--- a/scripts/blocks/solarflare.js
+++ b/scripts/blocks/solarflare.js
@@ -1,7 +1,6 @@
 const solarflare = new LaserTurret("solarflare");
 
 const solarflare.shootType = extend(meltdownLaser, {
-    var Color tmpColor = new Color();
     var colors = [Color.valueOf("e6c04555"), Color.valueOf("f7d95eaa"), Color.valueOf("ffec6e"), Color.white];
     var tscales = [1, 0.7, 0.5, 0.2];
     var strokes = [2, 1.5, 1, 0.3];

From c471dd22fe828bff419ba2ab89c37d47f1d5ada0 Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Mon, 13 Apr 2020 09:34:52 -0700
Subject: [PATCH 28/56] Thanks EyeofDarkness

---
 mod.hjson                    | 2 +-
 scripts/blocks/solarflare.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mod.hjson b/mod.hjson
index 425516d..d4473bb 100644
--- a/mod.hjson
+++ b/mod.hjson
@@ -8,5 +8,5 @@ description:
   '''
   Just a testing mod, nothing in here works properly.
   '''
-version: 0.18
+version: 0.19
 minGameVersion: 103
diff --git a/scripts/blocks/solarflare.js b/scripts/blocks/solarflare.js
index b99c422..ab33288 100644
--- a/scripts/blocks/solarflare.js
+++ b/scripts/blocks/solarflare.js
@@ -1,7 +1,7 @@
 const solarflare = new LaserTurret("solarflare");
 
 const solarflare.shootType = extend(meltdownLaser, {
-    var colors = [Color.valueOf("e6c04555"), Color.valueOf("f7d95eaa"), Color.valueOf("ffec6e"), Color.white];
+    var colors = [e6c04555, f7d95eaa, ffec6e, ffffff];
     var tscales = [1, 0.7, 0.5, 0.2];
     var strokes = [2, 1.5, 1, 0.3];
     var lenscales = [1, 1.12, 1.15, 1.17];

From 277dcc0a0cfe3b191303839ff36d4bb2a7b41f54 Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Mon, 13 Apr 2020 09:39:18 -0700
Subject: [PATCH 29/56] Seems like a good idea

---
 mod.hjson                    |  2 +-
 scripts/blocks/solarflare.js | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mod.hjson b/mod.hjson
index d4473bb..0d6d247 100644
--- a/mod.hjson
+++ b/mod.hjson
@@ -8,5 +8,5 @@ description:
   '''
   Just a testing mod, nothing in here works properly.
   '''
-version: 0.19
+version: 0.20
 minGameVersion: 103
diff --git a/scripts/blocks/solarflare.js b/scripts/blocks/solarflare.js
index ab33288..dee3fe5 100644
--- a/scripts/blocks/solarflare.js
+++ b/scripts/blocks/solarflare.js
@@ -1,11 +1,11 @@
 const solarflare = new LaserTurret("solarflare");
 
 const solarflare.shootType = extend(meltdownLaser, {
-    var colors = [e6c04555, f7d95eaa, ffec6e, ffffff];
-    var tscales = [1, 0.7, 0.5, 0.2];
-    var strokes = [2, 1.5, 1, 0.3];
-    var lenscales = [1, 1.12, 1.15, 1.17];
-    var length = 560;
+    this.colors = [e6c04555, f7d95eaa, ffec6e, ffffff];
+    this.tscales = [1, 0.7, 0.5, 0.2];
+    this.strokes = [2, 1.5, 1, 0.3];
+    this.lenscales = [1, 1.12, 1.15, 1.17];
+    this.length = 560;
 });
 
 solarflare.shootType.hitEffect = Fx.hitMeltdown;

From 1a9b0e24c2b00ba5c504fff956dfe987c02ff444 Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Mon, 13 Apr 2020 11:11:18 -0700
Subject: [PATCH 30/56] Copy some code.

---
 mod.hjson                    |  2 +-
 scripts/blocks/solarflare.js | 41 ++++++++++++++++++++++++++++++------
 2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/mod.hjson b/mod.hjson
index 0d6d247..efda1b1 100644
--- a/mod.hjson
+++ b/mod.hjson
@@ -8,5 +8,5 @@ description:
   '''
   Just a testing mod, nothing in here works properly.
   '''
-version: 0.20
+version: 0.21
 minGameVersion: 103
diff --git a/scripts/blocks/solarflare.js b/scripts/blocks/solarflare.js
index dee3fe5..3e73d3e 100644
--- a/scripts/blocks/solarflare.js
+++ b/scripts/blocks/solarflare.js
@@ -1,11 +1,38 @@
+//Large amounts of code copied from laser-interceptor.js from younggam/more-powerful-units. Once I know what I'm doing, I'll do stuff myself.
 const solarflare = new LaserTurret("solarflare");
 
-const solarflare.shootType = extend(meltdownLaser, {
-    this.colors = [e6c04555, f7d95eaa, ffec6e, ffffff];
-    this.tscales = [1, 0.7, 0.5, 0.2];
-    this.strokes = [2, 1.5, 1, 0.3];
-    this.lenscales = [1, 1.12, 1.15, 1.17];
-    this.length = 560;
+var tmpColor = new Color();
+var colors = [Color.valueOf("e6c04555"), Color.valueOf("f7d95eaa"), Color.valueOf("ffec6e"), Color.white];
+var tscales = [1, 0.7, 0.5, 0.2];
+var strokes = [2, 1.5, 1, 0.3];
+var lenscales = [1, 1.12, 1.15, 1.17];
+var length = 560;
+
+const solarflare.shootType = extend(BasicBulletType, {
+  init(b){
+    if (b == null) return;
+    Damage.collideLine(b, b.getTeam(), Fx.hitMeltdown, b.x, b.y, b.rot(), length, true);
+    //Look in damage.java for how this works, it's simular to lightning.
+    Effects.shake(1, 1, b.x, b.y);
+  },
+  hit(b,hitx,hity){
+    Effects.effect(Fx.hitMeltdown,colors[2],hitx,hity);
+
+  },
+  draw(b){
+    baseLen = (length) * b.fout();
+
+    Lines.lineAngle(b.x,b.y,b.rot(),baseLen);
+    for(var s = 0; s < colors.length; s++){
+      Draw.color(tmpColor.set(colors[s]).mul(1+Mathf.absin(Time.time(),1,0.1)));
+      for(var i = 0; i < tscales.length; i++){
+        Tmp.v1.trns(b.rot()+180,(lenscales[i]-1)*35);
+        Lines.stroke((4+Mathf.absin(Time.time(),0.8,1.5))*b.fout()*strokes[s]*tscales[i]);
+        Lines.lineAngle(b.x+Tmp.v1.x,b.y+Tmp.v1.y,b.rot(),baseLen*lenscales[i],CapStyle.none);
+      }
+    }
+    Draw.reset();
+  }
 });
 
 solarflare.shootType.hitEffect = Fx.hitMeltdown;
@@ -14,4 +41,4 @@ solarflare.shootType.damage = 1;
 solarflare.shootType.hitSize = 4;
 solarflare.shootType.lifetime = 16;
 solarflare.shootType.drawSize = 420;
-solarflare.shootType.pierce = true;
+solarflare.shootType.pierce = true;
\ No newline at end of file

From 4baef73c1b4996b5e1069cdba7936e827bca795b Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Mon, 13 Apr 2020 11:33:13 -0700
Subject: [PATCH 31/56] ?

---
 .../{solarflare.hjson => solar-flare.hjson}   |  0
 mod.hjson                                     |  2 +-
 scripts/blocks/solar-flare.js                 | 45 +++++++++++++++++++
 scripts/blocks/solarflare.js                  | 44 ------------------
 scripts/main.js                               |  2 +-
 5 files changed, 47 insertions(+), 46 deletions(-)
 rename content/blocks/turrets/{solarflare.hjson => solar-flare.hjson} (100%)
 create mode 100644 scripts/blocks/solar-flare.js
 delete mode 100644 scripts/blocks/solarflare.js

diff --git a/content/blocks/turrets/solarflare.hjson b/content/blocks/turrets/solar-flare.hjson
similarity index 100%
rename from content/blocks/turrets/solarflare.hjson
rename to content/blocks/turrets/solar-flare.hjson
diff --git a/mod.hjson b/mod.hjson
index efda1b1..ca40db4 100644
--- a/mod.hjson
+++ b/mod.hjson
@@ -8,5 +8,5 @@ description:
   '''
   Just a testing mod, nothing in here works properly.
   '''
-version: 0.21
+version: 0.22
 minGameVersion: 103
diff --git a/scripts/blocks/solar-flare.js b/scripts/blocks/solar-flare.js
new file mode 100644
index 0000000..e9ecf1a
--- /dev/null
+++ b/scripts/blocks/solar-flare.js
@@ -0,0 +1,45 @@
+//Large amounts of code copied from laser-interceptor.js from younggam/more-powerful-units.
+const solarflare = new LaserTurret("solar-flare");
+
+var tmpColor = new Color();
+var colors = [Color.valueOf("e6c04555"), Color.valueOf("f7d95eaa"), Color.valueOf("ffec6e"), Color.white];
+var tscales = [1, 0.7, 0.5, 0.2];
+var strokes = [2, 1.5, 1, 0.3];
+var lenscales = [1, 1.12, 1.15, 1.17];
+var length = 560;
+
+solarflare.shootType = extend(BasicBulletType, {
+    init(b){
+        if (b == null) return;
+        if (b.timer.get(1, 5)){
+            Damage.collideLine(b, b.getTeam(), Fx.hitMeltdown, b.x, b.y, b.rot(), length, true);
+        }
+        //Look in damage.java for how this works, it's simular to lightning.
+        Effects.shake(1, 1, b.x, b.y);
+    },
+    hit(b,hitx,hity){
+        Effects.effect(Fx.hitMeltdown, colors[2], hitx, hity);
+    },
+    draw(b){
+        baseLen = (length) * b.fout();
+
+        Lines.lineAngle(b.x,b.y,b.rot(),baseLen);
+        for(var s = 0; s < colors.length; s++){
+            Draw.color(tmpColor.set(colors[s]).mul(1+Mathf.absin(Time.time(),1,0.1)));
+            for(var i = 0; i < tscales.length; i++){
+                Tmp.v1.trns(b.rot()+180,(lenscales[i]-1)*35);
+                Lines.stroke((4+Mathf.absin(Time.time(),0.8,1.5))*b.fout()*strokes[s]*tscales[i]);
+                Lines.lineAngle(b.x+Tmp.v1.x,b.y+Tmp.v1.y,b.rot(),baseLen*lenscales[i],CapStyle.none);
+            }
+        }
+        Draw.reset();
+    }
+});
+
+solarflare.shootType.hitEffect = Fx.hitMeltdown;
+solarflare.shootType.despawnEffect = Fx.none;
+solarflare.shootType.damage = 1;
+solarflare.shootType.hitSize = 4;
+solarflare.shootType.lifetime = 16;
+solarflare.shootType.drawSize = 420;
+solarflare.shootType.pierce = true;
\ No newline at end of file
diff --git a/scripts/blocks/solarflare.js b/scripts/blocks/solarflare.js
deleted file mode 100644
index 3e73d3e..0000000
--- a/scripts/blocks/solarflare.js
+++ /dev/null
@@ -1,44 +0,0 @@
-//Large amounts of code copied from laser-interceptor.js from younggam/more-powerful-units. Once I know what I'm doing, I'll do stuff myself.
-const solarflare = new LaserTurret("solarflare");
-
-var tmpColor = new Color();
-var colors = [Color.valueOf("e6c04555"), Color.valueOf("f7d95eaa"), Color.valueOf("ffec6e"), Color.white];
-var tscales = [1, 0.7, 0.5, 0.2];
-var strokes = [2, 1.5, 1, 0.3];
-var lenscales = [1, 1.12, 1.15, 1.17];
-var length = 560;
-
-const solarflare.shootType = extend(BasicBulletType, {
-  init(b){
-    if (b == null) return;
-    Damage.collideLine(b, b.getTeam(), Fx.hitMeltdown, b.x, b.y, b.rot(), length, true);
-    //Look in damage.java for how this works, it's simular to lightning.
-    Effects.shake(1, 1, b.x, b.y);
-  },
-  hit(b,hitx,hity){
-    Effects.effect(Fx.hitMeltdown,colors[2],hitx,hity);
-
-  },
-  draw(b){
-    baseLen = (length) * b.fout();
-
-    Lines.lineAngle(b.x,b.y,b.rot(),baseLen);
-    for(var s = 0; s < colors.length; s++){
-      Draw.color(tmpColor.set(colors[s]).mul(1+Mathf.absin(Time.time(),1,0.1)));
-      for(var i = 0; i < tscales.length; i++){
-        Tmp.v1.trns(b.rot()+180,(lenscales[i]-1)*35);
-        Lines.stroke((4+Mathf.absin(Time.time(),0.8,1.5))*b.fout()*strokes[s]*tscales[i]);
-        Lines.lineAngle(b.x+Tmp.v1.x,b.y+Tmp.v1.y,b.rot(),baseLen*lenscales[i],CapStyle.none);
-      }
-    }
-    Draw.reset();
-  }
-});
-
-solarflare.shootType.hitEffect = Fx.hitMeltdown;
-solarflare.shootType.despawnEffect = Fx.none;
-solarflare.shootType.damage = 1;
-solarflare.shootType.hitSize = 4;
-solarflare.shootType.lifetime = 16;
-solarflare.shootType.drawSize = 420;
-solarflare.shootType.pierce = true;
\ No newline at end of file
diff --git a/scripts/main.js b/scripts/main.js
index fe1756f..5d813eb 100644
--- a/scripts/main.js
+++ b/scripts/main.js
@@ -1 +1 @@
-require("blocks/solarflare")
\ No newline at end of file
+require("blocks/solar-flare")
\ No newline at end of file

From d8cd6ebe6b8a9a1c5dfaa789e5846dd0499ae2f5 Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Mon, 13 Apr 2020 15:03:23 -0700
Subject: [PATCH 32/56] Minor Changes

---
 content/blocks/turrets/solar-flare.hjson | 8 +++++---
 mod.hjson                                | 4 ++--
 scripts/blocks/solar-flare.js            | 8 +++++++-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/content/blocks/turrets/solar-flare.hjson b/content/blocks/turrets/solar-flare.hjson
index 19cdd69..08d80bb 100644
--- a/content/blocks/turrets/solar-flare.hjson
+++ b/content/blocks/turrets/solar-flare.hjson
@@ -1,6 +1,7 @@
 name: Solar Flare
 description: A cousin of the meltdown. Focused more on burning enemies than damaging blocks.
 size: 4
+health: 3400
 range: 500
 reload: 80
 shootSound: laserbig
@@ -9,12 +10,13 @@ activeSoundVolume: 2
 powerUse: 15
 rotatespeed: 0.5
 shootCone: 35
+shootShake: 1.5
 targetAir: true
 targetGround: true
 heatColor: e3b464
-recoil: 5
-cooldown: 0.014
-restitution: 0.014
+recoil: 4
+shootDuration: 220
+firingMoveFract: 0.5
 requirements: [
 ]
 category: turret
diff --git a/mod.hjson b/mod.hjson
index ca40db4..a32da03 100644
--- a/mod.hjson
+++ b/mod.hjson
@@ -6,7 +6,7 @@ author:
   '''
 description:
   '''
-  Just a testing mod, nothing in here works properly.
+  Just a testing mod, nothing in here will work properly.
   '''
-version: 0.22
+version: 0.24
 minGameVersion: 103
diff --git a/scripts/blocks/solar-flare.js b/scripts/blocks/solar-flare.js
index e9ecf1a..97e9b8b 100644
--- a/scripts/blocks/solar-flare.js
+++ b/scripts/blocks/solar-flare.js
@@ -12,13 +12,19 @@ solarflare.shootType = extend(BasicBulletType, {
     init(b){
         if (b == null) return;
         if (b.timer.get(1, 5)){
+            //Look in damage.java for how this works, it's simular to lightning.
             Damage.collideLine(b, b.getTeam(), Fx.hitMeltdown, b.x, b.y, b.rot(), length, true);
         }
-        //Look in damage.java for how this works, it's simular to lightning.
         Effects.shake(1, 1, b.x, b.y);
     },
     hit(b,hitx,hity){
         Effects.effect(Fx.hitMeltdown, colors[2], hitx, hity);
+        if(Mathf.chance(0.8)){
+            //TRIPLE FLAMES BURNY BURN
+            Fire.create(world.tileWorld(hitx + Mathf.range(5f), hity + Mathf.range(5f)));
+            Fire.create(world.tileWorld(hitx + Mathf.range(5f), hity + Mathf.range(5f)));
+            Fire.create(world.tileWorld(hitx + Mathf.range(5f), hity + Mathf.range(5f)));
+        }
     },
     draw(b){
         baseLen = (length) * b.fout();

From 42147a95864a5d7ec751f4d2fbfd88b06c18f67f Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Mon, 13 Apr 2020 15:04:54 -0700
Subject: [PATCH 33/56] Revert "Minor Changes"

This reverts commit d8cd6ebe6b8a9a1c5dfaa789e5846dd0499ae2f5.
---
 content/blocks/turrets/solar-flare.hjson | 8 +++-----
 mod.hjson                                | 4 ++--
 scripts/blocks/solar-flare.js            | 8 +-------
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/content/blocks/turrets/solar-flare.hjson b/content/blocks/turrets/solar-flare.hjson
index 08d80bb..19cdd69 100644
--- a/content/blocks/turrets/solar-flare.hjson
+++ b/content/blocks/turrets/solar-flare.hjson
@@ -1,7 +1,6 @@
 name: Solar Flare
 description: A cousin of the meltdown. Focused more on burning enemies than damaging blocks.
 size: 4
-health: 3400
 range: 500
 reload: 80
 shootSound: laserbig
@@ -10,13 +9,12 @@ activeSoundVolume: 2
 powerUse: 15
 rotatespeed: 0.5
 shootCone: 35
-shootShake: 1.5
 targetAir: true
 targetGround: true
 heatColor: e3b464
-recoil: 4
-shootDuration: 220
-firingMoveFract: 0.5
+recoil: 5
+cooldown: 0.014
+restitution: 0.014
 requirements: [
 ]
 category: turret
diff --git a/mod.hjson b/mod.hjson
index a32da03..ca40db4 100644
--- a/mod.hjson
+++ b/mod.hjson
@@ -6,7 +6,7 @@ author:
   '''
 description:
   '''
-  Just a testing mod, nothing in here will work properly.
+  Just a testing mod, nothing in here works properly.
   '''
-version: 0.24
+version: 0.22
 minGameVersion: 103
diff --git a/scripts/blocks/solar-flare.js b/scripts/blocks/solar-flare.js
index 97e9b8b..e9ecf1a 100644
--- a/scripts/blocks/solar-flare.js
+++ b/scripts/blocks/solar-flare.js
@@ -12,19 +12,13 @@ solarflare.shootType = extend(BasicBulletType, {
     init(b){
         if (b == null) return;
         if (b.timer.get(1, 5)){
-            //Look in damage.java for how this works, it's simular to lightning.
             Damage.collideLine(b, b.getTeam(), Fx.hitMeltdown, b.x, b.y, b.rot(), length, true);
         }
+        //Look in damage.java for how this works, it's simular to lightning.
         Effects.shake(1, 1, b.x, b.y);
     },
     hit(b,hitx,hity){
         Effects.effect(Fx.hitMeltdown, colors[2], hitx, hity);
-        if(Mathf.chance(0.8)){
-            //TRIPLE FLAMES BURNY BURN
-            Fire.create(world.tileWorld(hitx + Mathf.range(5f), hity + Mathf.range(5f)));
-            Fire.create(world.tileWorld(hitx + Mathf.range(5f), hity + Mathf.range(5f)));
-            Fire.create(world.tileWorld(hitx + Mathf.range(5f), hity + Mathf.range(5f)));
-        }
     },
     draw(b){
         baseLen = (length) * b.fout();

From a2a21e4cbc8fdcbbe27c14c43ac098ebcf545125 Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Mon, 13 Apr 2020 15:06:14 -0700
Subject: [PATCH 34/56] Revert "Revert "Minor Changes""

This reverts commit 42147a95864a5d7ec751f4d2fbfd88b06c18f67f.
---
 content/blocks/turrets/solar-flare.hjson | 8 +++++---
 mod.hjson                                | 4 ++--
 scripts/blocks/solar-flare.js            | 8 +++++++-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/content/blocks/turrets/solar-flare.hjson b/content/blocks/turrets/solar-flare.hjson
index 19cdd69..08d80bb 100644
--- a/content/blocks/turrets/solar-flare.hjson
+++ b/content/blocks/turrets/solar-flare.hjson
@@ -1,6 +1,7 @@
 name: Solar Flare
 description: A cousin of the meltdown. Focused more on burning enemies than damaging blocks.
 size: 4
+health: 3400
 range: 500
 reload: 80
 shootSound: laserbig
@@ -9,12 +10,13 @@ activeSoundVolume: 2
 powerUse: 15
 rotatespeed: 0.5
 shootCone: 35
+shootShake: 1.5
 targetAir: true
 targetGround: true
 heatColor: e3b464
-recoil: 5
-cooldown: 0.014
-restitution: 0.014
+recoil: 4
+shootDuration: 220
+firingMoveFract: 0.5
 requirements: [
 ]
 category: turret
diff --git a/mod.hjson b/mod.hjson
index ca40db4..a32da03 100644
--- a/mod.hjson
+++ b/mod.hjson
@@ -6,7 +6,7 @@ author:
   '''
 description:
   '''
-  Just a testing mod, nothing in here works properly.
+  Just a testing mod, nothing in here will work properly.
   '''
-version: 0.22
+version: 0.24
 minGameVersion: 103
diff --git a/scripts/blocks/solar-flare.js b/scripts/blocks/solar-flare.js
index e9ecf1a..97e9b8b 100644
--- a/scripts/blocks/solar-flare.js
+++ b/scripts/blocks/solar-flare.js
@@ -12,13 +12,19 @@ solarflare.shootType = extend(BasicBulletType, {
     init(b){
         if (b == null) return;
         if (b.timer.get(1, 5)){
+            //Look in damage.java for how this works, it's simular to lightning.
             Damage.collideLine(b, b.getTeam(), Fx.hitMeltdown, b.x, b.y, b.rot(), length, true);
         }
-        //Look in damage.java for how this works, it's simular to lightning.
         Effects.shake(1, 1, b.x, b.y);
     },
     hit(b,hitx,hity){
         Effects.effect(Fx.hitMeltdown, colors[2], hitx, hity);
+        if(Mathf.chance(0.8)){
+            //TRIPLE FLAMES BURNY BURN
+            Fire.create(world.tileWorld(hitx + Mathf.range(5f), hity + Mathf.range(5f)));
+            Fire.create(world.tileWorld(hitx + Mathf.range(5f), hity + Mathf.range(5f)));
+            Fire.create(world.tileWorld(hitx + Mathf.range(5f), hity + Mathf.range(5f)));
+        }
     },
     draw(b){
         baseLen = (length) * b.fout();

From 67ab19f3e959ee16600a89ec89237ca9794ab4ee Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Mon, 13 Apr 2020 15:07:46 -0700
Subject: [PATCH 35/56] Maybe not triple burny burn

---
 scripts/blocks/solar-flare.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/scripts/blocks/solar-flare.js b/scripts/blocks/solar-flare.js
index 97e9b8b..efb3637 100644
--- a/scripts/blocks/solar-flare.js
+++ b/scripts/blocks/solar-flare.js
@@ -20,9 +20,6 @@ solarflare.shootType = extend(BasicBulletType, {
     hit(b,hitx,hity){
         Effects.effect(Fx.hitMeltdown, colors[2], hitx, hity);
         if(Mathf.chance(0.8)){
-            //TRIPLE FLAMES BURNY BURN
-            Fire.create(world.tileWorld(hitx + Mathf.range(5f), hity + Mathf.range(5f)));
-            Fire.create(world.tileWorld(hitx + Mathf.range(5f), hity + Mathf.range(5f)));
             Fire.create(world.tileWorld(hitx + Mathf.range(5f), hity + Mathf.range(5f)));
         }
     },

From 3b4d5965f2bc90d39b881c8cd372a380126e3c50 Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Mon, 13 Apr 2020 15:08:02 -0700
Subject: [PATCH 36/56] because i skipped a version

---
 mod.hjson | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod.hjson b/mod.hjson
index a32da03..d9c7c7c 100644
--- a/mod.hjson
+++ b/mod.hjson
@@ -8,5 +8,5 @@ description:
   '''
   Just a testing mod, nothing in here will work properly.
   '''
-version: 0.24
+version: 0.24-2
 minGameVersion: 103

From 82d5daf8444786bb9840626bb79935b9650c0943 Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Mon, 13 Apr 2020 15:19:22 -0700
Subject: [PATCH 37/56] Remove burnyburn

---
 mod.hjson                     | 2 +-
 scripts/blocks/solar-flare.js | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/mod.hjson b/mod.hjson
index d9c7c7c..58e41f7 100644
--- a/mod.hjson
+++ b/mod.hjson
@@ -8,5 +8,5 @@ description:
   '''
   Just a testing mod, nothing in here will work properly.
   '''
-version: 0.24-2
+version: 0.25
 minGameVersion: 103
diff --git a/scripts/blocks/solar-flare.js b/scripts/blocks/solar-flare.js
index efb3637..e971d2e 100644
--- a/scripts/blocks/solar-flare.js
+++ b/scripts/blocks/solar-flare.js
@@ -19,9 +19,6 @@ solarflare.shootType = extend(BasicBulletType, {
     },
     hit(b,hitx,hity){
         Effects.effect(Fx.hitMeltdown, colors[2], hitx, hity);
-        if(Mathf.chance(0.8)){
-            Fire.create(world.tileWorld(hitx + Mathf.range(5f), hity + Mathf.range(5f)));
-        }
     },
     draw(b){
         baseLen = (length) * b.fout();

From 671261cb3b73e7194adb23326ed21d0668755178 Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Mon, 13 Apr 2020 15:23:13 -0700
Subject: [PATCH 38/56] I am blind

---
 mod.hjson                     | 2 +-
 scripts/blocks/solar-flare.js | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/mod.hjson b/mod.hjson
index 58e41f7..6d27441 100644
--- a/mod.hjson
+++ b/mod.hjson
@@ -8,5 +8,5 @@ description:
   '''
   Just a testing mod, nothing in here will work properly.
   '''
-version: 0.25
+version: 0.26
 minGameVersion: 103
diff --git a/scripts/blocks/solar-flare.js b/scripts/blocks/solar-flare.js
index e971d2e..487ad9d 100644
--- a/scripts/blocks/solar-flare.js
+++ b/scripts/blocks/solar-flare.js
@@ -19,6 +19,12 @@ solarflare.shootType = extend(BasicBulletType, {
     },
     hit(b,hitx,hity){
         Effects.effect(Fx.hitMeltdown, colors[2], hitx, hity);
+        if(Mathf.chance(0.8)){
+            //TRIPLE FLAMES BURNY BURN
+            Fire.create(world.tileWorld(hitx + Mathf.range(5), hity + Mathf.range(5)));
+            Fire.create(world.tileWorld(hitx + Mathf.range(5), hity + Mathf.range(5)));
+            Fire.create(world.tileWorld(hitx + Mathf.range(5), hity + Mathf.range(5)));
+        }
     },
     draw(b){
         baseLen = (length) * b.fout();

From 7c28f04c6a1cf75083369a57a6613f009a90fa2c Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Mon, 13 Apr 2020 15:27:32 -0700
Subject: [PATCH 39/56] Unbreak thine self

---
 mod.hjson                     |  2 +-
 scripts/blocks/solar-flare.js | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/mod.hjson b/mod.hjson
index 6d27441..2828336 100644
--- a/mod.hjson
+++ b/mod.hjson
@@ -8,5 +8,5 @@ description:
   '''
   Just a testing mod, nothing in here will work properly.
   '''
-version: 0.26
+version: 0.27
 minGameVersion: 103
diff --git a/scripts/blocks/solar-flare.js b/scripts/blocks/solar-flare.js
index 487ad9d..180b00d 100644
--- a/scripts/blocks/solar-flare.js
+++ b/scripts/blocks/solar-flare.js
@@ -19,12 +19,6 @@ solarflare.shootType = extend(BasicBulletType, {
     },
     hit(b,hitx,hity){
         Effects.effect(Fx.hitMeltdown, colors[2], hitx, hity);
-        if(Mathf.chance(0.8)){
-            //TRIPLE FLAMES BURNY BURN
-            Fire.create(world.tileWorld(hitx + Mathf.range(5), hity + Mathf.range(5)));
-            Fire.create(world.tileWorld(hitx + Mathf.range(5), hity + Mathf.range(5)));
-            Fire.create(world.tileWorld(hitx + Mathf.range(5), hity + Mathf.range(5)));
-        }
     },
     draw(b){
         baseLen = (length) * b.fout();
@@ -48,4 +42,7 @@ solarflare.shootType.damage = 1;
 solarflare.shootType.hitSize = 4;
 solarflare.shootType.lifetime = 16;
 solarflare.shootType.drawSize = 420;
-solarflare.shootType.pierce = true;
\ No newline at end of file
+solarflare.shootType.pierce = true;
+solarflare.shootType.incendChance = 0.8;
+solarflare.shootType.incendSpread = 20;
+solarflare.shootType.incendAmmount = 5;
\ No newline at end of file

From 6c50983ea9d104ab2138e7f7f711d4a11b289014 Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Mon, 13 Apr 2020 15:40:02 -0700
Subject: [PATCH 40/56] remove the if (b.timer.get) and see what happens

---
 mod.hjson                     | 2 +-
 scripts/blocks/solar-flare.js | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/mod.hjson b/mod.hjson
index 2828336..b388140 100644
--- a/mod.hjson
+++ b/mod.hjson
@@ -8,5 +8,5 @@ description:
   '''
   Just a testing mod, nothing in here will work properly.
   '''
-version: 0.27
+version: 0.28
 minGameVersion: 103
diff --git a/scripts/blocks/solar-flare.js b/scripts/blocks/solar-flare.js
index 180b00d..ca4cc3b 100644
--- a/scripts/blocks/solar-flare.js
+++ b/scripts/blocks/solar-flare.js
@@ -11,10 +11,11 @@ var length = 560;
 solarflare.shootType = extend(BasicBulletType, {
     init(b){
         if (b == null) return;
-        if (b.timer.get(1, 5)){
+        /*if (b.timer.get(1, 5)){
             //Look in damage.java for how this works, it's simular to lightning.
             Damage.collideLine(b, b.getTeam(), Fx.hitMeltdown, b.x, b.y, b.rot(), length, true);
-        }
+        }*/
+        Damage.collideLine(b, b.getTeam(), Fx.hitMeltdown, b.x, b.y, b.rot(), length, true);
         Effects.shake(1, 1, b.x, b.y);
     },
     hit(b,hitx,hity){

From c6338bcd94956d3537e6aa8d0e73133e866664d2 Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Mon, 13 Apr 2020 16:30:31 -0700
Subject: [PATCH 41/56] Revert. Good to know that that wasn't the issue.

---
 mod.hjson                     | 2 +-
 scripts/blocks/solar-flare.js | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/mod.hjson b/mod.hjson
index b388140..2828336 100644
--- a/mod.hjson
+++ b/mod.hjson
@@ -8,5 +8,5 @@ description:
   '''
   Just a testing mod, nothing in here will work properly.
   '''
-version: 0.28
+version: 0.27
 minGameVersion: 103
diff --git a/scripts/blocks/solar-flare.js b/scripts/blocks/solar-flare.js
index ca4cc3b..180b00d 100644
--- a/scripts/blocks/solar-flare.js
+++ b/scripts/blocks/solar-flare.js
@@ -11,11 +11,10 @@ var length = 560;
 solarflare.shootType = extend(BasicBulletType, {
     init(b){
         if (b == null) return;
-        /*if (b.timer.get(1, 5)){
+        if (b.timer.get(1, 5)){
             //Look in damage.java for how this works, it's simular to lightning.
             Damage.collideLine(b, b.getTeam(), Fx.hitMeltdown, b.x, b.y, b.rot(), length, true);
-        }*/
-        Damage.collideLine(b, b.getTeam(), Fx.hitMeltdown, b.x, b.y, b.rot(), length, true);
+        }
         Effects.shake(1, 1, b.x, b.y);
     },
     hit(b,hitx,hity){

From 9f5ab722ce35877083ca60a1884a961d8ce69b7d Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Mon, 13 Apr 2020 17:06:57 -0700
Subject: [PATCH 42/56] init --> update

---
 content/blocks/turrets/solar-flare.hjson | 1 +
 mod.hjson                                | 2 +-
 scripts/blocks/solar-flare.js            | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/content/blocks/turrets/solar-flare.hjson b/content/blocks/turrets/solar-flare.hjson
index 08d80bb..619fdda 100644
--- a/content/blocks/turrets/solar-flare.hjson
+++ b/content/blocks/turrets/solar-flare.hjson
@@ -9,6 +9,7 @@ activeSound: beam
 activeSoundVolume: 2
 powerUse: 15
 rotatespeed: 0.5
+coolantMultiplier: 0.02
 shootCone: 35
 shootShake: 1.5
 targetAir: true
diff --git a/mod.hjson b/mod.hjson
index 2828336..b388140 100644
--- a/mod.hjson
+++ b/mod.hjson
@@ -8,5 +8,5 @@ description:
   '''
   Just a testing mod, nothing in here will work properly.
   '''
-version: 0.27
+version: 0.28
 minGameVersion: 103
diff --git a/scripts/blocks/solar-flare.js b/scripts/blocks/solar-flare.js
index 180b00d..328eb1a 100644
--- a/scripts/blocks/solar-flare.js
+++ b/scripts/blocks/solar-flare.js
@@ -9,7 +9,7 @@ var lenscales = [1, 1.12, 1.15, 1.17];
 var length = 560;
 
 solarflare.shootType = extend(BasicBulletType, {
-    init(b){
+    update(b){
         if (b == null) return;
         if (b.timer.get(1, 5)){
             //Look in damage.java for how this works, it's simular to lightning.

From 9859b03a1cbd24e47871af7cdb402e809778298e Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Mon, 13 Apr 2020 17:08:29 -0700
Subject: [PATCH 43/56] Update mod.hjson

---
 mod.hjson | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod.hjson b/mod.hjson
index b388140..4416251 100644
--- a/mod.hjson
+++ b/mod.hjson
@@ -8,5 +8,5 @@ description:
   '''
   Just a testing mod, nothing in here will work properly.
   '''
-version: 0.28
+version: 0.29
 minGameVersion: 103

From 5a39b03b5b3eb2e69b34922db64a8c294f0c9578 Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Mon, 13 Apr 2020 17:09:59 -0700
Subject: [PATCH 44/56] why do i always misspell amount

ammount -> amount
---
 mod.hjson                     | 2 +-
 scripts/blocks/solar-flare.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mod.hjson b/mod.hjson
index 4416251..ec75a0d 100644
--- a/mod.hjson
+++ b/mod.hjson
@@ -8,5 +8,5 @@ description:
   '''
   Just a testing mod, nothing in here will work properly.
   '''
-version: 0.29
+version: 0.30
 minGameVersion: 103
diff --git a/scripts/blocks/solar-flare.js b/scripts/blocks/solar-flare.js
index 328eb1a..341ec1b 100644
--- a/scripts/blocks/solar-flare.js
+++ b/scripts/blocks/solar-flare.js
@@ -45,4 +45,4 @@ solarflare.shootType.drawSize = 420;
 solarflare.shootType.pierce = true;
 solarflare.shootType.incendChance = 0.8;
 solarflare.shootType.incendSpread = 20;
-solarflare.shootType.incendAmmount = 5;
\ No newline at end of file
+solarflare.shootType.incendAmount = 5;
\ No newline at end of file

From 97e54a98e5c175b25b42ceb1db7a7b6697c7a620 Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Mon, 13 Apr 2020 17:21:54 -0700
Subject: [PATCH 45/56] Reload Test

---
 content/blocks/turrets/solar-flare.hjson | 2 +-
 mod.hjson                                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/blocks/turrets/solar-flare.hjson b/content/blocks/turrets/solar-flare.hjson
index 619fdda..5dd2876 100644
--- a/content/blocks/turrets/solar-flare.hjson
+++ b/content/blocks/turrets/solar-flare.hjson
@@ -3,7 +3,7 @@ description: A cousin of the meltdown. Focused more on burning enemies than dama
 size: 4
 health: 3400
 range: 500
-reload: 80
+reload: 1
 shootSound: laserbig
 activeSound: beam
 activeSoundVolume: 2
diff --git a/mod.hjson b/mod.hjson
index ec75a0d..f7bf6c2 100644
--- a/mod.hjson
+++ b/mod.hjson
@@ -8,5 +8,5 @@ description:
   '''
   Just a testing mod, nothing in here will work properly.
   '''
-version: 0.30
+version: 0.30-reloadTest
 minGameVersion: 103

From 9f5996d65ad20150229db263c0fb7159c73adc46 Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Mon, 13 Apr 2020 17:38:30 -0700
Subject: [PATCH 46/56] status effect test

---
 mod.hjson                     | 2 +-
 scripts/blocks/solar-flare.js | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/mod.hjson b/mod.hjson
index f7bf6c2..cc3fb72 100644
--- a/mod.hjson
+++ b/mod.hjson
@@ -8,5 +8,5 @@ description:
   '''
   Just a testing mod, nothing in here will work properly.
   '''
-version: 0.30-reloadTest
+version: 0.31
 minGameVersion: 103
diff --git a/scripts/blocks/solar-flare.js b/scripts/blocks/solar-flare.js
index 341ec1b..03105cc 100644
--- a/scripts/blocks/solar-flare.js
+++ b/scripts/blocks/solar-flare.js
@@ -45,4 +45,10 @@ solarflare.shootType.drawSize = 420;
 solarflare.shootType.pierce = true;
 solarflare.shootType.incendChance = 0.8;
 solarflare.shootType.incendSpread = 20;
-solarflare.shootType.incendAmount = 5;
\ No newline at end of file
+solarflare.shootType.incendAmount = 5;
+
+corn = new StatusEffect("the-sun-is-a-deadly-laser");
+corn.damage = 500;
+corn.effect = Fx.burning;
+corn.armorMultiplier = 0.6;
+solarflare.shootType.status = corn
\ No newline at end of file

From d6572bd04bbc7b5fc547af4cd763f47bb23f5210 Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Mon, 13 Apr 2020 17:42:51 -0700
Subject: [PATCH 47/56] Fix consumption rate

---
 mod.hjson                     | 2 +-
 scripts/blocks/solar-flare.js | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/mod.hjson b/mod.hjson
index cc3fb72..4aa1b90 100644
--- a/mod.hjson
+++ b/mod.hjson
@@ -8,5 +8,5 @@ description:
   '''
   Just a testing mod, nothing in here will work properly.
   '''
-version: 0.31
+version: 0.32
 minGameVersion: 103
diff --git a/scripts/blocks/solar-flare.js b/scripts/blocks/solar-flare.js
index 03105cc..a2b2092 100644
--- a/scripts/blocks/solar-flare.js
+++ b/scripts/blocks/solar-flare.js
@@ -1,6 +1,8 @@
 //Large amounts of code copied from laser-interceptor.js from younggam/more-powerful-units.
 const solarflare = new LaserTurret("solar-flare");
 
+solarflare.consumes.add(new ConsumeLiquidFilter(boolf(liquid=>liquid.temperature<=0.5&&liquid.flammability<0.1),/*amount per tick*/0.5)).update(false);
+
 var tmpColor = new Color();
 var colors = [Color.valueOf("e6c04555"), Color.valueOf("f7d95eaa"), Color.valueOf("ffec6e"), Color.white];
 var tscales = [1, 0.7, 0.5, 0.2];

From 5a9b80b31a21f045eef1be6256577812af546c24 Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Mon, 13 Apr 2020 17:44:16 -0700
Subject: [PATCH 48/56] and hopefully maybe reload is fixed

---
 content/blocks/turrets/solar-flare.hjson | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/content/blocks/turrets/solar-flare.hjson b/content/blocks/turrets/solar-flare.hjson
index 5dd2876..08d80bb 100644
--- a/content/blocks/turrets/solar-flare.hjson
+++ b/content/blocks/turrets/solar-flare.hjson
@@ -3,13 +3,12 @@ description: A cousin of the meltdown. Focused more on burning enemies than dama
 size: 4
 health: 3400
 range: 500
-reload: 1
+reload: 80
 shootSound: laserbig
 activeSound: beam
 activeSoundVolume: 2
 powerUse: 15
 rotatespeed: 0.5
-coolantMultiplier: 0.02
 shootCone: 35
 shootShake: 1.5
 targetAir: true

From 12e6dbd41b35121a2a8d2480f9420360bb7f6e31 Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Mon, 13 Apr 2020 17:48:46 -0700
Subject: [PATCH 49/56] Decrease the shootcone because lser is thisn

---
 content/blocks/turrets/solar-flare.hjson | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/blocks/turrets/solar-flare.hjson b/content/blocks/turrets/solar-flare.hjson
index 08d80bb..b941381 100644
--- a/content/blocks/turrets/solar-flare.hjson
+++ b/content/blocks/turrets/solar-flare.hjson
@@ -9,7 +9,7 @@ activeSound: beam
 activeSoundVolume: 2
 powerUse: 15
 rotatespeed: 0.5
-shootCone: 35
+shootCone: 16
 shootShake: 1.5
 targetAir: true
 targetGround: true

From e1688032ad93879515d72ad6534454064518598e Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Mon, 13 Apr 2020 18:03:18 -0700
Subject: [PATCH 50/56] Effects Crash Bugfix

---
 mod.hjson                     | 2 +-
 scripts/blocks/solar-flare.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mod.hjson b/mod.hjson
index 4aa1b90..fb04135 100644
--- a/mod.hjson
+++ b/mod.hjson
@@ -8,5 +8,5 @@ description:
   '''
   Just a testing mod, nothing in here will work properly.
   '''
-version: 0.32
+version: 0.33
 minGameVersion: 103
diff --git a/scripts/blocks/solar-flare.js b/scripts/blocks/solar-flare.js
index a2b2092..ed5ab4c 100644
--- a/scripts/blocks/solar-flare.js
+++ b/scripts/blocks/solar-flare.js
@@ -20,7 +20,7 @@ solarflare.shootType = extend(BasicBulletType, {
         Effects.shake(1, 1, b.x, b.y);
     },
     hit(b,hitx,hity){
-        Effects.effect(Fx.hitMeltdown, colors[2], hitx, hity);
+        Effects.effect(this.hitEffect,this.colors[2],hitx!=null?hitx:b.x,hity!=null?hity:b.y);
     },
     draw(b){
         baseLen = (length) * b.fout();

From b40ca9991f4afa895846452e2e2b67a02e829280 Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Mon, 13 Apr 2020 18:06:09 -0700
Subject: [PATCH 51/56] Pls no instacrash

---
 mod.hjson                     | 2 +-
 scripts/blocks/solar-flare.js | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/mod.hjson b/mod.hjson
index fb04135..2617cc5 100644
--- a/mod.hjson
+++ b/mod.hjson
@@ -8,5 +8,5 @@ description:
   '''
   Just a testing mod, nothing in here will work properly.
   '''
-version: 0.33
+version: 0.34
 minGameVersion: 103
diff --git a/scripts/blocks/solar-flare.js b/scripts/blocks/solar-flare.js
index ed5ab4c..5ad71e9 100644
--- a/scripts/blocks/solar-flare.js
+++ b/scripts/blocks/solar-flare.js
@@ -19,9 +19,6 @@ solarflare.shootType = extend(BasicBulletType, {
         }
         Effects.shake(1, 1, b.x, b.y);
     },
-    hit(b,hitx,hity){
-        Effects.effect(this.hitEffect,this.colors[2],hitx!=null?hitx:b.x,hity!=null?hity:b.y);
-    },
     draw(b){
         baseLen = (length) * b.fout();
 

From a1f5210701defd8f4622189b3c318c8ba90fd035 Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Mon, 13 Apr 2020 18:09:34 -0700
Subject: [PATCH 52/56] Update solar-flare.js

---
 scripts/blocks/solar-flare.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/blocks/solar-flare.js b/scripts/blocks/solar-flare.js
index 5ad71e9..cc7da7c 100644
--- a/scripts/blocks/solar-flare.js
+++ b/scripts/blocks/solar-flare.js
@@ -19,6 +19,9 @@ solarflare.shootType = extend(BasicBulletType, {
         }
         Effects.shake(1, 1, b.x, b.y);
     },
+    hit(b,hitx,hity){
+        Effects.effect(this.hitEffect,Color.valueOf("f7d95e"),hitx!=null?hitx:b.x,hity!=null?hity:b.y);
+    },
     draw(b){
         baseLen = (length) * b.fout();
 

From cb2190df8a262ccdbcfc4a91a7198f72b8dea80c Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Mon, 13 Apr 2020 18:14:20 -0700
Subject: [PATCH 53/56] Reimplement burny burn

---
 mod.hjson                     | 2 +-
 scripts/blocks/solar-flare.js | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/mod.hjson b/mod.hjson
index 2617cc5..d3bd5be 100644
--- a/mod.hjson
+++ b/mod.hjson
@@ -8,5 +8,5 @@ description:
   '''
   Just a testing mod, nothing in here will work properly.
   '''
-version: 0.34
+version: 0.35
 minGameVersion: 103
diff --git a/scripts/blocks/solar-flare.js b/scripts/blocks/solar-flare.js
index cc7da7c..a949cf7 100644
--- a/scripts/blocks/solar-flare.js
+++ b/scripts/blocks/solar-flare.js
@@ -21,6 +21,12 @@ solarflare.shootType = extend(BasicBulletType, {
     },
     hit(b,hitx,hity){
         Effects.effect(this.hitEffect,Color.valueOf("f7d95e"),hitx!=null?hitx:b.x,hity!=null?hity:b.y);
+        if(Mathf.chance(0.8)){
+            //TRIPPLE BURNY BURN MWAHAHAHAHAHA
+            Fire.create(Vars.world.tileWorld(hitx + Mathf.range(5), hity + Mathf.range(5)));
+            Fire.create(Vars.world.tileWorld(hitx + Mathf.range(5), hity + Mathf.range(5)));
+            Fire.create(Vars.world.tileWorld(hitx + Mathf.range(5), hity + Mathf.range(5)));
+        }
     },
     draw(b){
         baseLen = (length) * b.fout();
@@ -45,9 +51,6 @@ solarflare.shootType.hitSize = 4;
 solarflare.shootType.lifetime = 16;
 solarflare.shootType.drawSize = 420;
 solarflare.shootType.pierce = true;
-solarflare.shootType.incendChance = 0.8;
-solarflare.shootType.incendSpread = 20;
-solarflare.shootType.incendAmount = 5;
 
 corn = new StatusEffect("the-sun-is-a-deadly-laser");
 corn.damage = 500;

From eca82b9c86178aa3c4e8e3cff74a8becd3403c1e Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Mon, 13 Apr 2020 19:44:52 -0700
Subject: [PATCH 54/56] Transfer to K103908/Exotic-Mod

---
 content/blocks/turrets/solar-flare.hjson | 23 ---------
 mod.hjson                                |  2 +-
 scripts/blocks/solar-flare.js            | 59 ------------------------
 scripts/main.js                          |  1 -
 4 files changed, 1 insertion(+), 84 deletions(-)
 delete mode 100644 content/blocks/turrets/solar-flare.hjson
 delete mode 100644 scripts/blocks/solar-flare.js

diff --git a/content/blocks/turrets/solar-flare.hjson b/content/blocks/turrets/solar-flare.hjson
deleted file mode 100644
index b941381..0000000
--- a/content/blocks/turrets/solar-flare.hjson
+++ /dev/null
@@ -1,23 +0,0 @@
-name: Solar Flare
-description: A cousin of the meltdown. Focused more on burning enemies than damaging blocks.
-size: 4
-health: 3400
-range: 500
-reload: 80
-shootSound: laserbig
-activeSound: beam
-activeSoundVolume: 2
-powerUse: 15
-rotatespeed: 0.5
-shootCone: 16
-shootShake: 1.5
-targetAir: true
-targetGround: true
-heatColor: e3b464
-recoil: 4
-shootDuration: 220
-firingMoveFract: 0.5
-requirements: [
-]
-category: turret
-research: duo
\ No newline at end of file
diff --git a/mod.hjson b/mod.hjson
index d3bd5be..c225f46 100644
--- a/mod.hjson
+++ b/mod.hjson
@@ -8,5 +8,5 @@ description:
   '''
   Just a testing mod, nothing in here will work properly.
   '''
-version: 0.35
+version: 1.0
 minGameVersion: 103
diff --git a/scripts/blocks/solar-flare.js b/scripts/blocks/solar-flare.js
deleted file mode 100644
index a949cf7..0000000
--- a/scripts/blocks/solar-flare.js
+++ /dev/null
@@ -1,59 +0,0 @@
-//Large amounts of code copied from laser-interceptor.js from younggam/more-powerful-units.
-const solarflare = new LaserTurret("solar-flare");
-
-solarflare.consumes.add(new ConsumeLiquidFilter(boolf(liquid=>liquid.temperature<=0.5&&liquid.flammability<0.1),/*amount per tick*/0.5)).update(false);
-
-var tmpColor = new Color();
-var colors = [Color.valueOf("e6c04555"), Color.valueOf("f7d95eaa"), Color.valueOf("ffec6e"), Color.white];
-var tscales = [1, 0.7, 0.5, 0.2];
-var strokes = [2, 1.5, 1, 0.3];
-var lenscales = [1, 1.12, 1.15, 1.17];
-var length = 560;
-
-solarflare.shootType = extend(BasicBulletType, {
-    update(b){
-        if (b == null) return;
-        if (b.timer.get(1, 5)){
-            //Look in damage.java for how this works, it's simular to lightning.
-            Damage.collideLine(b, b.getTeam(), Fx.hitMeltdown, b.x, b.y, b.rot(), length, true);
-        }
-        Effects.shake(1, 1, b.x, b.y);
-    },
-    hit(b,hitx,hity){
-        Effects.effect(this.hitEffect,Color.valueOf("f7d95e"),hitx!=null?hitx:b.x,hity!=null?hity:b.y);
-        if(Mathf.chance(0.8)){
-            //TRIPPLE BURNY BURN MWAHAHAHAHAHA
-            Fire.create(Vars.world.tileWorld(hitx + Mathf.range(5), hity + Mathf.range(5)));
-            Fire.create(Vars.world.tileWorld(hitx + Mathf.range(5), hity + Mathf.range(5)));
-            Fire.create(Vars.world.tileWorld(hitx + Mathf.range(5), hity + Mathf.range(5)));
-        }
-    },
-    draw(b){
-        baseLen = (length) * b.fout();
-
-        Lines.lineAngle(b.x,b.y,b.rot(),baseLen);
-        for(var s = 0; s < colors.length; s++){
-            Draw.color(tmpColor.set(colors[s]).mul(1+Mathf.absin(Time.time(),1,0.1)));
-            for(var i = 0; i < tscales.length; i++){
-                Tmp.v1.trns(b.rot()+180,(lenscales[i]-1)*35);
-                Lines.stroke((4+Mathf.absin(Time.time(),0.8,1.5))*b.fout()*strokes[s]*tscales[i]);
-                Lines.lineAngle(b.x+Tmp.v1.x,b.y+Tmp.v1.y,b.rot(),baseLen*lenscales[i],CapStyle.none);
-            }
-        }
-        Draw.reset();
-    }
-});
-
-solarflare.shootType.hitEffect = Fx.hitMeltdown;
-solarflare.shootType.despawnEffect = Fx.none;
-solarflare.shootType.damage = 1;
-solarflare.shootType.hitSize = 4;
-solarflare.shootType.lifetime = 16;
-solarflare.shootType.drawSize = 420;
-solarflare.shootType.pierce = true;
-
-corn = new StatusEffect("the-sun-is-a-deadly-laser");
-corn.damage = 500;
-corn.effect = Fx.burning;
-corn.armorMultiplier = 0.6;
-solarflare.shootType.status = corn
\ No newline at end of file
diff --git a/scripts/main.js b/scripts/main.js
index 5d813eb..e69de29 100644
--- a/scripts/main.js
+++ b/scripts/main.js
@@ -1 +0,0 @@
-require("blocks/solar-flare")
\ No newline at end of file

From 4757af06047a25a47c420ce0aef37696e751703a Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Tue, 14 Apr 2020 20:36:48 -0700
Subject: [PATCH 55/56] nothing happened

---
 {scripts => content}/main.js | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {scripts => content}/main.js (100%)

diff --git a/scripts/main.js b/content/main.js
similarity index 100%
rename from scripts/main.js
rename to content/main.js

From bd40f3917e0a597a104de04827f73619bd284299 Mon Sep 17 00:00:00 2001
From: MEEP of Faith <meepmatthew@gmail.com>
Date: Tue, 14 Apr 2020 20:37:44 -0700
Subject: [PATCH 56/56] I did an oopsy

---
 {content => scripts}/main.js | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {content => scripts}/main.js (100%)

diff --git a/content/main.js b/scripts/main.js
similarity index 100%
rename from content/main.js
rename to scripts/main.js