Merge pull request #18 from msdigital/v1.22.8

V1.22.8

client/index.pug

@@ -32,6 +32,7 @@ html(lang="en").h-100
 
     main(role='main').flex-shrink-0
       .container
+        +newServerError()
         block content
 
     +footer()

client/layout.pug

@@ -39,3 +39,10 @@ mixin footer()
         a(href='http://www.msdigital.ch', target='_blank') msdigital.ch
       span.text-muted.float-end
         | Oasis #{config.VERSION} - Farming Simulator 22 Live Map
+
+mixin newServerError()
+  if isNewServer
+    .row.justify-content-center.new-server-error
+      .col-xl-12
+        .card.bg-danger.mb-3.small.shadow-sm
+          .card-header.text-center="This Server seems to be new. More Information will show up as soon as the server saved the game for the first time!"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "oasis",
-  "version": "1.22.7",
+  "version": "1.22.8",
   "description": "Live Map for Farming Simulator 22",
   "main": "server/app.js",
   "private": false,

public/stylesheets/style.css

@@ -22,6 +22,12 @@ a:hover {
   border-radius: 0;
 }
 
+.card.bg-danger > .card-header {
+  background-color: #ad1c1c;
+  font-size: 14px;
+  font-weight: normal;
+}
+
 .list-group-item {
   font-size: 11px;
   padding-top: 0.3rem;

server/api.js

@@ -62,7 +62,7 @@ module.exports.getSavegame = function (cb) {
 
 module.exports.getEconomy = function(cb) {
   request
-    .get('http://176.57.169.251:8600/feed/dedicated-server-savegame.html?code=M8La9eRC&file=economy')
+    .get('http://' + config.SERVER_IP + '/feed/dedicated-server-savegame.html?code=' + config.SERVER_KEY + '&file=economy')
     .end(function (err, xml) {
       if (err) {
         logger.error(err);

server/app.js

@@ -46,19 +46,6 @@ server.use(function(err, req, res, next) {
   })
 })
 
-// server.use(errorRouter);
-
-// server.use(function(err, req, res, next){
-//   logger.JSON(err.message);
-//   res.status(err.status || 500);
-//   res.render('error',{
-//     error: {
-//       status: 500,
-//       message: err.message
-//     }
-//   });
-// })
-
 var serverPort = config.WEB_PORT >= 0 ? config.WEB_PORT : 3000;
 
 server.listen(serverPort, () => {

server/locales/cz.json

@@ -97,5 +97,7 @@
 	"entity_Baler": "Balíkovač",
 	"entity_Baleloader": "Nakladač balíků",
 	"entity_Plow": "Pluh",
-	"entity_Product Pallet": "Paleta produktu"
+	"entity_Product Pallet": "Paleta produktu",
+	"product_LIQUIDSEEDTREATMENT": "Tekuté ošetření semen",
+	"No Mods installed": "Nejsou nainstalovány žádné mody"
 }

server/locales/de.json

@@ -98,5 +98,7 @@
 	"entity_Baler": "Ballenpresse",
 	"entity_Baleloader": "Ballensammler",
 	"entity_Plow": "Pflug",
-	"entity_Product Pallet": "Produkt Pallette"
+	"entity_Product Pallet": "Produkt Pallette",
+	"No Mods installed": "Keine Mods installiert",
+	"product_LIQUIDSEEDTREATMENT": "Flüssigsamenbehandlung"
 }

server/locales/en.json

@@ -97,5 +97,7 @@
 	"entity_Baleloader": "Baleloader",
 	"entity_Plow": "Plow",
 	"entity_Product Pallet": "Product Pallet",
-	"No Player online": "No Player online"
+	"No Player online": "No Player online",
+	"No Mods installed": "No Mods installed",
+	"product_LIQUIDSEEDTREATMENT": "Liquid seed treatment"
 }

server/model/economy.js

@@ -36,7 +36,7 @@ module.exports.Economy = function (economy) {
     var prices = calcluatePrices(this.rawPrices, getPriceFactor(difficulty))
     var months = getOrderMonths();
 
-    cb(null, { prices: prices, months: months })
+    cb({ prices: prices, months: months })
   }
 }
 

server/model/game.js

@@ -1,15 +1,16 @@
 var util = require('../lib/util')
 
 module.exports.Game = function (game) {
-  var timeScale = Number(game.settings.timeScale._text)
-  var playTime = Number(game.statistics.playTime._text)
+  var timeScale = game.settings !== undefined ? Number(game.settings.timeScale._text) : 0
+  var playTime = game.statistics !== undefined ? Number(game.statistics.playTime._text) : 0
   var serverTime = playTime * timeScale
 
   this.money = util.formatNumber(game.statistics.money._text, 0, ' €')
   this.playtime = util.calcAndFormatTime(serverTime)
-  this.mapname = game.settings.mapTitle._text
+  this.mapname = game.settings !== undefined ? game.settings.mapTitle._text : '-'
   this.timeScale = util.formatNumber(timeScale, 0, "x")
-  this.saveInterval = util.formatNumber(game.settings.autoSaveInterval._text, 0, '')
-  this.difficulty = game.settings.difficulty._text
-  this.economicDifficulty = game.settings.economicDifficulty._text
+  this.saveInterval = game.settings !== undefined ? util.formatNumber(game.settings.autoSaveInterval._text, 0, '') : 0
+  this.difficulty = game.settings !== undefined ? game.settings.difficulty._text : '-'
+  this.economicDifficulty = game.settings !== undefined ? game.settings.economicDifficulty._text : '-'
+  this.isNewServer = game.settings === undefined || game.statistics === undefined ? true : false
 }

server/model/server.js

@@ -3,7 +3,7 @@ var lodash = require('lodash')
 module.exports.Server = function(server){
   this.name = server._attributes.name
   this.version = server._attributes.version
-  this.mods = getMods(server.Mods.Mod)
+  this.mods = getMods((server.Mods !== undefined ? server.Mods.Mod : null))
 }
 
 module.exports.Slots = function(slots){

server/routes/index.js

@@ -9,32 +9,33 @@ router.get('/lang/:lang', function (req, res) {
   res.redirect('back');
 })
 
-var _server = null;
+var _server = null
+  , _savegame = null;
 
 router.get('*', function (req, res, next){
-  api.getEntities((entities) => {
-    _server = entities;
-    next();
+  async.parallel({
+    game: function(cb) {
+      api.getSavegame((res) => { cb(null, res) })
+    },
+    entities: function(cb) {
+      api.getEntities((res) => { cb(null, res) })
+    }
+  },
+  function (err, results) {
+    _server = results.entities
+    _savegame = results.game
+    res.locals.isNewServer = _savegame.isNewServer
+    next()
   })
 })
 
 router.get('/economy', function(req, res, next){
-  async.waterfall([
-    function (cb) {
-      api.getSavegame((game) => {
-        cb(null, game.economicDifficulty)
-      })
-    },
-    function (difficulty, cb) {
-      api.getEconomy((economy) => {
-        economy.calculateEconomy(difficulty,cb)
+  api.getEconomy((economy) => {
+    economy.calculateEconomy(_savegame.economicDifficulty, (eco) => {
+      res.render('economy', {
+        server: _server.server,
+        economy: eco //economy callback
       })
-    }
-  ],
-  function(err, result){
-    res.render('economy', {
-      server: _server.server,
-      economy: result //economy callback
     })
   })
 })
@@ -46,19 +47,12 @@ router.get('/mods', function (req, res, next) {
 })
 
 router.get('/', function(req, res, next){
-  async.parallel({
-    savegame: function (cb) {
-      api.getSavegame((res) => { cb(null, res) })
-    }
-  },
-  function (err, results) {
-    res.render('home', {
-      game: results.savegame,
-      slots: _server.slots,
-      server: _server.server,
-      players: _server.players
-    });
-  })
+  res.render('home', {
+    game: _savegame,
+    slots: _server.slots,
+    server: _server.server,
+    players: _server.players
+  });
 })
 
 module.exports = router;