Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,876 Commits 151 Branches 18 Tags 2.1 GiB
50d85940d8
Commit Graph

986 Commits

Author SHA1 Message Date
jshipsey
786ae39fb4 new entities 2022-02-09 20:10:59 -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
juliancoffee
c1a9e1a1b6 Add rare lanterns 2022-02-08 01:39:32 +02:00
juliancoffee
995b10c247 Add all Travelers 2022-02-08 01:39:26 +02:00
juliancoffee
bb99f7e3b6 Add Traveler0 2022-02-08 01:35:54 +02: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
juliancoffee
0682bfbe14 Add weapons to Husk loadout 2022-02-03 18:02:51 +02:00
Christof Petig
a98b9ad049 normalize loot tables before combining them, take current values for a start 2022-01-31 19:45:38 +01:00
jshipsey
7cac4b4001 myrmidon fix 2022-01-30 02:02:23 -05:00
jshipsey
7827797106 weapon tweaks 2022-01-30 01:10:13 -05:00
jshipsey
4fbd3027a1 new mobs 2022-01-28 02:50:15 -05:00
juliancoffee
e004fba9da Adress review 2022-01-28 00:02:34 +02:00
juliancoffee
9a2fde557c Fix rebase 2022-01-28 00:02:34 +02:00
juliancoffee
5a370cb6f7 Loadout Update: Use 
Delete guard and villager lazy_loadout and use LoadoutKind::Extended
with potions instead
 2022-01-28 00:02:34 +02:00
juliancoffee
7585c8dcc1 Migrate EntityConfig for Loadout update 2022-01-28 00:02:34 +02:00
floppy
2fe8cb965d change SeaCrocodile spawn 2022-01-27 11:34:59 +01:00
floppy
fb316e8f66 SeaCrocodile spawning in tropical Oceans 2022-01-24 19:36:13 +01:00
Samuel Keiffer
7052aad11b Merge branch 'snowram/arthropods' into 'master' 
Snowram/arthropods

See merge request veloren/veloren!3071
 2022-01-20 00:20:24 +00:00
Snowram
a6e396e29a Stunned and jump anims, stats, spawns, more IA work 2022-01-20 00:53:29 +01:00
InfRandomness
dabae7ece8 Remove bomb pile item 2022-01-19 19:31:43 +00: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
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
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
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
roidujeu
a6a825a97f gave speed more weight, reduced equip_time_weight, etc 2022-01-18 10:48:53 +05:30
Sam
b0644ca767 Melee attacks are now created through a melee constructor. 2022-01-17 20:41:24 -05:00
Sam
31a894601f Removed health sclaing from summon character state. 2022-01-16 18:18:23 -05:00
Sam
9b6c76bd3b Removed health scaling that bypasses the skill system. 2022-01-15 11:58:28 -05:00
jshipsey
0e9d50162b last fixes 2022-01-14 00:19:32 -05: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
Sam
c8f8ccdc55 Buffed spin for whatever strange reason 2022-01-12 22:18:59 -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
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
Monty Marz
d72d926341 change merchant backpack visuals and add mining skill icons 2022-01-08 01:57:52 +01:00
Sam
8221336587 Addressed some review. 2022-01-03 19:55:04 -05:00
Youssef Fahmy
9cd87b1af7 Christmas Cleanup 2021-12-30 18:58:15 +00:00
Samuel Keiffer
4d85ae4f60 Merge branch 'ubruntu/dagger-ux' into 'master' 
Dagger UX

See merge request veloren/veloren!3072
 2021-12-28 22:09:34 +00:00
ubruntu
65f9d18fb7 Dagger UX 2021-12-28 22:09:34 +00:00
DoctorKompot
22b19e40e9 updated changelog, fixed lantern colors 2021-12-27 03:01:28 +02:00
DoctorKompot
0dba858ca9 fixed turban specifier in item image manifest, reverted bag size for purified soulkeeper, updated item quality colors in mod files 2021-12-27 03:01:26 +02:00
DoctorKompot
d312452941 changed Magic Lantern kind: to "Magic" 2021-12-27 03:01:24 +02:00
DoctorKompot
0242552492 added mushroom stick, changed apple and apple stick models, made phoenix feather legendary rarity 2021-12-27 03:01:07 +02:00
DoctorKompot
d7ddb3ae04 updated bag displays 2021-12-27 03:00:59 +02:00
DoctorKompot
3c60bd1929 made lanterns slightly brighter, changed lantern color for green and red to match their names, changed display of Common items to fit the item frames of other qualities, updated item image manifest 2021-12-27 03:00:54 +02:00
Youssef Fahmy
04a37ba29c Christmas tweaks 2021-12-21 22:58:41 +00:00
Joshua Barretto
1db00eb255 Fixed bad manifest formatting 2021-12-20 19:52:50 +00:00
Christof Petig
453c4c149e fix more examples and satisfy code quality checks 2021-12-20 18:09:34 +00:00
UncomfySilence
065da20812 + Finished hat offsets for all races 
+ Villagers only wear christmas hat
+ Guards wear boreal_warhelm
+ Gave guards christmas color lanterns
+ Grave_robbers now wear hood and hood_dark too while also dropping them at a higher rate than previously.
+ Christmas event now starts at 20th and goes till 30th of december
+ item_image_manifest.ron manifest fix
+ Created a potential boss loot table which allows the player to get the winter_cap, the boreal_warhelm, polaris lantern, and more blue cheese.
+ Updated hood_dark with another index 17 layer to prevent hair clip.
 2021-12-20 18:06:21 +00:00
UncomfySilence
f9b4b55494 + working on hat offset 2021-12-20 18:06:21 +00:00
floppy
aa81f2522d - add Polaris Lantern, created by Gemu and Uncomfy 2021-12-20 18:06:21 +00:00
UncomfySilence
e70fd8d397 + Added Gemu models 
+ Created manifest files for each
+ Created stats and other needs
+ Changed Event date from (24..=25) to (20..=30)
 2021-12-20 18:06:19 +00:00
UncomfySilence
cd995b5ffe + Added limited event recipe. Can make one diamond with 20 coal. (actual conversion ratio would be around 12.5) 2021-12-20 18:03:52 +00:00
UncomfySilence
d6d55764c4 + Created common.loot_tables.calendar.<seasonal_event> directory for special item drop changes or for potential bosses. 
+ Created common.entity.calendar.<seasonal_event> directory for special entities that spawn exclusively during season event.
+ Added lines to world/src/layer/wildlife.rs for the current events underneath nonevent basis.
+ Attempted organization go brrrrrr
 2021-12-20 18:03:52 +00:00
UncomfySilence
c2bf1a5345 + Created common.loot_tables.event directory for special item drop changes or for potential bosses. 
+ Made yeti boss have a 5% chance to spawn in snow biomes.
+ New yeti entity has ~28.5% chance to drop 1 to 10 exclusive blue cheese, ~57.1% to drop 1 to 3 coal, and ~14.2% chance to drop 1 diamond.
+ Blue cheese heals 60hp over 20 seconds.
+Blue cheese has item_image_manifest and other necessities completed. (Model is current placeholder until Gemu or Hannibal have approved)
 2021-12-20 18:03:52 +00:00
jshipsey
88b4035729 last tweaks 2021-12-16 01:16:51 -05:00
jshipsey
2f2c171a4a cherrypick 2021-12-15 02:55:28 -05:00
James Melkonian
5f6d1c3438 Convert Armor Stats to Options 2021-12-12 00:25:35 +00:00
UncomfySilence
5dca7f9515 + T1 & T4 chest loot table fix 2021-11-20 07:44:23 +01:00
UncomfySilence
f88a3df040 + Rebase and fixes (kill me) 2021-11-18 19:50:32 +01:00
UncomfySilence
2fa0abf23d + Small fix to boss loot table. Boss drops gear from same tier and slight chance from one above. 2021-11-18 19:30:57 +01:00
UncomfySilence
0599726280 + Fixed pathing for coal in T0 boss loot table, was mineral.coal is mineral.ore.coal now 2021-11-18 19:30:57 +01:00
UncomfySilence
77b74091a9 + Reducing attack speed of minions 2021-11-18 19:30:53 +01:00
UncomfySilence
10e6de3e89 + Adjusted damage, crit chance, and attack speed of weapons 
+ Adjusted boss and chest loot table to match it's new intended tier of difficulty while providing an intermediate stage for new players to explore between T0(T1) and T1(T2)
 2021-11-18 19:18:37 +01:00
UncomfySilence
b92d104ca0 + Made sure that abilities in staff simple match abilities in the staff skillset. 
+ If anything happened to chests then no more! (Don't question it)
+ Bosses have a ~4% chance to drop higher tiered gear
+ Organized T2 boss ron
 2021-11-18 19:16:08 +01:00
UncomfySilence
0461178cd8 + Gnarling armor count - 7 previous being 7 
+ Adlet-bow armor count - 39 previous being 62
+ Sahagin armor count - 71 previous being 88
+ Haniwa armor count - 96 previous being 91
+ Myrmidon armor count - 152 previous being 161
+ Although an overall decrease in armor there's an increase in poise res, crit power, energy, and other stats.
+ Gave everything staff an ability set in skillset, and linked them all
 2021-11-18 19:09:18 +01:00
UncomfySilence
518099b92c + Fixing spelling msitake in T0 Boss craftin_ing.sticky_thread to crafting_ing.sticky_thread 2021-11-18 18:50:43 +01:00
UncomfySilence
c1d318f7ee + Reducing attack speed of minions 2021-11-18 18:50:43 +01:00
UncomfySilence
34d3cc836e + Adjusted damage, crit chance, and attack speed of weapons 
+ Adjusted boss and chest loot table to match it's new intended tier of difficulty while providing an intermediate stage for new players to explore between T0(T1) and T1(T2)
 2021-11-18 18:50:39 +01:00
UncomfySilence
90f29ce277 + Made sure that abilities in staff simple match abilities in the staff skillset. 
+ If anything happened to chests then no more! (Don't question it)
+ Bosses have a ~4% chance to drop higher tiered gear
+ Organized T2 boss ron
 2021-11-18 18:49:33 +01:00
UncomfySilence
9e28d889af + Lowered drop rate of extra extra tier armor and weapons from ~1.7% to ~0.8% 
+ Organized T2 boss ron
 2021-11-18 18:46:46 +01:00
UncomfySilence
3debaf2ded + All bosses ranging from T0 to T3 have a ~4% chance of dropping equipment one tier higher than normal, while having a ~1.7% chance to drop equipment even higher than that. 
+ All chests have a ~2% chance to drop better equipment than their tier.
 2021-11-18 18:43:15 +01:00
UncomfySilence
2163dc73b4 + Gnarling armor count - 7 previous being 7 
+ Adlet-bow armor count - 39 previous being 62
+ Sahagin armor count - 71 previous being 88
+ Haniwa armor count - 96 previous being 91
+ Myrmidon armor count - 152 previous being 161
+ Although an overall decrease in armor there's an increase in poise res, crit power, energy, and other stats.
+ Gave everything staff an ability set in skillset, and linked them all
 2021-11-18 18:31:23 +01:00
Monty Marz
ec07dbb05e Merchant Outfit 2021-11-18 16:31:12 +00:00
Youssef Fahmy
871859b09b Smol balance changes 2021-11-16 22:45:59 +00:00
Marcel Märtens
086f9737e4 move server.voxel for airship to common 2021-11-15 16:39:39 +01:00
Marcel Märtens
cd516d0912 name it just manifests rather then tmp_manifests 2021-11-15 09:47:38 +01:00
Marcel Märtens
d24b904563 move ship_manifest to common assets until its properly included in servers ECS and pushed to clients 2021-11-15 09:00:12 +01:00
Joshua Barretto
0f56ebe82b Toned down golf club knockback 2021-11-13 17:13:09 +00:00
Joshua Barretto
dbfbdcdacd Added golf club 2021-11-13 17:11:02 +00:00
Oolnokk
de0072bbc1 Fixed drop chances in village crates to better resemble prior odds 2021-11-12 19:52:09 -05:00
Oolnokk
a71f2204d9 Changed drop location from boars to T2 Chests 2021-11-12 19:34:57 -05:00
Oolnokk
c6383ca5a4 Models have been cleaned up and approved by Gemu 2021-11-12 18:46:01 -05:00
Sam
da677e8ea6 Abilities can now be referred to by the asset id. 2021-11-10 17:30:19 -05:00
UncomfySilence
debbc1e4c6 + Fixed pathing for coal in T0 boss loot table, was mineral.coal is mineral.ore.coal now 2021-11-09 22:40:25 +01:00
UncomfySilence
027664f1c0 + Fixing spelling msitake in T0 Boss craftin_ing.sticky_thread to crafting_ing.sticky_thread 2021-11-09 22:06:36 +01:00
UncomfySilence
7a49f26568 + Reducing attack speed of minions 2021-11-09 22:06:36 +01:00
UncomfySilence
f764ae99c0 + Adjusted damage, crit chance, and attack speed of weapons 
+ Adjusted boss and chest loot table to match it's new intended tier of difficulty while providing an intermediate stage for new players to explore between T0(T1) and T1(T2)
 2021-11-09 22:06:36 +01:00
UncomfySilence
7b5d92f5fb + Made sure that abilities in staff simple match abilities in the staff skillset. 
+ If anything happened to chests then no more! (Don't question it)
+ Bosses have a ~4% chance to drop higher tiered gear
+ Organized T2 boss ron
 2021-11-09 22:06:35 +01:00
UncomfySilence
6b637534f8 + Lowered drop rate of extra extra tier armor and weapons from ~1.7% to ~0.8% 
+ Organized T2 boss ron
 2021-11-09 22:06:35 +01:00
UncomfySilence
84d46314ad + All bosses ranging from T0 to T3 have a ~4% chance of dropping equipment one tier higher than normal, while having a ~1.7% chance to drop equipment even higher than that. 
+ All chests have a ~2% chance to drop better equipment than their tier.
 2021-11-09 22:06:35 +01:00
UncomfySilence
c8e88375c6 + Gnarling armor count - 7 previous being 7 
+ Adlet-bow armor count - 39 previous being 62
+ Sahagin armor count - 71 previous being 88
+ Haniwa armor count - 96 previous being 91
+ Myrmidon armor count - 152 previous being 161
+ Although an overall decrease in armor there's an increase in poise res, crit power, energy, and other stats.
+ Gave everything staff an ability set in skillset, and linked them all
 2021-11-09 22:06:35 +01:00
Youssef Fahmy
6c52d4ca5e Minor edits 2021-11-03 21:27:47 +00:00
jshipsey
913a2725e8 changelog 2021-10-31 01:19:21 -04:00
jshipsey
b1e9d9664b adjust models, last fixes 2021-10-30 23:42:18 -04:00
jshipsey
f69e3c9fbc more hats 2021-10-30 23:42:17 -04:00
jshipsey
a05c1ea4c5 switch to new matcell variant 2021-10-30 23:42:15 -04:00
jshipsey
97a3c1e713 simple hats 2021-10-30 23:42:15 -04:00
jshipsey
5cc54b34bd headbands 2021-10-30 23:42:13 -04:00
Evelyn
91477f7a5c Add new gliders 2021-10-30 20:48:04 +00:00
Sam
f339793911 Buffed staff firebomb a little. 2021-10-29 17:37:07 -04:00
Sam
2b447852fd Added min fall off to explosions. 2021-10-29 17:37:02 -04:00
Sam
111abbc3bc Added salvage tags to items, removed old salvage recipes from recipe book. 2021-10-27 17:02:29 -04:00
Sam
ed5cf8ebf9 Backend stuff for salvaging. 2021-10-27 17:02:29 -04:00
Sam
cac3f00250 Lengendary crit changes. 2021-10-26 20:55:32 -04:00
Kemper
b85f535f3c Add moonweave to the orichalcum cape recipe 
So that the ingredients include some cloth since it’s a cape.
 2021-10-24 23:43:24 +00:00
Samuel Keiffer
5c99ca2a52 Merge branch 'ubruntu/use-stealth-stat' into 'master' 
Use stealth stat on armors

See merge request veloren/veloren!2947
 2021-10-24 05:31:49 +00:00
ubruntu
e6bfce99bb Use stealth stat on armors 2021-10-24 05:31:49 +00:00
Youssef Fahmy
ec62ff3489 Giving T5 cultists maxed skillset 2021-10-23 20:48:07 +00:00
Doctor Kompot
51f8aa06df DoctorKompot - New Necklaces 2021-10-22 05:24:20 +00:00
Youssef Fahmy
dd1d067fde Tiny useless changes 2021-10-18 14:33:31 +00:00
UncomfySilence
ad0a6c7d1f + Adjusted Mino charge to have a higher bleed chance and slightly lower recovery rate. 2021-10-17 15:07:45 +02:00
Sam
6e82d67db5 "Balance" 2021-10-16 17:36:06 -04:00
Sam
42bb4bee15 Minotaur and cultist dungeons now offer roughly equiovalent loot. 
Minotaur now drops tier 5 weapons and armor instead of tier 4
Mindflayer now drops cultist weapons and armor instead of tier 5
Melee legendaries moved to minotaur
Mindflayer now lonly drops ranged legendaries
 2021-10-13 12:24:10 -04:00
Imbris
86bb6f8ef5 Tweaks to the credits.ron file 2021-10-03 16:06:09 -04:00
Imbris
f867991198 Merge branch 'imbris/credits' into 'master' 
Add credits screen

Closes #1296

See merge request veloren/veloren!2872
 2021-10-03 04:26:58 +00:00
Imbris
d2bd62733f Add core devs to the contributors list in credits.ron and remove placeholder entries in empty art sections (in favor of displaying nothing) 2021-10-03 00:06:47 -04:00
Imbris
691b61e22d Add documentation to credits.ron and fill in fonts entries with actual data, add additional entries to Art credits for documenting information relevant to satifying attribution requirements for some licenses, add/rename license files for fonts, center credits text on the credits screen, added asset_path field to associate art credits with the actual asset files and wrote a unit test to ensure that these paths are valid. 2021-09-30 02:35:59 -04:00
Imbris
40240a4005 Add basic credits screen to the main menu with some example data loaded from a ron file 2021-09-29 21:06:52 -04:00
juliancoffee
8af4cf1a37 Make Rtsim entity config work 2021-09-27 15:09:22 +03:00
Sam
70c2e9bebe Cave now uses entity configs. 2021-09-27 15:09:22 +03:00
Sam
56b17e7141 Format fixes. 2021-09-27 15:09:22 +03:00
juliancoffee
2475b97918 Move loot tables to entity configs 2021-09-27 15:09:22 +03:00
juliancoffee
b056cccb0c Hardened loot table handling 
- Rename LootSpec::None to LootSpec::Nothing to not confuse with Option
- Warn on invalid item paths in loot tables
 2021-09-27 15:09:22 +03:00
Sam
09dd9b4813 Changed ItemDrop to use LootSpec 2021-09-27 15:09:22 +03:00
Seth
d42d9166a1 Reduce duplication in glider asset identifiers 2021-09-26 13:49:49 +00:00
Samuel Keiffer
0af6969d19 Merge branch 'sam/energy-float' into 'master' 
Changed energy to a float

See merge request veloren/veloren!2838
 2021-09-25 06:51:21 +00:00
juliancoffee
f82a26e9c5 Don't drop quad_low loot from quad_small fur 2021-09-24 18:03:26 +03:00
Sam
0e5e2b46f2 Changed energy to internally use an integer with a high resolution, and externally to use a float. 2021-09-23 14:11:09 -04:00
Snowram
834749353a Adds flame wyvern npc 2021-09-21 15:30:42 +02:00
juliancoffee
91dd03b745 Clean entity assets for a small bit 
- Move loot_tables/creature/witch to loot_tables/spots/witch
- Move skillset/spots/general_max and skillset/spots/sceptre_max to
  skillset/preset/max/{general,sceptre}
- Remove tabs from dwarf_grave_robber entity config file
 2021-09-17 20:12:42 +03:00
Sam
c4c4318ac0 Fixed fall damage and sceptre regen. 2021-09-14 06:53:01 -04:00
Samuel Keiffer
73d3d3e4bb Merge branch 'sam/health-float' into 'master' 
Turned Health into a Float

See merge request veloren/veloren!2824
 2021-09-13 15:23:18 +00:00
Monty Marz
1d94adc2e1 0.11 Background images and more 2021-09-10 08:34:01 +00:00
Sam
42012fddcb Overhauled health component, making it a float to outer interfaces. 2021-09-09 00:10:17 -04:00
jshipsey
3c623c6801 address comments, boost village pop, lower raid chance 2021-09-06 00:01:26 -04:00
jshipsey
da9585205c buff guards 2021-09-05 23:17:14 -04:00
Joshua Barretto
7538f29b9e Merge branch 'slipped/tweaks' into 'master' 
more spots

See merge request veloren/veloren!2806
 2021-09-04 18:16:10 +00:00
jshipsey
6187cb8d23 address comments 2021-09-04 13:17:56 -04:00
jshipsey
523a15e5cc more spots 2021-09-04 00:18:58 -04:00
Sam
57ba9a0300 Cultist enemies are now spawned by rtsim. 2021-09-04 00:05:48 -04:00
juliancoffee
f88373f7d8 Nerf coin drop from enemies 2021-09-03 01:15:27 +03:00
Sam
daf287a469 Small loot rebalance. 2021-09-01 23:50:17 -04:00
ubruntu
bbc366e1b3 NPCs can drop nothing 2021-09-01 23:17:36 +00:00