From d61ad8d2ef70f53318c2dfeede130b10823b99ea Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 10 Oct 2020 13:15:59 -0400
Subject: [PATCH] Fixed #2895

---
 core/src/mindustry/content/Bullets.java            |  2 ++
 core/src/mindustry/content/UnitTypes.java          | 11 +++++++----
 core/src/mindustry/entities/bullet/BulletType.java |  2 +-
 core/src/mindustry/ui/dialogs/ModsDialog.java      |  8 +++++---
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/core/src/mindustry/content/Bullets.java b/core/src/mindustry/content/Bullets.java
index b03c489a93..221dc44e8d 100644
--- a/core/src/mindustry/content/Bullets.java
+++ b/core/src/mindustry/content/Bullets.java
@@ -355,6 +355,7 @@ public class Bullets implements ContentList{
             height = 23f;
             shootEffect = Fx.shootBig;
             pierceCap = 2;
+            pierceBuilding = true;
         }};
 
         standardIncendiaryBig = new BasicBulletType(7f, 60, "bullet"){{
@@ -365,6 +366,7 @@ public class Bullets implements ContentList{
             status = StatusEffects.burning;
             shootEffect = Fx.shootBig;
             pierceCap = 2;
+            pierceBuilding = true;
         }};
 
         damageLightning = new BulletType(0.0001f, 0f){{
diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
index 9a92882cf6..b6230b9eb7 100644
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -164,7 +164,7 @@ public class UnitTypes implements ContentList{
                 y = 1f;
                 x = 16f;
                 shootY = 8f;
-                reload = 50f;
+                reload = 45f;
                 recoil = 5f;
                 shake = 2f;
                 ejectEffect = Fx.shellEjectBig;
@@ -173,7 +173,7 @@ public class UnitTypes implements ContentList{
                 inaccuracy = 3f;
                 shotDelay = 4f;
 
-                bullet = new BasicBulletType(7f, 45){{
+                bullet = new BasicBulletType(7f, 50){{
                     width = 11f;
                     height = 20f;
                     lifetime = 25f;
@@ -182,7 +182,7 @@ public class UnitTypes implements ContentList{
                     lightningLength = 6;
                     lightningColor = Pal.surge;
                     //standard bullet damage is far too much for lightning
-                    lightningDamage = 25;
+                    lightningDamage = 30;
                 }};
             }},
 
@@ -230,8 +230,9 @@ public class UnitTypes implements ContentList{
                 ejectEffect = Fx.shellEjectBig;
                 shootSound = Sounds.artillery;
 
-                bullet = new BasicBulletType(13f, 55){{
+                bullet = new BasicBulletType(13f, 60){{
                     pierce = true;
+                    pierceCap = 10;
                     width = 14f;
                     height = 33f;
                     lifetime = 15f;
@@ -250,6 +251,8 @@ public class UnitTypes implements ContentList{
                         width = 10f;
                         height = 10f;
                         pierce = true;
+                        pierceBuilding = true;
+                        pierceCap = 3;
 
                         lifetime = 20f;
                         hitEffect = Fx.flakExplosion;
diff --git a/core/src/mindustry/entities/bullet/BulletType.java b/core/src/mindustry/entities/bullet/BulletType.java
index 0a6e6c38e7..0c3a605f1b 100644
--- a/core/src/mindustry/entities/bullet/BulletType.java
+++ b/core/src/mindustry/entities/bullet/BulletType.java
@@ -238,7 +238,7 @@ public abstract class BulletType extends Content{
     public void init(Bullet b){
         if(pierceCap >= 1) {
             pierce = true;
-            pierceBuilding = true;
+            //pierceBuilding is not enabled by default, because a bullet may want to *not* pierce buildings
         }
 
         if(killShooter && b.owner() instanceof Healthc){
diff --git a/core/src/mindustry/ui/dialogs/ModsDialog.java b/core/src/mindustry/ui/dialogs/ModsDialog.java
index 4695091886..866c3460e4 100644
--- a/core/src/mindustry/ui/dialogs/ModsDialog.java
+++ b/core/src/mindustry/ui/dialogs/ModsDialog.java
@@ -107,11 +107,13 @@ public class ModsDialog extends BaseDialog{
                             Core.settings.put("lastmod", text);
 
                             ui.loadfrag.show();
-                            // Try to download the 6.0 branch first, but if it doesnt exist try master.
+                            //Try to download the 6.0 branch first, but if it doesn't exist try master.
                             githubImport("6.0", text, e1 -> {
                                 githubImport("master", text, e2 -> {
-                                    ui.showErrorMessage(Core.bundle.format("connectfail", e2));
-                                    ui.loadfrag.hide();
+                                    githubImport("main", text, e3 -> {
+                                        ui.showErrorMessage(Core.bundle.format("connectfail", e2));
+                                        ui.loadfrag.hide();
+                                    });
                                 });
                             });
                         });