diff --git a/src/main/java/com/hbm/config/MobConfig.java b/src/main/java/com/hbm/config/MobConfig.java index 81724a61b..59f6c9e3f 100644 --- a/src/main/java/com/hbm/config/MobConfig.java +++ b/src/main/java/com/hbm/config/MobConfig.java @@ -151,7 +151,6 @@ public class MobConfig { config.addCustomCategoryComment(CATEGORY,rampantDesc); - //TODO: Disable this before release rampantMode = CommonConfig.createConfigBool(config, CATEGORY, "12.R01_rampantMode", "The main rampant mode toggle, enables all other features associated with it", false); config.addCustomCategoryComment(CATEGORY, "The individual features of rampant can be used regardless of whether the main rampant toggle is enabled or not"); diff --git a/src/main/java/com/hbm/entity/effect/EntityMist.java b/src/main/java/com/hbm/entity/effect/EntityMist.java index 8537520b2..713ebf06e 100644 --- a/src/main/java/com/hbm/entity/effect/EntityMist.java +++ b/src/main/java/com/hbm/entity/effect/EntityMist.java @@ -206,18 +206,16 @@ public class EntityMist extends Entity { FT_Pheromone pheromone = type.getTrait(FT_Pheromone.class); if(living != null) { - living.addPotionEffect(new PotionEffect(Potion.moveSpeed.id, 60 * 20, 1)); - living.addPotionEffect(new PotionEffect(Potion.digSpeed.id, 2 * 60 * 20, 1)); - living.addPotionEffect(new PotionEffect(Potion.regeneration.id, 2 * 20, 0)); + if ((living instanceof EntityGlyphid && pheromone.getType() == 1) || (living instanceof EntityPlayer && pheromone.getType() == 2)) { + int mult = pheromone.getType(); - if (living instanceof EntityGlyphid && pheromone.getType() == 1) { - living.addPotionEffect(new PotionEffect(Potion.resistance.id, 60 * 20, 0)); - living.addPotionEffect(new PotionEffect(Potion.damageBoost.id, 60 * 20, 1)); - living.addPotionEffect(new PotionEffect(Potion.fireResistance.id, 60 * 20, 0)); + living.addPotionEffect(new PotionEffect(Potion.moveSpeed.id, mult * 60 * 20, 1)); + living.addPotionEffect(new PotionEffect(Potion.digSpeed.id, mult * 60 * 20, 1)); + living.addPotionEffect(new PotionEffect(Potion.regeneration.id, mult * 2 * 20, 0)); + living.addPotionEffect(new PotionEffect(Potion.resistance.id, mult * 60 * 20, 0)); + living.addPotionEffect(new PotionEffect(Potion.damageBoost.id, mult * 60 * 20, 1)); + living.addPotionEffect(new PotionEffect(Potion.fireResistance.id, mult * 60 * 20, 0)); - } else if (living instanceof EntityPlayer && pheromone.getType() == 2) { - living.addPotionEffect(new PotionEffect(Potion.resistance.id, 2 * 60 * 20, 0)); - living.addPotionEffect(new PotionEffect(Potion.damageBoost.id, 2 * 60 * 20, 1)); } } } diff --git a/src/main/java/com/hbm/handler/guncfg/Gun12GaugeFactory.java b/src/main/java/com/hbm/handler/guncfg/Gun12GaugeFactory.java index 424deacfc..0a31c1634 100644 --- a/src/main/java/com/hbm/handler/guncfg/Gun12GaugeFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/Gun12GaugeFactory.java @@ -107,7 +107,7 @@ public class Gun12GaugeFactory { config.comment.add("\"Here, I have a more suitable gun for you. You'll need it - Catch!\""); config.comment.add("Alt-fire with Mouse 2 (Right-click) to fire 2 shells at once"); - config.config = HbmCollection.g12; + config.config = HbmCollection.g12hs; config.animations.put(AnimType.CYCLE, new BusAnimation() .addBus("SPAS_RECOIL_TRANSLATE", new BusAnimationSequence()