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
Ben Wallis
398b658524
Merge branch 'juliancoffee/better_item_tests' into 'master'
...
More informative item tests
See merge request veloren/veloren!2534
2021-06-30 20:12:21 +00:00
juliancoffee
a3bf073875
Use assets::load_dir to test item assets
2021-06-30 18:48:28 +03:00
DaforLynx
a757bf3dbd
Sfx fixes and new test
2021-06-30 11:43:00 +00:00
juliancoffee
c5da56e900
Nerf Husk Brute
...
- Remove HuskBrute health level buff
- Make their attack slower
2021-06-30 03:52:50 +03:00
juliancoffee
b9134a3f61
Make QuadMed great again
...
- Make Bonerattler, Darkhound, Lion, Snowleopard use QuadMedJump (Saber
attack)
2021-06-30 03:52:50 +03:00
juliancoffee
ef6a12edc2
bumb Biped Cultist armour
2021-06-30 02:10:39 +03:00
Sam
8a9de26132
Food now applies buff at end of state.
...
Rolling and poise states now cancel the potion buff.
UseItem character state now checks that the item in the slot has the same item_definition_id as when the entity enters the state.
Rolling can no cancel item use.
Rolling now checks for move_dir instead of velocity.
2021-06-29 05:59:02 -05:00
jshipsey
37c6fe9ee8
anims
2021-06-29 05:59:02 -05:00
Sam
3559ce5803
Added UseItem character state.
2021-06-29 05:59:02 -05:00
Sam
1978b590aa
Destringified consumables
2021-06-29 05:59:02 -05:00
Dr. Dystopia
11d2017bb3
Extract 'swap_equipment' and 'swap_armor' functions
2021-06-28 16:17:18 +02: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
juliancoffee
12243bd0c0
Add is_recycling field to recipe book
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
379e755006
Increases base damage of husk attack, rename some cultist weapons
2021-06-25 21:18:28 +02: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
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
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
Snowram
15a2fbc555
3 attack anims done
2021-06-23 22:38:16 -05:00
Sam
879aafad5c
3 attacks done
2021-06-23 22:38:16 -05: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
e930ff6779
Sanitise controller inputs
2021-06-21 21:13:49 +01:00
Joshua Barretto
288f2c13d4
Enable strafing in first-person mode
2021-06-21 13:27:19 +01:00
Avi Weinstock
0f9181cbcb
Address MR 2482 comments.
...
- Change lava density to 3x water density.
- Use `ServerEvent::Buff` instead of modifying the buff component directly.
- Revert commented-out changes to fluid shaders.
2021-06-20 11:32:05 -04:00
Avi Weinstock
2226a4c6a9
Add lava to caves, which sets you on fire if you swim in it. Currently requires uncommenting #define LAVA in the shaders, and only looks good with cheap fluid mode.
2021-06-19 16:31:21 -04:00
Samuel Keiffer
e7f54d6306
Merge branch 'juliancoffee/clay_golem_tweak' into 'master'
...
clay golem tweak
See merge request veloren/veloren!2478
2021-06-19 14:49:11 +00:00
juliancoffee
57649a2e90
tweak clay_golem HP
2021-06-19 10:47:45 +03:00
Samuel Keiffer
0b8039c3b0
Merge branch 'juliancoffee/trade_pricing_refactor' into 'master'
...
Refactor trade_pricing.rs
See merge request veloren/veloren!2469
2021-06-19 01:10:16 +00:00
juliancoffee
384409a1ed
Load ori_rate for BasicBeam from assets
...
+ make fire turret ori_rate slower
2021-06-18 22:33:00 +03:00
DaforLynx
c85238014a
More npc sfx
2021-06-18 06:24:57 +00:00
juliancoffee
ff27c550d1
clippy & code cleaning & test diagnostic
...
- add clippy::pedantic
- move internal functions to methods/functions
- rename one-letter variables
- use tuple pattern matching instead of indexing
- make print_sorted fancier, also show prices on `.other` entries
2021-06-17 19:10:55 +03:00
DaforLynx
9a5b95bc16
Added npc hurt sfx
2021-06-17 05:49:09 +00:00
jshipsey
a42e6e20b8
basilisk tweaks
2021-06-16 23:28:25 -04:00
jshipsey
0941f03608
buffs to stretch progression
2021-06-16 20:50:46 -04:00
Joshua Barretto
e3c44ba7fe
More voice kinds, more opportunities for sounds
2021-06-16 17:23:22 +01:00
Joshua Barretto
fb51fd3230
Emit sound from head
2021-06-16 17:23:22 +01:00
Joshua Barretto
0ef29a6989
VoiceKind for better sound effect specs
2021-06-16 17:23:22 +01:00
Joshua Barretto
559311e1b0
Chasing sounds
2021-06-16 17:23:22 +01:00
Snowram
f2c7836161
Makes summon range inclusive
2021-06-15 09:49:13 +02:00
