From c983fc15c2f42fc15e234664077220198a39914c Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Mon, 28 Sep 2015 23:20:19 +0100 Subject: [PATCH] Some gaia guardian health and damage cap changes. --- .../common/entity/EntityDoppleganger.java | 16 ++++++++++++---- .../resources/assets/botania/lang/en_US.lang | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index f523abd99..1570aa539 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -80,7 +80,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi public static final int SPAWN_TICKS = 100; private static final float RANGE = 12F; - private static final float MAX_HP = 300F; + private static final float MAX_HP = 800F; public static final int MOB_SPAWN_START_TICKS = 20; public static final int MOB_SPAWN_END_TICKS = 80; @@ -159,7 +159,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi return false; } } - + if(!hasProperArena(par3World, par4, par5, par6)) { player.addChatMessage(new ChatComponentTranslation("botaniamisc.badArena").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED))); return false; @@ -190,7 +190,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi return false; } - + private static boolean hasProperArena(World world, int sx, int sy, int sz) { int range = (int) Math.ceil(RANGE); for(int i = -range; i < range + 1; i++) @@ -326,7 +326,15 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi if(!playersWhoAttacked.contains(player.getCommandSenderName())) playersWhoAttacked.add(player.getCommandSenderName()); - return super.attackEntityFrom(par1DamageSource, Math.min(12, par2 * (isHardMode() ? 0.6F : 1F))); + float dmg = par2; + boolean crit = false; + if(e instanceof EntityPlayer) { + EntityPlayer p = (EntityPlayer) e; + crit = p.fallDistance > 0.0F && !p.onGround && !p.isOnLadder() && !p.isInWater() && !p.isPotionActive(Potion.blindness) && p.ridingEntity == null; + } + + int cap = crit ? 50 : 35; + return super.attackEntityFrom(par1DamageSource, Math.min(cap, dmg) * (isHardMode() ? 0.6F : 1F)); } return false; } diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 495299c4f..42fffa2d8 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -3275,7 +3275,7 @@ botania.page.gaiaRitual0=The &4Ritual of Gaia&0 is a procedure often enacted by botania.page.gaiaRitual1=Creating &1Gaia Pylons&0 botania.page.gaiaRitual2=Ritual of Gaia botania.page.gaiaRitual3=To start the ritual, simply shift-right click the &1Beacon&0 block with a &1Terrasteel Ingot&0, take a step back and prepare to fight for your life. Good preparation is required, as the fight with the &4Guardian of Gaia&0 can be even harder than that of the &4Wither&0. Upon defeating the &4Guardian&0, one can collect their prize, a handful of &1Spirits of Gaia&0. -botania.page.gaiaRitual4=The common attire for this ritual is a set of Enchanted &1Elementium Armor&0, a &1Terra Blade&0 and a large assortment of &4Brews&0 and &4Baubles&0. The effect of the &1Beacon&0 is nullified during the battle, so that should be taken in mind. +botania.page.gaiaRitual4=The common attire for this ritual is a set of Enchanted &1Elementium Armor&0, a &1Terra Blade&0 and a large assortment of &4Brews&0 and &4Baubles&0. The effect of the &1Beacon&0 is nullified during the battle, so that should be taken in mind.
The &1Guardian&0 has a massive health pool, so preparation in the form of &4Enchantments&0 and &4Brews&0 is a must! botania.page.gaiaRitual5=The difficulty and rewards bestowed by the ritual depend on the amount of people participating. Executing the ritual with over five people might be a recipe for disaster due to the chaos created, so collaborative rituals of that scale shouldn't be attempted.
Lastly, staying away from the purple might be a good idea. # -- RITUAL OF GAIA II