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

Fixed black holes not growing

Browse source
This commit is contained in:
Sollace 2023-09-05 20:03:49 +01:00
parent 3a4da158db
commit 02ed9e278b
No known key found for this signature in database
GPG key ID: E52FACE7B5C773DB
2 changed files with 12 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/AttractiveSpell.java
View file

@ -38,10 +38,12 @@ public class AttractiveSpell extends ShieldSpell implements HomingSpell, TimedSp
@Override @Override
public boolean tick(Caster<?> caster, Situation situation) { public boolean tick(Caster<?> caster, Situation situation) {
timer.tick(); if (getType() != SpellType.DARK_VORTEX) {
timer.tick();
if (timer.getTicksRemaining() <= 0) { if (timer.getTicksRemaining() <= 0) {
return false; return false;
}
} }
setDirty(); setDirty();

24
src/main/java/com/minelittlepony/unicopia/ability/magic/spell/effect/DarkVortexSpell.java
View file

@ -118,27 +118,18 @@ public class DarkVortexSpell extends AttractiveSpell implements ProjectileDelega
float radius = (float)getEventHorizonRadius(); float radius = (float)getEventHorizonRadius();
particlEffect.update(getUuid(), source, spawner -> { particlEffect.update(getUuid(), source, spawner -> {
spawner.addParticle(new SphereParticleEffect(UParticles.SPHERE, getType().getColor(), 0.99F, radius, SPHERE_OFFSET), source.getOriginVector(), Vec3d.ZERO); spawner.addParticle(new SphereParticleEffect(UParticles.SPHERE, 0x000000, 0.99F, radius, SPHERE_OFFSET), source.getOriginVector(), Vec3d.ZERO);
}).ifPresent(p -> { }).ifPresent(p -> {
p.setAttribute(Attachment.ATTR_RADIUS, radius); p.setAttribute(Attachment.ATTR_RADIUS, radius);
p.setAttribute(Attachment.ATTR_OPACITY, 2F);
}); });
particlEffect.update(getUuid(), "_ring", source, spawner -> { particlEffect.update(getUuid(), "_ring", source, spawner -> {
spawner.addParticle(new SphereParticleEffect(UParticles.DISK, 0xFFFFFFFF, 0.4F, radius + 1, SPHERE_OFFSET), getOrigin(source), Vec3d.ZERO); spawner.addParticle(new SphereParticleEffect(UParticles.DISK, 0xAAAAAA, 0.4F, radius + 1, SPHERE_OFFSET), getOrigin(source), Vec3d.ZERO);
}).ifPresent(p -> { }).ifPresent(p -> {
p.setAttribute(Attachment.ATTR_RADIUS, radius * 2F); p.setAttribute(Attachment.ATTR_RADIUS, radius * 0F);
p.setAttribute(Attachment.ATTR_COLOR, 0xAAAAAA);
}); });
double angle = age % 260;
source.spawnParticles(ParticleTypes.SMOKE, 3); source.spawnParticles(ParticleTypes.SMOKE, 3);
if (radius > 2) {
source.addParticle(new SphereParticleEffect(UParticles.DISK, 0xFF0000, 1, radius),
getOrigin(source).add(0, 0.2, 0), new Vec3d(0, angle, 10));
source.addParticle(new SphereParticleEffect(UParticles.DISK, 0xFF0000, 1, radius),
getOrigin(source).add(0, -0.2, 0), new Vec3d(0, angle, 10));
}
} }
@Override @Override
@ -208,7 +199,7 @@ public class DarkVortexSpell extends AttractiveSpell implements ProjectileDelega
return; return;
} }
if (distance <= getEventHorizonRadius()) { if (distance <= getEventHorizonRadius() + 0.5) {
target.setVelocity(target.getVelocity().multiply(distance / (2 * radius))); target.setVelocity(target.getVelocity().multiply(distance / (2 * radius)));
@Nullable @Nullable
@ -234,11 +225,10 @@ public class DarkVortexSpell extends AttractiveSpell implements ProjectileDelega
target.damage(source.damageOf(UDamageTypes.GAVITY_WELL_RECOIL, source), Integer.MAX_VALUE); target.damage(source.damageOf(UDamageTypes.GAVITY_WELL_RECOIL, source), Integer.MAX_VALUE);
if (!(target instanceof PlayerEntity)) { if (!(target instanceof PlayerEntity)) {
target.discard(); target.discard();
source.asWorld().playSound(null, source.getOrigin(), USounds.ENCHANTMENT_CONSUMPTION_CONSUME, SoundCategory.AMBIENT, 2, 0.02F);
} }
if (!source.subtractEnergyCost(-massOfTarget * 10)) { source.subtractEnergyCost(-massOfTarget * 10);
setDead();
}
source.asWorld().playSound(null, source.getOrigin(), USounds.AMBIENT_DARK_VORTEX_MOOD, SoundCategory.AMBIENT, 2, 0.02F); source.asWorld().playSound(null, source.getOrigin(), USounds.AMBIENT_DARK_VORTEX_MOOD, SoundCategory.AMBIENT, 2, 0.02F);
} else { } else {
double force = getAttractiveForce(source, target); double force = getAttractiveForce(source, target);