Photos expansion #30672

egorzaderiy · 2019-05-19T22:57:15Z

Summary

SUMMARY: Features "More features in photos. Allows centered on any tile, captures all creatures."

Purpose of change

Include more features in photos, like furniture, vehicles, weather, etc, for roleplaying purposes. Later this can be used to fill cameras/tablets with pregenerated photos that lead to treasure, for example.

Describe the solution

Monsters, npc and player use unified extended_photo_def format. Still saving monsters to monster memory. Old saves will load fine, as it saves photos to new section, while still reading old sections.

It takes photo of any point and checks points in radius=2.
If it founds creature, it scans tiles around (R=1). Any objects found are appended as "Nearby you can see ...". These tiles marked as processed and not scanned again.
Then all remaining not marked tiles are processed, and objects found are appended as paragraphs showed as categories.

Describe alternatives you've considered

First alternative is create 2d submap of selected part of map, and then draw it when user wants to see photo. Like snapshot of mini-part of map. But thats probably too hard.
Second alternative is creating photo like in first person view, with pseudographics. This is even harder.

Additional context

I want to add:

Screenshots (openable)

Selfie at forest trail:

Selfie in military bunker:

Selfie in campground tent:

Can't see robot and two items behind wall. Also monster is hallucination, so it is not captured in photo.

Blinding all monsters in photo when aim point is nearby, but only if player is not in photo (selfie). Reason is player not using a flash when making selfie, to not blind himself.

When downloading from camera to memory card, it also saves photos, which can be later viewed on e-ink, using new menu entry.

ledges:

from here all photos below do not include weather, location and time of day.

interaction of field effects with various objects. Note that there is more advanced affix now, like covered in, under, on, in %s cloud, illuminated by.

not correct focus example:

npc/player statuses and field effects:

traps example:

items with volume < 0.5 are not captured, unless they are in aim point.

src/iuse.cpp

egorzaderiy · 2019-05-28T11:32:30Z

i have

enum field_id : int {}
static const std::unordered_set<field_id> covered_in_affix_ids = {};

and travis gives me error .../hashtable_policy.h:85:11: error: implicit instantiation of undefined template 'std::hash<field_id>'
But why, isn't field_id = int anyway? What to do with it, should i clearly indicate hash for set?
https://travis-ci.org/CleverRaven/Cataclysm-DDA/jobs/537982901

egorzaderiy · 2019-05-29T16:47:17Z

src/iuse.cpp

@@ -6485,22 +6498,23 @@ const auto trap_name_at = []( const tripoint &point )

 std::string get_field_description_at( const tripoint &point )
 {
-    static const std::unordered_set<field_id> covered_in_affix_ids = {
+    typedef std::unordered_set<field_id, std::hash<int>> Field_id_set;
+    static const Field_id_set covered_in_affix_ids = {


This is that i have found related to error: https://stackoverflow.com/a/29618545

AMurkin · 2019-05-29T17:22:42Z

I guess I shouldn't see contents of the closed constructions on the photos. Such as lockers, vats or kegs.

egorzaderiy · 2019-05-29T20:18:01Z

I guess I shouldn't see contents of the closed constructions on the photos. Such as lockers, vats or kegs.

Well, you are right.

ifreund

Well this is a pretty epic PR

I've been fairly picky with my review as I haven't noticed any issues with the larger structure/goals of this PR.

src/iuse.cpp

egorzaderiy · 2019-06-07T03:19:53Z

Wow, thats a lot of changes! :D Thanks for review!

ifreund · 2019-06-07T09:09:19Z

Wow, thats a lot of changes! :D Thanks for review!

No problem, sorry that it's taken so long for someone to get around to this PR. It is a little large after all.

ifreund

Bunch of little grammar fixes this time. Don't think it's possible to make the wording perfect in every case without making the code super complex, but this should be pretty good.

Aside from that I'd say this is ready to merge.

src/iuse.cpp

egorzaderiy · 2019-06-11T05:48:45Z

Bunch of little grammar fixes this time.

I'm not native speaker, so these suggestions are always appreciated, thanks!

src/iuse.cpp

ifreund

This looks good to me.

There may be a few rough edges on the wording in some combinations of circumstances that I haven't thought of/noticed, but nothing that should prevent merging imo.

egorzaderiy · 2019-06-14T19:16:54Z

Oh well, since fields refactor #31310, #31311, #31362 is partially merged, it now fails to build :(

ZhilkinSerg · 2019-06-14T19:26:32Z

That's unfortunate. I will look into required changes when I have time after #31362 is merged.

egorzaderiy · 2019-06-14T19:34:54Z

@ZhilkinSerg I have renamed some method names that have been changed, but i fear after #31362 there will be a lot required changes.

src/iuse.cpp

BevapDin · 2019-06-14T21:44:41Z

src/iuse.cpp

+};
+static const auto format_object_pair_article = []( const std::pair<std::string, int> &pair )
+{
+    return format_object_pair( pair, "a " );


String is not translated.

I can see only one way it can be translated properly:

return format_object_pair( pair, pgettext( "Article 'a', replace it with empty " "string if it is not used in language", "a " ) );

src/iuse.cpp

…e in photo.

…ects around point.

… name. Refactor long effects_description_for_creature method.

…to blinded, save all monsters in photo to memory

…ER furniture. Added "balancing" pose.

…earby object, for cases when no creature in photo area.

…update quality in monster collection.

Co-Authored-By: Isaac Freund <[email protected]>

Co-Authored-By: ZhilkinSerg <[email protected]>

Night-Pryanik · 2019-06-19T05:45:01Z

My best photo so far:

Filthy cargo pants covered in blood splatter are mentioned twice. Do we really need that?

egorzaderiy · 2019-06-19T06:31:21Z

@Night-Pryanik its not mentioned twice, its cargo pants and cargo shorts

Night-Pryanik · 2019-06-19T06:36:40Z

@egorzaderiy it's cargo pants.

egorzaderiy · 2019-06-19T06:47:12Z

well, yes, it shows description of item at the aim point. If player have chosen it as main focus of photo, then it is significant, thats why i decided to put in more info.

egorzaderiy changed the title ~~[WIP]Photos expansion~~ [WIP][CR]Photos expansion May 19, 2019

ifreund added <Enhancement / Feature> New features, or enhancements on existing [C++] Changes (can be) made in C++. Previously named `Code` Items / Item Actions / Item Qualities Items and how they work and interact labels May 21, 2019

Night-Pryanik reviewed May 26, 2019

View reviewed changes

src/iuse.cpp Outdated Show resolved Hide resolved

egorzaderiy changed the title ~~[WIP][CR]Photos expansion~~ Photos expansion May 27, 2019

egorzaderiy commented May 29, 2019

View reviewed changes

egorzaderiy mentioned this pull request May 29, 2019

ebooks #30922

Closed

ZhilkinSerg self-assigned this Jun 4, 2019

ifreund reviewed Jun 6, 2019

View reviewed changes

ZhilkinSerg removed their assignment Jun 7, 2019

egorzaderiy force-pushed the photos-expansion branch from 5d16cef to 7cfbba6 Compare June 10, 2019 14:39

ifreund reviewed Jun 10, 2019

View reviewed changes

Night-Pryanik reviewed Jun 11, 2019

View reviewed changes

src/iuse.cpp Outdated Show resolved Hide resolved

ifreund approved these changes Jun 11, 2019

View reviewed changes

ZhilkinSerg self-assigned this Jun 14, 2019

egorzaderiy force-pushed the photos-expansion branch from 179f090 to f3bdfd5 Compare June 14, 2019 19:32

BevapDin reviewed Jun 14, 2019

View reviewed changes

src/iuse.cpp Outdated Show resolved Hide resolved

BevapDin reviewed Jun 14, 2019

View reviewed changes

src/iuse.cpp Outdated Show resolved Hide resolved

BevapDin reviewed Jun 14, 2019

View reviewed changes

src/iuse.cpp Outdated Show resolved Hide resolved

egorzaderiy and others added 23 commits June 19, 2019 04:00

Photos expansion: selfie photos include more features

6d09141

Photos expansion: allow monsters to have extended photo descriptions.

7c107d3

Camera expansion: refactor of iuse::camera, allow more than one figur…

bee1f81

…e in photo.

Photos expansion: allow photos of any point; more refactoring

17985b4

Photos expansion: npc/creature effects

f7d087b

Photos expansion: include unusual terrain in photo.

a9a1533

Photos expansion: fields and traps

2eb912a

Photos expansion: more refactoring, create method for enumerating obj…

b36a961

…ects around point.

Photos expansion: minor bug fix, extend description of field effects.

4c07431

Photos expansion: include time of day, outside/inside status, overmap…

d32c4a3

… name. Refactor long effects_description_for_creature method.

Photos expansion: can view photos on e-ink, make all creatures in pho…

0e45905

…to blinded, save all monsters in photo to memory

Photos expansion: attempt to satisfy travis

295eed5

Photos expansion: do not capture items inside of SEALABLE and CONTAIN…

8d176bb

…ER furniture. Added "balancing" pose.

Photos expansion: correctly remove object at aim_point from list of n…

33be848

…earby object, for cases when no creature in photo area.

Photos expansion: code style fixes after review

fdce40e

Photos expansion: support for riding states. Fixed not being able to …

6edabc6

…update quality in monster collection.

Photos expansion: grammar fixes

db28afa

Co-Authored-By: Isaac Freund <[email protected]>

Photos expansion: more grammar fixes + astyle

0c6b5d0

Photos expansion: replace combined string for plural form

aa2b092

Photos expansion: renamed called field methods to allow compiling

7d34bbb

Photos expansion: More review additions.

681f572

Photos expansion: remove old-style cast (int)

1db2dd2

Photos expansion: remove unused regex include

ec94129

Co-Authored-By: ZhilkinSerg <[email protected]>

egorzaderiy force-pushed the photos-expansion branch from 6a6a3a9 to ec94129 Compare June 18, 2019 22:00

ZhilkinSerg merged commit 0c5171c into CleverRaven:master Jun 19, 2019

ZhilkinSerg removed their assignment Jun 19, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Photos expansion #30672

Photos expansion #30672

egorzaderiy commented May 19, 2019 •

edited

Loading

egorzaderiy commented May 28, 2019

egorzaderiy May 29, 2019

AMurkin commented May 29, 2019

egorzaderiy commented May 29, 2019

ifreund left a comment

egorzaderiy commented Jun 7, 2019

ifreund commented Jun 7, 2019

ifreund left a comment

egorzaderiy commented Jun 11, 2019 •

edited

Loading

ifreund left a comment

egorzaderiy commented Jun 14, 2019

ZhilkinSerg commented Jun 14, 2019 •

edited

Loading

egorzaderiy commented Jun 14, 2019

BevapDin Jun 14, 2019

egorzaderiy Jun 17, 2019

Night-Pryanik commented Jun 19, 2019 •

edited

Loading

egorzaderiy commented Jun 19, 2019

Night-Pryanik commented Jun 19, 2019

egorzaderiy commented Jun 19, 2019

Photos expansion #30672

Photos expansion #30672

Conversation

egorzaderiy commented May 19, 2019 • edited Loading

Summary

Purpose of change

Describe the solution

Describe alternatives you've considered

Additional context

from here all photos below do not include weather, location and time of day.

egorzaderiy commented May 28, 2019

egorzaderiy May 29, 2019

Choose a reason for hiding this comment

AMurkin commented May 29, 2019

egorzaderiy commented May 29, 2019

ifreund left a comment

Choose a reason for hiding this comment

egorzaderiy commented Jun 7, 2019

ifreund commented Jun 7, 2019

ifreund left a comment

Choose a reason for hiding this comment

egorzaderiy commented Jun 11, 2019 • edited Loading

ifreund left a comment

Choose a reason for hiding this comment

egorzaderiy commented Jun 14, 2019

ZhilkinSerg commented Jun 14, 2019 • edited Loading

egorzaderiy commented Jun 14, 2019

BevapDin Jun 14, 2019

Choose a reason for hiding this comment

egorzaderiy Jun 17, 2019

Choose a reason for hiding this comment

Night-Pryanik commented Jun 19, 2019 • edited Loading

egorzaderiy commented Jun 19, 2019

Night-Pryanik commented Jun 19, 2019

egorzaderiy commented Jun 19, 2019

egorzaderiy commented May 19, 2019 •

edited

Loading

egorzaderiy commented Jun 11, 2019 •

edited

Loading

ZhilkinSerg commented Jun 14, 2019 •

edited

Loading

Night-Pryanik commented Jun 19, 2019 •

edited

Loading