From 977935e8d8e58614db16dbf813897b0a3bee86df Mon Sep 17 00:00:00 2001 From: Simon Schmutzler Date: Tue, 13 Feb 2024 16:57:52 +0100 Subject: [PATCH] =?UTF-8?q?Family=20des=20F=C3=B6rderers=20korrekt=20defin?= =?UTF-8?q?iert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SSG/shapes/palettes/c_Foerderer.xml | 2 +- .../{s_foerderer.txt => s_Foerderer.txt} | 5 +- MAIN_SSG.rdx | 971 +++++++++++++++++- 3 files changed, 966 insertions(+), 12 deletions(-) rename Editor2DLibrary/SSG/shapes/props/{s_foerderer.txt => s_Foerderer.txt} (93%) diff --git a/Editor2DLibrary/SSG/shapes/palettes/c_Foerderer.xml b/Editor2DLibrary/SSG/shapes/palettes/c_Foerderer.xml index c32393e..83fa135 100644 --- a/Editor2DLibrary/SSG/shapes/palettes/c_Foerderer.xml +++ b/Editor2DLibrary/SSG/shapes/palettes/c_Foerderer.xml @@ -1,3 +1,3 @@ -
Etagenförderer (ETF)
+
Etagenförderer
TEF mit Finger
 \ No newline at end of file diff --git a/Editor2DLibrary/SSG/shapes/props/s_foerderer.txt b/Editor2DLibrary/SSG/shapes/props/s_Foerderer.txt similarity index 93% rename from Editor2DLibrary/SSG/shapes/props/s_foerderer.txt rename to Editor2DLibrary/SSG/shapes/props/s_Foerderer.txt index 7cac75a..394405d 100644 --- a/Editor2DLibrary/SSG/shapes/props/s_foerderer.txt +++ b/Editor2DLibrary/SSG/shapes/props/s_Foerderer.txt @@ -1,7 +1,8 @@ { "shapeMode": 0, - "name": "Etagenförderer (ETF)", - "family": "Gefaellestrecke", + "name": "Etagenförderer", + "family": "Foerderer", + "description": "ETF", "icon": "SSG/shapes/img/Foerderer_32.png", "iconBig": "SSG/shapes/img/Foerderer_64.png", "srcSVG": "SSG/shapes/svg/s_Foerderer.xml", diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx index 48d9d1b..b6a57cf 100644 --- a/MAIN_SSG.rdx +++ b/MAIN_SSG.rdx @@ -1,6 +1,6 @@  - + @@ -60,6 +60,19 @@ + + + + + + + + + + + + + @@ -79,7 +92,7 @@ - + @@ -87,11 +100,12 @@ + - + @@ -269,7 +283,7 @@ - + @@ -379,7 +393,7 @@ - + @@ -726,7 +740,7 @@ - + @@ -743,7 +757,7 @@ - + @@ -783,6 +797,7 @@ + @@ -807,6 +822,7 @@ + @@ -890,6 +906,7 @@ + @@ -3345,6 +3362,8 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) + + @@ -3501,6 +3520,7 @@ KreiselData.AbstandMS+(KreiselData.Durchmesser/2) + @@ -4673,7 +4693,65 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2) - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4880,6 +4958,12 @@ ShapeTotalLength-SSGConnectionPoint.x_S-(KreiselData.Durchmesser/2) + + + + + + @@ -7541,6 +7625,7 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest + @@ -7560,8 +7645,10 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest + + @@ -7662,6 +7749,159 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Shape_Prototype.GefaelleDefinition.HoeheOben]]> + + + Shape_Prototype.GefaelleDefinition.HoeheUnten]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -8809,6 +9049,119 @@ Contains(IndirectConnKreiselList, Link) AND Shape_Prototype.family = "Gefaellest + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -13493,6 +13846,580 @@ ShapeList["id="+Param.Input[1].shapeID].name + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -13864,6 +14791,7 @@ ShapeList["id="+Param.Input[1].shapeID].name + @@ -13878,7 +14806,32 @@ ShapeList["id="+Param.Input[1].shapeID].name - + + + + + + + + + + + + + + + + + + + + + + + + + +