mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-29 08:27:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2026 from garyyo/mc1.16/dev

Browse source 
- Fixed incorrect damage displayed in the tooltip of potato cannons
This commit is contained in:
simibubi 2021-07-24 20:06:45 +02:00 committed by GitHub
commit 77aa620fb9
Failed to generate hash of commit
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonItem.java
View file

@ -161,7 +161,7 @@ public class PotatoCannonItem extends ShootableItem {
Vector3d sprayOffset = VecHelper.rotate(sprayBase, i * sprayChange + imperfection, Axis.Z); Vector3d sprayOffset = VecHelper.rotate(sprayBase, i * sprayChange + imperfection, Axis.Z);
splitMotion = splitMotion.add(VecHelper.lookAt(sprayOffset, motion)); splitMotion = splitMotion.add(VecHelper.lookAt(sprayOffset, motion));
} }
if (i != 0) if (i != 0)
projectile.recoveryChance = 0; projectile.recoveryChance = 0;
@ -226,9 +226,9 @@ public class PotatoCannonItem extends ShootableItem {
public void appendHoverText(ItemStack stack, World world, List<ITextComponent> tooltip, ITooltipFlag flag) { public void appendHoverText(ItemStack stack, World world, List<ITextComponent> tooltip, ITooltipFlag flag) {
int power = EnchantmentHelper.getItemEnchantmentLevel(Enchantments.POWER_ARROWS, stack); int power = EnchantmentHelper.getItemEnchantmentLevel(Enchantments.POWER_ARROWS, stack);
int punch = EnchantmentHelper.getItemEnchantmentLevel(Enchantments.PUNCH_ARROWS, stack); int punch = EnchantmentHelper.getItemEnchantmentLevel(Enchantments.PUNCH_ARROWS, stack);
final float additionalDamage = power * 2; final float additionalDamageMult = 1 + power * .2f;
final float additionalKnockback = punch * .5f; final float additionalKnockback = punch * .5f;
getAmmoforPreview(stack).ifPresent(ammo -> { getAmmoforPreview(stack).ifPresent(ammo -> {
String _attack = "potato_cannon.ammo.attack_damage"; String _attack = "potato_cannon.ammo.attack_damage";
String _reload = "potato_cannon.ammo.reload_ticks"; String _reload = "potato_cannon.ammo.reload_ticks";
@ -243,14 +243,14 @@ public class PotatoCannonItem extends ShootableItem {
TextFormatting green = TextFormatting.GREEN; TextFormatting green = TextFormatting.GREEN;
TextFormatting darkGreen = TextFormatting.DARK_GREEN; TextFormatting darkGreen = TextFormatting.DARK_GREEN;
float damageF = type.getDamage() + additionalDamage; float damageF = type.getDamage() * additionalDamageMult;
IFormattableTextComponent damage = new StringTextComponent( IFormattableTextComponent damage = new StringTextComponent(
damageF == MathHelper.floor(damageF) ? "" + MathHelper.floor(damageF) : "" + damageF); damageF == MathHelper.floor(damageF) ? "" + MathHelper.floor(damageF) : "" + damageF);
IFormattableTextComponent reloadTicks = new StringTextComponent("" + type.getReloadTicks()); IFormattableTextComponent reloadTicks = new StringTextComponent("" + type.getReloadTicks());
IFormattableTextComponent knockback = IFormattableTextComponent knockback =
new StringTextComponent("" + (type.getKnockback() + additionalKnockback)); new StringTextComponent("" + (type.getKnockback() + additionalKnockback));
damage = damage.withStyle(additionalDamage > 0 ? green : darkGreen); damage = damage.withStyle(additionalDamageMult > 1 ? green : darkGreen);
knockback = knockback.withStyle(additionalKnockback > 0 ? green : darkGreen); knockback = knockback.withStyle(additionalKnockback > 0 ? green : darkGreen);
reloadTicks = reloadTicks.withStyle(darkGreen); reloadTicks = reloadTicks.withStyle(darkGreen);

2
src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoProjectileEntity.java
View file

@ -176,7 +176,7 @@ public class PotatoProjectileEntity extends DamagingProjectileEntity implements
Vector3d hit = ray.getLocation(); Vector3d hit = ray.getLocation();
Entity target = ray.getEntity(); Entity target = ray.getEntity();
PotatoCannonProjectileTypes projectileType = getProjectileType(); PotatoCannonProjectileTypes projectileType = getProjectileType();
float damage = MathHelper.floor(projectileType.getDamage() * additionalDamageMult); float damage = projectileType.getDamage() * additionalDamageMult;
float knockback = projectileType.getKnockback() + additionalKnockback; float knockback = projectileType.getKnockback() + additionalKnockback;
Entity owner = this.getOwner(); Entity owner = this.getOwner();