fix tied conflict conquest order

2026-07-26 23:14:27 +00:00
parent 5a9b85e821
commit fc019a786c
7 changed files with 128 additions and 20 deletions
@@ -301,6 +301,7 @@ describe('war triggers', () => {
        cityUnit.setOppose(firstAttacker);
        expect(cityUnit.addConflict()).toBe(false);
        expect(city.conflict).toEqual({ 1: 1.05 });
+        expect(city.meta.conflict_order).toEqual([1]);
        expect(city.meta.conflict).toBeUndefined();

        const secondNation = { ...buildNation(), id: 2 };
@@ -319,6 +320,7 @@ describe('war triggers', () => {
        cityUnit.setOppose(secondAttacker);
        expect(cityUnit.addConflict()).toBe(true);
        expect(city.conflict).toEqual({ 1: 1.05, 2: 1 });
+        expect(city.meta.conflict_order).toEqual([1, 2]);
    });
 });