108 Commits

Author	SHA1	Message	Date
UncomfySilence	85ceae3354	repair recipes for armor pieces	2023-04-06 10:54:50 -04:00
Monty Marz	277a402781	Initial quest window work, spot fixes	2023-03-10 22:16:26 +00:00
Monty Marz	9a025cfcc8	More spot features	2023-03-03 23:21:37 +00:00
flo	bf81ffc029	frost_gigas	2023-02-15 00:10:37 +00:00
Monty Marz	a763a865fe	Musical Instruments part 2	2022-11-10 20:59:53 +00:00
James Melkonian	99d547c7c6	Add unit test to validate recipe keys	2022-10-09 20:50:09 -07:00
Tianyang Zhang	99bedde100	Crafting recipe for black lantern	2022-10-02 17:46:36 +00:00
flo	e882e62c08	seachapel	2022-08-24 21:50:53 +00:00
Chase Rozon	7dcee3eb23	Multiple Balance Tweaks & Miscellaneous Changes	2022-05-19 22:46:31 +00:00
Youssef Fahmy	080d8ef8b1	Tweaks for this week	2022-05-19 19:35:31 +00:00
Sam	cbf5336343	Moved items from 'items.crafting_ing.modular' to 'items.modular.weapon' (assets).	2022-05-16 15:11:45 -04:00
Sam	13ea6dee93	Addressed second round of balance feedback (assets).	2022-05-16 15:11:40 -04:00
Sam	9b078c3383	Addressed playtest feedback (assets).	2022-05-16 15:11:38 -04:00
Sam	d436362a8d	Consolidated crafting UI for the primnary component of modular weapons.	2022-05-16 15:11:21 -04:00
Sam	3702952f99	Added recipes for each material kind.	2022-05-16 15:11:20 -04:00
Sam	1c0154487a	Rebase fixes.	2022-05-16 15:11:18 -04:00
Sam	524845b661	Addressed more comments on MR.	2022-05-16 15:11:15 -04:00
Sam	d7f5b907ff	Gave modular items a pseudo item definition id that can be used when serializing ItemBase or when persisting items to the database. ONLY ASSETS	2022-05-16 15:11:14 -04:00
Sam	2aad3f3961	Switched to item list as an input for modular components so that allowed items could be centralized.	2022-05-16 15:11:08 -04:00
Sam	5acb8cf74e	Rebase conflcits handled.	2022-05-16 15:11:05 -04:00
Sam	b7aa0a7a9f	Rebase commit.	2022-05-16 15:11:04 -04:00
Sam	ca644f8f0b	Added more interesting ingredients to recipes. ... Changed bow main component from held (grip) to damage (limbs).	2022-05-16 15:11:02 -04:00
Sam	21084e48f0	Removed old weapons that were migrated to modular weapons.	2022-05-16 15:11:00 -04:00
Sam	c0ac8891ab	Added initial recipes for bow, staff, and sceptre components.	2022-05-16 15:10:58 -04:00
Sam	762b3be3c3	Modular weapons can now be dropped as loot or assigned to enemies.	2022-05-16 15:10:56 -04:00
Sam	f9256ecd62	Added recipes	2022-05-16 15:10:51 -04:00
Sam	77934c9214	Made changes to crafting to allow modular weapons to work as intended.	2022-05-16 15:10:48 -04:00
Youssef Fahmy	9cd87b1af7	Christmas Cleanup	2021-12-30 18:58:15 +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
James Melkonian	5f6d1c3438	Convert Armor Stats to Options	2021-12-12 00:25:35 +00:00
Monty Marz	ec07dbb05e	Merchant Outfit	2021-11-18 16:31:12 +00:00
Youssef Fahmy	6c52d4ca5e	Minor edits	2021-11-03 21:27:47 +00:00
Evelyn	91477f7a5c	Add new gliders	2021-10-30 20:48:04 +00: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
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
Doctor Kompot	51f8aa06df	DoctorKompot - New Necklaces	2021-10-22 05:24:20 +00:00
Seth	d42d9166a1	Reduce duplication in glider asset identifiers	2021-09-26 13:49:49 +00:00
Monty Marz	14eb0f9aa2	Remove sceptre, add swords	2021-07-29 22:38:35 +00:00
juliancoffee	1e358e6f0c	Make ItemEquality work ... + Create own directory for trade_pricing `assets/common/trading` + Move fictive loot tables there + Mark sellable/non-sellable items in trade_pricing tests	2021-07-05 19:55:08 +03:00
juliancoffee	8b9316a2c6	Change Mortar and Pestle crafting recipe ... - Make it require bowl instead of coconut	2021-07-05 10:56:29 +03:00
juliancoffee	12243bd0c0	Add is_recycling field to recipe book	2021-06-26 21:37:13 +03:00
juliancoffee	3d4eb7d6a4	Dismantle Leather items to Thick Leather ... - Previously both Leather and Rawhide items were dismantled to simple leather	2021-06-26 21:37:13 +03:00
Justin Shipsey	f983295318	Merge branch 'swilliams/jewellery' into 'master' ... Gem Rings and small change to trading. See merge request veloren/veloren!2500	2021-06-26 02:44:04 +00:00
Scott Williams	8d0a1ad7b4	Gem Rings and small change to trading.	2021-06-26 02:44:02 +00:00
Snowram	ef6d6563ea	Ajust new npcs from feedback	2021-06-25 03:26:32 +02:00
jshipsey	0941f03608	buffs to stretch progression	2021-06-16 20:50:46 -04:00
Monty	c17e3ad996	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
Justin Shipsey	7eda90b8f7	Update simple_leather.ron	2021-06-11 08:32:49 +00:00