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

Properly replace existing spells when casting one with different traits. #353

Browse source
This commit is contained in:
Sollace 2024-05-18 13:14:20 +01:00
parent e053539d1b
commit 1d15630566
No known key found for this signature in database
GPG key ID: E52FACE7B5C773DB
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/com/minelittlepony/unicopia/ability/UnicornCastingAbility.java
View file

@ -100,12 +100,19 @@ public class UnicornCastingAbility extends AbstractSpellCastingAbility {
if (newSpell.getResult() != ActionResult.FAIL && canCast(newSpell.getValue().type())) { if (newSpell.getResult() != ActionResult.FAIL && canCast(newSpell.getValue().type())) {
CustomisedSpellType<?> spell = newSpell.getValue(); CustomisedSpellType<?> spell = newSpell.getValue();
if (newSpell.getResult() == ActionResult.CONSUME) {
CustomisedSpellType<?> equippedType = player.getCharms().getEquippedSpell(player.getCharms().getHand());
if (equippedType.type() == spell.type()) {
player.getCharms().equipSpell(player.getCharms().getHand(), spell);
}
}
boolean hasExact = player.getSpellSlot().contains(spell);
boolean removed = player.getSpellSlot().removeWhere(s -> { boolean removed = player.getSpellSlot().removeWhere(s -> {
return s.findMatches(spell).findAny().isPresent() && (spell.isEmpty() || !SpellType.PLACED_SPELL.test(s)); return s.findMatches(spell.type()).findAny().isPresent() && (spell.isEmpty() || !SpellType.PLACED_SPELL.test(s));
}, true); }, true);
player.subtractEnergyCost(removed ? 2 : 4); player.subtractEnergyCost(removed ? 2 : 4);
if (!removed) { if (!hasExact && !spell.isEmpty()) {
Spell s = spell.apply(player, CastingMethod.DIRECT); Spell s = spell.apply(player, CastingMethod.DIRECT);
if (s == null) { if (s == null) {
player.spawnParticles(ParticleTypes.LARGE_SMOKE, 6); player.spawnParticles(ParticleTypes.LARGE_SMOKE, 6);