From 6e8b64feeffe73d580b5c180a05e399dd42caceb Mon Sep 17 00:00:00 2001 From: Evgeniy Alekseev Date: Mon, 4 Nov 2019 15:19:18 +0300 Subject: [PATCH] some improvements in loot system --- .../db/migration/postgresql/V2_0__Migrate_rings.sql | 5 +++++ .../db/migration/sqlite/V2_0__Migrate_rings.sql | 5 +++++ src/main/scala/me/arcanis/ffxivbis/Application.scala | 4 ++-- .../scala/me/arcanis/ffxivbis/http/AriyalaHelper.scala | 2 +- .../scala/me/arcanis/ffxivbis/http/Authorization.scala | 2 +- .../me/arcanis/ffxivbis/http/api/v1/BiSEndpoint.scala | 9 ++++----- .../me/arcanis/ffxivbis/http/api/v1/LootEndpoint.scala | 8 ++++---- .../me/arcanis/ffxivbis/http/api/v1/PlayerEndpoint.scala | 8 ++++---- .../me/arcanis/ffxivbis/http/api/v1/UserEndpoint.scala | 8 ++++---- .../me/arcanis/ffxivbis/http/view/BasePartyView.scala | 3 ++- .../scala/me/arcanis/ffxivbis/http/view/BiSView.scala | 3 ++- .../scala/me/arcanis/ffxivbis/http/view/IndexView.scala | 5 +++-- .../me/arcanis/ffxivbis/http/view/LootSuggestView.scala | 3 ++- .../scala/me/arcanis/ffxivbis/http/view/LootView.scala | 3 ++- .../scala/me/arcanis/ffxivbis/http/view/PlayerView.scala | 5 +++-- .../scala/me/arcanis/ffxivbis/http/view/UserView.scala | 3 ++- src/main/scala/me/arcanis/ffxivbis/models/BiS.scala | 8 ++++---- src/main/scala/me/arcanis/ffxivbis/models/Piece.scala | 7 +++---- src/main/scala/me/arcanis/ffxivbis/service/Ariyala.scala | 6 +++--- .../scala/me/arcanis/ffxivbis/storage/BiSProfile.scala | 2 +- .../me/arcanis/ffxivbis/storage/PlayersProfile.scala | 1 - src/test/scala/me/arcanis/ffxivbis/Fixtures.scala | 8 ++++---- 22 files changed, 61 insertions(+), 47 deletions(-) create mode 100644 src/main/resources/db/migration/postgresql/V2_0__Migrate_rings.sql create mode 100644 src/main/resources/db/migration/sqlite/V2_0__Migrate_rings.sql diff --git a/src/main/resources/db/migration/postgresql/V2_0__Migrate_rings.sql b/src/main/resources/db/migration/postgresql/V2_0__Migrate_rings.sql new file mode 100644 index 0000000..eb14491 --- /dev/null +++ b/src/main/resources/db/migration/postgresql/V2_0__Migrate_rings.sql @@ -0,0 +1,5 @@ +update loot set piece = 'left ring' where piece = 'leftRing'; +update loot set piece = 'right ring' where piece = 'rightRing'; + +update bis set piece = 'left ring' where piece = 'leftRing'; +update bis set piece = 'right ring' where piece = 'rightRing'; \ No newline at end of file diff --git a/src/main/resources/db/migration/sqlite/V2_0__Migrate_rings.sql b/src/main/resources/db/migration/sqlite/V2_0__Migrate_rings.sql new file mode 100644 index 0000000..eb14491 --- /dev/null +++ b/src/main/resources/db/migration/sqlite/V2_0__Migrate_rings.sql @@ -0,0 +1,5 @@ +update loot set piece = 'left ring' where piece = 'leftRing'; +update loot set piece = 'right ring' where piece = 'rightRing'; + +update bis set piece = 'left ring' where piece = 'leftRing'; +update bis set piece = 'right ring' where piece = 'rightRing'; \ No newline at end of file diff --git a/src/main/scala/me/arcanis/ffxivbis/Application.scala b/src/main/scala/me/arcanis/ffxivbis/Application.scala index 98588ea..38f058f 100644 --- a/src/main/scala/me/arcanis/ffxivbis/Application.scala +++ b/src/main/scala/me/arcanis/ffxivbis/Application.scala @@ -13,12 +13,12 @@ import akka.http.scaladsl.Http import akka.stream.ActorMaterializer import com.typesafe.scalalogging.StrictLogging import me.arcanis.ffxivbis.http.RootEndpoint -import me.arcanis.ffxivbis.service.{Ariyala, PartyService} import me.arcanis.ffxivbis.service.impl.DatabaseImpl +import me.arcanis.ffxivbis.service.{Ariyala, PartyService} import me.arcanis.ffxivbis.storage.Migration -import scala.concurrent.{Await, ExecutionContext} import scala.concurrent.duration.Duration +import scala.concurrent.{Await, ExecutionContext} import scala.util.{Failure, Success} class Application extends Actor with StrictLogging { diff --git a/src/main/scala/me/arcanis/ffxivbis/http/AriyalaHelper.scala b/src/main/scala/me/arcanis/ffxivbis/http/AriyalaHelper.scala index bfb19da..2304f48 100644 --- a/src/main/scala/me/arcanis/ffxivbis/http/AriyalaHelper.scala +++ b/src/main/scala/me/arcanis/ffxivbis/http/AriyalaHelper.scala @@ -11,7 +11,7 @@ package me.arcanis.ffxivbis.http import akka.actor.ActorRef import akka.pattern.ask import akka.util.Timeout -import me.arcanis.ffxivbis.models.{BiS, Job, Piece} +import me.arcanis.ffxivbis.models.{BiS, Job} import me.arcanis.ffxivbis.service.Ariyala import scala.concurrent.{ExecutionContext, Future} diff --git a/src/main/scala/me/arcanis/ffxivbis/http/Authorization.scala b/src/main/scala/me/arcanis/ffxivbis/http/Authorization.scala index 94e0222..6c21cda 100644 --- a/src/main/scala/me/arcanis/ffxivbis/http/Authorization.scala +++ b/src/main/scala/me/arcanis/ffxivbis/http/Authorization.scala @@ -11,8 +11,8 @@ package me.arcanis.ffxivbis.http import akka.actor.ActorRef import akka.http.scaladsl.model.headers._ import akka.http.scaladsl.server.AuthenticationFailedRejection._ -import akka.http.scaladsl.server._ import akka.http.scaladsl.server.Directives._ +import akka.http.scaladsl.server._ import akka.pattern.ask import akka.util.Timeout import me.arcanis.ffxivbis.models.{Permission, User} diff --git a/src/main/scala/me/arcanis/ffxivbis/http/api/v1/BiSEndpoint.scala b/src/main/scala/me/arcanis/ffxivbis/http/api/v1/BiSEndpoint.scala index 214df6f..60bbe3b 100644 --- a/src/main/scala/me/arcanis/ffxivbis/http/api/v1/BiSEndpoint.scala +++ b/src/main/scala/me/arcanis/ffxivbis/http/api/v1/BiSEndpoint.scala @@ -13,16 +13,15 @@ import akka.http.scaladsl.model.{HttpEntity, StatusCodes} import akka.http.scaladsl.server.Directives._ import akka.http.scaladsl.server._ import akka.util.Timeout -import com.typesafe.scalalogging.StrictLogging import io.swagger.v3.oas.annotations.enums.ParameterIn import io.swagger.v3.oas.annotations.media.{ArraySchema, Content, Schema} -import io.swagger.v3.oas.annotations.responses.ApiResponse -import io.swagger.v3.oas.annotations.{Operation, Parameter} import io.swagger.v3.oas.annotations.parameters.RequestBody +import io.swagger.v3.oas.annotations.responses.ApiResponse import io.swagger.v3.oas.annotations.security.SecurityRequirement -import javax.ws.rs.{Consumes, GET, POST, PUT, Path, Produces} -import me.arcanis.ffxivbis.http.{Authorization, BiSHelper} +import io.swagger.v3.oas.annotations.{Operation, Parameter} +import javax.ws.rs._ import me.arcanis.ffxivbis.http.api.v1.json._ +import me.arcanis.ffxivbis.http.{Authorization, BiSHelper} import me.arcanis.ffxivbis.models.PlayerId import scala.util.{Failure, Success} diff --git a/src/main/scala/me/arcanis/ffxivbis/http/api/v1/LootEndpoint.scala b/src/main/scala/me/arcanis/ffxivbis/http/api/v1/LootEndpoint.scala index 1f7db4c..76d5566 100644 --- a/src/main/scala/me/arcanis/ffxivbis/http/api/v1/LootEndpoint.scala +++ b/src/main/scala/me/arcanis/ffxivbis/http/api/v1/LootEndpoint.scala @@ -15,13 +15,13 @@ import akka.http.scaladsl.server._ import akka.util.Timeout import io.swagger.v3.oas.annotations.enums.ParameterIn import io.swagger.v3.oas.annotations.media.{ArraySchema, Content, Schema} -import io.swagger.v3.oas.annotations.responses.ApiResponse -import io.swagger.v3.oas.annotations.{Operation, Parameter} import io.swagger.v3.oas.annotations.parameters.RequestBody +import io.swagger.v3.oas.annotations.responses.ApiResponse import io.swagger.v3.oas.annotations.security.SecurityRequirement -import javax.ws.rs.{Consumes, GET, POST, PUT, Path, Produces} -import me.arcanis.ffxivbis.http.{Authorization, LootHelper} +import io.swagger.v3.oas.annotations.{Operation, Parameter} +import javax.ws.rs._ import me.arcanis.ffxivbis.http.api.v1.json._ +import me.arcanis.ffxivbis.http.{Authorization, LootHelper} import me.arcanis.ffxivbis.models.PlayerId import scala.util.{Failure, Success} diff --git a/src/main/scala/me/arcanis/ffxivbis/http/api/v1/PlayerEndpoint.scala b/src/main/scala/me/arcanis/ffxivbis/http/api/v1/PlayerEndpoint.scala index 75bfeb3..12f9749 100644 --- a/src/main/scala/me/arcanis/ffxivbis/http/api/v1/PlayerEndpoint.scala +++ b/src/main/scala/me/arcanis/ffxivbis/http/api/v1/PlayerEndpoint.scala @@ -15,13 +15,13 @@ import akka.http.scaladsl.server._ import akka.util.Timeout import io.swagger.v3.oas.annotations.enums.ParameterIn import io.swagger.v3.oas.annotations.media.{ArraySchema, Content, Schema} -import io.swagger.v3.oas.annotations.responses.ApiResponse -import io.swagger.v3.oas.annotations.{Operation, Parameter} import io.swagger.v3.oas.annotations.parameters.RequestBody +import io.swagger.v3.oas.annotations.responses.ApiResponse import io.swagger.v3.oas.annotations.security.SecurityRequirement -import javax.ws.rs.{Consumes, GET, POST, Path, Produces} -import me.arcanis.ffxivbis.http.{Authorization, PlayerHelper} +import io.swagger.v3.oas.annotations.{Operation, Parameter} +import javax.ws.rs._ import me.arcanis.ffxivbis.http.api.v1.json._ +import me.arcanis.ffxivbis.http.{Authorization, PlayerHelper} import me.arcanis.ffxivbis.models.PlayerId import scala.util.{Failure, Success} diff --git a/src/main/scala/me/arcanis/ffxivbis/http/api/v1/UserEndpoint.scala b/src/main/scala/me/arcanis/ffxivbis/http/api/v1/UserEndpoint.scala index da7104b..aed51fc 100644 --- a/src/main/scala/me/arcanis/ffxivbis/http/api/v1/UserEndpoint.scala +++ b/src/main/scala/me/arcanis/ffxivbis/http/api/v1/UserEndpoint.scala @@ -15,13 +15,13 @@ import akka.http.scaladsl.server._ import akka.util.Timeout import io.swagger.v3.oas.annotations.enums.ParameterIn import io.swagger.v3.oas.annotations.media.{ArraySchema, Content, Schema} -import io.swagger.v3.oas.annotations.responses.ApiResponse -import io.swagger.v3.oas.annotations.{Operation, Parameter} import io.swagger.v3.oas.annotations.parameters.RequestBody +import io.swagger.v3.oas.annotations.responses.ApiResponse import io.swagger.v3.oas.annotations.security.SecurityRequirement -import javax.ws.rs.{Consumes, DELETE, GET, POST, PUT, Path, Produces} -import me.arcanis.ffxivbis.http.{Authorization, UserHelper} +import io.swagger.v3.oas.annotations.{Operation, Parameter} +import javax.ws.rs._ import me.arcanis.ffxivbis.http.api.v1.json._ +import me.arcanis.ffxivbis.http.{Authorization, UserHelper} import me.arcanis.ffxivbis.models.Permission import scala.util.{Failure, Success} diff --git a/src/main/scala/me/arcanis/ffxivbis/http/view/BasePartyView.scala b/src/main/scala/me/arcanis/ffxivbis/http/view/BasePartyView.scala index 725caac..e241c3c 100644 --- a/src/main/scala/me/arcanis/ffxivbis/http/view/BasePartyView.scala +++ b/src/main/scala/me/arcanis/ffxivbis/http/view/BasePartyView.scala @@ -37,6 +37,7 @@ class BasePartyView(override val storage: ActorRef)(implicit timeout: Timeout) object BasePartyView { import scalatags.Text import scalatags.Text.all._ + import scalatags.Text.tags2.{title => titleTag} def root(partyId: String): Text.TypedTag[String] = a(href:=s"/party/$partyId", title:="root")("root") @@ -45,7 +46,7 @@ object BasePartyView { "" + html(lang:="en", head( - title:=s"Party $partyId", + titleTag(s"Party $partyId"), link(rel:="stylesheet", `type`:="text/css", href:="/static/styles.css") ), diff --git a/src/main/scala/me/arcanis/ffxivbis/http/view/BiSView.scala b/src/main/scala/me/arcanis/ffxivbis/http/view/BiSView.scala index c5d0d4e..2ddec08 100644 --- a/src/main/scala/me/arcanis/ffxivbis/http/view/BiSView.scala +++ b/src/main/scala/me/arcanis/ffxivbis/http/view/BiSView.scala @@ -86,12 +86,13 @@ class BiSView(override val storage: ActorRef, ariyala: ActorRef)(implicit timeou object BiSView { import scalatags.Text.all._ + import scalatags.Text.tags2.{title => titleTag} def template(partyId: String, party: Seq[Player], error: Option[String]): String = "" + html(lang:="en", head( - title:="Best in slot", + titleTag("Best in slot"), link(rel:="stylesheet", `type`:="text/css", href:="/static/styles.css") ), diff --git a/src/main/scala/me/arcanis/ffxivbis/http/view/IndexView.scala b/src/main/scala/me/arcanis/ffxivbis/http/view/IndexView.scala index c4a9b84..03fcdd5 100644 --- a/src/main/scala/me/arcanis/ffxivbis/http/view/IndexView.scala +++ b/src/main/scala/me/arcanis/ffxivbis/http/view/IndexView.scala @@ -14,7 +14,7 @@ import akka.http.scaladsl.server.Directives._ import akka.http.scaladsl.server._ import akka.util.Timeout import me.arcanis.ffxivbis.http.UserHelper -import me.arcanis.ffxivbis.models.{Party, Permission, User} +import me.arcanis.ffxivbis.models.{Permission, User} import scala.util.{Failure, Success} @@ -54,12 +54,13 @@ class IndexView(storage: ActorRef)(implicit timeout: Timeout) object IndexView { import scalatags.Text.all._ + import scalatags.Text.tags2.{title => titleTag} def template: String = "" + html( head( - title:="FFXIV loot helper", + titleTag("FFXIV loot helper"), link(rel:="stylesheet", `type`:="text/css", href:="/static/styles.css") ), diff --git a/src/main/scala/me/arcanis/ffxivbis/http/view/LootSuggestView.scala b/src/main/scala/me/arcanis/ffxivbis/http/view/LootSuggestView.scala index b18eee4..25a49db 100644 --- a/src/main/scala/me/arcanis/ffxivbis/http/view/LootSuggestView.scala +++ b/src/main/scala/me/arcanis/ffxivbis/http/view/LootSuggestView.scala @@ -71,12 +71,13 @@ class LootSuggestView(override val storage: ActorRef)(implicit timeout: Timeout) object LootSuggestView { import scalatags.Text.all._ + import scalatags.Text.tags2.{title => titleTag} def template(partyId: String, party: Seq[PlayerIdWithCounters], piece: Option[Piece], error: Option[String]): String = "" + html(lang:="en", head( - title:="Suggest loot", + titleTag("Suggest loot"), link(rel:="stylesheet", `type`:="text/css", href:="/static/styles.css") ), diff --git a/src/main/scala/me/arcanis/ffxivbis/http/view/LootView.scala b/src/main/scala/me/arcanis/ffxivbis/http/view/LootView.scala index 57c39dd..1f63aa5 100644 --- a/src/main/scala/me/arcanis/ffxivbis/http/view/LootView.scala +++ b/src/main/scala/me/arcanis/ffxivbis/http/view/LootView.scala @@ -79,12 +79,13 @@ class LootView (override val storage: ActorRef)(implicit timeout: Timeout) object LootView { import scalatags.Text.all._ + import scalatags.Text.tags2.{title => titleTag} def template(partyId: String, party: Seq[Player], error: Option[String]): String = "" + html(lang:="en", head( - title:="Loot", + titleTag("Loot"), link(rel:="stylesheet", `type`:="text/css", href:="/static/styles.css") ), diff --git a/src/main/scala/me/arcanis/ffxivbis/http/view/PlayerView.scala b/src/main/scala/me/arcanis/ffxivbis/http/view/PlayerView.scala index b7e8bd9..8e763d0 100644 --- a/src/main/scala/me/arcanis/ffxivbis/http/view/PlayerView.scala +++ b/src/main/scala/me/arcanis/ffxivbis/http/view/PlayerView.scala @@ -14,7 +14,7 @@ import akka.http.scaladsl.server.Directives._ import akka.http.scaladsl.server.Route import akka.util.Timeout import me.arcanis.ffxivbis.http.{Authorization, PlayerHelper} -import me.arcanis.ffxivbis.models.{BiS, Job, Player, PlayerId, PlayerIdWithCounters} +import me.arcanis.ffxivbis.models._ import scala.concurrent.{ExecutionContext, Future} @@ -74,12 +74,13 @@ class PlayerView(override val storage: ActorRef, ariyala: ActorRef)(implicit tim object PlayerView { import scalatags.Text.all._ + import scalatags.Text.tags2.{title => titleTag} def template(partyId: String, party: Seq[PlayerIdWithCounters], error: Option[String]): String = "" + html(lang:="en", head( - title:="Party", + titleTag("Party"), link(rel:="stylesheet", `type`:="text/css", href:="/static/styles.css") ), diff --git a/src/main/scala/me/arcanis/ffxivbis/http/view/UserView.scala b/src/main/scala/me/arcanis/ffxivbis/http/view/UserView.scala index 89ba478..fbb2188 100644 --- a/src/main/scala/me/arcanis/ffxivbis/http/view/UserView.scala +++ b/src/main/scala/me/arcanis/ffxivbis/http/view/UserView.scala @@ -77,12 +77,13 @@ class UserView(override val storage: ActorRef)(implicit timeout: Timeout) object UserView { import scalatags.Text.all._ + import scalatags.Text.tags2.{title => titleTag} def template(partyId: String, users: Seq[User], error: Option[String]) = "" + html(lang:="en", head( - title:="Users", + titleTag("Users"), link(rel:="stylesheet", `type`:="text/css", href:="/static/styles.css") ), diff --git a/src/main/scala/me/arcanis/ffxivbis/models/BiS.scala b/src/main/scala/me/arcanis/ffxivbis/models/BiS.scala index 38dc7d8..fca30ca 100644 --- a/src/main/scala/me/arcanis/ffxivbis/models/BiS.scala +++ b/src/main/scala/me/arcanis/ffxivbis/models/BiS.scala @@ -50,8 +50,8 @@ case class BiS(weapon: Option[Piece], "ears" -> ears, "neck" -> neck, "wrist" -> wrist, - "leftRing" -> leftRing, - "rightRing" -> rightRing + "left ring" -> leftRing, + "right ring" -> rightRing ) + (name -> piece) BiS(params) } @@ -70,8 +70,8 @@ object BiS { data.get("ears").flatten, data.get("neck").flatten, data.get("wrist").flatten, - data.get("leftRing").flatten, - data.get("rightRing").flatten) + data.get("left ring").flatten, + data.get("right ring").flatten) def apply(): BiS = BiS(Seq.empty) diff --git a/src/main/scala/me/arcanis/ffxivbis/models/Piece.scala b/src/main/scala/me/arcanis/ffxivbis/models/Piece.scala index 4095bee..7de790e 100644 --- a/src/main/scala/me/arcanis/ffxivbis/models/Piece.scala +++ b/src/main/scala/me/arcanis/ffxivbis/models/Piece.scala @@ -108,9 +108,7 @@ object Piece { case "ears" => Ears(isTome, job) case "neck" => Neck(isTome, job) case "wrist" => Wrist(isTome, job) - case "ring" => Ring(isTome, job) - case "leftring" => Ring(isTome, job).copy(piece = "leftRing") - case "rightring" => Ring(isTome, job).copy(piece = "rightRing") + case ring @ ("ring" | "left ring" | "right ring") => Ring(isTome, job, ring) case "accessory upgrade" => AccessoryUpgrade case "body upgrade" => BodyUpgrade case "weapon upgrade" => WeaponUpgrade @@ -119,5 +117,6 @@ object Piece { lazy val available: Seq[String] = Seq("weapon", "head", "body", "hands", "waist", "legs", "feet", - "ears", "neck", "wrist", "leftRing", "rightRing") + "ears", "neck", "wrist", "left ring", "right ring", + "accessory upgrade", "body upgrade", "weapon upgrade") } diff --git a/src/main/scala/me/arcanis/ffxivbis/service/Ariyala.scala b/src/main/scala/me/arcanis/ffxivbis/service/Ariyala.scala index a1d3e59..02e6c65 100644 --- a/src/main/scala/me/arcanis/ffxivbis/service/Ariyala.scala +++ b/src/main/scala/me/arcanis/ffxivbis/service/Ariyala.scala @@ -11,8 +11,8 @@ package me.arcanis.ffxivbis.service import java.nio.file.Paths import akka.actor.{Actor, Props} -import akka.http.scaladsl.model._ import akka.http.scaladsl.Http +import akka.http.scaladsl.model._ import akka.pattern.pipe import akka.stream.ActorMaterializer import akka.stream.scaladsl.{Keep, Sink} @@ -128,8 +128,8 @@ object Ariyala { private def remapKey(key: String): Option[String] = key match { case "mainhand" => Some("weapon") case "chest" => Some("body") - case "ringLeft" => Some("leftRing") - case "ringRight" => Some("rightRing") + case "ringLeft" => Some("left ring") + case "ringRight" => Some("right ring") case "head" | "hands" | "waist" | "legs" | "feet" | "ears" | "neck" | "wrist" => Some(key) case _ => None } diff --git a/src/main/scala/me/arcanis/ffxivbis/storage/BiSProfile.scala b/src/main/scala/me/arcanis/ffxivbis/storage/BiSProfile.scala index 580fef1..4f57138 100644 --- a/src/main/scala/me/arcanis/ffxivbis/storage/BiSProfile.scala +++ b/src/main/scala/me/arcanis/ffxivbis/storage/BiSProfile.scala @@ -9,7 +9,7 @@ package me.arcanis.ffxivbis.storage import me.arcanis.ffxivbis.models.{Job, Loot, Piece} -import slick.lifted.{ForeignKeyQuery, Index, PrimaryKey} +import slick.lifted.ForeignKeyQuery import scala.concurrent.Future diff --git a/src/main/scala/me/arcanis/ffxivbis/storage/PlayersProfile.scala b/src/main/scala/me/arcanis/ffxivbis/storage/PlayersProfile.scala index c723e8a..e723545 100644 --- a/src/main/scala/me/arcanis/ffxivbis/storage/PlayersProfile.scala +++ b/src/main/scala/me/arcanis/ffxivbis/storage/PlayersProfile.scala @@ -9,7 +9,6 @@ package me.arcanis.ffxivbis.storage import me.arcanis.ffxivbis.models.{BiS, Job, Player, PlayerId} -import slick.lifted.{Index, PrimaryKey} import scala.concurrent.Future diff --git a/src/test/scala/me/arcanis/ffxivbis/Fixtures.scala b/src/test/scala/me/arcanis/ffxivbis/Fixtures.scala index bfe9df6..aa5f800 100644 --- a/src/test/scala/me/arcanis/ffxivbis/Fixtures.scala +++ b/src/test/scala/me/arcanis/ffxivbis/Fixtures.scala @@ -15,8 +15,8 @@ object Fixtures { Ears(isTome = false, Job.DNC), Neck(isTome = true, Job.DNC), Wrist(isTome = false, Job.DNC), - Ring(isTome = true, Job.DNC, "leftRing"), - Ring(isTome = true, Job.DNC, "rightRing") + Ring(isTome = true, Job.DNC, "left ring"), + Ring(isTome = true, Job.DNC, "right ring") ) ) @@ -30,8 +30,8 @@ object Fixtures { lazy val lootLegs: Piece = Legs(isTome = false, Job.AnyJob) lazy val lootEars: Piece = Ears(isTome = false, Job.AnyJob) lazy val lootRing: Piece = Ring(isTome = true, Job.AnyJob) - lazy val lootLeftRing: Piece = Ring(isTome = true, Job.AnyJob, "leftRing") - lazy val lootRightRing: Piece = Ring(isTome = true, Job.AnyJob, "rightRing") + lazy val lootLeftRing: Piece = Ring(isTome = true, Job.AnyJob, "left ring") + lazy val lootRightRing: Piece = Ring(isTome = true, Job.AnyJob, "right ring") lazy val lootUpgrade: Piece = BodyUpgrade lazy val loot: Seq[Piece] = Seq(lootBody, lootHands, lootLegs, lootUpgrade)