-
Notifications
You must be signed in to change notification settings - Fork 0
Roguelike. Поле и управление. #2
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.
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
skychik
wants to merge
9
commits into
master
Choose a base branch
from
level-and-moving-and-client
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
52aedd5
split into two modules
zhvkgj 873430e
add core functionality
zhvkgj cc280a7
add application configuration file
zhvkgj 0b87f1f
fix problems with serialization
zhvkgj 7ce9fc0
add level generation
zhvkgj 2aba3f4
extend configuration data with player position info
zhvkgj 37bf9f8
client movements
skychik 07fddb9
client: map reloads when ended the level; bug fix, refactoring, polis…
skychik fb27b4e
client: small fixes
skychik File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 |
|---|---|---|
| @@ -1,32 +1,9 @@ | ||
| plugins { | ||
| application | ||
| kotlin("jvm") version "1.4.32" | ||
| kotlin("plugin.serialization") version "1.4.32" | ||
| id("io.gitlab.arturbosch.detekt") version "1.16.0-RC2" | ||
| allprojects { | ||
| repositories { | ||
| jcenter() | ||
| } | ||
| } | ||
|
|
||
| group = "ru.ifmo.jb" | ||
| version = "1.0-SNAPSHOT" | ||
| val ktor_version = "1.5.3" | ||
|
|
||
| application { | ||
| mainClass.set("ru.ifmo.sd.MainKt") | ||
| } | ||
|
|
||
| repositories { | ||
| mavenCentral() | ||
| } | ||
|
|
||
| dependencies { | ||
| implementation("io.ktor:ktor-websockets:$ktor_version") | ||
| implementation("io.ktor:ktor-client-cio:$ktor_version") | ||
| implementation("io.ktor:ktor-client-gson:$ktor_version") | ||
| implementation("io.ktor:ktor-gson:$ktor_version") | ||
| implementation("io.ktor:ktor-server-core:$ktor_version") | ||
| implementation("io.ktor:ktor-server-netty:$ktor_version") | ||
| testImplementation("io.ktor:ktor-server-tests:$ktor_version") | ||
| } | ||
|
|
||
| tasks.test { | ||
| useJUnit() | ||
| subprojects { | ||
| version = "1.0" | ||
| } |
This file contains hidden or 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,31 @@ | ||
| plugins { | ||
| java | ||
| application | ||
| kotlin("jvm") version "1.4.21" | ||
| } | ||
|
|
||
| group = "ru.ifmo.jb" | ||
| version = "1.0-SNAPSHOT" | ||
| val ktor_version = "1.5.2" | ||
|
|
||
| repositories { | ||
| mavenCentral() | ||
| } | ||
|
|
||
| dependencies { | ||
| implementation(kotlin("stdlib")) | ||
| implementation("org.jetbrains.kotlin:kotlin-reflect:1.4.32") | ||
| implementation("io.ktor:ktor-client-cio:$ktor_version") | ||
| implementation("io.ktor:ktor-client-gson:$ktor_version") | ||
| implementation("io.ktor:ktor-client-jackson:$ktor_version") | ||
| implementation("io.ktor:ktor-client-serialization:1.5.2") | ||
| implementation(project(":game-server")) | ||
| } | ||
|
|
||
| application { | ||
| mainClass.set("ru.ifmo.sd.MainKt") | ||
| } | ||
|
|
||
| tasks.test { | ||
| useJUnitPlatform() | ||
| } |
This file contains hidden or 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,56 @@ | ||
| package ru.ifmo.sd | ||
|
|
||
| import io.ktor.client.* | ||
| import io.ktor.client.call.* | ||
| import io.ktor.client.engine.cio.* | ||
| import io.ktor.client.features.json.* | ||
| import io.ktor.client.features.json.serializer.* | ||
| import io.ktor.client.request.* | ||
| import io.ktor.client.statement.* | ||
| import io.ktor.http.* | ||
| import ru.ifmo.sd.httpapi.models.LevelConfiguration | ||
| import ru.ifmo.sd.httpapi.models.MoveEventData | ||
| import ru.ifmo.sd.stuff.GUI | ||
| import ru.ifmo.sd.world.configuration.GameConfiguration | ||
| import ru.ifmo.sd.world.configuration.GameConfigurationSerializable | ||
| import ru.ifmo.sd.world.representation.Position | ||
| import ru.ifmo.sd.world.representation.units.GameUnit | ||
| import ru.ifmo.sd.world.representation.units.Player | ||
| import java.awt.EventQueue | ||
|
|
||
|
|
||
| internal var client: HttpClient? = null | ||
|
|
||
| suspend fun main() { | ||
| client = HttpClient(CIO) { | ||
| install(JsonFeature) { | ||
| serializer = KotlinxSerializer() | ||
| } | ||
| } | ||
| val response = makeNewGameConfiguration() | ||
|
|
||
| println(response.deserializeBack()) | ||
|
|
||
| EventQueue.invokeLater { createAndShowGUI(response.deserializeBack()) } | ||
|
|
||
| // client.close() | ||
| } | ||
|
|
||
| internal suspend fun makeNewGameConfiguration(): GameConfigurationSerializable { | ||
| return client!!.post("http://localhost:8080/start") { | ||
| contentType(ContentType.Application.Json) | ||
| body = LevelConfiguration(levelLength = 3, levelWidth = 3) | ||
| } | ||
| } | ||
|
|
||
| internal suspend fun makeMove(newPos: Position, unit: GameUnit = Player(0)) { | ||
| client!!.post<String>("http://localhost:8080/move") { | ||
| contentType(ContentType.Application.Json) | ||
| body = MoveEventData(unit, newPos) | ||
| } | ||
| } | ||
|
|
||
| private fun createAndShowGUI(config: GameConfiguration) { | ||
| val frame = GUI("Roguelike", config) | ||
| frame.isVisible = true | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.