Fritoloog: correct sauce price, improve 2nd with reduction and special

README.md

@@ -15,10 +15,10 @@ not work). Example (`↦` for tab and `·` for space):
 ```
 dish·fries:·Frietjes
 ↦   single_choice·size:·Formaat
-↦   ↦   extra_small:·Extra small··€·1.8
+↦   ↦   extra_small:·Extra small·€·1.8
-↦   ↦   small:·······Small········€·2
+↦   ↦   small:·······Small·······€·2
-↦   ↦   medium:······Medium·······€·2.5
+↦   ↦   medium:······Medium······€·2.5
-↦   ↦   large:·······Large········€·3.3
+↦   ↦   large:·······Large·······€·3.3
 ```
 
 ## Identifiers
@@ -52,8 +52,8 @@ A location consists of dishes. Spaces can be used to align the elements of your
 not required).
 
 ```hlds
-dish cheeseburger: Cheeseburger  € 2.9
+dish cheeseburger: Cheeseburger € 2.9
-dish assortment:   Twijfelaar    € 3
+dish assortment:   Twijfelaar   € 3
 ```
 
 ## Inline choices
@@ -64,15 +64,15 @@ Dishes can contain choices. There are two types:
 ```hlds
 dish fries: Frietjes
 	single_choice size: Formaat
-		extra_small: Extra small  € 1.8
+		extra_small: Extra small € 1.8
-		small:       Small        € 2
+		small:       Small       € 2
-		medium:      Medium       € 2.5
+		medium:      Medium      € 2.5
-		large:       Large        € 3.3
+		large:       Large       € 3.3
 	multi_choice sauce: Saus
-		ketchup: Ketchup         € 1.4
+		ketchup: Ketchup        € 1.4
-		mayo:    Mayonaise       € 1.4
+		mayo:    Mayonaise      € 1.4
-		bicky:   Bickysaus       € 1.4
+		bicky:   Bickysaus      € 1.4
-		stew:    Stoofvleessaus  € 1.9
+		stew:    Stoofvleessaus € 1.9
 ```
 
 ## Common choices
@@ -94,15 +94,13 @@ dish wok5: Studentenwok 5 babi pangang € 6
 You can add descriptions to dishes, choices and options. Separate name and description with ` -- `.
 
 ```hlds
-dish dishid: Name -- This is a description  € 3
+dish dishid: Name -- This is a description € 3
 ```
 
 ## Tags and price
 
 **Note:** Only the `{no_text}` tag is supported at this moment. You can ignore other tags for now.
 
-The tag and price part starts with at least two spaces: `  `.
-
 Tags are `{identifier}`. You can use tags to attach more information about a dish or option in a
 structured way. For example: `{has_meat}` signals to vegetarians that they should avoid this.
 
@@ -110,7 +108,7 @@ The order is always id, name, description, `  `, tags, price (not all have to be
 
 ```hlds
 
-dish dishid: Name -- This is a description  {has_meat} € 3
+dish dishid: Name -- This is a description {has_meat} € 3
 ```
 
 The special `{no_text}` tag signals that an option is to be hidden when showing a dish in an
@@ -119,7 +117,7 @@ read by the person making the order.
 
 ```hlds
 veggie: Vegetarische opties
-	meat:    Niet vegetarisch  {has_meat} {no_text}
+	meat:    Niet vegetarisch {has_meat} {no_text}
 	tofu:    Vegetarisch met tofu
 	falafel: Vegetarisch met falafel
 	vegan:   Veganistisch

fritoloog.hlds

@@ -25,25 +25,25 @@ dish standalone_sauce: Saus in potje  € 0.9
 		curry_ketchup: Curryketchup
 		yellow_curry: Gele currysaus
 		cocktail: Cocktailsaus
-		american: Amerikaanse
+		american: Amerikaanse saus
 		tartare: Tartaarsaus
 		piccalilly: Piccalilly
 		andalouse: Andalousesaus
-		mammoth: Mammoet
+		mammoth: Mammoetsaus
 		sweet_mayo: Zoete mayonaise
 		garlic: Looksaus
 		chili: Chilisaus
 		springroll: Loempiasaus
-		pepper: Peper
+		pepper: Pepersaus
 		pili_pili: Pili pili
 		salsa_diabla: Salsa diabla
 		giant: Giantsaus
-		toscan: Toscaanse
+		toscan: Toscaanse saus
 		mustard: Mosterd
 		brazil: Brazil
 		tropical: Tropical
-		tomato: Tomatensaus              € 1   # Actieprijs
+		tomato: Tomatensaus              € 0.1   # Actieprijs € 1
-		stew: Stoofvleessaus  {has_meat} € 1.7
+		stew: Stoofvleessaus  {has_meat} € 0.8   # Totaal € 1.7
 		other: Andere (in commentaar)
 
 # Frietcombo's
@@ -52,23 +52,24 @@ dish bicky_loaded_fries:     Bicky loaded fries -- Friet, 3 bickysausjes, burger
 
 # Snacks
 second_with_reduction_price1: Tweede portie met korting
-	second_with_reduction_yes: Tweede portie met korting  € 1.5
+	second_with_reduction_no: Eén portie {no_text}
+	second_with_reduction_yes: Twee porties met korting  € 1.5
 special: Special
-	normal: Normaal
+	normal: Normaal {no_text}
 	special: Met mayo, ketchup en ajuin  € 1.1
 	special_curryketchup: Met mayo, curryketchup en ajuin  € 1.1
 
 dish frikandel:              Frikandel                   {has_meat} € 2.1
-	multi_choice second_with_reduction_price1
+	single_choice second_with_reduction_price1
 dish frikandel_special:      Frikandel special -- Met mayo, ketchup en ajuin  {has_meat} € 3
 dish frikandel_xxl:          XXL Frikandel -- 35 cm      {has_meat} € 5
 	single_choice special: Special
-		normal: Normaal
+		normal: Normaal {no_text}
 		special: Met mayo, ketchup en ajuin  € 1.6
 		special_curryketchup: Met mayo, curryketchup en ajuin  € 1.6
 dish mammoth_sausage:        Mammoetworst -- Iets grotere frikandel met mammoetsaus  {has_meat} € 3
 	single_choice special: Special
-		normal: Normaal
+		normal: Normaal {no_text}
 		special: Met mayo, ketchup en ajuin  € 1.2
 		special_curryketchup: Met mayo, curryketchup en ajuin  € 1.2
 dish viandel:                Viandel -- Frikandel met beslag rond  {has_meat} € 2.5
@@ -84,12 +85,13 @@ dish sito:                   Sito -- Kalkoen en ajuin in licht pittig beslag  {h
 dish garlic_sausage:         Lookworst                   {has_meat} € 3.5
 	single_choice special
 dish bitterbal:              Bitterbal -- 5 stuks met draadjesvlees  {has_meat} € 2.1
-	multi_choice second_with_reduction_price1
+	single_choice second_with_reduction_price1
 dish boulet:                 Boulet                      {has_meat} € 2.5
 	single_choice special
 dish meat_croquette:         Vleeskroket                 {has_meat} € 2.4
-	multi_choice second_with_reduction: Tweede portie met korting
+	single_choice second_with_reduction: Tweede portie met korting
-		second_with_reduction_yes: Tweede portie met korting  € 1.6
+		second_with_reduction_no: Eén portie {no_text}
+		second_with_reduction_yes: Twee porties met korting  € 1.6
 dish fire_breather:          Vuurvreter                  {has_meat} € 2.7
 dish mexicano:               Mexicano                    {has_meat} € 3.5
 dish grisley:                Grisley -- Rundvlees en ajuin in pikant beslag  {has_meat} € 3.8
@@ -98,8 +100,9 @@ dish ardeens_satay:          Ardeense saté -- Gehaktballetjes en spek  {has_mea
 dish taco:                   Taco                        {has_meat} € 3.6
 dish gypsy_stick:            Zigeunerstick               {has_meat} € 2.7
 dish shrimp_croquette:       Garnaalkroket               {has_fish} € 2.8
-	multi_choice second_with_reduction: Tweede portie met korting
+	single_choice second_with_reduction: Tweede portie met korting
-		second_with_reduction_yes: Tweede portie met korting  € 2.2
+		second_with_reduction_no: Eén portie {no_text}
+		second_with_reduction_yes: Twee porties met korting  € 2.2
 dish assortment:             Twijfelaar -- 5 verschillende snacks  {has_meat} € 3.8
 
 # Burgers
@@ -134,7 +137,7 @@ dish burger_john_massis:     Burger op de grill John Massis -- Rundvlees, sesamb
 
 # Veggie
 dish cheese_croquette:       Kaaskroket (veggie)              € 2.1
-	multi_choice second_with_reduction_price1
+	single_choice second_with_reduction_price1
 dish veggi_burger:           Veggieburger                     € 4.2
 	multi_choice extras
 dish bicky_balls:            Bicky balls (veggie) -- 6 ballen met chicklessvulling en 3 bickysausjes erin  € 3.5