From d457901d2e937040b0a3e6a3c2b9383a0ab37281 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 15 Feb 2023 10:34:52 -0500
Subject: [PATCH] Minor Conquer buff

---
 core/src/mindustry/content/UnitTypes.java | 12 ++++++------
 core/src/mindustry/logic/Settable.java    | 10 ++++++++++
 2 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 core/src/mindustry/logic/Settable.java

diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
index 87d3900ea9..fced520ba1 100644
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -2751,7 +2751,7 @@ public class UnitTypes{
             weapons.add(new Weapon("conquer-weapon"){{
                 shootSound = Sounds.largeCannon;
                 layerOffset = 0.1f;
-                reload = 110f;
+                reload = 100f;
                 shootY = 32.5f;
                 shake = 5f;
                 recoil = 5f;
@@ -2823,7 +2823,7 @@ public class UnitTypes{
                     }});
                 }
 
-                bullet = new BasicBulletType(8f, 330f){{
+                bullet = new BasicBulletType(8f, 360f){{
                     sprite = "missile-large";
                     width = 12f;
                     height = 20f;
@@ -2862,7 +2862,7 @@ public class UnitTypes{
                             float fin = 0.05f + (j + 1) / (float)count;
                             float spd = speed;
                             float life = lifetime / Mathf.lerp(fin, 1f, 0.5f);
-                            spawnBullets.add(new BasicBulletType(spd * fin, 55){{
+                            spawnBullets.add(new BasicBulletType(spd * fin, 60){{
                                 drag = 0.002f;
                                 width = 12f;
                                 height = 11f;
@@ -2879,7 +2879,7 @@ public class UnitTypes{
                                 weaveScale = (3f + s/2f) / 1.2f;
                                 weaveMag = i * (4f - fin * 2f);
 
-                                splashDamage = 60f;
+                                splashDamage = 65f;
                                 splashDamageRadius = 30f;
                                 despawnEffect = new ExplosionEffect(){{
                                     lifetime = 50f;
@@ -3434,9 +3434,9 @@ public class UnitTypes{
                     }});
                 }
 
-                bullet = new ArtilleryBulletType(5.5f, 280){{
+                bullet = new ArtilleryBulletType(5.5f, 260){{
                     collidesTiles = collides = true;
-                    lifetime = 75f;
+                    lifetime = 70f;
                     shootEffect = Fx.shootBigColor;
                     smokeEffect = Fx.shootSmokeSquareBig;
                     frontColor = Color.white;
diff --git a/core/src/mindustry/logic/Settable.java b/core/src/mindustry/logic/Settable.java
new file mode 100644
index 0000000000..1a3bf405db
--- /dev/null
+++ b/core/src/mindustry/logic/Settable.java
@@ -0,0 +1,10 @@
+package mindustry.logic;
+
+import mindustry.ctype.*;
+
+//TODO
+public interface Settable{
+    void setProperty(LAccess prop, double value);
+    void setProperty(LAccess prop, Object value);
+    void setProperty(UnlockableContent content, double value);
+}