backups/Fantasy-Map-Generator
1
0
Fork 0
mirror of https://github.com/Azgaar/Fantasy-Map-Generator.git synced 2026-03-23 23:57:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

refactor: migrate military generator (#1330)

Browse source 
* refactor: migrate military gnerator

* fix: build + lint

* Update src/modules/military-generator.ts

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update src/modules/military-generator.ts

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update src/modules/military-generator.ts

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* fix: clean up regiment notes and improve emblem retrieval logic

* Update src/modules/military-generator.ts

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
This commit is contained in:
Marc Emmanuel 2026-03-04 12:53:07 +01:00 • committed by GitHub
parent 43e35cdecb
commit 32227518d2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 658 additions and 436 deletions
Download patch file Download diff file Expand all files Collapse all files

54
src/renderers/draw-military.ts
View file

@ -1,24 +1,13 @@
import { color, easeSinInOut, transition } from "d3";
import type { MilitaryRegiment } from "../modules/military-generator";
import { rn } from "../utils";
interface Regiment {
i: number;
name: string;
x: number;
y: number;
n?: number;
angle?: number;
icon: string;
state: number;
}
declare global {
var drawMilitary: () => void;
var drawRegiments: (regiments: Regiment[], stateId: number) => void;
var drawRegiment: (reg: Regiment, stateId: number) => void;
var moveRegiment: (reg: Regiment, x: number, y: number) => void;
var drawRegiments: (regiments: MilitaryRegiment[], stateId: number) => void;
var drawRegiment: (reg: MilitaryRegiment, stateId: number) => void;
var moveRegiment: (reg: MilitaryRegiment, x: number, y: number) => void;
var armies: import("d3").Selection<SVGGElement, unknown, null, undefined>;
var Military: { getTotal: (reg: Regiment) => number };
}
const militaryRenderer = (): void => {
@ -34,12 +23,15 @@ const militaryRenderer = (): void => {
TIME && console.timeEnd("drawMilitary");
};
const drawRegimentsRenderer = (regiments: Regiment[], s: number): void => {
const drawRegimentsRenderer = (
regiments: MilitaryRegiment[],
s: number,
): void => {
const size = +armies.attr("box-size");
const w = (d: Regiment) => (d.n ? size * 4 : size * 6);
const w = (d: MilitaryRegiment) => (d.n ? size * 4 : size * 6);
const h = size * 2;
const x = (d: Regiment) => rn(d.x - w(d) / 2, 2);
const y = (d: Regiment) => rn(d.y - size, 2);
const x = (d: MilitaryRegiment) => rn(d.x - w(d) / 2, 2);
const y = (d: MilitaryRegiment) => rn(d.y - size, 2);
const stateColor = pack.states[s]?.color;
const baseColor = stateColor && stateColor[0] === "#" ? stateColor : "#999";
@ -83,9 +75,9 @@ const drawRegimentsRenderer = (regiments: Regiment[], s: number): void => {
.attr("x", (d) => x(d) - size)
.attr("y", (d) => d.y)
.text((d) =>
d.icon.startsWith("http") || d.icon.startsWith("data:image")
d.icon!.startsWith("http") || d.icon!.startsWith("data:image")
? ""
: d.icon,
: d.icon!,
);
g.append("image")
.attr("class", "regimentImage")
@ -94,13 +86,13 @@ const drawRegimentsRenderer = (regiments: Regiment[], s: number): void => {
.attr("height", h)
.attr("width", h)
.attr("href", (d) =>
d.icon.startsWith("http") || d.icon.startsWith("data:image")
? d.icon
d.icon!.startsWith("http") || d.icon!.startsWith("data:image")
? d.icon!
: "",
);
};
const drawRegimentRenderer = (reg: Regiment, stateId: number): void => {
const drawRegimentRenderer = (reg: MilitaryRegiment, stateId: number): void => {
const size = +armies.attr("box-size");
const w = reg.n ? size * 4 : size * 6;
const h = size * 2;
@ -149,9 +141,9 @@ const drawRegimentRenderer = (reg: Regiment, stateId: number): void => {
.attr("x", x1 - size)
.attr("y", reg.y)
.text(
reg.icon.startsWith("http") || reg.icon.startsWith("data:image")
reg.icon!.startsWith("http") || reg.icon!.startsWith("data:image")
? ""
: reg.icon,
: reg.icon!,
);
g.append("image")
.attr("class", "regimentImage")
@ -161,14 +153,18 @@ const drawRegimentRenderer = (reg: Regiment, stateId: number): void => {
.attr("width", h)
.attr(
"href",
reg.icon.startsWith("http") || reg.icon.startsWith("data:image")
? reg.icon
reg.icon!.startsWith("http") || reg.icon!.startsWith("data:image")
? reg.icon!
: "",
);
};
// move one regiment to another
const moveRegimentRenderer = (reg: Regiment, x: number, y: number): void => {
const moveRegimentRenderer = (
reg: MilitaryRegiment,
x: number,
y: number,
): void => {
const el = armies
.select(`g#army${reg.state}`)
.select(`g#regiment${reg.state}-${reg.i}`);