Commit Graph

1386 Commits

Author SHA1 Message Date
maxicarlos08
8d3cd277b9 Merge branch 'jcoxeye/price-entries' into 'master'
Lots of price entries for miscellaneous items

See merge request veloren/veloren!4231
2024-01-24 06:57:07 +00:00
maxicarlos08
ef84ab6603 Merge branch 'jcoxeye/item-tiering-fixes' into 'master'
Adjusted tiers of various items

See merge request veloren/veloren!4249
2024-01-23 21:58:14 +00:00
JCoxeye
d017844416 Adjusted tiers of various items 2024-01-23 21:58:14 +00:00
JCoxeye
3207df3762 Rebalances, and moved sandals to cloth armor loot table, in line with other starter armor. 2024-01-23 16:46:24 -05:00
do-no-van
8c5759cb5e balance sword abilities 2024-01-21 20:18:19 +00:00
Illia Denysenko
5137966940 Merge branch 'evgenkot/follow-up-processing-of-i18n-items' into 'master'
i18n items processing

See merge request veloren/veloren!4260
2024-01-21 18:45:08 +00:00
evgenkot
7fb8506565 Split i18n items by category 2024-01-21 21:29:27 +05:00
evgenkot
799d636833 Change names of items with the same vox descriptor
| old | new |
|-|-|
| object-key_rusty-0-ancient | object-key_quarry_ancient |
| object-key_rusty-0-backdoor | object-key_quarry_backdoor |
| items-keeper_goggle | object-key_quarry_keeper_goggle_left |
| items-keeper_goggle-flamekeeper_right | object-key_quarry_keeper_goggle_right |
| object-key_rusty-0-overseer | object-key_quarry_overseer |
| object-key_rusty-0-smelting | object-key_quarry_smelting |
| weapon-staff-firestaff_starter | weapon-staff-firestaff_humble_stick |
| weapon-staff-firestaff_starter_gnarled | weapon-staff-firestaff_starter |
| weapon-hammer-2hhammer_rusty-starter_hammer | weapon-hammer-2hhammer_starter |
| armor-misc-chest-worker_green-worker_orange_0 | armor-misc-chest-worker_orange_0 |
| armor-misc-chest-shirt_white-worker_orange_1 | armor-misc-chest-worker_orange_1 |
| armor-misc-chest-worker_green-worker_purple_0 | armor-misc-chest-worker_purple_0 |
| armor-misc-chest-shirt_white-worker_purple_1 | armor-misc-chest-worker_purple_1 |
| armor-misc-chest-worker_green-worker_red_0 | armor-misc-chest-worker_red_0 |
| armor-misc-chest-shirt_white-worker_red_1 | armor-misc-chest-worker_red_1 |
| armor-misc-chest-worker_green-worker_yellow_0 | armor-misc-chest-worker_yellow_0 |
| armor-misc-chest-shirt_white-worker_yellow_1 | armor-misc-chest-worker_yellow_1 |
| armor-misc-back-backpack-backpack | armor-misc-back-backpack-traveler |
| armor-tabard_admin-admin | armor-tabard-admin_tabard |
| armor-misc-back-admin-admin_back | armor-misc-back-admin_back |
| weapon-sword-frost-1-admin_sword | weapon-sword-frost-admin_sword |
| armor-velorite_battlemage-belt-cultist_belt | armor-velorite-belt |
| armor-velorite_battlemage-foot-cultist_boots | armor-velorite-boots |
| armor-velorite_battlemage-chest-cultist_chest_blue | armor-velorite-chest |
| armor-velorite_battlemage-hand-cultist_hands_blue | armor-velorite-hands |
| armor-velorite_battlemage-pants-cultist_legs_blue | armor-velorite-legs |
| armor-velorite_battlemage-shoulder-cultist_shoulder_blue | armor-velorite-shoulder |
| armor-velorite_battlemage-back-dungeon_purple | armor-velorite-back |
| weapon-bow-velorite-velorite_bow_debug | weapon-bow-velorite-debug |
| sprite-mineral-ore-coal | sprite-mineral-stone-coal |
| sprite-mineral-ore-coal-coal | sprite-mineral-ore-coal |
| sprite-crafting_ing-animal_misc-grim_eyeball | sprite-crafting_ing-animal_misc-cyclops_eyeball |
| sprite-crafting_ing-animal_misc-grim_eyeball-grim_eyeball | sprite-crafting_ing-animal_misc-grim_eyeball |
| object-potion_red-potion_big | object-potion_big |
| object-potion_red-potion_med | object-potion_med |
| object-potion_red-potion_minor | object-potion_minor |
| sprite-flowers-sunflower_1-yellow | sprite-flowers-yellow |
2024-01-21 21:21:10 +05:00
maxicarlos08
83a24acc1e
Add charm animation 2024-01-21 15:00:06 +01:00
Sam
95835887e1
Charms now have crafting recipes. 2024-01-21 15:00:06 +01:00
Samuel Keiffer
3224bc5147 Merge branch 'crabman/earthsplitter-nerf' into 'master'
earthsplitter nerf

See merge request veloren/veloren!4264
2024-01-20 18:30:55 +00:00
flo
48a79b3e78 haniwa 2024-01-20 17:45:23 +00:00
Maxicarlos08
d30fed3961
earthsplitter nerf 2024-01-20 18:32:29 +01:00
juliancoffee
d3fcade857 Rename ItemL10n to ItemI18n 2024-01-16 19:14:14 +02:00
juliancoffee
7228543fbf Mark legacy item asset content 2024-01-14 21:25:15 +02:00
juliancoffee
28b400825e Add item localization assets 2024-01-14 21:25:15 +02:00
juliancoffee
b8e6840bf6 Enhance /kit all
- "all" is now in proposed completions
- `/kit all` gives all imaginable items, it's not limited to assets
  anymore
2024-01-14 21:25:15 +02:00
JCoxeye
be951e747c Merge branch veloren:master into jcoxeye/price-entries 2024-01-11 14:21:23 +00:00
Hrom
88c5a2e009 renamed twiggy shoulders 2024-01-09 23:54:32 +00:00
Pybit
f6204f9d04 Merge branch 'master' into 'More-potions'
# Conflicts:
#   CHANGELOG.md
2024-01-04 11:48:30 +00:00
Sam
f65d449aa3 Deprecated combo melee character state 2023-12-28 19:02:10 -05:00
JCoxeye
49994af136 Added glacial crystal to unsellable_materials.ron, and buffed price of boreal armor by 5x. 2023-12-27 08:34:27 -05:00
JCoxeye
0f46eeaa78 Added price entries for glass and bone dungeon keys to collection.ron, and listed their good type as default in trade_pricing.rs 2023-12-27 07:59:03 -05:00
JCoxeye
41bec15bc5 Added price entries for blue falcon, moonrise glider, and eerie pumpkin lantern to collection.ron, and added price entries for liana kit and heavy seabag to misc_armor. 2023-12-27 07:59:03 -05:00
JCoxeye
3f747b5ab3 Reverted grim salvager loot table changes, added bandanas and hoods to misc_armor, and roughly adjusted file weighting accordingly. 2023-12-27 07:59:02 -05:00
JCoxeye
3dc2c04491 Reduced price of abyssal heart. 2023-12-27 07:59:02 -05:00
JCoxeye
9334c7a2f9 Added price entries for coral, brinestone, abyssal hearts, and pearls in unsellable_materials. 2023-12-27 07:59:01 -05:00
JCoxeye
a7562b1baf Added a loot table in assets/common/trading for misc_armor, containing a variety of assorted armor. 2023-12-27 07:59:01 -05:00
JCoxeye
5c90797ee1 Moved grim salvager armor drops to their own loot table, and gave said loot table a price entry. 2023-12-27 07:59:00 -05:00
JCoxeye
853165e465 Added price entries for cultist and boreal armor loot tables. Removed redundant jewellery price table. 2023-12-27 07:59:00 -05:00
flo
c123bdaef5 various_small_fixes 2023-12-27 07:30:22 +00:00
Jeffrey Cox
31c04f1ffb Small leather pouches salvage into simple leather as opposed to thick leather 2023-12-25 21:55:41 +00:00
Christof Petig
5af8c4687e Merge branch 'christof/christmas23' into 'master'
Christmas theme revival

See merge request veloren/veloren!4209
2023-12-20 17:02:01 +00:00
flo
ecde64a30f Merge branch 'jcoxeye/resin-seeds-embers-selling' into 'master'
Gave prices to resin, sentient seeds, and living embers in unsellable_materials.ron

See merge request veloren/veloren!4212
2023-12-17 22:49:56 +00:00
flo
6f5e385d2a poise_resilience_buffs_for_dagon_and_wyverns 2023-12-17 20:12:13 +00:00
JCoxeye
00434f55c9 Gave prices to resin, sentient seeds, and living embers in unsellable_materials.ron 2023-12-17 12:41:27 -05:00
flo
569ab5c5ed crustacean-skeleton and crab 2023-12-16 13:47:55 +00:00
Christof Petig
9b485456eb Calendar based gear for villagers 2023-12-14 16:31:48 +01:00
Neras
10513091e0 added 10 armor stat for cobalt and bloodstone sets 2023-12-08 14:40:42 +00:00
HEIEnthusiast
933c897450 Renamed to potion of agility, burning potion to combustion 2023-12-05 14:15:54 -04:00
HEIEnthusiast
99b5571fd8 Renamed swiftness to retreating, changed model 2023-12-05 13:09:14 -04:00
HEIEnthusiast
76b2d7d0e0 Recipe change 2023-11-29 06:56:35 -04:00
HEIEnthusiast
4659a66cfe Further tweaks 2023-11-29 06:43:46 -04:00
HEIEnthusiast
cc013d7b77 Changing values 2023-11-29 06:25:20 -04:00
HEIEnthusiast
a01d7485e4 Small speed tweak 2023-11-28 11:43:12 -04:00
HEIEnthusiast
5001c4a262 Added swiftness debuffs 2023-11-28 11:41:29 -04:00
HEIEnthusiast
db71625226 Merge branch 'master' of gitlab.com:veloren/dev/veloren into More-potions 2023-11-28 10:07:00 -04:00
HEIEnthusiast
568d12cdd0 Swiftness potion changes 2023-11-28 10:03:07 -04:00
Michał
14120232a0 Phoenix overhaul 2023-11-28 11:13:18 +00:00
maxicarlos08
c7ee737fef
Add hit_timing to BasicMelee 2023-11-27 21:28:12 +01:00