diff --git a/changelog.md b/changelog.md index a27c086c63..d60e6d840a 100644 --- a/changelog.md +++ b/changelog.md @@ -8,6 +8,7 @@ - re-added InvTweaks compat to the Wooden Crates - re-added Railgun and Chemthrower documentation to the manual - buffed the default damage of the Railgun +- changed silver bullets to do extra damage to undead (Witchery isn't updated, so they'd be useless otherwise) - fixed Multiblocks looking derpy when formed (thanks Malte) - fixed connection offsets on transformers (thanks Malte) - improved connections on transformers (thanks Malte) diff --git a/src/main/java/blusunrize/immersiveengineering/common/entities/EntityRevolvershot.java b/src/main/java/blusunrize/immersiveengineering/common/entities/EntityRevolvershot.java index cb8abdf8b9..e556777a0b 100644 --- a/src/main/java/blusunrize/immersiveengineering/common/entities/EntityRevolvershot.java +++ b/src/main/java/blusunrize/immersiveengineering/common/entities/EntityRevolvershot.java @@ -271,7 +271,11 @@ else if(bulletType==5) else if(bulletType==6) damageSrc = IEDamageSources.causeWolfpackDamage(this, shootingEntity); else if(bulletType==7) + { damageSrc = IEDamageSources.causeSilverDamage(this, shootingEntity); + if(mop.entityHit instanceof EntityLivingBase && ((EntityLivingBase)mop.entityHit).isEntityUndead()) + damage *= 1.75; + } else if(bulletType==8) damageSrc = IEDamageSources.causePotionDamage(this, shootingEntity); diff --git a/src/main/resources/assets/immersiveengineering/lang/en_US.lang b/src/main/resources/assets/immersiveengineering/lang/en_US.lang index 59b0ecf545..04c7ade36d 100644 --- a/src/main/resources/assets/immersiveengineering/lang/en_US.lang +++ b/src/main/resources/assets/immersiveengineering/lang/en_US.lang @@ -982,7 +982,7 @@ ie.manual.entry.bullets2=§lCasull §lCartridges§r are created with a "Common P ie.manual.entry.bullets3=§lArmor-Piercing §lCartridges§r are created with the same blueprint. They do the same amount of damage but penetrate armor by sheer kinetic force. ie.manual.entry.bullets4=§lBuckshot §lCartridges§r, created with the aformentioned blueprint, are filled with multiple small projectiles that are fired out in a cone shape. This cartridge is highly effective at short range. ie.manual.entry.bullets5=§lHigh-Explosive §lCartridges§r are created with a "Common Projectiles" blueprint. They fire a projectile that explodes on impact, causing damage to living creatures and terrain. -ie.manual.entry.bullets6=§lSilver §lCartridges§r consist of a lead core wrapped in silver, making them highly effective against...werewolves?! +ie.manual.entry.bullets6=§lSilver §lCartridges§r consist of a lead core wrapped in silver, making them highly effective against undead. ie.manual.entry.bullets7=§lDragon's §lBreath Cartridges§r are created with a "Specialized Projectiles" blueprint. Similarly to Buckshot, they are effective at short range, but instead of small metal shots are filled with a flammable metal dust, creating a blast of flame. ie.manual.entry.bullets8=§lPhial §lCartridges§r are also created with the "Specialized" blueprint. They can be filled with any potion by crafting them together in a crafting grid and this potion will then be applied on impact. Normal potions require a direct hit, splash potions have an area of effect ie.manual.entry.bulletsBotania0=§lHoming §lCartridges§r are created with a "Specialized Projectiles" blueprint and the magical metal "Terrasteel", which gives them the ability to home in on the closest target.