diff --git a/places.php b/places.php index c0dd8b9..1ca29d5 100644 --- a/places.php +++ b/places.php @@ -89,11 +89,11 @@ foreach ($places as $place) { if (!$database->has('locations', ['osmid' => $place['osmid']])) { $database->insert('locations', ['osmid' => $place['osmid'], 'teamid' => 0]); } - $gameinfo = $database->select('locations', ['locationid', 'teamid', 'owneruuid', 'currentlife', 'maxlife'], ['osmid' => $place['osmid']])[0]; + $gameinfo = $database->select('locations', ['locationid', 'teamid', 'currentlife', 'maxlife'], ['osmid' => $place['osmid']])[0]; // Reset owner info for dead places if ($gameinfo['currentlife'] <= 0) { $database->update('locations', ['teamid' => 0, 'owneruuid' => null], ['locationid' => $gameinfo['locationid']]); - $gameinfo = $database->select('locations', ['locationid', 'teamid', 'owneruuid', 'currentlife', 'maxlife'], ['osmid' => $place['osmid']])[0]; + $gameinfo = $database->select('locations', ['locationid', 'teamid', 'currentlife', 'maxlife'], ['osmid' => $place['osmid']])[0]; } $geo['features'][] = array("type" => "Feature", "geometry" => [ diff --git a/placestats.php b/placestats.php index 616b181..a2b9e3f 100644 --- a/placestats.php +++ b/placestats.php @@ -13,7 +13,12 @@ $data['status'] = 'OK'; if (!$database->has('locations', ['locationid' => $VARS['locationid']])) { sendError("No stats found.", true); } -$gameinfo = $database->select('locations', ['locationid', 'teamid', 'owneruuid', 'currentlife', 'maxlife'], ['locationid' => $VARS['locationid']])[0]; +$gameinfo = $database->select('locations', ["[>]players" => ["owneruuid" => "uuid"]], ['locations.locationid', 'locations.teamid', 'locations.owneruuid', 'players.nickname', 'locations.currentlife', 'locations.maxlife'], ['locations.locationid' => $VARS['locationid']])[0]; + +if ($gameinfo['owneruuid'] == null) { + $gameinfo['nickname'] = null; +} +$gameinfo['owneruuid'] = ""; $data['stats'] = $gameinfo; echo json_encode($data); \ No newline at end of file diff --git a/settings.template.php b/settings.template.php index 88a7dc3..7b0f759 100644 --- a/settings.template.php +++ b/settings.template.php @@ -23,4 +23,6 @@ define("MUNZEE_KEY", ""); define("MUNZEE_SECRET", ""); define("GOOGLEPLAY_PUBLICKEY", ""); -define("APP_STORE_SANDBOX", true); \ No newline at end of file +define("APP_STORE_SANDBOX", true); + +define("DARKSKY_APIKEY", ""); \ No newline at end of file