Commit Graph

15137 Commits

Author SHA1 Message Date
juliancoffee
d743293e56 clippy & fmt 2024-01-14 21:25:15 +02:00
juliancoffee
1748b5e76f Final(?) step to deprecating item names 2024-01-14 21:25:15 +02:00
juliancoffee
b8e6840bf6 Enhance /kit all
- "all" is now in proposed completions
- `/kit all` gives all imaginable items, it's not limited to assets
  anymore
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
juliancoffee
8263154a7e Discourage random i18n and prettify get_content
- Add the comment that recommends avoiding all `get_variation` methods.
- Add the comment that recommends avoiding Content with random i18n.
- Improve `get_content` docs.
2024-01-14 21:25:15 +02:00
juliancoffee
1347a31108 Deprecation step of Item::name/description
- Mark Item::name() and Item::description() deprecated, along with
  corresponding ItemDesc methods.
- Dummify dialogue code that uses items, as it's not used anyway. In the
  future it should use common_i18n::Content.
- Allow usage of deprecated .name() for Inventory ordering, for now.
- Allow usage of deprecated .name() for Inventory ordering for
  merchants, for now.
2024-01-14 21:25:15 +02:00
juliancoffee
75013cc04a Make sfx.ron use ItemKey 2024-01-14 21:25:15 +02:00
juliancoffee
9264fe77b1 Add veloren-common-i18n
- Move common::comp::chat::Content to its own place
2024-01-14 21:25:15 +02:00
Samuel Keiffer
b4ae34cd7c Merge branch 'crabman/unstack-buffs' into 'master'
Don't stack buffs of the same kind with equal attributes

See merge request veloren/veloren!4251
2024-01-14 17:54:16 +00:00
Samuel Keiffer
dc215ace34 Merge branch 'juliancoffee/buff-misc-cmd' into 'master'
Add /buff_complex command

See merge request veloren/veloren!4243
2024-01-14 17:35:21 +00:00
Maxicarlos08
3a7bb698fc
handle overlap and queueing correctly 2024-01-13 19:53:02 +01:00
Maxicarlos08
df7c2ee70a
changelog 2024-01-13 18:58:50 +01:00
Maxicarlos08
da08376e9a
Don't stack buffs of the same kind with equal attributes 2024-01-13 18:58:44 +01:00
JCoxeye
be951e747c Merge branch veloren:master into jcoxeye/price-entries 2024-01-11 14:21:23 +00:00
flo
3922d28c8b Merge branch 'hrom/twig-shoulder-fix' into 'master'
renamed twiggy shoulders

See merge request veloren/veloren!4242
2024-01-09 23:54:32 +00:00
Hrom
88c5a2e009 renamed twiggy shoulders 2024-01-09 23:54:32 +00:00
juliancoffee
296f70c1b2 Unify /buff_complex and /buff
Turns out parse_cmd_args allows omitting arguments, /buff <buff>
[misc_data] will be idential to /buff <buff> [strength] [duration]
[misc_data]
2024-01-08 20:13:17 +02:00
juliancoffee
2746a98f40 Add /buff_complex command 2024-01-08 20:13:17 +02:00
juliancoffee
5aa30b0175 Warn about complex buffs when using /buff 2024-01-08 20:13:17 +02:00
juliancoffee
18742bc7fb Fix veloren-server compilation
As veloren-server enables plugin feature automatically, it results in
veloren-common-state inherit this feature, which enables
common/state/plugin/mod.rs which asks for common::assets function that
is enabled only if plugin feature is enabled, but because
veloren-common-state doesn't depend on common::assets, this feature is
kind of lost half-way.

This commit fixes this by adding explicit optional dependency on
common-assets in common-state that is enabled by plugin feature.
2024-01-08 20:13:17 +02:00
juliancoffee
f4939220cc Add BuffKind::differentiate 2024-01-08 20:13:17 +02:00
juliancoffee
5514df330b Add BuffDescriptor enum 2024-01-08 20:13:17 +02:00
Isse
12a4c5a256 Merge branch 'the_dimasmith/update-uk' into 'master'
update Ukrainian translation

See merge request veloren/veloren!4215
2024-01-08 16:39:08 +00:00
Dmytro Kovalchuk
95f63e46e6 update Ukrainian translation 2024-01-08 16:39:08 +00:00
Darren Salt
140f7a0871 Allow either Enter or Return for sending a message. 2024-01-08 11:10:32 +00:00
Isse
16b2f05dbb Merge branch 'isse/better-cave-entrances' into 'master'
Better cave entrances

See merge request veloren/veloren!4244
2024-01-07 13:43:18 +00:00
Isse
57efeecfbc add to changelog 2024-01-07 13:15:43 +01:00
Isse
f8cb4369be clamp cave alt base at terrain alt 2024-01-07 13:14:44 +01:00
Imbris
4d4e7c8ea2 Merge branch 'yusdacra/nix-updates' into 'master'
build(nix): update flake dependencies and fix flake.nix

Closes #1916

See merge request veloren/veloren!4235
2024-01-06 02:53:48 +00:00
Imbris
03e46de748 Merge branch 'imbris/construct-dispatcher-once' into 'master'
Only construct specs::Dispatcher once

See merge request veloren/veloren!4239
2024-01-06 02:47:37 +00:00
Darren Salt
7051ba5c89 Correct/improve some en-US text. 2024-01-05 11:47:27 +00:00
Imbris
6eedea7821 review fixes #2 2024-01-04 19:55:17 -05:00
Samuel Keiffer
dbf3ed49a9 Merge branch 'More-potions' into 'master'
Potion of Agility

See merge request veloren/veloren!4197
2024-01-04 23:06:45 +00:00
Pybit
db2a63357e Update file CHANGELOG.md 2024-01-04 11:55:24 +00:00
Pybit
f6204f9d04 Merge branch 'master' into 'More-potions'
# Conflicts:
#   CHANGELOG.md
2024-01-04 11:48:30 +00:00
Imbris
807bd758b7 cargo fmt 2024-01-04 00:30:21 -05:00
Imbris
6d57169875 review fixes 2024-01-04 00:01:08 -05:00
Imbris
6c6b9181a5 Only construct specs::Dispatcher once
* use version of shred that has an added SendDispatcher so we can
  construct the dispatcher and send it between threads (only State to
  remain sendable)
* move closure for adding systems from State::tick to the creation
  functions
* this does mean some voxygen systems always run instead of just in the
  session state, but that should not cause issues and we can always
  configure them to do nothing if needed
2024-01-03 18:11:06 -05:00
Isse
100568f955 Merge branch 'feat/time_length_on_map_settings' into 'master'
Feat: Day duration slider on map creation UI (#1909)

Closes #1909

See merge request veloren/veloren!4204
2024-01-03 22:21:53 +00:00
Joaquin Tornello
0ecfbce4d2 Feat: Day duration slider on map creation UI (#1909) 2024-01-03 22:21:53 +00:00
Imbris
6f28382a69 Merge branch 'shader-fixes' into 'master'
Avoid a warning in shader code (alleged unsupported function)

See merge request veloren/veloren!4238
2024-01-03 21:39:06 +00:00
Imbris
c37f0d4c90 Merge branch 'imbris/convert-screenshot-earlier' into 'master'
Convert to rgb earlier in screenshot process.

See merge request veloren/veloren!4237
2024-01-03 20:21:32 +00:00
Darren Salt
dc0725e104 Avoid a wgpu SPIR-V warning about BitFieldUExtract
premultiply-alpha-vert.glsl contains a function unpack() which, without this
change, causes the following warnings:

WARN wgpu_core::device: Failed to parse shader SPIR-V code for Some("premultiply-alpha-vert.glsl …"): UnsupportedInstruction(Function, BitFieldUExtract)
WARN wgpu_core::device:     Proceeding unsafely without validation

This avoids that warning (and removes now-unnecessary type conversions).
2024-01-03 16:33:02 +00:00
Pybit
26520b51ef Added previously requested changes 2024-01-03 12:31:35 +00:00
Samuel Keiffer
448e1ba64a Merge branch 'crabman/airship-fix-v6' into 'master'
Fix airship captains dismounting

See merge request veloren/veloren!4225
2024-01-02 23:19:48 +00:00
Maxicarlos08
37b562aaf6
Clippyyy 2024-01-02 23:42:14 +01:00
Maxicarlos08
551d783cac
Use correct scaling for volume entity collisions 2024-01-02 23:42:14 +01:00
Maxicarlos08
004be6395f
Don't dismount if we're a steering entity 2024-01-02 23:42:14 +01:00
Imbris
fc28629148 Convert to rgb earlier in screenshot process.
Also add path information to logs when screenshot folder or file
creation fails.
2024-01-01 16:45:44 -05:00