873 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
jake	c7a4dff627	Merge pull request 'add cargo.lock' (#84) from cargolock into master ... Reviewed-on: #84	2022-01-03 15:13:52 -05:00
jake	8d2fc5b736	add cargo.lock	2022-01-02 22:24:24 -07:00
jake	6c1ae1a41e	Merge pull request 'shop_sell' (#65) from shop_sell into master ... Reviewed-on: #65	2021-12-29 23:02:31 -05:00
jake	51d706fc65	clippy demands more	2021-12-29 19:04:22 -07:00
jake	0e308c13f7	Merge branch 'master' into shop_sell	2021-12-29 17:54:35 -07:00
jake	ea4c085dfd	satiate the clip's hunger for properness	2021-12-29 15:46:22 -07:00
jake	ed8bcbc812	everything into the inventory	2021-12-29 15:22:28 -07:00
jake	8b776a5906	ok turns out walletfull is a real thing	2021-12-29 15:22:03 -07:00
jake	c015acb653	Merge branch 'master' into shop_sell	2021-12-29 00:11:29 -07:00
jake	612c089833	Merge pull request 'rare_monsters' (#60) from rare_monsters into master ... Reviewed-on: #60	2021-12-29 02:10:50 -05:00
jake	27fcfcc1cc	Merge branch 'master' into rare_monsters	2021-12-28 14:16:05 -07:00
jake	26a2ef6492	Merge pull request 'TRADING YEAH LETS GO' (#80) from trading into master ... Reviewed-on: #80	2021-12-28 13:05:26 -05: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
andy	27a6c9a136	creating rooms with difficulties is bad for selling tests?	2021-12-28 01:22:46 +00:00
andy	7c85199e4c	andy vs. clippy round 3	2021-12-27 19:32:14 +00:00
andy	fef3b94732	cleanup	2021-12-27 19:32:14 +00:00
andy	cd8ebc23a0	imagine being level 0	2021-12-27 19:32:14 +00:00
andy	f29b59507a	don't expect people to remember null in Rust	2021-12-27 19:32:14 +00:00
andy	bb5d157439	missing nuls is too advanced for the client?	2021-12-27 19:32:14 +00:00
andy	dacbf1eea3	add level requirements for rooms and update tests	2021-12-27 19:32:14 +00:00
jake	81916d1f57	TRADING JUST IN TIME TO BARELY MISS XMAS	2021-12-27 00:48:42 -07:00
jake	ecf1f23c6c	fix tests	2021-12-27 00:43:25 -07:00
jake	9c34baeb26	meseta refactor	2021-12-26 23:31:12 -07:00
jake	72d72801e1	trade meseta	2021-12-12 22:55:08 -07:00
jake	3a10de502a	tell other players you don't have meseta when you drop it	2021-12-12 22:33:58 -07:00
jake	872794e45f	improve error messages	2021-12-12 15:55:59 -07:00
jake	6bd341cd01	check inventory has enough space to accept traded items	2021-12-12 15:55:24 -07:00
jake	6d2753d082	improve error display a bit	2021-12-10 23:41:17 -07:00
jake	3b7dcd0295	remove printlns	2021-12-10 13:43:11 -07:00
jake	71ba3c3c3d	forgot to add this migration	2021-12-10 13:25:27 -07:00
jake	b3b6dad6ad	trades!	2021-12-10 13:24:59 -07:00
jake	5d410f88f3	PartialEq LocalClientId u8	2021-12-10 13:20:20 -07:00
jake	3865caba8d	refcell room id counter	2021-12-10 13:19:22 -07:00
jake	d85ada945e	add some functions to Inventory	2021-12-10 13:16:18 -07:00
jake	070735edbf	ItemDetail::tool	2021-12-10 13:15:33 -07:00
jake	d4fc915164	add debug to characterentity	2021-12-10 13:14:50 -07:00
jake	c90c7c1fd3	update anyhow	2021-12-10 13:07:39 -07:00
jake	8b87bd8d7b	fix mag item data	2021-12-02 01:57:30 -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	b80f30ef9d	initial actual trading logic	2021-10-15 12:17:37 -06:00
jake	98260308e8	stray spaces	2021-10-14 00:30:53 -06:00
jake	8e82d6c4b4	convert item pickup to new itemtransaction model	2021-10-14 00:28:31 -06:00
jake	d80d0fb01d	add some functions to Inventory	2021-10-14 00:22:23 -06:00
jake	ddff55d09e	add another item pickup test	2021-10-14 00:20:59 -06:00
jake	ac423fa6ba	change trade structure in clientstate	2021-10-14 00:20:19 -06:00
jake	8a29a75397	remove TODO	2021-10-14 00:17:36 -06:00
jake	6ed0d838d2	add gateway function set_character_meseta	2021-10-14 00:16:22 -06:00
jake	296d1cc0ea	InventoryItem::{stacked, mag}	2021-10-13 23:58:32 -06:00
jake	dbb1105741	cleanup	2021-10-13 23:57:38 -06:00