Binome
/
Swift_Ark
2
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

merge louis

Browse Source
pull/25/head
Johan LACHENAL 10 months ago
parent 37926d528f 27aaa6eedc
commit 79ed823763
3 changed files with 122 additions and 92 deletions
Show Stats Download Patch File Download Diff File

BIN
.DS_Store vendored
View File

Binary file not shown.

138
ArkitDoushiQi/ArkitDoushiQi/Game/GameScene.swift
Unescape View File

@ -9,75 +9,99 @@ import Foundation
import SpriteKit import SpriteKit
import DouShouQiModel import DouShouQiModel
class GameScene: SKScene { class GameScene: SKScene {
var isGameOver = false var isGameOver = false
let imageBoard: SKSpriteNode = SKSpriteNode(imageNamed: "board") 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 player1Name: String
var player1Image: UIImage var player1Image: UIImage
var player2Name: String var player2Name: String
var player2Image: UIImage var player2Image: UIImage
var pieces: [Owner: [Animal: SpriteMoople]] = [ var pieces: [Owner: [Animal: SpriteMoople]] = [
.player1: [.cat: SpriteMoople(nameImage: "catMeeple", couleur: .red), .player1: [.cat: SpriteMoople(nameImage: "catMeeple", couleur: .red),
.dog: SpriteMoople(nameImage: "dogMeeple", couleur: .red), .dog: SpriteMoople(nameImage: "dogMeeple", couleur: .red),
.leopard: SpriteMoople(nameImage: "leopardMeeple", couleur: .red), .leopard: SpriteMoople(nameImage: "leopardMeeple", couleur: .red),
.lion: SpriteMoople(nameImage: "lionMeeple", couleur: .red), .lion: SpriteMoople(nameImage: "lionMeeple", couleur: .red),
.rat: SpriteMoople(nameImage: "ratMeeple", couleur: .red), .rat: SpriteMoople(nameImage: "ratMeeple", couleur: .red),
.wolf: SpriteMoople(nameImage: "wolfMeeple", couleur: .red), .wolf: SpriteMoople(nameImage: "wolfMeeple", couleur: .red),
.elephant: SpriteMoople(nameImage: "elephantMeeple", couleur: .red), .elephant: SpriteMoople(nameImage: "elephantMeeple", couleur: .red),
.tiger: SpriteMoople(nameImage: "tigerMeeple", couleur: .red)], .tiger: SpriteMoople(nameImage: "tigerMeeple", couleur: .red)],
.player2: [.cat: SpriteMoople(nameImage: "catMeeple", couleur: .blue), .player2: [.cat: SpriteMoople(nameImage: "catMeeple", couleur: .blue),
.dog: SpriteMoople(nameImage: "dogMeeple", couleur: .blue), .dog: SpriteMoople(nameImage: "dogMeeple", couleur: .blue),
.leopard: SpriteMoople(nameImage: "leopardMeeple", couleur: .blue), .leopard: SpriteMoople(nameImage: "leopardMeeple", couleur: .blue),
.lion: SpriteMoople(nameImage: "lionMeeple", couleur: .blue), .lion: SpriteMoople(nameImage: "lionMeeple", couleur: .blue),
.rat: SpriteMoople(nameImage: "ratMeeple", couleur: .blue), .rat: SpriteMoople(nameImage: "ratMeeple", couleur: .blue),
.wolf: SpriteMoople(nameImage: "wolfMeeple", couleur: .blue), .wolf: SpriteMoople(nameImage: "wolfMeeple", couleur: .blue),
.elephant: SpriteMoople(nameImage: "elephantMeeple", couleur: .blue), .elephant: SpriteMoople(nameImage: "elephantMeeple", couleur: .blue),
.tiger: SpriteMoople(nameImage: "tigerMeeple", couleur: .blue)] .tiger: SpriteMoople(nameImage: "tigerMeeple", couleur: .blue)]
] ]
var deplacementPossible: [SKShapeNode] = [] var deplacementPossible: [SKShapeNode] = []
init(size: CGSize, player1Name: String, player1Image: UIImage, player2Name: String, player2Image: UIImage) { required init?(coder aDecoder: NSCoder) {
self.player1Name = player1Name self.player1Name = ""
self.player1Image = player1Image self.player1Image = UIImage()
self.player2Name = player2Name self.player2Name = ""
self.player2Image = player2Image self.player2Image = UIImage()
super.init(size: size) super.init(coder: aDecoder)
}
scaleMode = .aspectFit
anchorPoint = CGPoint(x: 0.5, y: 0.5)
imageBoard.zPosition = 0
self.addChild(imageBoard)
for c in pieces.flatMap({ $0.value }) { override init(size: CGSize) {
c.value.refGameScene = self self.player1Name = ""
c.value.zPosition = 2 self.player1Image = UIImage()
self.addChild(c.value) self.player2Name = ""
} self.player2Image = UIImage()
super.init(size: size)
// -- -- //
scaleMode = .aspectFit
anchorPoint = CGPoint(x: 0.5, y: 0.5)
imageBoard.zPosition = 0
self.addChild(imageBoard)
// -- -- //
displayBoard(board: game.board) for c in pieces.flatMap({ _,values in return values })
{
c.self.value.refGameScene = self
c.self.value.zPosition = 2
self.addChild(c.self.value)
} }
required init?(coder aDecoder: NSCoder) { displayBoard(board: game.board)
self.player1Name = ""
self.player1Image = UIImage() }
self.player2Name = ""
self.player2Image = UIImage() init(size: CGSize, player1Name: String, player1Image: UIImage, player2Name: String, player2Image: UIImage) {
super.init(coder: aDecoder) 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)
} }
func displayBoard(board: Board) { displayBoard(board: game.board)
for ligne in 0..<board.grid.count { }
for col in 0..<board.grid[ligne].count {
if let piece = board.grid[ligne][col].piece { func displayBoard(board: Board) {
if let element = pieces[piece.owner]?[piece.animal] { for ligne in 0..<board.grid.count {
element.cellPosition = CGPoint(x: ligne, y: col) for col in 0..<board.grid[ligne].count {
} if let piece = board.grid[ligne][col].piece {
if let element = pieces[piece.owner]?[piece.animal] {
element.cellPosition = CGPoint(x: ligne, y: col)
} }
} }
} }
} }
} }
}

40
ArkitDoushiQi/ArkitDoushiQi/Game/GameView.swift
Unescape View File

@ -24,20 +24,24 @@ struct GameView: View {
return scene return scene
} }
@State var msg: String = "Msg" @State var msg: String = ""
var body: some View { var body: some View {
ZStack { ZStack {
Text(msg)
SpriteView(scene: gameScene) SpriteView(scene: gameScene)
.edgesIgnoringSafeArea(.all) .edgesIgnoringSafeArea(.all)
.task { .task {
gameScene.game.addGameStartedListener { board in startGame() } gameScene.game.addGameStartedListener { board in startGame() }
gameScene.game.addGameOverListener { board, result, player in gameOver(result: result) } gameScene.game.addGameOverListener { board, result, player in gameOver(result : result) }
gameScene.game.addGameChangedListener { game in gameChange() } gameScene.game.addGameChangedListener { game in gameChange() }
gameScene.game.addBoardChangedListener { board in boardChange() } gameScene.game.addBoardChangedListener { board in boardChange() }
gameScene.game.addMoveChosenCallbacksListener { board, move, player in moveChose(board: board, move: move, player: player) } gameScene.game.addMoveChosenCallbacksListener { board, move, player in moveChose(board: board, move: move, player: player) }
gameScene.game.addInvalidMoveCallbacksListener { board, move, player, bool in invalidMove(board: board, move: move, player: player, bool: bool) } gameScene.game.addInvalidMoveCallbacksListener { board, move, player, bool in invalidMove(board: board, move: move, player: player, bool: bool) }
gameScene.game.addPieceRemovedListener { _, _, piece in removePiece(piece: piece) } gameScene.game.addPieceRemovedListener { _, _, piece in removePiece(piece: piece) }
gameScene.game.addPlayerNotifiedListener { board, player in gameScene.game.addPlayerNotifiedListener { board, player in
print("Player notif : \(player.id) à toi de jouer ") print("Player notif : \(player.id) à toi de jouer ")
msg = "Player notif : \(player.id) à toi de jouer !" msg = "Player notif : \(player.id) à toi de jouer !"
@ -46,6 +50,7 @@ struct GameView: View {
try! await player.chooseMove(in: board, with: gameScene.game.rules) try! await player.chooseMove(in: board, with: gameScene.game.rules)
} }
} }
try! await gameScene.game.start() try! await gameScene.game.start()
} }
@ -87,32 +92,32 @@ struct GameView: View {
} }
} }
// ------ Listener Methods -------- // // ------ Listener -------- //
func startGame() { func startGame() {
print("Start game !") print("Start game !")
msg = "Start !!" msg = "Start !!"
} }
func gameOver(result: Result) { func gameOver(result : Result) { print("Game over !")
print("Game over !")
msg = "Game over ! " msg = "Game over ! "
switch result { switch result
{
case .winner(let winner, _): case .winner(let winner, _):
switch winner { switch winner {
case .player1: case .player1:
msg += "player 1 wins !" msg = msg + "player 1 wins !"
case .player2: case .player2:
msg += "player 2 wins !" msg = msg + "player 2 wins !"
default: default:
msg += "equality !" msg = msg + "equality !"
} }
default: default:
msg = "Game over !" msg="Game over !"
} }
gameScene.isGameOver = true gameScene.isGameOver = true
actionEndGame(scene: gameScene, message: msg) actionEndGame(scene: gameScene,message: msg)
} }
func gameChange() { func gameChange() {
@ -124,7 +129,8 @@ struct GameView: View {
gameScene.displayBoard(board: gameScene.game.board) gameScene.displayBoard(board: gameScene.game.board)
} }
func moveChose(board: Board, move: Move, player: Player) {} func moveChose(board: Board, move: Move, player: Player) {
}
func invalidMove(board: Board, move: Move, player: Player, bool: Bool) { func invalidMove(board: Board, move: Move, player: Player, bool: Bool) {
if bool { if bool {
@ -138,15 +144,15 @@ struct GameView: View {
print("------------") print("------------")
} }
func removePiece(piece: Piece) { func removePiece(piece:Piece){
print("Remove piece") print("Remove piece")
if let node = gameScene.pieces[piece.owner]?[piece.animal] { if let node = gameScene.pieces[piece.owner]![piece.animal] {
actionRemove(size: gameScene.size, node: node, scene: gameScene) actionRemove(size: gameScene.size, node: node, scene: gameScene)
if let node = gameScene.pieces[piece.owner]?[piece.animal] { print("Remove piece from parent")
print("Remove piece from parent")
}
} }
} }
// ------------------------- //
} }
struct GameView_Previews: PreviewProvider { struct GameView_Previews: PreviewProvider {

Write Preview
Loading…
Cancel
Save