File tree Expand file tree Collapse file tree 1 file changed +12
-0
lines changed Expand file tree Collapse file tree 1 file changed +12
-0
lines changed Original file line number Diff line number Diff line change @@ -457,6 +457,14 @@ export default class TradeService extends EventEmitter {
457
457
return tradeTechs ;
458
458
}
459
459
460
+ _canPlayersTradeInRange ( game : Game , fromPlayer : Player , toPlayer : Player ) {
461
+ if ( game . settings . player . tradeScanning === 'scanned' ) {
462
+ return this . playerService . isInScanningRangeOfPlayer ( game , fromPlayer , toPlayer ) ;
463
+ }
464
+
465
+ return true ;
466
+ }
467
+
460
468
_tradeScanningCheck ( game : Game , fromPlayer : Player , toPlayer : Player ) {
461
469
if ( game . settings . player . tradeScanning === 'scanned' ) {
462
470
let isInRange = this . playerService . isInScanningRangeOfPlayer ( game , fromPlayer , toPlayer ) ;
@@ -525,6 +533,10 @@ export default class TradeService extends EventEmitter {
525
533
return ;
526
534
}
527
535
536
+ if ( ! this . _canPlayersTradeInRange ( game , fromPlayer , toPlayer ) ) {
537
+ return ;
538
+ }
539
+
528
540
let tradeChance = TRADE_CHANCE_BASE + ( TRADE_CHANCE_STEP * reputation . score ) ;
529
541
let tradeRoll = this . randomService . getRandomNumber ( 99 ) ;
530
542
let canPerformTrade = tradeRoll <= tradeChance || true ;
You can’t perform that action at this time.
0 commit comments