New Pull Request

kill_counters #109

Closed

andy wants to merge 80 commits from kill_counters into master

andy commented 3 years ago

Collaborator

this is just adding kill counters. unsealing is a whole other feature that also deals with combining items

andy added 21 commits 3 years ago

9025458ee8 add kill counter field to weapons and increment it when a client kills a monster

527cf50b9d add kill counters to units (limiter)

ad5a1faccc make the right items drop with kill counters

e82fe779fc don't actually need this stuff

b8961d665d this was supposed to be for unsealing/combining items

ca44dcf689 andy vs. clippy round 5

117a2daa31 killcounters, redbox mode, failing unseal test, and random debug strings

e3991f5d41 fix warnings from rebase

b4866a3e59 fix tests

0976bd9ab0 remove 3rd attr for killcounter weapons and fix tests

a0747ea89a test for 1 kill increases every equipped kill counter

e075de3259 test with toomanyunwraps()

a21fb5a644 forgot about dre but not clippy

adf062c269 cleanup

c285d5cadc remove test

2d5b6c5c01 actually add and use AddKill modifier and remove dead code

d07c61d009 based clip

b2f3dc9f50 lol maybe if we actually apply modifiers the tests will stop failing

533af3a355 more cleanup

68de2504e0 fix drop test

f2e7795b54 fix kill count applying logic for later when we need to unseal things

andy added 59 commits 2 years ago

bc8769bc9a update sqlx

9baf23e1b6 make all entitygateway functions take &mut self, move postgres functions to separate function for future use

1cdf091a2c add transactions!

98d73a2db4 redo this cause entitygateway isnt Clone anymore

d7be62e69e initial ItemState

93a299af00 remove unused use

deface35b8 redundant bit of code

7c3ae25f29 cleanup

48b73bae09 move EntityGatewayTransaction to end of file

f7d802aa58 don't need static for with_transaction

c713445884 remove boxes from ItemStateAction structs to remove need for static lifetimes

92d231cd22 move item state action functions to new file

46af418adb cleanup

a764fe9835 mostly appease clippy

9c95bd8295 cool I can simplify this now

726a6a92a2 add character_id to ItemNote::PlayerDrop

867aa3537e add item_state to ShipState

9d8eecfd5d add/move stuff around for itemstate

29f6c9bcac move drop item over to item_state

007d73e07f missed fixing these

8b51f5e45d reorder function

573e1ff60b I was wondering why nightly a week ago was letting me get away with this

c7fdd5e58b move partial drops over to item_state

d6e368f055 wtf happened here

8057b82dc5 the start of a long process of replacing ItemManager

2aa8dae9b2 entitygateway stuff should take &BankName not BankName

9bef112d34 make inmemorytransaction actually work

3e907c6066 bank itemstate stuff

8e105b31f2 spacing

e1e898705e equipping!

883370db39 I am dumb

938668074b sort inventory

3f57d244ae spacing

4a077c30f1 fix item pickup tests

193fcf470e bare minimum item usage stuff

e61901d0ea clean these functions up a bit

73a93c0957 magstuff

ad7572b726 buy items from shop

fad0ccc856 selling items

547b5255eb trade refactor

07fd5955a8 fix some meseta-taking things

8655082e9e enemy drop refactor

ce41c7423e add postgres trade stuff

d1d48cae3b refactor tekking

098b1a79e7 remove old item manager code

01f575c0d9 appease clippy, the tyrant

d8842d6de7 missed a thing

bc104e4408 move ItemStateAction to its own file

bd692b8449 move inventory code out of state

317f236f7c move floor code out of state

7d5c4e0165 move bank code out of state

cb00ce67c6 split actions into actions+tasks

13017084ee put proper error strings on this struct

b0eb494660 add kill counter field to weapons and increment it when a client kills a monster

e39cf3eecc add kill counters to units (limiter)

3eeee323a9 andy vs. clippy round 5

a5a21d0968 killcounters, redbox mode, failing unseal test, and random debug strings

6a7d6ffdf2 remove 3rd attr for killcounter weapons and fix tests

7ac68d13bb actually add and use AddKill modifier and remove dead code

andy closed this pull request 2 years ago

continuous-integration/drone/pr Build is failing

Required

Details

continuous-integration/drone/push Build is failing

Required

Details

Please reopen this pull request to perform a merge.

Sign in to join this conversation.

No reviewers

No Label

No Milestone

No project

No Assignees

1 Participants

Notifications

Due Date

No due date set.

Dependencies

This pull request currently doesn't have any dependencies.