MagicBane
/
Server
92
0
Fork 2
Code Issues 12 Pull Requests Projects Releases Wiki Activity
Browse Source

mines named correctly

lakebane-master
FatBoy-DOTC 5 months ago
parent
66804d5704
commit
7716d82adb
2 changed files with 2 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/engine/objects/Mine.java
  2. 27
      src/engine/objects/MineProduction.java

2
src/engine/objects/Mine.java
Unescape View File

@ -90,7 +90,7 @@ public class Mine extends AbstractGameObject {
for (Zone zone : ZoneManager.getAllZonesIn(tower.loc)) { for (Zone zone : ZoneManager.getAllZonesIn(tower.loc)) {
if (zone.isMacroZone()) { if (zone.isMacroZone()) {
this.parentZone = zone; this.parentZone = zone;
this.zoneName = this.parentZone.getParent().getName(); this.zoneName = this.parentZone.getName();
} }
} }

27
src/engine/objects/MineProduction.java
Unescape View File

@ -16,8 +16,7 @@ public enum MineProduction {
LUMBER("Lumber Mine", new HashMap<>(), Resource.WORMWOOD, 1618637196, 1663491950), LUMBER("Lumber Mine", new HashMap<>(), Resource.WORMWOOD, 1618637196, 1663491950),
ORE("Ore Mine", new HashMap<>(), Resource.OBSIDIAN, 518103023, -788976428), ORE("Ore Mine", new HashMap<>(), Resource.OBSIDIAN, 518103023, -788976428),
GOLD("Gold Mine", new HashMap<>(), Resource.GALVOR, -662193002, -1227205358), GOLD("Gold Mine", new HashMap<>(), Resource.GALVOR, -662193002, -1227205358),
MAGIC("Magic Mine", new HashMap<>(), Resource.BLOODSTONE, 504746863, -1753567069), MAGIC("Magic Mine", new HashMap<>(), Resource.BLOODSTONE, 504746863, -1753567069);
ALL("Universal Mine",new HashMap<>(),null,504746864,504746865);
public final String name; public final String name;
public final HashMap<Integer, Resource> resources; public final HashMap<Integer, Resource> resources;
@ -66,30 +65,6 @@ public enum MineProduction {
MineProduction.MAGIC.resources.put(1580015, Resource.SULFUR); MineProduction.MAGIC.resources.put(1580015, Resource.SULFUR);
MineProduction.MAGIC.resources.put(1580016, Resource.QUICKSILVER); MineProduction.MAGIC.resources.put(1580016, Resource.QUICKSILVER);
} }
if (MineProduction.ALL.resources.size() == 0) {
MineProduction.ALL.resources.put(7, Resource.GOLD);
MineProduction.ALL.resources.put(1580004, Resource.LUMBER);
MineProduction.ALL.resources.put(1580005, Resource.OAK);
MineProduction.ALL.resources.put(1580006, Resource.BRONZEWOOD);
MineProduction.ALL.resources.put(1580007, Resource.MANDRAKE);
MineProduction.ALL.resources.put(1580012, Resource.AZOTH);
MineProduction.ALL.resources.put(1580013, Resource.ORICHALK);
MineProduction.ALL.resources.put(1580014, Resource.ANTIMONY);
MineProduction.ALL.resources.put(1580015, Resource.SULFUR);
MineProduction.ALL.resources.put(1580016, Resource.QUICKSILVER);
MineProduction.ALL.resources.put(1580000, Resource.STONE);
MineProduction.ALL.resources.put(1580008, Resource.COAL);
MineProduction.ALL.resources.put(1580009, Resource.AGATE);
MineProduction.ALL.resources.put(1580010, Resource.DIAMOND);
MineProduction.ALL.resources.put(1580011, Resource.ONYX);
MineProduction.ALL.resources.put(1580001, Resource.TRUESTEEL);
MineProduction.ALL.resources.put(1580002, Resource.IRON);
MineProduction.ALL.resources.put(1580003, Resource.ADAMANT);
MineProduction.ALL.resources.put(1580018, Resource.WORMWOOD);
MineProduction.ALL.resources.put(1580020, Resource.BLOODSTONE);
MineProduction.ALL.resources.put(1580019, Resource.OBSIDIAN);
MineProduction.ALL.resources.put(1580017, Resource.GALVOR);
}
} }
public static MineProduction getByName(String name) { public static MineProduction getByName(String name) {

Write Preview
Loading…
Cancel
Save