From a21f79ac6adddbc8a43d301c5277e0ab22ebe199 Mon Sep 17 00:00:00 2001
From: MEEP of Faith <54301439+MEEPofFaith@users.noreply.github.com>
Date: Wed, 23 Dec 2020 07:29:26 -0800
Subject: [PATCH] Draw size independent from puddle size. (#3826)

* Draw size independent from puddle size.

* Apply change to Bullets
---
 core/src/mindustry/content/Bullets.java                  | 4 ++++
 core/src/mindustry/entities/bullet/LiquidBulletType.java | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/src/mindustry/content/Bullets.java b/core/src/mindustry/content/Bullets.java
index 30fc1bfe79..d1b693c1f3 100644
--- a/core/src/mindustry/content/Bullets.java
+++ b/core/src/mindustry/content/Bullets.java
@@ -465,6 +465,7 @@ public class Bullets implements ContentList{
             speed = 4f;
             knockback = 1.7f;
             puddleSize = 8f;
+            orbSize = 8f;
             drag = 0.001f;
             ammoMultiplier = 0.4f;
             statusDuration = 60f * 4f;
@@ -476,6 +477,7 @@ public class Bullets implements ContentList{
             speed = 4f;
             knockback = 1.3f;
             puddleSize = 8f;
+            orbSize = 8f;
             drag = 0.001f;
             ammoMultiplier = 0.4f;
             statusDuration = 60f * 4f;
@@ -487,6 +489,7 @@ public class Bullets implements ContentList{
             speed = 4f;
             knockback = 1.3f;
             puddleSize = 8f;
+            orbSize = 8f;
             damage = 4.75f;
             drag = 0.001f;
             ammoMultiplier = 0.4f;
@@ -498,6 +501,7 @@ public class Bullets implements ContentList{
             speed = 4f;
             knockback = 1.3f;
             puddleSize = 8f;
+            orbSize = 8f;
             drag = 0.001f;
             ammoMultiplier = 0.4f;
             statusDuration = 60f * 4f;
diff --git a/core/src/mindustry/entities/bullet/LiquidBulletType.java b/core/src/mindustry/entities/bullet/LiquidBulletType.java
index 5da33f95e0..68721bd2fd 100644
--- a/core/src/mindustry/entities/bullet/LiquidBulletType.java
+++ b/core/src/mindustry/entities/bullet/LiquidBulletType.java
@@ -15,6 +15,7 @@ import static mindustry.Vars.*;
 public class LiquidBulletType extends BulletType{
     public Liquid liquid;
     public float puddleSize = 6f;
+    public float orbSize = 6f;
 
     public LiquidBulletType(@Nullable Liquid liquid){
         super(3.5f, 0);
@@ -64,7 +65,7 @@ public class LiquidBulletType extends BulletType{
     public void draw(Bullet b){
         Draw.color(liquid.color, Color.white, b.fout() / 100f);
 
-        Fill.circle(b.x, b.y, puddleSize / 2);
+        Fill.circle(b.x, b.y, orbSize / 2);
     }
 
     @Override