diff --git a/doc/grid.png b/doc/grid.png index 2fcf9f0..c2c7d34 100644 Binary files a/doc/grid.png and b/doc/grid.png differ diff --git a/icons/config.json b/icons/config.json index 3501799..5e20a94 100644 --- a/icons/config.json +++ b/icons/config.json @@ -347,6 +347,7 @@ "guidepost": { "directed": "right" }, + "guys": {}, "h": { "emoji": "H", "name": "H letter" @@ -657,6 +658,9 @@ "shelter": { "name": "shelter" }, + "shield_volcano": { + "name": "shield volcano" + }, "shop_convenience": {}, "shower": { "name": "shower" @@ -696,6 +700,9 @@ "⛔️" ] }, + "stratovolcano": { + "name": "stratovolcano" + }, "street_cabinet": {}, "street_lamp": {}, "sunflower": {}, @@ -822,6 +829,9 @@ }, "vending_tickets": {}, "ventilation": {}, + "volcanic_cone": { + "name": "volcanic cone" + }, "wall_bars": { "name": "wall bars" }, diff --git a/icons/icons.svg b/icons/icons.svg index d76d263..6d0fea0 100644 --- a/icons/icons.svg +++ b/icons/icons.svg @@ -148,9 +148,9 @@ showgrid="true" inkscape:document-units="px" inkscape:current-layer="layer1" - inkscape:cy="416.16223" - inkscape:cx="62.521128" - inkscape:zoom="8" + inkscape:cy="281.99816" + inkscape:cx="343.97225" + inkscape:zoom="32" inkscape:pageshadow="2" inkscape:pageopacity="0.0" borderopacity="1.0" @@ -552,7 +552,7 @@ image/svg+xml - + @@ -6649,18 +6649,18 @@ @@ -8319,7 +8319,7 @@ ry="0" rx="0" y="12.5" - x="36" + x="180" height="2" width="7" id="rect13453" @@ -8485,7 +8485,7 @@ ry="0.5" rx="0.5" y="3" - x="2" + x="146" height="10" width="12" id="rect2104" @@ -8493,14 +8493,14 @@ @@ -18875,18 +18875,18 @@ rx="0.5" /> @@ -18896,7 +18896,7 @@ width="2" height="2" x="231" - y="295" + y="294" rx="1" ry="1" /> @@ -21680,7 +21680,7 @@ id="rect7567" width="5.5" height="2" - x="115" + x="35" y="6" rx="0.5" ry="0.5" /> @@ -21689,47 +21689,47 @@ id="rect7569" width="7" height="2" - x="119" + x="39" y="8" rx="0" ry="0" /> @@ -21741,7 +21741,7 @@ id="rect7629" width="1" height="6" - x="153" + x="73" y="3" rx="0" ry="0" /> @@ -21749,24 +21749,24 @@ style="fill:none;stroke:#000000;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="circle8246" cx="-4" - cy="-165" + cy="-85" r="1" transform="matrix(0,-1,-1,0,0,0)" /> @@ -21776,13 +21776,13 @@ @@ -21908,14 +21908,14 @@ id="rect8401" width="8" height="3" - x="196" + x="116" y="2" /> @@ -21924,35 +21924,35 @@ id="rect8405" width="10" height="3" - x="211" + x="131" y="10" /> @@ -21960,14 +21960,14 @@ rx="0.5" ry="0.5" y="11" - x="215" + x="135" height="1" width="2" id="rect8415" style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> key + + + + + + + + + + + + + + + + + stratovolcano + + + shield volcano + + + volcanic cone + + + + + + + + + + + + + + + + + + + + smoke + + + + + smoke 2 + + diff --git a/scheme/default.yml b/scheme/default.yml index c04d666..09118f4 100644 --- a/scheme/default.yml +++ b/scheme/default.yml @@ -205,6 +205,71 @@ node_icons: shapes: [cliff] - tags: {natural: peak} shapes: [triangle_small] + + - tags: + natural: volcano + shapes: [stratovolcano, {shape: smoke, offset: [0, -3]}] + + - tags: {natural: volcano, volcano:type: stratovolcano} + shapes: [stratovolcano, {shape: smoke, offset: [0, -3]}] + - tags: {natural: volcano, volcano:type: shield} + shapes: [shield_volcano, {shape: smoke, offset: [0, -1]}] + - tags: {natural: volcano, volcano:type: scoria} + shapes: [volcanic_cone, {shape: smoke, offset: [0, -2]}] + + - tags: {natural: volcano, volcano:status: active} + shapes: [stratovolcano, {shape: smoke, offset: [0, -3]}] + - tags: {natural: volcano, volcano:status: dormant} + shapes: [stratovolcano, {shape: smoke_2, offset: [1, -3]}] + - tags: {natural: volcano, volcano:status: extinct} + shapes: [stratovolcano] + + - tags: + natural: volcano + volcano:type: stratovolcano + volcano:status: active + shapes: [stratovolcano, {shape: smoke, offset: [0, -3]}] + - tags: + natural: volcano + volcano:type: shield + volcano:status: active + shapes: [shield_volcano, {shape: smoke, offset: [0, -1]}] + - tags: + natural: volcano + volcano:type: scoria + volcano:status: active + shapes: [volcanic_cone, {shape: smoke, offset: [0, -2]}] + - tags: + natural: volcano + volcano:type: stratovolcano + volcano:status: dormant + shapes: [stratovolcano, {shape: smoke_2, offset: [1, -3]}] + - tags: + natural: volcano + volcano:type: shield + volcano:status: dormant + shapes: [shield_volcano, {shape: smoke_2, offset: [1, -1]}] + - tags: + natural: volcano + volcano:type: scoria + volcano:status: dormant + shapes: [volcanic_cone, {shape: smoke_2, offset: [1, -2]}] + - tags: + natural: volcano + volcano:type: stratovolcano + volcano:status: extinct + shapes: [stratovolcano] + - tags: + natural: volcano + volcano:type: shield + volcano:status: extinct + shapes: [shield_volcano] + - tags: + natural: volcano + volcano:type: scoria + volcano:status: extinct + shapes: [volcanic_cone] + - tags: {historic: castle} location_restrictions: {include: jp} shapes: [japan_castle]