Merge pull request #1405 from solaris-games/dev

Fixes for 251.1

Author: SpacialCircumstances

client/src/views/game/components/badges/PlayerBadgeShop.vue

@@ -82,7 +82,8 @@ const loadGalacticCredits = async () => {
 onMounted(async () => {
   recipientPlayer.value = GameHelper.getPlayerById(store.state.game!, props.recipientPlayerId)
 
-  badges.value = await store.dispatch('getBadges');
+  const allBadges = await store.dispatch('getBadges');
+  badges.value = allBadges.filter(b => b.price);
   await loadGalacticCredits()
 });
 

client/src/views/game/components/badges/PlayerBadges.vue

@@ -87,7 +87,15 @@ onMounted(async () => {
       badges.value = [];
       console.error(response.cause);
     } else {
-      badges.value = response.data;
+      badges.value = response.data.sort((a, b) => {
+        if (!a.time) {
+          return 1;
+        } else if (!b.time) {
+          return -1;
+        } else {
+          return a.time.getTime() - b.time.getTime();
+        }
+      });
     }
   } catch (err) {
     console.error(err)

client/src/views/game/components/badges/UserBadges.vue

@@ -44,7 +44,15 @@ onMounted(async () => {
       badges.value = [];
       console.error(response.cause);
     } else {
-      badges.value = response.data;
+      badges.value = response.data.sort((a, b) => {
+        if (!a.time) {
+          return 1;
+        } else if (!b.time) {
+          return -1;
+        } else {
+          return a.time.getTime() - b.time.getTime();
+        }
+      });
     }
   } catch (err) {
     console.error(err)

server/api/controllers/badges.ts

@@ -4,7 +4,7 @@ export default (container: DependencyContainer) => {
     return {
         listAll: async (req, res, next) => {
             try {
-                const result = container.badgeService.listPurchasableBadges();
+                const result = container.badgeService.listBadges();
 
                 res.status(200).json(result);
                 return next();

server/config/game/settings/official/1v1.json

@@ -114,7 +114,7 @@
     "experimentationDistribution": "random",
     "bankingReward": "standard",
     "experimentationReward": "standard",
-    "specialistTokenReward": "experimental"
+    "specialistTokenReward": "standard"
   },
   "gameTime": {
     "gameType": "realTime",

server/config/game/settings/official/1v1turnBased.json

@@ -117,7 +117,7 @@
         "experimentationDistribution": "random",
         "bankingReward": "standard",
         "experimentationReward": "standard",
-        "specialistTokenReward": "experimental"
+        "specialistTokenReward": "standard"
     },
     "gameTime": {
         "speed": 3600,

server/jobs/index.ts

@@ -11,10 +11,13 @@ import { cleanupOldGameHistoryJob } from './cleanupOldGameHistory';
 import { cleanupOldTutorialsJob } from './cleanupOldTutorials';
 import { serverStub } from "../sockets/serverStub";
 import {Scheduler, SchedulerOptions} from "./scheduler/scheduler";
+import events from "node:events";
 
 let mongo;
 Error.stackTraceLimit = 1000;
 
+events.setMaxListeners(20);
+
 setupLogging();
 
 const TEN_SECONDS = 10000;

server/services/starCapture.ts

@@ -172,7 +172,7 @@ export default class StarCaptureService {
             const effectiveTechs = this.technologyService.getStarEffectiveTechnologyLevels(game, star);
 
             const starEconCost = this._calculateEconomyCostSum(game, starEconomy, this.starService.calculateTerraformedResource(star.naturalResources.economy, effectiveTechs.terraforming));
-            const rewardLimit = starEconCost * game.constants.star.captureRewardLimitMultiplier;
+            const rewardLimit = Math.floor(starEconCost * game.constants.star.captureRewardLimitMultiplier);
 
             return Math.min(finalReward, rewardLimit);
         }