Commit Graph

195 Commits

Author SHA1 Message Date
kitswas
b35225a13d Used constant POISEBAR_TICK_COLOR
Should have done it earlier.
2022-10-24 22:05:11 +05:30
kitswas
e472632426 Rebased and implemented a TODO
Converted individual poise bar tick values to a list.

Co-authored-by: Samuel Keiffer <samuelkeiffer@gmail.com>
2022-10-24 22:05:11 +05:30
kitswas
c83ec87d6a Code cleanup 2022-10-24 22:05:11 +05:30
kitswas
e29a9f4e36 Colour reflects old poise state 2022-10-24 22:05:11 +05:30
kitswas
6ff5f540bf Colour changes by poise state 2022-10-24 22:05:11 +05:30
kitswas
6b2a41ade7 Ticks at every threshold 2022-10-24 22:05:11 +05:30
kitswas
78ce257d87 Removed numbers from the poisebar 2022-10-24 22:05:11 +05:30
kitswas
4a8536672c Removed unused import 2022-10-24 22:05:11 +05:30
kitswas
b21764c99f Added tick mark for the upcoming threshold 2022-10-24 22:05:11 +05:30
kitswas
202ac7ced8 Changed the poisebar's position 2022-10-24 22:05:11 +05:30
kitswas
0f3d6b3e3e Poisebar for the player 2022-10-24 22:05:11 +05:30
parzivale
0ca2e64772 formtaed code with cargo fmt 2022-08-23 19:18:18 +02:00
parzivale
cf09348306 second cleaning pass after removing i18n.get 2022-08-23 13:14:29 +02:00
IsseW
a165bc09bc character viewpoint 2022-08-09 18:45:45 +02:00
juliancoffee
d000cc90a1 Migrate code to new i18n API 2022-08-06 21:56:01 +03:00
juliancoffee
3e73fba165 Better naming for shortened key functions
* Old display_shortened that returned Option is now called try_shortened
* What was called try_shortened is now just display_shortest, because if
  shortened version isn't available, it means that regular version is
  already shortened.
2022-06-26 21:59:36 +03:00
juliancoffee
9d928261cb Try to display shortened version of key in diary
* Make try_shortened method that tries shortened version of key or
  regular version if shortened one isn't available
* Use it in most places where display_shortened + display_string were
  used
* Use it for diary skilbar
2022-06-25 18:17:37 +03:00
juliancoffee
8c837da561 Add i18n keys to abilities
* New hud/ability.ron file for ability localizations
* i18n keys are created by adding .name and .desc to ability id. Because
  of how i18n worked (returning key if string wasn't found), it was
  impossible to do because it leads to UB in case string is missed.
  To solve this we've added get_opt method that returns None
* New Localization::get_or method for convinient fallback key usage
2022-06-25 18:17:37 +03:00
Sam
94c19735ca Fixed broken stuff during rebase. 2022-05-16 15:11:16 -04:00
Sam
0a38567e8d Modular weapons can now be properly displayed in the inventory. 2022-05-16 15:10:57 -04:00
Sam
405b9b2448 Modular weapons now have programmatically generated names. 2022-05-16 15:10:53 -04:00
Avi Weinstock
f3f08936d8 Decrease too-many-arguments-threshold and type-complexity-threshold. 2022-01-30 20:16:21 +01:00
Avi Weinstock
5f8957d8ef Globally allow the clippy lints {new_without_default, many_single_char_names, identity_op, type_complexity, too_many_arguments}. 2022-01-30 20:16:20 +01:00
Sam
fe1db1e9e0 Can move around, so character state system runs
Hotbar now visible
Can't yet activate skillbar abilities, only M1 and M2
2022-01-20 15:26:35 -05:00
Sam
d0e487da8a Ability sets now start with non-empty defaults. 2022-01-15 21:45:27 -05:00
Sam
d86692c4fe Added in-memory persistence of ability sets per weapon kind pair. 2022-01-15 21:42:34 -05:00
Tormod G. Hellen
3afa16bf03 Fix hotbar changing when sorting inventory.
Previously the hotbar slots would refer to inventory slots. An
unfortunate consequence of this was that when the contents of an
inventory slot changed, so would the corresponding hotbar slot
change. This commit fixes that.
2022-01-14 19:14:24 +01:00
Marcel Märtens
ef40ebe0c8 update toolchain to nightly-2021-11-24 2021-11-24 10:09:22 +01:00
Sam
a288f9ee43 Addressed further review. 2021-11-11 22:37:37 -05:00
Sam
dfcb8c8519 Addressed review feedback. 2021-11-11 18:10:22 -05:00
Sam
da677e8ea6 Abilities can now be referred to by the asset id. 2021-11-10 17:30:19 -05:00
Sam
4309e1ff9b Did voxygen stuff for ability pool. 2021-11-09 21:20:41 -05:00
Sam
5707377565 Changed tooltips to take iterator. Tooltips also show original item as well as salvage output. 2021-10-27 17:02:34 -04:00
Snowram
2bf16aab63 Make item tooltip accept multiple items for salvage 2021-10-27 17:02:33 -04:00
Sam
0e5e2b46f2 Changed energy to internally use an integer with a high resolution, and externally to use a float. 2021-09-23 14:11:09 -04:00
Bafon
b910c1dd9c Add setting to always show energy bars 2021-09-15 12:04:44 +00:00
Sam
85f4e66337 Addressed MR 2824 comments 2021-09-10 15:20:14 -04:00
Sam
42012fddcb Overhauled health component, making it a float to outer interfaces. 2021-09-09 00:10:17 -04:00
Imbris
89eee332c9 Replace stamina -> energy in code, i18n keys, and asset names 2021-07-31 01:34:40 -04:00
Marcel Märtens
4c0b74150d remove some reexports 2021-07-29 22:18:34 +02:00
juliancoffee
a6b7e93854 Improve ability descriptions 2021-07-29 18:27:18 +03:00
juliancoffee
4adc045627 Added comments on PositionSpecifier usage 2021-07-28 20:03:23 +03:00
juliancoffee
4811ede2ea Split Skillbar::update to separate stages 2021-07-28 10:33:51 +03:00
juliancoffee
930a156cab display_shortened for keys 2021-07-28 10:33:51 +03:00
juliancoffee
034913a22d Update skillbar ability text 2021-07-28 10:33:51 +03:00
juliancoffee
1bdab02aad Deduplicate bar text 2021-07-28 10:33:51 +03:00
juliancoffee
e6c451ca4b Prettify skillbar code 2021-07-28 10:33:50 +03:00
juliancoffee
e6f2dc314c Deduplicate skillbar slots 2021-07-28 10:33:50 +03:00
schnippl0r
9e3b2a20d0 Moved GameInput to own module and made use of strum's EnumIter and AsRefStr. 2021-07-21 13:23:45 +02:00
Dr. Dystopia
fdee2d4a62 Resolve all '#[allow(clippy::unused_unit)]' error supressions 2021-07-14 21:42:29 +02:00