6311 Commits

Author SHA1 Message Date
Acrimon
f3784e5545 Merge branch 'Sarrakitty/RotsysItemSprites' into 'master'
Sarrakitty/rotsys item sprites

See merge request veloren/veloren!1695
2021-01-19 18:23:44 +00:00
Sarra Kitty
f332bf4ceb Sarrakitty/rotsys item sprites 2021-01-19 18:23:44 +00:00
Samuel Keiffer
f96489b66a 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
88a8814fe7 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
467ed6d7d3 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
91c243fd8d roll keyframes
Changed roll to have non-fixed acceleration.
2021-01-19 08:08:21 -05:00
jshipsey
2866091d7b 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
decef1d1a4 adjusted potions, refined level up message animation
fixed incorrect translation used on axe double strike regen skill

Changed migration so that skills and skill groups foreign key to entity_id instead of character_id
2021-01-19 08:08:14 -05:00
Monty Marz
5e55984595 stats display
Addressed comments.

Addressed comments.
2021-01-19 08:08:11 -05:00
Sam
1ea9335c40 Added level up sound to skill point gain. Fixed tests.
Fixed duplicate roll description.
2021-01-19 08:08:08 -05:00
jiminycrick
92b72d94ba Humanoid skill config and AI skill check
updated axe skill with correct icons
2021-01-19 08:08:05 -05:00
Noé
455ebf983c 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
ad73ef5c39 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
21220088d8 Added SkillSetConfig to specify skill sets for npcs. 2021-01-19 08:07:55 -05:00
Sam
e511a31780 Levling health gives you health. Added combat scaling to UI. 2021-01-19 08:07:54 -05:00
Sam
d904e20ffa Added function to automatically generate a combat rating. Currently, it is used to calculate exp. 2021-01-19 08:07:54 -05:00
Sam
933a413879 Added skill point costs to tooltips. 2021-01-19 08:07:53 -05:00
Sam
2774b0c5b2 Added tooltips with numbers. Balancing on some skills.
Added experience scaling for tougher enemies.
2021-01-19 08:07:51 -05:00
Sam
39ed979510 Added command to give yourself skill points.
adjusted social window

Changelog
2021-01-19 08:07:49 -05:00
Sam
ec3e2abc65 Wired up skill UI to check for prerequisites being met and sufficient skill points.
available SP check in general HUD, more skill icons

Trimmed 2000 lines from a file.

UI tweaks
2021-01-19 08:07:45 -05:00
Sam
bb42c95944 Skill point gains are displayed in hud.
level up message visuals and functionality

Handles simultaneous skill point gains in UI.
2021-01-19 08:07:41 -05:00
Sam
2896e593a7 Health can now be scaled for npcs again. 2021-01-19 08:07:40 -05:00
Sam
060e78f9e0 Added function to get the max amount of skill points that can be spent in a tree. 2021-01-19 08:07:39 -05:00
Sam
5e308f1695 Exp floaters.
You load in with correct energy and health values now.
2021-01-19 08:07:36 -05:00
Monty Marz
0101006609 flashing buttons for available points, WIP lock/unlock indicator
Condensed UI code. Removed some hardcoding.

icons

squash later, WIP colouring for unavailable skills
2021-01-19 08:07:33 -05:00
Sam
b5b132fc1a Database support for refunding skills.
Nonfunctional xp floaters, squash when working.

more icons, lock visuals
2021-01-19 08:07:29 -05:00
Monty Marz
1243a09d82 EXP bar and available points UI
fix overhead UI

Add WIP overhead difficulty indicator

readd commented out exp counter for later use

Wired skill information into UI.
2021-01-19 08:07:25 -05:00
Sam
c100657219 Purged stats, including level and experience 2021-01-19 08:07:23 -05:00
Sam
7d35d69579 UI now shows how many levels you've invested into a skill. 2021-01-19 08:07:22 -05:00
Sam
ddbdea96c1 General combat skill tree.
UI for general skill tree
2021-01-19 08:07:20 -05:00
Monty Marz
664abc69d7 cleaned up skillbar, adjusted buffs placing
cleaned up skillbar, adjusted buffs placing

cleaned up skillbar, adjusted buffs placing

render diary example items in voxygen instead of using pre-rendered image files
2021-01-19 08:07:16 -05:00
Sam
b2d52b8001 UI for sword skill tree
Axe skill tree UI

Hammer skill tree UI

Bow skill tree UI

moar renders

Staff skill tree UI

Sceptre skill tree UI
2021-01-19 08:07:12 -05:00
Monty Marz
1a57ec4afc Skill-Tree UI
switchable tabs
rework icons, fix cursor toggle
auto slot placing

Bow leap skill changed to bow glide skill.
2021-01-19 08:07:06 -05:00
Sam
5903578e1a Sceptre skill tree. 2021-01-19 08:07:03 -05:00
Sam
ed107dbe61 Staff skill tree. 2021-01-19 08:07:03 -05:00
Sam
97f89383b8 Implemented bow skill tree. 2021-01-19 08:07:02 -05:00
Sam
8d9d4fc62f Hammer skill tree complete. 2021-01-19 08:07:02 -05:00
Sam
4c61b59856 Axe skill tree functional. 2021-01-19 08:07:01 -05:00
Sam
b7c64463f7 Added migrations for skill trees. 2021-01-19 08:07:00 -05:00
Sam
3dd530d49a Added persistence for skill trees. 2021-01-19 08:07:00 -05:00
Sam
ba263cf444 Added sword skill tree 2021-01-19 08:06:59 -05:00
Sam
d691cc9260 Moved skill max level and skill prerequisites into ron files. 2021-01-19 08:06:59 -05:00
Sam
aceaba847d Ron file now used for skills belonging to each skill group. 2021-01-19 08:06:58 -05:00
Sam
266bea8298 Skills can now optionally have levels. Max level prevents adding skill of higher level. Support for skills having a prerequisite of a particular level. 2021-01-19 08:06:57 -05:00
Sam
80f2a20c35 Skills can now have prerequisite skills. Skills can now cost different amounts of skill points. 2021-01-19 08:06:57 -05:00
Sam
1a15625f12 You now gain skill points after a threshold of xp within a particular skill group.
Skills can now unlock skill groups. Temp method of using chat to unlock skills.
2021-01-19 08:06:52 -05:00
Samuel Keiffer
6593828913 Merge branch 'friendly-auras' into 'master'
Set up aura filtering

Closes #890

See merge request veloren/veloren!1698
2021-01-18 22:58:56 +00:00
Jesus Bracho
84218fe090 Set up aura filtering 2021-01-18 22:58:56 +00:00
Sam
7dca559885 Exp is now awarded to specific skill groups. It's automatically split between a general pool and weapon pools based on if you have the weapon in your loadout and if you've unlocked the weapon pools. 2021-01-18 17:54:03 -05:00
Samuel Keiffer
d215930f35 Merge branch 'provide-buff-information-on-killed-entities' into 'master'
Provide buff information on killed entities

Closes #927

See merge request veloren/veloren!1696
2021-01-18 05:46:53 +00:00