Work In Progress - TBM_Config.xml updated

The config file should hold info on all vanilla mobs by now

diff --git a/src/main/java/com/seodisparate/TurnBasedMinecraft/common/Battle.java b/src/main/java/com/seodisparate/TurnBasedMinecraft/common/Battle.java
index d41da577d60405b9565e2623cbddc4e38e7b72da..2395d7c3ad1682e8edf9169cf3a01cb1fd7f6bf7 100644 (file)
--- a/src/main/java/com/seodisparate/TurnBasedMinecraft/common/Battle.java
+++ b/src/main/java/com/seodisparate/TurnBasedMinecraft/common/Battle.java
@@ -264,7 +264,7 @@ public class Battle
         {
         case DECISION:
             timer = timer.minus(dt);
-            if(timer.isNegative() || timer.isZero())
+            if(timer.isNegative() || timer.isZero() || undecidedCount <= 0)
             {
                 state = State.ATTACK;
                 timer = TurnBasedMinecraftMod.BattleDecisionTime;

diff --git a/src/main/java/com/seodisparate/TurnBasedMinecraft/common/networking/PacketBattleDecision.java b/src/main/java/com/seodisparate/TurnBasedMinecraft/common/networking/PacketBattleDecision.java
index a3f0bcfd320c8bd331d3e84cb7c85ead776a7075..71ca9259f7b01d9d269651620229e79b23a33221 100644 (file)
--- a/src/main/java/com/seodisparate/TurnBasedMinecraft/common/networking/PacketBattleDecision.java
+++ b/src/main/java/com/seodisparate/TurnBasedMinecraft/common/networking/PacketBattleDecision.java
@@ -43,7 +43,7 @@ public class PacketBattleDecision implements IMessage
         public IMessage onMessage(PacketBattleDecision message, MessageContext ctx)
         {
             Battle b = TurnBasedMinecraftMod.getBattleManager().getBattleByID(message.battleID);
-            if(b != null && b.getState() == Battle.State.DECISION)
+            if(b != null)
             {
                 EntityPlayerMP player = ctx.getServerHandler().player;
                 b.setDecision(player.getEntityId(), message.decision);

diff --git a/src/main/resources/TBM_Config.xml b/src/main/resources/TBM_Config.xml
index 521b40b001418d8b1da8ba5b155ff9cbb0dfdac1..a897bd931a89017820b926fa7ceaaceeec5747ce 100644 (file)
--- a/src/main/resources/TBM_Config.xml
+++ b/src/main/resources/TBM_Config.xml
@@ -1,5 +1,9 @@
 <TurnBasedMinecraftConfig>
        <Version>1</Version>
+       <IgnoreBattleTypes>
+               <Passive></Passive>
+               <Boss></Boss>
+       </IgnoreBattleTypes>
        <EntityStats>
                <net.minecraft.entity.monster.EntityBlaze>
                        <AttackPower Probability="50">5</AttackPower>
@@ -130,5 +134,108 @@
                        <AttackPower Probability="70">3</AttackPower>
                        <Evasion>5</Evasion>
                </net.minecraft.entity.monster.EntityZombieVillager>
+               <net.minecraft.entity.passive.EntityBat
+                       Passive="true">
+                       <AttackPower Probability="70">0</AttackPower>
+                       <Evasion>35</Evasion>
+               </net.minecraft.entity.passive.EntityBat>
+               <net.minecraft.entity.passive.EntityChicken
+                       Passive="true">
+                       <AttackPower Probability="70">0</AttackPower>
+                       <Evasion>10</Evasion>
+               </net.minecraft.entity.passive.EntityChicken>
+               <net.minecraft.entity.passive.EntityCow
+                       Passive="true">
+                       <AttackPower Probability="50">0</AttackPower>
+                       <Evasion>1</Evasion>
+                       <Conflicts>
+                               <net.minecraft.entity.passive.EntityMooshroom></net.minecraft.entity.passive.EntityMooshroom>
+                       </Conflicts>
+               </net.minecraft.entity.passive.EntityCow>
+               <net.minecraft.entity.passive.EntityDonkey
+                       Passive="true">
+                       <AttackPower Probability="70">0</AttackPower>
+                       <Evasion>10</Evasion>
+               </net.minecraft.entity.passive.EntityDonkey>
+               <net.minecraft.entity.passive.EntityHorse
+                       Passive="true">
+                       <AttackPower Probability="70">0</AttackPower>
+                       <Evasion>10</Evasion>
+               </net.minecraft.entity.passive.EntityHorse>
+               <net.minecraft.entity.passive.EntityLlama
+                       Passive="true">
+                       <AttackPower Probability="70">1</AttackPower>
+                       <Evasion>10</Evasion>
+               </net.minecraft.entity.passive.EntityLlama>
+               <net.minecraft.entity.passive.EntityMooshroom
+                       Passive="true">
+                       <AttackPower Probability="70">0</AttackPower>
+                       <Evasion>1</Evasion>
+               </net.minecraft.entity.passive.EntityMooshroom>
+               <net.minecraft.entity.passive.EntityMule
+                       Passive="true">
+                       <AttackPower Probability="70">0</AttackPower>
+                       <Evasion>10</Evasion>
+               </net.minecraft.entity.passive.EntityMule>
+               <net.minecraft.entity.passive.EntityOcelot
+                       Passive="true">
+                       <AttackPower Probability="70" Variance="1">1</AttackPower>
+                       <Evasion>10</Evasion>
+               </net.minecraft.entity.passive.EntityOcelot>
+               <net.minecraft.entity.passive.EntityParrot
+                       Passive="true">
+                       <AttackPower Probability="70">0</AttackPower>
+                       <Evasion>35</Evasion>
+               </net.minecraft.entity.passive.EntityParrot>
+               <net.minecraft.entity.passive.EntityPig
+                       Passive="true">
+                       <AttackPower Probability="70">0</AttackPower>
+                       <Evasion>10</Evasion>
+               </net.minecraft.entity.passive.EntityPig>
+               <net.minecraft.entity.passive.EntityRabbit
+                       Passive="true">
+                       <AttackPower Probability="70">0</AttackPower>
+                       <Evasion>40</Evasion>
+               </net.minecraft.entity.passive.EntityRabbit>
+               <net.minecraft.entity.passive.EntitySheep
+                       Passive="true">
+                       <AttackPower Probability="70">0</AttackPower>
+                       <Evasion>5</Evasion>
+               </net.minecraft.entity.passive.EntitySheep>
+               <net.minecraft.entity.passive.EntitySkeletonHorse
+                       Passive="true">
+                       <AttackPower Probability="70">0</AttackPower>
+                       <Evasion>5</Evasion>
+               </net.minecraft.entity.passive.EntitySkeletonHorse>
+               <net.minecraft.entity.passive.EntitySquid
+                       Passive="true">
+                       <AttackPower Probability="70">0</AttackPower>
+                       <Evasion>15</Evasion>
+               </net.minecraft.entity.passive.EntitySquid>
+               <net.minecraft.entity.passive.EntityVillager
+                       Passive="true">
+                       <AttackPower Probability="70">0</AttackPower>
+                       <Evasion>5</Evasion>
+               </net.minecraft.entity.passive.EntityVillager>
+               <net.minecraft.entity.passive.EntityWolf>
+                       <AttackPower Probability="70">4</AttackPower>
+                       <Evasion>20</Evasion>
+               </net.minecraft.entity.passive.EntityWolf>
+               <net.minecraft.entity.passive.EntityZombieHorse
+                       Passive="true">
+                       <AttackPower Probability="70">0</AttackPower>
+                       <Evasion>8</Evasion>
+               </net.minecraft.entity.passive.EntityZombieHorse>
+               <net.minecraft.entity.boss.EntityDragon
+                       Boss="true">
+                       <AttackPower Probability="70" Variance="2">10</AttackPower>
+                       <Evasion>27</Evasion>
+               </net.minecraft.entity.boss.EntityDragon>
+               <net.minecraft.entity.boss.EntityWither
+                       Boss="true">
+                       <AttackPower Probability="70">8</AttackPower>
+                       <Evasion>20</Evasion>
+                       <AttackEffect Probability="90">wither</AttackEffect>
+               </net.minecraft.entity.boss.EntityWither>
        </EntityStats>
 </TurnBasedMinecraftConfig>
\ No newline at end of file