v0.3.4: reworked some aspects of plant & seed naming

This commit is contained in:
Evan Debenham
2016-01-09 05:40:06 -05:00
committed by Evan Debenham
parent 2d1023966b
commit f9b270447f
15 changed files with 28 additions and 36 deletions
@@ -39,10 +39,9 @@ public class BlandfruitBush extends Plant {
public static class Seed extends Plant.Seed {
{
setPlant( BlandfruitBush.class );
image = ItemSpriteSheet.SEED_BLANDFRUIT;
plantClass = BlandfruitBush.class;
alchemyClass = null;
}
@@ -60,10 +60,9 @@ public class Blindweed extends Plant {
public static class Seed extends Plant.Seed {
{
setPlant(Blindweed.class);
image = ItemSpriteSheet.SEED_BLINDWEED;
plantClass = Blindweed.class;
alchemyClass = PotionOfInvisibility.class;
}
}
@@ -66,10 +66,9 @@ public class Dreamfoil extends Plant {
public static class Seed extends Plant.Seed {
{
setPlant(Dreamfoil.class);
image = ItemSpriteSheet.SEED_DREAMFOIL;
plantClass = Dreamfoil.class;
alchemyClass = PotionOfPurity.class;
}
}
@@ -56,10 +56,9 @@ public class Earthroot extends Plant {
public static class Seed extends Plant.Seed {
{
setPlant( Earthroot.class );
image = ItemSpriteSheet.SEED_EARTHROOT;
plantClass = Earthroot.class;
alchemyClass = PotionOfParalyticGas.class;
bones = true;
@@ -74,10 +74,9 @@ public class Fadeleaf extends Plant {
public static class Seed extends Plant.Seed {
{
setPlant( Fadeleaf.class );
image = ItemSpriteSheet.SEED_FADELEAF;
plantClass = Fadeleaf.class;
alchemyClass = PotionOfMindVision.class;
}
}
@@ -47,10 +47,9 @@ public class Firebloom extends Plant {
public static class Seed extends Plant.Seed {
{
setPlant( Firebloom.class );
image = ItemSpriteSheet.SEED_FIREBLOOM;
plantClass = Firebloom.class;
alchemyClass = PotionOfLiquidFlame.class;
}
}
@@ -51,10 +51,9 @@ public class Icecap extends Plant {
public static class Seed extends Plant.Seed {
{
setPlant( Icecap.class );
image = ItemSpriteSheet.SEED_ICECAP;
plantClass = Icecap.class;
alchemyClass = PotionOfFrost.class;
}
}
@@ -128,15 +128,8 @@ public abstract class Plant implements Bundlable {
}
protected Class<? extends Plant> plantClass;
protected String plantName;
public Class<? extends Item> alchemyClass;
protected void setPlant(Class<? extends Plant> plantClass){
this.plantClass = plantClass;
plantName = Messages.get(plantClass, "name");
name = Messages.get(Seed.class, "seed_of", plantName);
}
@Override
public ArrayList<String> actions( Hero hero ) {
@@ -206,7 +199,7 @@ public abstract class Plant implements Bundlable {
@Override
public String info() {
return Messages.get( Seed.class, "info", Utils.indefinite( plantName ), desc() );
return Messages.get( Seed.class, "info", desc() );
}
}
}
@@ -37,10 +37,9 @@ public class Rotberry extends Plant {
public static class Seed extends Plant.Seed {
{
setPlant( Rotberry.class );
image = ItemSpriteSheet.SEED_ROTBERRY;
plantClass = Rotberry.class;
alchemyClass = PotionOfStrength.class;
}
}
@@ -51,10 +51,9 @@ public class Sorrowmoss extends Plant {
public static class Seed extends Plant.Seed {
{
setPlant( Sorrowmoss.class );
image = ItemSpriteSheet.SEED_SORROWMOSS;
plantClass = Sorrowmoss.class;
alchemyClass = PotionOfToxicGas.class;
}
}
@@ -49,10 +49,9 @@ public class Starflower extends Plant {
public static class Seed extends Plant.Seed{
{
setPlant( Starflower.class );
image = ItemSpriteSheet.SEED_STARFLOWER;
plantClass = Starflower.class;
alchemyClass = PotionOfExperience.class;
}
}
@@ -44,10 +44,9 @@ public class Stormvine extends Plant {
public static class Seed extends Plant.Seed {
{
setPlant( Stormvine.class );
image = ItemSpriteSheet.SEED_STORMVINE;
plantClass = Stormvine.class;
alchemyClass = PotionOfLevitation.class;
}
}
@@ -55,10 +55,9 @@ public class Sungrass extends Plant {
public static class Seed extends Plant.Seed {
{
setPlant( Sungrass.class );
image = ItemSpriteSheet.SEED_SUNGRASS;
plantClass = Sungrass.class;
alchemyClass = PotionOfHealing.class;
bones = true;