-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Finished GameMechanic logic
- Loading branch information
Showing
8 changed files
with
159 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 29 additions & 0 deletions
29
src/main/kotlin/com/drcorchit/justice/games/GridElement.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| package com.drcorchit.justice.games | ||
|
|
||
| import com.drcorchit.utils.json.getString | ||
| import com.drcorchit.utils.math.Space | ||
| import com.google.gson.JsonObject | ||
|
|
||
| abstract class GridElement(val parent: GridMechanic<*>, val coord: Space.Coordinate) : GameElement { | ||
|
|
||
| protected var info = JsonObject() | ||
|
|
||
| override fun name(): String { | ||
| return coord.toString() | ||
| } | ||
|
|
||
| override fun description(): String { | ||
| return info.getString("description", "No description is available.") | ||
| } | ||
|
|
||
| override fun parent(): GridMechanic<*> { | ||
| return parent | ||
| } | ||
|
|
||
| override fun sync(info: JsonObject) { | ||
| preSync(info) | ||
| this.info = info | ||
| postSync(info) | ||
| touch() | ||
| } | ||
| } |
106 changes: 106 additions & 0 deletions
106
src/main/kotlin/com/drcorchit/justice/games/GridMechanic.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| package com.drcorchit.justice.games | ||
|
|
||
| import com.drcorchit.utils.Logger | ||
| import com.drcorchit.utils.json.getBool | ||
| import com.drcorchit.utils.json.getOrDefault | ||
| import com.drcorchit.utils.math.Grid | ||
| import com.drcorchit.utils.math.Layout | ||
| import com.drcorchit.utils.math.Space | ||
| import com.google.gson.JsonObject | ||
|
|
||
| private val log = Logger.getLogger(GridMechanic::class.java) | ||
|
|
||
| abstract class GridMechanic<T : GridElement>(game: Game, info: JsonObject, date: Long) : GameMechanic<T> { | ||
|
|
||
| init { | ||
| sync(info) | ||
| } | ||
|
|
||
| override val parent: Game = game | ||
|
|
||
| override var lastModified: Long = date | ||
|
|
||
| override var defaultElement: T? = null | ||
|
|
||
| override fun size(): Int { | ||
| return grid.space.size | ||
| } | ||
|
|
||
| override fun has(key: Any): Boolean { | ||
| return if (key is Space.Coordinate) { | ||
| grid.space.within(key.x, key.y) | ||
| } else throw java.lang.IllegalArgumentException("Supplied key is not a valid coordinate") | ||
| } | ||
|
|
||
| override fun get(key: Any): T { | ||
| if (key is Space.Coordinate) { | ||
| return grid.get(key) | ||
| } else { | ||
| throw IllegalArgumentException("Supplied key is not a valid coordinate") | ||
| } | ||
| } | ||
|
|
||
| override fun touch() { | ||
| lastModified = System.currentTimeMillis() | ||
| } | ||
|
|
||
| final override fun sync(info: JsonObject) { | ||
| if (!info.has("elements")) { | ||
| val message = "Mechanic info for $name is missing \"elements\". Found keys: ${info.keySet()}" | ||
| throw IllegalArgumentException(message) | ||
| } | ||
|
|
||
| preSync(info) | ||
|
|
||
| val rows = info.getAsJsonArray("elements").asJsonArray | ||
| if (rows.size() != grid.height) { | ||
| throw IllegalArgumentException("Incorrect grid size; expected ${grid.height} but got ${rows.size()}") | ||
| } | ||
|
|
||
| for ((j, row) in rows.withIndex()) { | ||
| val actualWidth = row.asJsonArray.size() | ||
| if (actualWidth != grid.width) { | ||
| throw java.lang.IllegalArgumentException("Incorrect grid size; expected ${grid.width} but got $actualWidth") | ||
| } | ||
| for ((i, ele) in row.asJsonArray.withIndex()) { | ||
| val eleInfo = ele.asJsonObject | ||
| val element: T = grid[i, j] ?: create(grid.space.coordinate(i, j)) | ||
| element.sync(eleInfo) | ||
| } | ||
| } | ||
|
|
||
| defaultElement = | ||
| if (info.has("default")) { | ||
| val rawKey = info["default"].asJsonPrimitive | ||
| if (rawKey.isString) get(rawKey.asString) | ||
| else if (rawKey.isNumber) get(rawKey.asInt) | ||
| else throw IllegalArgumentException("That type of JsonPrimitive cannot specify a default element") | ||
| } else { | ||
| null | ||
| } | ||
|
|
||
| postSync(info) | ||
| val message = String.format("Synced GridMechanic $name", name) | ||
| log.info("sync", message) | ||
| } | ||
|
|
||
|
|
||
| override fun iterator(): Iterator<T> { | ||
| return grid.iterator() | ||
| } | ||
|
|
||
| //New (non-inherited) functionality | ||
|
|
||
| val grid: Grid<T> by lazy { | ||
| val w = info["width"].asInt | ||
| val h = info["height"].asInt | ||
| val wrapH = info.getBool("wrapHoriz", false) | ||
| val wrapV = info.getBool("wrapVert", false) | ||
| val layout = info.getOrDefault("layout", { Layout.CARTESIAN }, { Layout.valueOf(it.asString) }) | ||
| val space = Space(w, h, wrapH, wrapV, layout) | ||
| Grid(space) | ||
| } | ||
|
|
||
| abstract fun create(coordinate: Space.Coordinate): T | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| package com.drcorchit.justice.games | ||
|
|
||
| interface Syncable<T: Any> { | ||
|
|
||
| //This method is not intended to be called except by sync() | ||
| fun preSync(info: T) | ||
|
|
||
| fun sync(info: T) | ||
|
|
||
| //This method is not intended to be called except by sync() | ||
| fun postSync(info: T) | ||
|
|
||
| } |