diff --git a/game/begin.coffee b/game/begin.coffee index 253ef77..18354db 100644 --- a/game/begin.coffee +++ b/game/begin.coffee @@ -53,7 +53,7 @@ here = () -> # The first room of the game. # For accessibility reasons the text is provided in HTML, not here. room "start", - content: """ + dsc: """ """, choices: "#start" diff --git a/game/story.coffee b/game/story.coffee index f79660b..6f7c51a 100644 --- a/game/story.coffee +++ b/game/story.coffee @@ -2,9 +2,9 @@ room "world", tags: ["start"], optionText: "Enter the world", ways: ["plaza"] - content: """ + dsc: """ ### Rhinestone Room - + You're in a large room carved inside a giant milky rock mountain. The floor and walls are littered with signs and signatures of the previous visitors. @@ -32,7 +32,7 @@ room "plaza", """ else "You quickly find the central plaza." - content: (character, system) -> + dsc: (character, system) -> retval = "There are #{textlink("people shouting", "people")} nearby." unless character.sandbox.has_mark? retval += "\n\nYou could ask a policeman #{textlink("for directions.", "mark")}" @@ -52,7 +52,7 @@ room "plaza", room "shop", title: "The Shop" ways: ["plaza", "shop-inside", "lair"] - content: """ + dsc: """ Being the only shop in town, this trendy establishment did not need a name. It's an open question why it had one, especially because its name was "Hung Crossing". @@ -62,7 +62,7 @@ room "shop", room "lair", title: "The Lair" before: "Finding The Lair is easy. Leaving it is impossible. Your game ends here." - content: """ + dsc: """ The Lair of Yog-Sothoth is a very *n'gai* cave, full of *buggs-shoggogs* and *n'ghaa ng'aa*. """ objects: { @@ -83,8 +83,8 @@ room "shop-inside", tags: ["merchant"] optionText: "End the conversation" title: "Inside the Shop" - content: """ - The insides are painted pastel white, honouring The Great Milk Spill of 1985. + dsc: """ + The insides are painted pastel white, honouring The Great Milk Spill of 1985. """ objects: { merchant: obj "merchant", @@ -108,7 +108,6 @@ lamp.put("shop-inside") room "merchdialogue", choices: "#merchant", - content: """ + dsc: """ Nice day, isn't it? """ - diff --git a/html/index.html b/html/index.html index 730d04e..76e613b 100644 --- a/html/index.html +++ b/html/index.html @@ -23,6 +23,10 @@
+

Salet is an offspring of Undum and Raconteur.

The project is still a work-in-progress. This "game" will show you some of the new features.

It's supposed to be relatively painless for the author without sacrificing the reader's experience. diff --git a/lib/dialogue.coffee b/lib/dialogue.coffee index f585303..bce17b7 100644 --- a/lib/dialogue.coffee +++ b/lib/dialogue.coffee @@ -18,7 +18,7 @@ Usage: dialogue = (title, startTag, endTag, text, effect) -> retval = room(randomid(), { optionText: title - content: text + dsc: text clear: false # backlog is useful in dialogues choices: "#"+endTag }) diff --git a/lib/room.coffee b/lib/room.coffee index 2dcac55..8809999 100644 --- a/lib/room.coffee +++ b/lib/room.coffee @@ -79,7 +79,7 @@ class SaletRoom extends RaconteurSituation ### exit: (character, system, to) => return true - + ### I call SaletRoom.enter every time the player enters this room but before the section is opened. Unlike @before this gets called before the current section is opened. @@ -108,7 +108,7 @@ class SaletRoom extends RaconteurSituation @visited++ if undum.game.situations[f].exit? undum.game.situations[f].exit(character, system, @name) - + if @enter @enter character, system, f @@ -148,8 +148,8 @@ class SaletRoom extends RaconteurSituation retval = "" # Print the room description - if @content - retval += markdown(@content.fcall(this, character, system, f)) + if @dsc + retval += markdown(@dsc.fcall(this, character, system, f)) for name, thing of @objects retval += thing.look() @@ -188,7 +188,7 @@ class SaletRoom extends RaconteurSituation return print(thing.act.fcall(thing, character, system)) # the loop is done but no return came - match not found console.error("Could not find #{link[1]} in current room.") - + # default Raconteur action return RaconteurSituation.prototype.act.call(this, character, system, action)