Commit Graph

530 Commits

Author SHA1 Message Date
Snowram
bc95484863 Swaps bird_small skeleton to a new bird_large 2021-04-25 02:14:49 +02:00
Monty Marz
b69eb61e7b Add handles to lanterns, fix cooking pot scale 2021-04-22 17:12:07 +00:00
jshipsey
9d82b20891 remove 0.8, add snow's mixed_vel idea for other bodies 2021-04-22 00:04:39 -04:00
Ludvig Böklin
762c68cfbb Basic fluid dynamics and physical properties for entities 2021-04-20 17:38:19 +02:00
Monty
a1b4e0bdaf remove old craftsman hammer, add migration 2021-04-20 03:34:11 +02:00
Monty
a4d56e7843 more sprite stuff and crafting UI update
fix item images
fix CR display
2021-04-20 02:46:06 +02:00
Monty
a1fe7c12c3 fmt, add sprites 2021-04-20 02:46:04 +02:00
Joshua Barretto
5598d07944 Added crafting stations 2021-04-20 02:45:59 +02:00
Sam
ce7581037c Overhauled dash melee. 2021-04-18 18:36:12 -04:00
Joshua Barretto
cb817c0313 Merge branch 'zesterer/econ-tweaks' into 'master'
Rebalanced economy somewhat

See merge request veloren/veloren!2148
2021-04-18 21:20:49 +00:00
Avi Weinstock
0404250300 Unlock dodge roll iframes and staff explosion by default. 2021-04-18 16:16:06 -04:00
Joshua Barretto
352fce239e Allow trading items not sold by merchants 2021-04-18 20:07:00 +01:00
Joshua Barretto
cac9ac6807 Trading stock limits 2021-04-18 18:58:26 +01:00
Joshua Barretto
250733a123 Better price rationalisation 2021-04-18 18:11:00 +01:00
Joshua Barretto
c0b71d0731 Removed legendaries from trading 2021-04-18 17:29:22 +01:00
Joshua Barretto
11683084ad Use labour value for prices 2021-04-18 17:05:14 +01:00
Joshua Barretto
fcc23a4427 Normalised prices within sites 2021-04-18 15:09:21 +01:00
Joshua Barretto
b72e454148 Rebalanced economy somewhat 2021-04-18 14:08:48 +01:00
Samuel Keiffer
c962c5f12e Merge branch 'gGmMsS/Burning' into 'master'
Added burning debuff for Staff M2

See merge request veloren/veloren!2134
2021-04-15 23:51:33 +00:00
gGmMsS123
0d956610ec Added burning debuff for Staff M2 2021-04-15 23:34:28 +03:00
jshipsey
8f20d17c9a attacking movement tweaks 2021-04-15 12:13:50 -04:00
jshipsey
896d2a5b63 combat tweaks 2021-04-15 11:43:52 -04:00
Sam
c88df846a7 Fixes animation parameters so a 2h weapon in the offhand slot doesn't look wonky. 2021-04-14 17:38:37 -04:00
jshipsey
161382d06a changelog 2021-04-13 20:19:35 -04:00
jshipsey
ea9b871374 loot tables, clippy, animation tweaks 2021-04-13 20:18:59 -04:00
jshipsey
42460f7e65 spins, combos 2021-04-13 20:18:59 -04:00
jshipsey
529f8eb5a6 more setups. chargeswing/dash anims 2021-04-13 20:18:59 -04:00
Vincent Foulon
0692562533 New Command: "kit" + Removed Command: "debug"
Update CHANGELOG.md

Update CHANGELOG.md
2021-04-12 18:53:36 +02:00
Monty Marz
6772e71aaa UI fixes and more 2021-04-11 03:49:47 +00:00
Sam
a7e39bc8c9 Nerfs 2021-04-05 17:38:52 -04:00
Monty Marz
06bbb7f0ff Crafting Tabs and more item tags 2021-04-04 13:02:27 +00: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
9ad5b0f6b7 Changelog. Fixed a few qualities. 2021-04-02 23:04:36 -04:00
Sam
7c8242b5b1 Added unit test to validate contents of loot tables. 2021-04-02 23:04:35 -04:00
Sam
c8b8cd436e Made item prices sane. 2021-04-02 23:04:34 -04:00
Sam
7eb1eefa13 Re-created item_price_calculation with new loot tables. 2021-04-02 23:04:34 -04:00
Sam
a2906168a6 Moved materials into their own loot tables. 2021-04-02 23:04:33 -04:00
Sam
cb638180f8 Moved food items into their own loot tables. 2021-04-02 23:04:32 -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
67916b44a7 Staff weapon tiering shuffle. 2021-04-02 23:04:30 -04:00
Sam
a2fc2abf83 Made staff and sceptre balancing sane. Created loot tables for staffs and sceptres. 2021-04-02 23:04:30 -04:00
Sam
2e37cefce5 Created weapon loot tables. 2021-04-02 23:04:29 -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
247004d180 Loot tables can now recursively specify loot tables. Mercahnts broken. 2021-04-02 23:04:25 -04:00
Samuel Keiffer
12ec46c572 Merge branch 'sam/mindflayer-balancing' into 'master'
Mindflayer balance tweaks.

See merge request veloren/veloren!2031
2021-03-29 21:05:49 +00:00
Snowram
2c09180189 Set the item tooltip for every bag slots 2021-03-29 18:34:45 +02:00
Sam
71ba9b6a54 Mindflayer balance tweaks. 2021-03-29 10:44:46 -04:00
Sam
f6e4626887 Fix emerald sceptre. Remove duplicate asset. 2021-03-28 21:19:01 -04:00
Snowram
5295894105 Add new batch of starves and scepter (by Gemu) 2021-03-29 01:27:55 +02:00
Scott Williams
ef43d29627 Fix husk drops in miniboss rooms. 2021-03-28 10:39:20 +00:00
Sam
f117a57083 Switched to using ForceUpdate to forcefully update the client position after a blink 2021-03-27 21:33:45 -04:00
jshipsey
558c82ee54 flayer anims 2021-03-27 21:05:16 -04:00
Sam
b0b114a7f8 Balance tweaks 2021-03-27 21:05:15 -04:00
Sam
1edf79d109 Moved all legendaries to mindflayer loot table. 2021-03-27 21:05:12 -04:00
Sam
6c611d632a Mindflayer now only summons minions at set thresholds of health. 2021-03-27 21:05:11 -04:00
Sam
5966b1541d Mindflayer can now lifesteal off of its own minions 2021-03-27 21:05:11 -04:00
Sam
50e832b6d0 Mindflayer summons husks instead of dogs now 2021-03-27 21:05:10 -04:00
Snowram
39c8efe11f Adds husk npc 2021-03-27 21:05:09 -04:00
Sam
f9835e78da Pets no longer drop loot on death. Code to determine targeting of pets is less hacky and now takes into account alignment of their owner. 2021-03-27 21:05:07 -04:00
Sam
8e4aeff705 Improved mindflayer AI. Tweake some abilities. 2021-03-27 21:05:07 -04:00
Sam
720482d994 Gave mindflayer AI.
Fixed particles and made them sync across network.
2021-03-27 21:05:06 -04:00
Sam
a5b7477e96 Added summon minions ability to mindflayer 2021-03-27 21:05:05 -04:00
Sam
30da614e89 Added dimensional door ability for mindflayer 2021-03-27 21:05:05 -04:00
Sam
f1156c9ce5 Added necrotic vortex attack to mindflayer 2021-03-27 21:05:03 -04:00
Sam
0d3795112c Added cursed flame attack to mindflayer 2021-03-27 21:05:03 -04:00
Avi Weinstock
4b62a99ed9 Improve econsim's handling of diamond prices by lowering the implied homicide rate. 2021-03-27 10:50:16 -04:00
Sam
6c2de7d70e Fixed boost having ridiculous velocity. 2021-03-26 16:11:25 -04:00
Scott Williams
aa9180b20f Moved rugged armour to cloth_item 2021-03-26 16:51:43 +00:00
Scott Williams
d35475eaef Added leather scraps recipe 2021-03-26 16:44:38 +00:00
Samuel Keiffer
8ed7da7c49 Merge branch 'master' into 'master'
Update short_1.ron to make eligible for cloth scrap recipe

See merge request veloren/veloren!1981
2021-03-23 19:29:56 +00:00
steanne
818aaed32a Update short_1.ron to make eligible for cloth scrap recipe 2021-03-23 18:16:30 +00:00
Sam
31f4ef684d Tweaked numbers 2021-03-22 17:26:55 -04:00
Joshua Barretto
6690854687 Merge branch 'zesterer/better-particle-emission' into 'master'
Smoother particle emission for moving objects

See merge request veloren/veloren!1965
2021-03-22 06:15:20 +00:00
Samuel Keiffer
1374900928 Merge branch 'sam/combat-fixes' into 'master'
Fixes gaining combo by shooting loot bag

See merge request veloren/veloren!1953
2021-03-22 02:01:22 +00:00
Joshua Barretto
f9612c1c26 Made pickaxe obtainable 2021-03-22 00:24:07 +00:00
Joshua Barretto
7ae4230dc8 Merge branch 'zesterer/pick' into 'master'
Pickaxe

See merge request veloren/veloren!1959
2021-03-22 00:19:42 +00:00
Joshua Barretto
6ea5aa796b Faster pick, less vibrant block selection 2021-03-21 20:38:08 +00:00
Joshua Barretto
fb3980e273 Outcome for block destruction, take select_pos from ControllerInputs 2021-03-21 20:10:05 +00:00
Joshua Barretto
b45df7fe10 Switched to BasicMelee 2021-03-21 17:45:01 +00:00
Joshua Barretto
347e1022a0 Initial implementation of pickaxe 2021-03-21 16:09:16 +00:00
Vincent Foulon
e06870702f Add skill for swimming speed 2021-03-21 15:58:38 +01:00
Sam
c8c368adec Rebalanced a few stats 2021-03-20 16:28:03 -04:00
Vincent Foulon
d0aa68a9d2 Add climbing speed and cost 2021-03-20 17:17:28 +01:00
Monty Marz
e9cbac387e new loading bg, staff models
item images

fix paths

loot tables, adjustments

Update main.ron
2021-03-16 23:23:24 +00:00
Marcel
f679103041 Merge branch 'sam/nerfs' into 'master'
Nerfs

See merge request veloren/veloren!1922
2021-03-16 22:22:04 +00:00
James Melkonian
6ea43cfd75 Various RtSim and Agent Interaction Fixes 2021-03-16 01:30:35 +00:00
Marcel
ad49318a63 Merge branch 'sam/explosion-fix' into 'master'
Explosions now take into account hitbox of entity.

See merge request veloren/veloren!1905
2021-03-15 22:26:28 +00:00
Sam
1b2a62d5a8 Nerfs 2021-03-15 17:36:58 -04:00
Sam
0576e30b9e Nerfed aura 2021-03-15 14:23:28 -04:00
Sam
461ad6e339 Rebalanced explosion strengths 2021-03-15 00:36:07 -04:00
Avi Weinstock
8b9e84972a Draft of airships (spawn command, visuals, some physics refactoring, no collision yet). 2021-03-14 23:09:49 -04:00
Marcel
5570b57282 Merge branch 'sam/yeet-inputs' into 'master'
Reworked Controller Inputs to use Control Actions

See merge request veloren/veloren!1900
2021-03-15 01:32:02 +00:00
Sam
21e6f4797c Primary ability fully functional. 2021-03-14 17:26:53 -04:00
Snowram
60dd47cdea Theropod charge attack 2021-03-14 18:10:40 +01:00
Snowram
9d7e8957bb Add new npcs 2021-03-14 14:24:35 +01:00
Christof Petig
15b11d9154 Implement /price_list (work in progress), stub for /buy and /sell
remove outdated economic simulation code

remove old values, document

add natural resources to economy

Remove NaturalResources from Place (now in Economy)

find closest site to each chunk

implement natural resources (the distance scale is wrong)

cargo fmt

working distance calculation

this collection of natural resources seem to make sense, too much Wheat though

use natural resources and controlled area to replenish goods

increase the amount of chunks controlled by one guard to 50

add new professions and goods to the list

implement multiple products per worker

remove the old code and rename the new code to the previous name

correctly determine which goods guards will give you access to

correctly estimate the amount of natural resources controlled

adapt to new server API

instrument tooltips

Now I just need to figure out how to store a (reference to) a closure

closures for tooltip content generation

pass site/cave id to the client

Add economic information to the client structure
(not yet exchanged with the server)

Send SiteId to the client, prepare messages for economy request
Make client::sites a HashMap

Specialize the Crafter into Brewer,Bladesmith and Blacksmith

working server request for economic info from within tooltip

fully operational economic tooltips
I need to fix the id clash between caves and towns though

fix overlapping ids between caves and sites

display stock amount

correctly handle invalid (cave) ids in the request

some initial balancing, turn off most info logging

less intrusive way of implementing the dynamic tool tips in map

further tooltip cleanup

further cleanup, dynamic tooltip not fully working as intended

correctly working tooltip visibility logic

cleanup, display labor value

separate economy info request in a separate translation unit

display values as well

nicer display format for economy

add last_exports and coin to the new economy

do not allocate natural resources to Dungeons (making town so much larger)

balancing attempt

print town size statistics

cargo fmt (dead code)

resource tweaks, csv debugging

output a more interesting town (and then all sites)

fix the labor value logic (now we have meaningful prices)

load professions from ron (WIP)

use assets manager in economy

loading professions works

use professions from ron file

fix Labor debug logic

count chunks per type separately
(preparing for better resource control)

better structured resource data

traders, more professions (WIP)

fix exception when starting the simulation

fix replenish function
TODO:
- use area_ratio for resource usage (chunks should be added to stock, ratio on usage?)
- fix trading

documentation clean up

fix merge artifact

Revise trader mechanic

start Coin with a reasonable default

remove the outdated economy code

preserve documentation from removed old structure

output neighboring sites (preparation)

pass list of neighbors to economy

add trade structures

trading stub

Description of purpose by zesterer on Discord

remember prices (needed for planning)

avoid growing the order vector unboundedly

into_iter doesn't clear the Vec, so clear it manually

use drain to process Vecs, avoid clone

fix the test server

implement a test stub (I need to get it faster than 30 seconds to be more useful)

enable info output in test

debug missing and extra goods

use the same logging extension as water, activate feature

update dependencies

determine good prices, good exchange goods

a working set of revisions

a cozy world which economy tests in 2s

first order planning version

fun with package version

buy according to value/priority, not missing amount

introduce min price constant, fix order priority

in depth debugging

with a correct sign the trading plans start to make sense

move the trade planning to a separate function

rename new function

reorganize code into subroutines (much cleaner)

each trading step now has its own function

cut down the number of debugging output

introduce RoadSecurity and Transportation

transport capacity bookkeeping

only plan to pay with valuable goods, you can no longer stockpile unused options
(which interestingly shows a huge impact, to be investigated)

Coin is now listed as a payment (although not used)

proper transportation estimation (although 0)

remove more left overs uncovered by viewing the code in a merge request

use the old default values, handle non-pileable stocks directly before increasing it
(as economy is based on last year's products)

don't order the missing good multiple times
also it uses coin to buy things!

fix warnings and use the transportation from stock again

cargo fmt

prepare evaluation of trade

don't count transportation multiple times

fix merge artifact

operational trade planning
trade itself is still misleading

make clippy happy

clean up

correct labor ratio of merchants (no need to multiply with amount produced)

incomplete merchant labor_value computation

correct last commit

make economy of scale more explicit

make clippy happy (and code cleaner)

more merchant tweaks (more pop=better)

beginning of real trading code

revert the update of dependencies

remove stale comments/unused code

trading implementation complete (but untested)

something is still strange ...

fix sign in trading

another sign fix

some bugfixes and plenty of debugging code

another bug fixed, more to go

fix another invariant (rounding will lead to very small negative value)

introduce Terrain and Territory

fix merge mistakes
2021-03-14 03:18:32 +00:00
Sam
803e42cc01 Fixed broken weapon. 2021-03-12 11:00:54 -05:00
jshipsey
49f496e290 intitial values 2021-03-12 00:58:12 -05:00
Sam
66181a7f8c Rebalanced crit stats 2021-03-11 20:30:15 -05:00