fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Huskpocalypse!

Browse Source
This commit is contained in:
Electroblob77
2020-06-04 23:02:29 +01:00
parent 88d0780d69
commit afabcbde49
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/entity/construct/EntityZombieSpawner.java
+6 -1
View File
@@ -1,5 +1,6 @@
package electroblob.wizardry.entity.construct;
import electroblob.wizardry.entity.living.EntityHuskMinion;
import electroblob.wizardry.entity.living.EntityZombieMinion;
import electroblob.wizardry.registry.Spells;
import electroblob.wizardry.registry.WizardrySounds;
@@ -16,6 +17,8 @@ import net.minecraft.world.World;
public class EntityZombieSpawner extends EntityMagicConstruct {
public boolean spawnHusks;
private int spawnTimer = 10;
public EntityZombieSpawner(World world){
@@ -34,7 +37,7 @@ public class EntityZombieSpawner extends EntityMagicConstruct {
if(!world.isRemote){
EntityZombieMinion zombie = new EntityZombieMinion(world);
EntityZombieMinion zombie = spawnHusks ? new EntityHuskMinion(world) : new EntityZombieMinion(world);
zombie.setPosition(this.posX, this.posY, this.posZ);
zombie.setCaster(this.getCaster());
@@ -76,12 +79,14 @@ public class EntityZombieSpawner extends EntityMagicConstruct {
protected void writeEntityToNBT(NBTTagCompound nbt){
super.writeEntityToNBT(nbt);
nbt.setInteger("spawnTimer", spawnTimer);
nbt.setBoolean("spawnHusks", spawnHusks);
}
@Override
protected void readEntityFromNBT(NBTTagCompound nbt){
super.readEntityFromNBT(nbt);
this.spawnTimer = nbt.getInteger("spawnTimer");
this.spawnHusks = nbt.getBoolean("spawnHusks");
}
}
src/main/java/electroblob/wizardry/spell/ZombieApocalypse.java
+7
View File
@@ -1,10 +1,12 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.entity.construct.EntityZombieSpawner;
import electroblob.wizardry.item.ItemArtefact;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.SpellModifiers;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.SoundEvent;
import net.minecraft.world.World;
@@ -34,6 +36,11 @@ public class ZombieApocalypse extends SpellConstruct<EntityZombieSpawner> {
return super.spawnConstruct(world, x, y, z, side, caster, modifiers);
}
@Override
protected void addConstructExtras(EntityZombieSpawner construct, EnumFacing side, @Nullable EntityLivingBase caster, SpellModifiers modifiers){
construct.spawnHusks = caster instanceof EntityPlayer && ItemArtefact.isArtefactActive((EntityPlayer)caster, WizardryItems.charm_minion_variants);
}
@Override
protected void playSound(World world, double x, double y, double z, int ticksInUse, int duration, SpellModifiers modifiers, String... sounds){
this.playSoundLoop(world, x, y + SPAWNER_HEIGHT, z, 0, (int)(getProperty(DURATION).floatValue() * modifiers.get(WizardryItems.duration_upgrade)));