Vincent Foulon
dbee13f9be
Finally Behavior isn't good enough as a component, Remove it from ECS and include it onto Agent directly
2021-04-07 22:02:57 +02:00
Vincent Foulon
45fb9f3211
Address comments
...
- make Behavior's capabilities and state private
- Typo in a comment
- add basic tests
Apply 1 suggestion(s) to 1 file(s)
Remove comments in agent.rs
2021-04-07 22:02:42 +02:00
Vincent Foulon
993ae8fff7
address mutability comment
2021-04-07 17:39:12 +02:00
Vincent Foulon
a0157ac5f5
use bitflags instead of HashSet
2021-04-07 17:37:21 +02:00
Vincent Foulon
211ab02897
Use Behavior::CanTrade instead of Agent::trade_for_site + addressed comments
2021-04-07 17:26:42 +02:00
Vincent Foulon
51ef3547a1
cleanup old code
2021-04-07 17:26:27 +02:00
Vincent Foulon
a483817fc2
Change check for trading NPC
2021-04-07 17:26:19 +02:00
Vincent Foulon
18694b30ad
Use Behavior into Agent
2021-04-07 17:26:12 +02:00
Vincent Foulon
41314e9098
Create Behavior component
2021-04-07 17:21:53 +02:00
Vincent Foulon
5e23c164e6
Add missing translations + Add "enemy_killed" text for villagers
2021-04-07 13:26:15 +02:00
Louis Pearson
f5bc6b43c9
Add default world
build AABB
2021-04-05 07:39:09 -06:00
Marcel
69891f0b70
Merge branch 'login-trim-username' into 'master'
...
login trim username, improve validation, social ordering #1040
Closes #1040
See merge request veloren/veloren!2042
2021-04-04 22:09:16 +00:00
DaforLynx
6734198104
Adds on-hit combat sfx
2021-04-04 03:04:02 +00:00
Sam
27f178286d
Removed all rng matches in code to determine loot tables, and moved to loot tables specific for each sprite, creature, or dungeon.
2021-04-02 23:24:55 -04:00
Sam
9ad5b0f6b7
Changelog. Fixed a few qualities.
2021-04-02 23:04:36 -04:00
Sam
a2906168a6
Moved materials into their own loot tables.
2021-04-02 23:04:33 -04:00
Sam
cb638180f8
Moved food items into their own loot tables.
2021-04-02 23:04:32 -04:00
Sam
31e69021cb
Switched loot tables from declaring each weapon individually to just referencing a different loot table.
2021-04-02 23:04:31 -04:00
Sam
833f1f3309
Converted all armor in loot tables to reference armor set loot tables.
2021-04-02 23:04:28 -04:00
Sam
96b354c178
Consolidated loot tables by switching to CreatureMaterial where possible
2021-04-02 23:04:27 -04:00
Sam
ab2fca21cf
Fixed trading
2021-04-02 23:04:26 -04:00
Sam
cbca2a66b6
Support for creature specific materails and materials having a quantity.
2021-04-02 23:04:25 -04:00
Sam
247004d180
Loot tables can now recursively specify loot tables. Mercahnts broken.
2021-04-02 23:04:25 -04:00
Marcel
3b7e3f8e74
Merge branch 'vfoulon80/trading-dialogues' into 'master'
...
Add dialogue when the Merchant is busy and randomize some trading dialogues
See merge request veloren/veloren!2038
2021-04-01 18:08:44 +00:00
Vincent Foulon
dcde8df365
address review comments
2021-04-01 19:13:08 +02:00
aljazerzen
08146f6a3a
login trim username, improve validation, social ordering
2021-04-01 16:43:27 +02:00
aljazerzen
8ac879e4c1
after leaving group, issue warning instead of changing chat mode
2021-04-01 15:43:50 +02:00
aljazerzen
dae8515590
after leaving a group, set chat mode to world
2021-04-01 15:43:05 +02:00
Vincent Foulon
c2a8feada5
Add dialogue when the Merchant is busy and randomize some trading dialogues
2021-03-31 19:06:41 +02:00
Avi Weinstock
0122dca3c3
Allow fast stacking into and out of a trade with {ctrl,shift} click.
...
Shift click goes 1 at a time, Ctrl click automatically balances the trade w.r.t. that quantity.
2021-03-30 18:39:10 -04:00
Marcel
895de16dd6
Merge branch 'james/fix-merchant-wander' into 'master'
...
Fix merchant wandering
See merge request veloren/veloren!2035
2021-03-30 10:52:42 +00:00
Marcel
5ccbfba8fe
Merge branch 'xMAC94x/terrainoptimisation' into 'master'
...
if more than 1 player is in the area of a newly created chunk, skip additional copies
See merge request veloren/veloren!2030
2021-03-30 08:27:13 +00:00
James Melkonian
8e522596a5
Fixed merchant wandering
2021-03-29 17:27:56 -07:00
Samuel Keiffer
12ec46c572
Merge branch 'sam/mindflayer-balancing' into 'master'
...
Mindflayer balance tweaks.
See merge request veloren/veloren!2031
2021-03-29 21:05:49 +00:00
Vincent Foulon
a35fa19409
Implement a basic dialogue system
2021-03-29 14:47:42 +00:00
Sam
71ba9b6a54
Mindflayer balance tweaks.
2021-03-29 10:44:46 -04:00
Marcel Märtens
fdd1eac6ed
if more than 1 player is in the area of a newly created chunk, skip additional copies
2021-03-29 12:21:07 +02:00
Snowram
c8e191e138
Merge branch 'snowram/new-scepters-starves' into 'master'
...
Add new batch of starves and scepter (by Gemu)
See merge request veloren/veloren!2022
2021-03-29 00:08:19 +00:00
Snowram
5295894105
Add new batch of starves and scepter (by Gemu)
2021-03-29 01:27:55 +02:00
Marcel Märtens
6e77028605
make msg::terrain parallel via rayon, we parallelize over the number of clients, so this is a change servers with more than 1 player profit from.
2021-03-28 21:08:40 +02:00
Treeco
8c2a5559d3
Move common code out into function
2021-03-28 18:22:47 +01:00
Treeco
ab596d2ae8
New default world map, default continent scale doubled
2021-03-28 17:07:38 +01:00
Treeco
12cf8847c8
Added command to teleport to sites by name
2021-03-28 17:02:17 +01:00
Treeco
24763972ea
Added spawn_town server setting
2021-03-28 17:02:17 +01:00
Joshua Barretto
d8117b3b3d
Make caves and rtsim entities scale with map size, more cloud detail
2021-03-28 17:02:16 +01:00
Treeco
8f13750027
Temporarily disable humanoid rtsim entities until their pathfinding is fixed
2021-03-28 14:49:40 +01:00
Sam
f117a57083
Switched to using ForceUpdate to forcefully update the client position after a blink
2021-03-27 21:33:45 -04:00
Sam
b0b114a7f8
Balance tweaks
2021-03-27 21:05:15 -04:00
Sam
6c611d632a
Mindflayer now only summons minions at set thresholds of health.
2021-03-27 21:05:11 -04:00
Sam
f9835e78da
Pets no longer drop loot on death. Code to determine targeting of pets is less hacky and now takes into account alignment of their owner.
2021-03-27 21:05:07 -04:00
Sam
8e4aeff705
Improved mindflayer AI. Tweake some abilities.
2021-03-27 21:05:07 -04:00
Sam
720482d994
Gave mindflayer AI.
...
Fixed particles and made them sync across network.
2021-03-27 21:05:06 -04:00
Sam
a5b7477e96
Added summon minions ability to mindflayer
2021-03-27 21:05:05 -04:00
Sam
30da614e89
Added dimensional door ability for mindflayer
2021-03-27 21:05:05 -04:00
Marcel Märtens
c77446a014
fix some tracy only and no default features
2021-03-27 18:24:10 +01:00
Marcel Märtens
88b191dbbb
track state tick in a historgram too
2021-03-27 18:24:10 +01:00
Louis Pearson
ad0396d9f4
Use made_valid instead of min/max
2021-03-27 08:17:26 -06:00
Louis Pearson
165065725e
Add build_area_list command
...
* Reworks CanBuild to use HashSet
* Removes player argument from build permission, use sudo instead
2021-03-27 07:54:02 -06:00
Louis Pearson
21f794f84c
Use Depot instead of Store for BuildArea
2021-03-27 07:54:02 -06:00
Louis Pearson
f08c4e6585
Add commands to manage build areas
2021-03-27 07:54:02 -06:00
Louis Pearson
77d48657c6
Store build areas outside of CanBuild component
2021-03-27 07:54:02 -06:00
Louis Pearson
120a0cd9a7
Limit build mode to bounding box
2021-03-27 07:54:02 -06:00
Louis Pearson
eade0540b2
Add permit_build
command
...
This commit separates permission to build from building mode, allowing
build to become a NoAdmin command (since players will first need
permission from an Admin to enter build mode)
2021-03-27 07:54:02 -06:00
Marcel
da5c73c84b
Merge branch 'refactor-login' into 'master'
...
refactor handling of duplicate login #1015
Closes #1015
See merge request veloren/veloren!1992
2021-03-27 13:49:09 +00:00
aljazerzen
0e71af92f1
cleanup login provider
2021-03-27 13:29:17 +01:00
aljazerzen
0c8448517e
move already-logged-in check to register
2021-03-26 11:41:03 +01:00
Marcel Märtens
01c82b70ab
network scheduler and rawmsg cleanup
2021-03-26 08:57:42 +01:00
aljazerzen
0ea102dc9c
refactor handling of duplicate login
2021-03-25 12:33:56 +01:00
Avi Weinstock
8d90548331
Get SitePricing information to clients, and use it to display coin-denominated prices in voxygen on tooltips during a trade. Also boost merchant spawn rate slightly.
2021-03-25 02:11:58 -04:00
Marcel
28952f6d7b
Merge branch 'aweinstock/agent-retargetting' into 'master'
...
In `agent::Sys`, perform target selection periodically to avoid agents going...
See merge request veloren/veloren!1985
2021-03-24 22:22:04 +00:00
Avi Weinstock
650d1709d0
Address MR 1987 review comments.
2021-03-24 16:09:12 -04:00
Avi Weinstock
c4a6875133
Fix airships getting stuck in trees and campfires spawning too close to new-style dungeon stairs.
2021-03-24 15:42:37 -04:00
Avi Weinstock
ebc8e945d4
In agent::Sys
, perform target selection periodically to avoid agents going after their target too singlemindedly.
2021-03-23 23:00:05 -04:00
Avi Weinstock
19ea0c3f21
Fix expect-panic on failed UID lookups in inventory_manip
.
2021-03-23 19:04:21 -04:00
Avi Weinstock
75f1b0f5e0
Remove level
from create_ship
and CreateShip
.
2021-03-23 10:44:42 +01:00
Avi Weinstock
deb9358c3a
Add ServerEvent::CreateShip
, and use it instead of CreateNpc
for RtSim airships.
2021-03-23 10:44:37 +01:00
Avi Weinstock
49f39fb752
Make more systems work with an optional health component, to allow disabling health on rtsim airships (so that players can't hammer them out of the sky).
2021-03-23 10:44:32 +01:00
Avi Weinstock
e2a74c5e5c
Enable RtSim airships.
2021-03-23 10:44:22 +01:00
Marcel
f895b95bbe
Merge branch 'aweinstock/fix-agenttrade-acceptspam' into 'master'
...
Make merchants not virtually spamclick accept.
See merge request veloren/veloren!1976
2021-03-23 09:39:40 +00:00
Avi Weinstock
833ab7f1a8
Make merchants not virtually spamclick accept.
2021-03-22 22:53:53 -04:00
heydabop
0e3f7625a9
Fix #962 - kick old client and add new client on duplicate login
2021-03-22 19:15:24 -05:00
Marcel Märtens
6b23101fac
update toolchain to nightly-2021-03-22
2021-03-22 16:41:04 +01:00
Marcel
dc4570def5
Merge branch 'sharp/texture-atlases' into 'master'
...
Enable allocation of new textures on atlas allocation failure.
See merge request veloren/veloren!1949
2021-03-22 04:35:41 +00:00
Samuel Keiffer
1374900928
Merge branch 'sam/combat-fixes' into 'master'
...
Fixes gaining combo by shooting loot bag
See merge request veloren/veloren!1953
2021-03-22 02:01:22 +00:00
Joshua Barretto
7ae4230dc8
Merge branch 'zesterer/pick' into 'master'
...
Pickaxe
See merge request veloren/veloren!1959
2021-03-22 00:19:42 +00:00
Joshua Barretto
6ea5aa796b
Faster pick, less vibrant block selection
2021-03-21 20:38:08 +00:00
Joshua Barretto
fb3980e273
Outcome for block destruction, take select_pos from ControllerInputs
2021-03-21 20:10:05 +00:00
Marcel
983523c463
Merge branch 'vfoulon80/climbing-skill' into 'master'
...
Add climbing speed and cost
See merge request veloren/veloren!1950
2021-03-21 18:35:44 +00:00
Joshua Barretto
b45df7fe10
Switched to BasicMelee
2021-03-21 17:45:01 +00:00
Joshua Barretto
347e1022a0
Initial implementation of pickaxe
2021-03-21 16:09:16 +00:00
Vincent Foulon
e06870702f
Add skill for swimming speed
2021-03-21 15:58:38 +01:00
Avi Weinstock
1351b9515c
Update fall damage calculations.
2021-03-20 18:46:34 -04:00
Vincent Foulon
8b01abde67
address comments
2021-03-20 22:56:54 +01:00
Sam
92c9e8c477
Fixed gaining combo by shooting loot bags
2021-03-20 16:26:10 -04:00
Vincent Foulon
d0aa68a9d2
Add climbing speed and cost
2021-03-20 17:17:28 +01:00
Joshua Yanovski
866cc79d2e
Enable allocation of new textures on atlas allocation failure.
...
This solves the problem of not being able to set the view distance too
high, especially in pathological cases like giant trees. For
simplicity, we just freeze any atlas where allocation failed and start
allocating to a new texture and atlas, letting reference counting
destroy the old one when there are no more references to it. Because of
the spatial locality of chunk allocations, chunks allocated together
will virtually always have similar lifetimes, so the odds of this
causing significant fragmentation are very low, meaning this simple
solution should not do much worse than a much fancier one.
2021-03-20 16:21:41 +01:00
Marcel Märtens
2733ba2e27
Change the version number to 0.9
2021-03-20 13:07:09 +01:00
Marcel
eabddd7263
Merge branch 'christof/trading_fix2' into 'master'
...
fix merchant getting stuck in non-existant trade when declining after accepting
See merge request veloren/veloren!1941
2021-03-19 09:29:45 +00:00
Christof Petig
fb40cd93a9
fix merchant getting stuck in non-existant trade when declining after accepting
2021-03-19 00:43:23 +01:00
Avi Weinstock
a770ef0f4a
Fix agent flight by enabling flight mode at the start of each tick of the agent system.
2021-03-18 18:54:23 -04:00