{
if(event.getEntity().world.isRemote)
{
- TurnBasedMinecraftMod.logger.debug("isRemote");
return;
}
else if(TurnBasedMinecraftMod.battleManager == null)
if(!(event.getSource().getTrueSource() == null || event.getSource().getTrueSource().equals(TurnBasedMinecraftMod.attackingEntity)) && TurnBasedMinecraftMod.battleManager.checkAttack(event))
{
- TurnBasedMinecraftMod.logger.debug("Canceled LivingAttackEvent between " + TurnBasedMinecraftMod.attackingEntity + " and " + event.getEntity());
+// TurnBasedMinecraftMod.logger.debug("Canceled LivingAttackEvent between " + TurnBasedMinecraftMod.attackingEntity + " and " + event.getEntity());
event.setCanceled(true);
}
else
{
- TurnBasedMinecraftMod.logger.debug("Did not cancel attack");
+// TurnBasedMinecraftMod.logger.debug("Did not cancel attack");
}
if(TurnBasedMinecraftMod.attackingDamage < (int) event.getAmount())
{
{
hitChance -= target.entityInfo.evasion;
}
+ if(hitChance < 1)
+ {
+ hitChance = 1;
+ }
if((int)(Math.random() * 100) < hitChance)
{
if(target.remainingDefenses <= 0)
{
hitChance -= target.entityInfo.evasion;
}
+ if(hitChance < 1)
+ {
+ hitChance = 1;
+ }
if((int)(Math.random() * 100) < hitChance)
{
if(target.remainingDefenses <= 0)
{
if(b.hasCombatant(event.getSource().getTrueSource().getEntityId()))
{
- logger.debug("Attack Canceled: attacked ignores battle but attacker in battle");
+// logger.debug("Attack Canceled: attacked ignores battle but attacker in battle");
return true;
}
}
- logger.debug("Attack Not Canceled: attacked ignores battle");
+// logger.debug("Attack Not Canceled: attacked ignores battle");
return false;
}
entityInfo = TurnBasedMinecraftMod.config.getMatchingEntityInfo(event.getSource().getTrueSource());
{
if(b.hasCombatant(event.getEntity().getEntityId()))
{
- logger.debug("Attack Canceled: attacker ignores battle but attacked in battle");
+// logger.debug("Attack Canceled: attacker ignores battle but attacked in battle");
return true;
}
}
- logger.debug("Attack Not Canceled: attacker ignores battle");
+// logger.debug("Attack Not Canceled: attacker ignores battle");
return false;
}
if(inBattle != null)
{
// both combatants are in battle
- logger.debug("Attack Canceled: both are in battle");
+// logger.debug("Attack Canceled: both are in battle");
return true;
}
else
if(inBattle != null)
{
// both combatants are in battle
- logger.debug("Attack Canceled: both are in battle");
+// logger.debug("Attack Canceled: both are in battle");
return true;
}
else
sideA.add(event.getEntity());
sideB.add(event.getSource().getTrueSource());
createBattle(sideA, sideB);
- logger.debug("Attack Not Canceled: new battle created");
+// logger.debug("Attack Not Canceled: new battle created");
}
else
{
- logger.debug("Attack Not Canceled: neither are in battle or players");
+// logger.debug("Attack Not Canceled: neither are in battle or players");
}
return false;
}
battle.addCombatantToSideA(notInBattle);
}
- logger.debug("Attack Canceled: one is in battle");
+// logger.debug("Attack Canceled: one is in battle");
return true;
}
boolean isSlow = false;
for(PotionEffect e : c0Entity.getActivePotionEffects())
{
- if(e.getEffectName().equals(MobEffects.HASTE.getName()))
+ if(e.getEffectName().equals(MobEffects.HASTE.getName()) || e.getEffectName().equals(MobEffects.SPEED.getName()))
{
isHaste = true;
}
import org.apache.logging.log4j.Logger;
-import com.seodisparate.TurnBasedMinecraft.common.EntityInfo.Category;
-
public class Config
{
private Map<String, EntityInfo> entityInfoMap;
- private Set<EntityInfo.Category> ignoreBattleTypes;
+ private Set<String> ignoreBattleTypes;
private Logger logger;
private int playerSpeed = 50;
private int playerHasteSpeed = 80;
public Config(Logger logger)
{
entityInfoMap = new HashMap<String, EntityInfo>();
- ignoreBattleTypes = new HashSet<EntityInfo.Category>();
+ ignoreBattleTypes = new HashSet<String>();
this.logger = logger;
int internalVersion = 0;
xmlReader.next();
if(xmlReader.isStartElement())
{
- ignoreBattleTypes.add(Category.fromString(xmlReader.getLocalName()));
+ ignoreBattleTypes.add(xmlReader.getLocalName().toLowerCase());
}
} while(!(xmlReader.isEndElement() && xmlReader.getLocalName().equals("IgnoreBattleTypes")));
}
}
else if(xmlReader.getLocalName().equals("Category"))
{
- eInfo.category = Category.fromString(xmlReader.getElementText());
+ eInfo.category = xmlReader.getElementText().toLowerCase();
}
else if(xmlReader.getLocalName().equals("Conflicts"))
{
return configVersion;
}
- public boolean isIgnoreBattleType(Category type)
+ public boolean isIgnoreBattleType(String type)
{
return ignoreBattleTypes.contains(type);
}
public int defenseDamageProbability;
public int evasion;
public int speed;
- public Category category;
+ public String category;
public int decisionAttack;
public int decisionDefend;
public int decisionFlee;
- public enum Category
- {
- MONSTER,
- PASSIVE,
- ANIMAL,
- BOSS,
- UNKNOWN;
-
- public static Category fromString(String c)
- {
- c = c.toLowerCase();
- if(c.equals("monster"))
- {
- return MONSTER;
- }
- else if(c.equals("passive"))
- {
- return PASSIVE;
- }
- else if(c.equals("animal"))
- {
- return ANIMAL;
- }
- else if(c.equals("boss"))
- {
- return BOSS;
- }
- else
- {
- return UNKNOWN;
- }
- }
- }
-
public enum Effect
{
SPEED,
defenseDamageProbability = 0;
evasion = 15;
speed = 50;
- category = Category.UNKNOWN;
+ category = "unknown";
decisionAttack = 70;
decisionDefend = 20;
decisionFlee = 10;
<TurnBasedMinecraftConfig>
<!-- If the mod has a newer version config, it will rename the existing config and place the new config -->
<Version>1</Version>
- <!-- Types that will not initiate battle with player. They are listed as "Category" per EntiytStats entity. -->
+ <!-- Types that will not initiate battle with player. They are listed as "Category" per EntiytStats entity.
+ Note that items listed in "IgnoreBattleTypes" and "Category" are converted to lowercase before being compared. -->
<IgnoreBattleTypes>
<Passive></Passive>
<Boss></Boss>
</IgnoreBattleTypes>
<PlayerStats>
<Speed>50</Speed>
- <HasteSpeed>80</HasteSpeed>
- <SlowSpeed>20</SlowSpeed>
+ <HasteSpeed>80</HasteSpeed> <!-- Speed used if the player entity has "speed" or "haste" effects -->
+ <SlowSpeed>20</SlowSpeed> <!-- Speed used if the player entity has "slow" effect -->
<AttackProbability>90</AttackProbability>
<Evasion>10</Evasion>
</PlayerStats>
<!-- AttackEffect: (Optional) Applies effect to target entity with "Probability" success rate. -->
<!-- DefenseDamage: (Optional) Applies damage to an attacker when attacked with "Probability" success rate. -->
<!-- Evasion: Determines the percentage of evading attacks between 0 and 100. -->
+ <!-- Note that if the hit probability and evasion result in a percentage less than 1%, the hit chance will be changed ti 1% -->
<!-- Speed: Value in range of 0 to 100 that determines the order entities act in battle. Higher is sooner. Entities with same speed will take their turn as a group in random order (not at the same time). -->
<!-- IgnoreBattle: (Optional) Per entity setting to not enter turn-based-battle if value is "true". If "true" these stats will not apply to the entity as they are only used in turn-based-battle. -->
<!-- Category: Sets the type of the entity, used by "IgnoreBattleTypes" to determine what types ignore battle. -->
projects / TurnBasedMinecraftMod / commitdiff