| 
						
					 | 
					
						
						
						
						
							
						
						
							bd6b8effcd
							
						
					 | 
					
						
						
							
							reorder function
						
						
						
						
						
						
					 | 
					
						2022-07-25 16:41:06 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8c403f0d0e
							
						
					 | 
					
						
						
							
							missed fixing these
						
						
						
						
						
						
					 | 
					
						2022-07-25 16:41:06 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							810d8269af
							
						
					 | 
					
						
						
							
							move drop item over to item_state
						
						
						
						
						
						
					 | 
					
						2022-07-25 16:41:06 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							acdf960d4b
							
						
					 | 
					
						
						
							
							add/move stuff around for itemstate
						
						
						
						
						
						
					 | 
					
						2022-07-25 16:41:06 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b8de2ea8e6
							
						
					 | 
					
						
						
							
							add item_state to ShipState
						
						
						
						
						
						
					 | 
					
						2022-07-25 16:41:06 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1eae3795af
							
						
					 | 
					
						
						
							
							add character_id to ItemNote::PlayerDrop
						
						
						
						
						
						
					 | 
					
						2022-07-25 16:41:06 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							eac0a31056
							
						
					 | 
					
						
						
							
							cool I can simplify this now
						
						
						
						
						
						
					 | 
					
						2022-07-25 16:41:06 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5d6f9deb59
							
						
					 | 
					
						
						
							
							mostly appease clippy
						
						
						
						
						
						
					 | 
					
						2022-07-25 16:41:06 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							da0c75fa39
							
						
					 | 
					
						
						
							
							cleanup
						
						
						
						
						
						
					 | 
					
						2022-07-25 16:41:06 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							916bb31671
							
						
					 | 
					
						
						
							
							move item state action functions to new file
						
						
						
						
						
						
					 | 
					
						2022-07-25 16:41:06 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e58aff7042
							
						
					 | 
					
						
						
							
							remove boxes from ItemStateAction structs to remove need for static lifetimes
						
						
						
						
						
						
					 | 
					
						2022-07-25 16:41:06 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3d51b3ee57
							
						
					 | 
					
						
						
							
							don't need static for with_transaction
						
						
						
						
						
						
					 | 
					
						2022-07-25 16:41:06 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							da066a3445
							
						
					 | 
					
						
						
							
							move EntityGatewayTransaction to end of file
						
						
						
						
						
						
					 | 
					
						2022-07-25 16:41:06 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7aa4a6394f
							
						
					 | 
					
						
						
							
							cleanup
						
						
						
						
						
						
					 | 
					
						2022-07-25 16:41:06 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							bdfcb5c0ad
							
						
					 | 
					
						
						
							
							redundant bit of code
						
						
						
						
						
						
					 | 
					
						2022-07-25 16:41:06 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3c8a35de83
							
						
					 | 
					
						
						
							
							remove unused use
						
						
						
						
						
						
					 | 
					
						2022-07-25 16:41:06 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e337852d72
							
						
					 | 
					
						
						
							
							initial ItemState
						
						
						
						
						
						
					 | 
					
						2022-07-25 16:41:06 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							bc702375d2
							
						
					 | 
					
						
						
							
							redo this cause entitygateway isnt Clone anymore
						
						
						
						
						
						
					 | 
					
						2022-07-25 16:41:06 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							cbb5c1fffd
							
						
					 | 
					
						
						
							
							add transactions!
						
						
						
						
						
						
					 | 
					
						2022-07-25 16:41:06 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a2e78014ee
							
						
					 | 
					
						
						
							
							make all entitygateway functions take &mut self, move postgres functions to separate function for future use
						
						
						
						
						
						
					 | 
					
						2022-07-25 16:41:06 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4e1c6300d4
							
						
					 | 
					
						
						
							
							update sqlx
						
						
						
						
						
						
					 | 
					
						2022-07-25 16:41:06 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a26fbe1c68
							
						
					 | 
					
						
						
							
							Merge pull request 'the final itemrefactor (probably)' (#113) from peak_itemrefactor into master
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is failing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #113 
						
						
					 | 
					
						2022-07-20 02:12:54 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5b9ae1e9cc
							
						
					 | 
					
						
						
							
							put proper error strings on this struct
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
			
				
	
				continuous-integration/drone/pr Build is passing 
				
			 
		
		
	 
 
	 
						
						
					 | 
					
						2022-07-19 23:01:18 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							df135e1c3c
							
						
					 | 
					
						
						
							
							split actions into actions+tasks
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
			
				
	
				continuous-integration/drone/pr Build is passing 
				
			 
		
		
	 
 
	 
						
						
					 | 
					
						2022-07-19 21:26:00 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							24639496da
							
						
					 | 
					
						
						
							
							move bank code out of state
						
						
						
						
						
						
					 | 
					
						2022-07-19 20:48:55 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							414b3d2ce5
							
						
					 | 
					
						
						
							
							move floor code out of state
						
						
						
						
						
						
					 | 
					
						2022-07-19 20:06:43 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0fa3f4ea19
							
						
					 | 
					
						
						
							
							move inventory code out of state
						
						
						
						
						
						
					 | 
					
						2022-07-19 19:39:58 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							60802d3377
							
						
					 | 
					
						
						
							
							move ItemStateAction to its own file
						
						
						
						
						
						
					 | 
					
						2022-07-19 19:04:53 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f5968582b1
							
						
					 | 
					
						
						
							
							missed a thing
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/pr Build is passing 
				
			 
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						
					 | 
					
						2022-07-19 14:30:14 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							bde70011cc
							
						
					 | 
					
						
						
							
							appease clippy, the tyrant
						
						
						
						
						
						
					 | 
					
						2022-07-19 14:24:35 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							25e793cda9
							
						
					 | 
					
						
						
							
							remove old item manager code
						
						
						
						
						
						
					 | 
					
						2022-07-19 14:24:34 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8f44ca9d18
							
						
					 | 
					
						
						
							
							refactor tekking
						
						
						
						
						
						
					 | 
					
						2022-07-19 14:23:57 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4a6bd47c9e
							
						
					 | 
					
						
						
							
							add postgres trade stuff
						
						
						
						
						
						
					 | 
					
						2022-07-19 14:23:57 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							eb0689a1fe
							
						
					 | 
					
						
						
							
							enemy drop refactor
						
						
						
						
						
						
					 | 
					
						2022-07-19 14:23:57 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2a7b43df83
							
						
					 | 
					
						
						
							
							fix some meseta-taking things
						
						
						
						
						
						
					 | 
					
						2022-07-19 14:23:57 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6631468871
							
						
					 | 
					
						
						
							
							trade refactor
						
						
						
						
						
						
					 | 
					
						2022-07-19 14:23:56 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a9cbd9fba1
							
						
					 | 
					
						
						
							
							selling items
						
						
						
						
						
						
					 | 
					
						2022-07-19 14:23:56 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b5c821f1ae
							
						
					 | 
					
						
						
							
							buy items from shop
						
						
						
						
						
						
					 | 
					
						2022-07-19 14:23:56 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ce09c93940
							
						
					 | 
					
						
						
							
							magstuff
						
						
						
						
						
						
					 | 
					
						2022-07-19 14:23:56 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							925b022c4f
							
						
					 | 
					
						
						
							
							clean these functions up a bit
						
						
						
						
						
						
					 | 
					
						2022-07-19 14:23:56 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							faf00a904a
							
						
					 | 
					
						
						
							
							bare minimum item usage stuff
						
						
						
						
						
						
					 | 
					
						2022-07-19 14:23:56 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							eb23cc2dfd
							
						
					 | 
					
						
						
							
							fix item pickup tests
						
						
						
						
						
						
					 | 
					
						2022-07-19 14:23:56 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a664b17f2e
							
						
					 | 
					
						
						
							
							spacing
						
						
						
						
						
						
					 | 
					
						2022-07-19 14:23:56 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							725ba5d917
							
						
					 | 
					
						
						
							
							sort inventory
						
						
						
						
						
						
					 | 
					
						2022-07-19 14:23:56 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							dffa636247
							
						
					 | 
					
						
						
							
							I am dumb
						
						
						
						
						
						
					 | 
					
						2022-07-19 14:23:56 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6de3ee1cbf
							
						
					 | 
					
						
						
							
							equipping!
						
						
						
						
						
						
					 | 
					
						2022-07-19 14:23:55 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8b79ed18e0
							
						
					 | 
					
						
						
							
							spacing
						
						
						
						
						
						
					 | 
					
						2022-07-19 14:23:55 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8a7974f77f
							
						
					 | 
					
						
						
							
							bank itemstate stuff
						
						
						
						
						
						
					 | 
					
						2022-07-19 14:23:54 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e407409f04
							
						
					 | 
					
						
						
							
							make inmemorytransaction actually work
						
						
						
						
						
						
					 | 
					
						2022-07-19 14:20:04 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2b6f988c41
							
						
					 | 
					
						
						
							
							entitygateway stuff should take &BankName not BankName
						
						
						
						
						
						
					 | 
					
						2022-07-19 14:20:02 -06:00 | 
					
					
						
						
							
							
							
						
					 |