diff --git a/Pendu/Base.lproj/Main.storyboard b/Pendu/Base.lproj/Main.storyboard
index 8edcd760af13dbc69a1ca6aa116c5d3368c5b766..a5c7b58ab0f39e98059fcae669d907a5cbbd0420 100644
--- a/Pendu/Base.lproj/Main.storyboard
+++ b/Pendu/Base.lproj/Main.storyboard
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="vyD-kt-VPW">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
@@ -16,10 +16,6 @@
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
- <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="hqdefault.jpeg" translatesAutoresizingMaskIntoConstraints="NO" id="pv2-ee-Khp">
- <rect key="frame" x="0.0" y="-43" width="414" height="319"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
- </imageView>
<textField opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="iRK-mL-RC3">
<rect key="frame" x="106" y="400" width="184" height="34"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
@@ -51,6 +47,7 @@
<buttonConfiguration key="configuration" style="filled" title="Lancer Partie"/>
<connections>
<action selector="LancerPartie:" destination="BYZ-38-t0r" eventType="touchUpInside" id="ccG-OM-Emx"/>
+ <segue destination="SII-Cn-Tul" kind="show" identifier="DeAccueilAJeu" id="GRR-mn-viL"/>
</connections>
</button>
<segmentedControl opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="NvB-ZN-BTJ">
@@ -74,10 +71,15 @@
<action selector="AfficherClassement:" destination="BYZ-38-t0r" eventType="touchUpInside" id="up5-UE-mBH"/>
</connections>
</button>
+ <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="hqdefault.jpeg" translatesAutoresizingMaskIntoConstraints="NO" id="pv2-ee-Khp">
+ <rect key="frame" x="0.0" y="-43" width="414" height="319"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ </imageView>
</subviews>
<viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
</view>
+ <navigationItem key="navigationItem" id="SCg-aL-F4f"/>
<connections>
<outlet property="choixNiv" destination="NvB-ZN-BTJ" id="fAA-St-woR"/>
<outlet property="choixTheme" destination="LNU-nY-Uyk" id="Fff-Y6-Z8A"/>
@@ -87,13 +89,483 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
</objects>
- <point key="canvasLocation" x="131.8840579710145" y="81.696428571428569"/>
+ <point key="canvasLocation" x="276.81159420289856" y="72.991071428571431"/>
+ </scene>
+ <!--Game View Controller-->
+ <scene sceneID="LqT-Za-AMF">
+ <objects>
+ <viewController id="SII-Cn-Tul" customClass="GameViewController" customModule="Pendu" customModuleProvider="target" sceneMemberID="viewController">
+ <view key="view" contentMode="scaleToFill" id="lA6-ta-b6b">
+ <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <stackView autoresizesSubviews="NO" opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillProportionally" spacing="12" translatesAutoresizingMaskIntoConstraints="NO" id="nPm-hO-jSU">
+ <rect key="frame" x="18" y="674" width="378" height="117"/>
+ <subviews>
+ <stackView opaque="NO" contentMode="scaleToFill" spacing="6" translatesAutoresizingMaskIntoConstraints="NO" id="Lxn-jn-iUp">
+ <rect key="frame" x="0.0" y="0.0" width="378" height="31"/>
+ <subviews>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="K1J-8m-J9K">
+ <rect key="frame" x="0.0" y="0.0" width="37" height="31"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="37" id="nU8-EW-BQp"/>
+ </constraints>
+ <color key="tintColor" systemColor="opaqueSeparatorColor"/>
+ <buttonConfiguration key="configuration" style="filled" title="A">
+ <color key="baseBackgroundColor" systemColor="systemBrownColor"/>
+ </buttonConfiguration>
+ <connections>
+ <action selector="A_Action:" destination="SII-Cn-Tul" eventType="touchUpInside" id="hcG-jZ-rss"/>
+ </connections>
+ </button>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3y4-VD-M0Z">
+ <rect key="frame" x="43" y="0.0" width="36.5" height="31"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="36.5" id="gwE-ee-OW4"/>
+ </constraints>
+ <color key="tintColor" systemColor="opaqueSeparatorColor"/>
+ <state key="normal" title="Button"/>
+ <buttonConfiguration key="configuration" style="filled" title="Z">
+ <color key="baseBackgroundColor" systemColor="systemBrownColor"/>
+ </buttonConfiguration>
+ <connections>
+ <action selector="Z_Action:" destination="SII-Cn-Tul" eventType="touchUpInside" id="yOe-8Z-7Nt"/>
+ </connections>
+ </button>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="A5I-Mg-2Ou">
+ <rect key="frame" x="85.5" y="0.0" width="37" height="31"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="37" id="08g-4b-Pf0"/>
+ </constraints>
+ <color key="tintColor" systemColor="opaqueSeparatorColor"/>
+ <state key="normal" title="Button"/>
+ <buttonConfiguration key="configuration" style="filled" title="E">
+ <color key="baseBackgroundColor" systemColor="systemBrownColor"/>
+ </buttonConfiguration>
+ <connections>
+ <action selector="E_Action:" destination="SII-Cn-Tul" eventType="touchUpInside" id="jrj-uF-0Ak"/>
+ </connections>
+ </button>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zO4-1x-xRr">
+ <rect key="frame" x="128.5" y="0.0" width="36.5" height="31"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="36.5" id="Au1-0z-JiC"/>
+ </constraints>
+ <color key="tintColor" systemColor="opaqueSeparatorColor"/>
+ <state key="normal" title="Button"/>
+ <buttonConfiguration key="configuration" style="filled" title="R">
+ <color key="baseBackgroundColor" systemColor="systemBrownColor"/>
+ </buttonConfiguration>
+ <connections>
+ <action selector="R_Action:" destination="SII-Cn-Tul" eventType="touchUpInside" id="DXV-jd-2iB"/>
+ </connections>
+ </button>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="VI7-Hb-gxf">
+ <rect key="frame" x="171" y="0.0" width="36" height="31"/>
+ <color key="tintColor" systemColor="opaqueSeparatorColor"/>
+ <state key="normal" title="Button"/>
+ <buttonConfiguration key="configuration" style="filled" title="T">
+ <color key="baseBackgroundColor" systemColor="systemBrownColor"/>
+ </buttonConfiguration>
+ <connections>
+ <action selector="T_Action:" destination="SII-Cn-Tul" eventType="touchUpInside" id="y1M-gX-Qy0"/>
+ </connections>
+ </button>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dUl-j1-UPC">
+ <rect key="frame" x="213" y="0.0" width="36.5" height="31"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="36.5" id="wNM-kd-Ozm"/>
+ </constraints>
+ <color key="tintColor" systemColor="opaqueSeparatorColor"/>
+ <state key="normal" title="Button"/>
+ <buttonConfiguration key="configuration" style="filled" title="Y">
+ <color key="baseBackgroundColor" systemColor="systemBrownColor"/>
+ </buttonConfiguration>
+ <connections>
+ <action selector="Y_Action:" destination="SII-Cn-Tul" eventType="touchUpInside" id="3Cx-WL-qxi"/>
+ </connections>
+ </button>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="eT3-eI-h6F">
+ <rect key="frame" x="255.5" y="0.0" width="37" height="31"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="37" id="rQg-Xn-Ap9"/>
+ </constraints>
+ <color key="tintColor" systemColor="opaqueSeparatorColor"/>
+ <state key="normal" title="Button"/>
+ <buttonConfiguration key="configuration" style="filled" title="U">
+ <color key="baseBackgroundColor" systemColor="systemBrownColor"/>
+ </buttonConfiguration>
+ <connections>
+ <action selector="U_Action:" destination="SII-Cn-Tul" eventType="touchUpInside" id="sIQ-1u-Db4"/>
+ </connections>
+ </button>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3Vi-3e-hIm">
+ <rect key="frame" x="298.5" y="0.0" width="36.5" height="31"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="36.5" id="T3K-oO-Awp"/>
+ </constraints>
+ <color key="tintColor" systemColor="opaqueSeparatorColor"/>
+ <state key="normal" title="Button"/>
+ <buttonConfiguration key="configuration" style="filled" title="I">
+ <color key="baseBackgroundColor" systemColor="systemBrownColor"/>
+ </buttonConfiguration>
+ <connections>
+ <action selector="I_Action:" destination="SII-Cn-Tul" eventType="touchUpInside" id="onS-Az-XhG"/>
+ </connections>
+ </button>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dwK-xf-gfo">
+ <rect key="frame" x="341" y="0.0" width="37" height="31"/>
+ <color key="tintColor" systemColor="opaqueSeparatorColor"/>
+ <state key="normal" title="Button"/>
+ <buttonConfiguration key="configuration" style="filled" title="O">
+ <color key="baseBackgroundColor" systemColor="systemBrownColor"/>
+ </buttonConfiguration>
+ <connections>
+ <action selector="O_action:" destination="SII-Cn-Tul" eventType="touchUpInside" id="kip-ky-7Zm"/>
+ </connections>
+ </button>
+ </subviews>
+ <constraints>
+ <constraint firstItem="K1J-8m-J9K" firstAttribute="baseline" secondItem="3y4-VD-M0Z" secondAttribute="firstBaseline" id="9Mq-sP-wDV"/>
+ <constraint firstItem="VI7-Hb-gxf" firstAttribute="centerX" secondItem="Lxn-jn-iUp" secondAttribute="centerX" id="IW0-l5-udR"/>
+ </constraints>
+ </stackView>
+ <stackView opaque="NO" contentMode="scaleToFill" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="iGY-z0-cnq">
+ <rect key="frame" x="0.0" y="43" width="378" height="31"/>
+ <subviews>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="VcP-Ew-YEz">
+ <rect key="frame" x="0.0" y="0.0" width="35" height="31"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="35" id="sUt-Dd-SGf"/>
+ </constraints>
+ <color key="tintColor" systemColor="opaqueSeparatorColor"/>
+ <state key="normal" title="Button"/>
+ <buttonConfiguration key="configuration" style="filled" title="P">
+ <color key="baseBackgroundColor" systemColor="systemBrownColor"/>
+ </buttonConfiguration>
+ <connections>
+ <action selector="P_Action:" destination="SII-Cn-Tul" eventType="touchUpInside" id="UQa-kj-JkQ"/>
+ </connections>
+ </button>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5oN-oV-uOo">
+ <rect key="frame" x="43" y="0.0" width="35" height="31"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="35" id="vyp-KO-f6t"/>
+ </constraints>
+ <color key="tintColor" systemColor="opaqueSeparatorColor"/>
+ <state key="normal" title="Button"/>
+ <buttonConfiguration key="configuration" style="filled" title="Q">
+ <color key="baseBackgroundColor" systemColor="systemBrownColor"/>
+ </buttonConfiguration>
+ <connections>
+ <action selector="Q_Action:" destination="SII-Cn-Tul" eventType="touchUpInside" id="pah-NY-goD"/>
+ </connections>
+ </button>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pbT-fO-DaV">
+ <rect key="frame" x="86" y="0.0" width="34" height="31"/>
+ <color key="tintColor" systemColor="opaqueSeparatorColor"/>
+ <state key="normal" title="Button"/>
+ <buttonConfiguration key="configuration" style="filled" title="S">
+ <color key="baseBackgroundColor" systemColor="systemBrownColor"/>
+ </buttonConfiguration>
+ <connections>
+ <action selector="S_Action:" destination="SII-Cn-Tul" eventType="touchUpInside" id="exH-JQ-HeM"/>
+ </connections>
+ </button>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9ob-tq-FGc">
+ <rect key="frame" x="128" y="0.0" width="35" height="31"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="35" id="uas-qT-m7D"/>
+ </constraints>
+ <color key="tintColor" systemColor="opaqueSeparatorColor"/>
+ <state key="normal" title="Button"/>
+ <buttonConfiguration key="configuration" style="filled" title="D">
+ <color key="baseBackgroundColor" systemColor="systemBrownColor"/>
+ </buttonConfiguration>
+ <connections>
+ <action selector="D_Action:" destination="SII-Cn-Tul" eventType="touchUpInside" id="maK-zg-5ac"/>
+ </connections>
+ </button>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xVA-v4-SeY">
+ <rect key="frame" x="171" y="0.0" width="36" height="31"/>
+ <color key="tintColor" systemColor="opaqueSeparatorColor"/>
+ <state key="normal" title="Button"/>
+ <buttonConfiguration key="configuration" style="filled" title="F">
+ <color key="baseBackgroundColor" systemColor="systemBrownColor"/>
+ </buttonConfiguration>
+ <connections>
+ <action selector="F_Action:" destination="SII-Cn-Tul" eventType="touchUpInside" id="21T-nl-gQv"/>
+ </connections>
+ </button>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="lFV-Ph-7oH">
+ <rect key="frame" x="215" y="0.0" width="35" height="31"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="35" id="PAi-d0-m1T"/>
+ </constraints>
+ <color key="tintColor" systemColor="opaqueSeparatorColor"/>
+ <state key="normal" title="Button"/>
+ <buttonConfiguration key="configuration" style="filled" title="G">
+ <color key="baseBackgroundColor" systemColor="systemBrownColor"/>
+ </buttonConfiguration>
+ <connections>
+ <action selector="G_Action:" destination="SII-Cn-Tul" eventType="touchUpInside" id="C4d-sS-uyb"/>
+ </connections>
+ </button>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gfF-8E-ztz">
+ <rect key="frame" x="258" y="0.0" width="35" height="31"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="35" id="wzM-tZ-pzw"/>
+ </constraints>
+ <color key="tintColor" systemColor="opaqueSeparatorColor"/>
+ <state key="normal" title="Button"/>
+ <buttonConfiguration key="configuration" style="filled" title="H">
+ <color key="baseBackgroundColor" systemColor="systemBrownColor"/>
+ </buttonConfiguration>
+ <connections>
+ <action selector="H_Action:" destination="SII-Cn-Tul" eventType="touchUpInside" id="yfb-FP-5oM"/>
+ </connections>
+ </button>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9Hg-a5-lyX">
+ <rect key="frame" x="301" y="0.0" width="35" height="31"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="35" id="3eq-2n-Zh7"/>
+ </constraints>
+ <color key="tintColor" systemColor="opaqueSeparatorColor"/>
+ <state key="normal" title="Button"/>
+ <buttonConfiguration key="configuration" style="filled" title="J">
+ <color key="baseBackgroundColor" systemColor="systemBrownColor"/>
+ </buttonConfiguration>
+ <connections>
+ <action selector="J_Action:" destination="SII-Cn-Tul" eventType="touchUpInside" id="bGT-pq-EGZ"/>
+ </connections>
+ </button>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="SRC-kg-I9t">
+ <rect key="frame" x="344" y="0.0" width="34" height="31"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="34" id="Fzp-gB-C60"/>
+ </constraints>
+ <color key="tintColor" systemColor="opaqueSeparatorColor"/>
+ <state key="normal" title="Button"/>
+ <buttonConfiguration key="configuration" style="filled" title="K">
+ <color key="baseBackgroundColor" systemColor="systemBrownColor"/>
+ </buttonConfiguration>
+ <connections>
+ <action selector="K_Action:" destination="SII-Cn-Tul" eventType="touchUpInside" id="3ea-Kk-b5R"/>
+ </connections>
+ </button>
+ </subviews>
+ <constraints>
+ <constraint firstItem="xVA-v4-SeY" firstAttribute="centerX" secondItem="iGY-z0-cnq" secondAttribute="centerX" id="35V-U4-Rzg"/>
+ <constraint firstItem="9ob-tq-FGc" firstAttribute="leading" secondItem="pbT-fO-DaV" secondAttribute="trailing" constant="8" id="iMq-Tq-nu2"/>
+ <constraint firstItem="VcP-Ew-YEz" firstAttribute="baseline" secondItem="5oN-oV-uOo" secondAttribute="firstBaseline" id="y0Q-Ny-vsi"/>
+ </constraints>
+ </stackView>
+ <stackView opaque="NO" contentMode="scaleToFill" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="2hT-k9-3se">
+ <rect key="frame" x="0.0" y="86" width="378" height="31"/>
+ <subviews>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CiT-Ul-IXe">
+ <rect key="frame" x="0.0" y="0.0" width="40.5" height="31"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="40.5" id="hAd-XB-8jO"/>
+ </constraints>
+ <color key="tintColor" systemColor="opaqueSeparatorColor"/>
+ <state key="normal" title="Button"/>
+ <buttonConfiguration key="configuration" style="filled" title="L">
+ <color key="baseBackgroundColor" systemColor="systemBrownColor"/>
+ </buttonConfiguration>
+ <connections>
+ <action selector="L_Action:" destination="SII-Cn-Tul" eventType="touchUpInside" id="qL4-Ih-7GP"/>
+ </connections>
+ </button>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="him-pb-hSO">
+ <rect key="frame" x="48.5" y="0.0" width="40" height="31"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="40" id="Sv9-mP-1Lk"/>
+ </constraints>
+ <color key="tintColor" systemColor="opaqueSeparatorColor"/>
+ <state key="normal" title="Button"/>
+ <buttonConfiguration key="configuration" style="filled" title="M">
+ <color key="baseBackgroundColor" systemColor="systemBrownColor"/>
+ </buttonConfiguration>
+ <connections>
+ <action selector="M_Action:" destination="SII-Cn-Tul" eventType="touchUpInside" id="Rbj-3R-lQ8"/>
+ </connections>
+ </button>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="f86-Pv-8XU">
+ <rect key="frame" x="96.5" y="0.0" width="40.5" height="31"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="40.5" id="y8F-zR-SoZ"/>
+ </constraints>
+ <color key="tintColor" systemColor="opaqueSeparatorColor"/>
+ <state key="normal" title="Button"/>
+ <buttonConfiguration key="configuration" style="filled" title="W">
+ <color key="baseBackgroundColor" systemColor="systemBrownColor"/>
+ </buttonConfiguration>
+ <connections>
+ <action selector="W_Action:" destination="SII-Cn-Tul" eventType="touchUpInside" id="eKF-hD-n9A"/>
+ </connections>
+ </button>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="p6W-Zy-IJN">
+ <rect key="frame" x="145" y="0.0" width="40" height="31"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="40" id="UNr-Ew-RJI"/>
+ </constraints>
+ <color key="tintColor" systemColor="opaqueSeparatorColor"/>
+ <state key="normal" title="Button"/>
+ <buttonConfiguration key="configuration" style="filled" title="X">
+ <color key="baseBackgroundColor" systemColor="systemBrownColor"/>
+ </buttonConfiguration>
+ <connections>
+ <action selector="X_Action:" destination="SII-Cn-Tul" eventType="touchUpInside" id="SSD-RT-NyK"/>
+ </connections>
+ </button>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="f5g-Vp-Dkm">
+ <rect key="frame" x="193" y="0.0" width="40.5" height="31"/>
+ <color key="tintColor" systemColor="opaqueSeparatorColor"/>
+ <state key="normal" title="Button"/>
+ <buttonConfiguration key="configuration" style="filled" title="C">
+ <color key="baseBackgroundColor" systemColor="systemBrownColor"/>
+ </buttonConfiguration>
+ <connections>
+ <action selector="C_Action:" destination="SII-Cn-Tul" eventType="touchUpInside" id="a46-Ll-6FM"/>
+ </connections>
+ </button>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wg8-a4-KPy">
+ <rect key="frame" x="241.5" y="0.0" width="40" height="31"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="40" id="1G0-6C-igj"/>
+ </constraints>
+ <color key="tintColor" systemColor="opaqueSeparatorColor"/>
+ <state key="normal" title="Button"/>
+ <buttonConfiguration key="configuration" style="filled" title="V">
+ <color key="baseBackgroundColor" systemColor="systemBrownColor"/>
+ </buttonConfiguration>
+ <connections>
+ <action selector="V_Action:" destination="SII-Cn-Tul" eventType="touchUpInside" id="0Dn-We-fJ3"/>
+ </connections>
+ </button>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ErA-af-qSV">
+ <rect key="frame" x="289.5" y="0.0" width="40" height="31"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="40" id="eeV-Eq-QWY"/>
+ </constraints>
+ <color key="tintColor" systemColor="opaqueSeparatorColor"/>
+ <state key="normal" title="Button"/>
+ <buttonConfiguration key="configuration" style="filled" title="B">
+ <color key="baseBackgroundColor" systemColor="systemBrownColor"/>
+ </buttonConfiguration>
+ <connections>
+ <action selector="B_Action:" destination="SII-Cn-Tul" eventType="touchUpInside" id="Uy9-Fg-izd"/>
+ </connections>
+ </button>
+ <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="JoJ-to-kUH">
+ <rect key="frame" x="337.5" y="0.0" width="40.5" height="31"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="40.5" id="kz1-9t-uCY"/>
+ </constraints>
+ <color key="tintColor" systemColor="opaqueSeparatorColor"/>
+ <state key="normal" title="Button"/>
+ <buttonConfiguration key="configuration" style="filled" title="N">
+ <color key="baseBackgroundColor" systemColor="systemBrownColor"/>
+ </buttonConfiguration>
+ <connections>
+ <action selector="N_Action:" destination="SII-Cn-Tul" eventType="touchUpInside" id="iaq-mM-S5B"/>
+ </connections>
+ </button>
+ </subviews>
+ <constraints>
+ <constraint firstItem="ErA-af-qSV" firstAttribute="baseline" secondItem="wg8-a4-KPy" secondAttribute="firstBaseline" id="Jvt-zT-kdA"/>
+ </constraints>
+ </stackView>
+ </subviews>
+ <rect key="contentStretch" x="1" y="1" width="1" height="1"/>
+ </stackView>
+ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YK4-Bp-YJg">
+ <rect key="frame" x="20" y="606" width="376" height="60"/>
+ <fontDescription key="fontDescription" type="system" pointSize="30"/>
+ <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+ <nil key="highlightedColor"/>
+ </label>
+ </subviews>
+ <viewLayoutGuide key="safeArea" id="uHe-Zh-6OV"/>
+ <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+ <color key="tintColor" systemColor="opaqueSeparatorColor"/>
+ <constraints>
+ <constraint firstItem="YK4-Bp-YJg" firstAttribute="top" secondItem="uHe-Zh-6OV" secondAttribute="top" constant="518" id="0RM-e8-dUR"/>
+ <constraint firstItem="YK4-Bp-YJg" firstAttribute="leading" secondItem="lA6-ta-b6b" secondAttribute="leadingMargin" id="8V5-R5-D98"/>
+ <constraint firstItem="nPm-hO-jSU" firstAttribute="leading" secondItem="uHe-Zh-6OV" secondAttribute="leading" constant="18" id="Hxn-xs-CA2"/>
+ <constraint firstItem="nPm-hO-jSU" firstAttribute="top" secondItem="uHe-Zh-6OV" secondAttribute="top" constant="586" id="RCq-Wo-NQ6"/>
+ <constraint firstItem="YK4-Bp-YJg" firstAttribute="trailing" secondItem="nPm-hO-jSU" secondAttribute="trailing" id="gQQ-EB-9ZR"/>
+ <constraint firstItem="nPm-hO-jSU" firstAttribute="top" secondItem="YK4-Bp-YJg" secondAttribute="bottom" constant="8" id="gd4-GV-Rbc"/>
+ <constraint firstItem="nPm-hO-jSU" firstAttribute="centerX" secondItem="lA6-ta-b6b" secondAttribute="centerX" id="gx6-Zs-yWe"/>
+ </constraints>
+ </view>
+ <toolbarItems/>
+ <navigationItem key="navigationItem" id="rMD-mm-sNW"/>
+ <simulatedToolbarMetrics key="simulatedBottomBarMetrics"/>
+ <connections>
+ <outlet property="A_Button" destination="K1J-8m-J9K" id="b72-ap-I8X"/>
+ <outlet property="B_Button" destination="ErA-af-qSV" id="sVJ-az-XrD"/>
+ <outlet property="C_Button" destination="f5g-Vp-Dkm" id="B7N-b4-LJh"/>
+ <outlet property="D_Button" destination="9ob-tq-FGc" id="ovj-R9-Yhs"/>
+ <outlet property="E_Button" destination="A5I-Mg-2Ou" id="AYw-l2-lwb"/>
+ <outlet property="F_Button" destination="xVA-v4-SeY" id="ysb-Qp-ajt"/>
+ <outlet property="G_Button" destination="lFV-Ph-7oH" id="EQJ-GS-HqG"/>
+ <outlet property="H_Button" destination="gfF-8E-ztz" id="LuD-wg-xtr"/>
+ <outlet property="I_Button" destination="3Vi-3e-hIm" id="DkD-8T-Pkx"/>
+ <outlet property="J_Button" destination="9Hg-a5-lyX" id="gno-5P-QaH"/>
+ <outlet property="K_Button" destination="SRC-kg-I9t" id="yMS-Rw-7Iy"/>
+ <outlet property="L_Button" destination="CiT-Ul-IXe" id="ixN-Ye-JES"/>
+ <outlet property="M_Button" destination="him-pb-hSO" id="h3H-gE-moS"/>
+ <outlet property="N_Button" destination="JoJ-to-kUH" id="VE3-pe-git"/>
+ <outlet property="O_Button" destination="dwK-xf-gfo" id="Eaz-Dn-zdY"/>
+ <outlet property="P_Button" destination="VcP-Ew-YEz" id="T1d-wE-m9L"/>
+ <outlet property="Q_Button" destination="5oN-oV-uOo" id="Yk3-uX-vad"/>
+ <outlet property="R_Button" destination="zO4-1x-xRr" id="74S-OH-hIJ"/>
+ <outlet property="S_Button" destination="pbT-fO-DaV" id="ASE-IC-U8z"/>
+ <outlet property="T_Button" destination="VI7-Hb-gxf" id="D7R-PA-EbJ"/>
+ <outlet property="U_Button" destination="eT3-eI-h6F" id="ff2-01-NDL"/>
+ <outlet property="V_Button" destination="wg8-a4-KPy" id="G1k-LX-QOv"/>
+ <outlet property="W_Button" destination="f86-Pv-8XU" id="iCh-hi-XyI"/>
+ <outlet property="X_Button" destination="p6W-Zy-IJN" id="Sxv-Xl-26y"/>
+ <outlet property="Y_Button" destination="dUl-j1-UPC" id="iQo-bR-ql3"/>
+ <outlet property="Z_Button" destination="3y4-VD-M0Z" id="kgJ-ua-BLx"/>
+ <outlet property="wordLabel" destination="YK4-Bp-YJg" id="V2y-ee-WzG"/>
+ </connections>
+ </viewController>
+ <placeholder placeholderIdentifier="IBFirstResponder" id="gAK-xT-J7X" sceneMemberID="firstResponder"/>
+ </objects>
+ <point key="canvasLocation" x="1113.0434782608697" y="72.991071428571431"/>
+ </scene>
+ <!--Navigation Controller-->
+ <scene sceneID="v2s-Cx-8QZ">
+ <objects>
+ <navigationController automaticallyAdjustsScrollViewInsets="NO" id="vyD-kt-VPW" sceneMemberID="viewController">
+ <toolbarItems/>
+ <navigationBar key="navigationBar" contentMode="scaleToFill" id="HKI-s4-KxF">
+ <rect key="frame" x="0.0" y="44" width="414" height="44"/>
+ <autoresizingMask key="autoresizingMask"/>
+ </navigationBar>
+ <nil name="viewControllers"/>
+ <connections>
+ <segue destination="BYZ-38-t0r" kind="relationship" relationship="rootViewController" id="kxc-qu-D2L"/>
+ </connections>
+ </navigationController>
+ <placeholder placeholderIdentifier="IBFirstResponder" id="4bE-u3-5kP" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+ </objects>
+ <point key="canvasLocation" x="-633.33333333333337" y="72.991071428571431"/>
</scene>
</scenes>
<resources>
<image name="hqdefault.jpeg" width="480" height="360"/>
+ <systemColor name="opaqueSeparatorColor">
+ <color red="0.77647058823529413" green="0.77647058823529413" blue="0.78431372549019607" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ </systemColor>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
+ <systemColor name="systemBrownColor">
+ <color red="0.63529411764705879" green="0.51764705882352946" blue="0.36862745098039218" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ </systemColor>
</resources>
</document>
diff --git a/Pendu/GameViewController.swift b/Pendu/GameViewController.swift
index 92909b80beb84117a6f619874da5908419a8026a..947bd311b0721a9094e8a7934c3c649ebe6c4475 100644
--- a/Pendu/GameViewController.swift
+++ b/Pendu/GameViewController.swift
@@ -31,6 +31,7 @@ extension UIView {
class GameViewController: UIViewController {
let mainstoryboard = UIStoryboard(name: "Game", bundle: nil)
+ var wordToGuess : String = ""
@IBOutlet weak var wordLabel: UILabel!
@@ -154,14 +155,13 @@ class GameViewController: UIViewController {
imageView.frame = CGRect(x: 50, y: 250, width: 250, height: 250)
view.addSubview(imageView)
}
-
- let wordToGess = "PENDU"
+
var currentWordState = ""
override func viewDidLoad() {
view.addBackground()
super.viewDidLoad()
-
+ print(wordToGuess)
initializeWordState()
updateWordLabel()
@@ -176,7 +176,7 @@ class GameViewController: UIViewController {
}
func initializeWordState() {
- for _ in wordToGess {
+ for _ in wordToGuess {
currentWordState += "_"
}
}
@@ -187,11 +187,11 @@ class GameViewController: UIViewController {
func guessLetter(_ letter:Character) {
let guessedLetter = letter.uppercased()
- guard wordToGess.contains(guessedLetter)
+ guard wordToGuess.contains(guessedLetter)
else {
return
}
- for (index, char) in wordToGess.enumerated() {
+ for (index, char) in wordToGuess.enumerated() {
if char.uppercased() == guessedLetter {
let startIndex = currentWordState.startIndex
let offsetIndex = currentWordState.index(startIndex, offsetBy: index)
diff --git a/Pendu/ViewController.swift b/Pendu/ViewController.swift
index 96f8673eb4941f734bc7d287ce59e01a9a073813..1a822c61b772055ff1c59c15f889dea3e0ec3c79 100644
--- a/Pendu/ViewController.swift
+++ b/Pendu/ViewController.swift
@@ -7,15 +7,23 @@ class ViewController: UIViewController, UIPickerViewDataSource, UIPickerViewDele
@IBOutlet weak var choixTheme: UIPickerView!
@IBOutlet weak var choixNiv: UISegmentedControl!
+ var wordToGuess : String = ""
let pickerData = ["Animals", "Sports", "Food", "Cities", "Colors"]
let gameEngine : GameEngine = GameEngine()
+
override func viewDidLoad() {
super.viewDidLoad()
choixTheme.dataSource = self
choixTheme.delegate = self
}
-
+ override func prepare(for segue: UIStoryboardSegue, sender: Any?){
+ if segue.identifier == "DeAccueilAJeu" {
+ let destinationVC = segue.destination as! GameViewController
+ destinationVC.wordToGuess = wordToGuess
+
+ }
+ }
@IBAction func LancerPartie(_ sender: Any) {
guard let pseudo = pseudoinput.text else {
@@ -36,8 +44,8 @@ class ViewController: UIViewController, UIPickerViewDataSource, UIPickerViewDele
// Ajoutez votre code supplémentaire ici
let difficulty = niveau ?? ""
- let word = gameEngine.WordToGuess(theme: theme, difficulty: difficulty)
- print("Mot à deviner: \(word)")
+ wordToGuess = gameEngine.WordToGuess(theme: theme, difficulty: difficulty)
+ print("Mot à deviner: \(wordToGuess)")
}
// MARK: - UIPickerViewDataSource