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

Make ice age give frostbite II to players for 20 seconds

Browse Source
This commit is contained in:
Electroblob77
2020-06-12 23:31:50 +01:00
parent 1c0e046236
commit 4bf8aff2e6
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/spell/IceAge.java
+10 -2
View File
@@ -4,6 +4,7 @@ import electroblob.wizardry.block.BlockStatue;
import electroblob.wizardry.item.SpellActions; import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryBlocks; import electroblob.wizardry.registry.WizardryBlocks;
import electroblob.wizardry.registry.WizardryItems; import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.registry.WizardryPotions;
import electroblob.wizardry.registry.WizardrySounds; import electroblob.wizardry.registry.WizardrySounds;
import electroblob.wizardry.util.AllyDesignationSystem; import electroblob.wizardry.util.AllyDesignationSystem;
import electroblob.wizardry.util.ParticleBuilder; import electroblob.wizardry.util.ParticleBuilder;
@@ -14,6 +15,7 @@ import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand; import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
@@ -23,10 +25,12 @@ import java.util.List;
public class IceAge extends Spell { public class IceAge extends Spell {
public static final String FREEZE_DURATION = "freeze_duration";
public IceAge(){ public IceAge(){
super("ice_age", SpellActions.POINT_DOWN, false); super("ice_age", SpellActions.POINT_DOWN, false);
this.soundValues(1.5f, 1.0f, 0); this.soundValues(1.5f, 1.0f, 0);
addProperties(EFFECT_RADIUS, EFFECT_DURATION); addProperties(EFFECT_RADIUS, FREEZE_DURATION, EFFECT_DURATION, EFFECT_STRENGTH);
} }
@Override @Override
@@ -47,9 +51,13 @@ public class IceAge extends Spell {
if(target instanceof EntityLiving){ if(target instanceof EntityLiving){
if(((BlockStatue)WizardryBlocks.ice_statue).convertToStatue((EntityLiving)target, if(((BlockStatue)WizardryBlocks.ice_statue).convertToStatue((EntityLiving)target,
(int)(getProperty(EFFECT_DURATION).floatValue() * modifiers.get(WizardryItems.duration_upgrade)))){ (int)(getProperty(FREEZE_DURATION).floatValue() * modifiers.get(WizardryItems.duration_upgrade)))){
target.playSound(WizardrySounds.MISC_FREEZE, 1.0F, world.rand.nextFloat() * 0.4F + 0.8F); target.playSound(WizardrySounds.MISC_FREEZE, 1.0F, world.rand.nextFloat() * 0.4F + 0.8F);
} }
}else if(target instanceof EntityPlayer){
target.addPotionEffect(new PotionEffect(WizardryPotions.frost,
(int)(getProperty(EFFECT_DURATION).floatValue() * modifiers.get(WizardryItems.duration_upgrade)),
getProperty(EFFECT_STRENGTH).intValue()));
} }
} }
} }
src/main/resources/assets/ebwizardry/spells/ice_age.json
+3 -1
View File
@@ -18,6 +18,8 @@
"cooldown": 250, "cooldown": 250,
"base_properties": { "base_properties": {
"effect_radius": 7, "effect_radius": 7,
"effect_duration": 1200 "freeze_duration": 1200,
"effect_duration": 400,
"effect_strength": 1
} }
} }