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
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
Joaquin Tornello
0ecfbce4d2
Feat: Day duration slider on map creation UI ( #1909 )
2024-01-03 22:21:53 +00:00
Pybit
26520b51ef
Added previously requested changes
2024-01-03 12:31:35 +00:00
Maxicarlos08
551d783cac
Use correct scaling for volume entity collisions
2024-01-02 23:42:14 +01:00
Samuel Keiffer
5bd089c56d
Merge branch 'sam/remove-combo-melee' into 'master'
...
Deprecated combo melee character state
See merge request veloren/veloren!4233
2023-12-29 17:29:44 +00:00
DaforLynx
0b62898060
Audio fixes and new music
2023-12-29 00:25:08 +00:00
Sam
f65d449aa3
Deprecated combo melee character state
2023-12-28 19:02:10 -05:00
JCoxeye
0f46eeaa78
Added price entries for glass and bone dungeon keys to collection.ron, and listed their good type as default in trade_pricing.rs
2023-12-27 07:59:03 -05:00
flo
8e76aaceb8
make_crustaceans_tameable
2023-12-26 19:55:21 +00:00
Christof Petig
5af8c4687e
Merge branch 'christof/christmas23' into 'master'
...
Christmas theme revival
See merge request veloren/veloren!4209
2023-12-20 17:02:01 +00:00
flo
0a42a51810
Merge branch 'poise_resilience_buffs' into 'master'
...
poise_resilience_buffs_for_dagon_and_wyverns
See merge request veloren/veloren!4207
2023-12-17 20:12:13 +00:00
flo
6f5e385d2a
poise_resilience_buffs_for_dagon_and_wyverns
2023-12-17 20:12:13 +00:00
Uniior
737b5761f6
Crate and Barrel sprites
2023-12-17 16:17:14 +00:00
flo
569ab5c5ed
crustacean-skeleton and crab
2023-12-16 13:47:55 +00:00
Christof Petig
f55a70a2a8
fix doctest
2023-12-16 14:40:26 +01:00
Christof Petig
4b7f3d07d2
add hirdrasil ornament variants and fix clippy
2023-12-16 12:10:17 +01:00
Christof Petig
9b485456eb
Calendar based gear for villagers
2023-12-14 16:31:48 +01:00
Isse
8569f30336
review fixes
2023-12-12 19:41:40 +01:00
Isse
a3a19ecc3a
tavern rtsim
2023-12-07 20:08:03 +01:00
Isse
eb2395a401
walk fixes
2023-12-07 20:08:03 +01:00
Isse
63e500d3d8
laying and steering animation
2023-12-07 20:08:02 +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
HEIEnthusiast
7d7937df36
,
2023-11-28 13:42:24 -04:00
HEIEnthusiast
2497c04a63
Code quality fix :(
2023-11-28 12:11:34 -04:00
HEIEnthusiast
5001c4a262
Added swiftness debuffs
2023-11-28 11:41:29 -04:00
HEIEnthusiast
db71625226
Merge branch 'master' of gitlab.com:veloren/dev/veloren into More-potions
2023-11-28 10:07:00 -04:00
HEIEnthusiast
568d12cdd0
Swiftness potion changes
2023-11-28 10:03:07 -04:00
Michał
14120232a0
Phoenix overhaul
2023-11-28 11:13:18 +00:00
Maxicarlos08
2da97747e5
Addressed review comments
2023-11-27 21:29:13 +01:00
maxicarlos08
d05586f08a
fix small precision bug
2023-11-27 21:28:12 +01:00
maxicarlos08
c7ee737fef
Add hit_timing to BasicMelee
2023-11-27 21:28:12 +01:00
HEIEnthusiast
b6c67a7f41
Made handle_jump use it's own jump_modifier stat
2023-11-27 16:15:29 -04:00
HEIEnthusiast
bb2adfb2e5
Removed strength and regeneration potions
2023-11-27 15:16:44 -04:00
Py bit
e0de63dbf8
Update buff.rs
2023-11-27 12:25:23 +00:00
Py bit
16b873590b
Update buff.rs
2023-11-27 12:02:54 +00:00
Py bit
0074be2339
Update buff.rs
2023-11-27 11:39:30 +00:00
HEIEnthusiast
783cfdc719
Merge branch 'master' into More-potions
2023-11-27 07:00:48 -04:00
HEIEnthusiast
59c3162c49
Merge branch 'master' of https://gitlab.com/veloren/dev/veloren
...
12 commits behind master fix
2023-11-27 06:32:18 -04:00
HEIEnthusiast
ac4101e70d
Changed textures, added strength pot
2023-11-27 06:25:58 -04:00
Isse
69e827dfda
Merge branch 'isse/very-cool-commands' into 'master'
...
Target any entity with commands, and a few new commands.
See merge request veloren/veloren!4192
2023-11-26 15:13:45 +00:00
HEIEnthusiast
0bb74f9efe
Added swiftness and regeneration potions
2023-11-26 10:54:02 -04:00
Isse
a151a6f550
tether length argument
2023-11-23 22:22:34 +01:00
Isse
4d8bcf0a92
only preprocess for entity target argument
2023-11-23 11:04:30 +01:00
Isse
5a3e6316a5
fix tethering
2023-11-23 01:01:31 +01:00
maxicarlos08
4456643867
Don't use attacker orientation for calculating melee precision
2023-11-23 00:55:17 +01:00
Isse
34edfdb7a2
link related commands
2023-11-22 23:10:32 +01:00
Isse
1071fd0bca
entity targets
2023-11-22 22:40:56 +01:00
Isse
456c0ad3e8
Merge branch 'isse/rtsim-vehicles' into 'master'
...
Unify RTSim vehicles and NPCs
See merge request veloren/veloren!4168
2023-11-22 14:53:58 +00:00
Sam
4e0e94b5c6
Removed spin melee character state
2023-11-16 19:17:38 -05:00
maxicarlos08
a5199a966a
Include required serde feature for enum-map in veloren-common
...
This previously broke torvus builds, but worked fine for builds here
since veloren-rtsim enabled the serde feature.
2023-11-16 21:47:44 +01:00
Isse
7856aac713
Remove dead code and factor out into Dir::random_2d
2023-11-15 11:58:26 +01:00
Isse
e0dbba0279
clippy fixes
2023-11-15 11:58:26 +01:00
Isse
7fd255ec6c
bug fixes and airships land at airship stations
2023-11-15 11:58:26 +01:00
Isse
1f195fd848
Make vehicles npcs and npc uid used in rtsim commands
2023-11-15 11:58:26 +01:00
Sam
13148bd436
Changed how max precision was calculated to make it more compact.
2023-11-14 18:16:42 -05:00
Sam
fb3d0208b9
Changelog
2023-11-14 18:10:51 -05:00
Sam
49756ac37c
Headshots from above are less precise, headshots from below are no longer precise.
2023-11-14 18:07:02 -05:00
Maxicarlos08
17904d9387
crit_power -> precise_power
2023-11-14 18:07:01 -05:00
Sam
f47b61d446
Adjusted precision multipliers.
2023-11-14 18:07:00 -05:00
Sam
6814ce8134
Addressed review comments.
2023-11-14 18:07:00 -05:00
Sam
d3b3bca621
Added precision
2023-11-14 18:06:59 -05:00
Sam
62464dbe11
Removed crit chance stat
2023-11-14 18:06:58 -05:00
Samuel Keiffer
fdb28ec2dd
Merge branch 'sam/buff-maps' into 'master'
...
Changed buffs from using hash maps to an enum map and a slot map.
See merge request veloren/veloren!4182
2023-11-14 01:49:49 +00:00
Sam
a4df3f8ad5
Split action state into two sets of state, one each for combat and behavior.
2023-11-12 12:45:03 -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
Sam
e37f085114
Changed terrain check to use beam position instead of entity position.
2023-11-11 15:17:59 -05:00
Christof Petig
d193e03a03
Merge branch 'christof/kits_in_plugins' into 'master'
...
support adding kits, presets and resource experience by plugins
See merge request veloren/veloren!4173
2023-11-07 23:06:17 +00:00
Christof Petig
e7e4c20445
fix test and code quality
2023-11-07 22:54:19 +01:00
Christof Petig
2fbdf42360
support adding kits, presets and resource experience by plugins
2023-11-07 20:24:13 +01:00
maxicarlos08
17094ad569
remove_previous -> enforced_limit
2023-11-03 07:51:54 +01:00
maxicarlos08
601056ecbd
Add new SelfBuff buff category
2023-11-02 07:44:30 +01:00
maxicarlos08
d3f4b854fc
Disable selfbuff stacking
2023-11-01 21:50:50 +01:00
Christof Petig
4ba80c0e73
fix voxygen compilation without plugins, part 2
2023-10-25 00:05:35 +02:00
Christof Petig
c354fe1b1d
conditionally turn off more code (fixes unit test)
2023-10-25 00:05:35 +02:00
Christof Petig
e114c8b6f3
remove unneeded concatenate implementation
2023-10-25 00:05:35 +02:00
Christof Petig
7c4057d7d8
simplify, how can you not love clippy
2023-10-25 00:05:35 +02:00
Christof Petig
f73f52605f
Support recipes and item images from plugins
2023-10-25 00:05:35 +02:00
Christof Petig
fc81d6ecd5
fix compilation of voxygen without plugins
2023-10-23 21:47:26 +02:00