c015acb653 
							
						 
					 
					
						
						
							
							Merge branch 'master' into shop_sell  
						
						
	
		
			
	 
	
	
		
	
	
		
			
				
	continuous-integration/drone/pr Build is failing 
				
			 
		
			
				
	continuous-integration/drone/push Build is failing 
				
			 
		
		
	 
 
	 
						
						
					 
					
						2021-12-29 00:11:29 -07:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							27fcfcc1cc 
							
						 
					 
					
						
						
							
							Merge branch 'master' into rare_monsters  
						
						
	
		
			
	 
	
	
		
	
	
		
			
				
	continuous-integration/drone/pr Build is passing 
				
			 
		
			
				
	continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						
					 
					
						2021-12-28 14:16:05 -07:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							26a2ef6492 
							
						 
					 
					
						
						
							
							Merge pull request 'TRADING YEAH LETS GO' ( #80 ) from trading into master  
						
						... 
						
						
	
		
			
	 
	
	
		
	
	
		
			
				
	continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #80  
						
						
					 
					
						2021-12-28 13:05:26 -05:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							a6e50555de 
							
						 
					 
					
						
						
							
							appease the clip  
						
						
	
		
			
	 
	
	
		
	
	
		
			
				
	continuous-integration/drone/push Build is passing 
				
			 
		
			
				
	continuous-integration/drone/pr Build is passing 
				
			 
		
		
	 
 
	 
						
						
					 
					
						2021-12-28 01:37:24 -07:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							22f630f562 
							
						 
					 
					
						
						
							
							properly set item_id after a trade serverside  
						
						
	
		
			
	 
	
	
		
	
	
		
			
				
	continuous-integration/drone/push Build is failing 
				
			 
		
			
				
	continuous-integration/drone/pr Build is failing 
				
			 
		
		
	 
 
	 
						
						
					 
					
						2021-12-28 01:08:44 -07:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							27a6c9a136 
							
						 
					 
					
						
						
							
							creating rooms with difficulties is bad for selling tests?  
						
						
	
		
			
	 
	
	
		
	
	
		
			
				
	continuous-integration/drone/push Build is failing 
				
			 
		
			
				
	continuous-integration/drone/pr Build is failing 
				
			 
		
		
	 
 
	 
						
						
					 
					
						2021-12-28 01:22:46 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							7c85199e4c 
							
						 
					 
					
						
						
							
							andy vs. clippy round 3  
						
						
						
						
					 
					
						2021-12-27 19:32:14 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							fef3b94732 
							
						 
					 
					
						
						
							
							cleanup  
						
						
						
						
					 
					
						2021-12-27 19:32:14 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							cd8ebc23a0 
							
						 
					 
					
						
						
							
							imagine being level 0  
						
						
						
						
					 
					
						2021-12-27 19:32:14 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							f29b59507a 
							
						 
					 
					
						
						
							
							don't expect people to remember null in Rust  
						
						
						
						
					 
					
						2021-12-27 19:32:14 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							bb5d157439 
							
						 
					 
					
						
						
							
							missing nuls is too advanced for the client?  
						
						
						
						
					 
					
						2021-12-27 19:32:14 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							dacbf1eea3 
							
						 
					 
					
						
						
							
							add level requirements for rooms and update tests  
						
						
						
						
					 
					
						2021-12-27 19:32:14 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							81916d1f57 
							
						 
					 
					
						
						
							
							TRADING JUST IN TIME TO BARELY MISS XMAS  
						
						
	
		
			
	 
	
	
		
	
	
		
			
				
	continuous-integration/drone/push Build is failing 
				
			 
		
			
				
	continuous-integration/drone/pr Build is failing 
				
			 
		
		
	 
 
	 
						
						
					 
					
						2021-12-27 00:48:42 -07:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							ecf1f23c6c 
							
						 
					 
					
						
						
							
							fix tests  
						
						
	
		
			
	 
	
	
		
	
	
		
			
				
	continuous-integration/drone/push Build is failing 
				
			 
		
		
	 
 
	 
						
						
					 
					
						2021-12-27 00:43:25 -07:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							9c34baeb26 
							
						 
					 
					
						
						
							
							meseta refactor  
						
						
	
		
			
	 
	
	
		
	
	
		
			
				
	continuous-integration/drone/push Build is failing 
				
			 
		
		
	 
 
	 
						
						
					 
					
						2021-12-26 23:31:12 -07:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							72d72801e1 
							
						 
					 
					
						
						
							
							trade meseta  
						
						
	
		
			
	 
	
	
		
	
	
		
			
				
	continuous-integration/drone/push Build is failing 
				
			 
		
		
	 
 
	 
						
						
					 
					
						2021-12-12 22:55:08 -07:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							3a10de502a 
							
						 
					 
					
						
						
							
							tell other players you don't have meseta when you drop it  
						
						
	
		
			
	 
	
	
		
	
	
		
			
				
	continuous-integration/drone/push Build is failing 
				
			 
		
		
	 
 
	 
						
						
					 
					
						2021-12-12 22:33:58 -07:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							872794e45f 
							
						 
					 
					
						
						
							
							improve error messages  
						
						
	
		
			
	 
	
	
		
	
	
		
			
				
	continuous-integration/drone/push Build is failing 
				
			 
		
		
	 
 
	 
						
						
					 
					
						2021-12-12 15:55:59 -07:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							6bd341cd01 
							
						 
					 
					
						
						
							
							check inventory has enough space to accept traded items  
						
						
						
						
					 
					
						2021-12-12 15:55:24 -07:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							6d2753d082 
							
						 
					 
					
						
						
							
							improve error display a bit  
						
						
	
		
			
	 
	
	
		
	
	
		
			
				
	continuous-integration/drone/push Build is failing 
				
			 
		
		
	 
 
	 
						
						
					 
					
						2021-12-10 23:41:17 -07:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							3b7dcd0295 
							
						 
					 
					
						
						
							
							remove printlns  
						
						
						
						
					 
					
						2021-12-10 13:43:11 -07:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							71ba3c3c3d 
							
						 
					 
					
						
						
							
							forgot to add this migration  
						
						
	
		
			
	 
	
	
		
	
	
		
			
				
	continuous-integration/drone/push Build is failing 
				
			 
		
		
	 
 
	 
						
						
					 
					
						2021-12-10 13:25:27 -07:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							b3b6dad6ad 
							
						 
					 
					
						
						
							
							trades!  
						
						
						
						
					 
					
						2021-12-10 13:24:59 -07:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							5d410f88f3 
							
						 
					 
					
						
						
							
							PartialEq LocalClientId u8  
						
						
						
						
					 
					
						2021-12-10 13:20:20 -07:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							3865caba8d 
							
						 
					 
					
						
						
							
							refcell room id counter  
						
						
						
						
					 
					
						2021-12-10 13:19:22 -07:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							d85ada945e 
							
						 
					 
					
						
						
							
							add some functions to Inventory  
						
						
						
						
					 
					
						2021-12-10 13:16:18 -07:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							070735edbf 
							
						 
					 
					
						
						
							
							ItemDetail::tool  
						
						
						
						
					 
					
						2021-12-10 13:15:33 -07:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							d4fc915164 
							
						 
					 
					
						
						
							
							add debug to characterentity  
						
						
						
						
					 
					
						2021-12-10 13:14:50 -07:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							8b87bd8d7b 
							
						 
					 
					
						
						
							
							fix mag item data  
						
						
	
		
			
	 
	
	
		
	
	
		
			
				
	continuous-integration/drone/push Build is failing 
				
			 
		
		
	 
 
	 
						
						
					 
					
						2021-12-02 01:57:30 -07:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							82ef5ba2ea 
							
						 
					 
					
						
						
							
							RIP ItemLocation  
						
						... 
						
						
	
		
			
	 
	
	
		
	
	
		
			
				
	continuous-integration/drone/push Build is failing 
				
			 
		
		
	 
 
	 
						
						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 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							b80f30ef9d 
							
						 
					 
					
						
						
							
							initial actual trading logic  
						
						
	
		
			
	 
	
	
		
	
	
		
			
				
	continuous-integration/drone/push Build is failing 
				
			 
		
		
	 
 
	 
						
						
					 
					
						2021-10-15 12:17:37 -06:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							98260308e8 
							
						 
					 
					
						
						
							
							stray spaces  
						
						
						
						
					 
					
						2021-10-14 00:30:53 -06:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							8e82d6c4b4 
							
						 
					 
					
						
						
							
							convert item pickup to new itemtransaction model  
						
						
	
		
			
	 
	
	
		
	
	
		
			
				
	continuous-integration/drone/push Build is failing 
				
			 
		
		
	 
 
	 
						
						
					 
					
						2021-10-14 00:28:31 -06:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							d80d0fb01d 
							
						 
					 
					
						
						
							
							add some functions to Inventory  
						
						
						
						
					 
					
						2021-10-14 00:22:23 -06:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							ac423fa6ba 
							
						 
					 
					
						
						
							
							change trade structure in clientstate  
						
						
						
						
					 
					
						2021-10-14 00:20:19 -06:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							8a29a75397 
							
						 
					 
					
						
						
							
							remove TODO  
						
						
						
						
					 
					
						2021-10-14 00:17:36 -06:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							6ed0d838d2 
							
						 
					 
					
						
						
							
							add gateway function set_character_meseta  
						
						
	
		
			
	 
	
	
		
	
	
		
			
				
	continuous-integration/drone/push Build is failing 
				
			 
		
		
	 
 
	 
						
						
					 
					
						2021-10-14 00:16:22 -06:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							296d1cc0ea 
							
						 
					 
					
						
						
							
							InventoryItem::{stacked, mag}  
						
						
						
						
					 
					
						2021-10-13 23:58:32 -06:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							dbb1105741 
							
						 
					 
					
						
						
							
							cleanup  
						
						
						
						
					 
					
						2021-10-13 23:57:38 -06:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							21df9a9340 
							
						 
					 
					
						
						
							
							itemtransaction action takes boxed value  
						
						
	
		
			
	 
	
	
		
	
	
		
			
				
	continuous-integration/drone/push Build is failing 
				
			 
		
		
	 
 
	 
						
						
					 
					
						2021-10-13 23:56:42 -06:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							42eb875f8f 
							
						 
					 
					
						
						
							
							split create_item into individual and stacked variants  
						
						
						
						
					 
					
						2021-10-09 01:33:40 -06:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							a2566c8bc7 
							
						 
					 
					
						
						
							
							Merge pull request 'room_join_requirements' ( #49 ) from room_join_requirements into master  
						
						... 
						
						
	
		
			
	 
	
	
		
	
	
		
			
				
	continuous-integration/drone/push Build is failing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #49 
Reviewed-by: jake <jake@sharnoth.com> 
						
						
					 
					
						2021-09-30 21:55:50 -04:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							b374b63cba 
							
						 
					 
					
						
						
							
							nth(0) -> next()  
						
						
						
						
					 
					
						2021-09-27 23:47:19 -06:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							70a6764360 
							
						 
					 
					
						
						
							
							make these a bit more public for tests  
						
						
						
						
					 
					
						2021-09-27 23:46:03 -06:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							55f82b9fce 
							
						 
					 
					
						
						
							
							trace -> info  
						
						
						
						
					 
					
						2021-09-27 23:14:37 -06:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							143ed7ed78 
							
						 
					 
					
						
						
							
							add ItemTransaction struct as begining of item refactor v3  
						
						
						
						
					 
					
						2021-09-27 23:07:21 -06:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							9b78d7ed80 
							
						 
					 
					
						
						
							
							add some Defaults  
						
						
						
						
					 
					
						2021-09-27 23:06:21 -06:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							e18eebb5e9 
							
						 
					 
					
						
						
							
							change armor shop item structs to handle non-0 dfp/evp for selling  
						
						
						
						
					 
					
						2021-08-04 02:37:16 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							ab404d0cae 
							
						 
					 
					
						
						
							
							unit modifier to star value changes  
						
						
						
						
					 
					
						2021-08-04 02:37:16 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							d48494d5b3 
							
						 
					 
					
						
						
							
							update inventory for ingame selling tests  
						
						
						
						
					 
					
						2021-08-04 02:37:16 +00:00