mirror of
https://github.com/openfrontio/OpenFrontIO.git
synced 2026-06-24 13:52:45 +00:00
bugfix: humans start with zero troops on teams, also removed manpower argument to addPlayer()
This commit is contained in:
@@ -29,10 +29,7 @@ export class SpawnExecution implements Execution {
|
||||
if (this.mg.hasPlayer(this.playerInfo.id)) {
|
||||
player = this.mg.player(this.playerInfo.id);
|
||||
} else {
|
||||
player = this.mg.addPlayer(
|
||||
this.playerInfo,
|
||||
this.mg.config().startManpower(this.playerInfo),
|
||||
);
|
||||
player = this.mg.addPlayer(this.playerInfo);
|
||||
}
|
||||
|
||||
player.tiles().forEach((t) => player.relinquish(t));
|
||||
|
||||
@@ -433,7 +433,7 @@ export interface Game extends GameMap {
|
||||
playerByClientID(id: ClientID): Player | null;
|
||||
playerBySmallID(id: number): Player | TerraNullius;
|
||||
hasPlayer(id: PlayerID): boolean;
|
||||
addPlayer(playerInfo: PlayerInfo, manpower: number): Player;
|
||||
addPlayer(playerInfo: PlayerInfo): Player;
|
||||
terraNullius(): TerraNullius;
|
||||
owner(ref: TileRef): Player | TerraNullius;
|
||||
|
||||
|
||||
@@ -107,9 +107,7 @@ export class GameImpl implements Game {
|
||||
|
||||
private addHumans() {
|
||||
if (this.config().gameConfig().gameMode != GameMode.Team) {
|
||||
this._humans.forEach((p) =>
|
||||
this.addPlayer(p, this.config().startManpower(p)),
|
||||
);
|
||||
this._humans.forEach((p) => this.addPlayer(p));
|
||||
return;
|
||||
}
|
||||
const playerToTeam = assignTeams(this._humans);
|
||||
@@ -118,7 +116,7 @@ export class GameImpl implements Game {
|
||||
console.warn(`Player ${playerInfo.name} was kicked from team`);
|
||||
continue;
|
||||
}
|
||||
this.addPlayer(playerInfo, 0, team);
|
||||
this.addPlayer(playerInfo, team);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -348,16 +346,12 @@ export class GameImpl implements Game {
|
||||
return this.player(id);
|
||||
}
|
||||
|
||||
addPlayer(
|
||||
playerInfo: PlayerInfo,
|
||||
manpower: number,
|
||||
team: Team = null,
|
||||
): Player {
|
||||
addPlayer(playerInfo: PlayerInfo, team: Team = null): Player {
|
||||
const player = new PlayerImpl(
|
||||
this,
|
||||
this.nextPlayerID,
|
||||
playerInfo,
|
||||
manpower,
|
||||
this.config().startManpower(playerInfo),
|
||||
team ?? this.maybeAssignTeam(playerInfo),
|
||||
);
|
||||
this._playersBySmallID.push(player);
|
||||
|
||||
Reference in New Issue
Block a user