From 137371f3946198c0552877f2b4f7a786cf964787 Mon Sep 17 00:00:00 2001 From: Sollace Date: Sun, 22 Jul 2018 17:20:14 +0200 Subject: [PATCH] Fixed derpy foal scaling --- .../model/AbstractPonyModel.java | 7 +++-- .../minelittlepony/pony/data/PonySize.java | 2 +- .../transform/PonyTransformation.java | 28 ++++++++----------- 3 files changed, 16 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/minelittlepony/model/AbstractPonyModel.java b/src/main/java/com/minelittlepony/model/AbstractPonyModel.java index 3474a6bc..33a4168d 100644 --- a/src/main/java/com/minelittlepony/model/AbstractPonyModel.java +++ b/src/main/java/com/minelittlepony/model/AbstractPonyModel.java @@ -729,16 +729,17 @@ public abstract class AbstractPonyModel extends ModelPlayer implements IModel { @Override public float getRiderYOffset() { + if (isChild()) { - return 1.05F; + return 0.25F; } switch (getMetadata().getSize()) { case NORMAL: return 0.4F; - case FOAL: return 1.05F; + case FOAL: case TALL: case LARGE: - default: return 0.25F; + default: return 0.25F; } } diff --git a/src/main/java/com/minelittlepony/pony/data/PonySize.java b/src/main/java/com/minelittlepony/pony/data/PonySize.java index 2bc80096..90b052de 100644 --- a/src/main/java/com/minelittlepony/pony/data/PonySize.java +++ b/src/main/java/com/minelittlepony/pony/data/PonySize.java @@ -7,7 +7,7 @@ public enum PonySize implements ITriggerPixelMapped { TALL(0x534b76, 0.45f, 1.1F, PonyTransformation.TALL), LARGE(0xce3254, 0.5f, 1, PonyTransformation.LARGE), NORMAL(0, 0.4f, 0.8F, PonyTransformation.NORMAL), - FOAL(0xffbe53, 0.25f, 0.8F, PonyTransformation.FOAL); + FOAL(0xffbe53, 0.25f, 0.5F, PonyTransformation.FOAL); private int triggerValue; diff --git a/src/main/java/com/minelittlepony/transform/PonyTransformation.java b/src/main/java/com/minelittlepony/transform/PonyTransformation.java index 7914fde2..7d84801b 100644 --- a/src/main/java/com/minelittlepony/transform/PonyTransformation.java +++ b/src/main/java/com/minelittlepony/transform/PonyTransformation.java @@ -11,7 +11,7 @@ public enum PonyTransformation { NORMAL { @Override public void transform(IModel model, BodyPart part) { - if (model.isSleeping()) translate(0, -0.61F, 0.25F); + if (model.isSleeping()) translate(0, -0.61F, 0); switch (part) { case NECK: @@ -52,31 +52,25 @@ public enum PonyTransformation { FOAL { @Override public void transform(IModel model, BodyPart part) { - if (model.isCrouching()) translate(0, -0.12F, 0); - if (model.isSleeping()) translate(0, -1.48F, 0.25F); - if (model.isRiding()) translate(0, -0.1F, 0); + if (model.isCrouching()) translate(0, -0.3F, 0); + if (model.isSleeping()) translate(0, -0.6F, -0.5F); + if (model.isRiding()) translate(0, -0.4F, 0); + + translate(0, 0.2F, 0); switch (part) { case NECK: - translate(0, 0.76F, 0); - scale(0.9F, 0.9F, 0.9F); + scale(1.3F, 1.3F, 1.3F); if (model.isCrouching()) translate(0, -0.01F, 0.15F); break; case HEAD: - translate(0, 0.76F, 0); - scale(0.9F, 0.9F, 0.9F); - break; - case BODY: - case TAIL: - translate(0, 0.76F, -0.04F); - scale(0.6F, 0.6F, 0.6F); + scale(1.3F, 1.3F, 1.3F); break; case LEGS: - translate(0, 0.89F, 0); - scale(0.6F, 0.41F, 0.6F); - if (model.isCrouching()) translate(0, 0.12F, 0); - if (model.isGoingFast()) translate(0, -0.08F, 0); + translate(0, 0.1F, 0); + scale(1, 0.81F, 1); break; + default: } } },