Sam
fcb0f8d8f0
Wood golem attacks and ai
2022-02-10 14:58:32 -05:00
Sam
e044bf5091
Mandragora attacks and ai
2022-02-10 14:58:32 -05:00
Sam
f1801560fa
Deadwood ai
2022-02-10 14:58:31 -05:00
Sam
82c976919e
Darts are now darts.
2022-02-10 14:58:29 -05:00
Joshua Barretto
6263942041
Merge branch 'slipped/site2' into 'master'
...
new entities, frostpines
See merge request veloren/veloren!3193
2022-02-10 01:59:20 +00:00
jshipsey
786ae39fb4
new entities
2022-02-09 20:10:59 -05:00
jshipsey
7ae85aef50
tweaks
2022-02-09 19:34:24 -05:00
jshipsey
6d34a6b544
wallrunning
2022-02-09 19:34:23 -05:00
phoenix13032005
7a1f0d9fa1
Balance update
...
+ Make icons for Mino and Mindy dungeons with their faces
+ Adjust loot tables
+ Adjust names with respect to the lore of @Gemu
2022-02-09 12:13:42 +02:00
Tormod G. Hellen
82273f0f36
Make friendly creatures defend each other.
2022-02-08 22:32:25 +01:00
Jonathan Berglin
3bdc7b1bb9
Add documentation to Agent functions
2022-02-07 23:56:03 +00:00
James Melkonian
f21e0f31fb
Restrict RtSim ships to airships
2022-02-03 21:41:20 -08:00
Dominik Broński
19c764dde6
Merge branch 'christof/econfix' into 'master'
...
Small economy cleanup
See merge request veloren/veloren!3164
2022-02-03 21:48:01 +00:00
Youssef Fahmy
fdfd2c99ff
Removal of /home
2022-02-02 08:50:23 +00:00
Christof Petig
42faef9ab0
clippy is right,
...
but I don't want to rearrange print_sorted (test). so reduce overall strictness
2022-01-31 22:25:38 +01:00
Christof Petig
080444fc8b
juliancoffee prefers this style
2022-01-31 22:19:21 +01:00
Christof Petig
f4f1b5c77b
more stable sorting
2022-01-31 22:00:23 +01:00
Christof Petig
dc92d0ab12
fix multiple calls of init
2022-01-31 21:31:08 +01:00
Christof Petig
d8edd70837
create a nice csv table for comparison
2022-01-31 21:19:23 +01:00
Christof Petig
47aba3e4cd
clean up double rescaling
2022-01-31 20:52:25 +01:00
Christof Petig
6b9180bba6
separate amount from probability
2022-01-31 19:45:39 +01:00
Christof Petig
12fedef98f
fix some test cases
2022-01-31 19:45:39 +01:00
juliancoffee
45ba21796c
Add test cases
2022-01-31 19:45:39 +01:00
Christof Petig
8230323a76
fix code quality
2022-01-31 19:45:39 +01:00
Christof Petig
66c431ba86
cargo fmt
2022-01-31 19:45:39 +01:00
Christof Petig
a98b9ad049
normalize loot tables before combining them, take current values for a start
2022-01-31 19:45:38 +01:00
Christof Petig
8228437b22
load loot table only once, add utility function and test cases
2022-01-31 19:45:38 +01:00
Justin Shipsey
612f084831
Merge branch 'slipped/bipeds' into 'master'
...
Slipped/bipeds
See merge request veloren/veloren!3163
2022-01-31 17:08:01 +00:00
Marcel
72e270368d
Merge branch 'aweinstock/resolve-clippy-lints' into 'master'
...
Globally allow more clippy lints and reconfigure complexity to be less verbose
See merge request veloren/veloren!3052
2022-01-30 22:53:36 +00:00
Marcel Märtens
201a5ac2c7
stricten some rules and fix some clippy warnings
2022-01-30 20:16:21 +01:00
Avi Weinstock
f3f08936d8
Decrease too-many-arguments-threshold and type-complexity-threshold.
2022-01-30 20:16:21 +01:00
Avi Weinstock
5f8957d8ef
Globally allow the clippy lints {new_without_default, many_single_char_names, identity_op, type_complexity, too_many_arguments}.
2022-01-30 20:16:20 +01:00
Dr. Dystopia
7b5d9508b6
Create 'ColliderData' struct and implement it in 'resolve_e2e_collision' function
2022-01-30 19:50:32 +01:00
jshipsey
7cac4b4001
myrmidon fix
2022-01-30 02:02:23 -05:00
Scott Williams
21fd296407
Changed entity drops csv export to export names instead of asset paths
2022-01-29 17:37:45 +00:00
Joshua Barretto
d8c4284a32
Merge branch 'zesterer/worldgen' into 'master'
...
Improvements to site2
See merge request veloren/veloren!3159
2022-01-28 17:14:07 +00:00
Joshua Barretto
69436db64c
Added wall lamps
2022-01-28 13:58:41 +00:00
jshipsey
4fbd3027a1
new mobs
2022-01-28 02:50:15 -05:00
juliancoffee
fa724ec2e2
Fix doc-tests
2022-01-28 00:18:29 +02:00
juliancoffee
6ae25d5956
Require rng from EntityInfo::with_asset_expect
2022-01-28 00:02:34 +02:00
juliancoffee
e004fba9da
Adress review
2022-01-28 00:02:34 +02:00
juliancoffee
43b5af2980
Create asset_migrate bin from entity_migrate
2022-01-28 00:02:34 +02:00
juliancoffee
4a4f2f8d8f
Loadout Update: Managed Rng
...
Rewrite EntityInfo api to take Rng from caller.
2022-01-28 00:02:34 +02:00
juliancoffee
d5b927602a
Loadout Udpate: NpcData part
...
Actually implement creating npc with new EntitytInfo by chaning
CreateNpc.loadout to CreateNpc.inventory and cleaning code in
NpcData::from_entity_info.
2022-01-28 00:02:34 +02:00
juliancoffee
e1bfa6c7e2
remove outdated comment
2022-01-28 00:02:34 +02:00
juliancoffee
fbe07f016a
Loadout Update. EntityInfo part
...
EntityConfig changes:
+ Add LoadoutKind instead of Hands + Meta::LoadoutAsset.
+ Allows for random loadout asset and inventory.
```
pub enum LoadoutAsset {
Loadout(String),
Choice(Vec<(f32, String)>),
}
pub enum LoadoutKind {
FromBody,
Asset(LoadoutAsset),
Hands(Hands),
Extended {
hands: Hands,
base_asset: LoadoutAsset,
inventory: Vec<(u32, String)>,
},
}
```
EntityInfo:
Remove
- pub main_tool: Option<Item>,
- pub second_tool: Option<Item>,
- pub loadout_asset: Option<String>,
Add
+ pub inventory: Vec<(u32, Item)>,
+ pub loadout: Option<LoadoutBuilder>,
2022-01-28 00:02:34 +02:00
juliancoffee
765311add0
Add entity config migration tool
2022-01-28 00:02:34 +02:00
Samuel Keiffer
d89edc9357
Merge branch 'tygyh/Extract-controller-functions' into 'master'
...
Tygyh/extract controller functions
See merge request veloren/veloren!3151
2022-01-26 22:36:36 +00:00
infrandomness
1a1acfae2c
Fix RUSTSEC-2022-0006
2022-01-26 22:08:38 +01:00
Dr. Dystopia
b0d6a68e8c
Create 'push_initiate_invite' function
2022-01-26 21:23:37 +01:00
Dr. Dystopia
027154a5be
Create 'push_invite_response' function
2022-01-26 21:16:29 +01:00
Dr. Dystopia
0516526985
Create 'push_utterance' function
2022-01-26 21:12:19 +01:00
Dr. Dystopia
765e858c19
Create 'push_cancel_input' function
2022-01-26 21:07:36 +01:00
Dr. Dystopia
b2b208687c
Create 'push_basic_input' function
2022-01-26 20:09:59 +01:00
Dr. Dystopia
bc0a8c7704
Create 'push_action' function
2022-01-26 19:52:19 +01:00
juliancoffee
fba89517de
Move Veloren to 2021 edition
2022-01-26 16:46:40 +02:00
juliancoffee
25b04e6ee7
Move common to 2021 edition
2022-01-26 15:17:01 +02:00
juliancoffee
ebe95ebe33
Move common-assets to 2021 edition
2022-01-26 15:09:00 +02:00
Dominik Broński
ca7b048184
Merge branch 'SeaCrocodile' into 'master'
...
Sea crocodile
See merge request veloren/veloren!3146
2022-01-26 01:26:38 +00:00
Sam
e6bef416b4
Fix possession for animation work purposes.
2022-01-25 12:29:05 -05:00
floppy
fb316e8f66
SeaCrocodile spawning in tropical Oceans
2022-01-24 19:36:13 +01:00
Joshua Barretto
bdb0fc9c16
Merge branch 'zesterer/underwater' into 'master'
...
Underwater shaders
See merge request veloren/veloren!3127
2022-01-23 20:36:47 +00:00
Forest Anderson
d3aa224f15
Merge branch 'tygyh/Fix-warnings' into 'master'
...
Fix warnings
See merge request veloren/veloren!3051
2022-01-23 19:25:35 +00:00
Forest Anderson
1bcda9da7b
Merge branch 'maveth/skill-improvements' into 'master'
...
Test for cyclic skill dependencies
See merge request veloren/veloren!3098
2022-01-23 18:35:58 +00:00
Dr. Dystopia
bb48267827
Fix warnings
2022-01-23 19:03:47 +01:00
Joshua Barretto
8a684973b4
Merge branch 'zesterer/tiny-fixes' into 'master'
...
Addressing criticisms
See merge request veloren/veloren!3121
2022-01-22 16:44:01 +00:00
Joshua Barretto
3b347a2aa3
Improved underwater lighting on low shader settings
2022-01-21 13:35:40 +00:00
Samuel Keiffer
a00ac11e25
Merge branch 'sam/fix-possess' into 'master'
...
Fix possession bug
See merge request veloren/veloren!3123
2022-01-21 07:40:23 +00:00
Sam
fe1db1e9e0
Can move around, so character state system runs
...
Hotbar now visible
Can't yet activate skillbar abilities, only M1 and M2
2022-01-20 15:26:35 -05:00
Joshua Barretto
4f181c936d
Merge branch 'name_areas_based_on_biome' into 'master'
...
name_areas_based_on_biome
See merge request veloren/veloren!3115
2022-01-20 19:50:57 +00:00
Joshua Barretto
f8783487a8
Preventing gliding when mounted, allowed dancing
2022-01-20 12:53:08 +00:00
Snowram
a6e396e29a
Stunned and jump anims, stats, spawns, more IA work
2022-01-20 00:53:29 +01:00
Snowram
f6d7ba33ef
Arthropods spawns and loots
2022-01-19 19:01:16 +01:00
jshipsey
82df5f23c3
spit anim
2022-01-19 19:01:16 +01:00
jshipsey
269b1fcd00
summon an
2022-01-19 19:01:15 +01:00
Snowram
38bbd60fd2
Arthropod basic attack
2022-01-19 19:01:14 +01:00
Snowram
6da42e61ab
Arthropod jump attack, hitboxes
2022-01-19 19:01:14 +01:00
Snowram
1e6ead4005
Arthropod charge
2022-01-19 19:01:13 +01:00
Snowram
02ed6ffd60
More arthropod work
2022-01-19 19:01:13 +01:00
Snowram
ae71f2e4f0
Adds poisoned debuff (energy change over time)
2022-01-19 19:01:13 +01:00
Snowram
fa549eece7
Adds new arthropod species
2022-01-19 19:01:12 +01:00
Snowram
f67bf2a539
Adds arthropod skeleton
2022-01-19 19:01:11 +01:00
Imbris
59d195b9bc
Merge branch 'imbris/component-sync' into 'master'
...
Sync some components only from the client's own entity.
See merge request veloren/veloren!3108
2022-01-19 07:44:14 +00:00
Samuel Keiffer
c3e92b6c7a
Merge branch 'sam/melee-constructor' into 'master'
...
Melee Constructor
See merge request veloren/veloren!3111
2022-01-19 06:36:51 +00:00
Sam
f93b85368d
Addressed review comments.
2022-01-19 00:56:44 -05:00
Imbris
13d970bf6f
Rename SyncFrom::AllEntities to SyncFrom::AnyEntity for more clarity, add more comments for component syncing code, address MR comment
2022-01-19 00:56:42 -05:00
Imbris
3beb3c8205
Address review comments
2022-01-19 00:56:42 -05:00
Imbris
374bd10e5d
Small comment fixes
2022-01-19 00:56:42 -05:00
Imbris
cc40058ae2
Reduce extra energy updates
2022-01-19 00:56:42 -05:00
Imbris
fa42be75b8
Fix health last change time not being set properly
2022-01-19 00:56:42 -05:00
Imbris
5494bd31f2
Sync SkillSet from all entities for now since it is needed for some things in voxygen, fix character_behavior system always triggering energy and density modification flags
2022-01-19 00:56:42 -05:00
Imbris
7f7dc5ff8a
Add ability to plot component update counts each tick in tracy, controlled by the PLOT_UPDATE_COUNTS env var
2022-01-19 00:56:42 -05:00
Imbris
b19f780d9f
Make Combo also only sync for the client's entity
2022-01-19 00:56:42 -05:00
Imbris
aa122c1a18
Sync some components only from the client's own entity. Vastly reduce the amount of places to modify when adding/removing a component from network syncing.
2022-01-19 00:56:42 -05:00
floppy
51356d5fad
in terrain.mod.rs, return name as Option in fn name
2022-01-18 19:53:20 +01:00
juliancoffee
14cf272c8e
Change equip_time CR weapon calculation
2022-01-18 16:44:23 +02:00
floppy
ceb3507e50
-remove line breaks from biome names
...
-disable Wilderness world message in unspecified mini-biomes
-remove duplicate name in Grasslands name pattern
2022-01-18 11:27:55 +01:00
roidujeu
7da9f7dd47
changed the range of CRs
2022-01-18 12:27:13 +05:30
roidujeu
85965b7161
let fmt/clippy do it's thing
2022-01-18 11:19:30 +05:30
roidujeu
a6a825a97f
gave speed more weight, reduced equip_time_weight, etc
2022-01-18 10:48:53 +05:30
roidujeu
f77baeac4b
normalised crit_chance, zeroed out some stats(for now)
2022-01-18 10:48:53 +05:30
roidujeu
d6ca1bfd93
reverted accidental change
2022-01-18 10:48:53 +05:30
roidujeu
3f43610cfd
made stats separate and gave them different weights
2022-01-18 10:48:53 +05:30
roidujeu
13b0ad8c0e
included other stats, gave constant definition for some constants
...
reduced weight for poise
refuced weight for equipment time
2022-01-18 10:48:53 +05:30
roidujeu
dcc6b75c1c
fixed equip_time reverse logic, dimished effect_power's effect on CR
2022-01-18 10:48:53 +05:30
roidujeu
773bf9d9fd
changed the combat rating equation to a simpler one, which results in a more accurate weapon ranting.
2022-01-18 10:48:52 +05:30
James Melkonian
ac6f53922f
Move agent code into separate files
2022-01-18 03:02:43 +00:00
Sam
b0644ca767
Melee attacks are now created through a melee constructor.
2022-01-17 20:41:24 -05:00
Maveth
fa6e5f2cec
Add a comment explaining something unintuitive
2022-01-17 10:39:58 -06:00
Joshua Barretto
9c565dadc5
Merge branch 'zesterer/mount-everest' into 'master'
...
Mount Everest
See merge request veloren/veloren!3101
2022-01-17 13:21:38 +00:00
Sam
bc402dd1b2
Changed then_some to then
2022-01-16 18:36:46 -05:00
Sam
31a894601f
Removed health sclaing from summon character state.
2022-01-16 18:18:23 -05:00
Joshua Barretto
7f3d9898db
More sensible turn rate in air
2022-01-16 19:43:13 +00:00
Joshua Barretto
20509a7818
Removed mounted combat edge cases
2022-01-16 19:28:53 +00:00
Joshua Barretto
5008dba413
Sensibly filter mount inputs
2022-01-16 18:45:27 +00:00
Joshua Barretto
2966a42093
Added mounted combat
2022-01-16 18:30:00 +00:00
Joshua Barretto
043016a433
Don't try to mount unmountable entities, clippy fixes and fmt
2022-01-16 17:53:14 +00:00
Joshua Barretto
504e2a38d5
Added overhead hints, smoother mount movement
2022-01-16 17:53:14 +00:00
Joshua Barretto
157cd6cd14
Fixed unusual speech bubble placement
2022-01-16 17:53:14 +00:00
Joshua Barretto
2923d3cd2b
Made NPCs prefer food when idle
2022-01-16 17:53:13 +00:00
Joshua Barretto
537cc38b5e
Fixed lantern position when mounting
2022-01-16 17:53:13 +00:00
Joshua Barretto
b3e2d825ed
Overhauled mounting to make it more reliable
2022-01-16 17:53:13 +00:00
Sam
7ae8ed09f6
Addressed MR comments.
2022-01-15 21:50:27 -05:00
Sam
ed38272d23
Diary stats now use real values.
2022-01-15 21:46:55 -05:00
Sam
d0e487da8a
Ability sets now start with non-empty defaults.
2022-01-15 21:45:27 -05:00
Sam
4c3771a1a0
Persistence of auxiliary abilities.
2022-01-15 21:42:34 -05:00
Sam
d86692c4fe
Added in-memory persistence of ability sets per weapon kind pair.
2022-01-15 21:42:34 -05:00
Sam
cf724bd76c
Initial UI work
2022-01-15 21:42:32 -05:00
Sam
9b6c76bd3b
Removed health scaling that bypasses the skill system.
2022-01-15 11:58:28 -05:00
Tormod G. Hellen
3afa16bf03
Fix hotbar changing when sorting inventory.
...
Previously the hotbar slots would refer to inventory slots. An
unfortunate consequence of this was that when the contents of an
inventory slot changed, so would the corresponding hotbar slot
change. This commit fixes that.
2022-01-14 19:14:24 +01:00
Tormod G. Hellen
a33e6df303
Remove unused code.
2022-01-14 18:23:42 +01:00
jshipsey
475fc1631f
akhlut
2022-01-13 23:20:58 -05:00
jshipsey
1fac6359de
more gnarling weapons
2022-01-13 23:20:56 -05:00
jshipsey
7f928d0bc0
woodengolem, chieftain, icedrake, blowgun
2022-01-13 23:20:52 -05:00
Maveth
c8f083aa44
Thank you clippy, very cool
2022-01-13 12:31:51 -06:00
Maveth
167c9b2113
Test for cyclic skill dependencies
2022-01-13 12:21:11 -06:00
Sam
8c2a484ee5
Addressed review comments.
2022-01-12 22:19:00 -05:00
Sam
e98edbcc7a
Conversion of poise damage to health damage now scales depending on the poise state the target is in.
...
Entities are now immune to poise damage for 1 second after exiting a poise state.
Rebalanced most phyiscal damage attacks on player-accessible tools.
2022-01-12 22:18:59 -05:00
Sam
2e2e56661f
Tweaked poise effects and thresholds.
2022-01-12 22:18:59 -05:00
Sam
f182eec611
Fixed bugs in piercing penetration and crushing poise damage calculations.
2022-01-12 22:18:58 -05:00
Sam
d1e1de3b14
Slashing damage now decreases target's energy if available, and if target has no remaining energy will do additional damage.
...
Piercing damage now ignores an amount of protection equal to the piercing damage value.
Crushing damage now does poise damage equal to the amount of mitigated damage.
When poise damage is dealt while in a poise state, poise damage is instead converted to damage.
2022-01-12 22:18:58 -05:00
fetsorn
338dec41ab
Fix typo "incase"->"in case"
2022-01-06 18:28:05 +00:00
Sam
2e09feb426
Tweaks to prompt dialog.
2022-01-03 19:55:06 -05:00
Sam
efbc5f9b75
UI notifying player that their skillset has been invalidated.
2022-01-03 19:55:06 -05:00
Sam
0a9f3381f5
Skill points now attempt to be earned as experience is added.
2022-01-03 19:55:05 -05:00
Sam
da78800047
Changed skill groups to be a hashmap instead of a vec.
2022-01-03 19:55:05 -05:00
Sam
6d2496b7de
Changed skill group to store available_exp instead of spent_exp to help enforce certain invariants. Addressed more review coments.
2022-01-03 19:55:04 -05:00
Sam
8221336587
Addressed some review.
2022-01-03 19:55:04 -05:00
Sam
64c8321626
Made skill groups remain locked if skill to unlock them not acquired.
2022-01-03 19:55:03 -05:00
Sam
903c57b862
Persitence now tracks spent_exp as an additional point to potentially invalidate skills.
2022-01-03 19:55:03 -05:00
