| 
						
					 | 
					
						
						
						
						
							
						
						
							a148d96adc
							
						
					 | 
					
						
						
							
							slots need to be updated when an item leaves inventory
						
						
						
						
						
						
					 | 
					
						2020-10-07 19:24:46 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6de4b677ef
							
						
					 | 
					
						
						
							
							fix setting item location
						
						
						
						
						
						
					 | 
					
						2020-10-07 19:24:46 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c067ab444a
							
						
					 | 
					
						
						
							
							properly select character items based on the latest location
						
						
						
						
						
						
					 | 
					
						2020-10-07 19:24:46 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0f7cbbf096
							
						
					 | 
					
						
						
							
							fix tests again
						
						
						
						
						
						
					 | 
					
						2020-10-07 19:24:46 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fd6dc1fe5b
							
						
					 | 
					
						
						
							
							fix tests
						
						
						
						
						
						
					 | 
					
						2020-10-07 19:24:46 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							213d679e99
							
						
					 | 
					
						
						
							
							use postgres in main maybe
						
						
						
						
						
						
					 | 
					
						2020-10-07 19:24:46 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8ddbdda0a4
							
						
					 | 
					
						
						
							
							postgres!
						
						
						
						
						
						
					 | 
					
						2020-10-07 19:24:46 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4989ecaa7c
							
						
					 | 
					
						
						
							
							formatting
						
						
						
						
						
						
					 | 
					
						2020-10-07 19:24:46 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							412d4b8e81
							
						
					 | 
					
						
						
							
							Technique::from_value
						
						
						
						
						
						
					 | 
					
						2020-10-07 19:24:46 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							cd1c30c8eb
							
						
					 | 
					
						
						
							
							handle error
						
						
						
						
						
						
					 | 
					
						2020-10-07 19:24:46 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							032b2921f0
							
						
					 | 
					
						
						
							
							fix mag pbs
						
						
						
						
						
						
					 | 
					
						2020-10-07 19:24:46 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							89f3091099
							
						
					 | 
					
						
						
							
							make save_user_settings async
						
						
						
						
						
						
					 | 
					
						2020-10-07 19:24:46 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d8c6dd817e
							
						
					 | 
					
						
						
							
							add derives to item structs, make some things public
						
						
						
						
						
						
					 | 
					
						2020-10-07 19:24:46 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							17a8b288c1
							
						
					 | 
					
						
						
							
							change banned from bool to timestamp
						
						
						
						
						
						
					 | 
					
						2020-10-07 19:24:46 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							aa08e67f6b
							
						
					 | 
					
						
						
							
							Merge pull request 'save_options' (#225) from save_options into master
						
						
						
						
						
						
						
						Reviewed-by: jake <jake@sharnoth.com> 
						
						
					 | 
					
						2020-10-07 21:22:59 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1cdef4cea7
							
						
					 | 
					
						
						
							
							fixing more conflicts??
						
						
						
						
						
						
					 | 
					
						2020-10-03 00:12:18 -03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							046ca492a8
							
						
					 | 
					
						
						
							
							add a test
						
						
						
						
						
						
					 | 
					
						2020-10-03 00:10:36 -03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							114ed07adc
							
						
					 | 
					
						
						
							
							tests!
						
						
						
						
						
						
					 | 
					
						2020-10-02 22:41:53 -03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							db23a9794e
							
						
					 | 
					
						
						
							
							options saved to character!
						
						
						
						
						
						
					 | 
					
						2020-10-02 22:41:53 -03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e6dd3326d2
							
						
					 | 
					
						
						
							
							Merge pull request 'full char data packet' (#222) from fullchar into master
						
						
						
						
						
						
					 | 
					
						2020-10-02 20:58:18 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							62e5a966f6
							
						
					 | 
					
						
						
							
							options saved to character!
						
						
						
						
						
						
					 | 
					
						2020-10-02 21:24:32 -03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4434c42eaa
							
						
					 | 
					
						
						
							
							full char data packet
						
						
						
						
						
						
					 | 
					
						2020-10-01 16:58:16 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							355c3e9c1b
							
						
					 | 
					
						
						
							
							Merge pull request 'shops' (#219) from shops into master
						
						
						
						
						
						
					 | 
					
						2020-09-28 01:13:59 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							cebb6a5f31
							
						
					 | 
					
						
						
							
							handle case where items are removed from shop after buying
						
						
						
						
						
						
					 | 
					
						2020-09-27 20:30:37 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d08db622e2
							
						
					 | 
					
						
						
							
							shops!
						
						
						
						
						
						
					 | 
					
						2020-09-27 18:16:27 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7028f91187
							
						
					 | 
					
						
						
							
							latest nightly works again
						
						
						
						
						
						
					 | 
					
						2020-09-27 18:09:03 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							64040d55a2
							
						
					 | 
					
						
						
							
							and another!
						
						
						
						
						
						
					 | 
					
						2020-09-27 18:05:23 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e387bfafba
							
						
					 | 
					
						
						
							
							looks like the shop item list length still exists
						
						
						
						
						
						
					 | 
					
						2020-09-25 18:16:08 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b94dcb62d0
							
						
					 | 
					
						
						
							
							tool shop pricing
						
						
						
						
						
						
					 | 
					
						2020-09-23 21:49:33 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1e18d5729b
							
						
					 | 
					
						
						
							
							default to high price rather than zero
						
						
						
						
						
						
					 | 
					
						2020-09-23 21:41:15 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8a9ced09ea
							
						
					 | 
					
						
						
							
							armor shop pricing
						
						
						
						
						
						
					 | 
					
						2020-09-23 20:54:39 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							52d4fe8495
							
						
					 | 
					
						
						
							
							weapon shop prices
						
						
						
						
						
						
					 | 
					
						2020-09-23 19:14:11 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c13c071946
							
						
					 | 
					
						
						
							
							weapon stats
						
						
						
						
						
						
					 | 
					
						2020-09-23 19:13:45 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							514e18fff3
							
						
					 | 
					
						
						
							
							armor shop
						
						
						
						
						
						
					 | 
					
						2020-09-22 22:39:28 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							80f50c49cc
							
						
					 | 
					
						
						
							
							small fixes in weapon shop
						
						
						
						
						
						
					 | 
					
						2020-09-21 00:38:12 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							991a71e1ca
							
						
					 | 
					
						
						
							
							tool shop
						
						
						
						
						
						
					 | 
					
						2020-09-21 00:37:50 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							65208cddba
							
						
					 | 
					
						
						
							
							weapon shop
						
						
						
						
						
						
					 | 
					
						2020-09-18 07:55:48 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7a56f947fb
							
						
					 | 
					
						
						
							
							update readme
						
						
						
						
						
						
					 | 
					
						2020-09-14 22:18:59 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							606adf6ba9
							
						
					 | 
					
						
						
							
							Merge pull request 'bank_mag' (#212) from bank_mag into master
						
						
						
						
						
						
					 | 
					
						2020-09-08 23:06:05 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e4e9f12e10
							
						
					 | 
					
						
						
							
							pls be MINDful of MIND
						
						
						
						
						
						
					 | 
					
						2020-09-08 18:40:58 -03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b1a9e71f4b
							
						
					 | 
					
						
						
							
							mag bank truncation logic
						
						
						
						
						
						
					 | 
					
						2020-09-08 18:40:18 -03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b0be92cb50
							
						
					 | 
					
						
						
							
							Merge pull request 'mag feeding!' (#207) from mag_feeding into master
						
						
						
						
						
						
					 | 
					
						2020-09-08 00:00:21 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							819ec7bf58
							
						
					 | 
					
						
						
							
							actually evolve all the magcell mags
						
						
						
						
						
						
					 | 
					
						2020-09-07 21:46:40 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9e275d23a0
							
						
					 | 
					
						
						
							
							not handling mag cell usage in feeding
						
						
						
						
						
						
					 | 
					
						2020-09-07 21:23:03 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							acd4e57d1d
							
						
					 | 
					
						
						
							
							implement rest of mag cells
						
						
						
						
						
						
					 | 
					
						2020-09-07 21:14:17 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d567c50216
							
						
					 | 
					
						
						
							
							mag cells
						
						
						
						
						
						
					 | 
					
						2020-09-07 08:02:12 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							525ac1a08d
							
						
					 | 
					
						
						
							
							Merge pull request 'sranks' (#206) from sranks into master
						
						
						
						
						
						
						
						Reviewed-by: jake <jake@sharnoth.com> 
						
						
					 | 
					
						2020-09-06 23:58:56 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							bc7e513a74
							
						
					 | 
					
						
						
							
							one more test
						
						
						
						
						
						
					 | 
					
						2020-09-07 00:45:35 -03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							27a87ffe96
							
						
					 | 
					
						
						
							
							fix esweap type + special numbering. add to other files and tests
						
						
						
						
						
						
					 | 
					
						2020-09-07 00:39:23 -03:00 | 
					
					
						
						
							
							
							
						
					 |