stephenseo/TurnBasedMinecraftMod
1
0
Fork 0
Code Issues Pull requests Projects Releases 21 Wiki Activity Actions

Move probability logic to BattleUpdate thread

Browse source
This commit is contained in:
Stephen Seo 2018-10-27 16:53:04 +09:00
parent 044ee7d860
commit 83711ed7e3
1 changed files with 45 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
src/main/java/com/seodisparate/TurnBasedMinecraft/common/Battle.java
View file

@ -1050,33 +1050,61 @@ public class Battle
final Entity targetEntity = target.entity; final Entity targetEntity = target.entity;
final EntityInfo targetEntityInfo = target.entityInfo; final EntityInfo targetEntityInfo = target.entityInfo;
final int finalDamageAmount = damageAmount; final int finalDamageAmount = damageAmount;
final boolean defenseDamageTriggered;
final boolean attackEffectTriggered;
if(!(targetEntity instanceof EntityPlayer) && targetEntityInfo.defenseDamage > 0)
{
if((int)(Math.random() * 100) < targetEntityInfo.defenseDamageProbability)
{
defenseDamageTriggered = true;
}
else
{
defenseDamageTriggered = false;
}
}
else
{
defenseDamageTriggered = false;
}
if(nextEntityInfo.attackEffect != EntityInfo.Effect.UNKNOWN && nextEntityInfo.attackEffectProbability > 0)
{
if((int)(Math.random() * 100) < nextEntityInfo.attackEffectProbability)
{
attackEffectTriggered = true;
}
else
{
attackEffectTriggered = false;
}
}
else
{
attackEffectTriggered = false;
}
debugLog += " adding task..."; debugLog += " adding task...";
next.entity.getServer().addScheduledTask(() -> { next.entity.getServer().addScheduledTask(() -> {
TurnBasedMinecraftMod.proxy.setAttackingEntity(nextEntity); TurnBasedMinecraftMod.proxy.setAttackingEntity(nextEntity);
targetEntity.attackEntityFrom(damageSource, finalDamageAmount); targetEntity.attackEntityFrom(damageSource, finalDamageAmount);
TurnBasedMinecraftMod.proxy.setAttackingEntity(null); TurnBasedMinecraftMod.proxy.setAttackingEntity(null);
sendMessageToAllPlayers(PacketBattleMessage.MessageType.ATTACK, nextEntity.getEntityId(), targetEntity.getEntityId(), finalDamageAmount); sendMessageToAllPlayers(PacketBattleMessage.MessageType.ATTACK, nextEntity.getEntityId(), targetEntity.getEntityId(), finalDamageAmount);
if(!(targetEntity instanceof EntityPlayer) && targetEntityInfo.defenseDamage > 0) if(defenseDamageTriggered)
{ {
if((int)(Math.random() * 100) < targetEntityInfo.defenseDamageProbability) // defense damage
{ DamageSource defenseDamageSource = DamageSource.causeMobDamage((EntityLivingBase)targetEntity);
// defense damage TurnBasedMinecraftMod.proxy.setAttackingEntity(targetEntity);
DamageSource defenseDamageSource = DamageSource.causeMobDamage((EntityLivingBase)targetEntity); nextEntity.attackEntityFrom(defenseDamageSource, targetEntityInfo.defenseDamage);
TurnBasedMinecraftMod.proxy.setAttackingEntity(targetEntity); TurnBasedMinecraftMod.proxy.setAttackingEntity(null);
nextEntity.attackEntityFrom(defenseDamageSource, targetEntityInfo.defenseDamage); sendMessageToAllPlayers(PacketBattleMessage.MessageType.DEFENSE_DAMAGE, targetEntity.getEntityId(), nextEntity.getEntityId(), targetEntityInfo.defenseDamage);
TurnBasedMinecraftMod.proxy.setAttackingEntity(null);
sendMessageToAllPlayers(PacketBattleMessage.MessageType.DEFENSE_DAMAGE, targetEntity.getEntityId(), nextEntity.getEntityId(), targetEntityInfo.defenseDamage);
}
} }
// attack effect // attack effect
if(nextEntityInfo.attackEffect != EntityInfo.Effect.UNKNOWN && nextEntityInfo.attackEffectProbability > 0) if(attackEffectTriggered)
{ {
int effectChance = (int)(Math.random() * 100); nextEntityInfo.attackEffect.applyEffectToEntity((EntityLivingBase)targetEntity);
if(effectChance < nextEntityInfo.attackEffectProbability) sendMessageToAllPlayers(PacketBattleMessage.MessageType.WAS_AFFECTED, nextEntity.getEntityId(), targetEntity.getEntityId(), 0, nextEntityInfo.attackEffect.getAffectedString());
{
nextEntityInfo.attackEffect.applyEffectToEntity((EntityLivingBase)targetEntity);
sendMessageToAllPlayers(PacketBattleMessage.MessageType.WAS_AFFECTED, nextEntity.getEntityId(), targetEntity.getEntityId(), 0, nextEntityInfo.attackEffect.getAffectedString());
}
} }
}); });
debugLog += "...task added"; debugLog += "...task added";