From 2239ca6372546ef2a0fb2c201611a56c5d2dc715 Mon Sep 17 00:00:00 2001 From: Patrick 'Quezler' Mounier Date: Sun, 27 Dec 2020 19:32:04 +0100 Subject: [PATCH] Remove 4 square blocks from the accelerator (#4139) * Normalize rule comment line endings Just so i can get a new patch-## branch where i can drag my accelerator sprite on since github isn't smart enough yet to see that as a possible pull request by itself. * Add files via upload * Add files via upload --- .../campaign/interplanetary-accelerator.png | Bin 3952 -> 11273 bytes core/src/mindustry/game/Rules.java | 22 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/core/assets-raw/sprites/blocks/campaign/interplanetary-accelerator.png b/core/assets-raw/sprites/blocks/campaign/interplanetary-accelerator.png index a83ba863a9f5ac0fd055689e8e5ecc672893f594..41019a2c7d38f555e233534f051d1b65a3344027 100644 GIT binary patch literal 11273 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 literal 3952 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 L>gTe~DWM4fO}k7( diff --git a/core/src/mindustry/game/Rules.java b/core/src/mindustry/game/Rules.java index 046b2128cb..e0db8ac94a 100644 --- a/core/src/mindustry/game/Rules.java +++ b/core/src/mindustry/game/Rules.java @@ -28,7 +28,7 @@ public class Rules{ public boolean pvp; /** Whether to pause the wave timer until all enemies are destroyed. */ public boolean waitEnemies = false; - /** Determinates if gamemode is attack mode */ + /** Determinates if gamemode is attack mode. */ public boolean attackMode = false; /** Whether this is the editor gamemode. */ public boolean editor = false; @@ -36,7 +36,7 @@ public class Rules{ public boolean canGameOver = true; /** Whether reactors can explode and damage other blocks. */ public boolean reactorExplosions = true; - /** Whether schematics are allowed */ + /** Whether schematics are allowed. */ public boolean schematicsAllowed = true; /** Whether friendly explosions can occur and set fire/damage other blocks. */ public boolean damageExplosions = true; @@ -58,7 +58,7 @@ public class Rules{ public float buildCostMultiplier = 1f; /** Multiplier for building speed. */ public float buildSpeedMultiplier = 1f; - /** Multiplier for percentage of materials refunded when deconstructing */ + /** Multiplier for percentage of materials refunded when deconstructing. */ public float deconstructRefundMultiplier = 0.5f; /** No-build zone around enemy core radius. */ public float enemyCoreBuildRadius = 400f; @@ -70,17 +70,17 @@ public class Rules{ public int winWave = 0; /** Base unit cap. Can still be increased by blocks. */ public int unitCap = 0; - /** Sector for saves that have them.*/ + /** Sector for saves that have them. */ public @Nullable Sector sector; /** Spawn layout. */ public Seq spawns = new Seq<>(); - /** Starting items put in cores */ + /** Starting items put in cores. */ public Seq loadout = ItemStack.list(Items.copper, 100); /** Weather events that occur here. */ public Seq weather = new Seq<>(1); /** Blocks that cannot be placed. */ public ObjectSet bannedBlocks = new ObjectSet<>(); - /** Reveals blocks normally hidden by build visibility */ + /** Reveals blocks normally hidden by build visibility. */ public ObjectSet revealedBlocks = new ObjectSet<>(); /** Unlocked content names. Only used in multiplayer when the campaign is enabled. */ public ObjectSet researched = new ObjectSet<>(); @@ -91,20 +91,20 @@ public class Rules{ public boolean enemyLights = true; /** Ambient light color, used when lighting is enabled. */ public Color ambientLight = new Color(0.01f, 0.01f, 0.04f, 0.99f); - /** team of the player by default */ + /** team of the player by default. */ public Team defaultTeam = Team.sharded; - /** team of the enemy in waves/sectors */ + /** team of the enemy in waves/sectors. */ public Team waveTeam = Team.crux; /** name of the custom mode that this ruleset describes, or null. */ public @Nullable String modeName; - /** special tags for additional info */ + /** special tags for additional info. */ public StringMap tags = new StringMap(); /** A team-specific ruleset. */ public static class TeamRule{ /** Whether to use building AI. */ public boolean ai; - /** TODO Tier of blocks/designs that the AI uses for building. [0, 1]*/ + /** TODO Tier of blocks/designs that the AI uses for building. [0, 1] */ public float aiTier = 1f; /** Whether, when AI is enabled, ships should be spawned from the core. */ public boolean aiCoreSpawn = true; @@ -121,7 +121,7 @@ public class Rules{ return JsonIO.copy(this); } - /** Returns the gamemode that best fits these rules.*/ + /** Returns the gamemode that best fits these rules. */ public Gamemode mode(){ if(pvp){ return Gamemode.pvp;