Add vending ice cream icons

enzet · enzet · commit 126d9407a1dc · 2026-03-17T18:37:40.000+04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,9 @@ Add icons:
   - `street_cabinet_bolt`,
   - `street_cabinet_drop`,
   - `vending_bottle_upside_down`,
+  - `vending_ice_cream_cone`,
+  - `vending_ice_cream_stick`,
+  - `vending_bottle_upside_down`,
   - `water_from_pipe` ([#27](https://github.com/enzet/Roentgen/issues/27)),
   - `wig`,
   - `wig_on_stand` ([#26](https://github.com/enzet/Roentgen/issues/26)).
diff --git a/data/config.json b/data/config.json
@@ -87,7 +87,7 @@
             "apartments_6_story": {
                 "categories": ["building"],
                 "keywords": ["architecture", "building", "house"],
-                "name": "five-story apartments building",
+                "name": "six-story apartments building",
                 "shapes": [{"id": "apartments_6_story", "version": "v0"}],
                 "sketch": true
             },
@@ -523,7 +523,7 @@
         },
         "no_light_bulb": {
             "keywords": ["electric"],
-            "name": "light bulb striked out",
+            "name": "light bulb struck out",
             "shapes": [{"id": "no_light_bulb", "version": "v1"}],
             "sketch": true
         }
@@ -2014,7 +2014,7 @@
             "keywords": ["flag", "banner", "country", "symbol"]
         },
         "wretch_and_hammer": {
-            "name": "wretch and hammer",
+            "name": "wrench and hammer",
             "keywords": ["tool"]
         },
         "exchange___dollar___pound": {
@@ -3563,7 +3563,7 @@
                 "sketch": true
             },
             "5g_middle": {
-                "name": "medius size 5G inscription",
+                "name": "medium size 5G inscription",
                 "keywords": ["5G", "5th generation", "wireless"],
                 "shapes": [{"id": "5g_middle", "version": "v1"}],
                 "sketch": true
@@ -4467,6 +4467,14 @@
             "keywords": ["sell", "automat"],
             "name": "excrement bag vending"
         },
+        "vending_ice_cream_stick": {
+            "keywords": ["sell", "automat", "food", "sweet"],
+            "name": "vending machine with ice cream on stick"
+        },
+        "vending_ice_cream_cone": {
+            "keywords": ["sell", "automat", "food", "sweet"],
+            "name": "vending machine with cone ice cream"
+        },
         "vending_machine": {
             "keywords": ["sell", "automat"],
             "name": "vending machine"
diff --git a/doc/grid_black.svg b/doc/grid_black.svg
diff --git a/doc/grid_white.svg b/doc/grid_white.svg
diff --git a/icons/vending_ice_cream_cone.svg b/icons/vending_ice_cream_cone.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M 3.5,1.0 C 3.223,1.0 3.0,1.224 3.0,1.5 L 3.0,14.5 C 3.0,14.776 3.223,15.0 3.499,15.0 L 12.5,15.0 C 12.777,15.0 13.0,14.776 13.0,14.5 L 13.0,1.501 C 13.0,1.224 12.777,1.0 12.501,1.0 L 3.5,1.0 M 4.499,3.0 L 9.5,3.0 C 9.777,3.0 10.0,3.224 10.0,3.5 L 10.0,12.5 C 10.0,12.776 9.777,13.0 9.501,13.0 L 4.5,13.0 C 4.223,13.0 4.0,12.776 4.0,12.5 L 4.0,3.501 C 4.0,3.224 4.223,3.0 4.499,3.0 M 7.0,4.0 C 5.896,4.0 5.001,4.895 5.0,5.999 C 5.0,6.346 5.088,6.671 5.242,6.955 L 5.27,7.056 C 5.338,7.02 5.416,7.0 5.499,7.0 L 8.5,7.0 C 8.584,7.0 8.662,7.02 8.73,7.056 L 8.758,6.955 C 8.912,6.671 9.0,6.346 9.0,6.001 C 9.0,4.895 8.104,4.0 7.0,4.0 M 5.527,8.0 L 6.515,11.621 C 6.569,11.839 6.766,12.0 7.0,12.0 C 7.234,12.0 7.431,11.839 7.485,11.621 L 8.473,8.0 L 5.527,8.0 M 11.0,3.5 C 11.0,3.224 11.224,3.0 11.5,3.0 C 11.776,3.0 12.0,3.224 12.0,3.5 L 12.0,4.5 C 12.0,4.776 11.776,5.0 11.5,5.0 C 11.224,5.0 11.0,4.776 11.0,4.5 L 11.0,3.5" fill="#000" /></svg>
diff --git a/icons/vending_ice_cream_stick.svg b/icons/vending_ice_cream_stick.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M 3.5,1.0 C 3.223,1.0 3.0,1.224 3.0,1.5 L 3.0,14.5 C 3.0,14.776 3.223,15.0 3.499,15.0 L 12.5,15.0 C 12.777,15.0 13.0,14.776 13.0,14.5 L 13.0,1.501 C 13.0,1.224 12.777,1.0 12.501,1.0 L 3.5,1.0 M 4.499,3.0 L 9.5,3.0 C 9.777,3.0 10.0,3.224 10.0,3.5 L 10.0,12.5 C 10.0,12.776 9.777,13.0 9.501,13.0 L 4.5,13.0 C 4.223,13.0 4.0,12.776 4.0,12.5 L 4.0,3.501 C 4.0,3.224 4.223,3.0 4.499,3.0 M 7.0,4.0 C 5.896,4.0 5.001,4.895 5.0,5.999 L 5.0,9.5 C 5.0,9.776 5.223,10.0 5.499,10.0 L 6.0,10.0 L 6.0,11.0 C 6.0,11.552 6.448,12.0 7.0,12.0 C 7.552,12.0 8.0,11.552 8.0,11.0 L 8.0,10.0 L 8.5,10.0 C 8.777,10.0 9.0,9.776 9.0,9.5 L 9.0,6.002 C 9.0,4.895 8.104,4.0 7.0,4.0 M 6.0,6.0 C 6.0,5.448 6.448,5.0 7.0,5.0 C 7.552,5.0 8.0,5.448 8.0,6.0 L 8.0,9.0 L 6.0,9.0 L 6.0,6.0 M 11.0,3.5 C 11.0,3.224 11.224,3.0 11.5,3.0 C 11.776,3.0 12.0,3.224 12.0,3.5 L 12.0,4.5 C 12.0,4.776 11.776,5.0 11.5,5.0 C 11.224,5.0 11.0,4.776 11.0,4.5 L 11.0,3.5" fill="#000" /></svg>
diff --git a/iconscript/vending.iconscript b/iconscript/vending.iconscript
@@ -1,11 +1,11 @@
-icon vending_ice_cream = {
+icon vending_ice_cream_stick = {
     {fill r 3,1 +9,13}
     {subtract fill r 4,3 +5,9 l 11,3 +0,1}
     {fill e 6.5,5.5 1.5 r 5,5.5 +3,3.5}
     {w 2 l 6.5,6.5 +0,4}
     {subtract fill e 6.5,5.5 0.5 w 0 r 5.5,5.5 +2,3}
 }
-icon vending_ice_cream_2 = {
+icon vending_ice_cream_cone = {
     {fill r 3,1 +9,13}
     {subtract fill r 4,3 +5,9 l 11,3 +0,1}
     {fill e 6.5,5.5 1.5 l 5,5.5 +1.5,5.5 +1.5,-5.5}
diff --git a/shapes.json b/shapes.json
@@ -493,6 +493,8 @@
     "vending_chemist": "M -4.5,-7.0 C -4.777,-7.0 -5.0,-6.777 -5.0,-6.5 L -5.0,6.5 C -5.0,6.777 -4.777,7.0 -4.5,7.0 L 4.5,7.0 C 4.777,7.0 5.0,6.777 5.0,6.5 L 5.0,-6.5 C 5.0,-6.777 4.777,-7.0 4.5,-7.0 L -4.5,-7.0 M -3.5,-5.0 L 1.5,-5.0 C 1.777,-5.0 2.0,-4.777 2.0,-4.5 L 2.0,3.5 C 2.0,3.777 1.777,4.0 1.5,4.0 L -3.5,4.0 C -3.777,4.0 -4.0,3.777 -4.0,3.5 L -4.0,-4.5 C -4.0,-4.777 -3.777,-5.0 -3.5,-5.0 M 3.5,-5.0 C 3.777,-5.0 4.0,-4.777 4.0,-4.5 L 4.0,-2.5 C 4.0,-2.223 3.777,-2.0 3.5,-2.0 C 3.223,-2.0 3.0,-2.223 3.0,-2.5 L 3.0,-4.5 C 3.0,-4.777 3.223,-5.0 3.5,-5.0 M -2.0,-2.5 L -2.0,-2.0 L -2.5,-2.0 A 0.5,0.5 135.0 0,0 -3.0,-1.5 L -3.0,-0.5 A 0.5,0.5 45.0 0,0 -2.5,0.0 L -2.0,0.0 L -2.0,0.5 A 0.5,0.5 45.0 0,0 -1.5,1.0 L -0.5,1.0 A 0.5,0.5 135.0 0,0 0.0,0.5 L 0.0,0.0 L 0.5,0.0 A 0.5,0.5 135.0 0,0 1.0,-0.5 L 1.0,-1.5 A 0.5,0.5 45.0 0,0 0.5,-2.0 L 0.0,-2.0 L 0.0,-2.5 A 0.5,0.5 45.0 0,0 -0.5,-3.0 L -1.5,-3.0 A 0.5,0.5 135.0 0,0 -2.0,-2.5",
     "vending_drop": "M -4.5,-7.0 C -4.777,-7.0 -5.0,-6.777 -5.0,-6.5 L -5.0,6.5 C -5.0,6.777 -4.777,7.0 -4.5,7.0 L 4.5,7.0 C 4.777,7.0 5.0,6.777 5.0,6.5 L 5.0,-6.5 C 5.0,-6.777 4.777,-7.0 4.5,-7.0 L -4.5,-7.0 M -3.5,-5.0 L 1.5,-5.0 C 1.777,-5.0 2.0,-4.777 2.0,-4.5 L 2.0,3.5 C 2.0,3.777 1.777,4.0 1.5,4.0 L -3.5,4.0 C -3.777,4.0 -4.0,3.777 -4.0,3.5 L -4.0,-4.5 C -4.0,-4.777 -3.777,-5.0 -3.5,-5.0 M 3.5,-5.0 C 3.777,-5.0 4.0,-4.777 4.0,-4.5 L 4.0,-3.5 C 4.0,-3.223 3.777,-3.0 3.5,-3.0 C 3.223,-3.0 3.0,-3.223 3.0,-3.5 L 3.0,-4.5 C 3.0,-4.777 3.223,-5.0 3.5,-5.0 M -1.0,-3.0 C -1.2292,-2.9996 -1.4288,-2.8435 -1.4844,-2.6211 C -1.7154,-1.6972 -2.026,-1.2983 -2.3438,-0.8535 C -2.6615,-0.4087 -3.0,0.1389 -3.0,1.0 C -3.0,1.5833 -2.8464,2.1107 -2.4785,2.4785 C -2.1107,2.8464 -1.5833,3.0 -1.0,3.0 C -0.4167,3.0 0.1107,2.8464 0.4785,2.4785 C 0.8464,2.1107 1.0,1.5833 1.0,1.0 C 1.0,0.1389 0.6615,-0.4087 0.3438,-0.8535 C 0.026,-1.2984 -0.2847,-1.6972 -0.5156,-2.6211 C -0.5712,-2.8435 -0.7708,-2.9996 -1.0,-3.0",
     "vending_excrement_bag": "M -6.5,-6.0 C -6.777,-6.0 -7.0,-5.777 -7.0,-5.5 L -7.0,-3.5 C -7.0,-3.223 -6.777,-3.0 -6.5,-3.0 L -6.0,-3.0 L -6.0,-5.0 L 5.0,-5.0 L 5.0,-3.0 L 5.5,-3.0 C 5.777,-3.0 6.0,-3.223 6.0,-3.5 L 6.0,-5.5 C 6.0,-5.777 5.777,-6.0 5.5,-6.0 L -6.5,-6.0 M -5.0,-4.0 L -5.0,6.0 L 4.0,6.0 L 4.0,-4.0 L -5.0,-4.0 M -1.0,-1.0 C -0.949,-0.9999 -0.8983,-0.992 -0.8496,-0.9766 C -0.5027,-0.8669 -0.2351,-0.6456 -0.0703,-0.416 C 0.0945,-0.1864 0.1794,0.0358 0.2656,0.2188 C 0.4323,0.5726 0.5293,0.8017 1.0977,1.0039 C 1.6053,1.0529 2.0,1.4791 2.0,2.0 C 2.0,2.2403 1.9157,2.4607 1.7754,2.6328 C 1.6987,2.7585 1.7113,2.8469 1.7305,2.8906 C 1.7525,2.9406 1.7801,3.0 2.0,3.0 C 2.3997,2.9984 3.0,3.3188 3.0,4.0 C 3.0,4.554 2.554,5.0 2.0,5.0 L -3.0,5.0 C -3.554,5.0 -4.0,4.554 -4.0,4.0 C -4.0,3.3187 -3.3997,2.998 -3.0,3.0 C -2.7801,3.0 -2.7525,2.9406 -2.7305,2.8906 C -2.7113,2.847 -2.699,2.7583 -2.7754,2.6328 C -2.9158,2.4607 -3.0,2.2405 -3.0,2.0 C -3.0,1.446 -2.554,1.0 -2.0,1.0 C -1.5248,1.0 -1.3058,0.7978 -1.2051,0.5684 C -1.1044,0.339 -1.1312,0.073 -1.3516,-0.1445 C -1.4465,-0.2384 -1.5,-0.3664 -1.5,-0.5 C -1.5,-0.7761 -1.2761,-1.0 -1.0,-1.0",
+    "vending_ice_cream_cone": "M -4.5,-7.0 C -4.777,-7.0 -5.0,-6.776 -5.0,-6.5 L -5.0,6.5 C -5.0,6.776 -4.777,7.0 -4.501,7.0 L 4.5,7.0 C 4.777,7.0 5.0,6.776 5.0,6.5 L 5.0,-6.499 C 5.0,-6.776 4.777,-7.0 4.501,-7.0 L -4.5,-7.0 M -3.501,-5.0 L 1.5,-5.0 C 1.777,-5.0 2.0,-4.776 2.0,-4.5 L 2.0,4.5 C 2.0,4.776 1.777,5.0 1.501,5.0 L -3.5,5.0 C -3.777,5.0 -4.0,4.776 -4.0,4.5 L -4.0,-4.499 C -4.0,-4.776 -3.777,-5.0 -3.501,-5.0 M -1.0,-4.0 C -2.104,-4.0 -2.999,-3.105 -3.0,-2.001 C -3.0,-1.654 -2.912,-1.329 -2.758,-1.045 L -2.73,-0.944 C -2.662,-0.98 -2.584,-1.0 -2.501,-1.0 L 0.5,-1.0 C 0.584,-1.0 0.662,-0.98 0.73,-0.944 L 0.758,-1.045 C 0.912,-1.329 1.0,-1.654 1.0,-1.999 C 1.0,-3.105 0.104,-4.0 -1.0,-4.0 M -2.473,0.0 L -1.485,3.621 C -1.431,3.839 -1.234,4.0 -1.0,4.0 C -0.766,4.0 -0.569,3.839 -0.515,3.621 L 0.473,0.0 L -2.473,0.0 M 3.0,-4.5 C 3.0,-4.776 3.224,-5.0 3.5,-5.0 C 3.776,-5.0 4.0,-4.776 4.0,-4.5 L 4.0,-3.5 C 4.0,-3.224 3.776,-3.0 3.5,-3.0 C 3.224,-3.0 3.0,-3.224 3.0,-3.5 L 3.0,-4.5",
+    "vending_ice_cream_stick": "M -4.5,-7.0 C -4.777,-7.0 -5.0,-6.776 -5.0,-6.5 L -5.0,6.5 C -5.0,6.776 -4.777,7.0 -4.501,7.0 L 4.5,7.0 C 4.777,7.0 5.0,6.776 5.0,6.5 L 5.0,-6.499 C 5.0,-6.776 4.777,-7.0 4.501,-7.0 L -4.5,-7.0 M -3.501,-5.0 L 1.5,-5.0 C 1.777,-5.0 2.0,-4.776 2.0,-4.5 L 2.0,4.5 C 2.0,4.776 1.777,5.0 1.501,5.0 L -3.5,5.0 C -3.777,5.0 -4.0,4.776 -4.0,4.5 L -4.0,-4.499 C -4.0,-4.776 -3.777,-5.0 -3.501,-5.0 M -1.0,-4.0 C -2.104,-4.0 -2.999,-3.105 -3.0,-2.001 L -3.0,1.5 C -3.0,1.776 -2.777,2.0 -2.501,2.0 L -2.0,2.0 L -2.0,3.0 C -2.0,3.552 -1.552,4.0 -1.0,4.0 C -0.448,4.0 0.0,3.552 0.0,3.0 L 0.0,2.0 L 0.5,2.0 C 0.777,2.0 1.0,1.776 1.0,1.5 L 1.0,-1.998 C 1.0,-3.105 0.104,-4.0 -1.0,-4.0 M -2.0,-2.0 C -2.0,-2.552 -1.552,-3.0 -1.0,-3.0 C -0.448,-3.0 0.0,-2.552 0.0,-2.0 L 0.0,1.0 L -2.0,1.0 L -2.0,-2.0 M 3.0,-4.5 C 3.0,-4.776 3.224,-5.0 3.5,-5.0 C 3.776,-5.0 4.0,-4.776 4.0,-4.5 L 4.0,-3.5 C 4.0,-3.224 3.776,-3.0 3.5,-3.0 C 3.224,-3.0 3.0,-3.224 3.0,-3.5 L 3.0,-4.5",
     "vending_machine": "M -4.5,-7.0 C -4.777,-7.0 -5.0,-6.777 -5.0,-6.5 L -5.0,6.5 C -5.0,6.777 -4.777,7.0 -4.5,7.0 L 4.5,7.0 C 4.777,7.0 5.0,6.777 5.0,6.5 L 5.0,-6.5 C 5.0,-6.777 4.777,-7.0 4.5,-7.0 L -4.5,-7.0 M -3.5,-5.0 L 1.5,-5.0 C 1.777,-5.0 2.0,-4.777 2.0,-4.5 L 2.0,3.5 C 2.0,3.777 1.777,4.0 1.5,4.0 L -3.5,4.0 C -3.777,4.0 -4.0,3.777 -4.0,3.5 L -4.0,-4.5 C -4.0,-4.777 -3.777,-5.0 -3.5,-5.0 M 3.5,-5.0 C 3.777,-5.0 4.0,-4.777 4.0,-4.5 L 4.0,-3.5 C 4.0,-3.223 3.777,-3.0 3.5,-3.0 C 3.223,-3.0 3.0,-3.223 3.0,-3.5 L 3.0,-4.5 C 3.0,-4.777 3.223,-5.0 3.5,-5.0 M -2.5,-3.0 C -2.777,-3.0 -3.0,-2.777 -3.0,-2.5 L -3.0,-1.5 C -3.0,-1.223 -2.777,-1.0 -2.5,-1.0 C -2.223,-1.0 -2.0,-1.223 -2.0,-1.5 L -2.0,-2.5 C -2.0,-2.777 -2.223,-3.0 -2.5,-3.0 M -0.5,-3.0 C -0.777,-3.0 -1.0,-2.777 -1.0,-2.5 L -1.0,-1.5 C -1.0,-1.223 -0.777,-1.0 -0.5,-1.0 C -0.223,-1.0 0.0,-1.223 0.0,-1.5 L 0.0,-2.5 C 0.0,-2.777 -0.223,-3.0 -0.5,-3.0 M -2.5,0.0 C -2.777,0.0 -3.0,0.223 -3.0,0.5 L -3.0,1.5 C -3.0,1.777 -2.777,2.0 -2.5,2.0 C -2.223,2.0 -2.0,1.777 -2.0,1.5 L -2.0,0.5 C -2.0,0.223 -2.223,0.0 -2.5,0.0 M -0.5,0.0 C -0.777,0.0 -1.0,0.223 -1.0,0.5 L -1.0,1.5 C -1.0,1.777 -0.777,2.0 -0.5,2.0 C -0.223,2.0 0.0,1.777 0.0,1.5 L 0.0,0.5 C 0.0,0.223 -0.223,0.0 -0.5,0.0",
     "vending_p": "M -4.5,-7.0 C -4.777,-7.0 -5.0,-6.777 -5.0,-6.5 L -5.0,6.5 C -5.0,6.777 -4.777,7.0 -4.5,7.0 L 4.5,7.0 C 4.777,7.0 5.0,6.777 5.0,6.5 L 5.0,-6.5 C 5.0,-6.777 4.777,-7.0 4.5,-7.0 L -4.5,-7.0 M -3.5,-5.0 L 1.5,-5.0 C 1.777,-5.0 2.0,-4.777 2.0,-4.5 L 2.0,3.5 C 2.0,3.777 1.777,4.0 1.5,4.0 L -3.5,4.0 C -3.777,4.0 -4.0,3.777 -4.0,3.5 L -4.0,-4.5 C -4.0,-4.777 -3.777,-5.0 -3.5,-5.0 M 3.5,-5.0 C 3.777,-5.0 4.0,-4.777 4.0,-4.5 L 4.0,-3.5 C 4.0,-3.223 3.777,-3.0 3.5,-3.0 C 3.223,-3.0 3.0,-3.223 3.0,-3.5 L 3.0,-4.5 C 3.0,-4.777 3.223,-5.0 3.5,-5.0 M -2.5,-3.0 C -2.777,-3.0 -3.0,-2.777 -3.0,-2.5 L -3.0,-0.5 L -3.0,1.5 C -3.0,1.777 -2.777,2.0 -2.5,2.0 C -2.223,2.0 -2.0,1.777 -2.0,1.5 L -2.0,0.0 L -0.5,0.0 C -0.476,0.0 -0.4528,-0.003 -0.4297,-0.006 A 1.5,1.5 0.0 0,0 1.0,-1.5 A 1.5,1.5 0.0 0,0 -0.4297,-2.9941 C -0.4528,-2.9974 -0.476,-3.0 -0.5,-3.0 L -2.5,-3.0 M -2.0,-2.0 L -0.5,-2.0 A 0.5,0.5 0.0 0,1 0.0,-1.5 A 0.5,0.5 0.0 0,1 -0.5,-1.0 L -2.0,-1.0 L -2.0,-2.0",
     "vending_tickets": "M -5.5,-5.0 C -5.777,-5.0 -6.0,-4.777 -6.0,-4.5 L -6.0,-2.5 C -6.0,-2.223 -5.777,-2.0 -5.5,-2.0 L -5.0,-2.0 L -5.0,-4.0 L 5.0,-4.0 L 5.0,-2.0 L 5.5,-2.0 C 5.777,-2.0 6.0,-2.223 6.0,-2.5 L 6.0,-4.5 C 6.0,-4.777 5.777,-5.0 5.5,-5.0 L -5.5,-5.0 M -4.0,-3.0 L -4.0,1.0 L -2.5,1.0 C -2.223,1.0 -2.0,1.223 -2.0,1.5 C -2.0,1.777 -2.223,2.0 -2.5,2.0 L -4.0,2.0 L -4.0,4.5 C -4.0,4.777 -3.777,5.0 -3.5,5.0 L -2.0,5.0 A 2.0,2.0 0.0 0,1 -0.0488,3.0 A 2.0,2.0 0.0 0,1 0.0,3.0 A 2.0,2.0 0.0 0,1 2.0,5.0 L 3.5,5.0 C 3.777,5.0 4.0,4.777 4.0,4.5 L 4.0,2.0 L 2.5,2.0 C 2.223,2.0 2.0,1.777 2.0,1.5 C 2.0,1.223 2.223,1.0 2.5,1.0 L 4.0,1.0 L 4.0,-3.0 L -4.0,-3.0 L -4.0,-3.0 M -0.5,1.0 L 0.5,1.0 C 0.777,1.0 1.0,1.223 1.0,1.5 C 1.0,1.777 0.777,2.0 0.5,2.0 L -0.5,2.0 C -0.777,2.0 -1.0,1.777 -1.0,1.5 C -1.0,1.223 -0.777,1.0 -0.5,1.0",
