MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop

develop
lethosor 2020-12-27 23:38:32 -05:00
parent 4460584361 58a4dbe15d
commit a4ac11c238
No known key found for this signature in database
GPG Key ID: 76A269552F4F58C1
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/changelog.txt
Unescape Escape View File

@ -33,6 +33,9 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
# Future # Future
## Fixes
- `embark-assistant`: fixed order of factors when calculating min temperature
# 0.47.04-r4 # 0.47.04-r4
## Fixes ## Fixes

8
plugins/embark-assistant/survey.cpp
Unescape Escape View File

@ -432,17 +432,17 @@ namespace embark_assist {
} }
if (world->world_data->world_height == 17) { if (world->world_data->world_height == 17) {
divisor = (57 / steps * lat + 0.4); divisor = ((lat * 57) / steps + 0.4);
} }
else if (world->world_data->world_height == 33) { else if (world->world_data->world_height == 33) {
divisor = (61 / steps * lat + 0.1); divisor = ((lat * 61) / steps + 0.1);
} }
else if (world->world_data->world_height == 65) { else if (world->world_data->world_height == 65) {
divisor = (63 / steps * lat); divisor = ((lat * 63) / steps);
} }
else if (world->world_data->world_height == 129 || else if (world->world_data->world_height == 129 ||
world->world_data->world_height == 257) { world->world_data->world_height == 257) {
divisor = (64 / steps * lat); divisor = ((lat * 64) / steps);
} }
else { else {
return max_temperature; // Not any standard world height. No formula available return max_temperature; // Not any standard world height. No formula available