From b145e50811b3869ce3acd3a61e27407efc579926 Mon Sep 17 00:00:00 2001
From: Tor Andersson <tor@ccxvii.net>
Date: Thu, 27 Apr 2023 13:27:15 +0200
Subject: Don't log Shipment transfer between own faction.

---
 rules.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/rules.js b/rules.js
index 62dc30f..0a54d51 100644
--- a/rules.js
+++ b/rules.js
@@ -1839,19 +1839,19 @@ states.remove_pieces = {
 // === NEGOTIATION ===
 
 function is_player_govt() {
-	return game.active === NAME_GOVT || game.active === NAME_GOVT_AUC
+	return game.current === GOVT || game.active === NAME_GOVT_AUC
 }
 
 function is_player_farc() {
-	return game.active === NAME_FARC || game.active === NAME_FARC_CARTELS
+	return game.current === FARC || game.active === NAME_FARC_CARTELS
 }
 
 function is_player_auc() {
-	return game.active === NAME_AUC || game.active === NAME_GOVT_AUC || game.active === NAME_AUC_CARTELS
+	return game.current === AUC || game.active === NAME_GOVT_AUC || game.active === NAME_AUC_CARTELS
 }
 
 function is_player_cartels() {
-	return game.active === NAME_CARTELS || game.active === NAME_FARC_CARTELS || game.active === NAME_AUC_CARTELS
+	return game.current === CARTELS || game.active === NAME_FARC_CARTELS || game.active === NAME_AUC_CARTELS
 }
 
 function action_ask_resources() {
@@ -2120,7 +2120,8 @@ states.transfer_shipment = {
 			game.transfer.shipment = sh
 	},
 	piece(p) {
-		log_transfer(`${faction_name[game.current]} gave Shipment to ${piece_faction_name(p)} in S${piece_space(p)}.`)
+		if (game.current !== piece_faction(p))
+			log_transfer(`${faction_name[game.current]} gave Shipment to ${piece_faction_name(p)} in S${piece_space(p)}.`)
 		place_shipment(game.transfer.shipment, p)
 		game.transfer.shipment = -1
 		end_negotiation()
-- 
cgit v1.2.3