From cab585225d45d419149f72909ae530d058379903 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 13 Oct 2018 10:54:05 -0400
Subject: [PATCH] Removed unused 'pad' recipe modifier

---
 core/src/io/anuke/mindustry/game/GameMode.java            | 5 +----
 core/src/io/anuke/mindustry/maps/SectorPresets.java       | 2 +-
 core/src/io/anuke/mindustry/type/Recipe.java              | 8 +-------
 .../io/anuke/mindustry/ui/fragments/BlocksFragment.java   | 2 +-
 4 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/core/src/io/anuke/mindustry/game/GameMode.java b/core/src/io/anuke/mindustry/game/GameMode.java
index 13fa56e6a2..61575449ce 100644
--- a/core/src/io/anuke/mindustry/game/GameMode.java
+++ b/core/src/io/anuke/mindustry/game/GameMode.java
@@ -15,17 +15,14 @@ public enum GameMode{
         disableWaves = true;
         hidden = true;
         enemyCheat = true;
-        showPads = true;
     }},
     victory{{
         disableWaves = true;
         hidden = true;
         enemyCheat = false;
-        showPads = true;
         showMission = false;
     }},
     pvp{{
-        showPads = true;
         disableWaves = true;
         isPvp = true;
         hidden = true;
@@ -33,7 +30,7 @@ public enum GameMode{
         respawnTime = 60 * 10;
     }};
 
-    public boolean infiniteResources, disableWaveTimer, disableWaves, showMission = true, hidden, enemyCheat, isPvp, showPads;
+    public boolean infiniteResources, disableWaveTimer, disableWaves, showMission = true, hidden, enemyCheat, isPvp;
     public float enemyCoreBuildRadius = 400f;
     public float respawnTime = 60 * 4;
 
diff --git a/core/src/io/anuke/mindustry/maps/SectorPresets.java b/core/src/io/anuke/mindustry/maps/SectorPresets.java
index 125462feb4..624da0e72c 100644
--- a/core/src/io/anuke/mindustry/maps/SectorPresets.java
+++ b/core/src/io/anuke/mindustry/maps/SectorPresets.java
@@ -45,7 +45,7 @@ public class SectorPresets{
         //pad mission
         add(new SectorPreset(0, -2,
             Structs.array(
-                Missions.blockRecipe(mobile ? UpgradeBlocks.tridentPad : UpgradeBlocks.deltaPad),
+                Missions.blockRecipe(mobile ? UpgradeBlocks.alphaPad : UpgradeBlocks.dartPad),
                 new MechMission(Mechs.delta),
                 new WaveMission(15)
             ),
diff --git a/core/src/io/anuke/mindustry/type/Recipe.java b/core/src/io/anuke/mindustry/type/Recipe.java
index 7332868129..eed821961c 100644
--- a/core/src/io/anuke/mindustry/type/Recipe.java
+++ b/core/src/io/anuke/mindustry/type/Recipe.java
@@ -32,7 +32,6 @@ public class Recipe extends UnlockableContent{
     public RecipeVisibility visibility = RecipeVisibility.all;
     //the only gamemode in which the recipe shows up
     public GameMode mode;
-    public boolean isPad;
     public boolean hidden;
     public boolean alwaysUnlocked;
 
@@ -68,7 +67,7 @@ public class Recipe extends UnlockableContent{
         arr.clear();
         for(Recipe r : content.recipes()){
             if(r.category == category && (control.unlocks.isUnlocked(r)) &&
-            !((r.mode != null && r.mode != state.mode) || !r.visibility.shown() || (r.isPad && !state.mode.showPads))){
+            !((r.mode != null && r.mode != state.mode) || !r.visibility.shown())){
                 arr.add(r);
             }
         }
@@ -90,11 +89,6 @@ public class Recipe extends UnlockableContent{
         return recipeMap.get(block);
     }
 
-    public Recipe setPad(){
-        this.isPad = true;
-        return this;
-    }
-
     public Recipe setVisible(RecipeVisibility visibility){
         this.visibility = visibility;
         return this;
diff --git a/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java
index 23632e57b2..8a52813a75 100644
--- a/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java
+++ b/core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java
@@ -173,7 +173,7 @@ public class BlocksFragment extends Fragment{
 
             //add actual recipes
             for(Recipe r : recipes){
-                if((r.mode != null && r.mode != state.mode) || !r.visibility.shown() || (r.isPad && !state.mode.showPads)) continue;
+                if((r.mode != null && r.mode != state.mode) || !r.visibility.shown()) continue;
 
                 ImageButton image = new ImageButton(new TextureRegion(), "select");