Allow spawner spawn/wander range 0 and raise combat leash floor.
Pinned NPCs can spawn and idle on a single tile; combat disengage uses max(3× wander, wander + ranged/spell range) so short wander still chases far enough to fight.
@@ -1015,15 +1015,15 @@ export function initTileConfigModal ({
1015
1015
field("Bounty", numberInput("bounty", config.bounty ?? 0, 0, 1_000_000)),
1016
1016
field("Max alive", numberInput("maxAlive", config.maxAlive, 1, 20)),
1017
1017
field("Respawn delay (seconds)", numberInput("respawnDelaySeconds", config.respawnDelaySeconds ?? 25, 0, 86_400)),
1018
field("Spawn range", numberInput("spawnRangeTiles", config.spawnRangeTiles, 1, 32)),
1019
field("Max wander range", numberInput("maxWanderRangeTiles", config.maxWanderRangeTiles, 1, 64)),
1018
field("Spawn range", numberInput("spawnRangeTiles", config.spawnRangeTiles, 0, 32)),
1019
field("Max wander range", numberInput("maxWanderRangeTiles", config.maxWanderRangeTiles, 0, 64)),
1020
1020
field("Spawner id", textInput("spawnerId", config.spawnerId, true))
1021
1021
);
1022
1022
const spawnInput = form.querySelector('[name="spawnRangeTiles"]');
1023
1023
const wanderInput = form.querySelector('[name="maxWanderRangeTiles"]');
1024
1024
const syncWanderMin = () =>
1025
1025
{
1026
const spawn = Number(spawnInput.value) || 1;
1026
const spawn = Math.max(0, Number(spawnInput.value) || 0);
1027
1027
wanderInput.min = String(spawn);
1028
1028
if (Number(wanderInput.value) < spawn)
1029
1029
{ wanderInput.value = String(spawn); }
@@ -1249,8 +1249,16 @@ export function initTileConfigModal ({
1249
1249
mobTypeId: String(data.get("mobTypeId") || "deer"),
1250
1250
maxAlive: Number(data.get("maxAlive") || 3),
1251
1251
respawnDelaySeconds: Number(data.get("respawnDelaySeconds") ?? 25),
1252
spawnRangeTiles: Number(data.get("spawnRangeTiles") || 4),
1253
maxWanderRangeTiles: Number(data.get("maxWanderRangeTiles") || 4),
1252
spawnRangeTiles: (() =>
1253
{
1254
const n = Number(data.get("spawnRangeTiles"));
1255
return Number.isFinite(n) ? n : 4;
1256
})(),
1257
maxWanderRangeTiles: (() =>
1258
{
1259
const n = Number(data.get("maxWanderRangeTiles"));
1260
return Number.isFinite(n) ? n : 4;
1261
})(),
1254
1262
level: Number(data.get("level") || 1),
1255
1263
bounty: Number(data.get("bounty") || 0),
1256
1264
aggressive: data.get("aggressive") === "on",
@@ -1015,15 +1015,15 @@ export function initTileConfigModal ({1015
field("Bounty", numberInput("bounty", config.bounty ?? 0, 0, 1_000_000)),1015
field("Bounty", numberInput("bounty", config.bounty ?? 0, 0, 1_000_000)),1016
field("Max alive", numberInput("maxAlive", config.maxAlive, 1, 20)),1016
field("Max alive", numberInput("maxAlive", config.maxAlive, 1, 20)),1017
field("Respawn delay (seconds)", numberInput("respawnDelaySeconds", config.respawnDelaySeconds ?? 25, 0, 86_400)),1017
field("Respawn delay (seconds)", numberInput("respawnDelaySeconds", config.respawnDelaySeconds ?? 25, 0, 86_400)),1018
field("Spawn range", numberInput("spawnRangeTiles", config.spawnRangeTiles, 1, 32)),1018
field("Spawn range", numberInput("spawnRangeTiles", config.spawnRangeTiles, 0, 32)),1019
field("Max wander range", numberInput("maxWanderRangeTiles", config.maxWanderRangeTiles, 1, 64)),1019
field("Max wander range", numberInput("maxWanderRangeTiles", config.maxWanderRangeTiles, 0, 64)),1020
field("Spawner id", textInput("spawnerId", config.spawnerId, true))1020
field("Spawner id", textInput("spawnerId", config.spawnerId, true))1021
);1021
);1022
const spawnInput = form.querySelector('[name="spawnRangeTiles"]');1022
const spawnInput = form.querySelector('[name="spawnRangeTiles"]');1023
const wanderInput = form.querySelector('[name="maxWanderRangeTiles"]');1023
const wanderInput = form.querySelector('[name="maxWanderRangeTiles"]');1024
const syncWanderMin = () =>1024
const syncWanderMin = () =>1025
{1025
{1026
const spawn = Number(spawnInput.value) || 1;1026
const spawn = Math.max(0, Number(spawnInput.value) || 0);1027
wanderInput.min = String(spawn);1027
wanderInput.min = String(spawn);1028
if (Number(wanderInput.value) < spawn)1028
if (Number(wanderInput.value) < spawn)1029
{ wanderInput.value = String(spawn); }1029
{ wanderInput.value = String(spawn); }@@ -1249,8 +1249,16 @@ export function initTileConfigModal ({1249
mobTypeId: String(data.get("mobTypeId") || "deer"),1249
mobTypeId: String(data.get("mobTypeId") || "deer"),1250
maxAlive: Number(data.get("maxAlive") || 3),1250
maxAlive: Number(data.get("maxAlive") || 3),1251
respawnDelaySeconds: Number(data.get("respawnDelaySeconds") ?? 25),1251
respawnDelaySeconds: Number(data.get("respawnDelaySeconds") ?? 25),1252
spawnRangeTiles: Number(data.get("spawnRangeTiles") || 4),1252
spawnRangeTiles: (() =>1253
maxWanderRangeTiles: Number(data.get("maxWanderRangeTiles") || 4),1253
{1254
const n = Number(data.get("spawnRangeTiles"));1255
return Number.isFinite(n) ? n : 4;1256
})(),1257
maxWanderRangeTiles: (() =>1258
{1259
const n = Number(data.get("maxWanderRangeTiles"));1260
return Number.isFinite(n) ? n : 4;1261
})(),1254
level: Number(data.get("level") || 1),1262
level: Number(data.get("level") || 1),1255
bounty: Number(data.get("bounty") || 0),1263
bounty: Number(data.get("bounty") || 0),1256
aggressive: data.get("aggressive") === "on",1264
aggressive: data.get("aggressive") === "on",@@ -137,10 +137,11 @@ export function spawnOriginDistance (position, origin)
137
137
return Math.hypot((position.tileX | 0) - ox, (position.tileY | 0) - oy);
138
138
}
139
139
140
/** Break chase when farther than 3× wander range from the spawner. */
140
/** Break chase at max(3× wander, wander + spell/ranged combat range) from the spawner. */
141
141
export function combatLeashLimit (wanderRangeTiles)
142
142
{
143
return Math.max(0, wanderRangeTiles | 0) * 3;
143
const wander = Math.max(0, wanderRangeTiles | 0);
144
return Math.max(wander * 3, wander + COMBAT_RANGE_TILES);
144
145
}
145
146
146
147
function creatureWithinWanderHome (world, handle, position)
@@ -159,7 +160,7 @@ function creatureWithinWanderHome (world, handle, position)
159
160
}
160
161
161
162
/**
162
* Spawner creatures break combat when chased beyond 3× wander range (euclidean).
163
* Spawner creatures break combat beyond their leash (euclidean).
163
164
* Ambient mobs without spawnOrigin are not leashed.
164
165
*/
165
166
function creatureShouldBreakCombatLeash (world, handle, position)
@@ -172,8 +173,6 @@ function creatureShouldBreakCombatLeash (world, handle, position)
172
173
if (!origin)
173
174
{ return false; }
174
175
const range = Math.max(0, origin.wanderRangeTiles | 0);
175
if (range <= 0)
176
{ return false; }
177
176
return spawnOriginDistance(position, origin) > combatLeashLimit(range);
178
177
}
179
178
@@ -137,10 +137,11 @@ export function spawnOriginDistance (position, origin)137
return Math.hypot((position.tileX | 0) - ox, (position.tileY | 0) - oy);137
return Math.hypot((position.tileX | 0) - ox, (position.tileY | 0) - oy);138
}138
}139
139
140
/** Break chase when farther than 3× wander range from the spawner. */140
/** Break chase at max(3× wander, wander + spell/ranged combat range) from the spawner. */141
export function combatLeashLimit (wanderRangeTiles)141
export function combatLeashLimit (wanderRangeTiles)142
{142
{143
return Math.max(0, wanderRangeTiles | 0) * 3;143
const wander = Math.max(0, wanderRangeTiles | 0);144
return Math.max(wander * 3, wander + COMBAT_RANGE_TILES);144
}145
}145
146
146
function creatureWithinWanderHome (world, handle, position)147
function creatureWithinWanderHome (world, handle, position)@@ -159,7 +160,7 @@ function creatureWithinWanderHome (world, handle, position)159
}160
}160
161
161
/**162
/**162
* Spawner creatures break combat when chased beyond 3× wander range (euclidean).163
* Spawner creatures break combat beyond their leash (euclidean).163
* Ambient mobs without spawnOrigin are not leashed.164
* Ambient mobs without spawnOrigin are not leashed.164
*/165
*/165
function creatureShouldBreakCombatLeash (world, handle, position)166
function creatureShouldBreakCombatLeash (world, handle, position)@@ -172,8 +173,6 @@ function creatureShouldBreakCombatLeash (world, handle, position)172
if (!origin)173
if (!origin)173
{ return false; }174
{ return false; }174
const range = Math.max(0, origin.wanderRangeTiles | 0);175
const range = Math.max(0, origin.wanderRangeTiles | 0);175
if (range <= 0)176
{ return false; }177
return spawnOriginDistance(position, origin) > combatLeashLimit(range);176
return spawnOriginDistance(position, origin) > combatLeashLimit(range);178
}177
}179
178
@@ -557,25 +557,34 @@ function countCreatures (world, mobTypeId)
557
557
function pickSpawnTile (world, originX, originY, range, flying = false, reserved = null, dimensionId = OVERWORLD_ID)
558
558
{
559
559
const dim = normalizeDimensionId(dimensionId);
560
const radius = Math.max(1, range | 0);
561
for (let attempt = 0; attempt < 48; attempt++)
560
const radius = Math.max(0, range | 0);
561
const tryTile = (tileX, tileY) =>
562
562
{
563
const tileX = originX + randInt(-radius, radius);
564
const tileY = originY + randInt(-radius, radius);
565
563
const key = `${tileX},${tileY}`;
566
564
if (reserved?.has(key))
567
{ continue; }
565
{ return null; }
568
566
if (!world.ownsRegion(tileToRegion(tileX), tileToRegion(tileY), dim))
569
{ continue; }
567
{ return null; }
570
568
if (flying)
571
569
{
572
570
if (!chunkIsOpen(world, tileX, tileY, dim))
573
{ continue; }
571
{ return null; }
574
572
return { tileX, tileY, dimensionId: dim };
575
573
}
576
574
if (!world.isEnterable(tileX, tileY, dim) || world.occupied(tileX, tileY, dim))
577
{ continue; }
575
{ return null; }
578
576
return { tileX, tileY, dimensionId: dim };
577
};
578
if (radius === 0)
579
{ return tryTile(originX, originY); }
580
for (let attempt = 0; attempt < 48; attempt++)
581
{
582
const tile = tryTile(
583
originX + randInt(-radius, radius),
584
originY + randInt(-radius, radius)
585
);
586
if (tile)
587
{ return tile; }
579
588
}
580
589
return null;
581
590
}
@@ -557,25 +557,34 @@ function countCreatures (world, mobTypeId)557
function pickSpawnTile (world, originX, originY, range, flying = false, reserved = null, dimensionId = OVERWORLD_ID)557
function pickSpawnTile (world, originX, originY, range, flying = false, reserved = null, dimensionId = OVERWORLD_ID)558
{558
{559
const dim = normalizeDimensionId(dimensionId);559
const dim = normalizeDimensionId(dimensionId);560
const radius = Math.max(1, range | 0);560
const radius = Math.max(0, range | 0);561
for (let attempt = 0; attempt < 48; attempt++)561
const tryTile = (tileX, tileY) =>562
{562
{563
const tileX = originX + randInt(-radius, radius);564
const tileY = originY + randInt(-radius, radius);565
const key = `${tileX},${tileY}`;563
const key = `${tileX},${tileY}`;566
if (reserved?.has(key))564
if (reserved?.has(key))567
{ continue; }565
{ return null; }568
if (!world.ownsRegion(tileToRegion(tileX), tileToRegion(tileY), dim))566
if (!world.ownsRegion(tileToRegion(tileX), tileToRegion(tileY), dim))569
{ continue; }567
{ return null; }570
if (flying)568
if (flying)571
{569
{572
if (!chunkIsOpen(world, tileX, tileY, dim))570
if (!chunkIsOpen(world, tileX, tileY, dim))573
{ continue; }571
{ return null; }574
return { tileX, tileY, dimensionId: dim };572
return { tileX, tileY, dimensionId: dim };575
}573
}576
if (!world.isEnterable(tileX, tileY, dim) || world.occupied(tileX, tileY, dim))574
if (!world.isEnterable(tileX, tileY, dim) || world.occupied(tileX, tileY, dim))577
{ continue; }575
{ return null; }578
return { tileX, tileY, dimensionId: dim };576
return { tileX, tileY, dimensionId: dim };577
};578
if (radius === 0)579
{ return tryTile(originX, originY); }580
for (let attempt = 0; attempt < 48; attempt++)581
{582
const tile = tryTile(583
originX + randInt(-radius, radius),584
originY + randInt(-radius, radius)585
);586
if (tile)587
{ return tile; }579
}588
}580
return null;589
return null;581
}590
}@@ -1860,7 +1860,8 @@ export class WorkerWorld
1860
1860
}
1861
1861
1862
1862
/** Idle wander for spawner mobs: goals must stay within maxWanderRange of the spawner.
1863
* Combat chase is limited to 3× wander range (euclidean); beyond that they leash home. */
1863
* Combat chase leashes at max(3× wander, wander + combat range); beyond that they return home.
1864
* Wander range 0 pins the mob to its spawn tile when not fighting. */
1864
1865
#queueSpawnerWander ()
1865
1866
{
1866
1867
for (const entity of this.ecs.query(Component.position, Component.movement, Component.spawnOrigin))
@@ -1898,7 +1899,8 @@ export class WorkerWorld
1898
1899
const tooFar = homeDist > range || !!combat?.leashing;
1899
1900
1900
1901
// Outside the leash / returning from combat: always try to step home. Inside: mostly idle.
1901
if (!tooFar && Math.random() > 0.1)
1902
// Range 0: never pick a random wander goal — stay on the spawn tile.
1903
if (!tooFar && (range === 0 || Math.random() > 0.1))
1902
1904
{ continue; }
1903
1905
1904
1906
if (tooFar)
@@ -1860,7 +1860,8 @@ export class WorkerWorld1860
}1860
}1861
1861
1862
/** Idle wander for spawner mobs: goals must stay within maxWanderRange of the spawner.1862
/** Idle wander for spawner mobs: goals must stay within maxWanderRange of the spawner.1863
* Combat chase is limited to 3× wander range (euclidean); beyond that they leash home. */1863
* Combat chase leashes at max(3× wander, wander + combat range); beyond that they return home.1864
* Wander range 0 pins the mob to its spawn tile when not fighting. */1864
#queueSpawnerWander ()1865
#queueSpawnerWander ()1865
{1866
{1866
for (const entity of this.ecs.query(Component.position, Component.movement, Component.spawnOrigin))1867
for (const entity of this.ecs.query(Component.position, Component.movement, Component.spawnOrigin))@@ -1898,7 +1899,8 @@ export class WorkerWorld1898
const tooFar = homeDist > range || !!combat?.leashing;1899
const tooFar = homeDist > range || !!combat?.leashing;1899
1900
1900
// Outside the leash / returning from combat: always try to step home. Inside: mostly idle.1901
// Outside the leash / returning from combat: always try to step home. Inside: mostly idle.1901
if (!tooFar && Math.random() > 0.1)1902
// Range 0: never pick a random wander goal — stay on the spawn tile.1903
if (!tooFar && (range === 0 || Math.random() > 0.1))1902
{ continue; }1904
{ continue; }1903
1905
1904
if (tooFar)1906
if (tooFar)@@ -39,3 +39,15 @@ test("normalizeSpawnerConfig forces wander range ≥ spawn range", () =>
39
39
assert.equal(config.spawnRangeTiles, 6);
40
40
assert.equal(config.maxWanderRangeTiles, 6);
41
41
});
42
43
test("normalizeSpawnerConfig allows spawn and wander range 0", () =>
44
{
45
const config = normalizeSpawnerConfig({
46
spawnerId: "pin",
47
mobTypeId: "humanoid",
48
spawnRangeTiles: 0,
49
maxWanderRangeTiles: 0
50
});
51
assert.equal(config.spawnRangeTiles, 0);
52
assert.equal(config.maxWanderRangeTiles, 0);
53
});
@@ -39,3 +39,15 @@ test("normalizeSpawnerConfig forces wander range ≥ spawn range", () =>39
assert.equal(config.spawnRangeTiles, 6);39
assert.equal(config.spawnRangeTiles, 6);40
assert.equal(config.maxWanderRangeTiles, 6);40
assert.equal(config.maxWanderRangeTiles, 6);41
});41
});42
43
test("normalizeSpawnerConfig allows spawn and wander range 0", () =>44
{45
const config = normalizeSpawnerConfig({46
spawnerId: "pin",47
mobTypeId: "humanoid",48
spawnRangeTiles: 0,49
maxWanderRangeTiles: 050
});51
assert.equal(config.spawnRangeTiles, 0);52
assert.equal(config.maxWanderRangeTiles, 0);53
});@@ -1875,10 +1875,11 @@ test("fairy flees to 2 tiles from hit source, then stops until hit again", () =>
1875
1875
{ harness.close(); }
1876
1876
});
1877
1877
1878
test("combat leash limit is three times wander range", () =>
1878
test("combat leash limit is max of 3× wander and wander + combat range", () =>
1879
1879
{
1880
assert.equal(combatLeashLimit(4), 12);
1881
assert.equal(combatLeashLimit(0), 0);
1880
assert.equal(combatLeashLimit(4), 16);
1881
assert.equal(combatLeashLimit(0), 12);
1882
assert.equal(combatLeashLimit(8), 24);
1882
1883
assert.equal(spawnOriginDistance({ tileX: 8, tileY: 8 }, { originTileX: 8, originTileY: 12 }), 4);
1883
1884
});
1884
1885
@@ -1909,8 +1910,8 @@ test("spawner mobs break combat beyond 3× wander range and leash home", () =>
1909
1910
engageTarget(world.ecs, ratId, playerId, Date.now());
1910
1911
assert.equal(world.ecs.get(handle, Component.combat)?.targetEntityId, playerId);
1911
1912
1912
// Euclidean distance 7 > 3×2=6 → break leash.
1913
teleportEntity(worker, ratId, 17, 8);
1913
// Euclidean distance 15 > max(3×2, 2+12)=14 → break leash.
1914
teleportEntity(worker, ratId, 25, 8);
1914
1915
stepCombat(world, Date.now());
1915
1916
const combat = world.ecs.get(handle, Component.combat);
1916
1917
assert.equal(combat?.targetEntityId, null);
@@ -1875,10 +1875,11 @@ test("fairy flees to 2 tiles from hit source, then stops until hit again", () =>1875
{ harness.close(); }1875
{ harness.close(); }1876
});1876
});1877
1877
1878
test("combat leash limit is three times wander range", () =>1878
test("combat leash limit is max of 3× wander and wander + combat range", () =>1879
{1879
{1880
assert.equal(combatLeashLimit(4), 12);1880
assert.equal(combatLeashLimit(4), 16);1881
assert.equal(combatLeashLimit(0), 0);1881
assert.equal(combatLeashLimit(0), 12);1882
assert.equal(combatLeashLimit(8), 24);1882
assert.equal(spawnOriginDistance({ tileX: 8, tileY: 8 }, { originTileX: 8, originTileY: 12 }), 4);1883
assert.equal(spawnOriginDistance({ tileX: 8, tileY: 8 }, { originTileX: 8, originTileY: 12 }), 4);1883
});1884
});1884
1885
@@ -1909,8 +1910,8 @@ test("spawner mobs break combat beyond 3× wander range and leash home", () =>1909
engageTarget(world.ecs, ratId, playerId, Date.now());1910
engageTarget(world.ecs, ratId, playerId, Date.now());1910
assert.equal(world.ecs.get(handle, Component.combat)?.targetEntityId, playerId);1911
assert.equal(world.ecs.get(handle, Component.combat)?.targetEntityId, playerId);1911
1912
1912
// Euclidean distance 7 > 3×2=6 → break leash.1913
// Euclidean distance 15 > max(3×2, 2+12)=14 → break leash.1913
teleportEntity(worker, ratId, 17, 8);1914
teleportEntity(worker, ratId, 25, 8);1914
stepCombat(world, Date.now());1915
stepCombat(world, Date.now());1915
const combat = world.ecs.get(handle, Component.combat);1916
const combat = world.ecs.get(handle, Component.combat);1916
assert.equal(combat?.targetEntityId, null);1917
assert.equal(combat?.targetEntityId, null);