Merge pull request #1420 from solaris-games/dev

Update 251.3 fixes

Author: SpacialCircumstances

client/src/eventBusEventNames/mapCommand.ts

@@ -15,7 +15,7 @@ export default class MapCommandEventBusEventNames {
   public static readonly MapCommandPanToLocation: MapCommandEventBusEventName<{ location: Location }> = toEventName('panToLocation');
   public static readonly MapCommandPanToPlayer: MapCommandEventBusEventName<{ player: Player }> = toEventName('panToPlayer');
   public static readonly MapCommandClearHighlightedLocations: MapCommandEventBusEventName<{}> = toEventName('clearHighlightedLocations');
-  public static readonly MapCommandHighlightLocation: MapCommandEventBusEventName<{ object: MapObject<string>, opacity: number }> = toEventName('highlightLocation');
+  public static readonly MapCommandHighlightLocation: MapCommandEventBusEventName<{ location: Location }> = toEventName('highlightLocation');
   public static readonly MapCommandClickStar: MapCommandEventBusEventName<{ starId: string }> = toEventName('clickStar');
   public static readonly MapCommandClickCarrier: MapCommandEventBusEventName<{ carrierId: string }> = toEventName('clickCarrier');
   public static readonly MapCommandRemoveLastRulerPoint: MapCommandEventBusEventName<{}> = toEventName('removeLastRulerPoint');

client/src/game/map.ts

@@ -252,7 +252,7 @@ export class Map {
     const panToUser = () => this.panToUser(this.game!);
     const panToPlayer = ({ player }: { player: Player }) => this.panToPlayer(this.game!, player);
     const clearHighlightedLocations = () => this.clearCarrierHighlights();
-    const highlightLocation = ({ object, opacity }: { object: MapObject<string>, opacity: number }) => this.highlightLocation(object, opacity);
+    const highlightLocation = ({ location }: { location: Location }) => this.highlightLocation(location);
     const clickStar = ({ starId }: { starId: string }) => this.clickStar(starId);
     const clickCarrier = ({ carrierId }: { carrierId: string }) => this.clickCarrier(carrierId);
     const removeLastRulerWaypoint = () => this.removeLastRulerPoint();
@@ -1000,7 +1000,7 @@ export class Map {
     if (this.background) this.background.refreshZoom(zoomPercent)
   }
 
-  highlightLocation (location, opacity = 1) {
+  highlightLocation (location: Location, opacity = 1) {
     let graphics = new PIXI.Graphics()
     let radius = 12
 

client/src/views/game/components/carrier/CarrierWaypoints.vue

@@ -85,6 +85,7 @@ import CarrierApiService from '../../../../services/api/carrier'
 import AudioService from '../../../../game/audio'
 import OrbitalMechanicsETAWarningVue from '../shared/OrbitalMechanicsETAWarning.vue'
 import {eventBusInjectionKey} from "../../../../eventBus";
+import MapEventBusEventNames from "@/eventBusEventNames/map";
 
 export default {
   components: {
@@ -127,10 +128,10 @@ export default {
     GameContainer.setMode('waypoints', this.carrier)
 
     this.waypointCreatedHandler = this.onWaypointCreated.bind(this);
-    this.eventBus.on('onWaypointCreated', this.waypointCreatedHandler);
+    this.eventBus.on(MapEventBusEventNames.MapOnWaypointCreated, this.waypointCreatedHandler);
 
     this.waypointOutOfRangeHandler = this.onWaypointOutOfRange.bind(this);
-    this.eventBus.on('onWaypointOutOfRange', this.waypointOutOfRangeHandler);
+    this.eventBus.on(MapEventBusEventNames.MapOnWaypointOutOfRange, this.waypointOutOfRangeHandler);
 
     this.oldWaypoints = this.carrier.waypoints.slice(0);
     this.oldWaypointsLooped = this.carrier.waypointsLooped;
@@ -200,17 +201,17 @@ export default {
       this.recalculateTotalEta()
       this.recalculateLooped()
     },
-    onWaypointCreated (e) {
+    onWaypointCreated ({ waypoint }) {
       // Overwrite the default action and default action ships
-      e.action = this.$store.state.settings.carrier.defaultAction
-      e.actionShips = this.$store.state.settings.carrier.defaultAmount
+      waypoint.action = this.$store.state.settings.carrier.defaultAction
+      waypoint.actionShips = this.$store.state.settings.carrier.defaultAmount
 
       AudioService.type()
 
       this.recalculateTotalEta()
       this.recalculateLooped()
     },
-    onWaypointOutOfRange (e) {
+    onWaypointOutOfRange ({ waypoint }) {
       this.$toast.error(`This waypoint is out of hyperspace range.`)
     },
     recalculateTotalEta () {

server/services/trade.ts

@@ -457,6 +457,14 @@ export default class TradeService extends EventEmitter {
         return tradeTechs;
     }
 
+    _canPlayersTradeInRange(game: Game, fromPlayer: Player, toPlayer: Player) {
+        if (game.settings.player.tradeScanning === 'scanned') {
+            return this.playerService.isInScanningRangeOfPlayer(game, fromPlayer, toPlayer);
+        }
+
+        return true;
+    }
+
     _tradeScanningCheck(game: Game, fromPlayer: Player, toPlayer: Player) {
         if (game.settings.player.tradeScanning === 'scanned') {
             let isInRange = this.playerService.isInScanningRangeOfPlayer(game, fromPlayer, toPlayer);
@@ -525,6 +533,10 @@ export default class TradeService extends EventEmitter {
             return;
         }
 
+        if (!this._canPlayersTradeInRange(game, fromPlayer, toPlayer)) {
+            return;
+        }
+
         let tradeChance = TRADE_CHANCE_BASE + (TRADE_CHANCE_STEP * reputation.score);
         let tradeRoll = this.randomService.getRandomNumber(99);
         let canPerformTrade = tradeRoll <= tradeChance || true;