Rucknium/TownforgeR
1
0
Fork 0
mirror of https://github.com/Rucknium/TownforgeR.git synced 2025-03-12 09:17:05 +01:00
Code Issues Projects Releases Wiki Activity

hotfix for other cities' flags appearing on main map

Browse Source
This commit is contained in:
Rucknium 2021-07-23 17:56:10 -04:00
parent 1e44be9b52
commit ee499502e3
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
R/geo.R
View File

@ -127,7 +127,7 @@ tf_flag_bounds <- function(url.rpc, grid.dim = NULL, coords.origin = NULL, coord
if (i == 21 & packageVersion("TownforgeR") == "0.0.15") { next }
# far away flag in testnet
ret <- TownforgeR::tf_rpc_curl(url.rpc = url.rpc, method = "cc_get_flag", params = list(id = i))
if (any(names(ret) == "error")) { next }
if (any(names(ret) == "error") || ret$result$city > 0) { next }
coords.mat[i, "x0"] <- ret$result$x0
coords.mat[i, "x1"] <- ret$result$x1
coords.mat[i, "y0"] <- ret$result$y0
@ -320,7 +320,7 @@ tf_infl_location <- function(url.rpc, building.type = "all", coords.origin = NUL
for (i in 1:max.flag.id) {
if (i == 21 & packageVersion("TownforgeR") == "0.0.15") { next }
ret <- TownforgeR::tf_rpc_curl(url.rpc = url.rpc, method = "cc_get_flag", params = list(id = i))
if (any(names(ret) == "error")) { next }
if (any(names(ret) == "error") || ret$result$city > 0) { next }
if ( ! ret$result$role %in% building.type) { next }
# TODO: want to check if ret$result$active == TRUE
coords.mat[i, "x0"] <- ret$result$x0

2
R/search-best-flags.R
View File

@ -422,7 +422,7 @@ tf_build_buildings <- function(url.townforged, url.wallet, flags.to.buy.df, buil
# far away flag in testnet
ret <- TownforgeR::tf_rpc_curl(method = "cc_get_flag", params = list(id = i),
url.rpc = url.townforged, keep.trying.rpc = TRUE)
if (any(names(ret) == "error")) { next }
if (any(names(ret) == "error") || ret$result$city > 0) { next }
coords.mat[i, "x0"] <- ret$result$x0
coords.mat[i, "x1"] <- ret$result$x1
coords.mat[i, "y0"] <- ret$result$y0

2
R/server.R
View File

@ -194,7 +194,7 @@ serverTF <- function(input, output, session){
if (i == 21 & packageVersion("TownforgeR") == "0.0.15") { next }
# far away flag in testnet
ret <- TownforgeR::tf_rpc_curl(url.rpc = url.townforged, method = "cc_get_flag", params = list(id = i))
if (any(names(ret) == "error")) { next }
if (any(names(ret) == "error") || ret$result$city > 0) { next }
coords.mat[i, "x0"] <- ret$result$x0
coords.mat[i, "x1"] <- ret$result$x1
coords.mat[i, "y0"] <- ret$result$y0