PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2025-02-01 19:46:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Change the death message when using too much magic

Browse source
This commit is contained in:
Sollace 2020-09-24 21:02:19 +02:00
parent dc982b000c
commit 1bb305693e
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java
View file

@ -26,13 +26,13 @@ import com.minelittlepony.unicopia.network.MsgOtherPlayerCapabilities;
import com.minelittlepony.unicopia.network.MsgRequestCapabilities; import com.minelittlepony.unicopia.network.MsgRequestCapabilities;
import com.minelittlepony.unicopia.network.Transmittable; import com.minelittlepony.unicopia.network.Transmittable;
import com.minelittlepony.unicopia.util.Copieable; import com.minelittlepony.unicopia.util.Copieable;
import com.minelittlepony.unicopia.util.MagicalDamageSource;
import com.minelittlepony.common.util.animation.LinearInterpolator; import com.minelittlepony.common.util.animation.LinearInterpolator;
import com.minelittlepony.common.util.animation.Interpolator; import com.minelittlepony.common.util.animation.Interpolator;
import com.mojang.authlib.GameProfile; import com.mojang.authlib.GameProfile;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.attribute.DefaultAttributeContainer; import net.minecraft.entity.attribute.DefaultAttributeContainer;
import net.minecraft.entity.damage.DamageSource;
import net.minecraft.entity.data.DataTracker; import net.minecraft.entity.data.DataTracker;
import net.minecraft.entity.data.TrackedData; import net.minecraft.entity.data.TrackedData;
import net.minecraft.entity.data.TrackedDataHandlerRegistry; import net.minecraft.entity.data.TrackedDataHandlerRegistry;
@ -290,7 +290,7 @@ public class Pony implements Caster<PlayerEntity>, Equine<PlayerEntity>, Transmi
if (food < 0) { if (food < 0) {
entity.getHungerManager().add(-entity.getHungerManager().getFoodLevel(), 0); entity.getHungerManager().add(-entity.getHungerManager().getFoodLevel(), 0);
entity.damage(DamageSource.MAGIC, -food/2); entity.damage(MagicalDamageSource.EXHAUSTION, -food/2);
} else { } else {
entity.getHungerManager().add((int)-foodSubtract, 0); entity.getHungerManager().add((int)-foodSubtract, 0);
} }

1
src/main/java/com/minelittlepony/unicopia/util/MagicalDamageSource.java
View file

@ -15,6 +15,7 @@ import net.minecraft.text.TranslatableText;
public class MagicalDamageSource extends EntityDamageSource { public class MagicalDamageSource extends EntityDamageSource {
public static final DamageSource EXHAUSTION = new MagicalDamageSource("magical_exhaustion", true, true);
public static final DamageSource FOOD_POISONING = mundane("food_poisoning"); public static final DamageSource FOOD_POISONING = mundane("food_poisoning");
public static final DamageSource ZAP_APPLE = create("zap"); public static final DamageSource ZAP_APPLE = create("zap");

1
src/main/resources/assets/unicopia/lang/en_us.json
View file

@ -184,6 +184,7 @@
"unicopia.power.feed": "Primary Changeling ability", "unicopia.power.feed": "Primary Changeling ability",
"unicopia.power.disguise": "Secondary Changeling ability", "unicopia.power.disguise": "Secondary Changeling ability",
"death.attack.magical_exhaustion": "%1$s exhausted themselves",
"death.attack.alicorn_amulet": "%1$s was driven insane", "death.attack.alicorn_amulet": "%1$s was driven insane",
"death.attack.darkness": "%1$s went missing", "death.attack.darkness": "%1$s went missing",
"death.attack.feed": "%1$s was drained of all life", "death.attack.feed": "%1$s was drained of all life",