mirror of
https://github.com/louis-e/arnis.git
synced 2025-12-23 22:37:56 -05:00
Refine elements based on taginfo feedback
This commit is contained in:
2
Cargo.lock
generated
2
Cargo.lock
generated
@@ -191,7 +191,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "arnis"
|
name = "arnis"
|
||||||
version = "2.2.1"
|
version = "2.3.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"clap",
|
"clap",
|
||||||
"colored",
|
"colored",
|
||||||
|
|||||||
@@ -92,13 +92,6 @@ pub fn generate_amenities(editor: &mut WorldEditor, element: &ProcessedElement,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
"vending" => {
|
|
||||||
// Place vending machine blocks
|
|
||||||
if let Some(pt) = first_node {
|
|
||||||
editor.set_block(IRON_BLOCK, pt.x, 1, pt.z, None, None);
|
|
||||||
editor.set_block(IRON_BLOCK, pt.x, 2, pt.z, None, None);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
"shelter" => {
|
"shelter" => {
|
||||||
let roof_block: Block = STONE_BRICK_SLAB;
|
let roof_block: Block = STONE_BRICK_SLAB;
|
||||||
|
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ pub fn generate_leisure(editor: &mut WorldEditor, element: &ProcessedWay, args:
|
|||||||
"park" | "nature_reserve" | "garden" | "disc_golf_course" | "golf_course" => {
|
"park" | "nature_reserve" | "garden" | "disc_golf_course" | "golf_course" => {
|
||||||
GRASS_BLOCK
|
GRASS_BLOCK
|
||||||
}
|
}
|
||||||
|
"schoolyard" => BLACK_CONCRETE,
|
||||||
"playground" | "recreation_ground" | "pitch" | "beach_resort" | "dog_park" => {
|
"playground" | "recreation_ground" | "pitch" | "beach_resort" | "dog_park" => {
|
||||||
if let Some(surface) = element.tags.get("surface") {
|
if let Some(surface) = element.tags.get("surface") {
|
||||||
match surface.as_str() {
|
match surface.as_str() {
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ pub fn generate_man_made(editor: &mut WorldEditor, element: &ProcessedElement, _
|
|||||||
"chimney" => generate_chimney(editor, element),
|
"chimney" => generate_chimney(editor, element),
|
||||||
"water_well" => generate_water_well(editor, element),
|
"water_well" => generate_water_well(editor, element),
|
||||||
"water_tower" => generate_water_tower(editor, element),
|
"water_tower" => generate_water_tower(editor, element),
|
||||||
|
"mast" => generate_antenna(editor, element),
|
||||||
_ => {} // Unknown man_made type, ignore
|
_ => {} // Unknown man_made type, ignore
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -96,7 +97,6 @@ fn generate_antenna(editor: &mut WorldEditor, element: &ProcessedElement) {
|
|||||||
Some(h) => h.parse::<i32>().unwrap_or(20).min(40), // Max 40 blocks
|
Some(h) => h.parse::<i32>().unwrap_or(20).min(40), // Max 40 blocks
|
||||||
None => match element.tags().get("tower:type").map(|s| s.as_str()) {
|
None => match element.tags().get("tower:type").map(|s| s.as_str()) {
|
||||||
Some("communication") => 20,
|
Some("communication") => 20,
|
||||||
Some("transmission") => 25,
|
|
||||||
Some("cellular") => 15,
|
Some("cellular") => 15,
|
||||||
_ => 20,
|
_ => 20,
|
||||||
},
|
},
|
||||||
@@ -249,6 +249,7 @@ pub fn generate_man_made_nodes(editor: &mut WorldEditor, node: &ProcessedNode) {
|
|||||||
"chimney" => generate_chimney(editor, &element),
|
"chimney" => generate_chimney(editor, &element),
|
||||||
"water_well" => generate_water_well(editor, &element),
|
"water_well" => generate_water_well(editor, &element),
|
||||||
"water_tower" => generate_water_tower(editor, &element),
|
"water_tower" => generate_water_tower(editor, &element),
|
||||||
|
"mast" => generate_antenna(editor, &element),
|
||||||
_ => {} // Unknown man_made type, ignore
|
_ => {} // Unknown man_made type, ignore
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
49
taginfo.json
49
taginfo.json
@@ -178,19 +178,14 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"key": "highway",
|
"key": "highway",
|
||||||
"value": "secondary",
|
"value": "residential",
|
||||||
"description": "Generates medium-width roads."
|
"description": "Generates standard residential roads."
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"key": "highway",
|
"key": "highway",
|
||||||
"value": "tertiary",
|
"value": "tertiary",
|
||||||
"description": "Generates medium-width roads with lane markings."
|
"description": "Generates medium-width roads with lane markings."
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"key": "highway",
|
|
||||||
"value": "residential",
|
|
||||||
"description": "Generates standard residential roads."
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"key": "highway",
|
"key": "highway",
|
||||||
"value": "footway",
|
"value": "footway",
|
||||||
@@ -330,31 +325,6 @@
|
|||||||
"value": "concrete",
|
"value": "concrete",
|
||||||
"description": "Generates light gray concrete surfaces."
|
"description": "Generates light gray concrete surfaces."
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"key": "surface",
|
|
||||||
"value": "clay",
|
|
||||||
"description": "Generates terracotta surfaces."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"key": "surface",
|
|
||||||
"value": "tartan",
|
|
||||||
"description": "Generates red terracotta surfaces."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"key": "surface",
|
|
||||||
"value": "pebblestone",
|
|
||||||
"description": "Generates cobblestone surfaces."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"key": "surface",
|
|
||||||
"value": "cobblestone",
|
|
||||||
"description": "Generates cobblestone surfaces."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"key": "surface",
|
|
||||||
"value": "unhewn_cobblestone",
|
|
||||||
"description": "Generates cobblestone surfaces."
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"key": "lanes",
|
"key": "lanes",
|
||||||
"description": "Used to determine road width and lane markings."
|
"description": "Used to determine road width and lane markings."
|
||||||
@@ -714,11 +684,6 @@
|
|||||||
"value": "bench",
|
"value": "bench",
|
||||||
"description": "Generates benches using smooth stone and oak logs."
|
"description": "Generates benches using smooth stone and oak logs."
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"key": "amenity",
|
|
||||||
"value": "vending",
|
|
||||||
"description": "Generates vending facilities using iron blocks."
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"key": "amenity",
|
"key": "amenity",
|
||||||
"value": "shelter",
|
"value": "shelter",
|
||||||
@@ -823,6 +788,11 @@
|
|||||||
"value": "ice_rink",
|
"value": "ice_rink",
|
||||||
"description": "Generates ice rink areas with packed ice surfaces."
|
"description": "Generates ice rink areas with packed ice surfaces."
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"key": "leisure",
|
||||||
|
"value": "schoolyard",
|
||||||
|
"description": "Generates schoolyard areas with asphalt surfaces used for play at schools."
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"key": "waterway",
|
"key": "waterway",
|
||||||
"description": "Used to generate rivers, streams, and other waterways with appropriate depths and banks."
|
"description": "Used to generate rivers, streams, and other waterways with appropriate depths and banks."
|
||||||
@@ -1135,11 +1105,6 @@
|
|||||||
"value": "transmission",
|
"value": "transmission",
|
||||||
"description": "Generates transmission towers with increased height."
|
"description": "Generates transmission towers with increased height."
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"key": "tower:type",
|
|
||||||
"value": "cellular",
|
|
||||||
"description": "Generates cellular towers with reduced height."
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"key": "aeroway",
|
"key": "aeroway",
|
||||||
"description": "Used to generate airport infrastructure including runways and taxiways."
|
"description": "Used to generate airport infrastructure including runways and taxiways."
|
||||||
|
|||||||
Reference in New Issue
Block a user