feat(dungeon): allow proximity-linked rooms

src/main/java/games/dmg/fantasystick/FantasyStickPlugin.java

@@ -316,7 +316,8 @@ public final class FantasyStickPlugin extends JavaPlugin {
                     new games.dmg.fantasystick.persistence.YamlAdventureQuestRepository(getDataFolder().toPath()),
                     Clock.systemUTC(), adventureQuestSettings::rules, java.util.random.RandomGenerator.getDefault());
                 dungeons = new games.dmg.fantasystick.dungeon.DungeonDirectory(
-                    new games.dmg.fantasystick.persistence.YamlDungeonRepository(getDataFolder().toPath()));
+                    new games.dmg.fantasystick.persistence.YamlDungeonRepository(getDataFolder().toPath()),
+                    () -> adventureQuestSettings.rules().dungeonRoomLinkDistance());
                 armorers=new games.dmg.fantasystick.shop.FantasyArmorerDirectory(new games.dmg.fantasystick.persistence.YamlFantasyArmorerRepository(getDataFolder().toPath()));
             } catch (java.io.IOException invalidManagedState) {
                 throw new java.io.UncheckedIOException("Persistent party, shop, training or adventure state could not be loaded", invalidManagedState);
@@ -556,7 +557,7 @@ public final class FantasyStickPlugin extends JavaPlugin {
             characterParties.attachUnavailableCharacter(character->custodyDirectory.custody(character).isPresent());
             dungeonCommands = new games.dmg.fantasystick.dungeon.DungeonCommands(this,dungeons,dungeonController,adventureQuests,nextTick,characters::find,character->sessions.activeCharacter(character).isPresent(),character->characterParties.partyOf(character).isPresent());
             adventureQuests.registerDungeonRewards(site->dungeons.find(site.id()).map(value->new games.dmg.fantasystick.adventure.AdventureQuestDirectory.Reward(value.maximumXp(),value.maximumCoins())).orElse(new games.dmg.fantasystick.adventure.AdventureQuestDirectory.Reward(java.math.BigInteger.ZERO,java.math.BigInteger.ZERO)));
-            adventureQuests.registerDungeonSites(()->dungeons.snapshot().dungeons().stream().filter(games.dmg.fantasystick.dungeon.DungeonState.Dungeon::enabled).map(value->new games.dmg.fantasystick.adventure.AdventureQuestState.Site(value.id(),games.dmg.fantasystick.adventure.AdventureQuestState.SiteType.DUNGEON,value.name(),value.world(),value.entrance().x(),value.entrance().y(),value.entrance().z())).toList());
+            adventureQuests.registerDungeonSites(()->dungeons.snapshot().dungeons().stream().filter(value->dungeons.eligibleForFutureOffer(value.id())).map(value->new games.dmg.fantasystick.adventure.AdventureQuestState.Site(value.id(),games.dmg.fantasystick.adventure.AdventureQuestState.SiteType.DUNGEON,value.name(),value.world(),value.entrance().x(),value.entrance().y(),value.entrance().z())).toList());
             adventureQuests.registerDungeonAvailability(site->{var definition=dungeons.find(site.id());if(definition.isEmpty()||!definition.orElseThrow().enabled())return false;var catalog=adventureQuests.snapshot().catalog();return catalog==null||dungeons.runView(site.id(),catalog.revision()).map(run->!run.defeated()).orElse(true);});
             adventureQuestController.registerResetParticipant(dungeonController);
             combatExperience.attachExcluded(entity->adventureQuestController.managed(entity)||dungeonController.managed(entity));

src/main/java/games/dmg/fantasystick/dungeon/DungeonCommands.java

@@ -27,7 +27,8 @@ public final class DungeonCommands {
     private void entrance(CommandSender sender,String[] args){if(args.length!=3||!args[2].equals("set")||!(sender instanceof Player player)){usage(sender);return;}UUID dungeon=editing(player);if(dungeon==null)return;var location=player.getLocation();if(location.getWorld()==null||!directory.find(dungeon).orElseThrow().world().equals(location.getWorld().getUID())){sender.sendMessage("Dungeon entrance must remain in its world.");return;}directory.setEntrance(dungeon,location.getX(),location.getY(),location.getZ(),location.getYaw(),location.getPitch()).whenComplete((value,failure)->saved(sender,failure,"Updated dungeon entrance."));}
     private void room(CommandSender sender,String[] args){if(!(sender instanceof Player player)||args.length<3){usage(sender);return;}UUID dungeon=editing(player);if(dungeon==null)return;switch(args[2]){case"create"->roomCreate(sender,player,dungeon,args);case"list"->{if(args.length!=3){usage(sender);return;}var value=directory.find(dungeon).orElseThrow();if(value.rooms().isEmpty())sender.sendMessage("No rooms defined.");else value.rooms().stream().sorted(Comparator.comparing(v->v.id().toString())).forEach(v->sender.sendMessage(v.id()+" "+v.displayName()+" "+v.bounds()+"; mobs="+v.mobs().size()+"; effects="+v.effects().size()+"; reward="+v.reward().xp()+" XP, "+v.reward().coins()+" coins; boss="+(v.boss()==null?"none":v.boss().type().name().toLowerCase(Locale.ROOT))));}case"remove"->{if(args.length!=4){usage(sender);return;}UUID room=id(args[3]);if(room==null){usage(sender);return;}directory.removeRoom(dungeon,room).whenComplete((value,failure)->{if(failure==null&&value.isPresent())controller.definitionChanged(dungeon);respond(sender,()->sender.sendMessage(failure!=null?"Room removal refused: it would overlap, disconnect or could not be saved.":value.isPresent()?"Removed room "+room+".":"Room not found."));});}case"mob"->mob(sender,player,dungeon,args);case"effect"->effect(sender,player,dungeon,args);case"reward"->reward(sender,player,dungeon,args);case"boss"->boss(sender,player,dungeon,args);default->usage(sender);}}
     private void roomCreate(CommandSender sender,Player player,UUID dungeon,String[] args){if(args.length<6){usage(sender);return;}var location=player.getLocation();int x=location.getBlockX(),y=location.getBlockY()-1,z=location.getBlockZ();if(args[3].equals("corner")){if(args.length<7){usage(sender);return;}Integer xs=integer(args[4]),zs=integer(args[5]),height=integer(args[6]);if(xs==null||zs==null||height==null){usage(sender);return;}directory.addCornerRoom(dungeon,join(args,7),x,y,z,xs,zs,height).whenComplete((value,failure)->roomSaved(sender,dungeon,value,failure));return;}if(args[3].equals("radius")){Integer radius=integer(args[4]),height=integer(args[5]);if(radius==null||height==null){usage(sender);return;}directory.addRadiusRoom(dungeon,join(args,6),x,y,z,radius,height).whenComplete((value,failure)->roomSaved(sender,dungeon,value,failure));return;}usage(sender);}
-    private void roomSaved(CommandSender sender,UUID dungeon,DungeonState.Room value,Throwable failure){if(failure==null)controller.definitionChanged(dungeon);respond(sender,()->sender.sendMessage(failure==null?"Created room "+value.id()+" ("+value.displayName()+").":"Room creation refused: geometry, limits or persistence failed."));}
+    private void roomSaved(CommandSender sender,UUID dungeon,DungeonState.Room value,Throwable failure){if(failure==null)controller.definitionChanged(dungeon);String message=failure==null?"Created room "+value.id()+" ("+value.displayName()+").":roomFailure(failure);respond(sender,()->sender.sendMessage(message));}
+    private static String roomFailure(Throwable failure){Throwable cause=failure;while((cause instanceof java.util.concurrent.CompletionException||cause instanceof java.util.concurrent.ExecutionException)&&cause.getCause()!=null)cause=cause.getCause();String detail=cause.getMessage();if(cause instanceof IllegalArgumentException&&"Rooms overlap".equals(detail))return "Room creation refused: it overlaps an existing room.";if(cause instanceof IllegalArgumentException&&detail!=null&&detail.startsWith("Room exceeds configured link distance of ")){String blocks=detail.substring("Room exceeds configured link distance of ".length()).replace(" blocks","");return "Room creation refused: nearest room is farther than the configured "+blocks+"-block link distance.";}if(cause instanceof IllegalArgumentException&&(detail!=null&&(detail.equals("Room dimensions out of range")||detail.equals("Room limit reached"))))return "Room creation refused: dimensions or room limit are out of range.";if(cause instanceof java.io.IOException)return "Room creation failed: persistence is unavailable; desired state is unchanged.";return "Room creation refused: geometry validation failed; desired state is unchanged.";}
     private void mob(CommandSender sender,Player player,UUID dungeon,String[] args){var room=standing(sender,player);if(room==null)return;if(args.length>=5&&args[3].equals("add")){var type=entity(args[4]);if(!ordinary(type)){sender.sendMessage("Unsupported living mob type.");return;}var location=player.getLocation();directory.addMob(dungeon,room.id(),type,join(args,5),location.getX(),location.getY(),location.getZ(),location.getYaw(),location.getPitch()).whenComplete((value,failure)->saved(sender,failure,"Added mob slot "+(value==null?"":value.id())+"."));return;}if(args.length==5&&args[3].equals("remove")){UUID id=id(args[4]);if(id==null){usage(sender);return;}directory.removeMob(dungeon,room.id(),id).whenComplete((value,failure)->saved(sender,failure,value!=null&&value.isPresent()?"Removed mob slot "+id+".":"Mob slot not found."));return;}if(args.length==4&&args[3].equals("list")){if(room.mobs().isEmpty())sender.sendMessage("No ordinary mob slots in this room.");else room.mobs().forEach(value->sender.sendMessage(value.id()+" "+value.type().name().toLowerCase(Locale.ROOT)+" "+value.name()));return;}usage(sender);}
     private void effect(CommandSender sender,Player player,UUID dungeon,String[] args){var room=standing(sender,player);if(room==null)return;if(args.length>=7&&args[3].equals("add")){DungeonState.EffectTarget target;try{target=DungeonState.EffectTarget.valueOf(args[4].toUpperCase(Locale.ROOT));}catch(IllegalArgumentException invalid){usage(sender);return;}String key=args[5].contains(":")?args[5]:"minecraft:"+args[5];var namespaced=NamespacedKey.fromString(key);Integer level=integer(args[6]);boolean particles=args.length<8||Boolean.parseBoolean(args[7]);if(namespaced==null||PotionEffectType.getByKey(namespaced)==null||level==null||args.length>8||args.length==8&&!Set.of("true","false").contains(args[7])){usage(sender);return;}directory.addEffect(dungeon,room.id(),target,key,level,particles).whenComplete((value,failure)->saved(sender,failure,"Added room effect "+(value==null?"":value.id())+"."));return;}if(args.length==5&&args[3].equals("remove")){UUID id=id(args[4]);if(id==null){usage(sender);return;}directory.removeEffect(dungeon,room.id(),id).whenComplete((value,failure)->saved(sender,failure,value!=null&&value.isPresent()?"Removed room effect "+id+".":"Room effect not found."));return;}usage(sender);}
     private void reward(CommandSender sender,Player player,UUID dungeon,String[] args){if(args.length!=6||!args[3].equals("set")){usage(sender);return;}var room=standing(sender,player);if(room==null)return;BigInteger xp=whole(args[4]),coins=whole(args[5]);if(xp==null||coins==null){usage(sender);return;}directory.setReward(dungeon,room.id(),xp,coins).whenComplete((value,failure)->saved(sender,failure,"Set room reward to "+xp+" XP and "+coins+" coins."));}

src/main/java/games/dmg/fantasystick/dungeon/DungeonDirectory.java

@@ -13,9 +13,10 @@ import org.bukkit.entity.EntityType;
 
 /** Serialized save-before-publication authority for dungeon definitions and daily progress. */
 public final class DungeonDirectory implements AutoCloseable,AdventureResetParticipant {
-    private final YamlDungeonRepository repository;private final ExecutorService worker=Executors.newSingleThreadExecutor(r->new Thread(r,"fantasy-dungeon-persistence"));
+    private final YamlDungeonRepository repository;private final java.util.function.IntSupplier roomLinkDistance;private final ExecutorService worker=Executors.newSingleThreadExecutor(r->new Thread(r,"fantasy-dungeon-persistence"));
     private volatile DungeonState snapshot;private volatile UUID currentGeneration;private boolean closed;private int pending;private final CompletableFuture<Void> drained=new CompletableFuture<>();
-    public DungeonDirectory(YamlDungeonRepository repository)throws IOException{this.repository=Objects.requireNonNull(repository);snapshot=repository.load();}
+    public DungeonDirectory(YamlDungeonRepository repository)throws IOException{this(repository,()->10);}
+    public DungeonDirectory(YamlDungeonRepository repository,java.util.function.IntSupplier roomLinkDistance)throws IOException{this.repository=Objects.requireNonNull(repository);this.roomLinkDistance=Objects.requireNonNull(roomLinkDistance);snapshot=repository.load();}
     public DungeonState snapshot(){return snapshot;}
     public Optional<DungeonState.Dungeon> find(UUID id){return snapshot.dungeons().stream().filter(v->v.id().equals(id)).findFirst();}
     public Optional<DungeonState.CharacterBoss> custody(UUID character){return snapshot.dungeons().stream().flatMap(value->value.rooms().stream()).map(DungeonState.Room::boss).filter(Objects::nonNull).map(DungeonState.Boss::character).filter(Objects::nonNull).filter(value->value.character().id().equals(character)).findFirst();}
@@ -27,8 +28,8 @@ public final class DungeonDirectory implements AutoCloseable,AdventureResetParti
     public CompletableFuture<DungeonState.Dungeon> setEntrance(UUID id,double x,double y,double z,float yaw,float pitch){return change(id,dungeon->definition(dungeon,dungeon.rooms(),new DungeonState.Position(x,y,z,yaw,pitch),false));}
     public CompletableFuture<DungeonState.Room> addCornerRoom(UUID id,String name,int x,int y,int z,int xSize,int zSize,int height){if(xSize==0||Math.abs((long)xSize)>256||zSize==0||Math.abs((long)zSize)>256||height<1||height>128)return CompletableFuture.failedFuture(new IllegalArgumentException("Room dimensions out of range"));int maxX=x+(xSize>0?xSize-1:0),minX=x+(xSize<0?xSize+1:0),maxZ=z+(zSize>0?zSize-1:0),minZ=z+(zSize<0?zSize+1:0);return addRoom(id,name,new DungeonState.Bounds(Math.min(x,minX),y,Math.min(z,minZ),Math.max(x,maxX),y+height-1,Math.max(z,maxZ)));}
     public CompletableFuture<DungeonState.Room> addRadiusRoom(UUID id,String name,int x,int y,int z,int radius,int height){if(radius<1||radius>128||height<1||height>128)return CompletableFuture.failedFuture(new IllegalArgumentException("Room dimensions out of range"));return addRoom(id,name,new DungeonState.Bounds(x-radius,y,z-radius,x+radius,y+height-1,z+radius));}
-    private CompletableFuture<DungeonState.Room> addRoom(UUID id,String name,DungeonState.Bounds bounds){var room=new DungeonState.Room(UUID.randomUUID(),name,bounds,List.of(),List.of(),DungeonState.Reward.empty(),null);return mutate(state->{var dungeon=editable(state,id);if(dungeon.rooms().size()>=128)throw new IllegalArgumentException("Room limit reached");if(dungeon.rooms().stream().anyMatch(value->value.bounds().overlaps(bounds)))throw new IllegalArgumentException("Rooms overlap");if(!dungeon.rooms().isEmpty()&&dungeon.rooms().stream().noneMatch(value->value.bounds().touchesFace(bounds)))throw new IllegalArgumentException("Room is disconnected");var rooms=new ArrayList<>(dungeon.rooms());rooms.add(room);return result(replace(state,definition(dungeon,rooms,dungeon.entrance(),false)),room);});}
-    public CompletableFuture<Optional<DungeonState.Room>> removeRoom(UUID id,UUID roomId){return mutate(state->{var dungeon=editable(state,id);var found=dungeon.rooms().stream().filter(v->v.id().equals(roomId)).findFirst();if(found.isEmpty())return result(state,Optional.empty());if(found.orElseThrow().boss()!=null&&found.orElseThrow().boss().character()!=null)throw new IllegalArgumentException("Recover character boss custody first");var rooms=dungeon.rooms().stream().filter(v->!v.id().equals(roomId)).toList();if(!connected(rooms))throw new IllegalArgumentException("Removal disconnects rooms");return result(replace(state,definition(dungeon,rooms,dungeon.entrance(),false)),found);});}
+    private CompletableFuture<DungeonState.Room> addRoom(UUID id,String name,DungeonState.Bounds bounds){var room=new DungeonState.Room(UUID.randomUUID(),name,bounds,List.of(),List.of(),DungeonState.Reward.empty(),null);return mutate(state->{var dungeon=editable(state,id);if(dungeon.rooms().size()>=128)throw new IllegalArgumentException("Room limit reached");if(dungeon.rooms().stream().anyMatch(value->value.bounds().overlaps(bounds)))throw new IllegalArgumentException("Rooms overlap");int maximum=linkDistance();var rooms=new ArrayList<>(dungeon.rooms());rooms.add(room);if(!connected(rooms,maximum))throw new IllegalArgumentException("Room exceeds configured link distance of "+maximum+" blocks");return result(replace(state,definition(dungeon,rooms,dungeon.entrance(),false)),room);});}
+    public CompletableFuture<Optional<DungeonState.Room>> removeRoom(UUID id,UUID roomId){return mutate(state->{var dungeon=editable(state,id);var found=dungeon.rooms().stream().filter(v->v.id().equals(roomId)).findFirst();if(found.isEmpty())return result(state,Optional.empty());if(found.orElseThrow().boss()!=null&&found.orElseThrow().boss().character()!=null)throw new IllegalArgumentException("Recover character boss custody first");var rooms=dungeon.rooms().stream().filter(v->!v.id().equals(roomId)).toList();if(!connected(rooms,linkDistance()))throw new IllegalArgumentException("Removal disconnects rooms");return result(replace(state,definition(dungeon,rooms,dungeon.entrance(),false)),found);});}
     public CompletableFuture<DungeonState.Spawn> addMob(UUID id,UUID roomId,EntityType type,String name,double x,double y,double z,float yaw,float pitch){var value=new DungeonState.Spawn(UUID.randomUUID(),type,name,new DungeonState.Position(x,y,z,yaw,pitch));return updateRoom(id,roomId,room->{var mobs=new ArrayList<>(room.mobs());if(mobs.size()>=256)throw new IllegalArgumentException("Mob limit reached");mobs.add(value);return new DungeonState.Room(room.id(),room.name(),room.bounds(),mobs,room.effects(),room.reward(),room.boss());},value);}
     public CompletableFuture<Optional<DungeonState.Spawn>> removeMob(UUID id,UUID roomId,UUID spawn){var found=room(id,roomId).flatMap(value->value.mobs().stream().filter(v->v.id().equals(spawn)).findFirst());if(found.isEmpty())return CompletableFuture.completedFuture(Optional.empty());return updateRoom(id,roomId,room->new DungeonState.Room(room.id(),room.name(),room.bounds(),room.mobs().stream().filter(v->!v.id().equals(spawn)).toList(),room.effects(),room.reward(),room.boss()),found);}
     public CompletableFuture<DungeonState.Effect> addEffect(UUID id,UUID roomId,DungeonState.EffectTarget target,String effect,int level,boolean particles){var value=new DungeonState.Effect(UUID.randomUUID(),target,effect,level,particles);return updateRoom(id,roomId,room->{var effects=new ArrayList<>(room.effects());if(effects.size()>=32)throw new IllegalArgumentException("Effect limit reached");effects.add(value);return new DungeonState.Room(room.id(),room.name(),room.bounds(),room.mobs(),effects,room.reward(),room.boss());},value);}
@@ -57,8 +58,11 @@ public final class DungeonDirectory implements AutoCloseable,AdventureResetParti
     private static Optional<DungeonState.Dungeon> find(DungeonState state,UUID id){return state.dungeons().stream().filter(v->v.id().equals(id)).findFirst();}
     private static DungeonState replace(DungeonState state,DungeonState.Dungeon dungeon){var values=state.dungeons().stream().map(v->v.id().equals(dungeon.id())?dungeon:v).toList();return new DungeonState(values,state.runs());}
     private static DungeonState.Dungeon definition(DungeonState.Dungeon original,List<DungeonState.Room> rooms,DungeonState.Position entrance,boolean enabled){return new DungeonState.Dungeon(original.id(),original.name(),original.world(),entrance,enabled,UUID.randomUUID(),rooms);}
-    private static void validate(DungeonState.Dungeon dungeon){if(dungeon.rooms().stream().map(DungeonState.Room::boss).filter(Objects::nonNull).map(DungeonState.Boss::character).filter(Objects::nonNull).anyMatch(value->value.recovery()!=null))throw new IllegalArgumentException("Character recovery is pending");if(dungeon.rooms().isEmpty()||!connected(dungeon.rooms()))throw new IllegalArgumentException("Dungeon rooms are incomplete");if(dungeon.rooms().stream().filter(v->v.boss()!=null).count()!=1)throw new IllegalArgumentException("Dungeon needs exactly one boss");}
-    static boolean connected(List<DungeonState.Room> rooms){if(rooms.size()<2)return true;var reached=new HashSet<UUID>();var queue=new ArrayDeque<DungeonState.Room>();queue.add(rooms.getFirst());reached.add(rooms.getFirst().id());while(!queue.isEmpty()){var current=queue.remove();for(var room:rooms)if(!reached.contains(room.id())&&current.bounds().touchesFace(room.bounds())){reached.add(room.id());queue.add(room);}}return reached.size()==rooms.size();}
+    public boolean eligibleForFutureOffer(UUID id){var dungeon=find(id).orElse(null);if(dungeon==null||!dungeon.enabled())return false;try{validate(dungeon);return true;}catch(IllegalArgumentException invalid){return false;}}
+    private void validate(DungeonState.Dungeon dungeon){if(overlapping(dungeon.rooms()))throw new IllegalArgumentException("Dungeon rooms overlap");if(dungeon.rooms().stream().map(DungeonState.Room::boss).filter(Objects::nonNull).map(DungeonState.Boss::character).filter(Objects::nonNull).anyMatch(value->value.recovery()!=null))throw new IllegalArgumentException("Character recovery is pending");if(dungeon.rooms().isEmpty()||!connected(dungeon.rooms(),linkDistance()))throw new IllegalArgumentException("Dungeon rooms are incomplete");if(dungeon.rooms().stream().filter(v->v.boss()!=null).count()!=1)throw new IllegalArgumentException("Dungeon needs exactly one boss");}
+    private int linkDistance(){int value=roomLinkDistance.getAsInt();if(value<1||value>256)throw new IllegalArgumentException("Invalid dungeon room link distance");return value;}
+    private static boolean overlapping(List<DungeonState.Room> rooms){for(int left=0;left<rooms.size();left++)for(int right=left+1;right<rooms.size();right++)if(rooms.get(left).bounds().overlaps(rooms.get(right).bounds()))return true;return false;}
+    static boolean connected(List<DungeonState.Room> rooms,int maximum){if(rooms.size()<2)return true;var reached=new HashSet<UUID>();var queue=new ArrayDeque<DungeonState.Room>();queue.add(rooms.getFirst());reached.add(rooms.getFirst().id());while(!queue.isEmpty()){var current=queue.remove();for(var room:rooms)if(!reached.contains(room.id())&&current.bounds().withinDistance(room.bounds(),maximum)){reached.add(room.id());queue.add(room);}}return reached.size()==rooms.size();}
     private void requireGeneration(UUID generation){var current=currentGeneration;if(current!=null&&!current.equals(generation))throw new IllegalStateException("Stale dungeon generation");}
     private record Result<T>(DungeonState state,T value){}
     private static <T>Result<T> result(DungeonState state,T value){return new Result<>(state,value);}

src/main/java/games/dmg/fantasystick/dungeon/DungeonState.java

@@ -17,6 +17,9 @@ public record DungeonState(List<Dungeon> dungeons,List<Run> runs) {
         public boolean contains(int x,int y,int z){return x>=minX&&x<=maxX&&y>=minY&&y<=maxY&&z>=minZ&&z<=maxZ;}
         public boolean overlaps(Bounds other){return minX<=other.maxX&&maxX>=other.minX&&minY<=other.maxY&&maxY>=other.minY&&minZ<=other.maxZ&&maxZ>=other.minZ;}
         public boolean touchesFace(Bounds other){boolean vertical=minY<=other.maxY&&maxY>=other.minY;boolean x=(maxX+1==other.minX||other.maxX+1==minX)&&minZ<=other.maxZ&&maxZ>=other.minZ;boolean z=(maxZ+1==other.minZ||other.maxZ+1==minZ)&&minX<=other.maxX&&maxX>=other.minX;return vertical&&(x||z);}
+        public double distanceSquared(Bounds other){double x=axisDistance(minX,maxX,other.minX,other.maxX),y=axisDistance(minY,maxY,other.minY,other.maxY),z=axisDistance(minZ,maxZ,other.minZ,other.maxZ);return x*x+y*y+z*z;}
+        public boolean withinDistance(Bounds other,int maximum){return maximum>=1&&distanceSquared(other)<=(double)maximum*maximum;}
+        private static double axisDistance(int minimum,int maximum,int otherMinimum,int otherMaximum){if(maximum<otherMinimum)return (long)otherMinimum-maximum;if(otherMaximum<minimum)return (long)minimum-otherMaximum;return 0;}
     }
     public record Spawn(UUID id,EntityType type,String name,Position position) {
         public Spawn {Objects.requireNonNull(id);Objects.requireNonNull(type);name=validName(name);Objects.requireNonNull(position);}

src/main/java/games/dmg/fantasystick/persistence/AdventureQuestSettings.java

@@ -16,18 +16,27 @@ import org.yaml.snakeyaml.constructor.SafeConstructor;
 /** Durable save-before-publication settings for later daily catalogs, camp and champion attempts. */
 public final class AdventureQuestSettings implements AutoCloseable {
     public static final String DAILY_COUNT="adventure-daily-site-count", RADIUS="adventure-site-radius",
-        RESET_SECONDS="adventure-site-reset-seconds", CAMP_ENEMIES="adventure-camp-enemies",
+        RESET_SECONDS="adventure-site-reset-seconds", DUNGEON_ROOM_LINK_DISTANCE="dungeon-room-link-distance",
+        CAMP_ENEMIES="adventure-camp-enemies",
         CAMP_REWARD_XP="adventure-camp-reward-xp", CAMP_REWARD_COINS="adventure-camp-reward-coins",
         CHAMPION_HEALTH="adventure-champion-health", CHAMPION_DAMAGE="adventure-champion-damage",
         CHAMPION_REWARD_XP="adventure-champion-reward-xp", CHAMPION_REWARD_COINS="adventure-champion-reward-coins";
     private static final Map<String,String> DEFAULTS=Map.ofEntries(
-        Map.entry(DAILY_COUNT,"3"),Map.entry(RADIUS,"16"),Map.entry(RESET_SECONDS,"30"),Map.entry(CAMP_ENEMIES,"8"),
+        Map.entry(DAILY_COUNT,"3"),Map.entry(RADIUS,"16"),Map.entry(RESET_SECONDS,"30"),
+        Map.entry(DUNGEON_ROOM_LINK_DISTANCE,"10"),Map.entry(CAMP_ENEMIES,"8"),
         Map.entry(CAMP_REWARD_XP,"100"),Map.entry(CAMP_REWARD_COINS,"20"),Map.entry(CHAMPION_HEALTH,"100"),
         Map.entry(CHAMPION_DAMAGE,"8"),Map.entry(CHAMPION_REWARD_XP,"150"),Map.entry(CHAMPION_REWARD_COINS,"40"));
     private static final List<String> KEYS=DEFAULTS.keySet().stream().sorted().toList();
     public record Rules(int dailySiteCount,int radius,int resetSeconds,int campEnemies,
                         BigInteger campRewardXp,BigInteger campRewardCoins,int championHealth,int championDamage,
-                        BigInteger championRewardXp,BigInteger championRewardCoins) { }
+                        BigInteger championRewardXp,BigInteger championRewardCoins,int dungeonRoomLinkDistance) {
+        public Rules(int dailySiteCount,int radius,int resetSeconds,int campEnemies,
+                     BigInteger campRewardXp,BigInteger campRewardCoins,int championHealth,int championDamage,
+                     BigInteger championRewardXp,BigInteger championRewardCoins) {
+            this(dailySiteCount,radius,resetSeconds,campEnemies,campRewardXp,campRewardCoins,championHealth,
+                championDamage,championRewardXp,championRewardCoins,10);
+        }
+    }
     public record Update(String key,String value,Map<String,String> values,long sequence) {
         public Update { values=Map.copyOf(values); }
     }
@@ -54,7 +63,8 @@ public final class AdventureQuestSettings implements AutoCloseable {
             bounded(values.get(RESET_SECONDS),0,600),bounded(values.get(CAMP_ENEMIES),4,64),
             whole(values.get(CAMP_REWARD_XP)),whole(values.get(CAMP_REWARD_COINS)),
             bounded(values.get(CHAMPION_HEALTH),1,2048),bounded(values.get(CHAMPION_DAMAGE),1,2048),
-            whole(values.get(CHAMPION_REWARD_XP)),whole(values.get(CHAMPION_REWARD_COINS)));}
+            whole(values.get(CHAMPION_REWARD_XP)),whole(values.get(CHAMPION_REWARD_COINS)),
+            bounded(values.get(DUNGEON_ROOM_LINK_DISTANCE),1,256));}
         catch(RuntimeException invalid){throw new IllegalArgumentException("Invalid adventure quest settings",invalid);}
     }
     private static int bounded(String raw,int minimum,int maximum){var value=new BigInteger(raw);if(value.compareTo(BigInteger.valueOf(minimum))<0||value.compareTo(BigInteger.valueOf(maximum))>0)throw new IllegalArgumentException();return value.intValueExact();}

src/main/resources/config.yml

@@ -64,6 +64,8 @@ restricted-kill-spacing-blocks: 3
 adventure-daily-site-count: 3
 adventure-site-radius: 16
 adventure-site-reset-seconds: 30
+# Maximum inclusive 3D block-center distance linking non-overlapping dungeon rooms.
+dungeon-room-link-distance: 10
 adventure-camp-enemies: 8
 adventure-camp-reward-xp: 100
 adventure-camp-reward-coins: 20

src/nativeTest/java/games/dmg/fantasystick/DungeonNativeTest.java

@@ -54,6 +54,20 @@ class DungeonNativeTest {
 
         }
     }
+    @Test void roomCreationReportsOverlapDistanceLimitsAndPersistenceSeparately() throws Exception {
+        java.nio.file.Files.writeString(data.resolve("config.yml"),"adventure-daily-site-count: 0\ndungeon-room-link-distance: 10\n");
+        try(var f=new FantasyStickLifecycleNativeTest.Fixture(data)){
+            f.plugin.setEnabled(true);var actor=new FantasyStickLifecycleNativeTest.Actor(data);f.players.put(actor.core.id,actor.player);doReturn(true).when(actor.player).hasPermission("fantasystick.admin");when(actor.world.getUID()).thenReturn(UUID.randomUUID());
+            command(f,actor,"dungeon","create","Feedback");var dungeons=(DungeonDirectory)FantasyStickLifecycleNativeTest.Fixture.field(f.plugin,"dungeons");var dungeon=dungeons.snapshot().dungeons().getFirst();command(f,actor,"dungeon","edit","start",dungeon.id().toString());var controller=(games.dmg.fantasystick.dungeon.DungeonController)FantasyStickLifecycleNativeTest.Fixture.field(f.plugin,"dungeonController");await(f,()->controller.editing(actor.core.id).isPresent(),actor.messages);
+            command(f,actor,"dungeon","room","create","corner","1","1","1","First");await(f,()->dungeons.find(dungeon.id()).orElseThrow().rooms().size()==1,actor.messages);var first=dungeons.find(dungeon.id()).orElseThrow().rooms().getFirst();
+            command(f,actor,"dungeon","room","create","corner","1","1","1","Overlap");await(f,()->actor.messages.stream().anyMatch(message->message.contains("overlaps an existing room")),actor.messages);
+            actor.core.location.setX(first.bounds().maxX()+11.1);actor.core.location.setY(first.bounds().minY()+1);actor.core.location.setZ(first.bounds().minZ()+.5);command(f,actor,"dungeon","room","create","corner","1","1","1","Too Far");await(f,()->actor.messages.stream().anyMatch(message->message.contains("configured 10-block link distance")),actor.messages);
+            f.command.execute(actor.player,"fantasystick",new String[]{"config","dungeon-room-link-distance","11"});var settings=(games.dmg.fantasystick.persistence.AdventureQuestSettings)FantasyStickLifecycleNativeTest.Fixture.field(f.plugin,"adventureQuestSettings");await(f,()->settings.rules().dungeonRoomLinkDistance()==11,actor.messages);command(f,actor,"dungeon","room","create","corner","1","1","1","Now Linked");await(f,()->dungeons.find(dungeon.id()).orElseThrow().rooms().size()==2,actor.messages);var linked=dungeons.find(dungeon.id()).orElseThrow().rooms().getLast();
+            command(f,actor,"dungeon","room","create","corner","257","1","1","Too Large");await(f,()->actor.messages.stream().anyMatch(message->message.contains("dimensions or room limit")),actor.messages);
+            var file=data.resolve("dungeons.yml");java.nio.file.Files.delete(file);java.nio.file.Files.createDirectory(file);actor.core.location.setX(linked.bounds().maxX()+11.1);command(f,actor,"dungeon","room","create","corner","1","1","1","Unsaved");await(f,()->actor.messages.stream().anyMatch(message->message.contains("persistence is unavailable")),actor.messages);assertEquals(2,dungeons.find(dungeon.id()).orElseThrow().rooms().size());
+        }
+    }
+
     @Test void authenticSheetAssignmentBlocksActivationAndRecoveryReturnsExactCharacter() throws Exception {
         var root=data.resolve("custody");java.nio.file.Files.createDirectories(root);
         try(var f=new FantasyStickLifecycleNativeTest.Fixture(root)){f.plugin.setEnabled(true);var actor=new FantasyStickLifecycleNativeTest.Actor(root);f.players.put(actor.core.id,actor.player);doReturn(true).when(actor.player).hasPermission("fantasystick.admin");UUID world=UUID.randomUUID();when(actor.world.getUID()).thenReturn(world);var dungeons=(DungeonDirectory)FantasyStickLifecycleNativeTest.Fixture.field(f.plugin,"dungeons");var dungeon=dungeons.create("Custody",world,0,64,0,0,0).get(5,TimeUnit.SECONDS);var room=dungeons.addRadiusRoom(dungeon.id(),"Boss",0,64,0,3,3).get(5,TimeUnit.SECONDS);dungeons.setBoss(dungeon.id(),room.id(),EntityType.HUSK,"Temporary",0,65,0,0,0).get(5,TimeUnit.SECONDS);command(f,actor,"dungeon","edit","start",dungeon.id().toString());var controller=(games.dmg.fantasystick.dungeon.DungeonController)FantasyStickLifecycleNativeTest.Fixture.field(f.plugin,"dungeonController");await(f,()->controller.editing(actor.core.id).isPresent(),actor.messages);actor.core.location.setX(.5);actor.core.location.setY(65);actor.core.location.setZ(.5);assertEquals(List.of("assign-sheet"),f.command.tabComplete(actor.player,"fantasystick",new String[]{"dungeon","room","boss","ass"}));assertEquals(List.of("0.1","1","1.5","10","100"),f.command.tabComplete(actor.player,"fantasystick",new String[]{"dungeon","room","boss","assign-sheet",""}));var sheet=actor.core.inventory.getItemInOffHand();actor.core.inventory.setItemInOffHand(null);actor.core.inventory.setItemInMainHand(sheet);actor.core.inventory.setItem(5,sheet.clone());command(f,actor,"dungeon","room","boss","assign-sheet","1.125");assertTrue(dungeons.custody(actor.core.record.id()).isEmpty());actor.core.inventory.setItem(5,null);var partyDirectory=(games.dmg.fantasystick.party.CharacterPartyDirectory)FantasyStickLifecycleNativeTest.Fixture.field(f.plugin,"characterParties");var forbiddenParty=partyDirectory.create(actor.core.record.id(),"Before Custody").get(5,TimeUnit.SECONDS).party().orElseThrow();command(f,actor,"dungeon","room","boss","assign-sheet","1.125");assertTrue(dungeons.custody(actor.core.record.id()).isEmpty());assertFalse(actor.core.inventory.getItemInMainHand().isEmpty());partyDirectory.disband(actor.core.record.id(),forbiddenParty.id()).get(5,TimeUnit.SECONDS);command(f,actor,"dungeon","room","boss","assign-sheet","1.125");await(f,()->dungeons.custody(actor.core.record.id()).isPresent(),actor.messages);assertTrue(actor.core.inventory.getItemInMainHand().isEmpty());assertEquals(actor.core.record,dungeons.custody(actor.core.record.id()).orElseThrow().character());actor.core.inventory.setItemInOffHand(new games.dmg.fantasystick.items.CharacterSheets().create(actor.core.record));var sessions=(games.dmg.fantasystick.session.EquipmentSessions)FantasyStickLifecycleNativeTest.Fixture.field(f.plugin,"sessions");sessions.enter(actor.player);assertTrue(sessions.active(actor.core.id).isEmpty());assertTrue(actor.messages.stream().anyMatch(message->message.contains("dungeon boss")));var storage=(CharacterStorage)FantasyStickLifecycleNativeTest.Fixture.field(f.plugin,"characters");assertThrows(java.util.concurrent.ExecutionException.class,()->storage.awardExperience(actor.core.record.id(),actor.core.record.revision(),BigInteger.ONE,games.dmg.fantasystick.progression.ProgressionRules.defaults()).get(5,TimeUnit.SECONDS));assertEquals(games.dmg.fantasystick.party.CharacterPartyDirectory.Status.INVALID,partyDirectory.create(actor.core.record.id(),"Forbidden").get(5,TimeUnit.SECONDS).status());actor.core.inventory.setItemInOffHand(null);actor.core.location.setX(100);command(f,actor,"dungeon","edit","done");assertEquals(List.of(dungeon.id().toString()),f.command.tabComplete(actor.player,"fantasystick",new String[]{"dungeon","boss","recover-sheet",""}));command(f,actor,"dungeon","boss","recover-sheet",dungeon.id().toString());await(f,()->dungeons.custody(actor.core.record.id()).isEmpty(),actor.messages);var returned=Arrays.stream(actor.core.inventory.getContents()).filter(Objects::nonNull).filter(item->new games.dmg.fantasystick.items.CharacterSheets().identify(item).filter(actor.core.record.id()::equals).isPresent()).toList();assertEquals(1,returned.size());assertEquals(actor.core.record,storage.find(actor.core.record.id()).get(5,TimeUnit.SECONDS).orElseThrow());assertNull(dungeons.room(dungeon.id(),room.id()).orElseThrow().boss());}

src/nativeTest/java/games/dmg/fantasystick/FantasyStickLifecycleNativeTest.java

@@ -906,7 +906,8 @@ class FantasyStickLifecycleNativeTest {
         for (String row : List.of("passive-xp: -1", "ordinary-xp: 1.5", "boss-xp: nope",
                 "hard-mob-xp: -1", "hard-mob-xp: 2147483648", "hard-mob-xp: 1.5",
                 "adventure-daily-site-count: 21", "adventure-site-radius: 3",
-                "adventure-site-reset-seconds: 601", "adventure-camp-enemies: 3",
+                "adventure-site-reset-seconds: 601", "dungeon-room-link-distance: 0",
+                "dungeon-room-link-distance: 257", "adventure-camp-enemies: 3",
                 "adventure-camp-reward-xp: -1", "adventure-camp-reward-coins: 2147483648",
                 "adventure-champion-health: 0", "adventure-champion-health: 2049",
                 "adventure-champion-damage: 0", "adventure-champion-damage: 2049",

src/test/java/games/dmg/fantasystick/DistributionTest.java

@@ -49,7 +49,7 @@ class DistributionTest {
                 "The delivered configuration must expose the reviewed 15-minute default");
             assertTrue(defaults.contains("adventure-mode: true"));
             for (String setting : java.util.List.of("adventure-daily-site-count: 3", "adventure-site-radius: 16",
-                    "adventure-site-reset-seconds: 30", "adventure-camp-enemies: 8",
+                    "adventure-site-reset-seconds: 30", "dungeon-room-link-distance: 10", "adventure-camp-enemies: 8",
                     "adventure-camp-reward-xp: 100", "adventure-camp-reward-coins: 20",
                     "adventure-champion-health: 100", "adventure-champion-damage: 8",
                     "adventure-champion-reward-xp: 150", "adventure-champion-reward-coins: 40")) {

src/test/java/games/dmg/fantasystick/adventure/AdventureQuestDirectoryTest.java

@@ -157,12 +157,13 @@ class AdventureQuestDirectoryTest {
 
     @Test void failedAdventureWriteRetainsPublishedState() throws Exception {
         var blocked=data.resolve("blocked");java.nio.file.Files.writeString(blocked,"not a directory");
-        var rules=AdventureQuestSettings.parse(java.util.Map.of(
-            AdventureQuestSettings.DAILY_COUNT,"3",AdventureQuestSettings.RADIUS,"16",
-            AdventureQuestSettings.RESET_SECONDS,"30",AdventureQuestSettings.CAMP_ENEMIES,"8",
-            AdventureQuestSettings.CAMP_REWARD_XP,"100",AdventureQuestSettings.CAMP_REWARD_COINS,"20",
-            AdventureQuestSettings.CHAMPION_HEALTH,"100",AdventureQuestSettings.CHAMPION_DAMAGE,"8",
-            AdventureQuestSettings.CHAMPION_REWARD_XP,"150",AdventureQuestSettings.CHAMPION_REWARD_COINS,"40"));
+        var rules=AdventureQuestSettings.parse(java.util.Map.ofEntries(
+            java.util.Map.entry(AdventureQuestSettings.DAILY_COUNT,"3"),java.util.Map.entry(AdventureQuestSettings.RADIUS,"16"),
+            java.util.Map.entry(AdventureQuestSettings.RESET_SECONDS,"30"),java.util.Map.entry(AdventureQuestSettings.DUNGEON_ROOM_LINK_DISTANCE,"10"),
+            java.util.Map.entry(AdventureQuestSettings.CAMP_ENEMIES,"8"),
+            java.util.Map.entry(AdventureQuestSettings.CAMP_REWARD_XP,"100"),java.util.Map.entry(AdventureQuestSettings.CAMP_REWARD_COINS,"20"),
+            java.util.Map.entry(AdventureQuestSettings.CHAMPION_HEALTH,"100"),java.util.Map.entry(AdventureQuestSettings.CHAMPION_DAMAGE,"8"),
+            java.util.Map.entry(AdventureQuestSettings.CHAMPION_REWARD_XP,"150"),java.util.Map.entry(AdventureQuestSettings.CHAMPION_REWARD_COINS,"40")));
         try(var directory=new AdventureQuestDirectory(new YamlAdventureQuestRepository(blocked),Clock.systemUTC(),()->rules,new Random(1))){
             assertThrows(java.util.concurrent.ExecutionException.class,()->directory.placeSite(AdventureQuestState.SiteType.CAMP,"Camp",UUID.randomUUID(),0,64,0,AdventureQuestState.Arena.rectangle(20,30)).get(5,TimeUnit.SECONDS));
             assertTrue(directory.snapshot().sites().isEmpty());

src/test/java/games/dmg/fantasystick/dungeon/DungeonDirectoryTest.java

@@ -18,7 +18,7 @@ final class DungeonDirectoryTest {
         var repository=new YamlDungeonRepository(data);
         UUID world=UUID.randomUUID();
         UUID dungeonId;
-        try(var directory=new DungeonDirectory(repository)){
+        try(var directory=new DungeonDirectory(repository,()->1)){
             var dungeon=directory.create("Sunken Keep",world,10.25,65,-4.75,90,0).get(5,TimeUnit.SECONDS);
             dungeonId=dungeon.id();assertFalse(dungeon.enabled());assertEquals("Sunken Keep",dungeon.name());
             var first=directory.addCornerRoom(dungeon.id(),"Entry",10,64,-5,4,4,3).get(5,TimeUnit.SECONDS);
@@ -40,6 +40,30 @@ final class DungeonDirectoryTest {
         assertEquals(EntityType.VINDICATOR,reloaded.rooms().stream().filter(room->room.boss()!=null).findFirst().orElseThrow().boss().type());
     }
 
+    @Test void configuredDistanceLinksHorizontalVerticalDiagonalAndTransitiveRooms() throws Exception {
+        var distance=new java.util.concurrent.atomic.AtomicInteger(10);
+        try(var directory=new DungeonDirectory(new YamlDungeonRepository(data),distance::get)){
+            var dungeon=directory.create("Linked",UUID.randomUUID(),0,1,0,0,0).get(5,TimeUnit.SECONDS);
+            var first=directory.addCornerRoom(dungeon.id(),"First",0,0,0,1,1,1).get(5,TimeUnit.SECONDS);
+            var horizontal=directory.addCornerRoom(dungeon.id(),"Horizontal",10,0,0,1,1,1).get(5,TimeUnit.SECONDS);
+            var transitive=directory.addCornerRoom(dungeon.id(),"Transitive",20,0,0,1,1,1).get(5,TimeUnit.SECONDS);
+            var vertical=directory.addCornerRoom(dungeon.id(),"Vertical",20,10,0,1,1,1).get(5,TimeUnit.SECONDS);
+            var diagonal=directory.addCornerRoom(dungeon.id(),"Diagonal",26,18,0,1,1,1).get(5,TimeUnit.SECONDS);
+            assertEquals(100d,first.bounds().distanceSquared(horizontal.bounds()));
+            assertEquals(100d,vertical.bounds().distanceSquared(diagonal.bounds()));
+            assertThrows(java.util.concurrent.ExecutionException.class,()->directory.addCornerRoom(dungeon.id(),"Too Far",37,18,0,1,1,1).get(5,TimeUnit.SECONDS));
+            assertThrows(java.util.concurrent.ExecutionException.class,()->directory.addCornerRoom(dungeon.id(),"Overlap",0,0,0,1,1,1).get(5,TimeUnit.SECONDS));
+            assertThrows(java.util.concurrent.ExecutionException.class,()->directory.removeRoom(dungeon.id(),horizontal.id()).get(5,TimeUnit.SECONDS));
+            distance.set(4);assertThrows(java.util.concurrent.ExecutionException.class,()->directory.addCornerRoom(dungeon.id(),"Partial Repair",4,0,0,1,1,1).get(5,TimeUnit.SECONDS),"An addition must leave the complete graph linked under the current setting");distance.set(10);
+            directory.setBoss(dungeon.id(),first.id(),EntityType.HUSK,"Boss",0,0,0,0,0).get(5,TimeUnit.SECONDS);
+            assertTrue(directory.enable(dungeon.id(),java.util.List.of()).get(5,TimeUnit.SECONDS).enabled());var generation=UUID.randomUUID();directory.run(dungeon.id(),generation).get(5,TimeUnit.SECONDS);
+            distance.set(4);
+            assertFalse(directory.eligibleForFutureOffer(dungeon.id()));assertTrue(directory.runView(dungeon.id(),generation).isPresent(),"Current-generation work remains authoritative");
+            assertThrows(java.util.concurrent.ExecutionException.class,()->directory.enable(dungeon.id(),java.util.List.of()).get(5,TimeUnit.SECONDS));
+            assertTrue(directory.find(dungeon.id()).orElseThrow().enabled(),"Reduced configuration does not rewrite retained state");
+        }
+    }
+
     @Test void signedCornerAndCenteredRadiusUseExactInclusiveBlockBounds() throws Exception {
         try(var directory=new DungeonDirectory(new YamlDungeonRepository(data))){var dungeon=directory.create("Geometry",UUID.randomUUID(),10,65,-5,0,0).get(5,TimeUnit.SECONDS);var negative=directory.addCornerRoom(dungeon.id(),"Negative",10,64,-5,-4,-3,2).get(5,TimeUnit.SECONDS);assertEquals(new DungeonState.Bounds(7,64,-7,10,65,-5),negative.bounds());var radius=directory.addRadiusRoom(dungeon.id(),"Radius",5,64,-6,1,2).get(5,TimeUnit.SECONDS);assertEquals(new DungeonState.Bounds(4,64,-7,6,65,-5),radius.bounds());assertTrue(radius.bounds().touchesFace(negative.bounds()));}
     }

src/test/java/games/dmg/fantasystick/persistence/AdventureQuestSettingsTest.java

@@ -17,6 +17,7 @@ class AdventureQuestSettingsTest {
         for (String key : AdventureQuestSettings.keys()) initial.put(key, AdventureQuestSettings.defaultValue(key));
         var rules = AdventureQuestSettings.parse(initial);
         assertEquals(3, rules.dailySiteCount()); assertEquals(16, rules.radius()); assertEquals(30, rules.resetSeconds());
+        assertEquals(10, rules.dungeonRoomLinkDistance());
         assertEquals(8, rules.campEnemies()); assertEquals(java.math.BigInteger.valueOf(100), rules.campRewardXp());
         assertEquals(java.math.BigInteger.valueOf(20), rules.campRewardCoins());
         assertEquals(100, rules.championHealth()); assertEquals(8, rules.championDamage());
@@ -27,11 +28,14 @@ class AdventureQuestSettingsTest {
             var update = settings.set(AdventureQuestSettings.CAMP_ENEMIES, "64").toCompletableFuture().get(5, TimeUnit.SECONDS);
             assertEquals("8", settings.value(AdventureQuestSettings.CAMP_ENEMIES));
             assertTrue(settings.publish(update)); assertEquals("64", settings.value(AdventureQuestSettings.CAMP_ENEMIES));
-            assertTrue(Files.readString(data.resolve("config.yml")).contains("unrelated: retained"));
+            var saved=Files.readString(data.resolve("config.yml"));assertTrue(saved.contains("unrelated: retained"));
+            assertFalse(saved.contains(AdventureQuestSettings.DUNGEON_ROOM_LINK_DISTANCE),"Unchanged packaged defaults do not rewrite explicit configuration");
         }
         assertInvalid(initial, AdventureQuestSettings.DAILY_COUNT, "21");
         assertInvalid(initial, AdventureQuestSettings.RADIUS, "3");
         assertInvalid(initial, AdventureQuestSettings.RESET_SECONDS, "601");
+        assertInvalid(initial, AdventureQuestSettings.DUNGEON_ROOM_LINK_DISTANCE, "0");
+        assertInvalid(initial, AdventureQuestSettings.DUNGEON_ROOM_LINK_DISTANCE, "257");
         assertInvalid(initial, AdventureQuestSettings.CAMP_ENEMIES, "3");
         assertInvalid(initial, AdventureQuestSettings.CAMP_REWARD_XP, "-1");
         assertInvalid(initial, AdventureQuestSettings.CAMP_REWARD_COINS, "2147483648");