diff --git a/src/main/java/com/minelittlepony/unicopia/Race.java b/src/main/java/com/minelittlepony/unicopia/Race.java index 57b44e26..3656e5c0 100644 --- a/src/main/java/com/minelittlepony/unicopia/Race.java +++ b/src/main/java/com/minelittlepony/unicopia/Race.java @@ -19,6 +19,7 @@ public enum Race { EARTH(false, false, true), UNICORN(true, false, false), PEGASUS(false, true, false), + BAT(false, true, false), ALICORN(true, true, true), CHANGELING(false, true, false); @@ -59,7 +60,7 @@ public enum Race { } public boolean canInteractWithClouds() { - return canFly() && this != CHANGELING; + return canFly() && this != CHANGELING && this != BAT; } public String getTranslationKey() { diff --git a/src/main/java/com/minelittlepony/unicopia/ability/Abilities.java b/src/main/java/com/minelittlepony/unicopia/ability/Abilities.java index 9fe4ad2b..7f3fc2e7 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/Abilities.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/Abilities.java @@ -10,16 +10,18 @@ public interface Abilities { MutableRegistry KEYS_CODES = new SimpleRegistry<>(); MutableRegistry> REGISTRY = new SimpleRegistry<>(); - // unicorn + // unicorn / alicorn Ability TELEPORT = register(new UnicornTeleportAbility(), "teleport", GLFW.GLFW_KEY_O); Ability CAST = register(new UnicornCastingAbility(), "cast", GLFW.GLFW_KEY_P); - // earth + // earth / alicorn Ability GROW = register(new EarthPonyGrowAbility(), "grow", GLFW.GLFW_KEY_N); Ability STOMP = register(new EarthPonyStompAbility(), "stomp", GLFW.GLFW_KEY_M); - // pegasus - Ability CARRY = register(new PegasusCarryAbility(), "carry", GLFW.GLFW_KEY_K); + // pegasus / bat / alicorn / changeling + Ability CARRY = register(new CarryAbility(), "carry", GLFW.GLFW_KEY_K); + + // pegasus / alicorn Ability CLOUD = register(new PegasusCloudInteractionAbility(), "cloud", GLFW.GLFW_KEY_J); // changeling diff --git a/src/main/java/com/minelittlepony/unicopia/ability/PegasusCarryAbility.java b/src/main/java/com/minelittlepony/unicopia/ability/CarryAbility.java similarity index 97% rename from src/main/java/com/minelittlepony/unicopia/ability/PegasusCarryAbility.java rename to src/main/java/com/minelittlepony/unicopia/ability/CarryAbility.java index 89cfd861..88f6cdfc 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/PegasusCarryAbility.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/CarryAbility.java @@ -15,7 +15,7 @@ import net.minecraft.world.World; /** * Pegasi ability to pick up and carry other players */ -public class PegasusCarryAbility implements Ability { +public class CarryAbility implements Ability { @Override public int getWarmupTime(Pony player) { diff --git a/src/main/resources/assets/unicopia/lang/en_us.json b/src/main/resources/assets/unicopia/lang/en_us.json index 12b21b21..f4601626 100644 --- a/src/main/resources/assets/unicopia/lang/en_us.json +++ b/src/main/resources/assets/unicopia/lang/en_us.json @@ -1,25 +1,22 @@ { "tile.cloud_block.name": "Block of Cloud", - "tile.packed_cloud_block.name": "Dense Cloud", + "tile.dense_cloud_block.name": "Dense Cloud", "tile.enchanted_cloud_block.name": "Enchanted Cloud", "tile.cloud_slab.name": "Cloud Slab", - "tile.double_cloud_slab.name": "Double Cloud Slab", - "tile.packed_cloud_slab.name": "Dense Cloud Slab", - "tile.packed_normal_cloud_slab.name": "Double Dense Cloud Slab", + "tile.dense_cloud_slab.name": "Dense Cloud Slab", "tile.enchanted_cloud_slab.name": "Enchanted Cloud Slab", - "tile.double_enchanted_cloud_slab.name": "Double Enchanted Cloud Slab", "tile.cloud_stairs.name": "Cloud Stairs", "tile.cloud_fence.name": "Cloud Fence", "tile.cloud_banister.name": "Banister", "tile.cloud_farmland.name": "Tilled Clouds", - "tile.hive.name": "Hive Wall", - "tile.chitin_block.name": "Chitin Block", - "tile.chissled_chitin.name": "Chiseled Chitin Block", + "tile.hive_wall_block.name": "Hive Wall Block", + "tile.chitin_shell_block.name": "Chitin Shell Block", + "tile.chiseled_chitin_shell_block.name": "Chiseled Chitin Shell Block", "tile.chitin_shell.name": "Chitin Shell", - "tile.cuccoon.name": "Cocoon", + "tile.slime_drop.name": "Slime Droplet", "tile.slime_layer.name": "Slime", "tile.apple_leaves.name": "Apple Leaves", @@ -34,7 +31,7 @@ "item.construction_cloud_spawner.name": "Construction Cloud", "item.wild_cloud_spawner.name": "Wild Cloud", - "item.mist_door.name": "Cloud Door", + "item.misted_glass_door.name": "Misted Glass Door", "item.library_door.name": "Dutch Library Door", "item.bakery_door.name": "Dutch Bakery Door", "item.diamond_door.name": "Diamond Door", @@ -158,7 +155,7 @@ "item.hay_fries.name": "Hay Fries", "item.salad.name": "Salad", "item.wheat_worms.name": "Wheat Worms", - "item.apple_cider.name": "Apple Cider", + "item.cider.name": "Cider", "item.mug.name": "Mug", "item.juice.name": "Juice", @@ -222,6 +219,10 @@ "commands.race.describe.changeling.1": "Beware the changeling, for they can appear when least expected.", "commands.race.describe.changeling.2": "Changelings can fly but but do not interact with clouds.", "commands.race.describe.changeling.3": "They have to feed on mobs and other players to eat.", + + "commands.race.describe.bat.1": "I am the night! EEEEEEEEEEEEE!!!", + "commands.race.describe.bat.2": "Bat Ponies can fly but but do not interact with clouds.", + "commands.race.describe.bat.3": "They love mangoes. Give them one, and they will follow you forever.", "commands.racelist.usage": "/racelist ", "commands.racelist.illegal": "The default race %s cannot be used with this command.", @@ -258,6 +259,8 @@ "unicopia.race.alicorn.alt": "Alicorns", "unicopia.race.changeling": "Changeling", "unicopia.race.changeling.alt": "Changelings", + "unicopia.race.bat": "Bat Pony", + "unicopia.race.bat.alt": "Bat Ponies", "unicopia.category.name": "Pony Abilities",