kill_counters #109

Closed

andy wants to merge 80 commits from kill_counters into master

pull from: kill_counters

merge into: jake:master

jake:master

jake:andy/directories

jake:andy/clamp-mag-feed

jake:move_stuff_to_libpso

jake:andy/update-rust

jake:andy/add-patch-log-dir

jake:fuckin_andy_making_me_do_this_now

jake:andy/map-objects

jake:morfin/test

jake:teams

jake:set_char_exp

jake:expsteal

jake:unitxt

jake:sendgc

jake:map_objects

jake:traps

jake:pbs

jake:techs

jake:presents

Conversation 0 Commits 80 Files Changed 66 +5656 -3288

andy commented 2022-06-18 12:15:36 -04:00

Collaborator

Copy Link

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

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

andy added 21 commits 2022-06-18 12:15:37 -04:00

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

add kill counters to units (limiter) 527cf50b9d

make the right items drop with kill counters ad5a1faccc

don't actually need this stuff e82fe779fc

this was supposed to be for unsealing/combining items b8961d665d

andy vs. clippy round 5 ca44dcf689

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

fix warnings from rebase e3991f5d41

fix tests b4866a3e59

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

test for 1 kill increases every equipped kill counter a0747ea89a

test with toomanyunwraps() e075de3259

forgot about dre but not clippy a21fb5a644

cleanup adf062c269

remove test c285d5cadc

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

based clip d07c61d009

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

more cleanup 533af3a355

fix drop test 68de2504e0

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

andy added 59 commits 2022-07-25 19:47:57 -04:00

update sqlx bc8769bc9a

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

add transactions! 1cdf091a2c

redo this cause entitygateway isnt Clone anymore 98d73a2db4

initial ItemState d7be62e69e

remove unused use 93a299af00

redundant bit of code deface35b8

cleanup 7c3ae25f29

move EntityGatewayTransaction to end of file 48b73bae09

don't need static for with_transaction f7d802aa58

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

move item state action functions to new file 92d231cd22

cleanup 46af418adb

mostly appease clippy a764fe9835

cool I can simplify this now 9c95bd8295

add character_id to ItemNote::PlayerDrop 726a6a92a2

add item_state to ShipState 867aa3537e

add/move stuff around for itemstate 9d8eecfd5d

move drop item over to item_state 29f6c9bcac

missed fixing these 007d73e07f

reorder function 8b51f5e45d

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

move partial drops over to item_state c7fdd5e58b

wtf happened here d6e368f055

the start of a long process of replacing ItemManager 8057b82dc5

entitygateway stuff should take &BankName not BankName 2aa8dae9b2

make inmemorytransaction actually work 9bef112d34

bank itemstate stuff 3e907c6066

spacing 8e105b31f2

equipping! e1e898705e

I am dumb 883370db39

sort inventory 938668074b

spacing 3f57d244ae

fix item pickup tests 4a077c30f1

bare minimum item usage stuff 193fcf470e

clean these functions up a bit e61901d0ea

magstuff 73a93c0957

buy items from shop ad7572b726

selling items fad0ccc856

trade refactor 547b5255eb

fix some meseta-taking things 07fd5955a8

enemy drop refactor 8655082e9e

add postgres trade stuff ce41c7423e

refactor tekking d1d48cae3b

remove old item manager code 098b1a79e7

appease clippy, the tyrant 01f575c0d9

missed a thing d8842d6de7

move ItemStateAction to its own file bc104e4408

move inventory code out of state bd692b8449

move floor code out of state 317f236f7c

move bank code out of state 7d5c4e0165

split actions into actions+tasks cb00ce67c6

put proper error strings on this struct 13017084ee

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

add kill counters to units (limiter) e39cf3eecc

andy vs. clippy round 5 3eeee323a9

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

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

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

andy closed this pull request 2023-02-17 16:50:17 -05:00

Some checks failed

Hide all checks

continuous-integration/drone/pr Build is failing

Required

Details

continuous-integration/drone/push Build is failing

Required

Details

Pull request closed

Please reopen this pull request to perform a merge.

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

Clear labels

item refactor

nice to have

one day maybe someday

release

No Label

Milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

andy chimpyroadkill cmw252 morfin reason jake

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: jake/elseware#109

No description provided.