From f91619e5da975b77a69598bd13e260eebd5c95fc Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 15 Jan 2022 20:45:07 -0500
Subject: [PATCH] Toxopid cannon rotation limit

---
 core/src/mindustry/content/UnitTypes.java | 17 ++++++++++++-----
 core/src/mindustry/mod/ContentParser.java |  2 +-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
index a003ff5abb..3a6077588f 100644
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -907,6 +907,8 @@ public class UnitTypes{
                 rotate = true;
                 shadow = 30f;
 
+                rotationLimit = 80f;
+
                 bullet = new ArtilleryBulletType(3f, 50){{
                     hitEffect = Fx.sapExplosion;
                     knockback = 0.8f;
@@ -2529,7 +2531,7 @@ public class UnitTypes{
                 y = 5 / 4f;
                 rotate = true;
                 rotateSpeed = 2f;
-                reload = 60f;
+                reload = 70f;
                 layerOffset = -0.001f;
                 recoil = 1f;
                 rotationLimit = 60f;
@@ -2541,18 +2543,23 @@ public class UnitTypes{
                 }};
 
                 unitSpawned = new MissileUnitType("quell-missile"){{
-                    speed = 4f;
+                    speed = 3.8f;
                     maxRange = 80f;
+                    outlineColor = Pal.darkOutline;
+                    health = 45;
 
                     weapons.add(new Weapon(){{
+                        shootCone = 360f;
+                        mirror = false;
+                        reload = 1f;
                         shootOnDeath = true;
                         bullet = new BulletType(){{
                             rangeOverride = 20f;
-                            despawnEffect = Fx.blastExplosion;
+                            shootEffect = Fx.massiveExplosion;
                             killShooter = true;
                             //TODO status?
-                            splashDamageRadius = 60f;
-                            splashDamage = 230f;
+                            splashDamageRadius = 40f;
+                            splashDamage = 120f;
                         }};
                     }});
                 }};
diff --git a/core/src/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java
index 88341a53c3..6a42429e52 100644
--- a/core/src/mindustry/mod/ContentParser.java
+++ b/core/src/mindustry/mod/ContentParser.java
@@ -253,7 +253,7 @@ public class ContentParser{
 
             if(locate(ContentType.block, name) != null){
                 if(value.has("type")){
-                    Log.warn("Warning: '" + name + "' re-declares a type. This will be interpreted as a new block. If you wish to override a vanilla block, omit the 'type' section, as vanilla block `type`s cannot be changed.");
+                    Log.warn("Warning: '" + currentMod.name + "-" + name + "' re-declares a type. This will be interpreted as a new block. If you wish to override a vanilla block, omit the 'type' section, as vanilla block `type`s cannot be changed.");
                     block = make(resolve(value.getString("type", ""), Block.class), mod + "-" + name);
                 }else{
                     block = locate(ContentType.block, name);