1794 Commits

Author SHA1 Message Date
Adam Whitehurst
7f2fa4181d fix: commas 2021-05-30 14:47:42 -07:00
Adam Whitehurst
524bb4d7c7 feat: add frozen debuff icon, en strings 2021-05-30 08:49:32 -07:00
Avi Weinstock
202646787d Fix economy data not properly being used to price trades, resulting in default prices being applied at most towns.
Also add an exporter from econsim results to sqlite to aid in debugging the economy (which revealed this bug).
2021-05-28 15:09:29 -04:00
Justin Shipsey
285904a850 Merge branch 'sam/rework-bow' into 'master'
Bow Rework

See merge request veloren/veloren!2310
2021-05-26 04:44:09 +00:00
juliancoffee
e36e63825d fmt 2021-05-25 01:23:32 +03:00
juliancoffee
0fada1cfde Unique loot tables for each dungeon chest 2021-05-25 00:42:43 +03:00
juliancoffee
9bc15c3adf Overhaul loot tables 2021-05-25 00:20:18 +03:00
juliancoffee
718c5b88f4 Adding different chests for each dungeon 2021-05-24 23:00:44 +03:00
juliancoffee
f01b700c88 Add tests for validation assets 2021-05-23 22:27:33 +03:00
juliancoffee
9ed030442b Switch to using EquipSlot key instead of String 2021-05-23 21:37:41 +03:00
juliancoffee
53cd3ccfec Remove unused LoadoutConfig-s 2021-05-23 19:19:20 +03:00
juliancoffee
95dedc0e4e Add directory hierarchy 2021-05-23 19:19:20 +03:00
juliancoffee
e8c0f62c60 Move loadout config handling to .ron files 2021-05-23 19:19:20 +03:00
juliancoffee
23b566dbf8 Add support for .ron loadouts 2021-05-23 19:19:20 +03:00
Samuel Keiffer
7988f50259 Merge branch 'juliancoffee/dungeon_mobs' into 'master'
Dungeon rebalance

See merge request veloren/veloren!2333
2021-05-22 22:38:21 +00:00
juliancoffee
d584da11d6 Move fireworks into own table 2021-05-23 01:04:11 +03:00
juliancoffee
2f568235d9 Adjust mob numbers and add /kit tier-0 2021-05-23 01:04:11 +03:00
juliancoffee
6027f2ffa3 Adjust loot tables
- Add regular drop to T5 miniboss
- Fixup cultist loot table
- Give own loot table to Deadwood in T0
2021-05-23 01:04:11 +03:00
hqurve
36aae8b34b Item pickups are shown in separate window and "inventory-full" messages are shown above the item attempted to be picked up 2021-05-22 20:47:08 +00:00
Sam
7a40a04f16 Balance tweaks. 2021-05-22 15:00:05 -05:00
Illia Denysenko
e91d0c4dbd update uk ua 2021-05-22 18:58:11 +00:00
Samuel Keiffer
e64f4b8e9a Merge branch 'juliancoffee/boss_armour' into 'master'
Boss armor

See merge request veloren/veloren!2327
2021-05-22 17:42:27 +00:00
Sam
62e21e5961 Various tweaks. 2021-05-22 12:41:47 -05:00
juliancoffee
b6570d3151 Fix skill presets, add tests 2021-05-22 12:33:22 -05:00
Sam
0bc059513e Made new skills for reworked bow.
Created migration to reset bow skills.
2021-05-22 12:33:21 -05:00
Sam
74f4556349 Reworked bow 2021-05-22 12:33:20 -05:00
Monty Marz
20faacd04f Ferocious armour for t5-dungeon minibosses 2021-05-22 10:55:36 +00:00
juliancoffee
4f83a4fa4a Add placeholders for bosses armour 2021-05-22 00:20:56 +03:00
Samuel Keiffer
beee857cf7 Merge branch 'juliancoffee/boss_loot_tables' into 'master'
Improve dungeon loot tables

See merge request veloren/veloren!2324
2021-05-21 21:05:14 +00:00
Samuel Keiffer
083f67dbb2 Merge branch 'sam/extra-equip-slots' into 'master'
Added Extra Loadout Slots

See merge request veloren/veloren!2295
2021-05-21 20:28:53 +00:00
juliancoffee
5201de7192 Fixing loot tables
- Use quad_low and quad_medium loot table for corresponding mobs in
dungeons
- Remove cultist loot table from T3-T4 loot tables
- Use resize instead of vec[obj; len] to create different loot and not
duplicated for miniboss_1
2021-05-21 11:31:39 +03:00
juliancoffee
12c42cc1ad Give bosses own creation function and loot table
- Make goose miniboss fallback to differentiate bosses and minibosses
2021-05-21 11:01:47 +03:00
hqurve
84eca4a7b8 Added swap_equipped_weapons icon and resized inactive weapons 2021-05-17 15:35:27 -04:00
Nícolas Wildner
9150c05ac1 Update pt br 20210517 2021-05-17 18:12:20 +00:00
hqurve
b83ba9c10f Add offhand weapons to bag ui 2021-05-16 20:43:19 -04:00
Justin Shipsey
d10dbdf352 Merge branch 'juliancoffee/small_fixes' into 'master'
Set poise_resilience to sane values

See merge request veloren/veloren!2311
2021-05-16 17:35:39 +00:00
Marcel
12da9a80db Merge branch 'xMAC94x/czech' into 'master'
add czech language. fixed #1044

Closes #1044

See merge request veloren/veloren!2297
2021-05-16 16:39:51 +00:00
juliancoffee
06a69fa335 Set poise_resilience to sane values
- Druid Shoulders to 1.0
- Rugged Chest to 1.0
- Cultist Gloves to 1.0
2021-05-16 01:07:55 +03:00
Sam
a2d8496b3d Shifted poise damage of sword dash 2021-05-15 10:30:39 -05:00
Marcel
4ea398dfd9 Merge branch 'juliancoffee/update-it_IT' into 'master'
update Italian translation by 'Чингис Хан'

See merge request veloren/veloren!2305
2021-05-14 15:35:05 +00:00
juliancoffee
0fa437f1cb update Italian translation by 'Чингис Хан' 2021-05-14 17:31:01 +03:00
Marcel
8218fdd329 Revert "Merge branch 'snowram/hacky-mount' into 'master'"
This reverts merge request !2219
2021-05-14 13:43:20 +00:00
Marcel
f377c9c8a8 Merge branch 'snowram/hacky-mount' into 'master'
Allow for collars to make QuadMed npcs mountable

See merge request veloren/veloren!2219
2021-05-14 12:27:19 +00:00
hqurve
9425f212ca Added chat tabs 2021-05-14 12:27:15 +00:00
Snowram
b38c9e593b Use Body to determine mountee offsets 2021-05-14 00:11:54 +02:00
Marcel Märtens
791ab093b3 add czech language. fixed #1044 2021-05-12 22:36:11 +02:00
Sam
93f982df7b Changed particles to a switch statement. 2021-05-10 19:58:32 -05:00
Sam
cefa9d1ff3 Fixed offsets for laser and rocket attacks of clay golem. 2021-05-10 18:54:04 -05:00
jshipsey
8b0a2a0199 anims 2021-05-10 18:54:03 -05:00
Sam
510c1980da Made golem laser spawn based off of orientation rather than look_dir. Additional balance tweaks. 2021-05-10 18:54:00 -05:00