Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Automatic terrain transitions with single terrain type #556

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ proj/vs*/*/ipch/
proj/vs*/.vs
proj/vs*/.vs
proj/vs*/packages/
proj/vs*/vcpkg_installed/
proj/vs*/*.nupkg

# SCons junk files
.sconsign.dblite
Expand Down
Binary file modified rsrc/graphics/ter1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
96 changes: 48 additions & 48 deletions rsrc/scenarios/valleydy/out/out0~2.map
Original file line number Diff line number Diff line change
@@ -1,48 +1,48 @@
5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,71,71,71,15,5,5,5,5,5,5,5
5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,71,71,71,15,5,5,5,5,5,5,5
5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,20,77,77,77,19,5,5,5,5,5,5,5
5,5,5,5,5,5,5,5,5,5,5,21,245@9,18,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,21,8,71,71,71,15,5,5,5,5,5,5,5
5,5,5,5,5,5,5,5,5,5,5,9,0&25,17,18,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,71,71,71,71,15,5,5,5,5,5,5,5
5,5,5,5,5,5,5,5,5,5,5,9,0&25,0&25,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,20,77,77,77,12,19,5,5,5,5,5,5,5
5,5,5,5,5,5,5,5,5,5,5,20,11,0&25,15,5,5,21,6,6,6,6,6,6,18,5,5,5,5,5,5,5,5,5,21,8,71,71,71,17,18,5,5,5,5,5,5,5
5,5,5,5,5,5,21,6,18,21,6,18,9,0&25,15,5,5,9,0,0,0,0,0,98,17,18,5,5,5,5,5,21,6,6,8,0,71,71,71,0,15,5,5,5,5,5,5,5
5,5,5,5,5,5,9,71,17,8,96,15,9,0&25:0,17,6,18,9,0,0,0,0,0,0,93,17,6,6,6,6,6,8,0,0,0,74,71,71,71,1,17,18,5,5,5,5,5,5
5,5,5,5,5,5,9,71,96,96,96,15,9,0&25,0,1,17,8,0,98,93,92,98,94,0,0,93,0,92,93,0,93,0,0,71,71,71,71,71,0,0,15,5,5,5,5,5,5
5,5,5,5,5,5,20,11,96,96,0,17,8,0&25,0,0,0,1,0,0,97,97,94,98,93,0,92,0,93,0,93,0,71,71,71,71,71,71,92,91,0,15,5,5,5,5,5,5
5,5,5,5,5,5,5,9,96,0,0,0,0,0&25,0&25,0,0,0,0,94,97,0,93,92,93,0,71,71,71,71,74,71,71,71,71,71,71,71,91,1,91,17,18,5,5,5,5,5
5,5,5,5,5,5,5,20,11,0,97,0,98,0,0&25,1,0,0,93,0,0,0,0,91,91,71,71,71,71,71,71,71,71,74,71,71,1,93,0,0,0,92,15,5,5,5,5,5
5,5,5,5,5,5,5,5,9,0,0,0,0,97,0&25,0&25,0,0,0,98,98,93,92,0,71,71,71,71,71,71,71,71,71,71,71,92,1,92,0,98,0,91,15,5,5,5,5,5
5,5,5,5,5,5,5,5,9,0,1,0,0,0*3,0,0&25,0,0,98,0,0,0,0,0,71,71,71,71,1,1,91,92,1,0,0,91,91,91,91,91,91,98,15,5,5,5,5,5
5,5,5,5,5,5,5,21,8,0,0,0,97,0,0,0&25,0,0,0,0,1,93,92,0,71,71,71,93,0,93,91,91,1,0,91,91,94:5,98,98,0:4,92,93,15,5,5,5,5,5
5,5,5,5,5,5,5,9,0,0,0,0,0,0,0,0&25,106!0,0,0,0,98,0,92,93,74,71,71,0,94,91,91,92,91,0,91,91,91,93,91,97,93*0,0,15,5,5,5,5,5
5,5,5,5,5,5,21,8,0,0,0,85,86,0,0&25,0&25,0&25,0&25,0&25,0&25,0,0,93,92,71,71,71,71,94,91,94,93,0,92,1,93,91,91,91,0,94,94,15,5,5,5,5,5
5,5,5,5,5,5,9,0,98,1,0,0,0,0,0,0,0,0,0,0&25,0,0,1,0,71,71,71,71,94,0,91,91,91,92,93,91,92,0,98,0,91,91,15,5,5,5,5,5
5,5,5,5,5,5,9,0,0,97,0,0,85,86,0,96,0,1,0,0&25,0&25,1,0,0,0,71,74,71,71,71,71,71,93,92,93,98,0,91,92,91,91,0,15,5,5,5,5,5
5,5,5,5,5,5,9,0,0,0,0,0&25,0,0,0,0,96,96,96,0,0&25,0,0*2,0,0,71,71,71,71,71,71,71,71,71,92,1,91,92,92,92,0,0,15,5,5,5,5,5
5,5,5,5,5,5,9,0,0,0,0,0&25,0&25,0,1,93,0,96,96,0,0&25,0&25,0,0,0,0,71,71,71,71,71,71,71,71,0,0,91,0,0,0,97,0,15,5,5,5,5,5
5,5,5,5,5,5,20,11,0,0,0,0,0&25,0,0,0,96,0,96,0,0,0&25,0&25,0,0,0,91,0,0,93,71,71,71,71,0,0,0,0:9,91,91,0:9,14,19,5,5,5,5,5
5,5,5,5,5,5,5,20,11,0,0,0,0&25,96,96,96,96,96,96,84,96,0,0&25,0&25,0,0,93,0,0,0,1,71,71,71,0,92,91,91,0,0,1,15,5,5,5,5,5,5
5,5,5,5,5,5,5,5,20,11,96,93,0&25,84,96,96,84,0,0,96,0,1,91,0&25,96,0,93,1,92,0,0,71,71,71,71,0:9,91,0,0,14,12,19,5,5,5,5,5,5
5,5,5,5,5,5,5,5,5,227@19,0&25,0&25,0&25,96,0,71,71,71,71,71,0,96,1,0&25,0,0,93,0,93,93,93,71,71,71,71,0,0,0,0,15,5,5,5,5,5,5,5,5
5,5,5,5,5,5,5,21,6,8,0,0,0,71,71,71,74,71,71,71,96,0,1,0&25,1,0,96,0,96,0,0,0,71,71,71,0,0,0,0,17,18,5,5,5,5,5,5,5
5,5,5,5,5,5,21,8,93,98,0,96,71,71,71,71,71,71,71,71,0,0,1,0&25,96,0,93,0,0,0,0,74,71,71,71,0,0,1,0,0,15,5,5,5,5,5,5,5
5,5,5,5,5,5,9,93,0,96,71,71,71,71,71,71,71,71,71,71,71,96,96,0&25,91,0,93,91,0,0,71,71,71,71,0,0,0,0,0,14,19,5,5,5,5,5,5,5
5,5,5,5,5,5,9,93,96,71,71,71,71,71,71,71,96,84,71,71,71,71,0,0&25,1,0,93,0,93,71,71,71,71,71,0,0,0,0,14,19,5,5,5,5,5,5,5,5
5,5,5,5,5,5,20,11,96,71,71,71,71,71,84,1,96,84,71,71,71,71,0,0&25,0,0,0,0,0,71,71,71,71,0,0,0,14,12,19,5,5,5,5,5,5,5,5,5
5,5,5,5,5,21,6,8,0,71,71,71,1,96,96,0,93,0,96,71,71,71,71,72:2,71,71,96,0,71,71,71,71,71,0,0,14,19,5,5,5,5,5,5,5,5,5,5,5
5,5,5,5,5,9,96,96,96,71,74,71,0,96,96,0,96,98,96,0,71,71,71,72:3,71,71,71,71,71,71,71,71,244,0,0,17,18,21,6,245@10,6,18,5,5,5,5,5,5
5,5,5,5,5,9,0,0,0,71,71,71,71,96,84,0,96,96,0,93,0,0,0,0&25,71,71,71,71,74,71,0,93,244,244,0,0,17,8,244,244,0,15,5,5,5,5,5,5
5,5,5,5,5,20,11,0,97,71,71,71,71,0,0,0,96,93,0,0,0,98,0,0&25,244,0,93,1,0,1,93,0,1,244,244,244,244,244:1,244:1,0&25:1,1:1,15,5,5,5,5,5,5
5,5,5,5,5,5,20,12,11,71,71,74,71,96,96,0,0,0,0,0,0,0,0,0&25,244,244,93,93,0,0,0,0,0,0,98,244,0,244,106!2,0&25,0,15,5,5,5,5,5,5
5,5,5,5,5,5,5,5,9,71,71,71,71,96,0,96,0,96,96,0,0,0&25,0&25,0&25,96,244,244,0,0,0,0,0,244,244,244,244,1,244,0&25,0&25,1,15,5,5,5,5,5,5
5,5,5,5,5,5,5,5,9,71,71,71,1,0,98,98,0,98,0,0&25,0&25,0&25,106!1,0&25,0&25,0&25,244,244,244,244,244,244,244,244,0,0,0&25,244,0&25,0,0,15,5,5,5,5,5,5
5,5,5,5,5,5,5,5,9,71,71,71,71,96,0,98,0,0,0&25,0&25,97,0,0,0,0,0&25,0&25,0&25*1,0&25,0&25,0&25,0&25,0&25,0&25,0&25,0&25,0&25,244,0,0,14,19,5,5,5,5,5,5
5,5,5,5,5,5,5,5,9,71,71,71,14,12,11,0,0,98,0&25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,244,244,244,244,0,14,19,5,5,5,5,5,5,5
5,5,5,5,5,5,5,5,20,77,77,77,19,5,20,12,12,12,243@11,12,12,12,12,12,11,0,0,0,0,0,0,0,0,244,244,244,244,244,14,19,5,5,5,5,5,5,5,5
5,5,5,5,5,21,6,6,8,71,71,71,15,5,5,5,5,5,5,5,5,5,5,5,20,12,12,12,12,12,12,12,12,11,244,244,244,14,19,5,5,5,5,5,5,5,5,5
5,5,5,5,21,8,71,71,71,71,71,14,19,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,20,12,12,13,19,5,5,5,5,5,5,5,5,5,5
5,5,5,5,9,71,71,71,71,71,71,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,21,7,18,5,5,5,5,5,5,5,5,5,5
5,5,5,5,9,71,71,71,71,14,12,19,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,9,0&9:10,15,5,5,5,5,5,5,5,5,5,5
5,5,5,5,9,71,71,71,14,19,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,20,12,19,5,5,5,5,5,5,5,5,5,5
5,5,5,5,9,71,71,71,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
5,5,5,5,9,71,71,71,15,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,71,71,71,5,5,5,5,5,5,5,5
5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,71,71,71,5,5,5,5,5,5,5,5
5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,77,77,77,5,5,5,5,5,5,5,5
5,5,5,5,5,5,5,5,5,5,5,5,245@9,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,71,71,71,5,5,5,5,5,5,5,5
5,5,5,5,5,5,5,5,5,5,5,5,0&25,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,71,71,71,71,5,5,5,5,5,5,5,5
5,5,5,5,5,5,5,5,5,5,5,5,0&25,0&25,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,77,77,77,5,5,5,5,5,5,5,5,5
5,5,5,5,5,5,5,5,5,5,5,5,5,0&25,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,71,71,71,5,5,5,5,5,5,5,5,5
5,5,5,5,5,5,5,5,5,5,5,5,5,0&25,5,5,5,5,0,0,0,0,0,98,5,5,5,5,5,5,5,5,5,5,5,0,71,71,71,0,5,5,5,5,5,5,5,5
5,5,5,5,5,5,5,71,5,5,96,5,5,0&25:0,5,5,5,5,0,0,0,0,0,0,93,5,5,5,5,5,5,5,0,0,0,74,71,71,71,1,5,5,5,5,5,5,5,5
5,5,5,5,5,5,5,71,96,96,96,5,5,0&25,0,1,5,5,0,98,93,92,98,94,0,0,93,0,92,93,0,93,0,0,71,71,71,71,71,0,0,5,5,5,5,5,5,5
5,5,5,5,5,5,5,5,96,96,0,5,5,0&25,0,0,0,1,0,0,97,97,94,98,93,0,92,0,93,0,93,0,71,71,71,71,71,71,92,91,0,5,5,5,5,5,5,5
5,5,5,5,5,5,5,5,96,0,0,0,0,0&25,0&25,0,0,0,0,94,97,0,93,92,93,0,71,71,71,71,74,71,71,71,71,71,71,71,91,1,91,5,5,5,5,5,5,5
5,5,5,5,5,5,5,5,5,0,97,0,98,0,0&25,1,0,0,93,0,0,0,0,91,91,71,71,71,71,71,71,71,71,74,71,71,1,93,0,0,0,92,5,5,5,5,5,5
5,5,5,5,5,5,5,5,5,0,0,0,0,97,0&25,0&25,0,0,0,98,98,93,92,0,71,71,71,71,71,71,71,71,71,71,71,92,1,92,0,98,0,91,5,5,5,5,5,5
5,5,5,5,5,5,5,5,5,0,1,0,0,0*3,0,0&25,0,0,98,0,0,0,0,0,71,71,71,71,1,1,91,92,1,0,0,91,91,91,91,91,91,98,5,5,5,5,5,5
5,5,5,5,5,5,5,5,5,0,0,0,97,0,0,0&25,0,0,0,0,1,93,92,0,71,71,71,93,0,93,91,91,1,0,91,91,94:5,98,98,0:4,92,93,5,5,5,5,5,5
5,5,5,5,5,5,5,5,0,0,0,0,0,0,0,0&25,106!0,0,0,0,98,0,92,93,74,71,71,0,94,91,91,92,91,0,91,91,91,93,91,97,93*0,0,5,5,5,5,5,5
5,5,5,5,5,5,5,5,0,0,0,85,86,0,0&25,0&25,0&25,0&25,0&25,0&25,0,0,93,92,71,71,71,71,94,91,94,93,0,92,1,93,91,91,91,0,94,94,5,5,5,5,5,5
5,5,5,5,5,5,5,0,98,1,0,0,0,0,0,0,0,0,0,0&25,0,0,1,0,71,71,71,71,94,0,91,91,91,92,93,91,92,0,98,0,91,91,5,5,5,5,5,5
5,5,5,5,5,5,5,0,0,97,0,0,85,86,0,96,0,1,0,0&25,0&25,1,0,0,0,71,74,71,71,71,71,71,93,92,93,98,0,91,92,91,91,0,5,5,5,5,5,5
5,5,5,5,5,5,5,0,0,0,0,0&25,0,0,0,0,96,96,96,0,0&25,0,0*2,0,0,71,71,71,71,71,71,71,71,71,92,1,91,92,92,92,0,0,5,5,5,5,5,5
5,5,5,5,5,5,5,0,0,0,0,0&25,0&25,0,1,93,0,96,96,0,0&25,0&25,0,0,0,0,71,71,71,71,71,71,71,71,0,0,91,0,0,0,97,0,5,5,5,5,5,5
5,5,5,5,5,5,5,5,0,0,0,0,0&25,0,0,0,96,0,96,0,0,0&25,0&25,0,0,0,91,0,0,93,71,71,71,71,0,0,0,0:9,91,91,0:9,5,5,5,5,5,5,5
5,5,5,5,5,5,5,5,5,0,0,0,0&25,96,96,96,96,96,96,84,96,0,0&25,0&25,0,0,93,0,0,0,1,71,71,71,0,92,91,91,0,0,1,5,5,5,5,5,5,5
5,5,5,5,5,5,5,5,5,5,96,93,0&25,84,96,96,84,0,0,96,0,1,91,0&25,96,0,93,1,92,0,0,71,71,71,71,0:9,91,0,0,5,5,5,5,5,5,5,5,5
5,5,5,5,5,5,5,5,5,227@19,0&25,0&25,0&25,96,0,71,71,71,71,71,0,96,1,0&25,0,0,93,0,93,93,93,71,71,71,71,0,0,0,0,5,5,5,5,5,5,5,5,5
5,5,5,5,5,5,5,5,5,5,0,0,0,71,71,71,74,71,71,71,96,0,1,0&25,1,0,96,0,96,0,0,0,71,71,71,0,0,0,0,5,5,5,5,5,5,5,5,5
5,5,5,5,5,5,5,5,93,98,0,96,71,71,71,71,71,71,71,71,0,0,1,0&25,96,0,93,0,0,0,0,74,71,71,71,0,0,1,0,0,5,5,5,5,5,5,5,5
5,5,5,5,5,5,5,93,0,96,71,71,71,71,71,71,71,71,71,71,71,96,96,0&25,91,0,93,91,0,0,71,71,71,71,0,0,0,0,0,5,5,5,5,5,5,5,5,5
5,5,5,5,5,5,5,93,96,71,71,71,71,71,71,71,96,84,71,71,71,71,0,0&25,1,0,93,0,93,71,71,71,71,71,0,0,0,0,5,5,5,5,5,5,5,5,5,5
5,5,5,5,5,5,5,5,96,71,71,71,71,71,84,1,96,84,71,71,71,71,0,0&25,0,0,0,0,0,71,71,71,71,0,0,0,5,5,5,5,5,5,5,5,5,5,5,5
5,5,5,5,5,5,5,5,0,71,71,71,1,96,96,0,93,0,96,71,71,71,71,72:2,71,71,96,0,71,71,71,71,71,0,0,5,5,5,5,5,5,5,5,5,5,5,5,5
5,5,5,5,5,5,96,96,96,71,74,71,0,96,96,0,96,98,96,0,71,71,71,72:3,71,71,71,71,71,71,71,71,244,0,0,5,5,5,5,245@10,5,5,5,5,5,5,5,5
5,5,5,5,5,5,0,0,0,71,71,71,71,96,84,0,96,96,0,93,0,0,0,0&25,71,71,71,71,74,71,0,93,244,244,0,0,5,5,244,244,0,5,5,5,5,5,5,5
5,5,5,5,5,5,5,0,97,71,71,71,71,0,0,0,96,93,0,0,0,98,0,0&25,244,0,93,1,0,1,93,0,1,244,244,244,244,244:1,244:1,0&25:1,1:1,5,5,5,5,5,5,5
5,5,5,5,5,5,5,5,5,71,71,74,71,96,96,0,0,0,0,0,0,0,0,0&25,244,244,93,93,0,0,0,0,0,0,98,244,0,244,106!2,0&25,0,5,5,5,5,5,5,5
5,5,5,5,5,5,5,5,5,71,71,71,71,96,0,96,0,96,96,0,0,0&25,0&25,0&25,96,244,244,0,0,0,0,0,244,244,244,244,1,244,0&25,0&25,1,5,5,5,5,5,5,5
5,5,5,5,5,5,5,5,5,71,71,71,1,0,98,98,0,98,0,0&25,0&25,0&25,106!1,0&25,0&25,0&25,244,244,244,244,244,244,244,244,0,0,0&25,244,0&25,0,0,5,5,5,5,5,5,5
5,5,5,5,5,5,5,5,5,71,71,71,71,96,0,98,0,0,0&25,0&25,97,0,0,0,0,0&25,0&25,0&25*1,0&25,0&25,0&25,0&25,0&25,0&25,0&25,0&25,0&25,244,0,0,5,5,5,5,5,5,5,5
5,5,5,5,5,5,5,5,5,71,71,71,5,5,5,0,0,98,0&25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,244,244,244,244,0,5,5,5,5,5,5,5,5,5
5,5,5,5,5,5,5,5,5,77,77,77,5,5,5,5,5,5,243@11,5,5,5,5,5,5,0,0,0,0,0,0,0,0,244,244,244,244,244,5,5,5,5,5,5,5,5,5,5
5,5,5,5,5,5,5,5,5,71,71,71,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,244,244,244,5,5,5,5,5,5,5,5,5,5,5
5,5,5,5,5,5,71,71,71,71,71,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
5,5,5,5,5,71,71,71,71,71,71,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
5,5,5,5,5,71,71,71,71,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0&9:10,5,5,5,5,5,5,5,5,5,5,5
5,5,5,5,5,71,71,71,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
5,5,5,5,5,71,71,71,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
5,5,5,5,5,71,71,71,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
Loading
Loading