New Simple Items for Civilizations #104

ToroCraft · Feb 3, 2017 · 4cc570f · 4cc570f
1 parent dc855f4
commit 4cc570f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/java/net/torocraft/toroquest/entities/trades/ShopkeeperTradesForFire.java b/java/net/torocraft/toroquest/entities/trades/ShopkeeperTradesForFire.java
@@ -9,6 +9,7 @@
 import net.minecraft.village.MerchantRecipeList;
 import net.torocraft.toroquest.civilization.ReputationLevel;
 import net.torocraft.toroquest.item.ItemFireSword;
+import net.torocraft.toroquest.item.ItemSpicyChicken;
 
 public class ShopkeeperTradesForFire {
 	public static MerchantRecipeList trades(EntityPlayer player, ReputationLevel rep) {
@@ -32,7 +33,7 @@ public static MerchantRecipeList trades(EntityPlayer player, ReputationLevel rep
 		}
 
 		if (rep.equals(ReputationLevel.FRIEND) || rep.equals(ReputationLevel.ALLY) || rep.equals(ReputationLevel.HERO)) {
-
+			recipeList.add(new MerchantRecipe(new ItemStack(Items.EMERALD, rep.adjustPrice(4)), new ItemStack(Items.CHICKEN, 1), new ItemStack(ItemSpicyChicken.INSTANCE)));
 		}
 
 		if (rep.equals(ReputationLevel.ALLY) || rep.equals(ReputationLevel.HERO)) {

diff --git a/java/net/torocraft/toroquest/entities/trades/ShopkeeperTradesForMoon.java b/java/net/torocraft/toroquest/entities/trades/ShopkeeperTradesForMoon.java
@@ -9,6 +9,8 @@
 import net.minecraft.village.MerchantRecipeList;
 import net.torocraft.toroquest.civilization.ReputationLevel;
 import net.torocraft.toroquest.item.ItemObsidianSword;
+import net.torocraft.toroquest.item.ItemPickaxeOfGreed;
+import net.torocraft.toroquest.item.ItemSwordOfPain;
 
 public class ShopkeeperTradesForMoon {
 	public static MerchantRecipeList trades(EntityPlayer player, ReputationLevel rep) {
@@ -28,7 +30,8 @@ public static MerchantRecipeList trades(EntityPlayer player, ReputationLevel rep
 		}
 
 		if (rep.equals(ReputationLevel.FRIEND) || rep.equals(ReputationLevel.ALLY) || rep.equals(ReputationLevel.HERO)) {
-
+			recipeList.add(new MerchantRecipe(new ItemStack(Items.EMERALD, rep.adjustPrice(5)), new ItemStack(Items.QUARTZ, 20), new ItemStack(ItemPickaxeOfGreed.INSTANCE)));
+			recipeList.add(new MerchantRecipe(new ItemStack(Items.EMERALD, rep.adjustPrice(5)), new ItemStack(Items.QUARTZ, 20), new ItemStack(ItemSwordOfPain.INSTANCE)));
 		}
 
 		if (rep.equals(ReputationLevel.ALLY) || rep.equals(ReputationLevel.HERO)) {