Commit Graph

1982 Commits

Author SHA1 Message Date
Marcel Märtens
add7922653 Move Systems out of common into common_sys
This requires to move `State` into a own crate called `common_state` which depends on `common` and `common_sys`
2020-12-01 13:44:07 +01:00
Marcel Märtens
ca1601a980 Change the version number to 0.8 2020-11-28 11:25:58 +01:00
Marcel
a431fe3fad Merge branch 'sam/dehardcode-energy' into 'master'
Graying out skills with insufficient energy no longer dependent on hard-coded values

Closes #824

See merge request veloren/veloren!1560
2020-11-27 16:27:09 +00:00
Samuel Keiffer
352917d9cb Graying out skills with insufficient energy no longer dependent on hard-coded values 2020-11-27 16:27:09 +00:00
Sam
332a636647 You can now leap in directions other than forward with repeater ranged again. 2020-11-26 18:23:15 -06:00
Sam
6a6260daa1 Weapon combat fixes:
- Modified energy and speed scaling of sword, axe, and hammer combo melees.
 - Nerfed bow basic attack knockback. Buffed bow damage and energy regen.
 - Corrected xp values for theropods. Removed unnecessary function for xp increase per level.
 - Guards no longer flee at low health.
 - Buffed sword spin.
 - Nerfed axe spin and sword dash moderately.
 - Dash now takes a little time to reach full speed. Sword M2 and hammer M1 damage values tweaked.
2020-11-26 09:15:45 +01:00
Joshua Barretto
867ca911e5 Parallelised agent code for some sweet performance gains 2020-11-25 22:47:16 +00:00
Monty Marz
e7d27a2c21 fmt
cleanup
2020-11-25 16:53:48 +00:00
Marcel
5e64dcce02 Merge branch 'yusdacra/fix-improve-nix-build' into 'master'
Fix and improve Nix build

See merge request veloren/veloren!1548
2020-11-25 11:14:57 +00:00
Sam
33e4448542 Replaced every unnecssary powf in the entire codebase with either powi or sqrt. 2020-11-24 18:28:24 -06:00
Sam
5461f002fe Correct beam offsets used. Fix scaling damage on hammer M1. Add can_strafe function to body. 2020-11-24 17:56:39 -06:00
Sam
8ab2d2524a Changed default main and secondary tool from Some(empty) to None.
weapon fixes
2020-11-24 17:49:04 -06:00
jiminycrick
aad9734055 Agent tactic refactoring
Lower theropods spawns

clippy, changelog

review response
2020-11-24 17:49:00 -06:00
jiminycrick
1cf0aff5ef More ai work
balance

Lavadrake AI tweaks

feedback tweaks
2020-11-24 17:48:54 -06:00
jshipsey
d10dd83e5f theropods in world, small tweaks 2020-11-24 17:48:51 -06:00
jshipsey
f411ff7e04 bunch of animations and more attacks 2020-11-24 17:48:51 -06:00
jshipsey
6f72e68ad6 hoof attack, tweaks 2020-11-24 17:48:50 -06:00
jiminycrick
1337fdaa57 Generalize rotation time 2020-11-24 17:48:49 -06:00
jshipsey
a27b086401 placeholder for charge animal, animated leapmelee, small fixes 2020-11-24 17:48:49 -06:00
jiminycrick
a1aa3efd29 Moved hit timer to charged melee and adjusted for tail slap 2020-11-24 17:48:48 -06:00
jshipsey
1f59ef92d8 species specific speeds, more animation 2020-11-24 17:48:48 -06:00
jiminycrick
ee03304a3a Fix charged melee swing 2020-11-24 17:48:47 -06:00
jiminycrick
6b534729be Initial AI for quad low 2020-11-24 17:48:47 -06:00
jshipsey
c07d8df58b assigning weapons, building animations
ability mapping
2020-11-24 17:48:43 -06:00
jiminycrick
793d6095b3 Maneater AI
Rebase fixes and maneater AI
2020-11-24 17:48:38 -06:00
jshipsey
e3e513cc11 initial quadlow ranged work 2020-11-24 17:48:27 -06:00
jshipsey
ae06016e9a Wolf attacks and ai.
initial wolf dash testing

tool.rs

Wolf attack AI
2020-11-24 17:48:20 -06:00
Yusuf Bera Ertan
62d34422fe
fix and improve nix build: actually output a proper veloren voxygen package now 2020-11-25 02:00:50 +03:00
Sam
17656c990d Changed default main and secondary tool from Some(empty) to None. 2020-11-23 21:54:12 -06:00
Samuel Keiffer
7774599a19 Merge branch 'sam/rt-loadout-fix' into 'master'
Fixes loadout for RT NPCs

See merge request veloren/veloren!1545
2020-11-24 01:34:18 +00:00
Sam
0abe02ca13 Restructures loadout builder function to better support weapons being passed in. 2020-11-23 18:22:24 -06:00
Christof Petig
a3db20c9d6 Show caves in map 2020-11-23 19:05:17 +01:00
Joshua Barretto
26fd40c0e3 Fmt, make clippy happy 2020-11-23 15:39:03 +00:00
Joshua Barretto
765a1ca17b Switched light map iteration order, fire bowls in dungeons 2020-11-23 10:58:21 +00:00
Snowram
b7a33c56cc Add basic guards to towns 2020-11-23 10:58:21 +00:00
Monty Marz
d069eb9a57 street lamp particles, ground fire bowl, misc fixes 2020-11-23 10:58:21 +00:00
Snowram
8885efd702 Adds (mini)bosses spawns 2020-11-23 10:58:21 +00:00
Joshua Barretto
e461fbd951 Make chimneys glow 2020-11-23 10:58:21 +00:00
Joshua Barretto
b539ecf438 More lights, minimised light and glow map data 2020-11-23 10:58:21 +00:00
Joshua Barretto
54989cf4a6 Switched to pure iterator space search 2020-11-23 10:57:57 +00:00
Snowram
0737c71749 Adds new cultist armors, defines loadouts for dungeons 2020-11-23 10:57:57 +00:00
Joshua Barretto
8fd2e4537d Addressed review comments 2020-11-23 10:57:57 +00:00
Joshua Barretto
51d1a2ecff Added glow 2020-11-23 10:57:56 +00:00
Snowram
3bcffe1bf7 Assigns spawned npcs loadout with new method 2020-11-23 10:57:56 +00:00
Sam
0b86943e66 Added LoadoutConfig to better specify loadouts. 2020-11-23 10:57:56 +00:00
Joshua Barretto
7850b0bcaf Added site names, dungeon difficulty, better explosions 2020-11-23 10:57:55 +00:00
Joshua Barretto
de685b00b2 Improved water pathfinding 2020-11-23 10:45:01 +00:00
Joshua Barretto
71b7e1ef90 Better non-climbing NPC pathfinding in rivers 2020-11-23 10:45:01 +00:00
Joshua Barretto
b352ef5d55 Terrain pop-in, fixed agent pathfinding in water 2020-11-23 10:45:01 +00:00
Joshua Barretto
d4d4f17d3c Added world map size icons 2020-11-23 10:45:01 +00:00
Joshua Barretto
450bc6c4ae Prevented rtsim entities always climbing 2020-11-23 10:45:01 +00:00
Joshua Barretto
22fb71905b Added rtsim entities moving when unloaded, better generation 2020-11-23 10:45:01 +00:00
Joshua Barretto
99a881f349 Added entity simulation to rtsim, reification, assimilation 2020-11-23 10:44:59 +00:00
Joshua Barretto
808d1873bd Began implementing rtsim 2020-11-23 10:37:59 +00:00
Joshua Barretto
3ee4245652 Added test poles, minor improvements 2020-11-23 10:37:59 +00:00
Joshua Barretto
da9b23d4f6 Merge branch 'knarkzel/fix-npc-spawn' into 'master'
Fix bug that caused campfires and other stuff to duplicate

See merge request veloren/veloren!1543
2020-11-22 21:03:06 +00:00
Odd-Harald Lillestø Myhren
56e37a4846 Fix bug that caused campfires and other stuff to duplicate 2020-11-22 21:03:06 +00:00
Imbris
1355c1e8f5 Move tracy frame markers to proper locations, add a few spans 2020-11-22 14:22:39 -05:00
Joshua Barretto
2ae51de7f0 Added more creature spawns 2020-11-21 14:33:32 +01:00
Imbris
e72c69ca41 Merge branch 'imbris/fix-apple-bug' into 'master'
Fix issues with not being able to grab highlighted apples by unifying distance checking

Closes #820

See merge request veloren/veloren!1532
2020-11-21 02:55:09 +00:00
Imbris
ea275e320f Rename pos fields of Cube and Cylinder for enhanced clarity and added a few tests to the find_dist module 2020-11-20 20:51:44 -05:00
Sam
c00720fb44 Swapped bool values, only_roll changed to attack_interrupts. 2020-11-20 11:54:56 -06:00
Sam
e62960e75d Rolling can now interrupt any attack. 2020-11-20 11:30:48 -06:00
Snowram
d98bfa72ad Improves bipedlarge and theropod anims, balance tweaks 2020-11-19 00:56:50 +01:00
Snowram
b48de84f8c Adds 3 new npcs 2020-11-19 00:53:17 +01:00
Snowram
44fe398ba3 Adds 2 new npcs, some models tweaks 2020-11-19 00:53:13 +01:00
Snowram
42d2108c39 Adds mindflayer npc 2020-11-19 00:53:09 +01:00
Snowram
9bfccd42d3 Adds new animals 2020-11-19 00:53:02 +01:00
jiminycrick
3b47add55a Fully move sfx away from ECS event bus 2020-11-18 13:31:13 -08:00
jiminycrick
b3aa454f8e Initial work to move combat sfx to outcomes 2020-11-18 13:31:12 -08:00
jiminycrick
77d624f640 Made level up sounds use outcomes instead of emitting an event 2020-11-18 13:31:12 -08:00
jiminycrick
a9711eea01 Beginning to address comments 2020-11-18 13:31:12 -08:00
jiminycrick
a684bc90fd Quadraped footsteps and songs in biomes 2020-11-18 13:31:12 -08:00
jiminycrick
bc1059610b More clippy fixes 2020-11-18 13:31:12 -08:00
jiminycrick
c2a2361c22 Fix rebase 2020-11-18 13:31:12 -08:00
jiminycrick
ea1bc2941b Clippy fixes 2020-11-18 13:31:12 -08:00
jiminycrick
695cc7f5cb Broken wind implementation 2020-11-18 13:31:12 -08:00
jiminycrick
9b759efe41 Snow footsteps 2020-11-18 13:31:12 -08:00
jiminycrick
09a1974974 River water sfx 2020-11-18 13:31:12 -08:00
jiminycrick
c8d79b0b0e Dungeon and cave specific music 2020-11-18 13:31:12 -08:00
jiminycrick
46d3f6f6d2 Initial biome specific music and ambient sound channel 2020-11-18 13:31:11 -08:00
Imbris
7427367d96 Fix issues with not being able to grab highlighted apples by unifying distance checking 2020-11-17 23:06:02 -05:00
Snowram
950eb1976d Addressed more comments 2020-11-17 23:54:01 +01:00
Snowram
83b2640e02 Makes basic beam Y offset depend on body scale 2020-11-17 23:27:13 +01:00
Snowram
7af561263d Addressed comments 2020-11-17 23:27:13 +01:00
Snowram
93642428f2 Move eye sight and scale in body.rs, mounts tweaks 2020-11-17 23:27:13 +01:00
Imbris
cbb701f30d Temp fix for the home command 2020-11-15 20:40:12 -05:00
Knarkzel
917ae5a0b5 added persist combo counter on roll when mid-combo 2020-11-15 23:08:14 +01:00
Imbris
891e81cf58 Merge branch 'imbris/save-selected-char' into 'master'
Save the selected character, deselect character when deleting, auto select newly created character

See merge request veloren/veloren!1516
2020-11-15 01:40:44 +00:00
Imbris
4f2512f126 Save the selected character, deselect character when deleting, auto select newly created character 2020-11-14 19:17:42 -05:00
Imbris
2072929a5a Send ability map from the server to the client on connection instead of loading from the assets 2020-11-14 16:07:07 -05:00
Samuel Keiffer
0c7cd3d8fb Merge branch 'jasonkjl72/axe-spin-adjustment' into 'master'
Make Axe Spin More Realistic

Closes #827

See merge request veloren/veloren!1510
2020-11-14 04:15:50 +00:00
Jason Lee
1d2ccd5762 Make Axe Spin More Realistic 2020-11-13 21:49:12 -05:00
Imbris
1373b752ff Merge branch 'imbris/fix-5' into 'master'
Remove randomization of species and body_type with the randomize button in char creation

See merge request veloren/veloren!1512
2020-11-14 01:56:28 +00:00
Imbris
51dd5110d0 Merge branch 'imbris/fix-3' into 'master'
Tweak clock related things and fix voxygen tracy feature

See merge request veloren/veloren!1506
2020-11-14 01:39:33 +00:00
Imbris
1952785af2 Remove randomization of species and body_type with the randomize button in char creation 2020-11-13 19:43:32 -05:00
Sam
b5f59f9cf3 Fixed tests. Addressed comments. 2020-11-13 10:41:34 -06:00
Sam
e2fe2fd532 Speed and power on weapons are now able to modify abilities after they are loaded from ron files. 2020-11-12 21:24:36 -06:00
Imbris
37e4ea4669 Remove ability map from top level functions 2020-11-12 21:24:35 -06:00
Sam
9b4fa4e961 Started moving loading of ability manifest to an ecs variable. 2020-11-12 21:24:34 -06:00
Sam
050ad82e55 Abilities are now loaded from .ron files. 2020-11-12 21:24:34 -06:00
Sam
770aaf6b93 Added projectile constructor. Removed a bunch of cloning. 2020-11-12 21:24:32 -06:00
Sam
abf7301a89 Changed how buffs were constructed on projectiles. 2020-11-12 21:24:32 -06:00
Sam
f4244ecbaf Added ron files for unique and WIP tools. 2020-11-12 21:24:31 -06:00
Imbris
27d4310498 Add more catagories to common deps, store average busy dt as a duration, store frame delta times as seconds instead of milliseconds 2020-11-12 19:18:54 -05:00
Imbris
c0e8298ac3 Display averaged busy dt 2020-11-11 23:26:13 -05:00
Imbris
a97b188bea Make fps display and specification more precise 2020-11-11 21:47:22 -05:00
Imbris
ba042c76c8 Only limit negative z velocity by gravity instead of total negative z velocity 2020-11-11 20:09:07 -05:00
Snowram
bed3a5c70a Adds a speed variable to charged states 2020-11-11 22:06:05 +01:00
Snowram
af346806de Addressed comments 2020-11-11 22:03:54 +01:00
Snowram
fe977f0a6c Adds a speed stat to weapons 2020-11-11 22:03:53 +01:00
Imbris
cd1a134c26 Fix bug in body.validate(), add sliders to iced char creation screen, make char selection screen more closely resemble the master version in style 2020-11-11 03:02:22 -05:00
James Melkonian
6085edaa34 Improve NPC aiming and humanoid hitboxes 2020-11-11 04:36:40 +00:00
Marcel
696f607a70 Merge branch 'xMAC94x/clock' into 'master'
massivly switch clock algorithm.

See merge request veloren/veloren!1499
2020-11-10 22:12:12 +00:00
Monty Marz
0e072f72cc frost cleaver
velorite mage set

offsets
armor stats
2020-11-10 21:43:45 +00:00
Marcel Märtens
72afd7af6c switch to spin_sleep 2020-11-10 22:39:10 +01:00
Marcel Märtens
e4e5c6e55b massivly switch clock algorithm.
- before we had a Clock that tried to average multiple ticks and predict the next sleep.
   This system is massivly bugged.
   a) We know exactly how long the busy time took, so we dont need to predict anything in the first place
   b) Preduction was totally unrealistic after a single lag spike
   c) When a very slow tick happens, we dont benefit from 10 fast ticks.
 - Instead we just try to keep the tick time exact what we expect.
   If we can't manage a constant tick time because we are to slow, the systems have to "catch" this via the `dt` anyway.
2020-11-10 18:31:42 +01:00
Justin Shipsey
a8ac051f33 Merge branch 'james/axe-hammer-keyframes' into 'master'
James/axe hammer keyframes

See merge request veloren/veloren!1497
2020-11-10 01:03:11 +00:00
jshipsey
cd188fd32b tweaks 2020-11-09 18:32:23 -05:00
Joshua Barretto
71718d9c98 Better humidity, better snow trees 2020-11-09 15:06:37 +00:00
Sam
9b0e1c8dfc Slight balance tweaks. 2020-11-08 19:33:24 -06:00
Sam
8fa7e246e9 Minor tweaks. 2020-11-08 18:11:53 -06:00
jshipsey
0618de138e rebase 2020-11-08 19:02:48 -05:00
jshipsey
20efc692fd ranged 2020-11-08 18:52:22 -05:00
Sam
edff3a75c3 Made bow stay in BasicRanged state while autofiring. 2020-11-08 18:51:36 -05:00
jshipsey
92aa6a1b12 axe basic 2020-11-08 18:51:35 -05:00
jiminycrick
33e87de17e Initial combo melee for axe M1 2020-11-08 18:48:48 -05:00
Christof Petig
b56919b123 Make waypoints persistent
Closes #549
2020-11-08 22:15:47 +01:00
AlKabir
6535deae9c added two meat assets for mobs to drop 2020-11-07 23:34:20 -06:00
Sam
158fb36420 Other stupid fix. 2020-11-07 21:07:53 -06:00
Imbris
133ba82a9b Use item_definition_id for weapon asset mapping 2020-11-07 16:44:11 -06:00
Sam
a4046872b2 Yeeted from code files. 2020-11-07 15:53:10 -06:00
AlKabir
77f3c7e3c5 Minor combat fixes (see issue 785) 2020-11-07 18:00:07 +00:00
TheBoredProgrammer64
b2ec207979 Revert "Removed toolCategory"
This reverts commit 5b0ff408176ff00408cc90f2516a90d5cd303e56.
2020-11-06 15:33:20 +00:00
Marcel Märtens
40f5afc2b0 ci cleanup, dependency update 2020-11-06 14:34:42 +01:00
Samuel Keiffer
44f676d90c Merge branch 'sam/make-roll-great-again' into 'master'
Roll overhaul

See merge request veloren/veloren!1484
2020-11-06 03:25:18 +00:00
Sam
37ecb165ef Addressed comments. Roll now only provides i-frames to melee attacks. It also reduces height of hitbox. 2020-11-05 20:40:20 -06:00
Snowram
262ceac060 fmt 2020-11-06 01:08:35 +01:00
Monty Marz
642ad805a1 potion buff 2020-11-06 01:08:34 +01:00
Snowram
4b439e9b58 Adresses comment 2020-11-06 01:08:34 +01:00
Snowram
0d92f02deb Buff stonegolem, nerf giants, add missing sfxs 2020-11-06 01:08:33 +01:00
Monty Marz
ca932f6c15 easier to get minor potions
increase cost of a minor potion to 4 apples
2020-11-06 01:08:32 +01:00
Snowram
a52f83e92c Addresses some comments 2020-11-06 01:08:31 +01:00
Snowram
ce96af4363 Allow for an arbitrary array of effects and buffs for consumables 2020-11-06 01:08:30 +01:00
Sam
4a1a3f3ecc Roll now gives i-frames. 2020-11-05 16:48:04 -06:00
Sam
860c766d62 Changed roll movement. 2020-11-05 14:22:30 -06:00
Sam
55e75adec0 Created new fields in roll. Centralized generation of abilities. Added builder function for rolls since they are not yet tied to equipment. 2020-11-05 12:28:18 -06:00
Marcel
121364821a Merge branch 'xMAC94x/FeuerzeugBierflasche' into 'master'
xMAC94x/feuerzeugBierflasche

See merge request veloren/veloren!1478
2020-11-05 09:22:50 +00:00
Marcel Märtens
a7ce3e5a2e switch back to cylindric entity <-> entity collision check.
I still doubt why we do cylindric vs cylindric in entity <-> entity check,  but box vs box in entity <-> terrain check.
Though i did a spheric calculation here.
The cylindric one is alot slower though, 500 entities take 1.9s instead of 1.3s
2020-11-05 08:54:10 +01:00
Sam
a0af315930 Addressed comments. 2020-11-04 19:22:08 -06:00
Sam
bda7fefdc0 Removed Damages struct. Added GroupTarget enum. Changed RadiusEffect to use Effect instead of Daamges. Added Damage variant to Effect Eenum. 2020-11-04 19:22:07 -06:00
Sam
d38f1d319c Energy and health change server events now reference EcsEntity instead of Uid. Added TargetGroup to use to determine targets of effects/damage. Added Entity(TargetGroup, Effect) to RadiusEffect enum. 2020-11-04 19:22:06 -06:00
Sam
87bff41a66 Addressed comments. 2020-11-04 19:22:05 -06:00
Sam
c48c022f7e Separated out health from stats component. 2020-11-04 19:22:04 -06:00
Sam
b8f722af8d Removed most hardcoded ability keys. 2020-11-04 19:22:02 -06:00
Sam
f1f5c2b21b Added energy change server event. 2020-11-04 19:22:01 -06:00
Sam
e0cbbf52ed Changed explosions to take a vec of RadiusEffects. Changed Damage to a struct of DamageSource and value. Added interpolation function to damage. 2020-11-04 19:22:00 -06:00
Joshua Barretto
87ac4bd998 Merge branch 'christof/home_town' into 'master'
implement /home to return to home town

See merge request veloren/veloren!1481
2020-11-04 15:58:35 +00:00
Marcel Märtens
a7123c6e14 put cache in ECS to get rid of allocations 2020-11-04 14:19:28 +01:00
Marcel Märtens
ce3173ecdf add metrics for physics sys and implement concurrent physics 2020-11-04 11:53:13 +01:00
Marcel Märtens
bbe6e8be7c Improve Phyiscs speed of entity handling.
Before we had accessed velocities in a nested loop O(n²).
Now we copy it only once out of the ECS system and store it in a tmp Vec.
As we no longer need to hold a mut and imutable reference, we can iter of `&mut velocities` again in the outer loop.
Also improved many calculations called in the loop to make the check if 2 entities are to far apart as easy as possible
2020-11-04 11:53:09 +01:00
jshipsey
28cde31bbb setup for staff, more anim conversions 2020-11-04 01:48:05 +01:00
Christof Petig
ac92c8a6af implement /home to return to home town 2020-11-04 00:55:15 +01:00
Joshua Barretto
6331ad9455 Implemented Flight 2020-11-03 22:46:07 +00:00
Marcel Märtens
00456c8373 extract a Presence Component, which is server only and has state of Player and Client. Presence is only valid for Clients that are in game 2020-11-03 08:56:02 +01:00
Marcel Märtens
6bb74c9c6f Fix clients are disconnecting GRACEFULLY by removing the Disconnect Request from a client, a client now sends a TERMINATE message directly 2020-11-03 08:55:54 +01:00
ubruntu
8c1e1fdc5c Fixed sneak toggle, sneaking no longer has sound, rolling can return to sneaking state, sneaking reduces aggro distance 2020-11-03 04:09:38 +00:00
ubruntu
b11041dfa4 10% of bow hits cause bleed debuff 2020-11-01 18:38:57 +00:00
Sam
4d8a635843 Sceptre fix. 2020-10-31 12:57:51 -05:00
Imbris
64def3cde4 Allow interacting with nearby blocks without pointing at them, unify selection of block/entity interactors so that only one is select at once, rearrange pickup and mount range consts 2020-10-29 18:40:11 -04:00
Imbris
74ef766051 Rename running_tps_average -> running_average_delta 2020-10-29 18:30:19 -04:00
Sam
52c93f613e Addressed comments. 2020-10-28 22:04:15 -05:00
Sam
1a8cf33a60 Transitioned forced movement to an enum. 2020-10-28 18:15:27 -05:00
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
a7e3e55a12 Transitioned damage and healing from u32/i32s to enums. 2020-10-28 18:15:25 -05:00
Sam
844e6f2b60 Slightly nerfed sword dash. Reduced particle count on fire aoe by factor of 3. 2020-10-28 18:15:25 -05:00
Sam
15286a094a Leaps now require a non-negative vertical velocity to use. 2020-10-28 18:15:24 -05:00
Sam
555bc559f5 Axe no longer sets vertical velocity to 0, but instead preserves vertical velocity. 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
6559df459e Addressed comments. 2020-10-26 21:32:01 -05:00
Sam
e8f6338eb0 Admin armor now provides immunity to debuffs. 2020-10-26 19:49:40 -05:00
Sam
5d0fd3d9bc Addressed more comments. Changed how buffs were sorted so that duration was also taken into account. 2020-10-26 19:30:18 -05:00
Adam Whitehurst
f759895d63 add maxhealthmodifier
oops variable
2020-10-26 19:30:18 -05:00
Adam Whitehurst
8aad7adab8 add comments 2020-10-26 19:30:17 -05:00
Sam
f60985d733 Transitioned buff storage from a vec to a hashmap. Addressed other comments. Only continuous buff effects are handled right now. 2020-10-26 19:30:17 -05:00
Sam
337cf6e137 Cleaned up UI code. Removed stuff added for testing. Added 10% for melee attacks to inflict a bleeding debuff. Renamed BuffId to BuffKind. Fixed memory leak. Set event emission to false when timer is decremented. 2020-10-26 19:30:10 -05:00
Sam
fdf8decb18 Handled health change over time buff effect better. 2020-10-26 19:28:27 -05:00
Monty Marz
8fa398954d Initial implementation of buffs UI
player buffs animation

more testing debuffs

sorting and display limit fix

overhead buffs

fix

WIP buff removal function

fmt

Update buffs.rs

Now with compiling: WIP group UI buffs

positioning

Update group.rs

Update group.rs

Small optimizations.

Fixed positioning of buffs in group panel. Broke buff tooltips in group panel.

buff frame visuals

added setting for displaying buffs at minimap
2020-10-26 19:28:24 -05:00
Sam
007d3c09ac Buffs now get removed on death by default. Buffs are now required to have either the 'Buff' or 'Debuff' tag. RemoveByCategory function now has support for blacklisting certain categories. Support for UI stuffs. 2020-10-26 19:28:23 -05:00
Samuel Keiffer
60a5346a0b Addressed comments. 2020-10-26 19:28:22 -05:00
Sam
0df061a38e Moved duration to inside BuffId enum to future-proof for when buffs are persisted. 2020-10-26 19:28:20 -05:00
Sam
1a1ceb54bc Server event used to deal damage/heal with buffs. Buff kills now award xp. 2020-10-26 19:28:20 -05:00
Sam
de7191b985 Added functionality to remove buffs by category. 2020-10-26 19:28:19 -05:00
Sam
ccad1fa0b8 Separated buffs into active and inactive buffs. There can only be 1 active buff at a time of a particular buff id. If a new buff is stronger than an active buff, it moves the active buff to inactive buffs. When active buffs are removed, it checks inactive buffs for any buffs of the same id and moves the strongest one to active buffs. 2020-10-26 19:28:18 -05:00
Sam
19c7ed7885 Added builder function for buffs 2020-10-26 19:28:18 -05:00
Sam
b8690473e4 When buffs expire from duration, now only they expire rather than ending all buffs of the same type. 2020-10-26 19:28:17 -05:00
Sam
125de0b46e Creatures and playrs now have buffs component, buffs that expire now only end their particular buff instead of every buff with the same type. 2020-10-26 19:28:16 -05:00
Sam
c50063ad0c Move addition/removal of buffs to server event. 2020-10-26 19:28:15 -05:00
BottledByte
7ab99a3bbf Initial WIP implementation of the Buff system 2020-10-26 19:28:14 -05:00
Marcel Märtens
1b47913835 fix clippy after toolchain update 2020-10-26 22:30:51 +01:00
Marcel Märtens
153c6c3b13 Fixing Tarpaulin isn't easy.
So first off all we had to update the toolchain, i think everything in september is okay, but we got with this current version.
Then we had to update several dependencies, which broke:
 - need a specific fix of winit, i think we want to get rid of this with iced, hopefully, because its buggy as hell. update wayland client to 0.27
 - use a updated version of glutin which has wayland-client 0.27 and no longer the broke version 0.23
 - update conrod to use modern copypasta 0.7
 - use `packed_simd_2` instead of `packed_simd` as the owner of the create abandoned the project.
 - adjust all the coding to work with the newer glutin and winit version. that also includes fixing a macro in one of the dependencies that did some crazy conversion from 1 event type to another event type.
   It was called `convert_event`
 - make a `simd` feature which is default and introduce conditional compiling.
   AS I HAVE NO IDEA OF SIMD AND THE CODE. AND I DIDN'T INTRODUCE THE ERROR IN THE FIRST PLACE, WE PANIC FOR NON SIMD CASE FOR NOW. BUT IT WORKS FOR TESTS.
 - tarpaulin doesnt support no-default-features. so we have to `sed` them away. semms fair.
2020-10-26 17:04:20 +01:00
Adam Whitehurst
4dcac28f8a Ensure leap melee swing animation and hit are sync 2020-10-24 20:15:19 +00:00
jiminycrick
b98e2a924d Fixed hammer AI and added axe AI 2020-10-19 16:20:59 +02:00
Snowram
34ce8bb042 Addressed comments 2020-10-19 16:20:59 +02:00
jiminycrick
64ef7f39d6 Addressed comments on agent code 2020-10-19 16:20:59 +02:00
jshipsey
64d73abdec roshwalr fix 2020-10-19 16:20:59 +02:00
jshipsey
caa048b1d5 small fixes 2020-10-19 16:20:59 +02:00
Snowram
7a62ddfd3f Add BeastClaw npc weapontype 2020-10-19 16:20:59 +02:00
Snowram
f9383e4dd8 Add roshwalr npc 2020-10-19 16:20:59 +02:00
jiminycrick
be1596a703 fixed agent code for staff rework 2020-10-19 16:20:59 +02:00
jshipsey
66b1fe67dc rebase 2020-10-19 16:20:58 +02:00
Snowram
c9985e14cb Rename Saurok, various anim fixes 2020-10-19 16:20:58 +02:00
jshipsey
6a86567301 fix agent bug 2020-10-19 16:20:58 +02:00
jshipsey
65df398672 werewolf work 2020-10-19 16:20:58 +02:00
jiminycrick
50aac17d94 Added secondary skills to agent code (except bow) 2020-10-19 16:20:58 +02:00
Snowram
6c54e6d8fe Add sand, snow and wood raptor npcs 2020-10-19 16:20:58 +02:00
Snowram
588f66a1ee Add treant npc 2020-10-19 16:20:58 +02:00
unknown
d2f91bc3a0 Assigns a ToolKind to bipedlarge weapons 2020-10-19 16:20:58 +02:00
Snowram
0a9ec848a7 add lizardman npcs 2020-10-19 16:20:58 +02:00
Snowram
204fa50de9 Add werewolf npc 2020-10-19 16:20:57 +02:00
Sam
e6684009c2 Made ability key not hardcoded in tool.rs. 2020-10-15 20:05:58 -05:00
Sam
d869f7e430 Moved explsion struct from within comp to common. 2020-10-14 21:06:55 -05:00
Sam
14e4af7ab6 Addressed playtesting feedback. 2020-10-14 21:06:52 -05:00
jshipsey
6a744eed82 anims 2020-10-14 21:06:32 -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
1c21362bc3 Fixed shockwaves hitting entities multiple times. Explosions can now regen energy. Staff M1 now has particles instead of using bomb particles. 2020-10-14 20:56:23 -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
cbb72363af Reworked explosions. Tweaked staff fireball. 2020-10-14 20:56:21 -05:00
Sam
04dcd012da Flamethrower particles. 2020-10-14 20:56:21 -05:00
Sam
c80f16ae74 Started to add particles. 2020-10-14 20:56:20 -05:00
Sam
256846a669 Initial implementation of new staff abilities. 2020-10-14 20:56:16 -05:00
jiminycrick
4de42e36fd Consolidated recover code in repeater_ranged 2020-10-14 17:10:27 -07: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
jshipsey
3bb59b36cd energy values, remove hotload 2020-10-14 12:50:33 -07:00
jshipsey
64f72a73f9 axeleap tweaks 2020-10-14 12:50:33 -07:00
jiminycrick
691acd730d Smoother leap and recovery leap handling 2020-10-14 12:50:33 -07:00
jshipsey
22d8792c4b adjustments to chargedmelee, repeater 2020-10-14 12:50:33 -07:00
jshipsey
521ffd64ba cleanup 2020-10-14 12:50:33 -07:00
jshipsey
28eb58ddfa anims 2020-10-14 12:50:33 -07:00
Sam
fadba23dde Slight tweaks to leap 2020-10-14 12:50:33 -07:00
jshipsey
281155186f hammer leap melee anim 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
9ebda3c353 Made bow leap more graceful and set energy costs and removed jitter for no leap 2020-10-14 12:50:32 -07:00