Further container logic [RDY] #14972

mugling · 2016-01-23T19:05:07Z

EDIT: rebased against master

~~This PR continues directly from #14949 which is not yet merged. There are 11 new commits starting with 09ff0fd~~. It contains extensions to item_location and *::visit_items sufficient to implement this:

This PR does not implement a UI for nested containers but does however provide some of the key functionality that would be required. Character::find_parent can be used to determine whether an item has a parent container from which it can then be recursively unpacked via item_location::obtain.

The above screenshot demonstrates this functionality:

STANAG magazine (30) is contained by drop leg ammo pouch and worn by Character
item_location::describe uses Character::find_parent to help determine the container name
game::reload uses item_location::obtain to unpack the item to the base of the inventory
Reloading then proceeds as normal via player::assign_activity

Implementation details:

*::visit_items is extended to also provide a pointer to the parent node
*::find_parent uses the above to find any parent container
item_location::describe can optionally return the location relative to the player
item_location::obtain fetches the item to the root of the character inventor and in doing so it triggers events, eg. item::on_takeoff and deducts the appropriate number of moves

tl;dr
Demonstrates a wearable ammo pouch from which you can reload

Coolthulhu · 2016-01-23T19:12:50Z

data/json/items/magazines.json

+        "count" : 100,
+        "reliability" : 8,
+        "reload_time" : 80,
+        "flags": [ "NO_RELOAD", "NO_UNLOAD" ]


Why no unload? Can't you get rid of the belt and just use the ammo without it?

Too easy to accidentally destroy your ammo belt. I was going to allow disassembly though.

Coolthulhu · 2016-01-23T19:45:45Z

I don't like the idea of changing the drop leg pouches purely to ammo pouches.
It is an useful storage item that doesn't have an alternative. Ammo pouches should be a different item.

Rivet-the-Zombie · 2016-01-23T19:48:33Z

Ammo pouches should be a different item.

I'm going to second this.

mugling · 2016-01-23T20:14:22Z

I don't like the idea of changing the drop leg pouches purely to ammo pouches.

I'll create a new type but before I do so are the JSON values about right?

Coolthulhu · 2016-01-23T20:25:14Z

data/json/items/armor.json

        "color" : "dark_gray",
-        "covers" : ["LEGS"],
+        "covers" : ["LEG_EITHER"],
        "to_hit" : 0,


"to_hit" is optional

Rivet-the-Zombie · 2016-01-23T20:50:06Z

I'll create a new type but before I do so are the JSON values about right?

The current values look good for such an application.

mugling · 2016-01-23T20:53:02Z

Better name than drop leg ammo pouch?

Rivet-the-Zombie · 2016-01-23T21:58:54Z

How about 'leg ammo pouch' so we could then add other variants like 'chest ammo carrier'?

Or just call them 'ammo pouch' and 'ammo carrier' or whatever.

mugling · 2016-01-24T00:36:50Z

Rebased against master as there was a merge conflict with #14949

illi-kun · 2016-01-24T00:39:49Z

data/json/items/armor.json

+        "material" : ["cotton", "null"],
+        "volume" : 1,
+        "warmth" : 0,
+        "phase" : "solid",


"phase" : "solid", is default value for optional entry

illi-kun · 2016-01-24T00:47:22Z

data/json/items/armor.json

+            "holster_msg": "You stash your %s",
+            "max_volume": 2,
+            "draw_cost": 5,
+            "flags": [ "COMPACT_MAG" ]


Why this flag is here? Do we need to have the same flag on a container and on a magazine we want to store? If so, it's better to announce it in docs.

Do we need to have the same flag on a container and on a magazine we want to store?

Yes

If so, it's better to announce it in docs.

See 4842355. Is there anywhere else?

I saw the referenced note but I misunderstood it. Anyway, thanks for clarification.

Is there anywhere else?

No, I'm talking about exactly this place.

No worries, it's all a bit jumbled after rebasing

* INVENTORY_HANDLING_FACTOR * MAP_HANDLING_FACTOR * VEHICLE_HANDLING_FACTOR

chaosvolt · 2016-01-24T06:20:19Z

Ah, interesting.

BevapDin · 2016-01-24T18:08:39Z

src/item_location.cpp

+        // @todo handle unpacking costs
+        // @todo account for distance
+
+        mv += dynamic_cast<player *>( &ch )->item_handling_cost( *what );


Btw. you can dynamic cast reference, no need to convert the value to a pointer first.

Are you sure this works on all compilers?

I don't know, but The C++ Standard says so. That said, do you know any compilers that don't support it?

mugling · 2016-01-25T01:26:48Z

Found problem during testing, working on fix

chaosvolt · 2016-01-25T01:30:14Z

Oh? o.o

mugling · 2016-01-25T01:31:40Z

Fixed in 3504233.

Previously reloading using the first item of an inventory stack and without a parent container could trigger the debugmsg "Tried to find item parent using character who doesn't have the item". The fix stops the loop iterating if the first call to Character::find_parent returns nullptr (signifying no parent).

Coolthulhu reviewed Jan 23, 2016
View reviewed changes

mugling force-pushed the containers1 branch from a7962b4 to 4842355 Compare January 24, 2016 00:28

mugling changed the title ~~Further container logic~~ Further container logic [RDY] Jan 24, 2016

illi-kun reviewed Jan 24, 2016
View reviewed changes

mugling mentioned this pull request Jan 24, 2016

Rebalance item handling costs #14977

Merged

illi-kun reviewed Jan 24, 2016
View reviewed changes

mugling added 11 commits January 24, 2016 01:29

Change reference to pointer *::in visit_items

cd47ee0

Extend visitor pattern to provide parent node

a5e8d48

Implement Character::find_parent()

3122ce7

Implement inventory::find_parent()

2d4d352

Implement item::find_parent()

afe421f

Implement item_location::describe()

2653b32

Add handling factor constants

6942079

* INVENTORY_HANDLING_FACTOR * MAP_HANDLING_FACTOR * VEHICLE_HANDLING_FACTOR

Add option to can_holster to ignore contained items

31d72f6

Implement item_location::obtain()

9c139a2

Further document item_location::remove_item()

e365cd9

Describe location in item::pick_reload_ammo()

edf7d80

mugling added 7 commits January 24, 2016 01:29

Use item_location::obtain() when reloading

5190258

item::pick_reload_ammo() selects from adjacent tiles

f8a0fdc

Add leg ammo pouch as new item

bbd5d4e

Add COMPACT_MAG flag to magazines

084c006

Document COMPACT_MAG and BULKY_MAG

4842355

JSON fixups for leg ammo pouch

174168d

Slightly reduce encumbrance of leg ammo pouch

6d91e1a

illi-kun mentioned this pull request Jan 24, 2016

Rebalance of to_hit value for all books #14991

Merged

mugling mentioned this pull request Jan 24, 2016

Add magazines to 223 rifles [RDY] #14995

Closed

BevapDin reviewed Jan 24, 2016
View reviewed changes

mugling mentioned this pull request Jan 24, 2016

Magazine implementation: weapons added by Chaosvolt #15002

Closed

mugling changed the title ~~Further container logic [RDY]~~ Further container logic [WIP] Jan 25, 2016

mugling changed the title ~~Further container logic [WIP]~~ Further container logic [RDY] Jan 25, 2016

Check for nullptr (item not in any container)

3504233

kevingranade merged commit 3504233 into CleverRaven:master Jan 28, 2016

mugling mentioned this pull request Jan 29, 2016

Add ammo pouches #15073

Merged

mugling deleted the containers1 branch January 31, 2016 11:05

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Further container logic [RDY] #14972

Further container logic [RDY] #14972

mugling commented Jan 23, 2016

Coolthulhu Jan 23, 2016

mugling Jan 23, 2016

Coolthulhu commented Jan 23, 2016

Rivet-the-Zombie commented Jan 23, 2016

mugling commented Jan 23, 2016

Coolthulhu Jan 23, 2016

Rivet-the-Zombie commented Jan 23, 2016

mugling commented Jan 23, 2016

Rivet-the-Zombie commented Jan 23, 2016

mugling commented Jan 24, 2016

illi-kun Jan 24, 2016

illi-kun Jan 24, 2016

mugling Jan 24, 2016

illi-kun Jan 24, 2016

mugling Jan 24, 2016

chaosvolt commented Jan 24, 2016

BevapDin Jan 24, 2016

mugling Jan 24, 2016

BevapDin Jan 24, 2016

mugling commented Jan 25, 2016

chaosvolt commented Jan 25, 2016

mugling commented Jan 25, 2016

Further container logic [RDY] #14972

Further container logic [RDY] #14972

Conversation

mugling commented Jan 23, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Coolthulhu commented Jan 23, 2016

Rivet-the-Zombie commented Jan 23, 2016

mugling commented Jan 23, 2016

Choose a reason for hiding this comment

Rivet-the-Zombie commented Jan 23, 2016

mugling commented Jan 23, 2016

Rivet-the-Zombie commented Jan 23, 2016

mugling commented Jan 24, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

chaosvolt commented Jan 24, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mugling commented Jan 25, 2016

chaosvolt commented Jan 25, 2016

mugling commented Jan 25, 2016