Sam
f50fa25467
ItemConfig now stores AbilitySet directly instead of each individual ability.
2021-02-19 17:30:21 -05:00
Sam
fc01e9ea68
Handedness of weapons affects power and speed.
2021-02-19 17:30:21 -05:00
Sam
582c3f8459
Check for prerequisite skill in using an ability is no longer hardcoded.
2021-02-19 17:30:21 -05:00
Sam
341affdae2
Added hands field to all ron files of weapons.
...
Removed weapons that were duplicated in weapons and npc_weapons from npc_weapons.
Added migration to convert npc_weapons that ended up in anyone's inventory to weapon version.
Consolidated debug boost and possess sticks into one debug_stick, and renamed the admin sword (with name cultist_purp_2h_boss-0) to admin_sword
2021-02-19 17:30:20 -05:00
Sam
d4f509b3d0
Added hands field onto weapons.
2021-02-19 17:30:20 -05:00
Avi Weinstock
559ad7b7f5
Client-side trade improvements.
...
- Add item tooltips in trade.
- More localization support.
- Fix bindings (R for trade, B for bag).
2021-02-19 15:20:27 -05:00
Caelan
dda4931f46
Clean and update dependencies
...
* Remove tweak feature
* Remove const-tweaker
* Update tiny_http
* Update bitvec to 0.21.0
* Downgrade euc to avoid conflict with vek 0.12.0
* Require exactly vek 0.12.0
* Update all other dependencies automatically based on these changes
* Update gilrs to latest at the request of Ada Lovegirls
* Update meshing benchmarks to new criterion API
2021-02-17 01:27:06 -08:00
Joshua Barretto
4d19308612
Merge branch 'lboklin/quat-ori' into 'master'
...
Redefine Ori as a quaternion
See merge request veloren/veloren!1755
2021-02-16 22:39:11 +00:00
Imbris
1352d7ad9c
Merge branch 'quellus/max-name-length' into 'master'
...
Limit character name length
Closes #528
See merge request veloren/veloren!1774
2021-02-16 21:29:45 +00:00
Quellus
8b4230db61
Limit character name length
2021-02-16 21:29:45 +00:00
Avi Weinstock
03d28f7d93
Implement tags for items, allowing a crafting recipe to take any item with that tag as input.
...
- Added a recipe that turns any of the cloth equipment dropped by villagers into 1x cloth scraps.
- Animate placeholder items for tagged crafting.
2021-02-16 01:05:54 +00:00
Avi Weinstock
c984035976
MR 1775 review fixes.
...
- Separate `invite` machinery from `group_manip` into it's own thing (includes renaming `group_invite` to `invite` where applicable).
- Move some invite/trade machinery to `ControlEvent`.
- Make `TradePhase` a proper enum instead of a bunch of bools.
- Make `TradeId` a proper newtype.
- Remove trades from `Trades` on accept (previously was only on decline).
- Typo fixes/misc cleanup.
- Add bullet point for trading to the changelog.
2021-02-14 11:13:56 -05:00
Avi Weinstock
232ddb0860
Polish trading implementation and address review comments.
...
- Fix item swapping edge case
- Document more assumptions/edge cases
- fmt and clippy
- s/ServerGeneral::GroupInvite/ServerGeneral::Invite/
- Use `Client::current` in `Client::is_dead`
2021-02-14 11:11:35 -05:00
Avi Weinstock
f6db8bb7c4
Implement actual inventory-manipulation part of trading server side.
2021-02-12 18:43:10 -05:00
Avi Weinstock
abb5684883
Trade implementation progress.
...
- Accept/decline buttons that submit the proper messages
- A phase2 screen that renders the (item, quantity) pairs as text
- More checks in the trade state machine server-side.
2021-02-12 18:43:10 -05:00
Avi Weinstock
e2b55e0706
Implement enough of a trade UI that dragging & dropping items into it round-trips between clients.
2021-02-12 18:43:09 -05:00
Avi Weinstock
aeb2398fc6
Trade implementation progress.
...
- Server messages now bring up the trade window.
- When a trade is declined, it closes the window on both clients.
2021-02-12 18:43:09 -05:00
Avi Weinstock
ae528124fc
Trade implementation progress.
...
- State machine for modifying trades.
- ServerGeneral/ClientGeneral messages.
2021-02-12 18:43:09 -05:00
Avi Weinstock
e9b811b62b
Plumb trade requests through the group invite UI, such that they can be accepted/declined without impacting the counterparty's movement.
2021-02-12 18:43:09 -05:00
DaforLynx
ebbb06a400
Added crickets blocktype, added 3 new cricket sounds, made crickets chirp consistently, made frogs more sporadic
2021-02-12 00:54:42 +00:00
Quellus
63952875d9
Rebase !1447 Chat input color and icon reflect channel message is sent to.
2021-02-10 19:42:59 +00:00
Ludvig Böklin
74badd3dbd
Add note about to_quat() being a cheap copy operation
2021-02-10 17:35:20 +01:00
Snowram
477bdfdfe7
Adresses some comments, various visual tweaks
2021-02-10 00:30:23 +01:00
Snowram
02f446fe4b
Adds lights to dungeons
2021-02-10 00:30:23 +01:00
Ludvig Böklin
990198cd87
Don't test Dir->Ori correctness because it will fail from floating point errors
2021-02-09 15:44:12 +01:00
Ludvig Böklin
065e260e78
Code quality
2021-02-09 14:06:27 +01:00
Ludvig Böklin
582ddfc3cd
Ori: add tests, rename to_vec() => look_vec(); Dir: add methods, normalize on rot
2021-02-09 13:52:03 +01:00
Sam
398fcf7bdd
Changing main tool while in wield state moves character back to idle state.
2021-02-08 17:25:40 -05:00
Sam
e033fe6bee
Inventory manipulations are now only for input from the client, and are no longer directly sent as a server event. Slot manipulations do that instead.
2021-02-08 13:55:50 -05:00
Sam
1c83c5ee6f
Loadout manipulations now emit a separate event from client instead of hackily intercepting inventory manipulations in common.
2021-02-08 12:31:17 -05:00
Sam
f026aeb2dc
Server events directly emitted in states now.
2021-02-08 12:01:48 -05:00
Sam
6a1e583d45
Eradicated clones
2021-02-08 12:01:48 -05:00
Sam
9f2255a5de
Extended what states inventory manipulations touching the loadout could affect.
2021-02-08 12:01:47 -05:00
Sam
8eebcdfcd2
Inventory changes that modify the loadout now go through a control action instead of a control event.
2021-02-08 12:01:47 -05:00
Ludvig Böklin
46750880eb
Add Plane type, Projection trait, fix upright() and add doc tests
2021-02-07 17:16:15 +01:00
Samuel Keiffer
909ed80e9e
Merge branch 'sam/fix-roll' into 'master'
...
Fixes roll being free
See merge request veloren/veloren!1757
2021-02-06 22:15:06 +00:00
Imbris
a5c76a6d36
Merge branch 'trollderim/replace-magic-dr-number' into 'master'
...
Replace magic dr constant
Closes #915
See merge request veloren/veloren!1756
2021-02-06 20:28:40 +00:00
Sam
252e421692
Roll is no longer free.
2021-02-06 15:20:08 -05:00
Phillipp Mevenkamp
f5e1d446ad
Replace magic dr constant
2021-02-06 18:21:58 +01:00
James Melkonian
1d8496ea21
Move agent system to server
2021-02-06 06:15:25 +00:00
Ludvig Böklin
a1ff9ab83f
Redefine Ori as a quaternion
2021-02-05 09:33:14 +01:00
Pascal Fuhrmann
9f7637ab21
Converted combat states and other semi-combat-related to use float-values instead of integers to prevent more casts
2021-02-05 01:39:12 +00:00
Sam
be8df9aef6
Addressed comments.
2021-02-02 16:08:09 -05:00
Sam
80954f3ba4
Made attacker entity and uid optional to remove potential for attacks to not be applied and some unwraps.
2021-02-02 13:07:07 -05:00
Sam
af982ec0bb
Changed knockback to be an effect on the overall attack, rather than a damage.
2021-02-02 13:07:07 -05:00
Sam
17d1432be0
Outcomes now correctly read if an attack had any healing components.
2021-02-02 13:07:06 -05:00
Sam
5eec915c2e
Added support for damage falloff with explosions.
2021-02-02 13:07:06 -05:00
Sam
5c16b0b532
Explosions now use attacks.
2021-02-02 13:07:06 -05:00
Sam
7675e53740
Shockwaves now use attacks.
2021-02-02 13:07:05 -05:00
Sam
e5caef8a54
Effects on attacks can now require energy.
2021-02-02 13:07:05 -05:00
Sam
2b11ae6569
Attacks can now heal.
2021-02-02 13:07:04 -05:00
Sam
edcfcc31f6
Attacks can now deal poise damage.
2021-02-02 13:07:04 -05:00
Sam
fcd89a5d41
Lifesteal now functional on Attack.
2021-02-02 13:07:03 -05:00
Sam
fdef168e82
Beams now use Attack, with limited functionality in some cases.
2021-02-02 13:07:03 -05:00
Sam
59ce8c6843
Projectiles now use attacks.
2021-02-02 13:06:57 -05:00
Sam
46dbb8aef4
Attack effects can now have requirements.
2021-02-02 13:06:34 -05:00
Sam
c77f263cd1
Effects now work when not tied to a damage.
2021-02-02 13:06:34 -05:00
Sam
18aa315f0d
Rolling now dodges melee attacks again.
2021-02-02 13:06:34 -05:00
Sam
78879d5189
Attacks can now inflict de/buffs.
2021-02-02 13:06:33 -05:00
Sam
6d509932db
Attacks can now reward energy.
2021-02-02 13:06:33 -05:00
Sam
c3408c084c
Critical hits are now functional.
2021-02-02 13:06:32 -05:00
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
bb019309ea
Attack builder implemented.
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
Blob
5c8fc4f378
Fix projectile explosion being triggered twice.
2021-02-01 15:41:34 +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
Sam
9b7edcf32f
Changed how beams determined the energy regen and energy cost.
2021-01-24 23:47:10 -05: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
0343b57b2b
Merge branch 'lboklin/glider-stamina' into 'master'
...
Glider stamina cost now only when first starting to glide based on fall speed
See merge request veloren/veloren!1727
2021-01-25 00:17:32 +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
Ludvig Böklin
f42869f6ec
Glider deploy stamina cost value tweak
2021-01-24 12:06:23 +01:00
Ludvig Böklin
30168e375f
Glider stamina only costs on deploy
2021-01-24 10:56:35 +01:00
Samuel Keiffer
bdbed58b09
Merge branch 'swilliams/hitbox-adjustments' into 'master'
...
General NPC Hitbox Adjustments
See merge request veloren/veloren!1723
2021-01-24 04:00:57 +00:00
Scott Williams
c7baf1fd86
General NPC Hitbox Adjustments
2021-01-24 04:00:57 +00:00
Samuel Keiffer
3866bc73a4
Merge branch 'lboklin/glider-stamina' into 'master'
...
Fix glider stamina drain
See merge request veloren/veloren!1718
2021-01-23 23:21:22 +00:00
Marcel
82147653df
Merge branch 'torvus-quick-fix' into 'master'
...
Fix torvus
See merge request veloren/veloren!1720
2021-01-23 22:31:15 +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
Sam
77312ccdd4
Move outcome vec from being defined in frontend and server to common.
2021-01-23 15:17:36 -05:00
Ludvig Böklin
5eefa86d68
Fix glider stamina drain
2021-01-23 18:20:43 +01:00
Justin Shipsey
fb09d14725
Merge branch 'Rotsuoy/SavannaGrass' into 'master'
...
Rotsuoy/savanna grass
See merge request veloren/veloren!1711
2021-01-23 07:46:54 +00:00
Rotsuoy
994677a4d0
Rotsuoy/savanna grass
2021-01-23 07:46:54 +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
Justin Shipsey
6de8ca32ce
Merge branch 'sam/lactose-tolerant-golems' into 'master'
...
Gives golems a spin attack
See merge request veloren/veloren!1709
2021-01-22 07:30:53 +00:00
Sam
b5a3b3442c
Addressed comments.
2021-01-21 17:45:03 -05:00
Sam
d2f3c1dd25
Restores difficulty to mindflayer fight. Made various tweaks to skillset builder functions.
2021-01-21 14:56:24 -05:00
Sam
aaad5e49cc
Changed how it moved golem.
2021-01-20 17:22:24 -05:00
Sam
c888ec0535
Golems are now lactose tolerant.
2021-01-20 11:54:57 -05:00
Joshua Barretto
1223519ea1
Fix jump routes not being pathed
2021-01-20 14:39:01 +00:00
Monty Marz
1eb7f78189
Revert "Added TR translations for deaths by debuffs."
...
This reverts commit 0817e45e13
2021-01-20 11:20:06 +00:00
Samuel Keiffer
27796aac4e
Merge branch 'james/fix-biped-large-roll' into 'master'
...
Make only humanoid agents attempt to roll
See merge request veloren/veloren!1701
2021-01-19 21:37:48 +00:00
jiminycrick
08922dfc64
Make only humanoid agents attempt to roll
2021-01-19 10:42:46 -08: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
Sam
89766b2b34
Added command to give yourself skill points.
...
adjusted social window
Changelog
2021-01-19 08:07:49 -05:00
Sam
986c05621a
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
4b52574750
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
cb3e44a811
Health can now be scaled for npcs again.
2021-01-19 08:07:40 -05:00
Sam
1d90b64898
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
b6d2d48ead
Exp floaters.
...
You load in with correct energy and health values now.
2021-01-19 08:07:36 -05:00
Sam
51c0bd765f
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
48bd921d0a
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
c0c45a1996
Purged stats, including level and experience
2021-01-19 08:07:23 -05:00
Sam
48c98b11cf
General combat skill tree.
...
UI for general skill tree
2021-01-19 08:07:20 -05:00
Monty Marz
3f436079e8
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
0ccbdc3b8c
Sceptre skill tree.
2021-01-19 08:07:03 -05:00
Sam
5c7705f874
Staff skill tree.
2021-01-19 08:07:03 -05:00
Sam
662a08defc
Implemented bow skill tree.
2021-01-19 08:07:02 -05:00
Sam
4dfe14c103
Hammer skill tree complete.
2021-01-19 08:07:02 -05:00
Sam
72604e8a4e
Axe skill tree functional.
2021-01-19 08:07:01 -05:00
Sam
69be3a3d93
Added persistence for skill trees.
2021-01-19 08:07:00 -05:00
Sam
cc60ca58be
Added sword skill tree
2021-01-19 08:06:59 -05:00
Sam
0e84ba18c2
Moved skill max level and skill prerequisites into ron files.
2021-01-19 08:06:59 -05:00
