Sewer Features From DDA #626
Conversation
Bringing over changes for sewer extras as requested in: cataclysmbnteam#98 Sewer change from DDA here: CleverRaven/Cataclysm-DDA#43326
| @@ -543,6 +543,32 @@ | |||
| "mx_point_burned_ground": 125, | |||
| "mx_casings": 30 | |||
| } | |||
| }, | |||
| "sewer": { | |||
There was a problem hiding this comment.
This part unfortunately also requires porting some C++.
It might not be much, I'll check it later.
There was a problem hiding this comment.
Hmm, if you can point me in the right direction I'll get started on that this weekend when I get a chance, otherwise I'll take a look this weekend and see what I can find.
There was a problem hiding this comment.
The field itself is in regional_settings (.h and .cpp), but most of the handling of it is probably in overmap.cpp.
It would be the best if you found the actual DDA PR, since there may be other places. git blame is useful for this - git blame file_name_here shows which commit hash changed which line, you can then search for the commit on DDA github to find the PR.
If it's too complex to port, you can leave this PR open and I'll probably port the C++ part later.
There was a problem hiding this comment.
I pulled the new sewer stuff directly from the PR (#43326) on DDA, which I named in the description, the only changes on that pull were to JSON files.
I did glance through the code and the only differences I could find were:
BN : overmap.cpp:1841-1842
tripoint omt_pos( i.pos, z ); tripoint sm_pos = omt_to_sm_copy( omt_pos );
DDA: overmap.cpp:1731-1732
tripoint_om_omt omt_pos( i.pos, z ); tripoint_om_sm sm_pos = project_to<coords::sm>( omt_pos );
These are referencing the CHUD mob and when to load it.
Unless there is something you know that I am missing?
There was a problem hiding this comment.
I pulled the new sewer stuff directly from the PR (#43326) on DDA, which I named in the description, the only changes on that pull were to JSON files.
In regional_settings.cpp, in void load_region_settings( const JsonObject &jo ), there are 3 lines:
load_building_types( "houses", new_region.city_spec.houses );
load_building_types( "shops", new_region.city_spec.shops );
load_building_types( "parks", new_region.city_spec.parks );
DDA probably also has something like
load_building_types( "sewers", new_region.city_spec.sewers );
in there.
That line and PR that introduced it are needed for the "sewers" array in the JSON to be handled. Without it, it will be ignored and reported as a JSON field that wasn't read.
There was a problem hiding this comment.
I'd be glad to be wrong here.
Bottom line is: does it clearly show up as expected in manual testing? If it does, it works well enough.
There was a problem hiding this comment.
A screenshot from build a40a4de, 2021-06-23-1851:
And a screenshot from the same build, but from my test game directory, after the changes:
I always keep one directory for actually playing, and a separate directory for testing changes. Easier to compare the two, at least for me, this way.
There was a problem hiding this comment.
Is anything else needed from me on this?
There was a problem hiding this comment.
Oh right, I totally forgot that this should work. Sorry.
I'll test+possibly merge in next batch, most likely tomorrow.
There was a problem hiding this comment.
No problem. Ready to move on to other things :)
Summary
SUMMARY: Content "Bring over sewer extras from DDA."
Purpose of change
Bringing over changes for sewer extras as requested in: #98
Sewer change from DDA here: Cataclysm-DDA/pull/43326
Describe the solution
See purpose of change above
Describe alternatives you've considered
Redo all of it by hand.... suuure.
Testing
Made changes locally, loaded up a test game and wondered around sewers for a while.
Additional context
See 'Purpose of change' above, link to DDA pull request for more detailed information.
All credit goes to LovamKicsiGazsii for actual work performed.