Adam Whitehurst
daa18dd92a
fix: remove limit
2021-05-30 13:42:47 -07:00
Adam Whitehurst
9e7937d98f
refactor: BuffKind::Frozen comment
2021-05-30 13:39:18 -07:00
Adam Whitehurst
6dc1c05089
fix: better scaling
2021-05-30 13:06:01 -07:00
Adam Whitehurst
6b1351bdc3
feat: impl attack speed modifier
2021-05-30 12:39:30 -07:00
Avi Weinstock
e09ae8ad83
Address MR 2356 comments.
2021-05-30 13:36:25 -04:00
Avi Weinstock
5164b1a539
Add comments to the PID controller code.
2021-05-30 13:36:25 -04:00
Avi Weinstock
8b20175b6e
Implement PID controllers and use them to stabilize Agent airship flight.
2021-05-30 13:36:25 -04:00
Adam Whitehurst
eea7eead2e
wip: impl Stats::attack_speed_modifier
2021-05-30 09:40:11 -07:00
Adam Whitehurst
e06bd0eaa3
feat: BuffKind::Frozen
2021-05-30 08:51:47 -07:00
Avi Weinstock
3684cf0454
Fix economy data not properly being used to price trades, resulting in default prices being applied at most towns.
...
Also add an exporter from econsim results to sqlite to aid in debugging the economy (which revealed this bug).
2021-05-28 15:09:29 -04:00
Justin Shipsey
d7c7f6bf5d
Merge branch 'sam/rework-bow' into 'master'
...
Bow Rework
See merge request veloren/veloren!2310
2021-05-26 04:44:09 +00:00
Justin Shipsey
1074352ca4
Merge branch 'juliancoffee/dungeon_chests' into 'master'
...
dungeon chests
See merge request veloren/veloren!2342
2021-05-24 23:05:20 +00:00
juliancoffee
c618ec7222
fmt
2021-05-25 01:23:32 +03:00
juliancoffee
940655dcb6
Adding different chests for each dungeon
2021-05-24 23:00:44 +03:00
Marcel
80b8561317
Merge branch 'lboklin/wing-clip' into 'master'
...
Fix higher than intended drag for winged entities
See merge request veloren/veloren!2336
2021-05-24 11:42:12 +00:00
juliancoffee
e248e795a1
fixing tests
2021-05-24 00:06:03 +03:00
juliancoffee
d80a45a066
Fix species tests for random body_type and fmt
2021-05-23 22:59:48 +03:00
juliancoffee
457e5b14d8
Add tests for validation assets
2021-05-23 22:27:33 +03:00
juliancoffee
8c1643cad9
Switch to using EquipSlot key instead of String
2021-05-23 21:37:41 +03:00
juliancoffee
22b1880ae5
LoadoutBuilder efactoring
2021-05-23 20:29:19 +03:00
juliancoffee
00b182c183
Remove unused LoadoutConfig-s
2021-05-23 19:19:20 +03:00
juliancoffee
6656cfe010
Add directory hierarchy
2021-05-23 19:19:20 +03:00
juliancoffee
cbdb7dc1c1
add TODO about tests
2021-05-23 19:19:20 +03:00
juliancoffee
0722861364
Move loadout config handling to .ron files
2021-05-23 19:19:20 +03:00
juliancoffee
f0692c491b
Implement random choosing of item from loadout
2021-05-23 19:19:20 +03:00
juliancoffee
a8699cfa15
Add support for .ron loadouts
2021-05-23 19:19:20 +03:00
James Melkonian
419cd2a5e4
Don't modify position in glide character state
2021-05-23 07:26:11 +00:00
Ludvig Böklin
a2afb75c83
Birds don't have wings
2021-05-23 08:17:49 +02:00
hqurve
854930bc1a
Item pickups are shown in separate window and "inventory-full" messages are shown above the item attempted to be picked up
2021-05-22 20:47:08 +00:00
Sam
7828112486
Balance tweaks.
2021-05-22 15:00:05 -05:00
Sam
0592d14d04
Fix
2021-05-22 13:29:03 -05:00
Samuel Keiffer
9f1bb37b70
Merge branch 'lboklin/bird-drag' into 'master'
...
Adjusted masses; less excessive knockbacks; prevent loot shooting off
See merge request veloren/veloren!2307
2021-05-22 17:56:14 +00:00
Ludvig Böklin
46d1bb5f18
Adjusted masses; less excessive knockbacks; prevent loot shooting off
2021-05-22 17:56:13 +00:00
Samuel Keiffer
e543941073
Merge branch 'juliancoffee/boss_armour' into 'master'
...
Boss armor
See merge request veloren/veloren!2327
2021-05-22 17:42:27 +00:00
Sam
1014ac45bf
Made new skills for reworked bow.
...
Created migration to reset bow skills.
2021-05-22 12:33:21 -05:00
Sam
3f16d15bbb
Reworked bow
2021-05-22 12:33:20 -05:00
Monty Marz
30bcc6aaa3
Ferocious armour for t5-dungeon minibosses
2021-05-22 10:55:36 +00:00
juliancoffee
7dc50891d2
Add placeholders for bosses armour
2021-05-22 00:20:56 +03:00
juliancoffee
312a01122a
Add tests to loadout builder
2021-05-21 23:36:09 +03:00
Sam
3a004d9d4c
Removed commented code
2021-05-17 16:48:56 -05:00
Sam
93b5e674f6
Fixed comments and some functionality.
2021-05-16 21:35:17 -05:00
Ben Wallis
fcf4ab7619
main/offhand weapon swap check refactor
2021-05-16 21:07:36 -05:00
Sam
ad0c247838
Removed special case for equipping a weapon that is no longer needed.
2021-05-15 15:16:39 -05:00
Sam
5cc6168553
Unequipping a mainhand weapon now moves offhand weapon into mainhand.
2021-05-15 15:16:39 -05:00
Sam
19926a2322
Swapping weapon sets is now functional. (Though very hacky?)
2021-05-15 15:16:39 -05:00
Sam
23cc3d671b
Now allows weapons to be swapped between the mainhand and offhand slot. (Probably hacky?)
2021-05-15 15:16:38 -05:00
Sam
6b153bcf47
Enforced certain invariants in how an item was equipped into the loadout:
...
- a 2h weapon can only be equipped in a mainhand slot if the offhand slot is empty
- a 1h weapon can only be equipped in an offhand slot if the mainhand slot has a 1h weapon
- 2h weapons can never be equipped in an offhand slot
Fixed some tests
2021-05-15 15:16:38 -05:00
Sam
9173dca03f
Added equip slots for other weapons.
2021-05-15 15:16:37 -05:00
holychowders
d5f3ba77d4
Make NPCs Aware of Sound - See Issue #913
2021-05-15 19:36:27 +00:00
Marcel
7d5ca0e7bf
Revert "Merge branch 'snowram/hacky-mount' into 'master'"
...
This reverts merge request !2219
2021-05-14 13:43:20 +00:00
Snowram
8745fb803a
Use Body to determine mountee offsets
2021-05-14 00:11:54 +02:00
Snowram
b063ec5a8f
Clean unused mount offset
2021-05-14 00:11:46 +02:00
Snowram
486fbf940e
Anims export a transform for mounts
2021-05-14 00:11:37 +02:00
Snowram
026ba616ff
Expose the mounting bone to the mounter anims
2021-05-14 00:11:28 +02:00
Snowram
e4f3064b8a
Collar can make QuadMeds mountable, state + offsets
2021-05-14 00:11:15 +02:00
James Melkonian
f76b61ac17
Make merchants /tell instead of /say
2021-05-11 17:26:22 +00:00
Sam
0d53e790fd
Made golem laser spawn based off of orientation rather than look_dir. Additional balance tweaks.
2021-05-10 18:54:00 -05:00
Sam
fca56be4c0
Balance tweaks
2021-05-10 18:53:52 -05:00
Sam
d14fd59711
Increased exp of clay golems.
2021-05-10 18:53:51 -05:00
Sam
9bbdc26089
Added haniwa sentries to level 3 dungeons.
2021-05-10 18:53:50 -05:00
Snowram
47a2bf7de8
Adds haniwa sentry object
2021-05-10 18:53:48 -05:00
Sam
c67c56d194
Dungeon placement. Tweaks to melee.
2021-05-10 18:53:47 -05:00
Sam
9f8aeb91c0
Added armor, more ai tweaks.
2021-05-10 18:53:46 -05:00
Sam
1c8db241e2
Golem AI
2021-05-10 18:53:43 -05:00
Sam
5fa4358e74
Clay golem attacks done.
2021-05-10 18:53:01 -05:00
Joshua Yanovski
0cf0f59fa7
Merge branch 'sharp/modtools' into 'master'
...
Added non-admin moderators and timed bans.
See merge request veloren/veloren!2276
2021-05-10 04:54:06 +00:00
Joshua Yanovski
e7587c4d9d
Added non-admin moderators and timed bans.
...
The security model has been updated to reflect this change (for example,
moderators cannot revert a ban by an administrator). Ban history is
also now recorded in the ban file, and much more information about the
ban is stored (whitelists and administrators also have extra
information).
To support the new information without losing important information,
this commit also introduces a new migration path for editable settings
(both from legacy to the new format, and between versions). Examples
of how to do this correctly, and migrate to new versions of a settings
file, are in the settings/ subdirectory.
As part of this effort, editable settings have been revamped to
guarantee atomic saves (due to the increased amount of information in
each file), some latent bugs in networking were fixed, and server-cli
has been updated to go through StructOpt for both calls through TUI
and argv, greatly simplifying parsing logic.
2021-05-09 21:19:16 -07:00
Avi Weinstock
1ae105125d
Change agent's condition
field back to a bool (from bitflags) and add a separate int_counter
field.
2021-05-09 18:09:53 -04:00
Avi Weinstock
1dfcdce1c0
Add a purple fireball to mindflayer and have it shoot it a few times before teleporting, and fix mindflayer AI's husk summons.
2021-05-09 18:09:31 -04:00
juliancoffee
d3be89f5eb
Add species to /spawn auto-complete
2021-05-09 20:43:13 +03:00
juliancoffee
735e8ab4ec
Extract common/src/assets.rs to own crate
...
This gives us ability to use assets-related code in i18n without
depending on whole veloren-common
2021-05-09 13:12:26 +03:00
Snowram
831bfd0be9
Snowram/craft mats
2021-05-07 17:03:45 +00:00
Samuel Keiffer
a2999ce96f
Merge branch 'aweinstock/damage-types' into 'master'
...
Add `DamageKind`, and make piercing damage partially ignore damage resistence.
See merge request veloren/veloren!2262
2021-05-06 22:22:49 +00:00
Avi Weinstock
e4cda4309e
Add DamageKind
, and make piercing damage partially ignore damage resistence.
...
- Tweak bow/staff M1 stats.
2021-05-06 17:39:06 -04:00
James Melkonian
346eb48a27
Move weapon tactics to functions and take target body into attack radius consideration
2021-05-06 21:17:05 +00:00
Marcel Märtens
8196fd8b35
instead of manually trying to sync disconnect metrics we now pass a Reason to the handle_disconnect.
...
There we make sure that the disconnect only happens once and decrease the respective Metrics.
Also added more reasons
2021-05-06 11:43:10 +02:00
Sam
dc7e45c8bd
Rebalancing
2021-05-05 14:43:56 -04:00
Sam
062c290e49
Made buff commands exhaustive
2021-05-04 09:54:28 -04:00
Sam
2652660a58
Addressed comments and more testing feedback.
2021-05-04 08:45:14 -04:00
Sam
240a8e577d
Minor balancing tweaks.
2021-05-04 08:45:13 -04:00
Sam
5c241850f1
Added sfx. Addressed comments.
2021-05-04 08:45:12 -04:00
Sam
48fa4e7c1f
Balancing.
2021-05-04 08:45:11 -04:00
Sam
164fd0de04
Particles for frenzy buff and ground cleave.
2021-05-04 08:45:10 -04:00
Sam
2290a22a15
Gave minotaur AI.
2021-05-04 08:45:09 -04:00
Sam
811f1fadb2
Replaced action_timer with action_state so there are additional fields.
2021-05-04 08:45:09 -04:00
jshipsey
c886accaf1
anims
2021-05-04 08:45:08 -04:00
Sam
d1139c3b7c
Added frenzy ability to minotaur.
...
Added self-buff character state.
Added frenzied buff kind.
Added better comments on each buff kind.
2021-05-04 08:45:07 -04:00
Sam
160bd3ef0c
Crippling strike now functional. Crippled debuff added.
2021-05-04 08:45:05 -04:00
Samuel Keiffer
771a8db2a8
Merge branch 'slipped/oritweak' into 'master'
...
ori tweaks, animal adjusts
See merge request veloren/veloren!2234
2021-05-03 18:49:22 +00:00
jshipsey
63fdc4f590
animal adjustments
2021-05-02 23:17:58 -04:00
jshipsey
769e21104e
higher health lower damage
2021-05-01 12:29:28 -04:00
jshipsey
dc5a38f1e8
ori addition to combomelee
2021-05-01 12:29:28 -04:00
Sam
d500a00414
Made naming of fields more explicit.
2021-05-01 09:25:56 -04:00
Sam
708cb12086
Fixed tests.
2021-05-01 09:25:55 -04:00
Sam
d3d4ee8bb0
Formatting stuffs.
2021-05-01 09:25:53 -04:00
Sam
3cb0ee98c8
Removed all unique and simple tool kinds.
2021-05-01 09:25:51 -04:00
Sam
a35b8b4aad
Removed ability set as field on items.
2021-05-01 09:25:49 -04:00
DaforLynx
7334cce426
Poise (stun) SFX and fix for town music
2021-04-29 23:36:22 +00:00
Samuel Keiffer
e177aebd9e
Merge branch 'lboklin/lower-zero-lift-drag' into 'master'
...
Lower zero-lift drag
See merge request veloren/veloren!2223
2021-04-29 19:11:12 +00:00
Ludvig Böklin
c4444a908a
Lower zero-lift drag
2021-04-29 19:22:09 +02:00
Ludvig Böklin
6b52ea89b4
Add more specific masses to objects
2021-04-29 11:46:03 +02:00
Ben Wallis
b0aca9a348
Merge branch 'xvar/item-serialization' into 'master'
...
Changed Item serialization to not send ItemDef struct across the network
See merge request veloren/veloren!2215
2021-04-28 20:50:32 +00:00
Ben Wallis
14caae3667
Changed Item serialization to only send item_definition_id across the network rather than the whole ItemDef
2021-04-28 21:00:25 +01:00
Ludvig Böklin
34660462e9
Glider physics
2021-04-27 14:41:48 +00:00
Sam
d2d8d43410
Addressed testing feedback.
...
Particles better.
2021-04-25 13:09:08 -04:00
Sam
b9d6bd2fd2
Parrying no longer requires releasing the block button, and instead can parry if block happened in buildup.
2021-04-25 13:09:07 -04:00
Sam
288a6f3a82
Blocking now works if no weapon is equipped in main hand.
...
Added temp sfx for blocking and parrying.
Added temp particles for successful parry.
Tweaked values of default block ability.
2021-04-25 13:09:02 -04:00
Sam
f5ec23df48
Parrying
2021-04-25 13:08:42 -04:00
Sam
91c6288213
Melee weapons can now block.
2021-04-25 13:08:42 -04:00
Sam
0170a38ebc
Removed unwraps in buffs
2021-04-25 12:01:21 -04:00
Snowram
c16ec43938
Body specific beam offsets
2021-04-25 04:07:12 +02:00
Snowram
8f54a0bf31
More phoenix AI work
...
More phoenix AI work
2021-04-25 04:07:12 +02:00
Snowram
8cf8e51962
Phoenix npc + AI (WIP)
2021-04-25 04:07:11 +02:00
Snowram
fd177c9669
Breathe and stun anims
2021-04-25 02:14:50 +02:00
Snowram
eb98360183
Cockatrice bird_large conversion
2021-04-25 02:14:50 +02:00
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
Dominik Broński
1d25016459
Merge branch 'lboklin/arrow-turret-drag-fix' into 'master'
...
Fix ArrowTurret drag coefficient
See merge request veloren/veloren!2175
2021-04-21 20:17:44 +00:00
Ludvig Böklin
37713cb4ad
Fix ArrowTurret drag coefficient
2021-04-21 18:26:23 +02:00
Joshua Barretto
ed7cc12213
Made characters carry lanterns higher when possible
2021-04-21 15:59:29 +01:00
Ludvig Böklin
762c68cfbb
Basic fluid dynamics and physical properties for entities
2021-04-20 17:38:19 +02:00
Monty
86445af09c
change cauldron spawning
...
cooking pot height
fmt
fmt, changelog
2021-04-20 02:48:13 +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
Joshua Barretto
b700d9a641
Merge branch 'zesterer/econ-tweaks' into 'master'
...
Limit trading currency to sane amounts
See merge request veloren/veloren!2154
2021-04-19 10:46:17 +00:00
Joshua Barretto
324148d9a3
Limit trading currency to sane amounts
2021-04-19 10:04:28 +01: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
Ben Wallis
a4cdb89987
Implemented inventory sorting
2021-04-17 22:04:08 +01:00
gGmMsS123
d5a887f195
m2 staff
2021-04-16 00:48:20 +03:00
gGmMsS123
e33961e1fa
M2 Staff Final Touch
2021-04-16 00:34:24 +03:00
gGmMsS123
0d956610ec
Added burning debuff for Staff M2
2021-04-15 23:34:28 +03:00
Sam
94042bdf79
Stats adjusted for 2h. Poise adjusted by handedness.
2021-04-14 15:03:37 -04:00
holychowders
568a8d9666
Resolve Issue #978 - Extract SkillSet Into Its Own Component
2021-04-14 15:35:34 +00: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
Sam
0b10ffc715
You can now roll without a weapon equipped.
2021-04-13 20:18:58 -04:00
Avi Weinstock
ddf6a26577
Give NPCs the ability to use potions.
2021-04-11 23:47:29 +00:00
Joshua Yanovski
af94753ad9
Remove panics and unwraps, part 1.
...
Also fixes various other miscellaneous bugs.
2021-04-10 10:03:21 +02:00
Vincent Foulon
d80db38bc9
Remove TRADE capability, use trade_site attribute instead
2021-04-08 19:06:57 +02:00
Vincent Foulon
bc1797a240
Address comments
2021-04-08 18:33:00 +02:00
Vincent Foulon
a30cbaf735
Move Behavior to Agent's Component
2021-04-07 22:11:29 +02:00
Vincent Foulon
dbee13f9be
Finally Behavior isn't good enough as a component, Remove it from ECS and include it onto Agent directly
2021-04-07 22:02:57 +02: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