merge master #170

MattOttawa · 2021-07-12T22:31:10Z

No description provided.

…or them in cites.

…d of outright removing it. Some refactor.

…uating if it can reach enemy cities when it is potentially stranded; fixes one instance of the assert: "Cannot reach supposedly reachable city"

…it is not accurate and has many false positives, its like a shot in the dark as it trigger regardless unreachable city is supposed to be reachable or not.

… obsoleteing after replacement

…sert as it is not accurate and has many false positives, its like a shot in the dark as it trigger regardless unreachable city is supposed to be reachable or not." This reverts commit 7d923a8.

…ng spaces

…y" assert.

…t them, found couple of issues

… already in cargo is not well suited for SM game rules.

raxo2222 and others added 19 commits July 12, 2021 10:19

Detect implicit replacements - unlisted replacements of replacements

273d270

Fixed save-stream-read order bug for trade routes and the max limit f…

7c18c88

…or them in cites.

Added back code that I recently removed,, but commented it out instea…

8eb876f

…d of outright removing it. Some refactor.

First pass of filling replacements with implicit ones

a5b0b5b

Buildings now list all potential replacements

e06991e

Fixed minor mistakes

6b650e5

Merge branch 'master' of https://github.com/caveman2cosmos/Caveman2Co…

383465c

…smos

fixed NULL CyUnit assert 2 (#1070)

ceffaad

Stopped units that cannot attack or blend into enemy cities from eval…

15c2f98

…uating if it can reach enemy cities when it is potentially stranded; fixes one instance of the assert: "Cannot reach supposedly reachable city"

Commented out the "cannot reach supposedly reachable city" assert as …

7d923a8

…it is not accurate and has many false positives, its like a shot in the dark as it trigger regardless unreachable city is supposed to be reachable or not.

Now only earliest replacement is considered when it comes to building…

735fc6c

… obsoleteing after replacement

Revert "Commented out the "cannot reach supposedly reachable city" as…

5aeb8d2

…sert as it is not accurate and has many false positives, its like a shot in the dark as it trigger regardless unreachable city is supposed to be reachable or not." This reverts commit 7d923a8.

Adding affected buildings tech obsoletion finder, also removed traili…

a6f1601

…ng spaces

Removed building references, that can't be affected by other buildings

821f824

Refactoring of pathfinding code.

f6ab0bf

Tweaks while investigating the "cannot reach supposedly reachable cit…

54c72a0

…y" assert.

Refactored a bit debug code

85e1ef6

Added debug code to detect building obsoleting before civic can affec…

a33d3d7

…t them, found couple of issues

Crude workaround for assert, code for barb ship spawned in with units…

26b987c

… already in cargo is not well suited for SM game rules.

MattOttawa merged commit 8bc59a0 into MattOttawa:master Jul 12, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

merge master #170

merge master #170

MattOttawa commented Jul 12, 2021

merge master #170

merge master #170

Conversation

MattOttawa commented Jul 12, 2021