Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed unused 'pad' recipe modifier

Browse Source
This commit is contained in:
Anuken
2018-10-13 10:54:05 -04:00
parent 3688dde5e5
commit cab585225d
4 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/io/anuke/mindustry/game/GameMode.java
+1 -4
View File
@@ -15,17 +15,14 @@ public enum GameMode{
disableWaves = true; disableWaves = true;
hidden = true; hidden = true;
enemyCheat = true; enemyCheat = true;
showPads = true;
}}, }},
victory{{ victory{{
disableWaves = true; disableWaves = true;
hidden = true; hidden = true;
enemyCheat = false; enemyCheat = false;
showPads = true;
showMission = false; showMission = false;
}}, }},
pvp{{ pvp{{
showPads = true;
disableWaves = true; disableWaves = true;
isPvp = true; isPvp = true;
hidden = true; hidden = true;
@@ -33,7 +30,7 @@ public enum GameMode{
respawnTime = 60 * 10; 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 enemyCoreBuildRadius = 400f;
public float respawnTime = 60 * 4; public float respawnTime = 60 * 4;
core/src/io/anuke/mindustry/maps/SectorPresets.java
+1 -1
View File
@@ -45,7 +45,7 @@ public class SectorPresets{
//pad mission //pad mission
add(new SectorPreset(0, -2, add(new SectorPreset(0, -2,
Structs.array( Structs.array(
Missions.blockRecipe(mobile ? UpgradeBlocks.tridentPad : UpgradeBlocks.deltaPad), Missions.blockRecipe(mobile ? UpgradeBlocks.alphaPad : UpgradeBlocks.dartPad),
new MechMission(Mechs.delta), new MechMission(Mechs.delta),
new WaveMission(15) new WaveMission(15)
), ),
core/src/io/anuke/mindustry/type/Recipe.java
+1 -7
View File
@@ -32,7 +32,6 @@ public class Recipe extends UnlockableContent{
public RecipeVisibility visibility = RecipeVisibility.all; public RecipeVisibility visibility = RecipeVisibility.all;
//the only gamemode in which the recipe shows up //the only gamemode in which the recipe shows up
public GameMode mode; public GameMode mode;
public boolean isPad;
public boolean hidden; public boolean hidden;
public boolean alwaysUnlocked; public boolean alwaysUnlocked;
@@ -68,7 +67,7 @@ public class Recipe extends UnlockableContent{
arr.clear(); arr.clear();
for(Recipe r : content.recipes()){ for(Recipe r : content.recipes()){
if(r.category == category && (control.unlocks.isUnlocked(r)) && 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); arr.add(r);
} }
} }
@@ -90,11 +89,6 @@ public class Recipe extends UnlockableContent{
return recipeMap.get(block); return recipeMap.get(block);
} }
public Recipe setPad(){
this.isPad = true;
return this;
}
public Recipe setVisible(RecipeVisibility visibility){ public Recipe setVisible(RecipeVisibility visibility){
this.visibility = visibility; this.visibility = visibility;
return this; return this;
core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java
+1 -1
View File
@@ -173,7 +173,7 @@ public class BlocksFragment extends Fragment{
//add actual recipes //add actual recipes
for(Recipe r : 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"); ImageButton image = new ImageButton(new TextureRegion(), "select");