2402 Commits

Author SHA1 Message Date
Avi Weinstock
edb68601a3 Address MR 2062 comments: avoid an expect-equivalent pattern. 2021-04-05 11:29:10 -04:00
Avi Weinstock
8c6cafa675 Make merchants spawn with stacks of stackable items. 2021-04-04 13:47:05 -04:00
Monty Marz
c0b7952eb9 Crafting Tabs and more item tags 2021-04-04 13:02:27 +00:00
DaforLynx
5ee9108e0d Adds on-hit combat sfx 2021-04-04 03:04:02 +00:00
Joshua Yanovski
ad768d767a Merge branch 'sam/hashset-touch-entities' into 'master'
Changed touch_entities from a vec to a hashset.

See merge request veloren/veloren!2056
2021-04-03 22:06:05 +00:00
Joshua Yanovski
82a7194985 Merge branch 'sam/use-lottery-result' into 'master'
Handled error in setting stack size for item quantity in lottery.

See merge request veloren/veloren!2055
2021-04-03 20:11:12 +00:00
Sam
4750aaa79e Changed touch_entities from a vec to a hashset. 2021-04-03 15:13:04 -04:00
Samuel Keiffer
0f31bc6da0 Merge branch 'sam/combat-ratings' into 'master'
Tweaks to Combat Rating Calculation

See merge request veloren/veloren!2051
2021-04-03 17:33:34 +00:00
Sam
c3fc8bcf83 Handled error in setting stack size for item quantity in lottery. 2021-04-03 11:37:57 -04:00
Sam
21ed2885c9 Actually committed bone staff fix. 2021-04-03 10:26:32 -04:00
Samuel Keiffer
7ea1573db8 Merge branch 'sam/loot-table-features' into 'master'
Loot Table Rework

See merge request veloren/veloren!2046
2021-04-03 08:45:53 +00:00
Justin Shipsey
e493067826 Merge branch 'refactor-cell' into 'master'
refactor Cell back to 4 byte size #993

Closes #993

See merge request veloren/veloren!1997
2021-04-03 07:56:06 +00:00
Snowram
9cc6ff3711 Substitutes DPS for CR in item tooltip 2021-04-03 00:10:31 -04:00
Sam
76a28c6be1 Factored out weapons into their own rating. 2021-04-03 00:08:40 -04:00
Sam
33503bd9c2 Removed all rng matches in code to determine loot tables, and moved to loot tables specific for each sprite, creature, or dungeon. 2021-04-02 23:24:55 -04:00
Sam
ed5cb2b5f0 Changelog. Fixed a few qualities. 2021-04-02 23:04:36 -04:00
Sam
0306c6398d Added unit test to validate contents of loot tables. 2021-04-02 23:04:35 -04:00
Sam
9c0f75f580 Made item prices sane. 2021-04-02 23:04:34 -04:00
Sam
5d0249e350 Re-created item_price_calculation with new loot tables. 2021-04-02 23:04:34 -04:00
Sam
e83a2eef3d Moved materials into their own loot tables. 2021-04-02 23:04:33 -04:00
Sam
8d1700b882 Moved food items into their own loot tables. 2021-04-02 23:04:32 -04:00
Sam
01296ac816 Switched loot tables from declaring each weapon individually to just referencing a different loot table. 2021-04-02 23:04:31 -04:00
Sam
a773d53b3a Created weapon loot tables. 2021-04-02 23:04:29 -04:00
Sam
0a29d93164 Converted all armor in loot tables to reference armor set loot tables. 2021-04-02 23:04:28 -04:00
Sam
25034a6a0b Consolidated loot tables by switching to CreatureMaterial where possible 2021-04-02 23:04:27 -04:00
Sam
f88fd5f349 Fixed trading 2021-04-02 23:04:26 -04:00
Sam
fa7d1d85a9 Fixed csv tools 2021-04-02 23:04:26 -04:00
Sam
4cc4e3a158 Support for creature specific materails and materials having a quantity. 2021-04-02 23:04:25 -04:00
Sam
7846c6fdbf Loot tables can now recursively specify loot tables. Mercahnts broken. 2021-04-02 23:04:25 -04:00
aljazerzen
c8136a44de refactor Cell back to 4 byte size 2021-04-01 17:38:10 +02:00
aljazerzen
205e989350 after leaving group, issue warning instead of changing chat mode 2021-04-01 15:43:50 +02:00
Avi Weinstock
19ac0b2245 Allow fast stacking into and out of a trade with {ctrl,shift} click.
Shift click goes 1 at a time, Ctrl click automatically balances the trade w.r.t. that quantity.
2021-03-30 18:39:10 -04:00
Marcel Märtens
7afa77a06f move tracing code to own crate 2021-03-30 16:35:36 +02:00
Joshua Barretto
bb88d42295 Merge branch 'zesterer/sprite-text' into 'master'
Added text prompts to sprites

See merge request veloren/veloren!2034
2021-03-30 11:41:14 +00:00
Joshua Barretto
5cc6061606 Merge branch 'zesterer/small-fixes' into 'master'
Bow improvements

See merge request veloren/veloren!2032
2021-03-30 00:16:45 +00:00
Joshua Barretto
97e5c26838 Added indicator text to terrain sprites 2021-03-30 01:04:23 +01:00
Samuel Keiffer
c978386d40 Merge branch 'sam/mindflayer-balancing' into 'master'
Mindflayer balance tweaks.

See merge request veloren/veloren!2031
2021-03-29 21:05:49 +00:00
Joshua Barretto
286f6823b9 Added patch for sticky hitboxes 2021-03-29 21:52:05 +01:00
Joshua Barretto
6ca8cd9bb2 Fixed training dummy hitbox 2021-03-29 21:52:05 +01:00
Joshua Barretto
6f72e53295 Improved archery with feedback sfx and particles 2021-03-29 21:52:04 +01:00
Snowram
843f295eef Addresses comments 2021-03-29 18:35:12 +02:00
Snowram
a5c125fdef Tooltip now use ItemDesc instead of Item 2021-03-29 18:34:45 +02:00
Snowram
6451caf15b Set the item tooltip for every bag slots 2021-03-29 18:34:45 +02:00
Snowram
71fabb1637 Make the new tooltip item specific 2021-03-29 18:34:45 +02:00
Snowram
763cf70b70 New tooltip 2021-03-29 18:34:45 +02:00
Vincent Foulon
c4eca42fd8 Implement a basic dialogue system 2021-03-29 14:47:42 +00:00
Sam
d17edfcd64 Mindflayer balance tweaks. 2021-03-29 10:44:46 -04:00
Treeco
d47739c0c9 Added command to teleport to sites by name 2021-03-28 17:02:17 +01:00
Avi Weinstock
69665c0b0d Reclassify Glowing Remains as Armor for econsim. 2021-03-28 10:29:40 -04:00
Marcel
6ecd0b68f3 Merge branch 'christof/item_price_fix' into 'master'
Fix the price category of the newly added items

See merge request veloren/veloren!2010
2021-03-28 09:25:52 +00:00