Commit Graph

946 Commits

Author SHA1 Message Date
Sam
2690e9caa1 Applied basic functionality of attack-effects system to melee. 2021-02-02 13:06:32 -05:00
Sam
d3b75df76f Changed name of Attacking comp to MeleeAttack 2021-02-02 13:06:31 -05:00
Sam
78a2459e6d Changed knockback from an enum to a struct. 2021-02-02 13:06:30 -05:00
Pascal Fuhrmann
f4deb08a40 fixing #944 - LeapMelee fall damage fix & adjustments 2021-02-02 16:51:04 +00:00
James Melkonian
23b1df3cdd Add basic NPC interaction and fix NPC chat spamming 2021-01-31 20:29:50 +00:00
jiminycrick
ea13f75427 Quick poise fix 2021-01-29 15:52:40 -08:00
jiminycrick
a02444825d Address some comments
Eliminated extra stagger state

Responding to more comments

Move poise character state changes to character behavior system

Move poise out of JoinTuple/Data

Finish up comments (various fixes)
2021-01-28 17:31:05 -08:00
jiminycrick
46c8c744fa Add migration for starter gear 2021-01-28 17:22:39 -08:00
jshipsey
d456271921 animal stuns
Fix rebase
2021-01-28 17:22:39 -08:00
jiminycrick
661764f4aa Some preliminary balancing
Fix rebase
2021-01-28 17:22:39 -08:00
jshipsey
29732bb763 starting stun anim
stagger anim, mirroring, bettern walk anim

wielding with stuns/stagger

Knockback fix

Added Poise documentation/comments
2021-01-28 17:22:37 -08:00
jiminycrick
0f244bf84b Made stunned state invulnerable to poise damage
Fixing silly error for comp creation
2021-01-28 17:22:35 -08:00
jiminycrick
dd69b5f2bc Poise stats 2021-01-28 17:22:35 -08:00
jiminycrick
af076aa87f Add knockback to poise 2021-01-28 17:22:35 -08:00
jiminycrick
e3965ae0ab Very basic functioning stun 2021-01-28 17:22:35 -08:00
jiminycrick
c83296a4ec Initial broken implementation of poise
Character movement no longer broken.
2021-01-28 17:22:33 -08:00
jiminycrick
8b97199245 Update rand dependency 2021-01-26 20:35:08 -08:00
Sam
680a4e4dde Fixed base energy being 0. 2021-01-26 21:25:00 -05:00
Entropy9s
1f6cf7e155 StaminaPlus buff, modifying stamina via buffs
trying to fix this, coming back to this later

please remember to change potion back future self!

this ALMOST works. maybe MR ready, kinda jank tho

so close, and yet so far...

IT WORKS IT WORKS IT WORKS IT WORKS IT WORKS IT WO

did the same with health, ill fix this garbage l8r

think we're basically done here

whoops forgot to change the food back

fixing and cleaning up part 1

fixed everything part 2 now with buff images

ran clippy + fmt, fixed items that i modified

bracket bulldozing, boldly

hopefully this should be good?

need to rebase real quick

please let me be done

StaminaPlus buff, modifying stamina via buffs

trying to fix this, coming back to this later

please remember to change potion back future self!

this ALMOST works. maybe MR ready, kinda jank tho

so close, and yet so far...

IT WORKS IT WORKS IT WORKS IT WORKS IT WORKS IT WO

did the same with health, ill fix this garbage l8r

think we're basically done here

whoops forgot to change the food back

fixing and cleaning up part 1

fixed everything part 2 now with buff images

ran clippy + fmt, fixed items that i modified

hopefully this should be good?

cargo clippy fmt stuff

deleted an extraneous file?? how did that even...?
2021-01-26 22:47:55 +00:00
Snowram
ad6cdcab71 Merge branch 'swilliams/gems' into 'master'
Adds 6 different gems and removes shiny gem.

See merge request veloren/veloren!1729
2021-01-25 01:25:40 +00:00
Samuel Keiffer
c349afc9e9 Merge branch 'sam/speed-beam' into 'master'
Fixed how the speed stat was applied to beams.

See merge request veloren/veloren!1732
2021-01-24 23:23:53 +00:00
Sam
a83baa8243 Fixed how the speed stat was applied to beams. 2021-01-24 16:01:38 -05:00
Sam
6dd740feaa Nerfed bow M1 and M2, slightly buffed bow skillbar ability. 2021-01-24 14:24:59 -05:00
Scott Williams
157e56d8ca Removed Shiny Gem, Added migration to change shiny gems to diamonds. Changed shiny gem recipes to diamonds 2021-01-24 16:40:22 +00:00
Scott Williams
32bbdffc38 Added 6 gems, removed shiny gem from cave, replaced with diamond. 2021-01-24 14:00:49 +00:00
Scott Williams
c7baf1fd86 General NPC Hitbox Adjustments 2021-01-24 04:00:57 +00:00
Samuel Keiffer
39d1c9e885 Merge branch 'sam/skill-balancing-1' into 'master'
Skill balancing

See merge request veloren/veloren!1716
2021-01-23 21:12:35 +00:00
Samuel Keiffer
97f0413307 Merge branch 'sam/fix-dash' into 'master'
Dash now ticks damage based off distance rather than duration.

See merge request veloren/veloren!1715
2021-01-23 04:42:56 +00:00
Sam
5e4b6809ca Sceptre nerfs. 2021-01-22 22:46:18 -05:00
Sam
d6be67e0a0 Dash now ticks damage based off distance rather than duration. Fix for golem no longer being able to melee. 2021-01-22 18:10:47 -05:00
Sam
4014b28d19 Removed body from stats component as there is already a body component. 2021-01-22 16:50:22 -05:00
Scott Williams
2a9c4f6f2e Swilliams/golem hitbox fix 2021-01-22 16:30:35 +00:00
Sam
b5a3b3442c Addressed comments. 2021-01-21 17:45:03 -05:00
Sam
c888ec0535 Golems are now lactose tolerant. 2021-01-20 11:54:57 -05:00
Sarra Kitty
e7d852835c Sarrakitty/rotsys item sprites 2021-01-19 18:23:44 +00:00
Samuel Keiffer
b04158c5f9 Merge branch 'sam/combat-skill-trees' into 'master'
Sam/combat skill trees

See merge request veloren/veloren!1680
2021-01-19 14:18:07 +00:00
Monty Marz
ac60bf5794 Better visuals for skill button labels, don't show "0 EXP" in the SCT
Made functions that were called every frame significantly cheaper.

Final UI fixes.
2021-01-19 08:08:29 -05:00
Sam
eaa41c7dea Skills are now factored into combat rating. New formula for exp scaling per SP.
Adjust lvl up msg fade

Add female humanoid names WIP

Changed text formatting when skill is max level. Added message to show you have 0 skill points available.

Addressed a lot of comments.

various changes to UI

- fix skillbar offset
- remove CR indicators for group members
- add CR indicators to group member frames
- use unified CR indicator icon

Exp reward tweaks.

Fixed flamethrower range skill description.
2021-01-19 08:08:26 -05:00
jshipsey
0b156542e4 roll keyframes
Changed roll to have non-fixed acceleration.
2021-01-19 08:08:21 -05:00
jshipsey
5d1993009f keyframed axe spin
Fixed error in converting FK to entity_id from character_id.

Giant match statements in persistence.

Tweaked roll.

Changed how skills and skill groups were assigned in the skillset builder so it's format more closely followed loadout builder.
2021-01-19 08:08:18 -05:00
Monty Marz
de5c5702b3 stats display
Addressed comments.

Addressed comments.
2021-01-19 08:08:11 -05:00
Sam
c809569f6b Added level up sound to skill point gain. Fixed tests.
Fixed duplicate roll description.
2021-01-19 08:08:08 -05:00
jiminycrick
3d44ac2c35 Humanoid skill config and AI skill check
updated axe skill with correct icons
2021-01-19 08:08:05 -05:00
Noé
acbd965e65 implemented en translation for Hammer, Bow, Scepter and Staff skills
skill tree translation

Clamped earning SP to avoid u16 overflow.

translation fixes

Fixed exp scaling function

Fixed exp scaling function

remove debug combat rating display

Update overhead.rs

implemented en translation for Axe
2021-01-19 08:08:02 -05:00
Sam
a606313856 Added scaling exp costs per skill point.
Fix tooltip being red.

multiple fixes, started translation

change exp giving items
adjust loot tables
adjust combat rating indicators
fix group frame offsets
2021-01-19 08:07:57 -05:00
Sam
6ce422748c Added SkillSetConfig to specify skill sets for npcs. 2021-01-19 08:07:55 -05:00
Sam
968b66260e Levling health gives you health. Added combat scaling to UI. 2021-01-19 08:07:54 -05:00
Sam
83fdc8806d Added function to automatically generate a combat rating. Currently, it is used to calculate exp. 2021-01-19 08:07:54 -05:00
Sam
4f552a736e Added skill point costs to tooltips. 2021-01-19 08:07:53 -05:00
Sam
ae8c8b47f1 Added tooltips with numbers. Balancing on some skills.
Added experience scaling for tougher enemies.
2021-01-19 08:07:51 -05:00