Skip to content

Fix formula to generate next number #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix formula to generate next number #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Number-Merge-iOS-Game/Game.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,14 @@ struct Game {
@AppStorage("bestScore") var bestScore = 0

var score = 0
var maxNumber = 1
var grids = Array(repeating: Grid(value: 0), count: 25)
var randomGrid = Grid(value: 1)
var isEnd = false

mutating func nextRandomGrid() {
var grid = grids.randomElement()!
grid.value = [grid.value+1, grid.value+1, grid.value+1, grid.value+2].randomElement()!
grid.value = Int.random(in: 1...maxNumber)
randomGrid = grid
}

Expand Down Expand Up @@ -199,6 +200,9 @@ struct Game {

mutating func updateScore(point: Int) {
score += point
if point > maxNumber {
maxNumber = point
}
}

mutating func checkEnd() {
Expand Down