mirror of
https://github.com/Sollace/Unicopia.git
synced 2024-11-30 16:28:00 +01:00
Update all the tint colours!
This commit is contained in:
parent
4ba567d5e5
commit
f7dc68b4bd
8 changed files with 20 additions and 11 deletions
|
@ -26,7 +26,7 @@ public class SpellAwkward extends AbstractSpell {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getTint() {
|
public int getTint() {
|
||||||
return 0x248712;
|
return 0xE1239C;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -37,7 +37,7 @@ public class SpellCharge extends AbstractSpell {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getTint() {
|
public int getTint() {
|
||||||
return 0x0000AA;
|
return 0x7272B7;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -70,7 +70,10 @@ public class SpellCharge extends AbstractSpell {
|
||||||
|
|
||||||
protected EntitySpell getTarget(ICaster<?> source) {
|
protected EntitySpell getTarget(ICaster<?> source) {
|
||||||
if (targettedEntity == null && targettedEntityId != null) {
|
if (targettedEntity == null && targettedEntityId != null) {
|
||||||
source.getWorld().getEntities(EntitySpell.class, e -> e.getUniqueID().equals(targettedEntityId)).stream().findFirst().ifPresent(this::setTarget);
|
source.getWorld().getEntities(EntitySpell.class, e -> e.getUniqueID().equals(targettedEntityId))
|
||||||
|
.stream()
|
||||||
|
.findFirst()
|
||||||
|
.ifPresent(this::setTarget);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (targettedEntity != null && targettedEntity.isDead) {
|
if (targettedEntity != null && targettedEntity.isDead) {
|
||||||
|
@ -89,9 +92,9 @@ public class SpellCharge extends AbstractSpell {
|
||||||
BlockPos origin = source.getOrigin();
|
BlockPos origin = source.getOrigin();
|
||||||
|
|
||||||
List<Entity> list = source.getWorld().getEntitiesInAABBexcluding(source.getEntity(),
|
List<Entity> list = source.getWorld().getEntitiesInAABBexcluding(source.getEntity(),
|
||||||
searchArea.offset(origin), this::canTargetEntity).stream().sorted((a, b) -> {
|
searchArea.offset(origin), this::canTargetEntity).stream().sorted((a, b) ->
|
||||||
return (int)(a.getDistanceSq(origin) - b.getDistanceSq(origin));
|
(int)(a.getDistanceSq(origin) - b.getDistanceSq(origin))
|
||||||
}).collect(Collectors.toList());
|
).collect(Collectors.toList());
|
||||||
|
|
||||||
if (list.size() > 0) {
|
if (list.size() > 0) {
|
||||||
setTarget((EntitySpell)list.get(0));
|
setTarget((EntitySpell)list.get(0));
|
||||||
|
|
|
@ -80,7 +80,7 @@ public class SpellFire extends AbstractSpell.RangedAreaSpell implements IUseActi
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getTint() {
|
public int getTint() {
|
||||||
return 0xFF0000;
|
return 0xFF5D00;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -68,7 +68,7 @@ public class SpellIce extends AbstractSpell.RangedAreaSpell implements IUseActio
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getTint() {
|
public int getTint() {
|
||||||
return 0xADD8E6;
|
return 0xBDBDF9;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -58,7 +58,7 @@ public class SpellInferno extends SpellFire {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getTint() {
|
public int getTint() {
|
||||||
return 0xFF8C00;
|
return 0xF00F00;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -40,7 +40,7 @@ public class SpellNecromancy extends AbstractSpell.RangedAreaSpell {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getTint() {
|
public int getTint() {
|
||||||
return 0;
|
return 0x3A3A3A;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -42,7 +42,8 @@ public class SpellRegistry {
|
||||||
registerSpell(SpellAwkward::new);
|
registerSpell(SpellAwkward::new);
|
||||||
registerSpell(SpellInferno::new);
|
registerSpell(SpellInferno::new);
|
||||||
registerSpell(SpellDrake::new);
|
registerSpell(SpellDrake::new);
|
||||||
registerSpell(GenericSpell.factory("light", 0xf0ff0f, SpellAffinity.GOOD));
|
registerSpell(SpellReveal::new);
|
||||||
|
registerSpell(GenericSpell.factory("light", 0xF7FACB, SpellAffinity.GOOD));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
|
|
|
@ -17,6 +17,11 @@ public class SpellVortex extends SpellShield {
|
||||||
return "vortex";
|
return "vortex";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getTint() {
|
||||||
|
return 0x4CDEE7;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public SpellAffinity getAffinity() {
|
public SpellAffinity getAffinity() {
|
||||||
return SpellAffinity.NEUTRAL;
|
return SpellAffinity.NEUTRAL;
|
||||||
|
|
Loading…
Reference in a new issue