Commit Graph

1370 Commits

Author SHA1 Message Date
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
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
HEIEnthusiast
bb2adfb2e5 Removed strength and regeneration potions 2023-11-27 15:16:44 -04:00
HEIEnthusiast
4d87a9ab44 General potion modifications 2023-11-27 06:57:42 -04:00
HEIEnthusiast
ac4101e70d Changed textures, added strength pot 2023-11-27 06:25:58 -04:00
HEIEnthusiast
0bb74f9efe Added swiftness and regeneration potions 2023-11-26 10:54:02 -04:00
Sam
4e0e94b5c6 Removed spin melee character state 2023-11-16 19:17:38 -05:00
Maxicarlos08
17904d9387 crit_power -> precise_power 2023-11-14 18:07:01 -05:00
Maxicarlos08
1d1b51fa51 Adjust precision power 2023-11-14 18:07:01 -05:00
Sam
62464dbe11 Removed crit chance stat 2023-11-14 18:06:58 -05:00
Samuel Keiffer
9b878586bf Merge branch 'poperigby/fire-potion' into 'master'
Add Burning Potion that applies the Burning effect to the user

See merge request veloren/veloren!4174
2023-11-14 02:00:52 +00:00
PopeRigby
688fd67c33 Add Burning Potion that applies the Burning effect to the user 2023-11-14 02:00:50 +00:00
Samuel Keiffer
fdb28ec2dd Merge branch 'sam/buff-maps' into 'master'
Changed buffs from using hash maps to an enum map and a slot map.

See merge request veloren/veloren!4182
2023-11-14 01:49:49 +00:00
Sam
3f19c61426 Changed buffs from using hash maps to an enum map and a slot map. 2023-11-12 12:37:28 -05:00
Maxicarlos08
7382f70f1e
Re-enable buff stacking for short buffs 2023-11-12 17:17:20 +01:00
Uniior
1d8a23c30e Starter glider. 2023-11-04 22:09:00 +00:00
Maxicarlos08
5f547d62d3
Remove halloween dullahans 2023-10-24 18:34:02 +02:00
Joshua Barretto
5a41d7e33e Added cart, notion of rolling resistance (hacky) 2023-10-21 13:49:04 +01:00