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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 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;