Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'curious-potion-naming' into 'master'

Browse Source 
Curious potion naming fix (Issue #1896)

Closes #1896

See merge request veloren/veloren!4195
This commit is contained in:
crabman 2024-05-15 12:12:16 +00:00
commit b2d7a9291a
8 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/common/item_i18n_manifest.ron
View File

@ -3163,8 +3163,8 @@
"common.items.crafting_ing.cloth.wool", "common.items.crafting_ing.cloth.wool",
): "sprite-crafting_ing-cloth-wool", ): "sprite-crafting_ing-cloth-wool",
Simple( Simple(
"common.items.consumable.curious_potion", "common.items.consumable.potion_curious",
): "object-curious_potion", ): "object-potion_curious",
Simple( Simple(
"common.items.consumable.potion_agility", "common.items.consumable.potion_agility",
): "object-potion_agility", ): "object-potion_agility",

0
assets/common/items/consumable/curious_potion.ron → assets/common/items/consumable/potion_curious.ron
View File

2
assets/common/loot_tables/calendar/april_fools/trickster.ron
View File

@ -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")), (0.5, Item("common.items.armor.misc.head.cat_capuche")),
(19.0, Nothing), (19.0, Nothing),
] ]

2
assets/voxygen/i18n/en/item/items/potion.ftl
View File

@ -1,7 +1,7 @@
object-potion_red = Potent Potion object-potion_red = Potent Potion
.desc = A potent healing potion. .desc = A potent healing potion.
object-curious_potion = Curious Potion object-potion_curious = Curious Potion
.desc = Wonder what this does... .desc = Wonder what this does...
object-potion_agility = Potion of Agility object-potion_agility = Potion of Agility

4
assets/voxygen/item_image_manifest.ron
View File

@ -3227,8 +3227,8 @@
"voxel.object.potion_red", "voxel.object.potion_red",
(0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.9, (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.9,
), ),
Simple("common.items.consumable.curious_potion"): VoxTrans( Simple("common.items.consumable.potion_curious"): VoxTrans(
"voxel.object.curious_potion", "voxel.object.potion_curious",
(0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.7, (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.7,
), ),
Simple("common.items.consumable.potion_combustion"): VoxTrans( Simple("common.items.consumable.potion_combustion"): VoxTrans(

2
assets/voxygen/voxel/item_drop_manifest.ron
View File

@ -816,7 +816,7 @@
Simple("common.items.consumable.potion_med"): "voxel.object.potion_red", 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_minor"): "voxel.object.potion_red",
Simple("common.items.consumable.potion_big"): "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_combustion"): "voxel.object.potion_combustion",
Simple("common.items.consumable.potion_agility"): "voxel.object.potion_agility", Simple("common.items.consumable.potion_agility"): "voxel.object.potion_agility",
Simple("common.items.charms.burning_charm"): "voxel.object.burning_charm", Simple("common.items.charms.burning_charm"): "voxel.object.burning_charm",

0
assets/voxygen/voxel/object/curious_potion.vox → assets/voxygen/voxel/object/potion_curious.vox
View File

2
server/src/migrations/V59__potion_curious.sql Normal file
View File

@ -0,0 +1,2 @@
UPDATE item
SET item_definition_id = 'common.items.consumable.potion_curious' WHERE item_definition_id = 'common.items.consumable.curious_potion';