search

TGITS-Solutions / Cataclysm-DDA

Cataclysm - Dark Days Ahead. A turn-based survival game set in a post-apocalyptic world.
http://cataclysmdda.org
Other
1 stars 1 forks source link

Merge from CleverRaven #39

Closed TrainTurningPoint closed 5 years ago

TrainTurningPoint commented 5 years ago

SUMMARY: Infrastructure "Merge from CleverRaven"

Purpose of change

Routine merge

TrainTurningPoint commented 5 years ago

Hi @Coolthulhu. Could you please check that I didn't ruin the endgame lab code on merge? There were some conflicting changes in CleverRaven repo.

Coolthulhu commented 5 years ago

I don't see anything wrong, although I only skimmed it because without any hints to what was in conflict, I can't really focus on any part. Did you try generating a world, teleporting to overmap (0,0), locating the "big lab", teleporting to the finale and activating the computer to get a win screen? If all of this works on a new world, it should be fine.

TrainTurningPoint commented 5 years ago

@Coolthulhu Yes, that's the problem. I tried and didn't find a lab with portal finale near (0, 0). Didn't notice what could be the problem at a glance. I'll add info about merge conflicts in a moment.

Coolthulhu commented 5 years ago

I tried and didn't find a lab with portal finale near (0, 0).

Did you search for lab on surface? As in, using the in-game search for substring in name? If so, that doesn't work because of central labs being weird. You have to search for access shaft (or similar name, looks like a white 0 on map) on -1 z-level.

And I'm only just noticing that the symbol was changed as well from 76 to "L".

That might be it, though I'd expect it to fail at load, not at mapgen.

TrainTurningPoint commented 5 years ago

Searched for "portal chamber". But now I've realized that the search tool only looks on the same z-level you use it, so it explains why I didn't find it.

Anyway, results are inconclusive. Tried to generate map twice. There was a proper central lab with access shaft and portal on the first try, but I don't see anything on the second attempt.

I think I'll merge is as it is, since it does work on occasion and we'll return to working on the endgame locations later anyway. Thank you.