diff --git a/assets/common/item_i18n_manifest.ron b/assets/common/item_i18n_manifest.ron index a3855235ae..5e1f0375b1 100644 --- a/assets/common/item_i18n_manifest.ron +++ b/assets/common/item_i18n_manifest.ron @@ -3163,8 +3163,8 @@ "common.items.crafting_ing.cloth.wool", ): "sprite-crafting_ing-cloth-wool", Simple( - "common.items.consumable.curious_potion", - ): "object-curious_potion", + "common.items.consumable.potion_curious", + ): "object-potion_curious", Simple( "common.items.consumable.potion_agility", ): "object-potion_agility", diff --git a/assets/common/items/consumable/curious_potion.ron b/assets/common/items/consumable/potion_curious.ron similarity index 100% rename from assets/common/items/consumable/curious_potion.ron rename to assets/common/items/consumable/potion_curious.ron diff --git a/assets/common/loot_tables/calendar/april_fools/trickster.ron b/assets/common/loot_tables/calendar/april_fools/trickster.ron index 4cd41ec465..b5f0394843 100644 --- a/assets/common/loot_tables/calendar/april_fools/trickster.ron +++ b/assets/common/loot_tables/calendar/april_fools/trickster.ron @@ -1,5 +1,5 @@ [ - (1.0, Item("common.items.consumable.curious_potion")), + (1.0, Item("common.items.consumable.potion_curious")), (0.5, Item("common.items.armor.misc.head.cat_capuche")), (19.0, Nothing), -] \ No newline at end of file +] diff --git a/assets/voxygen/i18n/en/item/items/potion.ftl b/assets/voxygen/i18n/en/item/items/potion.ftl index c41d830143..0b759ca224 100644 --- a/assets/voxygen/i18n/en/item/items/potion.ftl +++ b/assets/voxygen/i18n/en/item/items/potion.ftl @@ -1,7 +1,7 @@ object-potion_red = Potent Potion .desc = A potent healing potion. -object-curious_potion = Curious Potion +object-potion_curious = Curious Potion .desc = Wonder what this does... object-potion_agility = Potion of Agility diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 23cc5b1401..7458419f49 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -3227,8 +3227,8 @@ "voxel.object.potion_red", (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.9, ), - Simple("common.items.consumable.curious_potion"): VoxTrans( - "voxel.object.curious_potion", + Simple("common.items.consumable.potion_curious"): VoxTrans( + "voxel.object.potion_curious", (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.7, ), Simple("common.items.consumable.potion_combustion"): VoxTrans( diff --git a/assets/voxygen/voxel/item_drop_manifest.ron b/assets/voxygen/voxel/item_drop_manifest.ron index ab03e07a87..45393556c8 100644 --- a/assets/voxygen/voxel/item_drop_manifest.ron +++ b/assets/voxygen/voxel/item_drop_manifest.ron @@ -816,7 +816,7 @@ Simple("common.items.consumable.potion_med"): "voxel.object.potion_red", Simple("common.items.consumable.potion_minor"): "voxel.object.potion_red", Simple("common.items.consumable.potion_big"): "voxel.object.potion_red", - Simple("common.items.consumable.curious_potion"): "voxel.object.curious_potion", + Simple("common.items.consumable.potion_curious"): "voxel.object.potion_curious", Simple("common.items.consumable.potion_combustion"): "voxel.object.potion_combustion", Simple("common.items.consumable.potion_agility"): "voxel.object.potion_agility", Simple("common.items.charms.burning_charm"): "voxel.object.burning_charm", diff --git a/assets/voxygen/voxel/object/curious_potion.vox b/assets/voxygen/voxel/object/potion_curious.vox similarity index 100% rename from assets/voxygen/voxel/object/curious_potion.vox rename to assets/voxygen/voxel/object/potion_curious.vox diff --git a/server/src/migrations/V59__potion_curious.sql b/server/src/migrations/V59__potion_curious.sql new file mode 100644 index 0000000000..a46a77977a --- /dev/null +++ b/server/src/migrations/V59__potion_curious.sql @@ -0,0 +1,2 @@ +UPDATE item +SET item_definition_id = 'common.items.consumable.potion_curious' WHERE item_definition_id = 'common.items.consumable.curious_potion';