diff --git a/core/assets-raw/sprites/mechs/mechs/alpha-mech.png b/core/assets-raw/sprites/mechs/mechs/alpha-mech.png index 3480cfecb4..eea5488b0a 100644 Binary files a/core/assets-raw/sprites/mechs/mechs/alpha-mech.png and b/core/assets-raw/sprites/mechs/mechs/alpha-mech.png differ diff --git a/core/assets-raw/sprites/mechs/ships/dart-ship.png b/core/assets-raw/sprites/mechs/ships/dart-ship.png index ba98cecfd0..12f4d9c924 100644 Binary files a/core/assets-raw/sprites/mechs/ships/dart-ship.png and b/core/assets-raw/sprites/mechs/ships/dart-ship.png differ diff --git a/core/assets-raw/sprites/weapons/vanguard-blaster-equip.png b/core/assets-raw/sprites/weapons/vanguard-blaster-equip.png new file mode 100644 index 0000000000..7d1e246dd4 Binary files /dev/null and b/core/assets-raw/sprites/weapons/vanguard-blaster-equip.png differ diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 80d8f56426..0130966306 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java index 8bfcbbec0f..1bcb6c6d59 100644 --- a/core/src/io/anuke/mindustry/content/Blocks.java +++ b/core/src/io/anuke/mindustry/content/Blocks.java @@ -1681,6 +1681,7 @@ public class Blocks implements ContentList{ type = UnitTypes.ghoul; produceTime = 1150; size = 3; + maxSpawn = 2; consumes.power(1.2f); consumes.items(new ItemStack(Items.silicon, 15), new ItemStack(Items.titanium, 10)); }}; @@ -1690,6 +1691,7 @@ public class Blocks implements ContentList{ type = UnitTypes.revenant; produceTime = 2000; size = 4; + maxSpawn = 2; consumes.power(3f); consumes.items(new ItemStack(Items.silicon, 40), new ItemStack(Items.titanium, 30)); }}; diff --git a/core/src/io/anuke/mindustry/content/Bullets.java b/core/src/io/anuke/mindustry/content/Bullets.java index ac18c8a2b0..7ee440e158 100644 --- a/core/src/io/anuke/mindustry/content/Bullets.java +++ b/core/src/io/anuke/mindustry/content/Bullets.java @@ -460,6 +460,7 @@ public class Bullets implements ContentList{ hitEffect = Fx.hitFlameSmall; despawnEffect = Fx.none; status = StatusEffects.burning; + keepVelocity = false; } @Override @@ -503,6 +504,7 @@ public class Bullets implements ContentList{ hitSize = 4; lifetime = 16f; pierce = true; + keepVelocity = false; } @Override diff --git a/core/src/io/anuke/mindustry/content/Mechs.java b/core/src/io/anuke/mindustry/content/Mechs.java index 3db2b79d56..ea64ad319c 100644 --- a/core/src/io/anuke/mindustry/content/Mechs.java +++ b/core/src/io/anuke/mindustry/content/Mechs.java @@ -43,15 +43,17 @@ public class Mechs implements ContentList{ velocityRnd = 0.1f; ejectEffect = Fx.none; bullet = new HealBulletType(){{ - backColor = engineColor; + healPercent = 3f; + //TODO decide on color or remove healing properties + //backColor = engineColor; homingPower = 20f; bulletHeight = 4f; bulletWidth = 1.5f; damage = 3f; speed = 4f; lifetime = 40f; - shootEffect = Fx.shootHealYellow; - smokeEffect = hitEffect = despawnEffect = Fx.hitYellowLaser; + //shootEffect = Fx.shootHealYellow; + //smokeEffect = hitEffect = despawnEffect = Fx.hitYellowLaser; }}; }}; } @@ -63,36 +65,6 @@ public class Mechs implements ContentList{ }; alpha = new Mech("alpha-mech", false){ - { - drillPower = 1; - mineSpeed = 1.5f; - mass = 1.2f; - speed = 0.5f; - itemCapacity = 40; - boostSpeed = 0.95f; - buildPower = 1.2f; - engineColor = Color.valueOf("ffd37f"); - health = 250f; - - weapon = new Weapon("blaster"){{ - length = 1.5f; - reload = 14f; - roundrobin = true; - ejectEffect = Fx.shellEjectSmall; - bullet = Bullets.standardMechSmall; - }}; - } - - @Override - public void updateAlt(Player player){ - player.healBy(Time.delta() * 0.09f); - } - - }; - - delta = new Mech("delta-mech", false){ - float cooldown = 120; - { drillPower = -1; speed = 0.75f; @@ -108,27 +80,41 @@ public class Mechs implements ContentList{ weapon = new Weapon("shockgun"){{ shake = 2f; length = 1f; - reload = 55f; - shotDelay = 3f; + reload = 60f; roundrobin = true; - shots = 2; - inaccuracy = 0f; ejectEffect = Fx.none; - bullet = Bullets.lightning; + bullet = Bullets.lancerLaser; shootSound = Sounds.spark; }}; } - //todo this is a useless ability @Override - public void onLand(Player player){ - if(player.timer.get(Player.timerAbility, cooldown)){ - Effects.shake(1f, 1f, player); - Effects.effect(Fx.landShock, player); - for(int i = 0; i < 8; i++){ - Time.run(Mathf.random(8f), () -> Lightning.create(player.getTeam(), Pal.lancerLaser, 17f * Vars.state.rules.playerDamageMultiplier, player.x, player.y, Mathf.random(360f), 14)); - } - } + public void updateAlt(Player player){ + player.healBy(Time.delta() * 0.09f); + } + + }; + + delta = new Mech("delta-mech", false){ + { + drillPower = 1; + mineSpeed = 1.5f; + mass = 1.2f; + speed = 0.5f; + itemCapacity = 40; + boostSpeed = 0.95f; + buildPower = 1.2f; + engineColor = Color.valueOf("ffd37f"); + health = 250f; + weaponOffsetX = 4f; + + weapon = new Weapon("flamethrower"){{ + length = 1.5f; + reload = 10f; + width = 4f; + roundrobin = true; + bullet = Bullets.basicFlame; + }}; } }; diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java index 08302458d2..e5d5b2b9ce 100644 --- a/core/src/io/anuke/mindustry/core/Control.java +++ b/core/src/io/anuke/mindustry/core/Control.java @@ -29,8 +29,8 @@ import java.text.*; import java.util.*; import static io.anuke.arc.Core.*; -import static io.anuke.mindustry.Vars.*; import static io.anuke.mindustry.Vars.net; +import static io.anuke.mindustry.Vars.*; /** * Control module. diff --git a/core/src/io/anuke/mindustry/game/UnlockableContent.java b/core/src/io/anuke/mindustry/game/UnlockableContent.java index 9b1986b9c9..71e1fbe96c 100644 --- a/core/src/io/anuke/mindustry/game/UnlockableContent.java +++ b/core/src/io/anuke/mindustry/game/UnlockableContent.java @@ -8,7 +8,7 @@ import io.anuke.mindustry.*; /** Base interface for an unlockable content type. */ public abstract class UnlockableContent extends MappableContent{ - /** Localized, formal name. Never null. Set to block name if not found in bundle. */ + /** Localized, formal name. Never null. Set to internal name if not found in bundle. */ public String localizedName; /** Localized description. May be null. */ public String description; @@ -40,11 +40,6 @@ public abstract class UnlockableContent extends MappableContent{ return cicons[icon.ordinal()]; } - /** Returns the localized name of this content. */ - public abstract String localizedName(); - - //public abstract TextureRegion getContentIcon(); - /** This should show all necessary info about this content in the specified table. */ public abstract void displayInfo(Table table); diff --git a/core/src/io/anuke/mindustry/mod/Mods.java b/core/src/io/anuke/mindustry/mod/Mods.java index 21a5aa4073..de3ff6fd9e 100644 --- a/core/src/io/anuke/mindustry/mod/Mods.java +++ b/core/src/io/anuke/mindustry/mod/Mods.java @@ -55,7 +55,7 @@ public class Mods implements Loadable{ public void importMod(FileHandle file) throws IOException{ FileHandle dest = modDirectory.child(file.name()); if(dest.exists()){ - throw new IOException("A mod with the same filename already exists!"); + throw new IOException("A file with the same name already exists in the mod folder!"); } file.copyTo(dest); diff --git a/core/src/io/anuke/mindustry/type/Item.java b/core/src/io/anuke/mindustry/type/Item.java index 4950f32c10..8dcefc9f75 100644 --- a/core/src/io/anuke/mindustry/type/Item.java +++ b/core/src/io/anuke/mindustry/type/Item.java @@ -51,14 +51,9 @@ public class Item extends UnlockableContent{ ContentDisplay.displayItem(table, this); } - @Override - public String localizedName(){ - return Core.bundle.get("item." + this.name + ".name"); - } - @Override public String toString(){ - return localizedName(); + return localizedName; } @Override diff --git a/core/src/io/anuke/mindustry/type/Liquid.java b/core/src/io/anuke/mindustry/type/Liquid.java index 816e430c9c..dd5e7bf63f 100644 --- a/core/src/io/anuke/mindustry/type/Liquid.java +++ b/core/src/io/anuke/mindustry/type/Liquid.java @@ -45,14 +45,9 @@ public class Liquid extends UnlockableContent{ ContentDisplay.displayLiquid(table, this); } - @Override - public String localizedName(){ - return Core.bundle.get("liquid." + this.name + ".name"); - } - @Override public String toString(){ - return localizedName(); + return localizedName; } @Override diff --git a/core/src/io/anuke/mindustry/type/Mech.java b/core/src/io/anuke/mindustry/type/Mech.java index 2f9e64a9b4..be58d1cfe3 100644 --- a/core/src/io/anuke/mindustry/type/Mech.java +++ b/core/src/io/anuke/mindustry/type/Mech.java @@ -45,10 +45,6 @@ public class Mech extends UnlockableContent{ this(name, false); } - public String localizedName(){ - return Core.bundle.get("mech." + name + ".name"); - } - public void updateAlt(Player player){ } @@ -112,6 +108,6 @@ public class Mech extends UnlockableContent{ @Override public String toString(){ - return localizedName(); + return localizedName; } } diff --git a/core/src/io/anuke/mindustry/type/UnitType.java b/core/src/io/anuke/mindustry/type/UnitType.java index 1c75e27a08..a2a98d6b45 100644 --- a/core/src/io/anuke/mindustry/type/UnitType.java +++ b/core/src/io/anuke/mindustry/type/UnitType.java @@ -63,11 +63,6 @@ public class UnitType extends UnlockableContent{ ContentDisplay.displayUnit(table, this); } - @Override - public String localizedName(){ - return Core.bundle.get("unit." + name + ".name"); - } - @Override public void load(){ weapon.load(); diff --git a/core/src/io/anuke/mindustry/type/Weapon.java b/core/src/io/anuke/mindustry/type/Weapon.java index de70c5f3d3..fd150a55fa 100644 --- a/core/src/io/anuke/mindustry/type/Weapon.java +++ b/core/src/io/anuke/mindustry/type/Weapon.java @@ -113,11 +113,12 @@ public class Weapon{ shooter.velocity().add(Tmp.v1); Tmp.v1.trns(rotation, 3f); + boolean parentize = ammo.keepVelocity; Effects.shake(weapon.shake, weapon.shake, x, y); Effects.effect(weapon.ejectEffect, x, y, rotation * -Mathf.sign(left)); - Effects.effect(ammo.shootEffect, x + Tmp.v1.x, y + Tmp.v1.y, rotation, shooter); - Effects.effect(ammo.smokeEffect, x + Tmp.v1.x, y + Tmp.v1.y, rotation, shooter); + Effects.effect(ammo.shootEffect, x + Tmp.v1.x, y + Tmp.v1.y, rotation, parentize ? shooter : null); + Effects.effect(ammo.smokeEffect, x + Tmp.v1.x, y + Tmp.v1.y, rotation, parentize ? shooter : null); //reset timer for remote players shooter.getTimer().get(shooter.getShootTimer(left), weapon.reload); @@ -172,7 +173,6 @@ public class Weapon{ if(owner == null) return; Tmp.v1.trns(angle, 3f); - Bullet.create(bullet, - owner, owner.getTeam(), x + Tmp.v1.x, y + Tmp.v1.y, angle, (1f - velocityRnd) + Mathf.random(velocityRnd)); + Bullet.create(bullet, owner, owner.getTeam(), x + Tmp.v1.x, y + Tmp.v1.y, angle, (1f - velocityRnd) + Mathf.random(velocityRnd)); } } diff --git a/core/src/io/anuke/mindustry/type/Zone.java b/core/src/io/anuke/mindustry/type/Zone.java index 19e11aa3be..bfec538d67 100644 --- a/core/src/io/anuke/mindustry/type/Zone.java +++ b/core/src/io/anuke/mindustry/type/Zone.java @@ -200,11 +200,6 @@ public class Zone extends UnlockableContent{ public void displayInfo(Table table){ } - @Override - public String localizedName(){ - return Core.bundle.get("zone." + name + ".name"); - } - @Override public ContentType getContentType(){ return ContentType.zone; diff --git a/core/src/io/anuke/mindustry/ui/ContentDisplay.java b/core/src/io/anuke/mindustry/ui/ContentDisplay.java index 8245047e0f..fd44ed99ea 100644 --- a/core/src/io/anuke/mindustry/ui/ContentDisplay.java +++ b/core/src/io/anuke/mindustry/ui/ContentDisplay.java @@ -67,7 +67,7 @@ public class ContentDisplay{ table.table(title -> { title.addImage(item.icon(Cicon.xlarge)).size(8 * 6); - title.add("[accent]" + item.localizedName()).padLeft(5); + title.add("[accent]" + item.localizedName).padLeft(5); }); table.row(); @@ -98,7 +98,7 @@ public class ContentDisplay{ table.table(title -> { title.addImage(liquid.icon(Cicon.xlarge)).size(8 * 6); - title.add("[accent]" + liquid.localizedName()).padLeft(5); + title.add("[accent]" + liquid.localizedName).padLeft(5); }); table.row(); @@ -132,7 +132,7 @@ public class ContentDisplay{ public static void displayMech(Table table, Mech mech){ table.table(title -> { title.addImage(mech.icon(Cicon.xlarge)).size(8 * 6); - title.add("[accent]" + mech.localizedName()).padLeft(5); + title.add("[accent]" + mech.localizedName).padLeft(5); }); table.left().defaults().left(); @@ -180,7 +180,7 @@ public class ContentDisplay{ public static void displayUnit(Table table, UnitType unit){ table.table(title -> { title.addImage(unit.icon(Cicon.xlarge)).size(8 * 6); - title.add("[accent]" + unit.localizedName()).padLeft(5); + title.add("[accent]" + unit.localizedName).padLeft(5); }); table.row(); diff --git a/core/src/io/anuke/mindustry/ui/ItemDisplay.java b/core/src/io/anuke/mindustry/ui/ItemDisplay.java index 1efcd10919..a55a5034c5 100644 --- a/core/src/io/anuke/mindustry/ui/ItemDisplay.java +++ b/core/src/io/anuke/mindustry/ui/ItemDisplay.java @@ -15,7 +15,7 @@ public class ItemDisplay extends Table{ public ItemDisplay(Item item, int amount, boolean showName){ add(new ItemImage(new ItemStack(item, amount))).size(8 * 4).padRight(amount > 99 ? 12 : 0); - if(showName) add(item.localizedName()).padLeft(4 + amount > 99 ? 4 : 0); + if(showName) add(item.localizedName).padLeft(4 + amount > 99 ? 4 : 0); this.item = item; this.amount = amount; diff --git a/core/src/io/anuke/mindustry/ui/ItemsDisplay.java b/core/src/io/anuke/mindustry/ui/ItemsDisplay.java index 5e820ba459..363e272ff8 100644 --- a/core/src/io/anuke/mindustry/ui/ItemsDisplay.java +++ b/core/src/io/anuke/mindustry/ui/ItemsDisplay.java @@ -30,7 +30,7 @@ public class ItemsDisplay extends Table{ if(item.type == ItemType.material && data.isUnlocked(item)){ t.label(() -> format(item)).left(); t.addImage(item.icon(Cicon.small)).size(8 * 3).padLeft(4).padRight(4); - t.add(item.localizedName()).color(Color.lightGray).left(); + t.add(item.localizedName).color(Color.lightGray).left(); t.row(); } } diff --git a/core/src/io/anuke/mindustry/ui/LiquidDisplay.java b/core/src/io/anuke/mindustry/ui/LiquidDisplay.java index 160ab843c7..6fc5f8ba6d 100644 --- a/core/src/io/anuke/mindustry/ui/LiquidDisplay.java +++ b/core/src/io/anuke/mindustry/ui/LiquidDisplay.java @@ -34,6 +34,6 @@ public class LiquidDisplay extends Table{ add(StatUnit.perSecond.localized()).padLeft(2).padRight(5).color(Color.lightGray); } - add(liquid.localizedName()); + add(liquid.localizedName); } } diff --git a/core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java index 4c25761cb4..281682710f 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java @@ -66,7 +66,7 @@ public class DatabaseDialog extends FloatingDialog{ if(unlocked(unlock)){ image.clicked(() -> Vars.ui.content.show(unlock)); - image.addListener(new Tooltip(t -> t.background(Tex.button).add(unlock.localizedName()))); + image.addListener(new Tooltip(t -> t.background(Tex.button).add(unlock.localizedName))); } if((++count) % maxWidth == 0){ diff --git a/core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java index c92097077a..0764a6cea3 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java @@ -148,7 +148,7 @@ public class DeployDialog extends FloatingDialog{ }).color(Color.darkGray).grow())); } - TextButton button = Elements.newButton(Core.bundle.format("resume", slot.getZone().localizedName()), Styles.squaret, () -> { + TextButton button = Elements.newButton(Core.bundle.format("resume", slot.getZone().localizedName), Styles.squaret, () -> { control.saves.getZoneSlot().cautiousLoad(() -> { hide(); ui.loadAnd(() -> { @@ -225,7 +225,7 @@ public class DeployDialog extends FloatingDialog{ }); if(zone.unlocked() && !hidden(zone)){ - button.labelWrap(zone.localizedName()).style(Styles.outlineLabel).width(140).growX().get().setAlignment(Align.center); + button.labelWrap(zone.localizedName).style(Styles.outlineLabel).width(140).growX().get().setAlignment(Align.center); }else{ Consumer flasher = zone.canUnlock() && !hidden(zone) ? e -> e.update(() -> e.getColor().set(Color.white).lerp(Pal.accent, Mathf.absin(3f, 1f))) : e -> {}; flasher.accept(button.addImage(Icon.locked).get()); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java index b34b4935eb..b9536459d3 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java @@ -319,7 +319,7 @@ public class TechTreeDialog extends FloatingDialog{ t.table(list -> { list.left(); list.addImage(req.item.icon(Cicon.small)).size(8 * 3).padRight(3); - list.add(req.item.localizedName()).color(Color.lightGray); + list.add(req.item.localizedName).color(Color.lightGray); list.label(() -> " " + Math.min(data.getItem(req.item), req.amount) + " / " + req.amount) .update(l -> l.setColor(data.has(req.item, req.amount) ? Color.lightGray : Color.scarlet)); }).fillX().left(); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/ZoneInfoDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/ZoneInfoDialog.java index 9e0441a412..077fc36e51 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/ZoneInfoDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/ZoneInfoDialog.java @@ -95,7 +95,7 @@ public class ZoneInfoDialog extends FloatingDialog{ }).growX(); }else{ - cont.add(zone.localizedName()).color(Pal.accent).growX().center(); + cont.add(zone.localizedName).color(Pal.accent).growX().center(); cont.row(); cont.addImage().color(Pal.accent).height(3).pad(6).growX(); cont.row(); diff --git a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java index 7250099b78..1b34c5c7fb 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java @@ -254,7 +254,7 @@ public class HudFragment extends Fragment{ t.add(new Minimap().visible(() -> Core.settings.getBool("minimap") && !state.rules.tutorial)); t.row(); //position - t.label(() -> world.toTile(player.x) + "," + world.toTile(player.y)) + t.label(() -> world.toTile(player.x) + "," + world.toTile(player.y)).style(Styles.outlineLabel) .visible(() -> Core.settings.getBool("position") && !state.rules.tutorial); t.top().right(); }); diff --git a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java index ac6cfe8edf..a52a252bc8 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java @@ -220,7 +220,7 @@ public class PlacementFragment extends Fragment{ req.table(line -> { line.left(); line.addImage(stack.item.icon(Cicon.small)).size(8 * 2); - line.add(stack.item.localizedName()).color(Color.lightGray).padLeft(2).left(); + line.add(stack.item.localizedName).color(Color.lightGray).padLeft(2).left(); line.labelWrap(() -> { TileEntity core = player.getClosestCore(); if(core == null || state.rules.infiniteResources) return "*/*"; diff --git a/core/src/io/anuke/mindustry/world/Block.java b/core/src/io/anuke/mindustry/world/Block.java index 83b367e10d..da5b3d4bc0 100644 --- a/core/src/io/anuke/mindustry/world/Block.java +++ b/core/src/io/anuke/mindustry/world/Block.java @@ -360,11 +360,6 @@ public class Block extends BlockStorage{ return sum; } - @Override - public String localizedName(){ - return localizedName; - } - @Override public void displayInfo(Table table){ ContentDisplay.displayBlock(table, this); @@ -517,7 +512,7 @@ public class Block extends BlockStorage{ }else{ current = entity -> entity.liquids.current(); } - bars.add("liquid", entity -> new Bar(() -> entity.liquids.get(current.get(entity)) <= 0.001f ? Core.bundle.get("bar.liquid") : current.get(entity).localizedName(), + bars.add("liquid", entity -> new Bar(() -> entity.liquids.get(current.get(entity)) <= 0.001f ? Core.bundle.get("bar.liquid") : current.get(entity).localizedName, () -> current.get(entity).color, () -> entity.liquids.get(current.get(entity)) / liquidCapacity)); } diff --git a/core/src/io/anuke/mindustry/world/blocks/OreBlock.java b/core/src/io/anuke/mindustry/world/blocks/OreBlock.java index cf4d45524c..8bc1142601 100644 --- a/core/src/io/anuke/mindustry/world/blocks/OreBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/OreBlock.java @@ -14,7 +14,7 @@ public class OreBlock extends OverlayFloor{ public OreBlock(Item ore){ super("ore-" + ore.name); - this.localizedName = ore.localizedName(); + this.localizedName = ore.localizedName; this.itemDrop = ore; this.variants = 3; this.color.set(ore.color); @@ -27,7 +27,7 @@ public class OreBlock extends OverlayFloor{ } public void setup(Item ore){ - this.localizedName = ore.localizedName(); + this.localizedName = ore.localizedName; this.itemDrop = ore; this.color.set(ore.color); } @@ -78,6 +78,6 @@ public class OreBlock extends OverlayFloor{ @Override public String getDisplayName(Tile tile){ - return itemDrop.localizedName(); + return itemDrop.localizedName; } } diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Drill.java b/core/src/io/anuke/mindustry/world/blocks/production/Drill.java index 5cf1aca2d0..41d024bd86 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Drill.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/Drill.java @@ -186,7 +186,7 @@ public class Drill extends Block{ Item item = list.get(i); table.addImage(Core.atlas.find(item.name + "1")).size(8 * 3).padRight(2).padLeft(2).padTop(3).padBottom(3); - table.add(item.localizedName()); + table.add(item.localizedName); if(i != list.size - 1){ table.add("/").padLeft(5).padRight(5); } diff --git a/core/src/io/anuke/mindustry/world/meta/values/AmmoListValue.java b/core/src/io/anuke/mindustry/world/meta/values/AmmoListValue.java index 71e4643866..eb613ed766 100644 --- a/core/src/io/anuke/mindustry/world/meta/values/AmmoListValue.java +++ b/core/src/io/anuke/mindustry/world/meta/values/AmmoListValue.java @@ -28,7 +28,7 @@ public class AmmoListValue implements StatValue{ for(T t : map.keys()){ BulletType type = map.get(t); table.addImage(icon(t)).size(3 * 8).padRight(4).right().top(); - table.add(t.localizedName()).padRight(10).left().top(); + table.add(t.localizedName).padRight(10).left().top(); table.table(Tex.underline, bt -> { bt.left().defaults().padRight(3).left();