5 modes de jeux + graphique à modifier

5 years ago · 40eb1d79d2
parent 54cd0e64e5
commit 40eb1d79d2
9 changed files with 1279 additions and 220 deletions
--- a/HyperSet/.idea/workspace.xml
+++ b/HyperSet/.idea/workspace.xml
@ -44,26 +44,26 @@
    <property name="DefaultHtmlFileTemplate" value="HTML File" />
    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/vues/images" />
  </component>
  <component name="ReadonlyStatusHandler">
    <option name="SHOW_DIALOG" value="false" />
  </component>
  <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="C:\wamp64\www\HyperSet\DAL" />
-      <recent name="C:\wamp64\www\HyperSet\site\vues" />
-      <recent name="C:\wamp64\www\HyperSet\site" />
-      <recent name="C:\wamp64\www\HyperSet" />
-      <recent name="C:\wamp64\www\HyperSet\vues\css" />
-    </key>
    <key name="MoveFile.RECENT_KEYS">
-      <recent name="C:\wamp64\www\HyperSet\vues" />
      <recent name="C:\wamp64\www\HyperSet\vues\images" />
+      <recent name="C:\wamp64\www\HyperSet\vues" />
      <recent name="C:\wamp64\www\HyperSet" />
      <recent name="C:\wamp64\www\HyperSet\bdd" />
      <recent name="C:\wamp64\www\HyperSet\site\vues\js" />
    </key>
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="C:\wamp64\www\HyperSet\vues\images" />
+      <recent name="C:\wamp64\www\HyperSet\DAL" />
+      <recent name="C:\wamp64\www\HyperSet\site\vues" />
+      <recent name="C:\wamp64\www\HyperSet\site" />
+      <recent name="C:\wamp64\www\HyperSet" />
+    </key>
  </component>
  <component name="SvnConfiguration">
    <configuration />
@ -99,6 +99,7 @@
      <workItem from="1592989402859" duration="14949000" />
      <workItem from="1593080270400" duration="16461000" />
      <workItem from="1593102504672" duration="528000" />
+      <workItem from="1593166507430" duration="19199000" />
    </task>
    <servers />
  </component>
@ -118,10 +119,10 @@
      <screen x="0" y="0" width="1920" height="1040" />
    </state>
    <state x="690" y="267" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1592564996566" />
-    <state x="267" y="278" key="FileChooserDialogImpl" timestamp="1592822833892">
+    <state x="267" y="278" key="FileChooserDialogImpl" timestamp="1593185301624">
      <screen x="0" y="0" width="1920" height="1040" />
    </state>
-    <state x="267" y="278" key="FileChooserDialogImpl/0.0.1920.1040@0.0.1920.1040" timestamp="1592822833892" />
+    <state x="267" y="278" key="FileChooserDialogImpl/0.0.1920.1040@0.0.1920.1040" timestamp="1593185301624" />
    <state width="196" height="457" key="HiddenNamespacesPopup" timestamp="1591707100032">
      <screen x="0" y="0" width="1920" height="1040" />
    </state>
@ -138,10 +139,10 @@
      <screen x="0" y="0" width="1920" height="1040" />
    </state>
    <state width="498" height="446" key="SwitcherDM/0.0.1920.1040@0.0.1920.1040" timestamp="1592141850590" />
-    <state x="1136" y="344" key="com.intellij.ide.util.TipDialog" timestamp="1593102507519">
+    <state x="1136" y="344" key="com.intellij.ide.util.TipDialog" timestamp="1593166563021">
      <screen x="0" y="0" width="1920" height="1040" />
    </state>
-    <state x="1136" y="344" key="com.intellij.ide.util.TipDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1593102507519" />
+    <state x="1136" y="344" key="com.intellij.ide.util.TipDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1593166563021" />
    <state x="701" y="162" key="refactoring.ChangeSignatureDialog" timestamp="1593090265720">
      <screen x="0" y="0" width="1920" height="1040" />
    </state>
--- a/HyperSet/metiers/deck.php
+++ b/HyperSet/metiers/deck.php
@ -20,6 +20,7 @@ class Deck {
            $colors = array('green', 'red', 'purple');
            $shapes = array('oval', 'diamond', 'wave');
            $fills = array('solid', 'stripped', 'open');
+            $border = 'simple';
            $numbers = array(1, 2, 3);

            $index = 1;
@ -28,7 +29,7 @@ class Deck {
                foreach ($shapes as $shape) {
                    foreach ($fills as $fill) {
                        foreach ($numbers as $number) {
-                            $cardAttributes = new CardAttributes($color, $shape, $fill, '', $number, $index);
+                            $cardAttributes = new CardAttributes($color, $shape, $fill, $border, $number, $index);
                            $card = new Card($cardAttributes, $this);
                            $index++;
                        }
@ -44,16 +45,16 @@ class Deck {
            $borders = array('plein', 'point', 'rond');
            $numbers = array(1, 2, 3);

-            $index = 1;
+            $index1 = 1;

            foreach ($colors as $color) {
                foreach ($shapes as $shape) {
                    foreach ($fills as $fill) {
                        foreach ($borders as $border) {
                            foreach ($numbers as $number) {
-                                $cardAttributes = new CardAttributes($color, $shape, $fill, $border, $number, $index);
+                                $cardAttributes = new CardAttributes($color, $shape, $fill, $border, $number, $index1);
                                $card = new Card($cardAttributes, $this);
-                                $index++;
+                                $index1++;
                            }
                        }
                    }
@ -66,15 +67,15 @@ class Deck {
            $fills = array('solid', 'stripped', 'open','quadrillage');
            $numbers = array(1, 2, 3,4);

-            $index = 1;
+            $index2 = 1;

            foreach ($colors as $color) {
                foreach ($shapes as $shape) {
                    foreach ($fills as $fill) {
                        foreach ($numbers as $number) {
-                            $cardAttributes = new CardAttributes($color, $shape, $fill,'', $number, $index);
+                            $cardAttributes = new CardAttributes($color, $shape, $fill,'simple', $number, $index2);
                            $card = new Card($cardAttributes, $this);
-                            $index++;
+                            $index2++;
                        }
                    }
                }
@ -86,16 +87,16 @@ class Deck {
            $borders = array ('plein','point','rond','zigzag');
            $numbers = array(1, 2, 3,4);

-            $index = 1;
+            $index3 = 1;

            foreach ($colors as $color) {
                foreach ($shapes as $shape) {
                    foreach ($fills as $fill) {
                        foreach ($borders as $border){
                            foreach ($numbers as $number) {
-                                $cardAttributes = new CardAttributes($color, $shape, $fill, $border, $number, $index);
+                                $cardAttributes = new CardAttributes($color, $shape, $fill, $border, $number, $index3);
                                $card = new Card($cardAttributes, $this);
-                                $index++;
+                                $index3++;
                            }
                        }
                    }
@ -109,16 +110,16 @@ class Deck {
            $borders = array('plein', 'point', 'rond', 'zigzag','hachure');
            $numbers = array(1, 2, 3, 4, 5);

-            $index = 1;
+            $index4 = 1;

            foreach ($colors as $color) {
                foreach ($shapes as $shape) {
                    foreach ($fills as $fill) {
                        foreach ($borders as $border) {
                            foreach ($numbers as $number) {
-                                $cardAttributes = new CardAttributes($color, $shape, $fill, $border,$number, $index);
+                                $cardAttributes = new CardAttributes($color, $shape, $fill, $border,$number, $index4);
                                $card = new Card($cardAttributes, $this);
-                                $index++;
+                                $index4++;
                            }
                        }
                    }
--- a/HyperSet/vues/css/style-page.css
+++ b/HyperSet/vues/css/style-page.css
@ -380,7 +380,7 @@ input:checked + .slider .on {
 }

 .game-button-mode {
-    position: absolute;
+    position: fixed;
    top: 55%;
    left: 50%;
    transform: translateY(-50%) translateX(-50%);
--- a/HyperSet/vues/css/style.css
+++ b/HyperSet/vues/css/style.css
@ -32,7 +32,7 @@ h1 {

 .card {
 	display: table-cell;
-	width: 250px;
+	width: 320px;

 	height: 200px;
 	border: 2px solid #ccc;
@ -91,6 +91,19 @@ h1 {
 }


+.rectangle{
+	transform: rotate(0.5deg) skewX(1deg) scaleX(0.8);
+	width: 55px;
+
+}
+
+.triangle{
+	clip-path: polygon(50% 0%, 0% 100%, 100% 100%);
+	rotation: 90deg;
+}
+
+
+

 .yellow {
 	background: yellow;
@ -106,10 +119,75 @@ h1 {



+
+.green.quadrillage{
+	background-color: green;
+	background-image:
+			linear-gradient(rgba(255,255,255,.5) 2px, transparent 2px),
+			linear-gradient(90deg, rgba(255,255,255,.5) 2px, transparent 2px),
+			linear-gradient(rgba(255,255,255,.28) 2px, transparent 2px),
+			linear-gradient(90deg, rgba(255,255,255,.28) 2px, transparent 2px);
+	background-size: 100px 100px, 100px 100px, 20px 20px, 20px 20px;
+	background-position: -2px -2px, -2px -2px, -1px -1px, -1px -1px;
+}
+.red.quadrillage{
+	background-color: red;
+	background-image:
+			linear-gradient(rgba(255,255,255,.5) 2px, transparent 2px),
+			linear-gradient(90deg, rgba(255,255,255,.5) 2px, transparent 2px),
+			linear-gradient(rgba(255,255,255,.28) 2px, transparent 2px),
+			linear-gradient(90deg, rgba(255,255,255,.28) 2px, transparent 2px);
+	background-size: 100px 100px, 100px 100px, 20px 20px, 20px 20px;
+	background-position: -2px -2px, -2px -2px, -1px -1px, -1px -1px;
+}
+.yellow.quadrillage{
+	background-color: yellow;
+	background-image:
+			linear-gradient(rgba(255,255,255,.5) 2px, transparent 2px),
+			linear-gradient(90deg, rgba(255,255,255,.5) 2px, transparent 2px),
+			linear-gradient(rgba(255,255,255,.28) 2px, transparent 2px),
+			linear-gradient(90deg, rgba(255,255,255,.28) 2px, transparent 2px);
+	background-size: 80px 80px, 80px 80px, 15px 15px, 15px 15px;
+	background-position: -2px -2px, -2px -2px, -1px -1px, -1px -1px;
+}
+
+.lightblue.quadrillage{
+	background-color: lightblue;
+	background-image:
+			linear-gradient(rgba(255,255,255,.5) 2px, transparent 2px),
+			linear-gradient(90deg, rgba(255,255,255,.5) 2px, transparent 2px),
+			linear-gradient(rgba(255,255,255,.28) 2px, transparent 2px),
+			linear-gradient(90deg, rgba(255,255,255,.28) 2px, transparent 2px);
+	background-size: 100px 100px, 100px 100px, 20px 20px, 20px 20px;
+	background-position: -2px -2px, -2px -2px, -1px -1px, -1px -1px;
+}
+.purple.quadrillage{
+	background-color: purple;
+	background-image:
+			linear-gradient(rgba(255,255,255,.5) 2px, transparent 2px),
+			linear-gradient(90deg, rgba(255,255,255,.5) 2px, transparent 2px),
+			linear-gradient(rgba(255,255,255,.28) 2px, transparent 2px),
+			linear-gradient(90deg, rgba(255,255,255,.28) 2px, transparent 2px);
+	background-size: 100px 100px, 100px 100px, 20px 20px, 20px 20px;
+	background-position: -2px -2px, -2px -2px, -1px -1px, -1px -1px;
+}
+
+
+
+
+
+
+
+
 .green.solid {
 	background: green;
 }

+
+.lightblue.solid {
+	background: lightblue;
+}
+
 .red.solid {

 	background: red;
@ -118,6 +196,13 @@ h1 {
 	background: purple;
 }

+.yellow.solid {
+	background: yellow;
+}
+
+
+
+


 .red.open{
@ -129,6 +214,14 @@ h1 {
 	border: 2px solid green;
 }

+.lightblue.open {
+	border: 2px solid lightblue;
+}
+
+.yellow.open {
+	border: 2px solid yellow;
+}
+
 .purple.open {
 	border: 2px solid purple;
 }
@ -142,6 +235,18 @@ h1 {

 }

+.lightblue.stripped{
+	background: repeating-linear-gradient(-40deg, lightblue, lightblue 5px, white 5px, white 10px);
+	border: 2px solid lightblue;
+
+}
+
+.yellow.stripped{
+	background: repeating-linear-gradient(-40deg, yellow, yellow 5px, white 5px, white 10px);
+	border: 2px solid lightblue;
+
+}
+
 .green.stripped {
 	background: repeating-linear-gradient(-40deg, green, green 5px, white 5px, white 10px);
 	border: 2px solid green;
--- a/HyperSet/vues/images/diamond.svg
+++ b/HyperSet/vues/images/diamond.svg
@ -0,0 +1,15 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="64.000000pt" height="67.000000pt" viewBox="0 0 161.000000 156.000000"
+ preserveAspectRatio="xMidYMid meet">
+<metadata>
+Created by potrace 1.16, written by Peter Selinger 2001-2019
+</metadata>
+<g transform="translate(0.000000,156.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M425 1150 l-370 -370 373 -373 372 -372 372 372 373 373 -370 370
+c-203 203 -372 370 -375 370 -3 0 -172 -167 -375 -370z"/>
+</g>
+</svg>
--- a/HyperSet/vues/images/oval.svg
+++ b/HyperSet/vues/images/oval.svg
@ -0,0 +1,17 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="70.500000pt" height="50.500000pt" viewBox="0 0 201.000000 109.000000"
+ preserveAspectRatio="xMidYMid meet">
+<metadata>
+Created by potrace 1.16, written by Peter Selinger 2001-2019
+</metadata>
+<g transform="translate(0.000000,109.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M440 961 c-85 -27 -131 -55 -186 -113 -58 -59 -84 -105 -109 -193
+-53 -182 43 -398 217 -486 111 -56 140 -59 639 -59 417 0 462 2 530 19 93 24
+153 58 214 120 62 63 100 136 121 228 15 67 15 79 0 143 -39 176 -156 302
+-321 346 -39 11 -163 14 -550 13 -451 0 -505 -2 -555 -18z"/>
+</g>
+</svg>
--- a/HyperSet/vues/images/wave.svg
+++ b/HyperSet/vues/images/wave.svg
@ -0,0 +1,52 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="61.000000pt" height="32.000000pt" viewBox="0 0 308.000000 190.000000"
+ preserveAspectRatio="xMidYMid meet">
+<metadata>
+Created by potrace 1.16, written by Peter Selinger 2001-2019
+</metadata>
+<g transform="translate(0.000000,190.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M2560 1513 c-8 -4 -63 -39 -122 -79 -183 -125 -284 -168 -463 -201
+-150 -27 -267 -7 -458 76 -62 26 -139 56 -172 65 -33 9 -73 21 -90 26 -133 41
+-375 55 -490 29 -152 -34 -261 -98 -342 -201 -61 -77 -123 -182 -123 -208 0
+-11 -10 -43 -22 -72 -21 -49 -23 -68 -22 -258 0 -195 1 -209 26 -288 33 -99
+56 -135 116 -173 37 -23 57 -29 103 -29 64 0 119 25 231 102 183 128 302 170
+483 172 94 1 196 -19 230 -44 15 -12 244 -86 300 -99 80 -17 273 -23 360 -12
+116 15 177 34 300 96 130 64 185 109 267 219 74 99 107 164 144 281 25 80 28
+105 28 225 1 126 -1 139 -28 200 -39 90 -60 116 -119 150 -50 28 -101 37 -137
+23z m124 -48 c53 -37 86 -73 86 -96 0 -12 9 -36 19 -53 21 -35 40 -157 34
+-226 -5 -70 -25 -149 -40 -161 -7 -6 -13 -25 -13 -41 0 -37 -25 -96 -54 -128
+-13 -14 -29 -40 -36 -58 -7 -18 -26 -43 -41 -57 -16 -13 -29 -30 -29 -37 0
+-17 -51 -68 -68 -68 -7 0 -12 -6 -12 -14 0 -18 -48 -49 -66 -42 -8 3 -14 1
+-14 -4 0 -16 -31 -40 -53 -40 -13 0 -30 -9 -40 -21 -11 -12 -25 -18 -36 -14
+-11 3 -25 -3 -36 -15 -14 -15 -26 -19 -43 -15 -16 4 -31 0 -44 -12 -15 -13
+-23 -15 -37 -6 -13 8 -22 7 -36 -4 -11 -8 -30 -11 -43 -8 -12 3 -31 1 -42 -5
+-14 -8 -26 -8 -41 0 -15 9 -24 8 -35 -1 -10 -8 -21 -9 -41 0 -16 6 -37 10 -48
+10 -43 -1 -111 8 -125 16 -8 5 -23 8 -32 7 -10 -2 -28 3 -40 9 -13 7 -31 12
+-40 10 -10 -1 -28 5 -40 13 -12 9 -32 16 -44 16 -12 0 -27 7 -34 15 -7 8 -25
+15 -40 15 -15 0 -33 7 -40 15 -7 8 -27 15 -44 15 -18 0 -37 5 -43 11 -6 6 -40
+11 -77 11 -37 1 -69 5 -72 10 -3 5 -12 4 -20 -3 -8 -7 -27 -9 -49 -5 -21 4
+-35 3 -35 -3 0 -15 -37 -23 -59 -12 -14 8 -20 7 -25 -4 -3 -8 -18 -15 -33 -15
+-15 0 -37 -7 -47 -15 -11 -8 -26 -15 -34 -15 -8 0 -25 -9 -39 -20 -14 -11 -33
+-20 -43 -20 -9 0 -27 -11 -40 -25 -13 -14 -31 -25 -40 -25 -9 0 -26 -14 -38
+-30 -13 -17 -31 -30 -42 -30 -11 0 -20 -5 -20 -10 0 -6 -17 -18 -38 -26 -20
+-9 -44 -20 -53 -25 -34 -16 -110 -1 -143 28 -61 54 -76 77 -76 115 0 20 -7 43
+-15 52 -33 33 -48 133 -43 292 4 128 8 157 26 196 12 24 22 58 22 74 0 32 44
+134 58 134 5 0 17 18 27 41 11 23 34 52 52 66 18 14 35 33 38 43 3 11 14 22
+24 25 11 3 31 17 45 30 15 14 33 25 41 25 8 0 30 9 49 21 19 11 40 18 46 14 6
+-4 16 -2 23 3 13 10 71 22 127 26 19 1 41 5 47 9 7 4 22 3 33 -3 14 -8 26 -8
+41 0 15 8 24 8 34 0 8 -7 26 -9 43 -5 20 4 34 1 44 -8 9 -9 25 -13 41 -10 15
+3 34 0 42 -7 8 -7 22 -10 31 -6 8 3 28 -1 44 -9 16 -8 40 -15 54 -15 14 0 28
+-4 31 -10 3 -5 19 -10 34 -10 15 0 36 -9 45 -19 10 -11 24 -17 32 -14 7 3 27
+-5 43 -16 16 -12 35 -21 43 -21 8 0 23 -7 34 -15 10 -8 31 -15 46 -15 15 0 31
+-7 36 -16 6 -12 17 -15 32 -11 13 3 33 1 44 -6 12 -6 31 -10 43 -8 12 1 31 -3
+42 -8 14 -8 22 -8 27 0 4 6 20 8 40 4 19 -3 40 -2 47 2 6 4 28 9 47 10 59 4
+84 9 114 21 16 7 35 11 42 8 7 -3 18 2 24 10 7 8 25 14 40 14 15 0 33 7 40 15
+6 8 22 17 33 21 12 4 33 15 46 25 13 11 31 19 41 19 9 0 27 11 40 25 13 14 34
+25 47 25 13 0 23 5 23 12 0 18 31 48 49 48 9 0 24 9 33 19 22 26 102 24 142
+-4z"/>
+</g>
+</svg>
--- a/HyperSet/vues/js/Settings.js
+++ b/HyperSet/vues/js/Settings.js
@ -75,22 +75,27 @@ function showExplain(){

 function showGame(){
    document.getElementById('game').style.display='block';
+    document.getElementById('selectModeSet').style.display='none';
 }

 function showGame1(){
    document.getElementById('game1').style.display='block';
+    document.getElementById('selectModeSet').style.display='none';
 }

 function showGame2(){
    document.getElementById('game2').style.display='block';
+    document.getElementById('selectModeSet').style.display='none';

 }
 function showGame3(){
    document.getElementById('game3').style.display='block';
+    document.getElementById('selectModeSet').style.display='none';

 }
 function showGame4(){
    document.getElementById('game4').style.display='block';
+    document.getElementById('selectModeSet').style.display='none';
 }

 function showModeGame(){
--- a/HyperSet/vues/js/set.js
+++ b/HyperSet/vues/js/set.js