diff --git a/deploy.py b/deploy.py index 5a27864..1d94a62 100644 --- a/deploy.py +++ b/deploy.py @@ -178,13 +178,6 @@ def prepare_images(data, config): logging.info(f"copying other images") shutil.copy("./source/images/boombox.png", "./build/boombox.png") - if config["use_ita"]: - shutil.copy("./source/images/sunken_tapes_titletext_ita.png", - "./build/sunken_tapes_titletext_ita.png") - else: - shutil.copy("./source/images/sunken_tapes_titletext_vanilla.png", - "./build/sunken_tapes_titletext_vanilla.png") - def build_xml_code(data, config): logging.info(f"calculate the value that lets you use the songs n-times") diff --git a/source/filelist_template.xml b/source/filelist_template.xml index d6f144e..072db81 100644 --- a/source/filelist_template.xml +++ b/source/filelist_template.xml @@ -5,8 +5,6 @@ - - diff --git a/source/images/sunken_tapes_titletext_ita.png b/source/images/sunken_tapes_titletext_ita.png deleted file mode 100644 index 185e749..0000000 Binary files a/source/images/sunken_tapes_titletext_ita.png and /dev/null differ diff --git a/source/images/sunken_tapes_titletext_vanilla.png b/source/images/sunken_tapes_titletext_vanilla.png deleted file mode 100644 index 4c84d35..0000000 Binary files a/source/images/sunken_tapes_titletext_vanilla.png and /dev/null differ diff --git a/source/sunken_tapes_style_ita_template.xml b/source/sunken_tapes_style_ita_template.xml index 8bfc180..3a66ff0 100644 --- a/source/sunken_tapes_style_ita_template.xml +++ b/source/sunken_tapes_style_ita_template.xml @@ -175,7 +175,7 @@ --> - + {% for tape in tapes %} diff --git a/source/sunken_tapes_style_template.xml b/source/sunken_tapes_style_template.xml index 7549b7c..e1e55a5 100644 --- a/source/sunken_tapes_style_template.xml +++ b/source/sunken_tapes_style_template.xml @@ -175,7 +175,9 @@ --> - + + + {% for tape in tapes %} diff --git a/source/sunken_tapes_template.xml b/source/sunken_tapes_template.xml index 3234bd1..a527411 100644 --- a/source/sunken_tapes_template.xml +++ b/source/sunken_tapes_template.xml @@ -154,7 +154,7 @@ {% if tape.buffs %} {% for buff in tape.buffs %} - {% if buff == "psychosis" %}{% else %}{% endif %}{% endfor %} + {% if buff == "psychosis" %}{% else %}{% endif %}{% endfor %} {% endif %} diff --git a/source/tapes.yaml b/source/tapes.yaml index 0540ae9..bad88f6 100644 --- a/source/tapes.yaml +++ b/source/tapes.yaml @@ -16,6 +16,7 @@ buffs: - strengthen - haste + buff_multiplier: 0.75 - identifier: dmxcut name: DMX Carnage Cut @@ -35,6 +36,7 @@ buffs: - strengthen - haste + buff_multiplier: 1.0 - identifier: ddt name: Dragostea Din Tei @@ -54,6 +56,7 @@ sold: [true, false, false, false, false] # outpost, city, research, military, mine no_of_uses: 6 buffs: False + buff_multiplier: 0.5 - identifier: java name: Kenny Larkin - Java @@ -73,6 +76,7 @@ sold: [false, false, true, false, false] # outpost, city, research, military, mine no_of_uses: 6 buffs: False + buff_multiplier: 0.5 - identifier: dm name: Menace Ruine - Dark Mother @@ -91,6 +95,7 @@ no_of_uses: 1 buffs: - psychosis + buff_multiplier: 0.65 - identifier: swgd name: Sewer Goddess - Chained To The Edge Of Existence @@ -109,6 +114,7 @@ no_of_uses: 1 buffs: - psychosis + buff_multiplier: 0.75 - identifier: urfaust name: Urfaust - Die Kalte Teufelsfaust @@ -127,6 +133,7 @@ no_of_uses: 1 buffs: - psychosis + buff_multiplier: 0.65 - identifier: rainbowstalin name: Rainbow Stalin @@ -147,6 +154,7 @@ no_of_uses: 6 buffs: - strengthen + buff_multiplier: 0.25 - identifier: nazare name: Альянс - На заре @@ -166,6 +174,7 @@ sold: [false, true, true, false, false] # outpost, city, research, military, mine no_of_uses: 6 buffs: False + buff_multiplier: 0.5 - identifier: shanty1 name: Doodle Let Me Go @@ -185,6 +194,7 @@ sold: [true, false, false, false, true] # outpost, city, research, military, mine no_of_uses: 6 buffs: False + buff_multiplier: 0.5 - identifier: shanty2 name: Rolling Down To Old Maui @@ -204,6 +214,7 @@ sold: [true, false, false, false, true] # outpost, city, research, military, mine no_of_uses: 6 buffs: False + buff_multiplier: 0.5 - identifier: rum name: 15 Men and a Bottle of Rum @@ -223,6 +234,7 @@ sold: [true, false, false, false, true] # outpost, city, research, military, mine no_of_uses: 4 buffs: False + buff_multiplier: 0.5 - identifier: biosphere name: Biosphere - Daphnis 26 @@ -242,6 +254,7 @@ sold: [false, false, true, false, false] # outpost, city, research, military, mine no_of_uses: 6 buffs: False + buff_multiplier: 0.5 - identifier: bedouin name: Bedouin - Set The Control For The Heart Of The Sun @@ -261,6 +274,7 @@ sold: [false, true, false, false, false] # outpost, city, research, military, mine no_of_uses: 4 buffs: False + buff_multiplier: 0.5 - identifier: hardbass name: Hardbass @@ -281,6 +295,7 @@ no_of_uses: 6 buffs: - strengthen + buff_multiplier: 0.35 - identifier: ira name: Come out and Fight @@ -300,6 +315,7 @@ sold: [false, false, false, false, true] # outpost, city, research, military, mine no_of_uses: 6 buffs: False + buff_multiplier: 0.5 - identifier: tha name: Aphex Twin - Tha @@ -319,6 +335,7 @@ sold: [false, false, true, false, false] # outpost, city, research, military, mine no_of_uses: 6 buffs: False + buff_multiplier: 0.5 - identifier: immigrantsong name: Led Zeppelin - Immigrant Song @@ -336,6 +353,7 @@ sold: [false, false, false, false, false] # outpost, city, research, military, mine no_of_uses: 6 buffs: False + buff_multiplier: 0.5 - identifier: redoctober name: The Hunt for Red October @@ -355,6 +373,7 @@ sold: [false, false, false, true, false] # outpost, city, research, military, mine no_of_uses: 6 buffs: False + buff_multiplier: 0.5 - identifier: shoegazeprincessa name: Шугейз-принцесса @@ -374,6 +393,7 @@ sold: [false, true, true, false, false] # outpost, city, research, military, mine no_of_uses: 6 buffs: False + buff_multiplier: 0.5 - identifier: rusija name: УБИЙЦЫ - Россия @@ -393,6 +413,7 @@ sold: [false, true, false, false, false] # outpost, city, research, military, mine no_of_uses: 6 buffs: False + buff_multiplier: 0.5 - identifier: schritte_08080 name: Inka - Schritte (08080 remix) @@ -407,6 +428,7 @@ no_of_uses: 6 buffs: - psychosis + buff_multiplier: 0.25 - identifier: schritte name: Inka - Schritte @@ -424,6 +446,7 @@ sold: [false, true, false, false, false] # outpost, city, research, military, mine no_of_uses: 6 buffs: False + buff_multiplier: 0.5 - identifier: wacky_tape name: Neznani Rock Fotri @@ -437,6 +460,7 @@ sold: [false, false, false, false, false] # outpost, city, research, military, mine no_of_uses: 1 buffs: False + buff_multiplier: 0.5 - identifier: 08080_minor_threat name: 08080 - Minor Threat @@ -452,6 +476,7 @@ sold: [false, false, true, false, false] # outpost, city, research, military, mine no_of_uses: 3 buffs: False + buff_multiplier: 0.5 - identifier: 08080_canyons_joyride name: 08080 - Canyon's Joyride @@ -467,6 +492,7 @@ sold: [false, true, false, false, false] # outpost, city, research, military, mine no_of_uses: 3 buffs: False + buff_multiplier: 0.5 - identifier: sigma name: ∑ @@ -484,4 +510,5 @@ sold: [false, false, false, true, false] # outpost, city, research, military, mine no_of_uses: 1 buffs: - - psychosis \ No newline at end of file + - psychosis + buff_multiplier: 0.25 \ No newline at end of file