diff --git a/resources/lang/en.json b/resources/lang/en.json index 4f41c9347..ea078c4fe 100644 --- a/resources/lang/en.json +++ b/resources/lang/en.json @@ -130,9 +130,7 @@ "disable_nations": "Disable Nations", "instant_build": "Instant build", "infinite_gold": "Infinite gold", - "donate_gold": "Donate gold", "infinite_troops": "Infinite troops", - "donate_troops": "Donate troops", "disable_nukes": "Disable Nukes", "enables_title": "Enable Settings", "start": "Start Game" diff --git a/src/client/SinglePlayerModal.ts b/src/client/SinglePlayerModal.ts index 145ee5214..2f9653e5b 100644 --- a/src/client/SinglePlayerModal.ts +++ b/src/client/SinglePlayerModal.ts @@ -33,9 +33,7 @@ export class SinglePlayerModal extends LitElement { @state() private disableNPCs: boolean = false; @state() private bots: number = 400; @state() private infiniteGold: boolean = false; - @state() private donateGold: boolean = false; @state() private infiniteTroops: boolean = false; - @state() private donateTroops: boolean = false; @state() private instantBuild: boolean = false; @state() private useRandomMap: boolean = false; @state() private gameMode: GameMode = GameMode.FFA; @@ -454,9 +452,9 @@ export class SinglePlayerModal extends LitElement { disableNPCs: this.disableNPCs, bots: this.bots, infiniteGold: this.infiniteGold, - donateGold: this.donateGold, + donateGold: true, + donateTroops: true, infiniteTroops: this.infiniteTroops, - donateTroops: this.donateTroops, instantBuild: this.instantBuild, disabledUnits: this.disabledUnits .map((u) => Object.values(UnitType).find((ut) => ut === u)) diff --git a/src/core/Schemas.ts b/src/core/Schemas.ts index e402da509..0abf62554 100644 --- a/src/core/Schemas.ts +++ b/src/core/Schemas.ts @@ -145,8 +145,8 @@ export type TeamCountConfig = z.infer; export const GameConfigSchema = z.object({ gameMap: z.enum(GameMapType), difficulty: z.enum(Difficulty), - donateGold: z.boolean(), - donateTroops: z.boolean(), + donateGold: z.boolean(), // Configures donations to humans only + donateTroops: z.boolean(), // Configures donations to humans only gameType: z.enum(GameType), gameMode: z.enum(GameMode), disableNPCs: z.boolean(), diff --git a/src/core/game/PlayerImpl.ts b/src/core/game/PlayerImpl.ts index a52cd26e8..e2ac4deed 100644 --- a/src/core/game/PlayerImpl.ts +++ b/src/core/game/PlayerImpl.ts @@ -21,8 +21,6 @@ import { ColoredTeams, Embargo, EmojiMessage, - GameMode, - GameType, Gold, MessageType, MutableAlliance, @@ -578,14 +576,10 @@ export class PlayerImpl implements Player { } if ( recipient.type() === PlayerType.Human && - this.mg.config().gameConfig().gameMode === GameMode.FFA && - this.mg.config().gameConfig().gameType === GameType.Public + this.mg.config().donateGold() === false ) { return false; } - if (this.mg.config().donateGold() === false) { - return false; - } for (const donation of this.sentDonations) { if (donation.recipient === recipient) { if ( @@ -605,14 +599,10 @@ export class PlayerImpl implements Player { } if ( recipient.type() === PlayerType.Human && - this.mg.config().gameConfig().gameMode === GameMode.FFA && - this.mg.config().gameConfig().gameType === GameType.Public + this.mg.config().donateTroops() === false ) { return false; } - if (this.mg.config().donateTroops() === false) { - return false; - } for (const donation of this.sentDonations) { if (donation.recipient === recipient) { if ( diff --git a/src/server/MapPlaylist.ts b/src/server/MapPlaylist.ts index 002226e46..1837de717 100644 --- a/src/server/MapPlaylist.ts +++ b/src/server/MapPlaylist.ts @@ -77,8 +77,8 @@ export class MapPlaylist { // Create the default public game config (from your GameManager) return { - donateGold: true, - donateTroops: true, + donateGold: false, + donateTroops: false, gameMap: map, maxPlayers: config.lobbyMaxPlayers(map, mode, playerTeams), gameType: GameType.Public,