264 Commits

Author	SHA1	Message	Date
Sam	981eee5936	Transitioned knockback to an enum.	2020-10-28 18:15:27 -05:00
Sam	1ccbdec35c	Tweaked dash melee some more.	2020-10-28 18:15:26 -05:00
Sam	15286a094a	Leaps now require a non-negative vertical velocity to use.	2020-10-28 18:15:24 -05:00
Sam	63011241ea	Added keyframes to all states that were lacking them.	2020-10-28 18:15:23 -05:00
Sam	e6684009c2	Made ability key not hardcoded in tool.rs.	2020-10-15 20:05:58 -05:00
Sam	14e4af7ab6	Addressed playtesting feedback.	2020-10-14 21:06:52 -05:00
Sam	1ba8a6cfb3	Balance tweaks to staff abilities.	2020-10-14 20:57:01 -05:00
Sam	b5091a5891	Ai for staff-wielding enemies. Keyframes for shockwave state.	2020-10-14 20:56:24 -05:00
Sam	7ef73f5981	Added particles for fire shockwave. Added ability key enum so held abilities could differentiate what button they should check. Modified energy fields on basic beam so it could drain energy every second.	2020-10-14 20:56:22 -05:00
Sam	256846a669	Initial implementation of new staff abilities.	2020-10-14 20:56:16 -05:00
jiminycrick	512d881cd2	Fixed clippy errors and added SFX	2020-10-14 15:30:58 -07:00
jiminycrick	95c36cc3fb	Skill icons with proper rotation	2020-10-14 12:50:33 -07:00
jiminycrick	1f3bd0e1d2	Responded to testing feedback	2020-10-14 12:50:33 -07:00
Sam	e1634fa83a	Fixed errors from transitioning some states to keyframes.	2020-10-14 12:50:33 -07:00
Sam	21cf1e2168	Added keyframes to leap melee.	2020-10-14 12:50:33 -07:00
Sam	7e0cc2d8e5	Added keyframes to repeater ranged.	2020-10-14 12:50:33 -07:00
Sam	97f580be2b	Added keyframes to charged melee.	2020-10-14 12:50:32 -07:00
jiminycrick	431f99a791	Reducing the amount of data in character state	2020-10-14 12:50:32 -07:00
jiminycrick	05623eb8bd	Addressed comments	2020-10-14 12:50:32 -07:00
jiminycrick	04175bab09	Add skillbar stuff for 3rd skills	2020-10-14 12:50:32 -07:00
jiminycrick	951acfca21	Add 3rd skill for hammer, bow, and axe minus skillbar UI stuff	2020-10-14 12:50:32 -07:00
Sam	56d2afc0dc	Added keyframe support to basic beam state. Addressed some comments.	2020-09-29 19:48:15 -05:00
Sam	67eafdabd0	Separated out energy cost for healing so it's not based off of the energy regen from dealing damage.	2020-09-29 19:48:11 -05:00
Sam	46563e7008	Added beam system. Added collision code for spherical wedge/cylinder detection.	2020-09-29 19:48:04 -05:00
Sam	8f7d45100d	Tick rate now exposed as a variable.	2020-09-29 19:48:01 -05:00
Monty Marz	a2d74b71c4	change tick rate	2020-09-29 19:48:01 -05:00
Sam	921d224ef6	Lifesteal now works. Added particles to healing beam.	2020-09-29 19:47:57 -05:00
Sam	f20134d7ea	Initial implementation for beam attack.	2020-09-29 19:47:56 -05:00
Sam	2ff59c9f60	Addressed comments	2020-09-21 17:55:29 -05:00
Sam	b4018e7d42	Made 3rd ability interruptible. Final balance tweaks.	2020-09-21 17:40:16 -05:00
Sam	133e79ffd5	Modified how spin melee functions.	2020-09-21 17:38:56 -05:00
Sam	a8e834e754	Initial implementation of spin attack for sword.	2020-09-21 17:38:54 -05:00
Sam	fe70b7fbce	Addressed second round of feedback.	2020-09-21 17:38:53 -05:00
Sam	b06ab250cc	Addressed first round of feedback on sword overhaul.	2020-09-21 17:38:52 -05:00
Sam	c99e4c3c18	Added swing duration to dash melee. Added framework for animation to be added.	2020-09-21 17:38:51 -05:00
Sam	6dede05a0e	Combo now only increases when landing a hit.	2020-09-21 17:38:51 -05:00
Sam	2aac008b90	Attack speed now scales with combo in combo melee.	2020-09-21 17:38:50 -05:00
Sam	e54483d789	Shifted hit attempt to before swing duration, instead of after.	2020-09-21 17:38:49 -05:00
Sam	b79235b890	Dash melee now works as desired.	2020-09-21 17:38:49 -05:00
Sam	04af75bf8d	Initial implementation of new dash melee.	2020-09-21 17:38:48 -05:00
Sam	abcd0af1e3	Removed combo duration of combo melee (combo now activated from recover duration). Allowed for forced forward movement in combo melee, and added it to stages 1 and 3).	2020-09-21 17:38:47 -05:00
Sam	847bddbd89	Removed swing_frac, added a swing duration instead to allow for more utility in character state. Moved location of stage_section enum to wielding so it could more easily be used by other character states.	2020-09-21 17:38:46 -05:00
Sam	0ba5740265	Added enum for stage section instead of using 4 bools.	2020-09-21 17:38:43 -05:00
Sam	440e45f2bc	Did stuff to support addition of keyframes for combo melee animation.	2020-09-21 17:38:43 -05:00
Sam	cf573a42bd	Initial implementation of combo melee attack.	2020-09-21 17:38:41 -05:00
Sam	45fef87f32	Addressed comments	2020-09-19 14:40:21 -05:00
Sam	717142d5ea	Started to implement shockwave system.	2020-09-19 14:29:06 -05:00
Sam	68ecfba291	Projectile speed is no longer hard-coded.	2020-09-19 14:29:05 -05:00
Sam	66b0fee3c7	Separated knockback out from basicmelee. Added weapon for cyclops boss to use, and added 1 ability to it.	2020-09-19 14:29:04 -05:00
jshipsey	ecae71c016	gliders as items. anim improvements	2020-09-17 22:32:09 -04:00
Ben Wallis	712f2e9c97	* Moved migrations to beginning of server initialisation ... * Added migrations for entity ID changes to existing tables	2020-09-17 23:02:14 +00:00
Imbris	c2f3e1b47f	Revert "Merge branch 'BottledByte/ability_design' into 'master'" ... This reverts merge request !1264	2020-08-06 08:04:03 +00:00
BottledByte	34c87d7a86	Add ability IDs and use them in GUI	2020-08-05 23:00:43 +02:00
BottledByte	a167ee98ee	De-enumerized armor variants	2020-08-03 03:41:32 +00:00
Samuel Keiffer	827b91d691	Bow charged shot attack	2020-07-26 03:06:53 +00:00
jshipsey	5b76ed23f4	small fixes	2020-07-20 21:37:13 -04:00
Samuel Keiffer	6cce09be85	Added protection stat to admin armor hidden in debug folder. Removed blue cultist armor set from drop table as it is an admin set.	2020-07-18 00:05:28 +00:00
Samuel Keiffer	fe47a14ba5	Spin attack for axe	2020-07-08 19:58:41 +00:00
Marcel Märtens	c212de00c2	updated dependencies and fixed stuff ... - replace serde_derive by feature of serde incl. source code modifications to compile - reduce futures-timer to "2.0" to be same as async_std - update notify - removed mio, bincode and lz4 compress in common as networking is now in own crate btw there is a better lz4 compress crate, which is newer than 2017 - update prometheus to 0.9 - can't update uvth yet due to usues - hashbrown to 7.2 to only need a single version - libsqlite3 update - image didn't change as there is a problem with `image 0.23` - switch old directories with newer directories-next - no num upgrade as we still depend on num 0.2 anyways - rodio and cpal upgrade - const-tewaker update - dispatch (untested) update - git2 update - iterations update	2020-07-07 09:43:49 +02:00
Imbris	c2d6d00b00	point to github specs to access PairedStorage type, fix Loadout sync spam	2020-07-06 01:56:02 -04:00
Samuel Keiffer	85d1d4b3ff	Leap now actually works. In addition, leaping while next to an entity no longer interrupts the leap.	2020-07-03 15:40:12 +00:00
Ben Wallis	de37de7f45	Initial clippy fixes as discussed in #587	2020-06-08 21:27:51 +01:00
Shane Handley	fc8bb427fb	Handle TripleStrike stages individually.	2020-06-08 10:19:42 +10:00
Shane Handley	802bce1698	Target the specific attack types, to handle TripeStrike etc... ... Removed the Axe sfx until the animations show the swing	2020-06-08 10:19:41 +10:00
Pfauenauge90	f5a768dccf	more armour types	2020-04-12 18:40:56 +02:00
Pfauenauge90	7f97fbac0b	cape item	2020-04-12 18:40:56 +02:00
AdamWhitehurst	2b10797db1	refactor transition logic (thx imbris)	2020-04-01 08:39:18 -07:00
AdamWhitehurst	56fab6db09	Roll duration 500 -> 700ms	2020-04-01 06:24:02 -07:00
AdamWhitehurst	dcc9d44b1c	remove unused timed_combo	2020-03-29 13:40:03 -07:00
Imbris	f551c4a2c5	Move armor types to a new location, use a const for the moving cutoff in voxygen anims	2020-03-28 01:52:12 -04:00
AdamWhitehurst	1d51f8fc0f	prevent transition if pressing too early & timed	2020-03-27 11:17:34 -07:00
AdamWhitehurst	2ffac59aa3	add triple strike timing	2020-03-27 10:40:15 -07:00
timokoesters	7a9c7628db	Fix triplestrike bug	2020-03-26 23:29:12 +01:00
timokoesters	2b68adff51	Balancing, make fireball not holdable, arrow knockback	2020-03-26 22:56:33 +01:00
timokoesters	8010e5afb4	Better equip durations, fix roll bug, slow down while attacking, smoother gliding, stronger npcs, giants	2020-03-26 22:56:33 +01:00
timokoesters	b9c85b9beb	Balancing	2020-03-26 22:56:33 +01:00
Imbris	3889ec7292	climbing tweaks, fix triple strike overflow, fix Last<CharacterState> ... not registered	2020-03-25 02:05:28 -04:00
timokoesters	2117bb05d0	Healing staff	2020-03-24 22:03:11 +01:00
timokoesters	f0ce088810	Add lights and gravity again	2020-03-24 20:31:54 +01:00
timokoesters	58585e0810	Better climbing, fireball impl	2020-03-24 20:09:23 +01:00
timokoesters	ea2500e7ab	Add minimum prepare duration to fireball and bow	2020-03-24 14:42:31 +01:00
timokoesters	99e7e1f785	Split staff into 3 abilities	2020-03-24 14:00:22 +01:00
timokoesters	f3ca06aa71	feat: fireball explosions	2020-03-22 20:40:16 +01:00
timokoesters	0456d3cbed	Better staff M1, random +1 damage, better attackrange,angle impl	2020-03-22 16:26:32 +01:00
Adam Whitehurst	afa6e43dd5	* remove Component Trait from CharacterAbility	2020-03-22 05:45:39 -07:00
Imbris	41c424ac13	Optimized uses of emitters, cleanup	2020-03-22 00:49:46 -04:00
Adam Whitehurst	862efb147c	clean up based on pr review comment	2020-03-21 15:55:20 -07:00
Adam Whitehurst	c5378b7065	Better triple_strike handling	2020-03-21 14:55:04 -07:00
Adam Whitehurst	0cdb80427d	better triple_strike	2020-03-20 15:03:29 -07:00
timokoesters	df858cb370	Remove all warnings	2020-03-20 15:45:36 +01:00
timokoesters	3ec2cc08b3	Experimental tweeks to triplestrike	2020-03-20 15:06:33 +01:00
Adam Whitehurst	0b7a572178	update triple_strike	2020-03-19 15:40:03 -07:00
timokoesters	83be1226ef	Set dash direction based on look_dir	2020-03-19 18:33:10 +01:00
timokoesters	19a09782a0	Add ability requirements system	2020-03-17 15:01:41 +01:00
timokoesters	d5db1f6ca0	Add dash ability to sword M2	2020-03-16 16:34:53 +01:00
timokoesters	87acc01d48	Readd ranged and debug boost. Add bouncing while running in first person	2020-03-16 12:32:57 +01:00
timokoesters	1f78344d6f	Move equipment from loadout into body	2020-03-15 19:44:47 +01:00
Joshua Barretto	e20feeeb0c	Added armour items and equipping of armour	2020-03-15 16:42:09 +01:00
timokoesters	447617dc69	Make durations and damage depend on weapon type	2020-03-15 14:34:17 +01:00
timokoesters	598a4c6cbb	Add loadout struct for info on weapon configurations	2020-03-14 22:33:20 +01:00
AdamWhitehurst	7dfe00b674	Finish state struct data refactor	2020-03-14 15:17:27 -06:00
AdamWhitehurst	6fc94c22ba	Update timed combo, add CharacerBehavior trait	2020-03-14 12:50:07 -06:00
timokoesters	fe19698d52	Make abilities depend on weapon	2020-03-14 16:40:29 +01:00
Adam Whitehurst	68dd8c578f	Add some ability costs	2020-03-12 07:36:02 -07:00
Adam Whitehurst	a64bf1ac60	TripleAttack -> TimedCombo ... (it wasnt the right logic for the tiple attack)	2020-03-12 05:16:40 -07:00
Adam Whitehurst	5f8751e2d3	Begin implementing triple attack	2020-03-08 12:37:17 -07:00
Adam Whitehurst	f769c74bf4	Add charging back	2020-03-08 10:04:26 -07:00
Adam Whitehurst	c678ca9540	Re-add blocking	2020-03-07 11:55:15 -08:00
Adam Whitehurst	b1d1299fe6	Clean up character states	2020-03-07 10:15:02 -08:00
timokoesters	2fa902270e	fix: block	2020-02-24 18:10:42 +01:00
timokoesters	aa52c6fd4f	fix: jumping and attacking	2020-02-03 17:03:52 +01:00
timokoesters	7b558b4542	refactor: combine actionstate and movestate	2020-01-21 23:54:59 +01:00
Adam Whitehurst	8648641362	Grooming	2020-01-07 07:49:08 -08:00
Adam Whitehurst	2635c405fe	Ability comps and sys	2020-01-01 09:16:29 -08:00