PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2024-11-23 04:57:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed derpy foal scaling

Browse source
This commit is contained in:
Sollace 2018-07-22 17:20:14 +02:00
parent 76a3f30f32
commit 137371f394
3 changed files with 16 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/com/minelittlepony/model/AbstractPonyModel.java
View file

@ -729,16 +729,17 @@ public abstract class AbstractPonyModel extends ModelPlayer implements IModel {
@Override @Override
public float getRiderYOffset() { public float getRiderYOffset() {
if (isChild()) { if (isChild()) {
return 1.05F; return 0.25F;
} }
switch (getMetadata().getSize()) { switch (getMetadata().getSize()) {
case NORMAL: return 0.4F; case NORMAL: return 0.4F;
case FOAL: return 1.05F; case FOAL:
case TALL: case TALL:
case LARGE: case LARGE:
default: return 0.25F; default: return 0.25F;
} }
} }

2
src/main/java/com/minelittlepony/pony/data/PonySize.java
View file

@ -7,7 +7,7 @@ public enum PonySize implements ITriggerPixelMapped<PonySize> {
TALL(0x534b76, 0.45f, 1.1F, PonyTransformation.TALL), TALL(0x534b76, 0.45f, 1.1F, PonyTransformation.TALL),
LARGE(0xce3254, 0.5f, 1, PonyTransformation.LARGE), LARGE(0xce3254, 0.5f, 1, PonyTransformation.LARGE),
NORMAL(0, 0.4f, 0.8F, PonyTransformation.NORMAL), 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; private int triggerValue;

28
src/main/java/com/minelittlepony/transform/PonyTransformation.java
View file

@ -11,7 +11,7 @@ public enum PonyTransformation {
NORMAL { NORMAL {
@Override @Override
public void transform(IModel model, BodyPart part) { 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) { switch (part) {
case NECK: case NECK:
@ -52,31 +52,25 @@ public enum PonyTransformation {
FOAL { FOAL {
@Override @Override
public void transform(IModel model, BodyPart part) { public void transform(IModel model, BodyPart part) {
if (model.isCrouching()) translate(0, -0.12F, 0); if (model.isCrouching()) translate(0, -0.3F, 0);
if (model.isSleeping()) translate(0, -1.48F, 0.25F); if (model.isSleeping()) translate(0, -0.6F, -0.5F);
if (model.isRiding()) translate(0, -0.1F, 0); if (model.isRiding()) translate(0, -0.4F, 0);
translate(0, 0.2F, 0);
switch (part) { switch (part) {
case NECK: case NECK:
translate(0, 0.76F, 0); scale(1.3F, 1.3F, 1.3F);
scale(0.9F, 0.9F, 0.9F);
if (model.isCrouching()) translate(0, -0.01F, 0.15F); if (model.isCrouching()) translate(0, -0.01F, 0.15F);
break; break;
case HEAD: case HEAD:
translate(0, 0.76F, 0); scale(1.3F, 1.3F, 1.3F);
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);
break; break;
case LEGS: case LEGS:
translate(0, 0.89F, 0); translate(0, 0.1F, 0);
scale(0.6F, 0.41F, 0.6F); scale(1, 0.81F, 1);
if (model.isCrouching()) translate(0, 0.12F, 0);
if (model.isGoingFast()) translate(0, -0.08F, 0);
break; break;
default:
} }
} }
}, },