diff options
| author | Robert Sosnitzka <robert.sosnitzka@gmail.com> | 2017-01-14 00:54:57 +0100 |
|---|---|---|
| committer | Robert Sosnitzka <robert.sosnitzka@gmail.com> | 2017-01-14 00:54:57 +0100 |
| commit | 450b8b089976b968a69655a194fbbcd541adcde6 (patch) | |
| tree | c452b2ba1395dfcaeb42876e1d59576b9860677c /src/main/java/com/sosnitzka/taiga/MaterialTraits.java | |
| parent | 81450023261c4a81fd36db719101b1abc474f8d4 (diff) | |
Added Trait Crushing, changed old assignment, fixed two variables to prevent annoyance
Diffstat (limited to 'src/main/java/com/sosnitzka/taiga/MaterialTraits.java')
| -rw-r--r-- | src/main/java/com/sosnitzka/taiga/MaterialTraits.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/main/java/com/sosnitzka/taiga/MaterialTraits.java b/src/main/java/com/sosnitzka/taiga/MaterialTraits.java index d98d950..7ffb0d4 100644 --- a/src/main/java/com/sosnitzka/taiga/MaterialTraits.java +++ b/src/main/java/com/sosnitzka/taiga/MaterialTraits.java @@ -58,6 +58,7 @@ public class MaterialTraits { public static final AbstractTrait leveled1 = new TraitLeveled(1); public static final AbstractTrait leveled2 = new TraitLeveled(2); public static final AbstractTrait leveled3 = new TraitLeveled(3); + public static final AbstractTrait crushing = new TraitCrushing(); /** @@ -86,11 +87,8 @@ public class MaterialTraits { public static Material tritonite = new Material("tritonite", TextFormatting.GOLD).addTrait(whirl); public static Material ignitz = new Material("ignitz", TextFormatting.RED).addTrait(melting).addTrait(garishly, MaterialTypes.HANDLE); public static Material imperomite = new Material("imperomite", TextFormatting.DARK_RED).addTrait(hollow); - public static Material solarium = new Material("solarium", TextFormatting.YELLOW).addTrait(pulverizing).addTrait(superheavy); + public static Material solarium = new Material("solarium", TextFormatting.YELLOW).addTrait(superheavy).addTrait(crushing); public static Material nihilite = new Material("nihilite", TextFormatting.DARK_GRAY).addTrait(souleater); - /** - * With Dev - **/ public static Material adamant = new Material("adamant", TextFormatting.GOLD).addTrait(beserk).addTrait(leveled1, MaterialTypes.EXTRA).addTrait(leveled2, MaterialTypes.HANDLE).addTrait(leveled3, MaterialTypes.HEAD); //.addTrait(dev); public static Material dyonite = new Material("dyonite", TextFormatting.GREEN).addTrait(tantrum); public static Material nucleum = new Material("nucleum", TextFormatting.YELLOW).addTrait(decay); @@ -99,7 +97,7 @@ public class MaterialTraits { public static Material astrium = new Material("astrium", TextFormatting.DARK_PURPLE).addTrait(ported); public static Material niob = new Material("niob", TextFormatting.RED).addTrait(reviving); public static Material yrdeen = new Material("yrdeen", TextFormatting.RED).addTrait(naturebound); - public static Material meteorite = new Material("meteorite", TextFormatting.DARK_GREEN).addTrait(crumbling, MaterialTypes.HEAD).addTrait(cheap); + public static Material meteorite = new Material("meteorite", TextFormatting.DARK_GREEN).addTrait(crumbling, MaterialTypes.HEAD).addTrait(pulverizing); public static Material obsidiorite = new Material("obsidiorite", obsidioriteFluid.getColor()).addTrait(alien); public static Material osram = new Material("osram", TextFormatting.GOLD); |