alois/OpenFrontIO
1
0
Fork 0
mirror of https://github.com/openfrontio/OpenFrontIO.git synced 2026-07-30 18:05:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove setnameexecution because unused, create DisplayName on Player

Browse Source
This commit is contained in:
Evan
2024-10-31 20:30:17 -07:00
parent d08d0c473f
commit a31a35c038
9 changed files with 78 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/Schemas.ts
-8
View File
@@ -7,7 +7,6 @@ export type ClientID = string
export type Intent = SpawnIntent
| AttackIntent
| BoatAttackIntent
| UpdateNameIntent
| AllianceRequestIntent
| AllianceRequestReplyIntent
| BreakAllianceIntent
@@ -19,7 +18,6 @@ export type Intent = SpawnIntent
export type AttackIntent = z.infer<typeof AttackIntentSchema>
export type SpawnIntent = z.infer<typeof SpawnIntentSchema>
export type BoatAttackIntent = z.infer<typeof BoatAttackIntentSchema>
export type UpdateNameIntent = z.infer<typeof UpdateNameIntentSchema>
export type AllianceRequestIntent = z.infer<typeof AllianceRequestIntentSchema>
export type AllianceRequestReplyIntent = z.infer<typeof AllianceRequestReplyIntentSchema>
export type BreakAllianceIntent = z.infer<typeof BreakAllianceIntentSchema>
@@ -101,11 +99,6 @@ export const BoatAttackIntentSchema = BaseIntentSchema.extend({
y: z.number(),
})
export const UpdateNameIntentSchema = BaseIntentSchema.extend({
type: z.literal('updateName'),
name: z.string(),
})
export const AllianceRequestIntentSchema = BaseIntentSchema.extend({
type: z.literal('allianceRequest'),
requestor: z.string(),
@@ -157,7 +150,6 @@ const IntentSchema = z.union([
AttackIntentSchema,
SpawnIntentSchema,
BoatAttackIntentSchema,
UpdateNameIntentSchema,
AllianceRequestIntentSchema,
AllianceRequestReplyIntentSchema,
BreakAllianceIntentSchema,
src/core/Util.ts
+28 -6
View File
@@ -1,7 +1,9 @@
import {v4 as uuidv4} from 'uuid';
import { v4 as uuidv4 } from 'uuid';
import twemoji from 'twemoji';
import DOMPurify from 'dompurify';
import {Cell, Game, Player, TerraNullius, Tile} from "./game/Game";
import { Cell, Game, Player, TerraNullius, Tile } from "./game/Game";
export function manhattanDist(c1: Cell, c2: Cell): number {
return Math.abs(c1.x - c2.x) + Math.abs(c1.y - c2.y);
@@ -97,7 +99,7 @@ export function simpleHash(str: string): number {
return Math.abs(hash);
}
export function calculateBoundingBox(borderTiles: ReadonlySet<Tile>): {min: Cell; max: Cell} {
export function calculateBoundingBox(borderTiles: ReadonlySet<Tile>): { min: Cell; max: Cell } {
let minX = Infinity, minY = Infinity, maxX = -Infinity, maxY = -Infinity;
borderTiles.forEach((tile: Tile) => {
@@ -108,10 +110,10 @@ export function calculateBoundingBox(borderTiles: ReadonlySet<Tile>): {min: Cell
maxY = Math.max(maxY, cell.y);
});
return {min: new Cell(minX, minY), max: new Cell(maxX, maxY)}
return { min: new Cell(minX, minY), max: new Cell(maxX, maxY) }
}
export function inscribed(outer: {min: Cell; max: Cell}, inner: {min: Cell; max: Cell}): boolean {
export function inscribed(outer: { min: Cell; max: Cell }, inner: { min: Cell; max: Cell }): boolean {
return (
outer.min.x <= inner.min.x &&
outer.min.y <= inner.min.y &&
@@ -122,7 +124,7 @@ export function inscribed(outer: {min: Cell; max: Cell}, inner: {min: Cell; max:
export function getMode(list: string[]): string {
// Count occurrences
const counts: {[key: string]: number} = {};
const counts: { [key: string]: number } = {};
for (const item of list) {
counts[item] = (counts[item] || 0) + 1;
}
@@ -139,4 +141,24 @@ export function getMode(list: string[]): string {
}
return mode;
}
export function sanitize(name: string): string {
return Array.from(name).slice(0, 10).join('').replace(/[^\p{L}\p{N}\s\p{Emoji}\p{Emoji_Component}]/gu, '');
}
export function processName(name: string): string {
// First sanitize the raw input - strip everything except text and emojis
const withEmojis = twemoji.parse(sanitize(name), {
base: 'https://cdn.jsdelivr.net/gh/twitter/twemoji@14.0.2/assets/', // Use jsDelivr CDN
folder: 'svg', // or 'png' if you prefer
ext: '.svg' // or '.png' if you prefer
});
return DOMPurify.sanitize(withEmojis, {
ALLOWED_TAGS: ['img'],
ALLOWED_ATTR: ['src', 'alt', 'class'],
// Only allow twemoji CDN URLs
ALLOWED_URI_REGEXP: /^https:\/\/cdn\.jsdelivr\.net\/gh\/twitter\/twemoji/
});
}
src/core/execution/ExecutionManager.ts
+17 -23
View File
@@ -1,21 +1,20 @@
import {Cell, Execution, MutableGame, Game, MutablePlayer, PlayerInfo, TerraNullius, Tile, PlayerType, Alliance, AllianceRequestReplyEvent, Difficulty} from "../game/Game";
import {AttackIntent, BoatAttackIntentSchema, GameID, Intent, Turn} from "../Schemas";
import {AttackExecution} from "./AttackExecution";
import {SpawnExecution} from "./SpawnExecution";
import {BotSpawner} from "./BotSpawner";
import {BoatAttackExecution} from "./BoatAttackExecution";
import {PseudoRandom} from "../PseudoRandom";
import {UpdateNameExecution} from "./UpdateNameExecution";
import {FakeHumanExecution} from "./FakeHumanExecution";
import { Cell, Execution, MutableGame, Game, MutablePlayer, PlayerInfo, TerraNullius, Tile, PlayerType, Alliance, AllianceRequestReplyEvent, Difficulty } from "../game/Game";
import { AttackIntent, BoatAttackIntentSchema, GameID, Intent, Turn } from "../Schemas";
import { AttackExecution } from "./AttackExecution";
import { SpawnExecution } from "./SpawnExecution";
import { BotSpawner } from "./BotSpawner";
import { BoatAttackExecution } from "./BoatAttackExecution";
import { PseudoRandom } from "../PseudoRandom";
import { FakeHumanExecution } from "./FakeHumanExecution";
import Usernames from '../../../resources/Usernames.txt'
import {simpleHash} from "../Util";
import {AllianceRequestExecution} from "./alliance/AllianceRequestExecution";
import {AllianceRequestReplyExecution} from "./alliance/AllianceRequestReplyExecution";
import {BreakAllianceExecution} from "./alliance/BreakAllianceExecution";
import {TargetPlayerExecution} from "./TargetPlayerExecution";
import {EmojiExecution} from "./EmojiExecution";
import {DonateExecution} from "./DonateExecution";
import {NukeExecution} from "./NukeExecution";
import { processName, sanitize, simpleHash } from "../Util";
import { AllianceRequestExecution } from "./alliance/AllianceRequestExecution";
import { AllianceRequestReplyExecution } from "./alliance/AllianceRequestReplyExecution";
import { BreakAllianceExecution } from "./alliance/BreakAllianceExecution";
import { TargetPlayerExecution } from "./TargetPlayerExecution";
import { EmojiExecution } from "./EmojiExecution";
import { DonateExecution } from "./DonateExecution";
import { NukeExecution } from "./NukeExecution";
@@ -48,7 +47,7 @@ export class Executor {
)
} else if (intent.type == "spawn") {
return new SpawnExecution(
new PlayerInfo(intent.name.slice(0, 18), intent.playerType, intent.clientID, intent.playerID),
new PlayerInfo(sanitize(intent.name), intent.playerType, intent.clientID, intent.playerID),
new Cell(intent.x, intent.y)
)
} else if (intent.type == "boat") {
@@ -58,11 +57,6 @@ export class Executor {
new Cell(intent.x, intent.y),
intent.troops
)
} else if (intent.type == "updateName") {
return new UpdateNameExecution(
intent.name,
intent.clientID
)
} else if (intent.type == "allianceRequest") {
return new AllianceRequestExecution(intent.requestor, intent.recipient)
} else if (intent.type == "allianceRequestReply") {
src/core/execution/UpdateNameExecution.ts
-35
View File
@@ -1,35 +0,0 @@
import {Execution, MutableGame, MutablePlayer, PlayerID} from "../game/Game"
import {ClientID} from "../Schemas"
export class UpdateNameExecution implements Execution {
private active = true
private mg: MutableGame
constructor(private newName: string, private clientID: ClientID) {
}
init(mg: MutableGame, ticks: number) {
this.mg = mg
}
tick(ticks: number) {
const player = this.mg.players().find(p => p.clientID() == this.clientID)
if (player == null) {
return
}
player.setName(this.newName)
this.active = false
}
owner(): MutablePlayer {
return null
}
isActive(): boolean {
return this.active
}
activeDuringSpawnPhase(): boolean {
return true
}
}
src/core/game/Game.ts
+1
View File
@@ -163,6 +163,7 @@ export interface TerraNullius {
export interface Player {
info(): PlayerInfo
name(): string
displayName(): string
clientID(): ClientID
id(): PlayerID
type(): PlayerType
src/core/game/PlayerImpl.ts
+22 -17
View File
@@ -1,12 +1,12 @@
import {MutablePlayer, Tile, PlayerInfo, PlayerID, PlayerType, Player, TerraNullius, Cell, Execution, AllianceRequest, MutableAllianceRequest, MutableAlliance, Alliance, Tick, TargetPlayerEvent, EmojiMessage, EmojiMessageEvent, AllPlayers, Currency} from "./Game";
import {ClientID} from "../Schemas";
import {simpleHash} from "../Util";
import {CellString, GameImpl} from "./GameImpl";
import {BoatImpl} from "./BoatImpl";
import {TileImpl} from "./TileImpl";
import {TerraNulliusImpl} from "./TerraNulliusImpl";
import {MessageType} from "../../client/graphics/layers/EventsDisplay";
import {renderTroops} from "../../client/graphics/Utils";
import { MutablePlayer, Tile, PlayerInfo, PlayerID, PlayerType, Player, TerraNullius, Cell, Execution, AllianceRequest, MutableAllianceRequest, MutableAlliance, Alliance, Tick, TargetPlayerEvent, EmojiMessage, EmojiMessageEvent, AllPlayers, Currency } from "./Game";
import { ClientID } from "../Schemas";
import { processName, simpleHash } from "../Util";
import { CellString, GameImpl } from "./GameImpl";
import { BoatImpl } from "./BoatImpl";
import { TileImpl } from "./TileImpl";
import { TerraNulliusImpl } from "./TerraNulliusImpl";
import { MessageType } from "../../client/graphics/layers/EventsDisplay";
import { renderTroops } from "../../client/graphics/Utils";
interface Target {
tick: Tick
@@ -29,6 +29,7 @@ export class PlayerImpl implements MutablePlayer {
public _tiles: Map<CellString, Tile> = new Map<CellString, Tile>();
private _name: string;
private _displayerName: string;
public pastOutgoingAllianceRequests: AllianceRequest[] = []
@@ -40,11 +41,15 @@ export class PlayerImpl implements MutablePlayer {
constructor(private gs: GameImpl, private readonly playerInfo: PlayerInfo, private _troops) {
this._name = playerInfo.name;
this._displayerName = processName(this._name)
}
name(): string {
return this._name;
}
displayName(): string {
return this._displayerName
}
clientID(): ClientID {
return this.playerInfo.clientID;
@@ -115,19 +120,19 @@ export class PlayerImpl implements MutablePlayer {
return toRemove
}
isPlayer(): this is MutablePlayer {return true as const;}
ownsTile(cell: Cell): boolean {return this._tiles.has(cell.toString());}
setTroops(troops: number) {this._troops = Math.floor(troops);}
conquer(tile: Tile) {this.gs.conquer(this, tile);}
isPlayer(): this is MutablePlayer { return true as const; }
ownsTile(cell: Cell): boolean { return this._tiles.has(cell.toString()); }
setTroops(troops: number) { this._troops = Math.floor(troops); }
conquer(tile: Tile) { this.gs.conquer(this, tile); }
relinquish(tile: Tile) {
if (tile.owner() != this) {
throw new Error(`Cannot relinquish tile not owned by this player`);
}
this.gs.relinquish(tile);
}
info(): PlayerInfo {return this.playerInfo;}
troops(): number {return this._troops;}
isAlive(): boolean {return this._tiles.size > 0;}
info(): PlayerInfo { return this.playerInfo; }
troops(): number { return this._troops; }
isAlive(): boolean { return this._tiles.size > 0; }
executions(): Execution[] {
return this.gs.executions().filter(exec => exec.owner().id() == this.id());
}
@@ -204,7 +209,7 @@ export class PlayerImpl implements MutablePlayer {
}
target(other: Player): void {
this.targets_.push({tick: this.gs.ticks(), target: other})
this.targets_.push({ tick: this.gs.ticks(), target: other })
this.gs.eventBus.emit(new TargetPlayerEvent(this, other))
}