diff options
Diffstat (limited to 'src/scalevalapokalypsi/Model')
| -rw-r--r-- | src/scalevalapokalypsi/Model/Adventure.scala | 7 | ||||
| -rw-r--r-- | src/scalevalapokalypsi/Model/Entities/Entity.scala | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/scalevalapokalypsi/Model/Adventure.scala b/src/scalevalapokalypsi/Model/Adventure.scala index e751280..9d07ba6 100644 --- a/src/scalevalapokalypsi/Model/Adventure.scala +++ b/src/scalevalapokalypsi/Model/Adventure.scala @@ -31,10 +31,9 @@ class Adventure(val playerNames: Vector[String]): clearing.addItem(Item("battery", "It's a small battery cell. Looks new.")) southForest.addItem(Item( - "remote", - "It's the remote control for your TV.\n" + - "What it was doing in the forest, you have no idea.\n" + - "Problem is, there's no battery." + "laulukäärö", + "Jukranpujut, löysit laulukäärön!\n" + + "Et vielä voi tehdä sillä mitään, koska et edes osaa laula." )) val players: Map[String, Player] = Map() diff --git a/src/scalevalapokalypsi/Model/Entities/Entity.scala b/src/scalevalapokalypsi/Model/Entities/Entity.scala index ff5b320..b90a61a 100644 --- a/src/scalevalapokalypsi/Model/Entities/Entity.scala +++ b/src/scalevalapokalypsi/Model/Entities/Entity.scala @@ -61,7 +61,7 @@ class Entity(val name: String, initialLocation: Area): ) def sayTo(entity: Entity, message: String): (String, String) = - entity.observe(s"Alice: \"$message\"") + entity.observe(s"${this.name}: \"$message\"") (s"You say so to ${entity.name}.", "") def say(message: String): (String, String) = |