Commit Graph

2052 Commits

Author SHA1 Message Date
Samuel Keiffer
099ddea165 Merge branch 'juliancoffee/dungeon_rebalance' into 'master'
Make cultist great again

See merge request veloren/veloren!2513
2021-07-01 02:37:39 +00:00
Joshua Barretto
269c6171e4 Merge branch 'DaforLynx/aeh' into 'master'
Sfx fixes and new test

See merge request veloren/veloren!2529
2021-06-30 11:43:01 +00:00
DaforLynx
a757bf3dbd Sfx fixes and new test 2021-06-30 11:43:00 +00:00
juliancoffee
6418bcefac Introduce maxed skillsets for melee and staff 2021-06-30 13:21:12 +03:00
juliancoffee
adf340cf32 Nerf hammer poise 2021-06-30 03:52:51 +03:00
juliancoffee
86af138dc7 Buff Mindflayer flamethrower
- Buff DPS twice: increase tick_rate from 0.9 to 5.0 (x5.5), while reducing
damage from 400 to 150 (x2.6)
- Make ori_rate slower: 0.2 from 0.6 and make it use FromOri orientation
behaviour
2021-06-30 03:52:50 +03:00
juliancoffee
21fc5aafcd Nerf bow repeater knockback 2021-06-30 03:52:50 +03:00
juliancoffee
5b2ef98a7d Slower ori_rate of StaffSimple flamethrower
+ use FromOri for StaffSimple flamethrower
2021-06-30 03:52:50 +03:00
juliancoffee
c5da56e900 Nerf Husk Brute
- Remove HuskBrute health level buff
- Make their attack slower
2021-06-30 03:52:50 +03:00
juliancoffee
f9b71750ca Make cultist great again
- Change cultist set stats to mixed dragonscale (hands and feet),
sunsilk (belt, pants and shoulders) and orichalcum (chest and cape)
Distribute cultist set stats as hybrid set.

- Make cultist cape count towards npc aggro
- Remove unused staff skilltree from cultist
- Remove spin number skill from sword cultist skillset
2021-06-30 03:52:50 +03:00
juliancoffee
21a29ecf74 Add CorruptionSpores
- New lootable food which you can find as husk or darkhound drop
2021-06-30 03:33:06 +03:00
juliancoffee
ef6a12edc2 bumb Biped Cultist armour 2021-06-30 02:10:39 +03:00
Sam
1978b590aa Destringified consumables 2021-06-29 05:59:02 -05:00
Snowram
aaf5f89076 Merge branch 'snowram/death-outcome' into 'master'
Adds an outcome to death with SFX and VFX

See merge request veloren/veloren!2519
2021-06-28 23:18:45 +00:00
Snowram
3ec5306ed0 Adds an outcome to death with SFX and VFX 2021-06-29 00:14:05 +02:00
Ben Wallis
94fa7da4fa Merge branch 'aweinstock/scaleprice' into 'master'
Add prices for dragonscale, hard carapace, and plate, so that more craftable armors have prices.

See merge request veloren/veloren!2521
2021-06-28 21:03:44 +00:00
Imbris
20a9a420c6 Merge branch 'imbris/bind-order' into 'master'
Ensure bind groups are ordered with the most frequently changed ones in later slots

See merge request veloren/veloren!2496
2021-06-28 15:39:31 +00:00
Avi Weinstock
0ab451ec36 Add prices for dragonscale, hard carapace, and plate, so that more craftable armors have prices. 2021-06-28 09:24:22 -04:00
Marcel
f063dcd939 Merge branch 'alphyr/assets_manager0_5' into 'master'
Update `assets_manager` to 0.5

See merge request veloren/veloren!2501
2021-06-27 15:50:16 +00:00
Nícolas Wildner
81010e8465 Update pt br 20210627 2021-06-27 03:26:44 +00:00
juliancoffee
12243bd0c0 Add is_recycling field to recipe book 2021-06-26 21:37:13 +03:00
juliancoffee
c93748224b Clean Material tags
- Make ferocious set (currently not lootable) made from Moonweave
- Remove material tag from twig sets
2021-06-26 21:37:13 +03:00
juliancoffee
3d4eb7d6a4 Dismantle Leather items to Thick Leather
- Previously both Leather and Rawhide items were dismantled to simple
leather
2021-06-26 21:37:13 +03:00
Benoît du Garreau
1cba7db9b6 Update assets_manager to 0.5 2021-06-26 12:05:40 +02:00
Justin Shipsey
f983295318 Merge branch 'swilliams/jewellery' into 'master'
Gem Rings and small change to trading.

See merge request veloren/veloren!2500
2021-06-26 02:44:04 +00:00
Scott Williams
8d0a1ad7b4 Gem Rings and small change to trading. 2021-06-26 02:44:02 +00:00
Snowram
6e8daefa97 Merge branch 'snowram/new-npcs-batch' into 'master'
Snowram/new npcs batch

See merge request veloren/veloren!2495
2021-06-25 20:29:41 +00:00
Snowram
379e755006 Increases base damage of husk attack, rename some cultist weapons 2021-06-25 21:18:28 +02:00
Joshua Barretto
b66957bf74 Merge branch 'AldanTanneo/smooth-layers-shader-fix' into 'master'
Fixes a block noise issue at specific layers (z=434 among others)

See merge request veloren/veloren!2494
2021-06-25 12:43:27 +00:00
Snowram
ef6d6563ea Ajust new npcs from feedback 2021-06-25 03:26:32 +02:00
Snowram
d7f25627ab Ajustments to new npcs 2021-06-24 19:31:21 +02:00
Snowram
8760b69345 Husk brute animations 2021-06-24 19:31:19 +02:00
Snowram
58b95d12d4 Adds alpaca and llama npcs 2021-06-24 19:30:15 +02:00
Snowram
fef0f407d3 Removes warlord and warlock armours 2021-06-24 19:30:11 +02:00
Snowram
87ca00fac0 Adds new species 2021-06-24 19:29:44 +02:00
juliancoffee
1eb9c165be (uk_UA) small fitting fix 2021-06-24 19:52:38 +03:00
Imbris
58f237eaf5 Ensure bind groups are ordered with the most frequently changed ones in later slots 2021-06-24 00:47:59 -04:00
Sam
645cc60dc0 Balance tweaks. 2021-06-23 22:38:37 -05:00
Sam
f0c5ed1397 Added sparseness field to sprite summon. 2021-06-23 22:38:16 -05:00
Sam
68c6a0a495 Balance tweaks for harvester. 2021-06-23 22:38:16 -05:00
Sam
aac24ad601 Added ensnared debuff icon. 2021-06-23 22:38:16 -05:00
Snowram
47cc040301 Adds SpriteSummon animation 2021-06-23 22:38:16 -05:00
Sam
0a32b676c8 Vines now ensnare you by applying a buff. 2021-06-23 22:38:16 -05:00
Sam
763461ebef Ensnaring vines now ensnare you. 2021-06-23 22:38:16 -05:00
Sam
ed503236d6 Slightly functional sprite summon. 2021-06-23 22:38:16 -05:00
Sam
879aafad5c 3 attacks done 2021-06-23 22:38:16 -05:00
AldanTanneo
f1b83962bd Fixed smooth layer at z=434 (and a few other) 2021-06-23 21:13:15 +02:00
juliancoffee
ccf7c7a0e4 Balance food to have sane health per second regen
* Gatherable food gives you slightly variable regen with variable time
based on tier and that fact that we have x2 health on endgame character.
For example while mushroom gives you 5 health over 10 seconds (0.5 health-per-second),
mushroom curry will give you 120 health over 80 seconds (1.5 health-per-second).

* Meat gives you twice powerful regen strength, but with twice shorter
duration
2021-06-22 20:51:31 +03:00
Dominik Broński
8356e2ffca Merge branch 'aweinstock/lava' into 'master'
Lava

See merge request veloren/veloren!2482
2021-06-21 20:49:44 +00:00
Joshua Barretto
b84708ca75 Added chat toggle 2021-06-21 20:16:03 +01:00