Merge remote-tracking branch 'origin/main' into feature/liturgy-dialog

2025-10-30 11:54:39 +01:00 · 2025-10-30 11:54:39 +01:00 · bf78cfde87
parent b04315946b 2362631465
commit bf78cfde87
207 changed files with 1373 additions and 114 deletions
--- a/README.md
+++ b/README.md
@ -61,6 +61,10 @@ Um die Vorbereitung einer Sitzung so komfortabel wie möglich zu gestalten, gibt
 oder NSCs vorzubereiten welche Waren und oder (ggf. in Anzahl beschränkte) Dienstleistungen bereitstellen, gegen einen
 Preis natürlich.

+### Battle
+
+Um heimlich vergleichend Talentproben von zwei Charakteren und oder Kreaturen durchzuführen gibt es den Battle Dialog. In diesem können Charaktere/Kreaturen ausgewählt werden, deren Talente ausgewählt oder eingegeben (samt Eigenschaften) werden, Erschwernisse eingetragen werden und dann geht es auch schon los.
+
 ---

 # Acknowledgments
--- a/src/assets/Halloween/SODA_Icons_Halloween_001.png
+++ b/src/assets/Halloween/SODA_Icons_Halloween_001.png
--- a/src/assets/Halloween/SODA_Icons_Halloween_002.png
+++ b/src/assets/Halloween/SODA_Icons_Halloween_002.png
--- a/src/assets/Halloween/SODA_Icons_Halloween_003.png
+++ b/src/assets/Halloween/SODA_Icons_Halloween_003.png
--- a/src/assets/Halloween/SODA_Icons_Halloween_004.png
+++ b/src/assets/Halloween/SODA_Icons_Halloween_004.png
--- a/src/assets/Halloween/SODA_Icons_Halloween_005.png
+++ b/src/assets/Halloween/SODA_Icons_Halloween_005.png
--- a/src/assets/Halloween/SODA_Icons_Halloween_006.png
+++ b/src/assets/Halloween/SODA_Icons_Halloween_006.png
--- a/src/assets/Halloween/SODA_Icons_Halloween_007.png
+++ b/src/assets/Halloween/SODA_Icons_Halloween_007.png
--- a/src/assets/Halloween/SODA_Icons_Halloween_008.png
+++ b/src/assets/Halloween/SODA_Icons_Halloween_008.png
--- a/src/assets/Halloween/SODA_Icons_Halloween_009.png
+++ b/src/assets/Halloween/SODA_Icons_Halloween_009.png
--- a/src/assets/Halloween/SODA_Icons_Halloween_010.png
+++ b/src/assets/Halloween/SODA_Icons_Halloween_010.png
--- a/src/assets/Halloween/SODA_Icons_Halloween_011.png
+++ b/src/assets/Halloween/SODA_Icons_Halloween_011.png
--- a/src/assets/Halloween/SODA_Icons_Halloween_012.png
+++ b/src/assets/Halloween/SODA_Icons_Halloween_012.png
--- a/src/assets/Halloween/SODA_Icons_Halloween_013.png
+++ b/src/assets/Halloween/SODA_Icons_Halloween_013.png
--- a/src/assets/Halloween/SODA_Icons_Halloween_014.png
+++ b/src/assets/Halloween/SODA_Icons_Halloween_014.png
--- a/src/assets/Halloween/SODA_Icons_Halloween_015.png
+++ b/src/assets/Halloween/SODA_Icons_Halloween_015.png
--- a/src/assets/Halloween/SODA_Icons_Halloween_016.png
+++ b/src/assets/Halloween/SODA_Icons_Halloween_016.png
--- a/src/assets/Halloween/SODA_Icons_Halloween_017.png
+++ b/src/assets/Halloween/SODA_Icons_Halloween_017.png
--- a/src/assets/Halloween/SODA_Icons_Halloween_018.png
+++ b/src/assets/Halloween/SODA_Icons_Halloween_018.png
--- a/src/assets/Halloween/SODA_Icons_Halloween_019.png
+++ b/src/assets/Halloween/SODA_Icons_Halloween_019.png
--- a/src/assets/Halloween/SODA_Icons_Halloween_020.png
+++ b/src/assets/Halloween/SODA_Icons_Halloween_020.png
--- a/src/assets/Halloween/SODA_Icons_Halloween_021.png
+++ b/src/assets/Halloween/SODA_Icons_Halloween_021.png
--- a/src/assets/Halloween/SODA_Icons_Halloween_022.png
+++ b/src/assets/Halloween/SODA_Icons_Halloween_022.png
--- a/src/assets/Halloween/SODA_Icons_Halloween_023.png
+++ b/src/assets/Halloween/SODA_Icons_Halloween_023.png
--- a/src/assets/Halloween/SODA_Icons_Halloween_024.png
+++ b/src/assets/Halloween/SODA_Icons_Halloween_024.png
--- a/Labels/SODA_Icons_PotionsLabeled_001.png
+++ b/Labels/SODA_Icons_PotionsLabeled_001.png
--- a/Labels/SODA_Icons_PotionsLabeled_002.png
+++ b/Labels/SODA_Icons_PotionsLabeled_002.png
--- a/Labels/SODA_Icons_PotionsLabeled_003.png
+++ b/Labels/SODA_Icons_PotionsLabeled_003.png
--- a/Labels/SODA_Icons_PotionsLabeled_004.png
+++ b/Labels/SODA_Icons_PotionsLabeled_004.png
--- a/Labels/SODA_Icons_PotionsLabeled_005.png
+++ b/Labels/SODA_Icons_PotionsLabeled_005.png
--- a/Labels/SODA_Icons_PotionsLabeled_006.png
+++ b/Labels/SODA_Icons_PotionsLabeled_006.png
--- a/Labels/SODA_Icons_PotionsLabeled_007.png
+++ b/Labels/SODA_Icons_PotionsLabeled_007.png
--- a/Labels/SODA_Icons_PotionsLabeled_008.png
+++ b/Labels/SODA_Icons_PotionsLabeled_008.png
--- a/Labels/SODA_Icons_PotionsLabeled_009.png
+++ b/Labels/SODA_Icons_PotionsLabeled_009.png
--- a/Labels/SODA_Icons_PotionsLabeled_010.png
+++ b/Labels/SODA_Icons_PotionsLabeled_010.png
--- a/Labels/SODA_Icons_PotionsLabeled_011.png
+++ b/Labels/SODA_Icons_PotionsLabeled_011.png
--- a/Labels/SODA_Icons_PotionsLabeled_012.png
+++ b/Labels/SODA_Icons_PotionsLabeled_012.png
--- a/Labels/SODA_Icons_PotionsLabeled_013.png
+++ b/Labels/SODA_Icons_PotionsLabeled_013.png
--- a/Labels/SODA_Icons_PotionsLabeled_014.png
+++ b/Labels/SODA_Icons_PotionsLabeled_014.png
--- a/Labels/SODA_Icons_PotionsLabeled_015.png
+++ b/Labels/SODA_Icons_PotionsLabeled_015.png
--- a/Labels/SODA_Icons_PotionsLabeled_016.png
+++ b/Labels/SODA_Icons_PotionsLabeled_016.png
--- a/Labels/SODA_Icons_PotionsLabeled_017.png
+++ b/Labels/SODA_Icons_PotionsLabeled_017.png
--- a/Labels/SODA_Icons_PotionsLabeled_018.png
+++ b/Labels/SODA_Icons_PotionsLabeled_018.png
--- a/Labels/SODA_Icons_PotionsLabeled_019.png
+++ b/Labels/SODA_Icons_PotionsLabeled_019.png
--- a/Labels/SODA_Icons_PotionsLabeled_020.png
+++ b/Labels/SODA_Icons_PotionsLabeled_020.png
--- a/Labels/SODA_Icons_PotionsLabeled_021.png
+++ b/Labels/SODA_Icons_PotionsLabeled_021.png
--- a/Labels/SODA_Icons_PotionsLabeled_022.png
+++ b/Labels/SODA_Icons_PotionsLabeled_022.png
--- a/Labels/SODA_Icons_PotionsLabeled_023.png
+++ b/Labels/SODA_Icons_PotionsLabeled_023.png
--- a/Labels/SODA_Icons_PotionsLabeled_024.png
+++ b/Labels/SODA_Icons_PotionsLabeled_024.png
--- a/Labels/SODA_Icons_PotionsLabeled_025.png
+++ b/Labels/SODA_Icons_PotionsLabeled_025.png
--- a/Labels/SODA_Icons_PotionsLabeled_026.png
+++ b/Labels/SODA_Icons_PotionsLabeled_026.png
--- a/Labels/SODA_Icons_PotionsLabeled_027.png
+++ b/Labels/SODA_Icons_PotionsLabeled_027.png
--- a/Labels/SODA_Icons_PotionsLabeled_028.png
+++ b/Labels/SODA_Icons_PotionsLabeled_028.png
--- a/Labels/SODA_Icons_PotionsLabeled_029.png
+++ b/Labels/SODA_Icons_PotionsLabeled_029.png
--- a/Labels/SODA_Icons_PotionsLabeled_030.png
+++ b/Labels/SODA_Icons_PotionsLabeled_030.png
--- a/Labels/SODA_Icons_PotionsLabeled_031.png
+++ b/Labels/SODA_Icons_PotionsLabeled_031.png
--- a/Labels/SODA_Icons_PotionsLabeled_032.png
+++ b/Labels/SODA_Icons_PotionsLabeled_032.png
--- a/Labels/SODA_Icons_PotionsLabeled_033.png
+++ b/Labels/SODA_Icons_PotionsLabeled_033.png
--- a/Tags/SODA_Icons_PotionsTagged_001.png
+++ b/Tags/SODA_Icons_PotionsTagged_001.png
--- a/Tags/SODA_Icons_PotionsTagged_002.png
+++ b/Tags/SODA_Icons_PotionsTagged_002.png
--- a/Tags/SODA_Icons_PotionsTagged_003.png
+++ b/Tags/SODA_Icons_PotionsTagged_003.png
--- a/Tags/SODA_Icons_PotionsTagged_004.png
+++ b/Tags/SODA_Icons_PotionsTagged_004.png
--- a/Tags/SODA_Icons_PotionsTagged_005.png
+++ b/Tags/SODA_Icons_PotionsTagged_005.png
--- a/Tags/SODA_Icons_PotionsTagged_006.png
+++ b/Tags/SODA_Icons_PotionsTagged_006.png
--- a/Tags/SODA_Icons_PotionsTagged_007.png
+++ b/Tags/SODA_Icons_PotionsTagged_007.png
--- a/Tags/SODA_Icons_PotionsTagged_008.png
+++ b/Tags/SODA_Icons_PotionsTagged_008.png
--- a/Tags/SODA_Icons_PotionsTagged_009.png
+++ b/Tags/SODA_Icons_PotionsTagged_009.png
--- a/Tags/SODA_Icons_PotionsTagged_010.png
+++ b/Tags/SODA_Icons_PotionsTagged_010.png
--- a/Tags/SODA_Icons_PotionsTagged_011.png
+++ b/Tags/SODA_Icons_PotionsTagged_011.png
--- a/Tags/SODA_Icons_PotionsTagged_012.png
+++ b/Tags/SODA_Icons_PotionsTagged_012.png
--- a/Tags/SODA_Icons_PotionsTagged_013.png
+++ b/Tags/SODA_Icons_PotionsTagged_013.png
--- a/Tags/SODA_Icons_PotionsTagged_014.png
+++ b/Tags/SODA_Icons_PotionsTagged_014.png
--- a/Tags/SODA_Icons_PotionsTagged_015.png
+++ b/Tags/SODA_Icons_PotionsTagged_015.png
--- a/Tags/SODA_Icons_PotionsTagged_016.png
+++ b/Tags/SODA_Icons_PotionsTagged_016.png
--- a/Tags/SODA_Icons_PotionsTagged_017.png
+++ b/Tags/SODA_Icons_PotionsTagged_017.png
--- a/Tags/SODA_Icons_PotionsTagged_018.png
+++ b/Tags/SODA_Icons_PotionsTagged_018.png
--- a/Tags/SODA_Icons_PotionsTagged_019.png
+++ b/Tags/SODA_Icons_PotionsTagged_019.png
--- a/Tags/SODA_Icons_PotionsTagged_020.png
+++ b/Tags/SODA_Icons_PotionsTagged_020.png
--- a/Tags/SODA_Icons_PotionsTagged_021.png
+++ b/Tags/SODA_Icons_PotionsTagged_021.png
--- a/Tags/SODA_Icons_PotionsTagged_022.png
+++ b/Tags/SODA_Icons_PotionsTagged_022.png
--- a/Tags/SODA_Icons_PotionsTagged_023.png
+++ b/Tags/SODA_Icons_PotionsTagged_023.png
--- a/Tags/SODA_Icons_PotionsTagged_024.png
+++ b/Tags/SODA_Icons_PotionsTagged_024.png
--- a/Tags/SODA_Icons_PotionsTagged_025.png
+++ b/Tags/SODA_Icons_PotionsTagged_025.png
--- a/Tags/SODA_Icons_PotionsTagged_026.png
+++ b/Tags/SODA_Icons_PotionsTagged_026.png
--- a/Tags/SODA_Icons_PotionsTagged_027.png
+++ b/Tags/SODA_Icons_PotionsTagged_027.png
--- a/Tags/SODA_Icons_PotionsTagged_028.png
+++ b/Tags/SODA_Icons_PotionsTagged_028.png
--- a/Tags/SODA_Icons_PotionsTagged_029.png
+++ b/Tags/SODA_Icons_PotionsTagged_029.png
--- a/Tags/SODA_Icons_PotionsTagged_030.png
+++ b/Tags/SODA_Icons_PotionsTagged_030.png
--- a/Tags/SODA_Icons_PotionsTagged_031.png
+++ b/Tags/SODA_Icons_PotionsTagged_031.png
--- a/Tags/SODA_Icons_PotionsTagged_032.png
+++ b/Tags/SODA_Icons_PotionsTagged_032.png
--- a/Tags/SODA_Icons_PotionsTagged_033.png
+++ b/Tags/SODA_Icons_PotionsTagged_033.png
--- a/src/assets/Potions/SODA_Icons_Potions_001.png
+++ b/src/assets/Potions/SODA_Icons_Potions_001.png
--- a/src/assets/Potions/SODA_Icons_Potions_002.png
+++ b/src/assets/Potions/SODA_Icons_Potions_002.png
--- a/src/assets/Potions/SODA_Icons_Potions_003.png
+++ b/src/assets/Potions/SODA_Icons_Potions_003.png
--- a/src/assets/Potions/SODA_Icons_Potions_004.png
+++ b/src/assets/Potions/SODA_Icons_Potions_004.png
--- a/src/assets/Potions/SODA_Icons_Potions_005.png
+++ b/src/assets/Potions/SODA_Icons_Potions_005.png
--- a/src/assets/Potions/SODA_Icons_Potions_006.png
+++ b/src/assets/Potions/SODA_Icons_Potions_006.png
--- a/src/assets/Potions/SODA_Icons_Potions_007.png
+++ b/src/assets/Potions/SODA_Icons_Potions_007.png
--- a/src/assets/Potions/SODA_Icons_Potions_008.png
+++ b/src/assets/Potions/SODA_Icons_Potions_008.png
--- a/src/assets/Potions/SODA_Icons_Potions_009.png
+++ b/src/assets/Potions/SODA_Icons_Potions_009.png
--- a/Show More
+++ b/Show More