Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[READY][CR] Container Inventory Management - Liquids #9718

Merged
merged 11 commits into from Oct 29, 2014

Conversation

Projects
None yet
2 participants
@Robik81
Copy link
Contributor

commented Oct 28, 2014

As discussed in #9524 I added functionality into AIM to allow for transfer of liquids between containers.

You select one container as target and then 'move' other containers into it from other pane. Unloading is automatic.

Screenshots:
cim01

cim02

cim03

Issues:

  • CATEGORY_SELECTION set to 't'
  • selected container is persisted in uistate as location, index, type and content type
  • refactor common part of code from move_content and game::handle_liquid

Robik81 added some commits Oct 22, 2014

AIM Keybinding
change of ITEMS_CONTAINER to ITEMS_DRAGGED_CONTAINER and addition of
ITEMS_CONTAINER for normal inventory container
UI state
Not save persistent
CIM Liquids
CIM functionality in AIM
UIState fix
Clearing pointer in deserialize to ensure that it is cleared after load
Persistent UIState
changed UIState from pointer to location, index, type and content type
Style fix and changes for persistence
Styles fixed hopefully everywhere...
WarningFix
explicit conversion to size_t
LiquidHandlingRefactor
both move_content and handle_liquid are now calling new item method
fill_with
FixContainerPositionOffset
deals with real position of container depending on its location
@Robik81

This comment has been minimized.

Copy link
Contributor Author

commented Oct 28, 2014

Last thing to deal with is container selection / category selection shortcuts... any suggestions?

@KA101

This comment has been minimized.

Copy link
Contributor

commented Oct 28, 2014

Either K or T could work for English-speakers.

CategorySelectionShortcut_t
instead of c
@Robik81

This comment has been minimized.

Copy link
Contributor Author

commented Oct 28, 2014

Done.

@Robik81 Robik81 changed the title [WIP][CR] Container Inventory Management - Liquids [READY][CR] Container Inventory Management - Liquids Oct 28, 2014

@KA101

This comment has been minimized.

Copy link
Contributor

commented Oct 28, 2014

And it ought to be rebindable from the ? menu whilst in that screen, so yeah.

@KA101 KA101 self-assigned this Oct 28, 2014

@KA101

This comment has been minimized.

Copy link
Contributor

commented Oct 28, 2014

OK, folks ,ay need to rebind controls (but that's nothing new) and there's a bit of a learning curve as you need to find the container and highight it, then hit the Container button, then go get your source containers into the other pane.

But then you can load up a 55 gallon drum whilst it's sitting on the floor. w00t.

(I'm not sure if this is adequately measuring the time it takes, though at this point we can tweak that if need be.)

@Robik81

This comment has been minimized.

Copy link
Contributor Author

commented Oct 28, 2014

Should take same time as moving items around, but it could be changed if desired.

@KA101

This comment has been minimized.

Copy link
Contributor

commented Oct 28, 2014

Yeah, it looks like it does. Nice.

@KA101 KA101 merged commit 0f2ebd6 into CleverRaven:master Oct 29, 2014

1 check passed

default
Details

@Robik81 Robik81 deleted the Robik81:CIM branch Oct 30, 2014

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.