diff --git a/Packliste.java b/Packliste.java index ab44c45..4dcec57 100644 --- a/Packliste.java +++ b/Packliste.java @@ -82,7 +82,7 @@ output += "# Klamotten\n"; output += "- " + packDays + " T-Shirts\n"; output += "- " + packDays + " Socken\n"; - output += "- 1 Schuhe\n"; + output += "- 1 Paar Schuhe\n"; output += "- " + packDays + " Unterhosen\n"; if(summer){ output += "- 1 Hose\n"; @@ -92,6 +92,8 @@ output += "- " + foo + " Pullover\n"; } output += "- 1 Regenjacke\n"; + if(lightweight && camping) output += "- Microfaser-Handtuch\n"; + else output += "- Handtuch\n"; if(beach){ output += "- Badehose\n"; @@ -104,28 +106,28 @@ //Hygiene-Kram output += "# Hygiene-Kram\n"; - output += "- 1 Zahnbürste\n"; - output += "- 1 Zahnpasta\n"; - output += "- 1 Deo\n"; - output += "- 1 Duschgel & Shampoo\n"; - output += "- 1 Erste-Hilfe-Tasche\n"; + output += "- Zahnbürste\n"; + output += "- Zahnpasta\n"; + output += "- Deo\n"; + output += "- Duschgel & Shampoo\n"; + output += "- Erste-Hilfe-Tasche\n"; + if(summer || beach) output += "- Sonnencreme\n"; output += "\n"; //Camping if(camping){ output += "# Camping\n"; - output += "- 1 Zelt\n"; - output += "- 1 Schlafsack\n"; - output += "- 1 Isomatte\n"; - output += "- 1 Stirnlampe\n"; - output += "- 1 Kocher\n"; - output += " - 1 Gas/Benzin/Spiritus\n"; - output += "- 1 Teller\n"; - output += "- 1 Besteck\n"; - output += "- 1 Tasse\n"; - output += "- 1 Becher\n"; - output += "- 1 (Microfaser)-Handtuch\n"; + output += "- Zelt\n"; + output += "- Schlafsack\n"; + output += "- Isomatte\n"; + output += "- Stirnlampe\n"; + output += "- Kocher\n"; + output += " - Gas/Benzin/Spiritus\n"; + output += "- Teller\n"; + output += "- Besteck\n"; + output += "- Tasse\n"; + output += "- Becher\n"; } else if(hotel){ //TODO } @@ -137,6 +139,12 @@ output += "\n"; + output += "# Kram\n"; + output += "- Notizblock\n"; + output += "- Stifte\n"; + + output += "\n"; + if(hasEntertainment()){ output += "# Unterhaltung\n"; if(books){