1954 Commits

Author SHA1 Message Date
Marcel
f41bedc02c Merge branch 'juliancoffee/asset_entity' into 'master'
EntityInfo assetization.

See merge request veloren/veloren!2382
2021-06-14 12:56:28 +00:00
Marcel
76b12eb93d Merge branch 'Veloren_Kisa-master-patch-51169' into 'master'
Не полный перевод навыков, исправлены оригинальные описания и названия.

See merge request veloren/veloren!2432
2021-06-13 21:55:57 +00:00
Marcel
e8d0e8a222 Merge branch 'Veloren_Kisa-master-patch-14791' into 'master'
Полный перевод на русский язык

See merge request veloren/veloren!2434
2021-06-13 21:55:55 +00:00
Marcel
78ba8cd34d Merge branch 'Veloren_Kisa-master-patch-17326' into 'master'
Upload New File

See merge request veloren/veloren!2435
2021-06-13 21:55:53 +00:00
K. Kisa
b744631662 Upload New File 2021-06-13 13:30:42 +00:00
K. Kisa
e8b3dbf72d Полный перевод на русский язык 2021-06-13 13:24:57 +00:00
K. Kisa
1895ef1939 Не полный перевод навыков, исправлены оригинальные описания и названия. 2021-06-13 13:08:52 +00:00
Monty
fe86ef1e96 Cactus Colada
Made cacti lootable
Cactus colada recipe and item
price balance
fmt

 "make it 8 and drop it to 20 or 25? Not really sure tbh"
2021-06-13 13:52:56 +02:00
Marcel
b9347332ed Merge branch 'juliancoffee/item_price_split_consumables' into 'master'
Split consumables to different tables in trading

See merge request veloren/veloren!2415
2021-06-13 11:29:47 +00:00
Forest Anderson
f8dae445aa Merge branch 'juliancoffee/small_fixes' into 'master'
Ranged, Tidal Warrior, spears, assets

See merge request veloren/veloren!2416
2021-06-11 17:46:56 +00:00
juliancoffee
d122c2e9cb revert bow to almost master values 2021-06-11 17:20:46 +03:00
juliancoffee
44cda79992 Nerf recover duration for animal dashes 2021-06-11 16:18:59 +03:00
juliancoffee
60068f161d Make bow more snipy 2021-06-11 15:56:16 +03:00
juliancoffee
9a8ae64f4c adjust staff firebomb 2021-06-11 15:41:38 +03:00
Justin Shipsey
01379ca6dc Update simple_leather.ron 2021-06-11 08:32:49 +00:00
juliancoffee
0940fe6ef5 Balanse fixes
- Make bow charge time even smaller and reduce damage/enery reward a little
- Buff staff firebomb
- Nerf spear dash
- Longer recover time of Tidal shockwaves and less knockback
- Nerf Tidal bubbles
2021-06-11 01:34:33 +03:00
juliancoffee
2764dfbdc8 add new armour and legendary weapons to /kit 2021-06-11 01:33:18 +03:00
juliancoffee
67a03d9cd1 add temporary "middle" skill preset 2021-06-11 01:31:46 +03:00
juliancoffee
fb76c2a4c7 Split consumables to different tables in trading 2021-06-10 16:04:59 +03:00
João Victor Cardoso Kdouk
38ab1e20dc Small fixes to pt_br language. 2021-06-09 14:36:10 +00:00
juliancoffee
72bc681570 Move loot tables to entityconfigs
* Moved all entities in dungeons to assets
2021-06-09 15:37:04 +03:00
juliancoffee
14a99cd0e1 Move body to EntityConfig assets
* currently works only for random and random_with, uses FromStr for
NpcKind
2021-06-09 15:37:04 +03:00
juliancoffee
e6d7b70ee0 remove Mindflayer skillset 2021-06-09 15:37:04 +03:00
juliancoffee
f9575d7df0 Load skillsets from assets
Done:
    support loading from assets in skillset_builder.rs
    entity_config field with skillset asset field
    move every SkillSet config to assets
    tests for skillset assets
    tests for assets in entity configs
2021-06-09 15:37:04 +03:00
juliancoffee
c61cfac20c Post refactoring 2021-06-09 15:37:04 +03:00
juliancoffee
299d660857 Start to load EntityInfo from assets in dungeons
* All enemies in dungeons are now specify loadout_config, name and
main_tool in assets
* Add more variance to the enemies names
2021-06-09 15:37:04 +03:00
juliancoffee
6b487fbadf Split LodoutBuilder::build_loadout
LoadoutBuilder::build_loadout is a function which has four parameters
and 3 of them are Option<>, and although fourth (body) isn't Option<>,
it's optional too because it is used only in some combinations of
another arguments.

Because these combinations produces quirky code flow, it will be better
to split it to different methods.

So we did following changes to remove it and rewrite code that was using it
to use better methods.

* Introduce LoadoutPreset as new LoadoutConfig, currently it's only used
in Summon ability, because SummonInfo uses Copy and we can't specify
String for specifying asset path for loadout.
Everything else is rewritten to use asset path to create loadouts.

* More builder methods for LoadoutBuilder.
Namely:
    - from_default which is used in server/src/cmd.rs in "/spawn" command.
    - with_default_equipment, with_default_maintool to use default
    loadout for specific body
    - with_preset to use LoadoutPreset

* Add new make_loadout field with `fn (loadout_builder, trading_info) -> loadout_builder`
to EntityInfo which allows to lazily construct loadout without
modifying LoadoutBuilder code

* Fix Merchants not having trade site
We had heuristic that if something has Merchant LoadoutConfig - it's
merchant, which can be false, especially if we create Merchant loadout
lazily
As side note, we do same check for Guards and it fails too.

Too fix it, we introduce new agent::Mark, which explicitly specifies
kind of agent for entity

* `LoadoutBuilder::build_loadout` was written in a such way that depending
on main_tool you will have different loadout. Turns out it was this
way only for Adlets though and this behaviour is reproduced by specifying
different loadouts directly in world code.
2021-06-09 15:37:04 +03:00
juliancoffee
1973dcc8d2 Move traveler loadout declaration to asset
* New loadout/world/traveler.ron file to specify traveler loadout
* LoadoutBuilder::with_asset_expect now can use passed rng to choose
items
2021-06-09 15:37:03 +03:00
juliancoffee
dd88aeb2bd Add entity template and make 'loadouts' singular 2021-06-09 15:37:03 +03:00
jshipsey
7c1798d71a small tweaks
t
2021-06-09 01:58:08 -04:00
Sam
c7fbe0580b Fix 2021-06-08 20:12:42 -05:00
jshipsey
9d03211a1a various fixes to items 2021-06-07 21:21:12 -04:00
Christof Petig
a2f12c94bb Enable spinning flax (recipe got overwritten by linen from linen items) 2021-06-07 23:40:25 +02:00
Marcel Märtens
2aea36227f fix swedish ron files 2021-06-07 12:02:02 +02:00
Marcel
69593c234f Merge branch 'master' into 'master'
Update Swedish translation

See merge request veloren/veloren!2380
2021-06-07 09:42:09 +00:00
jshipsey
9817bc59d7 changelog 2021-06-07 11:06:39 +02:00
Sam
58bcf27105 Adressed comments on energy and armor functions. 2021-06-07 11:06:25 +02:00
Snowram
6ee751a9c6 Derive str from Material, better deserialization 2021-06-07 11:03:50 +02:00
jshipsey
0c550516a1 cave adjustments 2021-06-07 11:02:34 +02:00
jshipsey
b03af3b712 finalize stats
t
2021-06-07 11:02:03 +02:00
jshipsey
1892554b21 comment addressing, cave tweaks 2021-06-07 11:01:46 +02:00
jshipsey
5883c8248e tooltip work 2021-06-07 11:01:32 +02:00
jshipsey
63f6f313d0 migration 2021-06-07 11:01:04 +02:00
Snowram
afd43ba3d9 Split tags into material class and material 2021-06-07 11:00:57 +02:00
Snowram
44ba95a836 Add material and armor class tags 2021-06-07 11:00:31 +02:00
jshipsey
44cd8c1bf6 proper recipes, tanning racks, various fixes 2021-06-07 11:00:14 +02:00
jshipsey
7da7c56260 armor stats on chest 2021-06-07 11:00:05 +02:00
jshipsey
287ec0ffe9 more loot tables, overworld ores, more items 2021-06-07 11:00:00 +02:00
jshipsey
df3fa8b073 ore deposits, flower drops 2021-06-07 10:59:50 +02:00
jshipsey
ab09814bd9 cave changes 2021-06-07 10:59:44 +02:00