Move feed ability to the secondary slot for changelings and make the dispell ability available

src/main/java/com/minelittlepony/unicopia/ability/Abilities.java

@@ -47,7 +47,7 @@ public interface Abilities {
 
     // changeling
     Ability<?> DISGUISE = register(new ChangelingDisguiseAbility(), "disguise", AbilitySlot.SECONDARY);
-    Ability<?> FEED = register(new ChangelingFeedAbility(), "feed", AbilitySlot.TERTIARY);
+    Ability<?> FEED = register(new ChangelingFeedAbility(), "feed", AbilitySlot.SECONDARY);
 
     // bat
     Ability<?> HANG = register(new BatPonyHangAbility(), "hang", AbilitySlot.SECONDARY);

src/main/java/com/minelittlepony/unicopia/ability/PegasusFlightToggleAbility.java

@@ -41,7 +41,10 @@ public class PegasusFlightToggleAbility implements Ability<Hit> {
     @Override
     public Identifier getIcon(Pony player, boolean swap) {
         Identifier id = Abilities.REGISTRY.getId(this);
-        return new Identifier(id.getNamespace(), "textures/gui/ability/" + id.getPath() + (player.getPhysics().isFlying() ? "_land" : "_takeoff") + ".png");
+        return new Identifier(id.getNamespace(), "textures/gui/ability/" + id.getPath()
+            + (player.getPhysics().isFlying() ? "_land" : "_takeoff")
+            + (player.getSpecies() == Race.CHANGELING ? "_changeling" : "")
+            + ".png");
     }
 
     @Override

src/main/java/com/minelittlepony/unicopia/ability/UnicornDispellAbility.java

@@ -14,6 +14,7 @@ import com.minelittlepony.unicopia.util.TraceHelper;
 import com.minelittlepony.unicopia.util.VecHelper;
 
 import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
 
 /**
  * Dispells an active spell
@@ -32,7 +33,13 @@ public class UnicornDispellAbility implements Ability<Pos> {
 
     @Override
     public boolean canUse(Race race) {
-        return race.canCast();
+        return race.canCast() || race == Race.CHANGELING;
+    }
+
+    @Override
+    public Identifier getIcon(Pony player, boolean swap) {
+        Identifier id = Abilities.REGISTRY.getId(this);
+        return new Identifier(id.getNamespace(), "textures/gui/ability/" + id.getPath() + (player.getSpecies() == Race.CHANGELING ? "_changeling" : "") + ".png");
     }
 
     @Override
@@ -43,19 +50,21 @@ public class UnicornDispellAbility implements Ability<Pos> {
     @Override
     public boolean onQuickAction(Pony player, ActivationType type) {
 
-        if (type.getTapCount() > 1) {
+        if (player.getSpecies() != Race.CHANGELING) {
-            player.setAnimation(Animation.WOLOLO, 10);
+            if (type.getTapCount() > 1) {
-            if (player.getSpellSlot().clear()) {
+                player.setAnimation(Animation.WOLOLO, 10);
-                player.getMaster().sendMessage(Text.translatable("gui.unicopia.action.spells_cleared"), true);
+                if (player.getSpellSlot().clear()) {
-            } else {
+                    player.getMaster().sendMessage(Text.translatable("gui.unicopia.action.spells_cleared"), true);
-                player.getMaster().sendMessage(Text.translatable("gui.unicopia.action.no_spells_cleared"), true);
+                } else {
+                    player.getMaster().sendMessage(Text.translatable("gui.unicopia.action.no_spells_cleared"), true);
+                }
+                return true;
             }
-            return true;
-        }
 
-        if (type == ActivationType.TAP && player.isClient()) {
+            if (type == ActivationType.TAP && player.isClient()) {
-            InteractionManager.instance().openScreen(InteractionManager.SCREEN_DISPELL_ABILITY);
+                InteractionManager.instance().openScreen(InteractionManager.SCREEN_DISPELL_ABILITY);
-            return true;
+                return true;
+            }
         }
 
         return false;