Merge pull request 'Synchronizing local changes after getting "Detached..." warning at Iceberg.' (#1) from image-sync into master

Reviewed-on: https://code.tupale.co/Offray/RoloLudo/pulls/1

RoloLudo.package/SfAsset.class/instance/abilitiesAsWikiTextFor.marked..st

@@ -7,6 +7,6 @@ abilitiesAsWikiTextFor: abilitiesSubset marked: unicodeSymbol
 		aStream 
 			nextPutAll: '  <li> ', unicodeSymbol ; cr;
 			nextPutAll: '    ';
-			nextPutAll: ((WikiText new content: abi) convertMarkdownLinks); cr;
+			nextPutAll: abi; cr;
 			nextPutAll: '  </li>'; cr ].
 	^ aStream contents

RoloLudo.package/SfAsset.class/instance/asJsonTiddler.st

@@ -1,3 +1,7 @@
 accessing
 asJsonTiddler
-	^ self asTiddler asJson 
+<<<<<<< HEAD
+	^ self asTiddler asJson
+=======
+	^ self asTiddler asJson 
+>>>>>>> master

RoloLudo.package/SfAsset.class/instance/asTiddler.st

@@ -3,4 +3,5 @@ asTiddler
 	^ Tiddler new
 		title: self name;
 		tags: 'Starforged ' , self category;
-		text: self abilitiesAsWikiText
+		text: self abilitiesAsWikiText;
+		created: DateAndTime now asString.

RoloLudo.package/SfMove.class/instance/asTiddler.st

@@ -0,0 +1,7 @@
+accessing
+asTiddler
+	^ Tiddler new
+		title: self name;
+		tags: 'Starforged ' ,'[[', self category,']]';
+		text: self text;
+		created: DateAndTime now asString.

RoloLudo.package/SfMove.class/instance/category.st

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

RoloLudo.package/SfMove.class/instance/fromDictionary..st

@@ -0,0 +1,8 @@
+accessing
+fromDictionary: aDictionary
+	| tempText |
+	tempText := (WikiText new content: (aDictionary at: 'Text')) convertMarkdownBold; convertMarkdownLinks. 
+	category := aDictionary at: 'Category'.
+	name := aDictionary at: 'Name'.
+	text := tempText content.
+	(aDictionary includesKey: 'Progress Move') ifTrue: [ self progress: true ]

RoloLudo.package/SfMove.class/instance/name.st

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

RoloLudo.package/SfMove.class/instance/printOn..st

@@ -0,0 +1,4 @@
+accessing
+printOn: aStream
+	super printOn: aStream.
+	aStream nextPutAll: '( ', self name, ' ) '.

RoloLudo.package/SfMove.class/instance/progress..st

@@ -0,0 +1,3 @@
+accessing
+progress: aBoolean
+	progress := aBoolean

RoloLudo.package/SfMove.class/instance/progress.st

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

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

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

RoloLudo.package/SfMove.class/properties.json

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

RoloLudo.package/SfOracle.class/instance/asTiddler.st

@@ -0,0 +1,7 @@
+accessing
+asTiddler
+	^ Tiddler new
+		title: self name;
+		tags: 'Starforged';
+		text: self intro, String lf, String lf, self optionsWikiTextTable;
+		created: DateAndTime now asString.

RoloLudo.package/SfOracle.class/instance/fromDictionary..st

@@ -0,0 +1,15 @@
+accessing
+fromDictionary: aDictionary
+	| optionsTable |
+	name := aDictionary at: 'Name'.
+	optionsTable := aDictionary at: 'Table'.
+	optionsTable doWithIndex: [:opt :i | | key value prevKey | 
+		(i = 1) 
+			ifTrue: [key := 1 to: (opt at: 'Chance') asInteger]
+			ifFalse: [
+				prevKey := ((optionsTable at: (i-1)) at: 'Chance').
+				key := (prevKey asInteger + 1) to: (opt at: 'Chance') asInteger.
+			].
+		value := (opt at: 'Description') capitalized.
+		self options at: key put: value .
+	].

RoloLudo.package/SfOracle.class/instance/intro..st

@@ -0,0 +1,3 @@
+accessing
+intro: longerText
+	intro := longerText 

RoloLudo.package/SfOracle.class/instance/intro.st

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

RoloLudo.package/SfOracle.class/instance/name..st

@@ -0,0 +1,3 @@
+accessing
+name: shortText
+	name := shortText

RoloLudo.package/SfOracle.class/instance/name.st

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

RoloLudo.package/SfOracle.class/instance/options..st

@@ -0,0 +1,3 @@
+accessing
+options: anOrderedDictionary
+	options := anOrderedDictionary

RoloLudo.package/SfOracle.class/instance/options.st

@@ -0,0 +1,3 @@
+accessing
+options
+	^ options ifNil: [ options := OrderedDictionary new ]

RoloLudo.package/SfOracle.class/instance/optionsWikiTextTable.st

@@ -0,0 +1,10 @@
+accessing
+optionsWikiTextTable
+	| output |
+	output := '' writeStream.
+	self options keysAndValuesDo: [:k :v |
+		output
+			nextPutAll: '| ', k first asString, ' - ', k last asString, ' |';
+			nextPutAll: v, ' |'; cr
+	].
+	^ output contents

RoloLudo.package/SfOracle.class/instance/printOn..st

@@ -0,0 +1,5 @@
+accessing
+printOn: aStream
+	super printOn: aStream.
+	aStream
+		nextPutAll: '( ', self name, ' )'.

RoloLudo.package/SfOracle.class/instance/roll.st

@@ -0,0 +1,7 @@
+accessing
+roll
+	| diceRoll |
+	diceRoll := 100 atRandom.
+	self options keysAndValuesDo: [:k :v |
+		(k includes: diceRoll) ifTrue: [ ^ v ]
+	]

RoloLudo.package/SfOracle.class/properties.json

@@ -0,0 +1,15 @@
+{
+	"commentStamp" : "",
+	"super" : "Object",
+	"category" : "RoloLudo-RoloLudo",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [
+		"name",
+		"intro",
+		"options"
+	],
+	"name" : "SfOracle",
+	"type" : "normal"
+}