42 Commits

Author	SHA1	Message	Date
jake	c015acb653	Merge branch 'master' into shop_sell	2021-12-29 00:11:29 -07:00
jake	a6e50555de	appease the clip	2021-12-28 01:37:24 -07:00
jake	22f630f562	properly set item_id after a trade serverside	2021-12-28 01:08:44 -07:00
jake	6bd341cd01	check inventory has enough space to accept traded items	2021-12-12 15:55:24 -07:00
jake	d85ada945e	add some functions to Inventory	2021-12-10 13:16:18 -07:00
jake	82ef5ba2ea	RIP ItemLocation ... fun while it lasted ItemLocation ceased to be the canonical place to store an item's location. replaced with ItemNote which basically covers the actual use case but without the enforcing of a location.	2021-11-12 10:42:33 -07:00
jake	d80d0fb01d	add some functions to Inventory	2021-10-14 00:22:23 -06:00
jake	296d1cc0ea	InventoryItem::{stacked, mag}	2021-10-13 23:58:32 -06:00
andy	b60463eaa0	appease the clip	2021-07-31 02:21:15 +00:00
andy	66d882d336	cleanup todos	2021-07-31 02:07:41 +00:00
andy	61e7e8b39f	add impl From<> for shops. get_sell_price returns Result now.	2021-07-31 01:28:30 +00:00
andy	1eff61629a	andy vs. clippy round 2	2021-06-21 18:32:02 +00:00
andy	fbc68c7a26	handle selling photon tools and untekked weapon test	2021-06-21 17:08:55 +00:00
andy	78c0ffda04	andy vs. clippy round 1	2021-06-21 02:17:55 +00:00
andy	10aca8c7ec	wow i should have pushed much smaller chunks more often oops. shop selling added, shop buying quantity bug fixed(?) added lots of todos	2021-06-21 02:17:54 +00:00
jake	1b506e014f	clean up last of normal warnings	2021-06-18 20:38:29 -06:00
jake	3457996afd	lint src/ship/items/*	2021-06-18 16:09:35 -06:00
jake	bbe22a305a	properly handle an error that doesn't even occur at the moment	2021-06-18 02:11:52 -06:00
jake	d263bf4caa	remove item from inventory by id	2020-12-03 15:01:00 -07:00
jake	5345939b1b	IndividualInventoryItem::weapon	2020-12-03 15:00:38 -07:00
jake	c437c3da5b	split this into individual/individual_mut	2020-12-02 22:51:36 -07:00
jake	6e2fab31f0	e q u i p r e f a c t o r	2020-11-09 16:47:19 -07:00
jake	7ae8976c10	i t e m r e f a c t o r	2020-11-05 16:36:39 -07:00
andy	34cf660cbd	dont make new inventory	2020-11-01 19:54:50 -04:00
andy	a95bcf35c8	andypls	2020-10-28 20:15:00 -03:00
andy	67e96d33db	why did i shuffle this	2020-10-28 20:12:42 -03:00
andy	f3e7599975	some comments and tests	2020-10-26 23:15:04 -03:00
andy	555171d11d	server unequips units now. formatting and cleanup unuseds. fix merge conflict	2020-10-26 23:14:06 -03:00
andy	6c33c7ec9b	dont delete items when unequipping	2020-10-26 23:05:25 -03:00
jake	a148d96adc	slots need to be updated when an item leaves inventory	2020-10-07 19:24:46 -06:00
jake	64040d55a2	and another!	2020-09-27 18:05:23 -06:00
jake	32d30d38ec	off by one errors sure are nice ... the item gets added to the vec before len is calculated, and since its 0-indexed we want to subtract 1	2020-09-27 17:47:21 -06:00
jake	b0be92cb50	Merge pull request 'mag feeding!' (#207) from mag_feeding into master	2020-09-08 00:00:21 -04:00
jake	d567c50216	mag cells	2020-09-07 08:02:12 -06:00
andy	27a87ffe96	fix esweap type + special numbering. add to other files and tests	2020-09-07 00:39:23 -03:00
jake	50c5699f34	handle mags changing owners	2020-09-02 22:28:21 -06:00
jake	15b4732981	item helper methods	2020-08-31 23:45:40 -06:00
jake	4187e93455	withdraw from bank	2020-07-29 08:34:19 -06:00
jake	1867fee78b	add bank depositing	2020-07-29 08:34:19 -06:00
jake	755ff575cc	probably trying too hard	2020-07-29 08:34:19 -06:00
jake	1474c91dcd	fix warnings	2020-07-19 14:50:52 -06:00
jake	344cfc6dc4	i t e m r e f a c t o r ... also some bank functionality	2020-07-19 14:14:07 -06:00