Sam
4784b61656
Small fixes
2022-11-13 14:03:37 -05:00
Samuel Keiffer
1173c8257f
Merge branch 'holychowders/agent_awareness2' into 'master'
...
Rework internal representation of agent awareness
See merge request veloren/veloren!3661
2022-11-12 18:48:32 +00:00
holychowders
95fd092e26
Fix awareness changes.
2022-11-12 12:12:32 -06:00
flo
0351bf1d63
Moss Drake
2022-11-12 13:00:42 +00:00
Eternalisime
8f4863be28
combat: balance tweaks on roshwalr
2022-11-11 10:22:23 +01:00
Eternalisime
f1b77e27fe
combat: lowered flee_health on roshwalr
2022-11-10 16:57:29 +01:00
Eternalisime
918d5eb345
combat: added a unique kit to roshwalr
2022-11-10 13:53:12 +01:00
holychowders
571b07d54a
Remove dt and multiplication by 30.
2022-11-06 13:10:17 -06:00
holychowders
641a5c4cda
Merge branch 'master' of gitlab.com:veloren/dev/veloren into holychowders/agent_awareness2
2022-10-29 13:21:27 -05:00
holychowders
3d4ad29d1d
Flee if attacked even if attacker is not close.
2022-10-28 21:31:49 +00:00
holychowders
3f3f8605af
Merge branch 'master' of gitlab.com:veloren/dev/veloren into holychowders/agent_awareness2
2022-10-28 15:16:44 -05:00
holychowders
4426972057
Refer to the fully aware state of an agent as "alert".
2022-10-28 15:03:11 -05:00
Sam
0fe073fcdc
Addressed feedback from testing
2022-10-27 20:07:10 -04:00
Sam
b5682c4682
Addressed review comments
2022-10-27 20:07:09 -04:00
Sam
a44c36432e
Fixed that equipping weapons by using them from hotbar would bypass equipping animation.
2022-10-27 20:07:09 -04:00
Sam
1782408676
Address UX issues of contextual abilities.
2022-10-27 20:07:08 -04:00
Sam
8cfe62e6dc
Activated abilities can now be contextualized
2022-10-27 20:07:07 -04:00
Sam
07d273aa09
Removed unneccessary term in skill point cost calculation
2022-10-27 20:07:07 -04:00
Sam
5674923a54
Changed exp/sp progression for sword skill tree
2022-10-27 20:07:06 -04:00
Sam
38ce87d80b
Initial balance pass on sword ability stats
2022-10-27 20:07:05 -04:00
Sam
2e8ad96121
Stances now require a small amount of time to enter them
2022-10-27 20:07:05 -04:00
Sam
df9ef691fd
Cleaving stance AI
2022-10-27 20:07:03 -04:00
Sam
c97bfdfb94
Defensive stance AI
2022-10-27 20:07:01 -04:00
Sam
7dcb3582e6
Sword AI for offensive abilities
2022-10-27 20:07:01 -04:00
Sam
221b0aff5f
Sword AI can now choose their abilities
2022-10-27 20:07:00 -04:00
Sam
8d3567b6b2
Made combo melee more ergonomic to use when it is a stance
2022-10-27 20:06:59 -04:00
Sam
5757b0bdf0
Abilities are now more expensive when in a mismatched stance if that stance is not the balanced stance.
2022-10-27 20:06:57 -04:00
Sam
5974646a3c
You can now leave a stance by using the corresponding ability input
2022-10-27 20:06:57 -04:00
Sam
a2242b28f4
If you were in a stance when you used an ability, return to that stance after the ability is complete.
2022-10-27 20:06:56 -04:00
Sam
a8212d6f41
Dive melee now scales its attack off of the entity's vertical speed.
...
Parries now cause the attacker to effectively have a recover that is either twice as long or 0.5s longer, whichever is more.
Counters now deal twice as much damage to the target if the target is in the buildup portion of an ability.
2022-10-27 20:06:55 -04:00
Sam
9091d46554
Animation for reaching charge. Changed dash melee code to probe with a test melee instead of performing the actual melee strike during charge.
2022-10-27 20:06:53 -04:00
Sam
7c22847009
Animation for parrying parry
2022-10-27 20:06:48 -04:00
Sam
e03e137793
Combo melee tweaks
2022-10-27 20:06:40 -04:00
Sam
da21e1cb02
Removed air slash stance and abilities
2022-10-27 20:06:40 -04:00
Sam
eacbdefb75
Skill point prerequisites and costs
2022-10-27 20:06:37 -04:00
Sam
2fcd876e3f
Air slash abilities
2022-10-27 20:06:35 -04:00
Sam
7a8653e8f8
Reaching abilities
2022-10-27 20:06:35 -04:00
Sam
500e0ae3d0
Heavy abilities
2022-10-27 20:06:34 -04:00
Sam
8a578bf3f6
Parrying abilities
2022-10-27 20:06:34 -04:00
Sam
d99eddb483
Defensive abilities
2022-10-27 20:06:33 -04:00
Sam
ec03bd7032
Cleaving abilities
2022-10-27 20:06:33 -04:00
Sam
2051d45d2f
Offensive abilities
2022-10-27 20:06:32 -04:00
Sam
c37925d1e2
Changed logic for entering combo melee state depending on whether or not it was a stance
2022-10-27 20:06:31 -04:00
Sam
fd05795b4c
Titles and descriptions for each ability.
2022-10-27 20:06:31 -04:00
Sam
014a8cce61
Combo melee can now optionally not function as a stance
2022-10-27 20:06:31 -04:00
Sam
66f9cf22fc
Balanced abilities and insert ability id into animations.
2022-10-27 20:06:30 -04:00
Sam
aea4a43b65
Placeholder abilities
2022-10-27 20:06:30 -04:00
Sam
38094b6ba2
Finisher melee
2022-10-27 20:06:29 -04:00
Sam
057b1a4ad6
Added capability for attacks to be interrupted by dodging or blocking
2022-10-27 20:06:29 -04:00
Sam
1e0dfe003d
Rolling can now only interrupt abilities when in buildup
2022-10-27 20:06:28 -04:00
Sam
7b27b63122
Melee attacks now only hit a single target by default
2022-10-27 20:06:28 -04:00
Sam
af39287331
Added support for abilities being cheaper if activated from the correct stance
2022-10-27 20:06:27 -04:00
Sam
0ff06edcdc
Combo melee skips recover if continuously striking. Combo animations consolidated to one file.
2022-10-27 20:06:27 -04:00
Sam
17258975fc
Combo melee 2 state
2022-10-27 20:06:26 -04:00
Marcel
51d4c8dd51
Merge branch 'halloween' into 'master'
...
Halloween event
See merge request veloren/veloren!3668
2022-10-25 21:37:34 +00:00
Samuel Keiffer
f676e732f6
Merge branch 'flaffwaffle/action_state_concurrent_states' into 'master'
...
ActionState extensions to allow for multiple concurrent state variables And More Complex AI
See merge request veloren/veloren!3659
2022-10-25 03:21:46 +00:00
Timothy Finnegan
1922d69154
Ran Cargo fmt
2022-10-24 19:52:37 -07:00
IsseW
9a6a3a05a1
bat config
2022-10-25 00:31:04 +02:00
kitswas
c83ec87d6a
Code cleanup
2022-10-24 22:05:11 +05:30
kitswas
e29a9f4e36
Colour reflects old poise state
2022-10-24 22:05:11 +05:30
kitswas
b21764c99f
Added tick mark for the upcoming threshold
2022-10-24 22:05:11 +05:30
kitswas
be586aa84f
Extracted hard-coded poise thresholds to a constant
2022-10-24 22:05:11 +05:30
Timothy Finnegan
5e5e1066eb
Added support for multiple timers, conditions, and counters in a single action node.
2022-10-23 18:31:09 -07:00
James Melkonian
6bacb487f3
Bat AI
2022-10-23 20:05:39 +02:00
flo666
586d0f6dd8
add bat (created by Gemu)
2022-10-23 20:05:39 +02:00
flo666
79e6fd58fe
- make tricksters spawn in groups and play instruments
...
- remove defunct draugr flee
2022-10-23 20:05:39 +02:00
flo666
e1bd385408
make draugrs Npcs flee at health below 100%,
...
trickster gear,
single spawns (trickster, dullahan),
2022-10-23 20:05:39 +02:00
holychowders
7502cd664a
Have agents update awareness of targets.
...
This is preliminary and has no visible effect.
2022-10-21 20:25:54 -05:00
holychowders
f45c465c75
Add new Awareness struct.
2022-10-20 11:36:29 -05:00
holychowders
bc20744cd3
Remove old unused awareness stuff.
2022-10-20 11:36:16 -05:00
Monty Marz
2d8627c29b
Add gnarling chieftain mask
2022-10-15 11:05:21 +00:00
Avi Weinstock
e6576f0cf3
Make the trading AI for pets only accept food.
2022-09-30 15:11:03 -04:00
Avi Weinstock
60f5383f8b
Address comments for MR 3633.
2022-09-30 14:51:49 -04:00
Avi Weinstock
c62bc0dd0d
Allow pets to be traded with.
2022-09-30 14:51:49 -04:00
Marcel Märtens
cf6a764aa4
update toolchain to 2022-09-23
2022-09-25 15:58:32 +02:00
Samuel Keiffer
59d8d287d9
Merge branch 'seachapel_npc_work' into 'master'
...
seachapel npc work
See merge request veloren/veloren!3599
2022-09-22 01:04:01 +00:00
flo
a37e1f8d99
seachapel npc work
2022-09-22 01:04:01 +00:00
Joshua Yanovski
1c14ec7ee1
Parallelize ingame messages.
2022-09-21 10:25:57 -07:00
Joshua Yanovski
67231aff90
Remove persistence loading error from SkillSet.
...
This is needed (for now) in order to parallelize ingame_chat, because
one of the handled messages updates this value on the server. It turns
out that the value is not actually used on the server, only the client,
so this was mostly a matter of threading this back to the correct place.
Additionally, we took the opportunity to modify the UI to not log you
into the game until your character was confirmed to be loaded, which
was a todo item that lets us simplify some error handling logic and
remove stuff from global state.
2022-09-21 09:29:25 -07:00
flo
dc688bccb9
fix_salamander_and_elbst
2022-09-13 17:32:53 +00:00
Joshua Yanovski
aea4aca057
Merge branch 'xmac94x/steal-sharps-clippy-improvements' into 'master'
...
Xmac94x/steal sharps clippy improvements
See merge request veloren/veloren!3612
2022-09-11 19:56:35 +00:00
flo
e43608ce80
add guitar & instrument sample edits
2022-09-10 17:23:38 +00:00
Joshua Yanovski
986d104faa
Update Rust toolchain.
2022-09-08 15:43:53 -07:00
juliancoffee
34c5e95d8a
Add Energy regen buff
...
* Fix broken i18n keys for health and energy increases
* Better handle buff descriptions
Calculate infobox lines for item stats to set correct infobox frame
dimensions
2022-09-06 15:50:04 +03:00
Isse
7ea720b2ef
Merge branch 'creature_model_updates' into 'master'
...
Creature model updates
See merge request veloren/veloren!3584
2022-09-06 10:35:11 +00:00
flo
e4a3671345
Creature model updates
2022-09-06 10:35:10 +00:00
juliancoffee
2b3cfe690d
Adress review
...
* Make compatible_handndess check its own function and get back to
`match`
2022-09-06 00:59:15 +03:00
juliancoffee
421aa44d5f
Make kit generate all possible modulars
2022-09-05 00:24:58 +03:00
juliancoffee
0c5a33b031
Add functions to generate collection of modulars
2022-09-05 00:24:58 +03:00
flo
6c89cd8fbf
put Organ under Toolkind Instrument
2022-08-30 16:55:02 +00:00
Samuel Keiffer
52ce12f383
Merge branch 'floppy-music-instruments' into 'master'
...
Music Instruments
See merge request veloren/veloren!3535
2022-08-28 18:48:18 +00:00
flo
9339971032
Music Instruments
2022-08-28 18:48:18 +00:00
flo666
1876d169c8
- Dagon, SeaCrocodile hitboxes
2022-08-27 08:06:33 +02:00
flo
e882e62c08
seachapel
2022-08-24 21:50:53 +00:00
Joshua Barretto
51d90707b5
Relaxed automod somewhat
2022-08-23 10:03:06 +01:00
Imbris
275b17be57
Merge branch 'imbris/misc_fix' into 'master'
...
Trade canceling related tweaks, make kill_npcs not leave clutter (and actually remove entities in the first place), and misc tweaks
See merge request veloren/veloren!3555
2022-08-21 16:35:16 +00:00
DaforLynx
656727ecbd
Miscellaneous audio fixes
2022-08-21 05:32:02 +00:00
Imbris
ca66a9f79b
Fix bug in Health::kill that caused Destroy event to never be emitted by preemptively setting is_dead to true
2022-08-20 18:47:09 -04:00
juliancoffee
69cea513ee
Make comments to be doc-comments
2022-08-20 22:30:25 +03:00
juliancoffee
6319dcfc22
Add more components in /body
...
* Add mass
* Add density
* Add collider.
This one is strange as always, I don't know what's wrong, but debug hitbox
changes only after death. Real one seems to work.
2022-08-20 17:02:08 +03:00
Tormod Gjeitnes Hellen
e306b3bfe3
Have the ambushers say something.
...
Very unsure about the way I did this...
2022-08-17 23:50:09 +02:00
Samuel Keiffer
a1b5f53d15
Merge branch 'craft-all' into 'master'
...
Craft all
See merge request veloren/veloren!3525
2022-08-12 00:47:48 +00:00
Julio Cezar Silva
9315482fc4
Craft all
2022-08-12 00:47:48 +00:00
Joshua Barretto
602de267b1
Perform validation on all kinds of chat message
2022-08-11 11:11:33 +01:00
IsseW
87821d5c1d
force update counter
2022-08-09 19:22:09 +02:00
Imbris
d5b59c2bb7
Convert away from IdvStorage to mixture of VecStorage and DenseVecStorage
2022-08-08 00:38:20 -04:00
Sam
28a4ce9be1
Various tweaks
2022-07-26 19:44:49 -04:00
Forest Anderson
67534488b3
Merge branch 'tygyh/CleanUp' into 'master'
...
Tygyh/clean up
See merge request veloren/veloren!3480
2022-07-17 14:04:45 +00:00
Youssef Fahmy
91c85dea22
Humanoid Model Overhaul
2022-07-16 11:13:24 +00:00
tygyh
120ee6b6c0
Fix typos
2022-07-15 18:59:37 +02:00
tygyh
cbe4d9d807
Remove unused imports
2022-07-15 16:00:27 +02:00
tygyh
fefe745508
Reorder impl member order to match trait member order
2022-07-15 15:54:32 +02:00
tygyh
5e5698249b
Remove unnecessarily qualified paths
2022-07-15 14:49:46 +02:00
Christof Petig
bb952fe755
rustfmt the last cleanup
2022-07-13 23:38:11 +02:00
Christof Petig
edfe6d887e
final polish
2022-07-13 23:32:20 +02:00
Christof Petig
eab062450a
clippy helped to get rid of one level of indirection
2022-07-13 23:27:17 +02:00
Christof Petig
d2aa9028ec
clippy is right about this flat_map
2022-07-13 23:17:22 +02:00
Christof Petig
197f84a360
returning a vec creates much more readable code
2022-07-13 23:03:58 +02:00
Christof Petig
3bdeb77268
Full support for modular weapon in loot table read
2022-07-13 22:56:52 +02:00
Christof Petig
a0749ac9bc
test passes, not happy with implementation yet
2022-07-13 20:15:28 +02:00
Christof Petig
5bbb73bc17
changelog + remove dead code, but the test still fails
2022-07-13 20:15:28 +02:00
Christof Petig
5ee72f8a5e
fix test; add tusk, crest, pincer
2022-07-13 20:15:28 +02:00
Christof Petig
8c5901516e
clean up
2022-07-13 20:15:28 +02:00
Christof Petig
7a1218cf2f
make a recipe of all modular weapons
2022-07-13 20:15:28 +02:00
Christof Petig
3a7835c6d0
replace one Owned reference by the normal Reference type
2022-07-13 20:15:28 +02:00
Avi Weinstock
cea2550dde
Add Item::new_from_item_definition_id.
2022-07-13 20:15:28 +02:00
Christof Petig
7e5ebada2d
still incomplete but looks surprisingly usable
2022-07-13 20:15:28 +02:00
Christof Petig
33a01a0dab
fix compilation of example
2022-07-13 20:15:28 +02:00
Christof Petig
2b2ac20403
use ItemDefintionId across trade_pricing
2022-07-13 20:15:27 +02:00
Avi Weinstock
27d2cdeb79
WIP modular weapon pricing.
2022-07-13 20:15:27 +02:00
Socksonme
6a355c58f2
Remove instance from PoiseChange
2022-06-29 18:36:05 +03:00
Socksonme
2c5fd06d0b
Address review
...
- Change hp_pulse to not be framerate dependent
- Change some of the HpFloater checks to be inside the find() function
- Remove unnecessary join
- Add back option for showing incoming damage + add option for
experience accumulation
- Change `ExpFloater`s to not store the owner, as they are only shown
for the player (will have to see if the implementation is correct so
that it may be applied to the other floaters)
- Rename `Outcome::Damage` to `Outcome::HealthChange` and `DamageInfo`
to `HealthChangeInfo`
- Update some outdated comments/documentation
2022-06-29 17:31:58 +03:00
socksonme
eabbfe6a51
Remove damage batch option + crit_mult
2022-06-29 17:31:54 +03:00
socksonme
0e84794217
change font size formula to not use crit_mult + use ints for change by check
2022-06-29 17:31:43 +03:00
socksonme
3d2dcbf894
Revert some changes
2022-06-29 17:31:43 +03:00
socksonme
559d5ca804
Some changes to DamageSources + various code qual changes
2022-06-29 17:31:43 +03:00
socksonme
5360a7c93e
Tons of code quality changes, added damage rounding option
2022-06-29 17:31:37 +03:00
socksonme
64f0f05608
Fixed bug with healing above 5.0 and preparing for options
2022-06-29 17:31:10 +03:00
socksonme
db16e6147c
Instance inside projectile constructor is now a variable
2022-06-29 17:31:09 +03:00
socksonme
202d558246
Instance number generated inside projectile constructor, remove crit field
2022-06-29 17:31:07 +03:00
socksonme
6c75ad6ef8
Code quality changes and comments
2022-06-29 17:30:54 +03:00
socksonme
c0e78d869e
Instance numbers are now based on the AttackDamage struct
2022-06-29 17:30:53 +03:00
socksonme
ac5bf53c42
Instance numbers for HpChanges
2022-06-29 17:30:50 +03:00
socksonme
f8924d6c1a
tweaks to damage floaters
...
Added some comments where stuff needs to be discussed
2022-06-29 17:30:32 +03:00
socksonme
7a1e19d42c
Crits now only glob with eachother, now show up like healing
...
Still a WIP, need to change crits to being non-floating and try implementing crits popping, need to remove some debugging stuff later
2022-06-29 17:30:29 +03:00
socksonme
ce95680df9
Addressed comments, health and damage floaters are now separated
...
Enemy healing probably needs to be discussed as it doesn't show up as of now and the way crits are handled also needs to be discussed
2022-06-29 17:29:59 +03:00
socksonme
94f193fbe0
Damage outcomes are now emitted with health change events
...
Being healed and damaged at the same time still leads to issues - needs to be sorted out
2022-06-29 17:29:19 +03:00
Marcel Märtens
997b330f19
add physics tests that verify the status quo
2022-06-07 22:53:34 +02:00
terrarier2111
45efdb6602
Implement group owned loot
2022-06-04 17:16:12 +00:00
Sam
5e57eabd11
Code changes and msm
2022-05-30 20:25:31 -04:00
