Anvilcraft/ModularPowersuits
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

updated jump/sprint assist variables

Browse source
This commit is contained in:
MachineMuse 2013-11-28 03:02:01 -07:00
parent 5fca5e46fd
commit 60b02ba294
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/minecraft/net/machinemuse/powersuits/powermodule/movement/JumpAssistModule.java
View file

@ -59,7 +59,7 @@ public class JumpAssistModule extends PowerModuleBase implements IToggleableModu
player.motionY += 0.15 * Math.min(multiplier, 1) * MusePlayerUtils.getWeightPenaltyRatio(MuseItemUtils.getPlayerWeight(player), 25000); player.motionY += 0.15 * Math.min(multiplier, 1) * MusePlayerUtils.getWeightPenaltyRatio(MuseItemUtils.getPlayerWeight(player), 25000);
MovementManager.setPlayerJumpTicks(player, multiplier - 1); MovementManager.setPlayerJumpTicks(player, multiplier - 1);
} }
player.jumpMovementFactor = player.getAIMoveSpeed() * .7f; player.jumpMovementFactor = player.getAIMoveSpeed() * .2f;
} else { } else {
MovementManager.setPlayerJumpTicks(player, 0); MovementManager.setPlayerJumpTicks(player, 0);
} }

11
src/minecraft/net/machinemuse/powersuits/powermodule/movement/SprintAssistModule.scala
View file

@ -55,16 +55,15 @@ class SprintAssistModule(validItems: List[IModularItem]) extends PowerModuleBase
ElectricItemUtils.drainPlayerEnergy(player, sprintCost * horzMovement * 5) ElectricItemUtils.drainPlayerEnergy(player, sprintCost * horzMovement * 5)
setMovementModifier(item, sprintMultiplier) setMovementModifier(item, sprintMultiplier)
player.getFoodStats.addExhaustion((-0.01 * exhaustion * exhaustionComp).asInstanceOf[Float]) player.getFoodStats.addExhaustion((-0.01 * exhaustion * exhaustionComp).asInstanceOf[Float])
// player.jumpMovementFactor = player.getAIMoveSpeed * .5f player.jumpMovementFactor = player.getAIMoveSpeed * .2f
} }
} } else {
else {
val cost: Double = ModuleManager.computeModularProperty(item, WALKING_ENERGY_CONSUMPTION) val cost: Double = ModuleManager.computeModularProperty(item, WALKING_ENERGY_CONSUMPTION)
if (cost < totalEnergy) { if (cost < totalEnergy) {
val walkMultiplier: Double = ModuleManager.computeModularProperty(item, WALKING_SPEED_MULTIPLIER) val walkMultiplier: Double = ModuleManager.computeModularProperty(item, WALKING_SPEED_MULTIPLIER)
ElectricItemUtils.drainPlayerEnergy(player, cost * horzMovement * 5) ElectricItemUtils.drainPlayerEnergy(player, cost * horzMovement * 5)
setMovementModifier(item, walkMultiplier) setMovementModifier(item, walkMultiplier)
// player.jumpMovementFactor = player.getAIMoveSpeed * .5f player.jumpMovementFactor = player.getAIMoveSpeed * .2f
} }
} }
} }
@ -81,10 +80,10 @@ class SprintAssistModule(validItems: List[IModularItem]) extends PowerModuleBase
} flatMap { } flatMap {
tag: NBTTagCompound => tag: NBTTagCompound =>
tag.setInteger("Operation", 1) tag.setInteger("Operation", 1)
tag.setDouble("Amount", multiplier-1) tag.setDouble("Amount", multiplier - 1)
Some(tag) Some(tag)
} }
if (sprintModifiers.isEmpty) modifiers.appendTag(AttributeModifier(1, TAGUUID, multiplier-1, "generic.movementSpeed", "Sprint Assist").toNBT) if (sprintModifiers.isEmpty) modifiers.appendTag(AttributeModifier(1, TAGUUID, multiplier - 1, "generic.movementSpeed", "Sprint Assist").toNBT)
} }
def onPlayerTickInactive(player: EntityPlayer, item: ItemStack) { def onPlayerTickInactive(player: EntityPlayer, item: ItemStack) {