Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
kostmo committed Aug 19, 2024
1 parent d1791a1 commit 7bf111e
Show file tree
Hide file tree
Showing 3 changed files with 91 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
nonoverlapping-structure-merge.yaml
root-map-expansion.yaml
structure-composition.yaml
structure-composition.yaml
sequential-placement.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
version: 1
name: Adjacent structure placement
author: Karl Ostmo
description: |
Sequentially place structures that are larger than the map.
creative: false
robots:
- name: base
dir: north
devices:
- 3D printer
- ADT calculator
- antenna
- branch predictor
- clock
- comparator
- counter
- dictionary
- grabber
- lambda
- logger
- net
- scanner
- strange loop
- string
- workbench
known: [water, mountain, boulder]
seed: 0
world:
structures:
- name: house
structure:
palette:
'x': [stone, boulder]
'.': [stone]
map: |
xxxxxxxxxxxx
x..........x
x..........x
x..........x
xxxxxxxxxxxx
- name: street pair
structure:
palette:
'.': [grass]
placements:
- src: house
offset: [-9, 0]
orient:
up: south
map: |
.
.
.
.
.
.
.
.
.
.
.
- name: block
structure:
placements:
- src: street pair
offset: [0, 0]
orient:
flip: true
- src: street pair
offset: [0, 1]
map: ""
palette:
'Ω': [grass, erase, base]
placements:
- src: block
offset: [-3, -1]
upperleft: [0, 0]
dsl: |
{grass}
map: |
Ω
7 changes: 7 additions & 0 deletions test/integration/Main.hs
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,13 @@ testScenarioSolutions rs ui key =
[ testSolution Default "Testing/1535-ping/1535-in-range"
, testSolution Default "Testing/1535-ping/1535-out-of-range"
]
, testGroup
"Structure placement (#1780)"
[ testSolution Default "Testing/1780-structure-merge-expansion/nonoverlapping-structure-merge"
, testSolution Default "Testing/1780-structure-merge-expansion/root-map-expansion"
, testSolution Default "Testing/1780-structure-merge-expansion/structure-composition"
, testSolution Default "Testing/1780-structure-merge-expansion/sequential-placement"
]
, testGroup
"Structure recognition (#1575)"
[ testSolution Default "Testing/1575-structure-recognizer/1575-browse-structures"
Expand Down

0 comments on commit 7bf111e

Please sign in to comment.