diff --git a/ArkitDoushiQi/ArkitDoushiQi/Game/GameScene.swift b/ArkitDoushiQi/ArkitDoushiQi/Game/GameScene.swift index 1816764..80ce17b 100644 --- a/ArkitDoushiQi/ArkitDoushiQi/Game/GameScene.swift +++ b/ArkitDoushiQi/ArkitDoushiQi/Game/GameScene.swift @@ -12,12 +12,8 @@ import SwiftUI class GameScene: SKScene { var isGameOver = false let imageBoard: SKSpriteNode = SKSpriteNode(imageNamed: "board") - var game: Game = try! Game(withRules: ClassicRules(), andPlayer1: HumanPlayer(withName: "Bot1", andId: .player1)!, andPlayer2: RandomPlayer(withName: "Bot2", andId: .player2)!) + var game: Game // = try! Game(withRules: ClassicRules(), andPlayer1: HumanPlayer(withName: "Bot1", andId: .player1)!, andPlayer2: RandomPlayer(withName: "Bot2", andId: .player2)!) - var player1Name: String - var player1Image: Image - var player2Name: String - var player2Image: Image var pieces: [Owner: [Animal: SpriteMoople]] = [ .player1: [.cat: SpriteMoople(nameImage: "catMeeple", couleur: .red), @@ -41,18 +37,12 @@ class GameScene: SKScene { var deplacementPossible: [SKShapeNode] = [] required init?(coder aDecoder: NSCoder) { - self.player1Name = "" - self.player1Image = Image("profil") - self.player2Name = "" - self.player2Image = Image("profil") + self.game = try! Game(withRules: ClassicRules(), andPlayer1: RandomPlayer(withName: "Bot1", andId: .player1)!, andPlayer2: RandomPlayer(withName: "Bot2", andId: .player2)!) super.init(coder: aDecoder) } - override init(size: CGSize) { - self.player1Name = "" - self.player1Image = Image("profil") - self.player2Name = "" - self.player2Image = Image("profil") + init(size: CGSize,game:Game) { + self.game = game super.init(size: size) // -- -- // scaleMode = .aspectFit @@ -69,29 +59,9 @@ class GameScene: SKScene { } displayBoard(board: game.board) - } + - init(size: CGSize, player1Name: String, player1Image: Image, player2Name: String, player2Image: Image) { - self.player1Name = player1Name - self.player1Image = player1Image - self.player2Name = player2Name - self.player2Image = player2Image - super.init(size: size) - - scaleMode = .aspectFit - anchorPoint = CGPoint(x: 0.5, y: 0.5) - imageBoard.zPosition = 0 - self.addChild(imageBoard) - - for c in pieces.flatMap({ $0.value }) { - c.value.refGameScene = self - c.value.zPosition = 2 - self.addChild(c.value) - } - - displayBoard(board: game.board) - } func displayBoard(board: Board) { for ligne in 0..