Merge branch 'main' of https://gitlab2.informatik.hs-fulda.de/fdai7359/gesellschaftsspiele-sammlung

2 years ago · 8caed94855
154 changed files with 2140 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1,2 @@
 /node_modules/
+/commits
--- a/kniffel/inc/errechneChance.js
+++ b/kniffel/inc/errechneChance.js
@ -0,0 +1,5 @@
+function errechneChance(w1, w2, w3, w4, w5){
+    
+    return w1 + w2 + w3 + w4 + w5;   
+}
+module.exports = errechneChance;
--- a/kniffel/inc/sortiereWuerfelaufsteigend.js
+++ b/kniffel/inc/sortiereWuerfelaufsteigend.js
@ -0,0 +1,6 @@
+function sortiereWuerfelaufsteigend(wuerfelArr){
+    
+    return wuerfelArr.sort();
+}
+module.exports = sortiereWuerfelaufsteigend;
+
--- a/kniffel/index.html
+++ b/kniffel/index.html
@ -7,7 +7,6 @@
        <script type="text/javascript" src="inc/sammleGleicheZahlen.js"></script>
        <script type="text/javascript" src="inc/helper.js"></script>
        <script type="text/javascript" src="inc/summeObererTeil.js"></script>
-        <script type="text/javascript" src="inc/checkeBonus.js"></script>
        <title>Kniffel</title>
 </head>
 <body>
--- a/kniffel/test/test_checkeBonus.test.js
+++ b/kniffel/test/test_checkeBonus.test.js
@ -5,11 +5,18 @@ const checkeBonus = require('../inc/checkeBonus');
 describe('tests kniffel', () => {

    //Ein Test mit Name und Funktion
-    it('teste Bonus Kniffel oberer Teil', ()=>{
+    it('teste Bonus Kniffel oberer Teil auf obere Wertgrenze', ()=>{

        //Vergleiche Ist- und Sollergebnis
        expect(checkeBonus(65)).toBe(100);

    });

+    it('teste Bonus Kniffel oberer Teil auf untere Wertgrenze', ()=>{
+
+        //Vergleiche Ist- und Sollergebnis
+        expect(checkeBonus(64)).toBe(64);
+
+    });
+
 })
--- a/kniffel/test/test_errechneChance.test.js
+++ b/kniffel/test/test_errechneChance.test.js
@ -0,0 +1,14 @@
+const errechneChance = require('../inc/errechneChance');
+
+
+//Eine Test Gruppe, mit mehreren Tests
+describe('tests kniffel', () => {
+
+    it('teste Chance fuer unteren Teil von Kniffel mit fuenf uebergebenen Wuerfeln', ()=>{
+
+        //Vergleiche Ist- und Sollergebnis
+        expect(errechneChance(3, 4, 6, 1, 2)).toBe(16);
+
+    });
+
+})
--- a/kniffel/test/test_sortiereWuerfelaufsteigend.test.js
+++ b/kniffel/test/test_sortiereWuerfelaufsteigend.test.js
@ -0,0 +1,20 @@
+const sortiereWuerfelaufsteigend = require('../inc/sortiereWuerfelaufsteigend');
+
+
+//Eine Test Gruppe, mit mehreren Tests
+describe('tests kniffel', () => {
+
+    it('teste aufsteigende Sortierung fuer große  Straße', ()=>{
+
+        //Vergleiche Ist- und Sollergebnis
+        expect(sortiereWuerfelaufsteigend(['3', '5', '4', '2', '1'])).toContain('1', '2', '3', '4', '5');
+
+    });
+    it('teste aufsteigende Sortierung fuer kleine Straße', ()=>{
+
+        //Vergleiche Ist- und Sollergebnis
+        expect(sortiereWuerfelaufsteigend(['2', '3', '5', '2', '4'])).toContain('2', '3', '4', '5');
+
+    });
+
+})
--- a/plugins.js
+++ b/plugins.js
--- a/uno/css/uno.css
+++ b/uno/css/uno.css
@ -0,0 +1,44 @@
+@import url('https://fonts.googleapis.com/css2?family=Cabin:wght@600;700&display=swap');
+
+*{
+    font-family: 'Cabin', sans-serif;
+}
+
+body
+{
+    overflow: hidden;
+}
+
+
+/* ### Stapel-"Karte ziehen" ### */
+.stack-draw
+{
+    max-width: 25vh;
+    min-width: 20vh;
+    position: absolute;
+    top: 47vh;
+    right: min(90%, (53% + 10vh));
+    transform: translate(50%, -50%);
+}
+
+/* ### Stapel-"Karte legen" ### */
+.stack-put
+{
+    max-width: 25vh;
+    min-width: 20vh;
+    position: absolute;
+    top: 47vh;
+    left: min(90%, (53% + 10vh));
+    transform: translate(-50%, -50%);
+}
+
+#first-put-anim
+{
+    top: 30vh;
+    opacity: 0;
+}
+
+#first-put
+{
+    opacity: 0;
+}
--- a/uno/img/cards/BLUE/+2.png
+++ b/uno/img/cards/BLUE/+2.png
--- a/uno/img/cards/BLUE/0.png
+++ b/uno/img/cards/BLUE/0.png
--- a/uno/img/cards/BLUE/1.png
+++ b/uno/img/cards/BLUE/1.png
--- a/uno/img/cards/BLUE/2.png
+++ b/uno/img/cards/BLUE/2.png
--- a/uno/img/cards/BLUE/3.png
+++ b/uno/img/cards/BLUE/3.png
--- a/uno/img/cards/BLUE/4.png
+++ b/uno/img/cards/BLUE/4.png
--- a/uno/img/cards/BLUE/5.png
+++ b/uno/img/cards/BLUE/5.png
--- a/uno/img/cards/BLUE/6.png
+++ b/uno/img/cards/BLUE/6.png
--- a/uno/img/cards/BLUE/7.png
+++ b/uno/img/cards/BLUE/7.png
--- a/uno/img/cards/BLUE/8.png
+++ b/uno/img/cards/BLUE/8.png
--- a/uno/img/cards/BLUE/9.png
+++ b/uno/img/cards/BLUE/9.png
--- a/uno/img/cards/BLUE/A.png
+++ b/uno/img/cards/BLUE/A.png
--- a/uno/img/cards/BLUE/R.png
+++ b/uno/img/cards/BLUE/R.png
--- a/uno/img/cards/GREEN/+2.png
+++ b/uno/img/cards/GREEN/+2.png
--- a/uno/img/cards/GREEN/0.png
+++ b/uno/img/cards/GREEN/0.png
--- a/uno/img/cards/GREEN/1.png
+++ b/uno/img/cards/GREEN/1.png
--- a/uno/img/cards/GREEN/2.png
+++ b/uno/img/cards/GREEN/2.png
--- a/uno/img/cards/GREEN/3.png
+++ b/uno/img/cards/GREEN/3.png
--- a/uno/img/cards/GREEN/4.png
+++ b/uno/img/cards/GREEN/4.png
--- a/uno/img/cards/GREEN/5.png
+++ b/uno/img/cards/GREEN/5.png
--- a/uno/img/cards/GREEN/6.png
+++ b/uno/img/cards/GREEN/6.png
--- a/uno/img/cards/GREEN/7.png
+++ b/uno/img/cards/GREEN/7.png
--- a/uno/img/cards/GREEN/8.png
+++ b/uno/img/cards/GREEN/8.png
--- a/uno/img/cards/GREEN/9.png
+++ b/uno/img/cards/GREEN/9.png
--- a/uno/img/cards/GREEN/A.png
+++ b/uno/img/cards/GREEN/A.png
--- a/uno/img/cards/GREEN/R.png
+++ b/uno/img/cards/GREEN/R.png
--- a/uno/img/cards/NONE/+4.png
+++ b/uno/img/cards/NONE/+4.png
--- a/uno/img/cards/NONE/CC.png
+++ b/uno/img/cards/NONE/CC.png
--- a/uno/img/cards/RED/+2.png
+++ b/uno/img/cards/RED/+2.png
--- a/uno/img/cards/RED/0.png
+++ b/uno/img/cards/RED/0.png
--- a/uno/img/cards/RED/1.png
+++ b/uno/img/cards/RED/1.png
--- a/uno/img/cards/RED/2.png
+++ b/uno/img/cards/RED/2.png
--- a/uno/img/cards/RED/3.png
+++ b/uno/img/cards/RED/3.png
--- a/uno/img/cards/RED/4.png
+++ b/uno/img/cards/RED/4.png
--- a/uno/img/cards/RED/5.png
+++ b/uno/img/cards/RED/5.png
--- a/uno/img/cards/RED/6.png
+++ b/uno/img/cards/RED/6.png
--- a/uno/img/cards/RED/7.png
+++ b/uno/img/cards/RED/7.png
--- a/uno/img/cards/RED/8.png
+++ b/uno/img/cards/RED/8.png
--- a/uno/img/cards/RED/9.png
+++ b/uno/img/cards/RED/9.png
--- a/uno/img/cards/RED/A.png
+++ b/uno/img/cards/RED/A.png
--- a/uno/img/cards/RED/R.png
+++ b/uno/img/cards/RED/R.png
--- a/uno/img/cards/YELLOW/+2.png
+++ b/uno/img/cards/YELLOW/+2.png
--- a/uno/img/cards/YELLOW/0.png
+++ b/uno/img/cards/YELLOW/0.png
--- a/uno/img/cards/YELLOW/1.png
+++ b/uno/img/cards/YELLOW/1.png
--- a/uno/img/cards/YELLOW/2.png
+++ b/uno/img/cards/YELLOW/2.png
--- a/uno/img/cards/YELLOW/3.png
+++ b/uno/img/cards/YELLOW/3.png
--- a/uno/img/cards/YELLOW/4.png
+++ b/uno/img/cards/YELLOW/4.png
--- a/uno/img/cards/YELLOW/5.png
+++ b/uno/img/cards/YELLOW/5.png
--- a/uno/img/cards/YELLOW/6.png
+++ b/uno/img/cards/YELLOW/6.png
--- a/uno/img/cards/YELLOW/7.png
+++ b/uno/img/cards/YELLOW/7.png
--- a/uno/img/cards/YELLOW/8.png
+++ b/uno/img/cards/YELLOW/8.png
--- a/uno/img/cards/YELLOW/9.png
+++ b/uno/img/cards/YELLOW/9.png
--- a/uno/img/cards/YELLOW/A.png
+++ b/uno/img/cards/YELLOW/A.png
--- a/uno/img/cards/YELLOW/R.png
+++ b/uno/img/cards/YELLOW/R.png
--- a/uno/img/stackCards/BLUE/+2.png
+++ b/uno/img/stackCards/BLUE/+2.png
--- a/uno/img/stackCards/BLUE/+4.png
+++ b/uno/img/stackCards/BLUE/+4.png
--- a/uno/img/stackCards/BLUE/0.png
+++ b/uno/img/stackCards/BLUE/0.png
--- a/uno/img/stackCards/BLUE/1.png
+++ b/uno/img/stackCards/BLUE/1.png
--- a/uno/img/stackCards/BLUE/2.png
+++ b/uno/img/stackCards/BLUE/2.png
--- a/uno/img/stackCards/BLUE/3.png
+++ b/uno/img/stackCards/BLUE/3.png
--- a/uno/img/stackCards/BLUE/4.png
+++ b/uno/img/stackCards/BLUE/4.png
--- a/uno/img/stackCards/BLUE/5.png
+++ b/uno/img/stackCards/BLUE/5.png
--- a/uno/img/stackCards/BLUE/6.png
+++ b/uno/img/stackCards/BLUE/6.png
--- a/uno/img/stackCards/BLUE/7.png
+++ b/uno/img/stackCards/BLUE/7.png
--- a/uno/img/stackCards/BLUE/8.png
+++ b/uno/img/stackCards/BLUE/8.png
--- a/uno/img/stackCards/BLUE/9.png
+++ b/uno/img/stackCards/BLUE/9.png
--- a/uno/img/stackCards/BLUE/CC.png
+++ b/uno/img/stackCards/BLUE/CC.png
--- a/uno/img/stackCards/BLUE/R.png
+++ b/uno/img/stackCards/BLUE/R.png
--- a/uno/img/stackCards/BLUE/S.png
+++ b/uno/img/stackCards/BLUE/S.png
--- a/uno/img/stackCards/FirstDrawCard.png
+++ b/uno/img/stackCards/FirstDrawCard.png
--- a/uno/img/stackCards/GREEN/+2.png
+++ b/uno/img/stackCards/GREEN/+2.png
--- a/uno/img/stackCards/GREEN/+4.png
+++ b/uno/img/stackCards/GREEN/+4.png
--- a/uno/img/stackCards/GREEN/0.png
+++ b/uno/img/stackCards/GREEN/0.png
--- a/uno/img/stackCards/GREEN/1.png
+++ b/uno/img/stackCards/GREEN/1.png
--- a/uno/img/stackCards/GREEN/2.png
+++ b/uno/img/stackCards/GREEN/2.png
--- a/uno/img/stackCards/GREEN/3.png
+++ b/uno/img/stackCards/GREEN/3.png
--- a/uno/img/stackCards/GREEN/4.png
+++ b/uno/img/stackCards/GREEN/4.png
--- a/uno/img/stackCards/GREEN/5.png
+++ b/uno/img/stackCards/GREEN/5.png
--- a/uno/img/stackCards/GREEN/6.png
+++ b/uno/img/stackCards/GREEN/6.png
--- a/uno/img/stackCards/GREEN/7.png
+++ b/uno/img/stackCards/GREEN/7.png
--- a/uno/img/stackCards/GREEN/8.png
+++ b/uno/img/stackCards/GREEN/8.png
--- a/uno/img/stackCards/GREEN/9.png
+++ b/uno/img/stackCards/GREEN/9.png
--- a/uno/img/stackCards/GREEN/CC.png
+++ b/uno/img/stackCards/GREEN/CC.png
--- a/uno/img/stackCards/GREEN/R.png
+++ b/uno/img/stackCards/GREEN/R.png
--- a/uno/img/stackCards/GREEN/S.png
+++ b/uno/img/stackCards/GREEN/S.png
--- a/uno/img/stackCards/NONE/+4.png
+++ b/uno/img/stackCards/NONE/+4.png
--- a/uno/img/stackCards/NONE/CC.png
+++ b/uno/img/stackCards/NONE/CC.png
--- a/uno/img/stackCards/RED/+2.png
+++ b/uno/img/stackCards/RED/+2.png
--- a/uno/img/stackCards/RED/+4.png
+++ b/uno/img/stackCards/RED/+4.png
--- a/uno/img/stackCards/RED/0.png
+++ b/uno/img/stackCards/RED/0.png
--- a/uno/img/stackCards/RED/1.png
+++ b/uno/img/stackCards/RED/1.png