Commit Graph

1756 Commits

Author SHA1 Message Date
juliancoffee
1748b5e76f Final(?) step to deprecating item names 2024-01-14 21:25:15 +02:00
juliancoffee
aba8ec7558 Implement item localization
- Add Content::Key as proxy to Language::try_msg
- Add Content::Attr as proxy to Language::try_attr
- Extend ItemKey::TagExamples so it includes base asset id
- Implement ItemDesc::l10n using new Content variants
- Add all_items_expect() function to grab all items, because
  try_all_item_defs() covers only items in asset folder.

Required assets will go in next commit
2024-01-14 21:25:15 +02:00
juliancoffee
18e507315f Add ItemDesc::l10n method
- Add ItemL10n struct that is similar to ItemImgs except it holds i18n
  description and not items. ItemDesc::l10n uses this struct to provide
  common_i18n::Content for both names and descriptions.
  So far it only used in voxygen, but it can be used by rtsim in
  dialogues.
- Introduced new deprecation, ItemKind::Ingredient, because it uses
  item.name().
  It's not deleted, because it's used in inventory sorting, and our
  inventory sorting is, for some reason, server-side.
- Crafting UI also still uses deprecated item.name(), because again,
  sorting. It's probably will be easier to handle, because it's UI
  sorting and we can use localized names here, but still, it's a thing
  to discuss.
- Moved Item::describe() to voxygen/hud/util.

The most important thing to note is we don't want to completely delete
deprecated .name() and .description() along with corresponding fields
in ItemDef because ItemDef is now "public" API, exposed in plugins and I
don't want to break plugins before we actually implement i18n for them.
Otherwise, it would be basically impossible to use items in plugins.

What's left is actually fully implementing ItemDesc::l10n, create
item_l10n.ron and add fallback on current .name() and .description()
implementation.
2024-01-14 21:25:15 +02:00
Pybit
f6204f9d04 Merge branch 'master' into 'More-potions'
# Conflicts:
#   CHANGELOG.md
2024-01-04 11:48:30 +00:00
Pybit
26520b51ef Added previously requested changes 2024-01-03 12:31:35 +00:00
Isse
ba02d083da Merge branch 'isse/walk-toggle' into 'master'
Roleplay stuff

See merge request veloren/veloren!4171
2023-12-12 19:59:58 +00:00
Isse
b60ebd4131 don't show red text when walking 2023-12-07 20:08:03 +01:00
Isse
63e500d3d8 laying and steering animation 2023-12-07 20:08:02 +01:00
Isse
5320f83462 configurable walking speed 2023-12-07 20:08:02 +01:00
Hrom
de42ffdfd8 fixed perforate icon not displaying 2023-12-06 23:38:22 +01:00
HEIEnthusiast
933c897450 Renamed to potion of agility, burning potion to combustion 2023-12-05 14:15:54 -04:00
HEIEnthusiast
99b5571fd8 Renamed swiftness to retreating, changed model 2023-12-05 13:09:14 -04:00
Py bit
53600a941d Update mod.rs 2023-11-29 17:03:17 +00:00
HEIEnthusiast
db71625226 Merge branch 'master' of gitlab.com:veloren/dev/veloren into More-potions 2023-11-28 10:07:00 -04:00
Michał
14120232a0 Phoenix overhaul 2023-11-28 11:13:18 +00:00
HEIEnthusiast
bb2adfb2e5 Removed strength and regeneration potions 2023-11-27 15:16:44 -04:00
HEIEnthusiast
ac4101e70d Changed textures, added strength pot 2023-11-27 06:25:58 -04:00
Maxicarlos08
c689708ec9
fix stat UI bug while trading 2023-11-26 20:22:59 +01:00
HEIEnthusiast
0bb74f9efe Added swiftness and regeneration potions 2023-11-26 10:54:02 -04:00
Maxicarlos08
17904d9387 crit_power -> precise_power 2023-11-14 18:07:01 -05:00
Sam
62464dbe11 Removed crit chance stat 2023-11-14 18:06:58 -05:00
Sam
3f19c61426 Changed buffs from using hash maps to an enum map and a slot map. 2023-11-12 12:37:28 -05:00
Christof Petig
f73f52605f Support recipes and item images from plugins 2023-10-25 00:05:35 +02:00
Joshua Barretto
9dd5cd24d1 Make backpacks distinct ArmorKinds, fix visual offsets of carried weapons 2023-10-13 11:57:49 +01:00
maxicarlos08
8a5f237e9c Frost gigas tweaks 2023-10-08 11:35:01 +00:00
Marcel Märtens
8e95cb944d cargo fmt after updating new toolchain 2023-10-06 09:13:01 +02:00
Marcel Märtens
cb25a409d5 more clippy fixes in all binaries 2023-10-06 09:12:31 +02:00
Marcel Märtens
631f3ab8ee fix clippy issues, WITHOUT clippy::needless_pass_by_ref_mut as we are still unsure how to proceed with it. we want to keep the &mut ref where we are actually writing. maybe we need another method support 2023-10-05 23:23:27 +02:00
Marcel Märtens
882a8d104c Revert "extended clippy from quality.sh"
This reverts commit 30ebb7f2edcf299e4886aa7de6573ef54353a8dd.
2023-10-05 22:00:49 +02:00
Marcel Märtens
df03c92741 extended clippy from quality.sh 2023-10-05 22:00:49 +02:00
Imbris
9c398cb06d djust for changes in specs safety refactor 2023-09-24 23:46:59 -04:00
Maxicarlos08
ec42b9b5ce
don't store group id in ChatMode 2023-09-06 17:47:16 +02:00
Thomas S
4d21fbaea5 add fr translations 2023-08-29 10:14:48 +00:00
Imbris
f5445774de Update winit to 0.28
Hopefully works better on wayland!
2023-08-23 00:45:36 -04:00
Joshua Barretto
6fbca74e88 Merge branch 'maxicarlos08/dungeon-avoid-cave' into 'master'
Cheesing fixes to old-style dungeons

See merge request veloren/veloren!4014
2023-08-19 11:12:01 +00:00
Evgen Kot
9f213019d1 Settings for Si prefixes in the interface menu 2023-08-17 15:24:05 +00:00
Maxicarlos08
e5e26149ed
review 2023-08-17 11:16:20 +02:00
Maxicarlos08
92ab8dab9a
require interaction to start teleportation 2023-08-15 12:24:49 +02:00
Maxicarlos08
6a4a6bab9f
dance dance 2023-08-15 12:24:49 +02:00
Maxicarlos08
ac68f0af7b
addressed review comments and added hud interaction 2023-08-15 12:24:49 +02:00
Michal Sroczynski
b7c56c9057
Hud fix 2023-08-15 11:10:54 +02:00
Maxicarlos08
1ea0f249f5
display if pet is currently following or staying 2023-08-15 11:10:54 +02:00
TelepathicWalrus
4bdbb3ff6b
Move stay position to agent 2023-08-15 11:10:54 +02:00
TelepathicWalrus
0648ba1bc6
Clean Code
Remove option to mount if pet is told to stay
2023-08-15 11:10:53 +02:00
TelepathicWalrus
d6496c999d
Removed is_stay variable
Added server side owner and distance checks
2023-08-15 11:10:53 +02:00
TelepathicWalrus
d9d364fe79
Add stay position to PetState
Pets will now stay within 10 voxels of where they were told to stay
Added MAX_STAY_DISTANCE constant
Fixed being able to tell pet to stay when mounted
2023-08-15 11:10:53 +02:00
TelepathicWalrus
9597810e3d
Remove is_stay function
Clean code
2023-08-15 11:10:53 +02:00
TelepathicWalrus
e611d695b1
Add stay/follow option for pets 2023-08-15 11:10:52 +02:00
Isse
98385b3b15 animation 2023-08-04 13:59:22 +02:00
Isse
b06960ce1c fix interaction_text 2023-08-03 20:56:26 +02:00