886 Commits

Author SHA1 Message Date
jshipsey
599981fca4 combat tweaks 2021-04-15 11:43:52 -04: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
Marcel Märtens
7d8c85ff07 update deps 2021-04-10 15:53:00 +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
Louis Pearson
ee302607f0 Tries to implement npcs only travelling by paths
Unfortunately, there's a degenerate case where npcs can get stuck in a
town. Not sure why
2021-04-08 04:19:02 -06:00
Louis Pearson
3d000833a6 Resolve comments 2021-04-08 04:19:02 -06:00
Louis Pearson
642dcf08b8 First pass at rtsim following paths 2021-04-08 04:19:02 -06: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
72d0067e5c Use Behavior::CanTrade instead of Agent::trade_for_site + addressed comments 2021-04-07 17:26:42 +02:00
James Melkonian
7bb62615df Add topographic option to map 2021-04-06 09:16:17 -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
Marcel
5043cdb20e Merge branch 'christof/economy_graph' into 'master'
create economy tree graph

See merge request veloren/veloren!2052
2021-04-04 20:21:19 +00:00
Christof Petig
85d07526a0 as usual clippy is right (and helpful) 2021-04-03 10:54:42 +02: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
e83a2eef3d Moved materials into their own loot tables. 2021-04-02 23:04:33 -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
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
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
Christof Petig
70781238fc create economy tree graph 2021-04-02 22:27:39 +02:00
Snowram
95924315fb Fix a staff icon, some offset fixes, lower wolf spawn rate 2021-03-30 00:27:03 +02:00
Sam
699f992774 Made entity spawn room check more intuitive to understand 2021-03-29 13:05:04 -04:00
Sam
d17edfcd64 Mindflayer balance tweaks. 2021-03-29 10:44:46 -04:00
Treeco
dfbfd25934 Less horrible spawn 2021-03-28 20:12:27 +01:00
Joshua Barretto
e4b5f02df2 Merge branch 'treeco/new-map' into 'master'
A new map and clouds

See merge request veloren/veloren!2007
2021-03-28 18:32:20 +00:00
Treeco
bf155b1407 Move common code out into function 2021-03-28 18:22:47 +01:00
Joshua Barretto
6005756f94 Updated changelog, fmt 2021-03-28 18:07:01 +01:00
Treeco
2922b00c11 New default world map, default continent scale doubled 2021-03-28 17:07:38 +01:00
Joshua Barretto
fa1fee430b Make caves and rtsim entities scale with map size, more cloud detail 2021-03-28 17:02:16 +01:00
Joshua Barretto
a76f15dd9f Softer and faster clouds with more verticality 2021-03-28 17:01:51 +01:00
Treeco
0186cf8398 Fix issues loading larger maps 2021-03-28 17:01:19 +01:00
Sam
c18726753d Loot table hotfix 2021-03-28 11:26:30 -04:00
Scott Williams
998d5f0719 Fix husk drops in miniboss rooms. 2021-03-28 10:39:20 +00: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
Christof Petig
b94013943f Fix the price category of the newly added items 2021-03-28 09:25:51 +00:00
Sam
d707fbbd83 Repalced stone golems with 10 husks in T5 dungeon miniboss rooms. 2021-03-27 21:06:18 -04:00
Sam
43290d1dc3 Moved all legendaries to mindflayer loot table. 2021-03-27 21:05:12 -04:00
Avi Weinstock
6d30f17add Get SitePricing information to clients, and use it to display coin-denominated prices in voxygen on tooltips during a trade. Also boost merchant spawn rate slightly. 2021-03-25 02:11:58 -04:00
Joshua Barretto
3ba439994e Merge branch 'christof/de_unwrap2' into 'master'
Replace unwrap in the economy code

See merge request veloren/veloren!1988
2021-03-24 22:22:02 +00:00
Christof Petig
11aaf90845 fix the test 2021-03-24 22:37:01 +01:00
Joshua Barretto
76d40981db Merge branch 'synis/primitives' into 'master'
Primitives

See merge request veloren/veloren!1937
2021-03-24 21:06:33 +00:00
Christof Petig
76fa685b9a remove the remaining unwraps 2021-03-24 21:59:47 +01:00
Christof Petig
3049c6daf5 replace another group of unwraps 2021-03-24 21:43:30 +01:00
Avi Weinstock
67dedf409a Fix airships getting stuck in trees and campfires spawning too close to new-style dungeon stairs. 2021-03-24 15:42:37 -04:00