Firelights: Refactoring cards deck, adding StoryNode(s) and improving stories storage.

RoloLudo.package/DeckOfCards.class/class/cards.st

@@ -1,10 +1,10 @@
 accessing
-initialize
+cards
 	| response |
-	response := self new. 
+	response := OrderedCollection new.
 	self suits keysDo: [:suit | 
 		(self numeralCards, self faceCards) do: [:number|
-			response cards add: number asString, suit.
+			response add: number asString, suit.
 		].	
 	].
 	^ response

RoloLudo.package/DeckOfCards.class/instance/cards..st

@@ -1,3 +0,0 @@
-accessing
-cards: aCollection
-	cards := aCollection 

RoloLudo.package/DeckOfCards.class/instance/cards.st

@@ -1,3 +1,3 @@
 accessing
 cards
-	^ cards ifNil: [ cards := OrderedCollection new]
+	^ self class cards 

RoloLudo.package/DeckOfCards.class/instance/reset.st

@@ -1,5 +1,5 @@
 accessing
 reset
 	self drawn: OrderedCollection new.
-	self cards: self class initialize cards.
+	self stock: self class cards.
 	^ self

RoloLudo.package/DeckOfCards.class/instance/stock.st

@@ -1,3 +1,3 @@
 accessing
 stock
-	^ stock := self cards copyWithoutAll: self drawn
+	^ stock := self class cards copyWithoutAll: self drawn

RoloLudo.package/DeckOfCards.class/properties.json

@@ -6,7 +6,6 @@
 	"pools" : [ ],
 	"classvars" : [ ],
 	"instvars" : [
-		"cards",
 		"drawn",
 		"stock"
 	],

RoloLudo.package/FirelightsGame.class/instance/deck..st

@@ -0,0 +1,3 @@
+accessing
+deck: anObject
+	deck := anObject

RoloLudo.package/FirelightsGame.class/instance/deck.st

@@ -1,3 +1,3 @@
 accessing
 deck
-	^ deck ifNil: [ deck := DeckOfCards initialize]
+	^ deck ifNil: [ deck := DeckOfCards new]

RoloLudo.package/FirelightsGame.class/instance/export.st

@@ -0,0 +1,10 @@
+accessing
+export
+	| response |
+	response := '' writeStream.
+	(STON writer on: response)
+		newLine: String lf;	
+    	prettyPrint: true;
+		keepNewLines: true;
+    	nextPut: self.
+	^ MarkupFile exportAsFileOn: FileLocator temp / 'firelights.ston' containing: (response contents)

RoloLudo.package/FirelightsGame.class/instance/resetWorlMap.st

@@ -0,0 +1,4 @@
+accessing
+resetWorlMap
+	self worldMap: nil.
+	self deck reset.

RoloLudo.package/FirelightsGame.class/instance/story..st

@@ -0,0 +1,3 @@
+accessing
+story: anObject 
+	story := anObject

RoloLudo.package/FirelightsGame.class/instance/story.st

@@ -0,0 +1,3 @@
+accessing
+story
+	^ story ifNil: [ story := OrderedCollection new]

RoloLudo.package/FirelightsGame.class/instance/uiGameFor..st

@@ -0,0 +1,13 @@
+accessing
+uiGameFor: aView
+	<gtView>
+	| response |
+	response := '' writeStream.
+	response
+		nextPutAll: '❭❭❭ Main Character'; cr; cr; 
+		nextPutAll: self characters first printString; cr;
+		nextPutAll: '❭❭❭ Deck'; cr; cr;
+		nextPutAll: self deck printString.
+	^ aView text
+		title: 'Game';
+		text: [ response contents ]

RoloLudo.package/FirelightsGame.class/instance/worldMap..st

@@ -0,0 +1,3 @@
+accessing
+worldMap: anObject 
+	wordMap := anObject

RoloLudo.package/FirelightsGame.class/instance/worldMapDraw..st

@@ -0,0 +1,5 @@
+accessing
+worldMapDraw: aCardCollection
+	self deck drawn addAll: aCardCollection.
+	self worldMap addAll: aCardCollection. 
+	

RoloLudo.package/FirelightsGame.class/properties.json

@@ -11,7 +11,8 @@
 		"wordMap",
 		"oracles",
 		"wiki",
-		"characters"
+		"characters",
+		"story"
 	],
 	"name" : "FirelightsGame",
 	"type" : "normal"

RoloLudo.package/StoryNode.class/instance/addCharacter..st

@@ -0,0 +1,3 @@
+accessing
+addCharacter: aCharacter
+	self characters add: aCharacter

RoloLudo.package/StoryNode.class/instance/addPlace..st

@@ -0,0 +1,3 @@
+accessing
+addPlace: aPlaceCard
+	self places add: aPlaceCard

RoloLudo.package/StoryNode.class/instance/characters.st

@@ -0,0 +1,3 @@
+accessing
+characters
+	^ characters ifNil: [ characters := Set new]

RoloLudo.package/StoryNode.class/instance/places.st

@@ -0,0 +1,3 @@
+accessing
+places
+	^ places ifNil: [ places := Set new]

RoloLudo.package/StoryNode.class/instance/text..st

@@ -0,0 +1,3 @@
+accessing
+text: aString 
+	text := aString

RoloLudo.package/StoryNode.class/instance/text.st

@@ -0,0 +1,3 @@
+accessing
+text
+	^ text

RoloLudo.package/StoryNode.class/properties.json

@@ -0,0 +1,16 @@
+{
+	"commentStamp" : "",
+	"super" : "Object",
+	"category" : "RoloLudo",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [
+		"text",
+		"characters",
+		"places",
+		"inspirations"
+	],
+	"name" : "StoryNode",
+	"type" : "normal"
+}