tools: demobane med lommeparkering, hegn, markvej langs kanten

This commit is contained in:
2026-10-08 01:19:51 +02:00
parent ea98addc03
commit 8f1d4cbb45
3 changed files with 64 additions and 30 deletions
+27
View File
@@ -0,0 +1,27 @@
# Giver demostaldene hegn (navigationsnet til dyrene) og fjerner grisestalden. Kør: python3 add_fences.py <savegame>
import sys, re, pickle
SG = sys.argv[1]
S = '/tmp/claude-1000/-var-home-masterdraco/1b0df907-2292-4111-9866-f9ea477e9378/scratchpad/demo'
fences = pickle.load(open(S + '/fences.pkl', 'rb'))
# fårefolden gøres mindre (den oprindelige gik ud over ringvejen ved z=-865)
fences['rudolfHormann/sheepBarnBig/sheepBarnBig.xml'] = [
(((202.6, -814.4), (202.6, -850.0)), 'SEGMENT'), (((202.6, -850.0), (245.0, -850.0)), 'SEGMENT'),
(((245.0, -850.0), (245.0, -824.9)), 'SEGMENT'), (((245.0, -824.9), (224.9, -824.4)), 'SEGMENT'),
(((224.9, -824.4), (224.6, -814.4)), 'SEGMENT')]
path = SG + '/placeables.xml'
raw = open(path, encoding='utf-8-sig').read()
for key, segs in fences.items():
fence = ' <husbandryFence>\n <fence>\n' + ''.join(
' <segment start="%.3f 106.000 %.3f" end="%.3f 106.000 %.3f" id="%s"/>\n' % (a[0], a[1], b[0], b[1], i)
for (a, b), i in segs) + ' </fence>\n </husbandryFence>\n'
pat = re.compile(r'(<placeable [^>]*filename="[^"]*' + re.escape(key) + r'"[^>]*>.*?)(\s*</placeable>)', re.S)
m = pat.search(raw)
assert m, key
body = re.sub(r'\s*<husbandryFence>.*?</husbandryFence>', '', m.group(1), flags=re.S)
raw = raw[:m.start()] + body + '\n' + fence + ' </placeable>' + raw[m.end():]
# grisestalden ud (kun vand-trigger, intet hegn)
raw = re.sub(r'\s*<placeable [^>]*pigBarnSmall\.xml".*?</placeable>', '', raw, count=1, flags=re.S)
open(path, 'w', encoding='utf-8-sig', newline='\n').write(raw)
import xml.etree.ElementTree as ET
r = ET.parse(path).getroot()
print('bygninger:', len(r.findall('placeable')), '— med hegn:', len(r.findall('.//husbandryFence')))
+37 -30
View File
@@ -66,15 +66,20 @@ def marker(name, x, z):
# kryds-punkter registreres først (så hjørne-afføjning ikke flytter dem)
N_Z, S_Z, W_X, E_X = -865.0, -690.0, 95.0, 505.0
for x in (95, 116, 144, 190, 282, 317.64, 335, 355, 505): node(x, N_Z)
for x in (505, 441.98, 340, 317.64, 282, 270, 262, 250, 144, 116, 104, 95): node(x, S_Z)
for z in (-600, -620, -645, -668, -690, -728.1, -865): node(W_X, z)
for x in (505, 470, 441.98, 317.64, 282, 270, 250, 144, 116, 95): node(x, S_Z)
for z in (-580, -612, -650, -668, -690, -728.1, -865): node(W_X, z)
node(E_X, -843.6)
SLOTS = [440, 400, 360, 320, 280, 240, 200, 160, 120] # lommer á 40 m; køretøjet holder i lommen, hovedsporet er frit
FEED = {1: (-650.0, -638.0), 2: (-612.0, -600.0)} # række: (hovedspor-z, lomme-z)
for F, L in FEED.values():
for x in [470] + [sx + 20 for sx in SLOTS] + [100]: node(x, F)
node(95, F)
# ringvej (med uret): nord mod øst, øst mod syd, syd mod vest, vest mod nord
road([(95, N_Z), (116, N_Z), (144, N_Z), (190, N_Z), (282, N_Z), (317.64, N_Z), (335, N_Z), (355, N_Z), (505, N_Z)])
road([(505, N_Z), (505, -843.6), (505, S_Z)])
road([(505, S_Z), (441.98, S_Z), (340, S_Z), (317.64, S_Z), (282, S_Z), (270, S_Z), (262, S_Z), (250, S_Z), (144, S_Z), (116, S_Z), (104, S_Z), (95, S_Z)])
road([(95, -600), (95, -620), (95, -645), (95, -668), (95, S_Z), (95, -728.1), (95, N_Z)])
road([(505, N_Z), (505, -843.6), (505, S_Z), (505, -580)])
road([(505, S_Z), (470, S_Z), (441.98, S_Z), (317.64, S_Z), (282, S_Z), (270, S_Z), (250, S_Z), (144, S_Z), (116, S_Z), (95, S_Z)])
road([(95, -580), (95, -612), (95, -650), (95, -668), (95, S_Z), (95, -728.1), (95, N_Z)])
# hønsehus: æg (vestsiden, mod syd) og foder + silo (østsiden, mod syd; silo-gren mod vest under siloen)
road([(116, N_Z), (116, S_Z)])
@@ -98,13 +103,15 @@ road([(355, N_Z), (375, -843.6), (505, -843.6)])
bay = road([(441.98, S_Z), (441.98, -708)], flag=1)
for a, b in zip(reversed(bay), list(reversed(bay))[1:]):
reverse_link(a, b)
# marker: sløjfe syd for gården (ud ad x=262, hjem ad x=104)
road([(262, S_Z), (262, -580), (104, -580), (104, S_Z)])
# parkeringer + Wait: indkørsel ad x=340 mod syd, sporene mod vest ud på vestvejen
road([(340, S_Z), (340, -668), (340, -645), (340, -620)], flag=1)
road([(340, -668), (95, -668)], flag=1)
road([(340, -645), (95, -645)], flag=1)
road([(340, -620), (95, -620)], flag=1)
# markvej: fra østvejen mod syd og langs sydkanten mod vest forbi F53/F52, ud på vestvejen
road([(505, -580), (95, -580)])
# parkering + Wait: indkørsel ad x=470 mod syd; hovedspor mod vest ud på vestvejen; en lomme pr. plads
road([(470, S_Z), (470, -668), (470, -650), (470, -612)], flag=1)
road([(470, -668), (95, -668)], flag=1)
for F, L in FEED.values():
road([(470, F)] + [(sx + 20, F) for sx in SLOTS] + [(100, F), (95, F)], flag=1)
for sx in SLOTS:
road([(sx + 20, F), (sx + 12, L), (sx - 12, L), (sx - 20, F)], flag=1)
# ---------------- markører ----------------
marker("Silo", 124, -728.1)
@@ -119,32 +126,32 @@ marker("Dairy", 441.98, -708)
marker("Biogas", 443, -843.6)
marker("F52", 146, -580)
marker("F53", 239.5, -580)
for i, x in enumerate((310, 280, 225, 195, 165), 1):
for i, x in enumerate((440, 400, 360, 320, 280), 1):
marker("Wait %d" % i, x, -668)
SLOTS = [320, 298, 276, 240, 218, 196, 174, 152, 130]
# (filnavn-del, nummer blandt ens, markørnavn, spor-z, plads, kobling?)
PARK = [
("z18051", 1, "Tipper 1", -645, 0, True), ("z18051", 2, "Tipper 2", -645, 1, True),
("mks32", 1, "Milk Tank", -645, 2, True), ("supercis800", 1, "Slurry Tank", -645, 3, True),
("cenio4000", 1, "Cultivator", -645, 4, True), ("pov5xl", 1, "Plow", -645, 5, True),
("seeder1500", 1, "Seeder", -645, 6, True), ("maxima3TIL", 1, "Planter", -645, 7, True),
("k105", 1, "Spreader", -645, 8, True),
("crystal", 1, "Crystal", -620, 0, False), ("vario700", 1, "Vario 700", -620, 1, False),
("puma", 1, "Puma", -620, 2, False), ("multiPurposeTruck", 1, "Pallet Truck", -620, 3, False),
("mt655", 1, "MT655", -620, 4, False), ("series6RLarge", 1, "6R", -620, 5, False),
("t7", 1, "T7", -620, 6, False), ("series6C", 1, "6C", -620, 7, False),
("z18051", 1, "Tipper 1", 1, 0, True), ("z18051", 2, "Tipper 2", 1, 1, True),
("mks32", 1, "Milk Tank", 1, 2, True), ("supercis800", 1, "Slurry Tank", 1, 3, True),
("cenio4000", 1, "Cultivator", 1, 4, True), ("pov5xl", 1, "Plow", 1, 5, True),
("seeder1500", 1, "Seeder", 1, 6, True), ("maxima3TIL", 1, "Planter", 1, 7, True),
("k105", 1, "Spreader", 1, 8, True),
("crystal", 1, "Crystal", 2, 0, False), ("vario700", 1, "Vario 700", 2, 1, False),
("puma", 1, "Puma", 2, 2, False), ("multiPurposeTruck", 1, "Pallet Truck", 2, 3, False),
("mt655", 1, "MT655", 2, 4, False), ("series6RLarge", 1, "6R", 2, 5, False),
("t7", 1, "T7", 2, 6, False), ("series6C", 1, "6C", 2, 7, False),
]
park_marker = {}
for key, num, name, lz, slot, connect in PARK:
x = SLOTS[slot]
for key, num, name, row, slot, connect in PARK:
lz = FEED[row][1]
x = SLOTS[slot] - (7 if connect else 0) # redskab/vogn: traktoren stopper vest for redskabet og bakker til
marker("P " + name, x, lz)
if connect: marker("Connect P " + name, x, lz)
park_marker[(key, num)] = len(markers) # 1-baseret indeks på P-markøren
if connect: park_marker[(key, num)] = len(markers) - 1
# øvrige (ingen AD): stilles i en række øst for parkeringen
YARD = {"evion450": (380, -625), "vario620": (395, -610), "diamant8": (410, -610), "weight650": (425, -610),
"rwgP13": (440, -610), "pickUp1150": (455, -625)}
YARD = {"evion450": (50, -605), "vario620": (35, -625), "diamant8": (55, -640), "weight650": (35, -655),
"rwgP13": (55, -670), "pickUp1150": (35, -685)}
# ---------------- forbindelseskontrol ----------------
def reach(s):
@@ -210,10 +217,10 @@ def fix(m):
num = counts[key]
uids[(key, num)] = re.search(r'uniqueId="([^"]*)"', block).group(1)
block = re.sub(r'\s*<AutoDrive [^>]*/>', '', block)
for pk, pnum, name, lz, slot, connect in PARK:
for pk, pnum, name, row, slot, connect in PARK:
if pk == key and pnum == num:
x = SLOTS[slot]
cx = x + (9.0 if connect else 1.0) # redskab/vogn bag traktoren (øst), traktor på pladsen
lz = FEED[row][1]
cx = SLOTS[slot] + (3.0 if connect else 0.0) # i lommen: redskab/vogn lidt øst for midten, traktor midt i
block = place(block, cx, lz)
block = block.replace("</vehicle>", ' <AutoDrive parkDestination="%d"/>\n </vehicle>' % park_marker[(key, num)])
return block
Binary file not shown.