Commit Graph

4652 Commits

Author SHA1 Message Date
Maxicarlos08
4276dbd628
updated bed sprite height 2024-01-25 19:40:58 +01:00
maxicarlos08
8d3cd277b9 Merge branch 'jcoxeye/price-entries' into 'master'
Lots of price entries for miscellaneous items

See merge request veloren/veloren!4231
2024-01-24 06:57:07 +00:00
Joshua Barretto
92a8bc2806 Merge branch 'zesterer/toggle-light-sprites' into 'master'
Added the ability to toggle light sources on and off

See merge request veloren/veloren!4267
2024-01-22 09:39:31 +00:00
Joshua Barretto
49ba880af0 Removed irrelevant test 2024-01-21 22:14:40 +00:00
Joshua Barretto
d836461f8d Use SpriteInteract state for toggling lights 2024-01-21 21:30:08 +00:00
Joshua Barretto
4a89d88e9b Added default sprite attribute state 2024-01-21 21:30:08 +00:00
Joshua Barretto
ad8965fdd7 Don't use distinct event system for handling sprite interactions 2024-01-21 21:30:08 +00:00
Joshua Barretto
4cbec5d93c Interaction distance check, better text 2024-01-21 21:30:08 +00:00
Joshua Barretto
e0ebe6939e Added the ability to toggle light sources on and off 2024-01-21 21:30:06 +00:00
do-no-van
646c57501f make fortitude scale of difference from maximum health 2024-01-21 20:18:19 +00:00
do-no-van
8c5759cb5e balance sword abilities 2024-01-21 20:18:19 +00:00
maxicarlos08
83a24acc1e
Add charm animation 2024-01-21 15:00:06 +01:00
Illia Denysenko
cebfb9f508 Merge branch 'timvinc/kill_npc_cmd_option' into 'master'
Fixes #1922 - Adds Flag to ArgumentSpec to support server command arguments like 'kill_npcs --also-pets'

Closes #1922

See merge request veloren/veloren!4261
2024-01-21 10:27:09 +00:00
Tim Vincent
cb1a0b9f91 Adds Flag to ArgumentSpec to support server command arguments like 'kill_npcs --also-pets' 2024-01-20 16:39:42 -08:00
Samuel Keiffer
3224bc5147 Merge branch 'crabman/earthsplitter-nerf' into 'master'
earthsplitter nerf

See merge request veloren/veloren!4264
2024-01-20 18:30:55 +00:00
Samuel Keiffer
5d6824aace Merge branch 'haniwa' into 'master'
haniwa

See merge request veloren/veloren!4234
2024-01-20 17:45:23 +00:00
flo
48a79b3e78 haniwa 2024-01-20 17:45:23 +00:00
Maxicarlos08
d30fed3961
earthsplitter nerf 2024-01-20 18:32:29 +01:00
Benoît du Garreau
b6ffb3a146 Update assets_manager to v0.11 2024-01-20 15:46:16 +00:00
Joshua Barretto
777d03b361 Categorised more sprites 2024-01-20 10:36:34 +00:00
Joshua Barretto
e5aa8cd3b7 Fix warnings 2024-01-19 20:14:32 +00:00
Joshua Barretto
5260c82c4a Overhauled sprite representation to support many more sprites and attributes 2024-01-19 18:05:56 +00:00
Joshua Barretto
a852298010 Merge branch 'zesterer/better-char-select-scene' into 'master'
Render render LoD terrain on char select, remove old backdrop figure

See merge request veloren/veloren!4254
2024-01-16 18:51:04 +00:00
Isse
4f084506c0 Merge branch 'juliancoffee/item-i18n' into 'master'
Add Item i18n

Closes #903

See merge request veloren/veloren!4250
2024-01-16 17:58:35 +00:00
juliancoffee
d3fcade857 Rename ItemL10n to ItemI18n 2024-01-16 19:14:14 +02:00
JCoxeye
941e953348 Merge branch veloren:master into jcoxeye/price-entries 2024-01-15 22:47:06 +00:00
Joshua Barretto
5bc60f2436 Add LoD zone data to char select screen 2024-01-15 19:07:19 +00:00
Maxicarlos08
d6371f7f9b
Server rules i18n and rules button in character screen 2024-01-15 00:03:23 +01:00
Joshua Barretto
3d9ab445d9
Added rules field to server description 2024-01-15 00:02:42 +01:00
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
Maxicarlos08
3a7bb698fc
handle overlap and queueing correctly 2024-01-13 19:53:02 +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
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
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
Pybit
f6204f9d04 Merge branch 'master' into 'More-potions'
# Conflicts:
#   CHANGELOG.md
2024-01-04 11:48:30 +00:00