PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2024-11-24 05:47:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Start with a full mana bar rather than forcing the player to recharge

Browse source
This commit is contained in:
Sollace 2020-10-09 19:09:34 +02:00
parent e894fd3a58
commit c300e401b5
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/main/java/com/minelittlepony/unicopia/entity/player/ManaContainer.java
View file

@ -13,10 +13,10 @@ public class ManaContainer implements MagicReserves {
public ManaContainer(Pony pony) { public ManaContainer(Pony pony) {
this.pony = pony; this.pony = pony;
this.energy = new BarInst(Pony.ENERGY, 100F); this.energy = new BarInst(Pony.ENERGY, 100F, 0);
this.exertion = new BarInst(Pony.EXERTION, 10F); this.exertion = new BarInst(Pony.EXERTION, 10F, 0);
this.xp = new BarInst(Pony.XP, 1); this.xp = new BarInst(Pony.XP, 1, 0);
this.mana = new XpCollectingBar(Pony.MANA, 100F); this.mana = new XpCollectingBar(Pony.MANA, 100F, 100F);
} }
@Override @Override
@ -40,8 +40,8 @@ public class ManaContainer implements MagicReserves {
class XpCollectingBar extends BarInst { class XpCollectingBar extends BarInst {
XpCollectingBar(TrackedData<Float> marker, float max) { XpCollectingBar(TrackedData<Float> marker, float max, float initial) {
super(marker, max); super(marker, max, initial);
} }
@Override @Override
@ -49,7 +49,10 @@ public class ManaContainer implements MagicReserves {
float diff = value - get(); float diff = value - get();
if (diff < 0) { if (diff < 0) {
if (pony.getLevel().canLevelUp()) { if (pony.getLevel().canLevelUp()) {
xp.add(-diff / (100 * (1 + pony.getLevel().get())));
diff /= Math.pow(1000, 1 + pony.getLevel().get());
xp.add(-diff);
if (xp.getPercentFill() >= 1) { if (xp.getPercentFill() >= 1) {
pony.getLevel().add(1); pony.getLevel().add(1);
xp.set(0); xp.set(0);
@ -68,10 +71,10 @@ public class ManaContainer implements MagicReserves {
private final TrackedData<Float> marker; private final TrackedData<Float> marker;
private final float max; private final float max;
BarInst(TrackedData<Float> marker, float max) { BarInst(TrackedData<Float> marker, float max, float initial) {
this.marker = marker; this.marker = marker;
this.max = max; this.max = max;
pony.getMaster().getDataTracker().startTracking(marker, 0F); pony.getMaster().getDataTracker().startTracking(marker, initial);
} }
@Override @Override