From 8bffe711aeb78a197fdad8435c5d87a4fbdaa275 Mon Sep 17 00:00:00 2001 From: austin Date: Wed, 28 May 2025 21:15:59 -0400 Subject: [PATCH] farm plot radius work --- docs/src/progress/renderertodo.md | 1 + .../java/electrosphere/server/macro/town/TownLayout.java | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md index fb13e1e5..ef80a9dc 100644 --- a/docs/src/progress/renderertodo.md +++ b/docs/src/progress/renderertodo.md @@ -2041,6 +2041,7 @@ Town layout non-statically generates farm plots Y-aligned prism meshgen Rendering prism regions Utilities for turning mesh gen algos into renderable entities +Back off farm plots from roads by road radius diff --git a/src/main/java/electrosphere/server/macro/town/TownLayout.java b/src/main/java/electrosphere/server/macro/town/TownLayout.java index b6f32937..a300edb6 100644 --- a/src/main/java/electrosphere/server/macro/town/TownLayout.java +++ b/src/main/java/electrosphere/server/macro/town/TownLayout.java @@ -270,13 +270,13 @@ public class TownLayout { } //this is +0,+0 - plotPoint1.set(currPoint); + plotPoint1.set(currPoint).add(Road.DEFAULT_RADIUS,0,Road.DEFAULT_RADIUS); scanPoint.set(townCenter).add(TOWN_LAYOUT_SCALER * (x + 1),0,TOWN_LAYOUT_SCALER * (z + 0)); - plotPoint2 = TownLayout.getTownCenter(realm, scanPoint); + plotPoint2 = TownLayout.getTownCenter(realm, scanPoint).add(-Road.DEFAULT_RADIUS,0,Road.DEFAULT_RADIUS); scanPoint.set(townCenter).add(TOWN_LAYOUT_SCALER * (x + 1),0,TOWN_LAYOUT_SCALER * (z + 1)); - plotPoint3 = TownLayout.getTownCenter(realm, scanPoint); + plotPoint3 = TownLayout.getTownCenter(realm, scanPoint).add(-Road.DEFAULT_RADIUS,0,-Road.DEFAULT_RADIUS); scanPoint.set(townCenter).add(TOWN_LAYOUT_SCALER * (x + 0),0,TOWN_LAYOUT_SCALER * (z + 1)); - plotPoint4 = TownLayout.getTownCenter(realm, scanPoint); + plotPoint4 = TownLayout.getTownCenter(realm, scanPoint).add(Road.DEFAULT_RADIUS,0,-Road.DEFAULT_RADIUS); if( plotPoint1.distance(townCenter) > TOWN_CENTER_RADIUS && plotPoint2.distance(townCenter) > TOWN_CENTER_RADIUS &&