127 Commits

Author SHA1 Message Date
26a2ef6492 Merge pull request 'TRADING YEAH LETS GO' (#80) from trading into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #80
2021-12-28 13:05:26 -05:00
a6e50555de appease the clip
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2021-12-28 01:37:24 -07:00
81916d1f57 TRADING JUST IN TIME TO BARELY MISS XMAS
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone/pr Build is failing
2021-12-27 00:48:42 -07:00
9c34baeb26 meseta refactor
Some checks failed
continuous-integration/drone/push Build is failing
2021-12-26 23:31:12 -07:00
72d72801e1 trade meseta
Some checks failed
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
Some checks failed
continuous-integration/drone/push Build is failing
2021-12-12 22:33:58 -07:00
872794e45f improve error messages
Some checks failed
continuous-integration/drone/push Build is failing
2021-12-12 15:55:59 -07:00
3b7dcd0295 remove printlns 2021-12-10 13:43:11 -07:00
b3b6dad6ad trades! 2021-12-10 13:24:59 -07:00
b80f30ef9d initial actual trading logic
Some checks failed
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
ac423fa6ba change trade structure in clientstate 2021-10-14 00:20:19 -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
Some checks failed
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
0d30df8da6 start of trading 2021-07-30 23:19:47 -06:00
e6cf819bf4 andy vs. clippy round 3
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2021-06-23 01:03:54 +00:00
f0f65c70be cleanup 2021-06-23 00:02:31 +00:00
6980355c00 imagine being level 0 2021-06-23 00:00:46 +00:00
0e2d6cd3b1 don't expect people to remember null in Rust 2021-06-22 23:23:22 +00:00
baf5510c21 missing nuls is too advanced for the client?
Some checks failed
continuous-integration/drone/push Build is failing
2021-06-22 03:20:30 +00:00
c89751aa22 add level requirements for rooms and update tests
Some checks failed
continuous-integration/drone/push Build is failing
2021-06-21 19:10:59 -06:00
89ae918a2f remove unused line
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2021-06-20 15:38:09 -06:00
a65afc4123 todo error? 2021-06-20 15:38:09 -06:00
da2267c723 tell neighbours we are banking 2021-06-20 15:38:09 -06:00
1b506e014f clean up last of normal warnings 2021-06-18 20:38:29 -06:00
53ec82d9eb lint src/ship/*
All checks were successful
continuous-integration/drone/push Build is passing
2021-06-18 17:38:36 -06:00
60bcfd78ec lint src/ship/packet/builder/*
All checks were successful
continuous-integration/drone/push Build is passing
2021-06-18 12:38:33 -06:00
3cf834ed55 lint src/ship/packet/handler/*
All checks were successful
continuous-integration/drone/push Build is passing
2021-06-18 12:18:29 -06:00
e89821990f lint src/ship/packet/builder/ship.rs 2021-06-18 11:53:23 -06:00
f4fae162f0 tekking! 2020-12-03 15:04:48 -07:00
b6ce6296d4 create_item takes generic item rather than floor item 2020-12-03 15:01:41 -07:00
ae696888e9 remove player from lobby before sending to another ship/block 2020-11-25 22:08:41 -07:00
fe03515871 basic multiple login check 2020-11-25 22:05:55 -07:00
78ed2101e5 I forgot blocks are a thing 2020-11-24 23:17:42 -07:00
5ca852260f only 1 block actually exists 2020-11-21 23:50:10 -07:00
ffce662c95 transfer ship 2020-11-21 23:45:27 -07:00
ae7ba9e3fe start on misc interserver things like player counts and ship lists 2020-11-18 18:56:04 -07:00
a3cc29b68f use anyhow for itemmanager 2020-11-16 21:50:10 -07:00
f7c6be48b2 don't try and say an item was picked up that the client doesn't know about 2020-11-16 21:50:10 -07:00
55c393b7a8 move the tech level adjustment to prevent underflow for new FOs. let characters use tech disks 2020-11-16 20:46:52 -04:00
8fae8d11af fix equipping bought weapon 2020-11-09 16:47:35 -07:00
6e2fab31f0 e q u i p r e f a c t o r 2020-11-09 16:47:19 -07:00
10458baea0 shrink some structures, remove async from functions that didn't need it 2020-11-09 16:25:15 -07:00
7ae8976c10 i t e m r e f a c t o r 2020-11-05 16:36:39 -07:00
898cb9064d Merge pull request 'misc shit' (#246) from cleaning_up into master 2020-11-02 14:36:37 -05:00
7157074419 remove comments 2020-11-01 23:27:47 -04:00
e1360e4958 bank doesn't spawn infinite money! 2020-11-01 23:14:38 -04:00
3a095a928d fix item ids not being set correctly 2020-11-01 18:06:00 -07:00
5e9a94081c remove unwrap 2020-11-01 18:06:00 -07:00