1969 Commits

Author SHA1 Message Date
Snowram
e2b26dc0ef Addresses comments about roc AI 2021-06-15 09:50:23 +02:00
Snowram
e32c103e9a Makes summon range inclusive 2021-06-15 09:49:13 +02:00
Avi Weinstock
a5ff4be601 Make tornado (and empty models in general) work on WGPU. 2021-06-15 09:49:13 +02:00
Snowram
aa62ad8bc0 Tornado summoning attack 2021-06-15 09:49:13 +02:00
Snowram
3df69ba11d Add troll variants and roc npcs 2021-06-15 09:49:13 +02:00
Samuel Keiffer
2218018177 Merge branch 'juliancoffee/swing_fix' into 'master'
Introduce hit_timing for combo_melee

See merge request veloren/veloren!2426
2021-06-15 02:38:23 +00:00
Marcel
6225666050 Merge branch 'aweinstock/forcemove-no-pushback' into 'master'
Don't apply e2e pushback during a forced movement character state.

See merge request veloren/veloren!2429
2021-06-14 14:42:01 +00:00
Marcel
27e0b17651 Merge branch 'aweinstock/mining-skill-tree' into 'master'
Mining skill tree.

See merge request veloren/veloren!2406
2021-06-14 14:19:06 +00:00
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
Monty Marz
8466df5078 mining exp sct color and icon; add mining to skill_preset 2021-06-13 14:34:42 -04:00
Avi Weinstock
4bd989e2a5 Adjust mining xp numbers and add SkillGroupKind information to Outcome::ExpChange. 2021-06-13 14:34:42 -04:00
Monty Marz
c34fa59a08 icons and naming 2021-06-13 14:34:42 -04:00
Avi Weinstock
ef3d5f36d5 Address MR 2406 comments.
- Tweak ore xp values per Slipped's advice.
2021-06-13 14:34:42 -04:00
Avi Weinstock
667e5eb510 Mining skill tree. 2021-06-13 14:34:42 -04: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
Avi Weinstock
c97797a87c Don't apply e2e pushback during a forced movement character state. 2021-06-12 11:10:06 -04:00
juliancoffee
b5e1911930 Introduce hit_timing for combo_melee
bonus: speeding up first swing of sword from 0.15 to 0.1 and reducing
poise damage of hammer from 25 to 20
2021-06-12 14:10:19 +03: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