Commit Graph

886 Commits

Author SHA1 Message Date
jshipsey
896d2a5b63 combat tweaks 2021-04-15 11:43:52 -04:00
Marcel
54024ce401 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
9db290d4ea 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
655a35d128 update deps 2021-04-10 15:53:00 +02:00
Imbris
0eecc61ddf 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
126b7efa92 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
99c6e57c1f Resolve comments 2021-04-08 04:19:02 -06:00
Louis Pearson
c281fb32cc First pass at rtsim following paths 2021-04-08 04:19:02 -06:00
Vincent Foulon
45fb9f3211 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
a0157ac5f5 use bitflags instead of HashSet 2021-04-07 17:37:21 +02:00
Vincent Foulon
114715908a fix tag removing 2021-04-07 17:26:54 +02:00
Vincent Foulon
211ab02897 Use Behavior::CanTrade instead of Agent::trade_for_site + addressed comments 2021-04-07 17:26:42 +02:00
James Melkonian
16871208f2 Add topographic option to map 2021-04-06 09:16:17 -07:00
James Melkonian
bacda06dba Added map layers 2021-04-06 08:42:07 -07:00
James Melkonian
70ede7f34d Topographic map 2021-04-06 08:42:06 -07:00
Marcel
b433938e0a 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
18f1cb9f43 as usual clippy is right (and helpful) 2021-04-03 10:54:42 +02:00
Sam
27f178286d 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
a2906168a6 Moved materials into their own loot tables. 2021-04-02 23:04:33 -04:00
Sam
31e69021cb Switched loot tables from declaring each weapon individually to just referencing a different loot table. 2021-04-02 23:04:31 -04:00
Sam
833f1f3309 Converted all armor in loot tables to reference armor set loot tables. 2021-04-02 23:04:28 -04:00
Sam
96b354c178 Consolidated loot tables by switching to CreatureMaterial where possible 2021-04-02 23:04:27 -04:00
Sam
ab2fca21cf Fixed trading 2021-04-02 23:04:26 -04:00
Sam
cbca2a66b6 Support for creature specific materails and materials having a quantity. 2021-04-02 23:04:25 -04:00
Sam
247004d180 Loot tables can now recursively specify loot tables. Mercahnts broken. 2021-04-02 23:04:25 -04:00
Christof Petig
3a9e070ec0 create economy tree graph 2021-04-02 22:27:39 +02:00
Snowram
606dd64741 Fix a staff icon, some offset fixes, lower wolf spawn rate 2021-03-30 00:27:03 +02:00
Sam
92973a470c Made entity spawn room check more intuitive to understand 2021-03-29 13:05:04 -04:00
Sam
71ba9b6a54 Mindflayer balance tweaks. 2021-03-29 10:44:46 -04:00
Treeco
eb7122e8e9 Less horrible spawn 2021-03-28 20:12:27 +01:00
Joshua Barretto
15caf440e8 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
8c2a5559d3 Move common code out into function 2021-03-28 18:22:47 +01:00
Joshua Barretto
5bf17779ec Updated changelog, fmt 2021-03-28 18:07:01 +01:00
Treeco
ab596d2ae8 New default world map, default continent scale doubled 2021-03-28 17:07:38 +01:00
Joshua Barretto
d8117b3b3d Make caves and rtsim entities scale with map size, more cloud detail 2021-03-28 17:02:16 +01:00
Joshua Barretto
19ef00085d Softer and faster clouds with more verticality 2021-03-28 17:01:51 +01:00
Treeco
f3284b7d90 Fix issues loading larger maps 2021-03-28 17:01:19 +01:00
Sam
738aa02e7e Loot table hotfix 2021-03-28 11:26:30 -04:00
Scott Williams
ef43d29627 Fix husk drops in miniboss rooms. 2021-03-28 10:39:20 +00:00
Marcel
519c01a888 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
66d0948d06 Fix the price category of the newly added items 2021-03-28 09:25:51 +00:00
Sam
0e3b0a9ee7 Repalced stone golems with 10 husks in T5 dungeon miniboss rooms. 2021-03-27 21:06:18 -04:00
Sam
1edf79d109 Moved all legendaries to mindflayer loot table. 2021-03-27 21:05:12 -04:00
Avi Weinstock
8d90548331 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
5b234a3d08 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
71b91d589b fix the test 2021-03-24 22:37:01 +01:00
Joshua Barretto
5abdd0be8d Merge branch 'synis/primitives' into 'master'
Primitives

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