Overhaul of map revealing items #27012

ZhilkinSerg · Dec 8, 2018

Summary

SUMMARY: Features "Overhaul of map revealing items"

Purpose of change

Map revealing items will now reveal overmap terrains around city nearest to its spawn location (as opposed to player location which was used previously).

Describe the solution

When items of maps category are spawned they store coordinates of nearest city as tripoint in item variable named reveal_map_center_omt. Corresponding city name is shown for this items in inventory. When item is used it reveals overmap terrain around corresponding city.

I've also moved map revealing items to separate item category (MAPS) and separate json file. Also utilized abstract for map revealing items and added disassembly recipe for trail guide.

Additional context

kevingranade · Dec 9, 2018

kevingranade reviewed Dec 9, 2018

View changes

kevingranade · Dec 9, 2018

src/overmap.cpp

@@ -2321,6 +2326,9 @@ void overmap::place_cities()
            tmp.s = size;
            cities.push_back( tmp );

+            DebugLog( D_INFO, DC_ALL ) << "CITY:[" << tmp.name << "] at {" << tmp.x << "," << tmp.x <<


This spams the logs a LOT, it might be interesting but I don't think we need it happening by default.

Right, it was debug feature I forgot to cut-off.

kevingranade · Dec 9, 2018

kevingranade reviewed Dec 9, 2018

View changes

kevingranade · Dec 9, 2018

src/overmap.h

@@ -294,14 +295,12 @@ class overmap
        // parse data in an old overmap file
        void unserialize_legacy( std::istream &fin );
        void unserialize_view_legacy( std::istream &fin );
+        const city &get_nearest_city( const tripoint &p ) const;


Instead of making this public, please see if you can use overmapbuffer::closest_city()

kevingranade · Dec 9, 2018

kevingranade reviewed Dec 9, 2018

View changes

kevingranade · Dec 9, 2018

src/overmap.h

@@ -48,6 +48,7 @@ struct city {
    }

    int get_distance_from( const tripoint &p ) const;
+    tripoint position() const;


Even better, if you use overmapbuffer::closest_city(), the reference it returns has this position already.

Will try to do that, though position in city_reference is in submap coordinates, not omt coordinates.

kevingranade · Dec 9, 2018

kevingranade reviewed Dec 9, 2018

View changes

kevingranade · Dec 9, 2018

src/map.cpp

@@ -4177,6 +4177,12 @@ item &map::add_item_at( const tripoint &p,
    submap *const current_submap = get_submap_at( p, lx, ly );
    current_submap->is_uniform = false;

+    if( new_item.is_map() && !new_item.has_var( "reveal_map_center_omt" ) ) {
+        //new_item.set_var( "origin_abs", g->m.getabs( p ) );


Looks like you forgot to remove some commented out code.

BevapDin · Dec 9, 2018

BevapDin reviewed Dec 9, 2018

View changes

BevapDin · Dec 9, 2018

src/item.cpp

@@ -2934,7 +2952,14 @@ std::string item::display_name( unsigned int quantity ) const
        }
    }

-    return string_format( "%s%s%s", name.c_str(), sidetxt.c_str(), amt.c_str() );
+    std::string &prefixed_name = name;


Why that? Can't you just use the variable name directly?

Right, I thought name was item field and didn't want to change that.

ZhilkinSerg · Dec 9, 2018

We need to improve name selection algorithm (see two Bradleys nearby):

ZhilkinSerg · Dec 9, 2018

Should I split json changes off current PR?

I-am-Erk · Dec 10, 2018

What about worlds without cities?

ZhilkinSerg · Dec 10, 2018

What about worlds without cities?

Old behavior - item display name isn't changed, overmap terrains are revealed around player.

kevingranade · Dec 20, 2018

This pull request has been mentioned on Cataclysm: Dark Days Ahead. There might be relevant details there:

https://discourse.cataclysmdda.org/t/military-operation-map-bug/18016/2

ZhilkinSerg · Dec 20, 2018

ZhilkinSerg reviewed Dec 20, 2018

View changes

ZhilkinSerg · Dec 20, 2018

data/json/items/book/maps.json

+      "type": "reveal_map",
+      "radius": 180,
+      "terrain": [ "hiway", "road", "bridge", "fema_entrance", "bunker", "outpost", "silo", "shelter", "police" ],
+      "message": "You add roads and restaurants to your map."


Message is invalid (copy-paste error) and should be updated.

kevingranade · Apr 8, 2019

This pull request has been mentioned on Cataclysm: Dark Days Ahead. There might be relevant details there:

https://discourse.cataclysmdda.org/t/road-maps-and-tourist-maps/19593/5

ZhilkinSerg added <Enhancement / Feature> [JSON] [C++] Items / Item Actions / Item Qualities labels Dec 8, 2018

Don't rewrite existing `reveal_map_center_omt`

Loading status checks…

89e3ab9

ZhilkinSerg added some commits Dec 9, 2018

Implemented changes from review comments

Loading status checks…

25c1195

Revert "Overmap functions"
This reverts commit ef4d6a2.

b411040

Trail map deconstruction recipe

Loading status checks…

391c371

ZhilkinSerg deleted the ZhilkinSerg:map-items-overhaul branch Dec 14, 2018

ZhilkinSerg referenced this pull request Dec 20, 2018
Merged
Fixed military map message #27197

CleverRaven/Cataclysm-DDA

Overhaul of map revealing items #27012

Overhaul of map revealing items #27012

ZhilkinSerg commented Dec 8, 2018 •

edited

ZhilkinSerg added some commits Dec 8, 2018

ZhilkinSerg added <Enhancement / Feature> [JSON] [C++] Items / Item Actions / Item Qualities labels Dec 8, 2018

kevingranade reviewed Dec 9, 2018

View changes

This comment has been minimized.

This comment has been minimized.

kevingranade reviewed Dec 9, 2018

View changes

This comment has been minimized.

kevingranade reviewed Dec 9, 2018

View changes

This comment has been minimized.

This comment has been minimized.

kevingranade reviewed Dec 9, 2018

View changes

This comment has been minimized.

This comment has been minimized.

BevapDin reviewed Dec 9, 2018

View changes

This comment has been minimized.

This comment has been minimized.

ZhilkinSerg added some commits Dec 9, 2018

This comment has been minimized.

ZhilkinSerg commented Dec 9, 2018

This comment has been minimized.

ZhilkinSerg commented Dec 9, 2018

This comment has been minimized.

I-am-Erk commented Dec 10, 2018

This comment has been minimized.

ZhilkinSerg commented Dec 10, 2018

Rivet-the-Zombie merged commit `1c4c8da` into CleverRaven:master Dec 14, 2018
3 checks passed

3 checks passed

ZhilkinSerg deleted the ZhilkinSerg:map-items-overhaul branch Dec 14, 2018

This comment has been minimized.

kevingranade commented Dec 20, 2018

ZhilkinSerg reviewed Dec 20, 2018

View changes

This comment has been minimized.

ZhilkinSerg referenced this pull request Dec 20, 2018

Fixed military map message #27197

This comment has been minimized.

kevingranade commented Apr 8, 2019

CleverRaven/Cataclysm-DDA

Join GitHub today

Overhaul of map revealing items #27012

Conversation

ZhilkinSerg commented Dec 8, 2018 • edited

Summary

Purpose of change

Describe the solution

Additional context

ZhilkinSerg added some commits Dec 8, 2018

ZhilkinSerg added <Enhancement / Feature> [JSON] [C++] Items / Item Actions / Item Qualities labels Dec 8, 2018

kevingranade reviewed Dec 9, 2018 View changes

This comment has been minimized.

This comment has been minimized.

kevingranade reviewed Dec 9, 2018 View changes

This comment has been minimized.

kevingranade reviewed Dec 9, 2018 View changes

This comment has been minimized.

This comment has been minimized.

kevingranade reviewed Dec 9, 2018 View changes

This comment has been minimized.

This comment has been minimized.

BevapDin reviewed Dec 9, 2018 View changes

This comment has been minimized.

This comment has been minimized.

ZhilkinSerg added some commits Dec 9, 2018

This comment has been minimized.

ZhilkinSerg commented Dec 9, 2018

This comment has been minimized.

ZhilkinSerg commented Dec 9, 2018

This comment has been minimized.

I-am-Erk commented Dec 10, 2018

This comment has been minimized.

ZhilkinSerg commented Dec 10, 2018

Hide details View details Rivet-the-Zombie merged commit 1c4c8da into CleverRaven:master Dec 14, 2018 3 checks passed

3 checks passed

ZhilkinSerg deleted the ZhilkinSerg:map-items-overhaul branch Dec 14, 2018

This comment has been minimized.

kevingranade commented Dec 20, 2018

ZhilkinSerg reviewed Dec 20, 2018 View changes

This comment has been minimized.

ZhilkinSerg referenced this pull request Dec 20, 2018

This comment has been minimized.

kevingranade commented Apr 8, 2019

ZhilkinSerg commented Dec 8, 2018 •

edited

kevingranade reviewed Dec 9, 2018

View changes

kevingranade reviewed Dec 9, 2018

View changes

kevingranade reviewed Dec 9, 2018

View changes

kevingranade reviewed Dec 9, 2018

View changes

BevapDin reviewed Dec 9, 2018

View changes

Rivet-the-Zombie merged commit `1c4c8da` into CleverRaven:master Dec 14, 2018
3 checks passed

ZhilkinSerg reviewed Dec 20, 2018

View changes