2437 Commits

Author SHA1 Message Date
Vincent Foulon
bdbbc23b9c Support quantity + use Enum for autocompletion + Address comments 2021-04-12 20:07:34 +02:00
Vincent Foulon
65ef568d70 New Command: "kit" + Removed Command: "debug"
Update CHANGELOG.md

Update CHANGELOG.md
2021-04-12 18:53:36 +02:00
Marcel
39d4d84f15 Merge branch 'DaforLynx/more-music' into 'master'
Adds many new songs; re-adds many old ones; revamped song distribution; reorganized music folders; better biome parameters; accurate day and night; new sounds

See merge request veloren/veloren!2102
2021-04-12 00:43:08 +00:00
DaforLynx
e1ca34d9e8 Adds many new songs; re-adds many old ones; revamped song distribution; reorganized music folders; better biome parameters; accurate day and night; new sounds 2021-04-12 00:43:08 +00:00
Avi Weinstock
5bf4048419 Give NPCs the ability to use potions. 2021-04-11 23:47:29 +00:00
Joshua Yanovski
909f2c4680 Remove panics and unwraps, part 1.
Also fixes various other miscellaneous bugs.
2021-04-10 10:03:21 +02:00
Marcel Märtens
1b38cfbd2d remove spamming of the logs 2021-04-08 23:55:13 +02:00
Imbris
fd30663156 Merge branch 'vfoulon80/behavior-component' into 'master'
New Component: Behavior

See merge request veloren/veloren!2033
2021-04-08 19:16:28 +00:00
Vincent Foulon
5809116afa Remove TRADE capability, use trade_site attribute instead 2021-04-08 19:06:57 +02:00
Vincent Foulon
7c4da6e501 Address comments 2021-04-08 18:33:00 +02:00
holychowders
261802a0d1 Fix issue #1061 - Combat Rating is Affected by Buffs
Replaced `stats` with `None` into the calculation for damage reduction
2021-04-07 17:09:51 -07:00
Vincent Foulon
39bf6826f2 Move Behavior to Agent's Component 2021-04-07 22:11:29 +02:00
Vincent Foulon
8cb001e91b Finally Behavior isn't good enough as a component, Remove it from ECS and include it onto Agent directly 2021-04-07 22:02:57 +02:00
Vincent Foulon
e0da6aa572 Address comments
- make Behavior's capabilities and state private
 - Typo in a comment
 - add basic tests

Apply 1 suggestion(s) to 1 file(s)

Remove comments in agent.rs
2021-04-07 22:02:42 +02:00
Vincent Foulon
c33e73bbed use bitflags instead of HashSet 2021-04-07 17:37:21 +02:00
Vincent Foulon
738f074f89 fix tag removing 2021-04-07 17:26:54 +02:00
Vincent Foulon
4d10230f54 Use HashSet instead of Vec 2021-04-07 17:26:48 +02:00
Vincent Foulon
72d0067e5c Use Behavior::CanTrade instead of Agent::trade_for_site + addressed comments 2021-04-07 17:26:42 +02:00
Vincent Foulon
822db0895c Use Behavior into Agent 2021-04-07 17:26:12 +02:00
Vincent Foulon
ccf89c4275 Create Behavior component 2021-04-07 17:21:53 +02:00
Marcel
ea2db98598 Merge branch 'james/topo-map' into 'master'
Adds topographic map option and allows for map layers

See merge request veloren/veloren!2074
2021-04-07 09:34:13 +00:00
James Melkonian
7bb62615df Add topographic option to map 2021-04-06 09:16:17 -07:00
James Melkonian
44715100c1 Add layers to minimap 2021-04-06 08:42:08 -07:00
James Melkonian
3578116eee Added map layers 2021-04-06 08:42:07 -07:00
James Melkonian
5d3acb0c2e Topographic map 2021-04-06 08:42:06 -07:00
Avi Weinstock
d2e2f30f47 Fix loadout_builder panic. 2021-04-06 10:34:13 -04:00
Marcel
af2a9c0f45 Merge branch 'aweinstock/stackable-merchants' into 'master'
Make merchants spawn with stacks of stackable items.

See merge request veloren/veloren!2062
2021-04-06 08:14:33 +00:00
Samuel Keiffer
d8b8fd1d97 Merge branch 'sam/consolidate-roll' into 'master'
Flattened roll progression.

See merge request veloren/veloren!2073
2021-04-06 03:31:46 +00:00
Sam
31e9577182 Flattened roll progression. 2021-04-05 17:50:53 -04:00
Sam
8c0c0b9d4e Nerfs 2021-04-05 17:38:52 -04:00
Avi Weinstock
edb68601a3 Address MR 2062 comments: avoid an expect-equivalent pattern. 2021-04-05 11:29:10 -04:00
Louis Pearson
07341cc67f Return none from depot get if stale id used 2021-04-05 06:16:23 -06:00
Marcel
d7ed57ca7e Merge branch 'login-trim-username' into 'master'
login trim username, improve validation, social ordering #1040

Closes #1040

See merge request veloren/veloren!2042
2021-04-04 22:09:16 +00:00
Marcel
81994622be Merge branch 'christof/stats_per_price' into 'master'
output stats per value for all categories in the trade pricing test

See merge request veloren/veloren!2057
2021-04-04 18:35:39 +00: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
Christof Petig
329db14f39 output stats per value for all categories in the trade pricing test 2021-04-03 23:22:34 +02: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