From acfc78187ff3758dfc7d3c781e02ac922942cb65 Mon Sep 17 00:00:00 2001 From: Arcaratus Date: Tue, 28 Jul 2015 13:03:47 -0400 Subject: [PATCH] Added in the Demon Spawn achievement --- .../common/AlchemicalWizardryEventHooks.java | 6 ++++++ .../common/achievements/AchievementsRegistry.java | 1 + .../common/achievements/ModAchievements.java | 5 ++++- .../resources/assets/alchemicalwizardry/lang/en_US.lang | 4 ++++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/AlchemicalWizardryEventHooks.java b/src/main/java/WayofTime/alchemicalWizardry/common/AlchemicalWizardryEventHooks.java index 92f5e8b1..10b04848 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/AlchemicalWizardryEventHooks.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/AlchemicalWizardryEventHooks.java @@ -812,6 +812,12 @@ public class AlchemicalWizardryEventHooks { EntityLivingBase entityLiving = event.entityLiving; + if (entityLiving instanceof IDemon && event.source.getEntity() instanceof EntityPlayer) + { + EntityPlayer player = (EntityPlayer) event.source.getEntity(); + + player.addStat(ModAchievements.demonSpawn, 1); + } if (entityLiving instanceof IHoardDemon && event.source.getEntity() instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.source.getEntity(); diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/achievements/AchievementsRegistry.java b/src/main/java/WayofTime/alchemicalWizardry/common/achievements/AchievementsRegistry.java index 14222ba8..02e15ac6 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/achievements/AchievementsRegistry.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/achievements/AchievementsRegistry.java @@ -36,6 +36,7 @@ public class AchievementsRegistry craftinglist.add(ModItems.itemRitualDiviner); craftinglist.add(ModItems.sigilOfTheBridge); craftinglist.add(ModItems.itemSigilOfSupression); + craftinglist.add(ModItems.energyBazooka); } public static void addBlocksToCraftingList() diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/achievements/ModAchievements.java b/src/main/java/WayofTime/alchemicalWizardry/common/achievements/ModAchievements.java index e3fd4118..da29820f 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/achievements/ModAchievements.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/achievements/ModAchievements.java @@ -1,6 +1,7 @@ package WayofTime.alchemicalWizardry.common.achievements; import WayofTime.alchemicalWizardry.ModBlocks; +import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; import net.minecraftforge.common.AchievementPage; import WayofTime.alchemicalWizardry.ModItems; @@ -26,6 +27,7 @@ public class ModAchievements public static Achievement complexSpells; public static Achievement ritualDiviner; public static Achievement masterOrb; + public static Achievement demonSpawn; public static Achievement phantomBridgeSigil; public static Achievement teleposer; public static Achievement suppressionSigil; @@ -52,12 +54,13 @@ public class ModAchievements complexSpells = new AchievementsMod("complexSpells", 1, -4, ModItems.itemComplexSpellCrystal, magicianOrb); ritualDiviner = new AchievementsMod("ritualDiviner", 1, -3, ModItems.itemRitualDiviner, magicianOrb); masterOrb = new AchievementsMod("masterOrb", -2, -1, ModItems.masterBloodOrb, boundBlade); + demonSpawn = new AchievementsMod("demonSpawn", -3, -2, ModItems.demonPlacer, masterOrb); phantomBridgeSigil = new AchievementsMod("phantomBridgeSigil", 6, -1, ModItems.sigilOfTheBridge, masterOrb); teleposer = new AchievementsMod("teleposer", -4, -1, ModBlocks.blockTeleposer, masterOrb); suppressionSigil = new AchievementsMod("suppressionSigil", 6, -2, ModItems.itemSigilOfSupression, masterOrb); archmageOrb = new AchievementsMod("archmageOrb", -1, 2, ModItems.archmageBloodOrb, masterOrb); energyBazooka = new AchievementsMod("energyBazooka", -3, 2, ModItems.energyBazooka, archmageOrb); - demons = new AchievementsMod("demons", 0, 3, ModItems.demonPlacer, archmageOrb).setSpecial(); + demons = new AchievementsMod("demons", 0, 3, new ItemStack(ModItems.baseItems, 1, 29), archmageOrb).setSpecial(); transcendentOrb = new AchievementsMod("trancsendentOrb", 0, 5, ModItems.transcendentBloodOrb, demons); alchemicalWizardryPage = new AchievementPage("Blood Magic", AchievementsMod.achievements.toArray(new Achievement[AchievementsMod.achievements.size()])); diff --git a/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang b/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang index 6df25837..38a41541 100644 --- a/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang +++ b/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang @@ -499,6 +499,8 @@ achievement.alchemicalwizardry:ritualDiviner=Ritual Making achievement.alchemicalwizardry:ritualDiviner.desc=Craft a Ritual Diviner achievement.alchemicalwizardry:masterOrb=Getting Very Strong achievement.alchemicalwizardry:masterOrb.desc=Pickup a Master Orb +achievement.alchemicalwizardry:demonSpawn=Demon Spawn +achievement.alchemicalwizardry:demonSpawn.desc=Summon and slay a demon/elemental achievement.alchemicalwizardry:phantomBridgeSigil=Walking In Mid-Air achievement.alchemicalwizardry:phantomBridgeSigil.desc=Make the Sigil of the Phantom Bridge achievement.alchemicalwizardry:teleposer=Teleposed! @@ -507,6 +509,8 @@ achievement.alchemicalwizardry:suppressionSigil=Suppress! achievement.alchemicalwizardry:suppressionSigil.desc=Create a Suppression Sigil achievement.alchemicalwizardry:archmageOrb=Too Strong achievement.alchemicalwizardry:archmageOrb.desc=Pickup an Archmage Orb +achievement.alchemicalwizardry:energyBazooka=BOOM!!! +achievement.alchemicalwizardry:energyBazooka.desc=Create the all powerful, Energy Bazooka!! achievement.alchemicalwizardry:demons=Demon Hunter achievement.alchemicalwizardry:demons.desc=Kill a Demon achievement.alchemicalwizardry:trancsendentOrb=OVERPOWERED