mirror of
https://github.com/GTNewHorizons/Gadomancy.git
synced 2026-11-22 04:52:14 +00:00
- Added aura effect blacklist
- Added more future familiar rework stuff - Rewrote all ResearchItems to mod-internal SimpleResearchItems - Fix for issue with non-intended merging golem core stacks
This commit is contained in:
1 parent
8821efdb73
commit
0dac2eeee9
13 files changed
+245
-97
No files matched your search
@@ -5,7 +5,6 @@ import cpw.mods.fml.common.network.NetworkRegistry;
|
||||
import makeo.gadomancy.common.items.baubles.ItemEtherealFamiliar;
|
||||
import makeo.gadomancy.common.network.PacketHandler;
|
||||
import makeo.gadomancy.common.network.packets.PacketFamiliarBolt;
|
||||
import makeo.gadomancy.common.network.packets.PacketStartAnimation;
|
||||
import makeo.gadomancy.common.utils.MiscUtils;
|
||||
import makeo.gadomancy.common.utils.Vector3;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
@@ -17,7 +16,10 @@ import net.minecraft.potion.Potion;
|
||||
import net.minecraft.potion.PotionEffect;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.util.DamageSource;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
import thaumcraft.common.config.Config;
|
||||
import thaumcraft.common.items.baubles.ItemAmuletVis;
|
||||
import thaumcraft.common.items.wands.ItemWandCasting;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Iterator;
|
||||
@@ -58,40 +60,81 @@ public class FamiliarController {
|
||||
public void tick() {
|
||||
IInventory baubles = BaublesApi.getBaubles(owningPlayer);
|
||||
ItemStack stack = baubles.getStackInSlot(0);
|
||||
if(stack == null || !(stack.getItem() instanceof ItemEtherealFamiliar)) return;
|
||||
if (stack == null || !(stack.getItem() instanceof ItemEtherealFamiliar)) return;
|
||||
|
||||
if(tickLastEffect > 0) {
|
||||
if (tickLastEffect > 0) {
|
||||
tickLastEffect--;
|
||||
return;
|
||||
}
|
||||
|
||||
FamiliarAugment.FamiliarAugmentList augments = ItemEtherealFamiliar.getAugments(stack);
|
||||
if(augments == null) return;
|
||||
if (augments == null) return;
|
||||
|
||||
if(augments.isEmpty()) {
|
||||
if (augments.isEmpty()) {
|
||||
doDefaultAttack();
|
||||
tickLastEffect = AS_DELAY_DEF;
|
||||
} else {
|
||||
FamiliarAugment.FamiliarAugmentPair effectElement = null;
|
||||
for (FamiliarAugment.FamiliarAugmentPair pair : augments) {
|
||||
FamiliarAugment augment = pair.augment;
|
||||
if(augment.equals(FamiliarAugment.SHOCK) || augment.equals(FamiliarAugment.FIRE)
|
||||
if (augment.equals(FamiliarAugment.SHOCK) || augment.equals(FamiliarAugment.FIRE)
|
||||
|| augment.equals(FamiliarAugment.POISON) || augment.equals(FamiliarAugment.WEAKNESS)) {
|
||||
effectElement = pair;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
AspectList costs = new AspectList();
|
||||
|
||||
int dmgLevel = augments.getLevel(FamiliarAugment.DAMAGE_INCREASE);
|
||||
if (dmgLevel > 0) {
|
||||
for (int i = 0; i < dmgLevel; i++) {
|
||||
costs.add(FamiliarAugment.DAMAGE_INCREASE.getCostsPerLevel());
|
||||
}
|
||||
}
|
||||
|
||||
int attackSpeedLevel = augments.getLevel(FamiliarAugment.ATTACK_SPEED);
|
||||
if (attackSpeedLevel > 0) {
|
||||
for (int i = 0; i < attackSpeedLevel; i++) {
|
||||
costs.add(FamiliarAugment.ATTACK_SPEED.getCostsPerLevel());
|
||||
}
|
||||
}
|
||||
|
||||
int rangeLevel = augments.getLevel(FamiliarAugment.RANGE_INCREASE);
|
||||
if (rangeLevel > 0) {
|
||||
for (int i = 0; i < rangeLevel; i++) {
|
||||
costs.add(FamiliarAugment.RANGE_INCREASE.getCostsPerLevel());
|
||||
}
|
||||
}
|
||||
|
||||
double damage = DMG_DEF + (dmgLevel != -1 ? DMG_INC * dmgLevel : 0);
|
||||
int ticksUntilNextAttack = AS_DELAY_DEF - (attackSpeedLevel != -1 ? AS_INC * attackSpeedLevel : 0);
|
||||
double range = RANGE_DEF + (rangeLevel != -1 ? RANGE_INC * rangeLevel : 0);
|
||||
if(effectElement == null) {
|
||||
if(doEnhancedDefaultAttack(damage, range)) tickLastEffect = ticksUntilNextAttack;
|
||||
|
||||
if(effectElement != null) {
|
||||
for (int i = 0; i < effectElement.level; i++) {
|
||||
costs.add(effectElement.augment.getCostsPerLevel());
|
||||
}
|
||||
}
|
||||
|
||||
if (!owningPlayer.capabilities.isCreativeMode && !consumeVisFromInventory(owningPlayer, costs, false)) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (effectElement == null) {
|
||||
if (doEnhancedDefaultAttack(damage, range)) {
|
||||
tickLastEffect = ticksUntilNextAttack;
|
||||
if(!owningPlayer.capabilities.isCreativeMode && RAND.nextInt(3) == 0) {
|
||||
consumeVisFromInventory(owningPlayer, costs, true);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if(doAttack(effectElement, damage, range)) tickLastEffect = ticksUntilNextAttack;
|
||||
if (doAttack(effectElement, damage, range)) {
|
||||
tickLastEffect = ticksUntilNextAttack;
|
||||
if(!owningPlayer.capabilities.isCreativeMode && RAND.nextInt(3) == 0) {
|
||||
consumeVisFromInventory(owningPlayer, costs, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -101,59 +144,60 @@ public class FamiliarController {
|
||||
int effectLevel = element.level;
|
||||
FamiliarAugment augment = element.augment;
|
||||
int boltType = 6;
|
||||
if(augment.equals(FamiliarAugment.SHOCK)) {
|
||||
if (augment.equals(FamiliarAugment.SHOCK)) {
|
||||
boltType = 1;
|
||||
damage += effectLevel * SHOCK_DMG_INC;
|
||||
} else if(augment.equals(FamiliarAugment.FIRE)) {
|
||||
} else if (augment.equals(FamiliarAugment.FIRE)) {
|
||||
boltType = 4;
|
||||
damage += effectLevel * FIRE_DMG_INC;
|
||||
} else if(augment.equals(FamiliarAugment.POISON)) {
|
||||
} else if (augment.equals(FamiliarAugment.POISON)) {
|
||||
boltType = 3;
|
||||
range += effectLevel * POISON_RANGE_INC;
|
||||
} else if(augment.equals(FamiliarAugment.WEAKNESS)) {
|
||||
} else if (augment.equals(FamiliarAugment.WEAKNESS)) {
|
||||
boltType = 5;
|
||||
damage -= effectLevel * WEAKNESS_DMG_DEC;
|
||||
if(effectLevel == 3) toSelect = 3;
|
||||
if (effectLevel == 3) toSelect = 3;
|
||||
}
|
||||
|
||||
List<EntityLivingBase> toAttack = selectEntityToAttack(range, toSelect);
|
||||
if(toAttack == null || toAttack.isEmpty()) return false;
|
||||
if (toAttack == null || toAttack.isEmpty()) return false;
|
||||
for (EntityLivingBase entity : toAttack) {
|
||||
attack(entity, damage, boltType);
|
||||
}
|
||||
if(augment.equals(FamiliarAugment.SHOCK)) {
|
||||
if (augment.equals(FamiliarAugment.SHOCK)) {
|
||||
for (EntityLivingBase entity : toAttack) {
|
||||
if(RAND.nextInt(3) == 0) {
|
||||
if (RAND.nextInt(3) == 0) {
|
||||
Vector3 vel = MiscUtils.getPositionVector(entity).subtract(MiscUtils.getPositionVector(owningPlayer))
|
||||
.normalize().divide(2).multiply(0.5 * effectLevel);
|
||||
if (vel.getY() < 0) vel.setY(-vel.getY());
|
||||
entity.motionX += vel.getX();
|
||||
entity.motionY += vel.getY();
|
||||
entity.motionZ += vel.getZ();
|
||||
}
|
||||
}
|
||||
} else if(augment.equals(FamiliarAugment.FIRE)) {
|
||||
} else if (augment.equals(FamiliarAugment.FIRE)) {
|
||||
int fireDur = 14;
|
||||
for (int i = 0; i < effectLevel; i++) {
|
||||
fireDur *= 2;
|
||||
}
|
||||
for (EntityLivingBase entity : toAttack) {
|
||||
entity.setFire(fireDur);
|
||||
if(effectLevel == 3) {
|
||||
if (effectLevel == 3) {
|
||||
entity.addPotionEffect(new PotionEffect(Config.potionSunScornedID, MiscUtils.ticksForMinutes(1), 2));
|
||||
}
|
||||
}
|
||||
} else if(augment.equals(FamiliarAugment.POISON)) {
|
||||
} else if (augment.equals(FamiliarAugment.POISON)) {
|
||||
int potionLvl = 0;
|
||||
if(effectLevel > 1) potionLvl += 1;
|
||||
if (effectLevel > 1) potionLvl += 1;
|
||||
for (EntityLivingBase entity : toAttack) {
|
||||
entity.addPotionEffect(new PotionEffect(Potion.poison.getId(), MiscUtils.ticksForSeconds(30), potionLvl));
|
||||
if(effectLevel == 3) {
|
||||
if (effectLevel == 3) {
|
||||
entity.addPotionEffect(new PotionEffect(Potion.hunger.getId(), MiscUtils.ticksForMinutes(2), 3));
|
||||
}
|
||||
}
|
||||
} else if(augment.equals(FamiliarAugment.WEAKNESS)) {
|
||||
} else if (augment.equals(FamiliarAugment.WEAKNESS)) {
|
||||
int potionLvl = 0;
|
||||
if(effectLevel == 3) potionLvl++;
|
||||
if (effectLevel == 3) potionLvl++;
|
||||
int dur = MiscUtils.ticksForSeconds(30);
|
||||
for (EntityLivingBase entity : toAttack) {
|
||||
entity.addPotionEffect(new PotionEffect(Potion.weakness.getId(), dur, potionLvl));
|
||||
@@ -163,9 +207,31 @@ public class FamiliarController {
|
||||
return true;
|
||||
}
|
||||
|
||||
public static boolean consumeVisFromInventory(EntityPlayer player, AspectList cost, boolean doit) {
|
||||
IInventory baubles = BaublesApi.getBaubles(player);
|
||||
for (int a = 0; a < 4; a++) {
|
||||
if ((baubles.getStackInSlot(a) != null) && ((baubles.getStackInSlot(a).getItem() instanceof ItemAmuletVis))) {
|
||||
boolean done = ((ItemAmuletVis) baubles.getStackInSlot(a).getItem()).consumeAllVis(baubles.getStackInSlot(a), player, cost, doit, true);
|
||||
if (done) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
for (int a = player.inventory.mainInventory.length - 1; a >= 0; a--) {
|
||||
ItemStack item = player.inventory.mainInventory[a];
|
||||
if ((item != null) && ((item.getItem() instanceof ItemWandCasting))) {
|
||||
boolean done = ((ItemWandCasting) item.getItem()).consumeAllVis(item, player, cost, doit, true);
|
||||
if (done) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private boolean doEnhancedDefaultAttack(double damage, double range) {
|
||||
List<EntityLivingBase> toAttack = selectEntityToAttack(range, 1);
|
||||
if(toAttack == null || toAttack.isEmpty()) return false;
|
||||
if (toAttack == null || toAttack.isEmpty()) return false;
|
||||
|
||||
attack(toAttack.get(0), damage, 6);
|
||||
return true;
|
||||
@@ -173,7 +239,7 @@ public class FamiliarController {
|
||||
|
||||
private boolean doDefaultAttack() {
|
||||
List<EntityLivingBase> toAttack = selectEntityToAttack(RANGE_DEF, 1);
|
||||
if(toAttack == null || toAttack.isEmpty()) return false;
|
||||
if (toAttack == null || toAttack.isEmpty()) return false;
|
||||
|
||||
attack(toAttack.get(0), DMG_DEF, 6);
|
||||
return true;
|
||||
@@ -189,9 +255,9 @@ public class FamiliarController {
|
||||
|
||||
private List<EntityLivingBase> selectEntityToAttack(double rad, int amountToSelectMax) {
|
||||
List<EntityLivingBase> attackable = getAttackableEntities(rad);
|
||||
if(attackable.size() <= 0) return null;
|
||||
if (attackable.size() <= 0) return null;
|
||||
List<EntityLivingBase> entities = new ArrayList<EntityLivingBase>();
|
||||
if(attackable.size() <= amountToSelectMax) {
|
||||
if (attackable.size() <= amountToSelectMax) {
|
||||
entities.addAll(attackable);
|
||||
} else {
|
||||
for (int i = 0; i < amountToSelectMax; i++) {
|
||||
@@ -211,7 +277,7 @@ public class FamiliarController {
|
||||
Iterator<EntityLivingBase> it = entities.iterator();
|
||||
while (it.hasNext()) {
|
||||
EntityLivingBase base = it.next();
|
||||
if(base == null || base.isDead || base instanceof EntityPlayer || !(base instanceof IMob)) it.remove();
|
||||
if (base == null || base.isDead || base instanceof EntityPlayer || !(base instanceof IMob)) it.remove();
|
||||
//TODO remove entities we don't want to attack...
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user