From 611f94a7c6036e1f6119539b661d8c2f0a73286a Mon Sep 17 00:00:00 2001 From: Offray Luna Date: Sun, 20 Jun 2021 13:32:57 -0500 Subject: [PATCH 1/3] Synchronizing local changes after getting "Detached..." warning at Iceberg. --- .../instance/abilitiesAsWikiText.st | 4 ++-- .../instance/abilitiesAsWikiTextFor.marked..st | 12 ++++++++++++ .../SfAsset.class/instance/asJsonTiddler.st | 2 +- .../SfAsset.class/instance/asTiddler.st | 3 ++- RoloLudo.package/SfMove.class/README.md | 0 .../SfMove.class/instance/asTiddler.st | 7 +++++++ .../SfMove.class/instance/category.st | 3 +++ .../SfMove.class/instance/fromDictionary..st | 8 ++++++++ RoloLudo.package/SfMove.class/instance/name.st | 3 +++ .../SfMove.class/instance/printOn..st | 4 ++++ .../SfMove.class/instance/progress..st | 3 +++ .../SfMove.class/instance/progress.st | 3 +++ RoloLudo.package/SfMove.class/instance/text.st | 3 +++ RoloLudo.package/SfMove.class/properties.json | 16 ++++++++++++++++ RoloLudo.package/SfOracle.class/README.md | 0 .../SfOracle.class/instance/asTiddler.st | 7 +++++++ .../SfOracle.class/instance/fromDictionary..st | 15 +++++++++++++++ .../SfOracle.class/instance/intro..st | 3 +++ .../SfOracle.class/instance/intro.st | 3 +++ .../SfOracle.class/instance/name..st | 3 +++ RoloLudo.package/SfOracle.class/instance/name.st | 3 +++ .../SfOracle.class/instance/options..st | 3 +++ .../SfOracle.class/instance/options.st | 3 +++ .../instance/optionsWikiTextTable.st | 10 ++++++++++ .../SfOracle.class/instance/printOn..st | 5 +++++ RoloLudo.package/SfOracle.class/instance/roll.st | 7 +++++++ RoloLudo.package/SfOracle.class/properties.json | 15 +++++++++++++++ 27 files changed, 144 insertions(+), 4 deletions(-) create mode 100644 RoloLudo.package/SfAsset.class/instance/abilitiesAsWikiTextFor.marked..st create mode 100644 RoloLudo.package/SfMove.class/README.md create mode 100644 RoloLudo.package/SfMove.class/instance/asTiddler.st create mode 100644 RoloLudo.package/SfMove.class/instance/category.st create mode 100644 RoloLudo.package/SfMove.class/instance/fromDictionary..st create mode 100644 RoloLudo.package/SfMove.class/instance/name.st create mode 100644 RoloLudo.package/SfMove.class/instance/printOn..st create mode 100644 RoloLudo.package/SfMove.class/instance/progress..st create mode 100644 RoloLudo.package/SfMove.class/instance/progress.st create mode 100644 RoloLudo.package/SfMove.class/instance/text.st create mode 100644 RoloLudo.package/SfMove.class/properties.json create mode 100644 RoloLudo.package/SfOracle.class/README.md create mode 100644 RoloLudo.package/SfOracle.class/instance/asTiddler.st create mode 100644 RoloLudo.package/SfOracle.class/instance/fromDictionary..st create mode 100644 RoloLudo.package/SfOracle.class/instance/intro..st create mode 100644 RoloLudo.package/SfOracle.class/instance/intro.st create mode 100644 RoloLudo.package/SfOracle.class/instance/name..st create mode 100644 RoloLudo.package/SfOracle.class/instance/name.st create mode 100644 RoloLudo.package/SfOracle.class/instance/options..st create mode 100644 RoloLudo.package/SfOracle.class/instance/options.st create mode 100644 RoloLudo.package/SfOracle.class/instance/optionsWikiTextTable.st create mode 100644 RoloLudo.package/SfOracle.class/instance/printOn..st create mode 100644 RoloLudo.package/SfOracle.class/instance/roll.st create mode 100644 RoloLudo.package/SfOracle.class/properties.json diff --git a/RoloLudo.package/SfAsset.class/instance/abilitiesAsWikiText.st b/RoloLudo.package/SfAsset.class/instance/abilitiesAsWikiText.st index 27f489c..4f390b3 100644 --- a/RoloLudo.package/SfAsset.class/instance/abilitiesAsWikiText.st +++ b/RoloLudo.package/SfAsset.class/instance/abilitiesAsWikiText.st @@ -4,7 +4,7 @@ abilitiesAsWikiText output := '' writeStream. output nextPutAll: ''. ^ output contents \ No newline at end of file diff --git a/RoloLudo.package/SfAsset.class/instance/abilitiesAsWikiTextFor.marked..st b/RoloLudo.package/SfAsset.class/instance/abilitiesAsWikiTextFor.marked..st new file mode 100644 index 0000000..bc91666 --- /dev/null +++ b/RoloLudo.package/SfAsset.class/instance/abilitiesAsWikiTextFor.marked..st @@ -0,0 +1,12 @@ +utilities +abilitiesAsWikiTextFor: abilitiesSubset marked: unicodeSymbol + + | aStream | + aStream := '' writeStream. + abilitiesSubset do: [:abi| + aStream + nextPutAll: '
  • ', unicodeSymbol ; cr; + nextPutAll: ' '; + nextPutAll: abi; cr; + nextPutAll: '
    • '; cr ]. + ^ aStream contents \ No newline at end of file diff --git a/RoloLudo.package/SfAsset.class/instance/asJsonTiddler.st b/RoloLudo.package/SfAsset.class/instance/asJsonTiddler.st index 62e2c38..a8ba71f 100644 --- a/RoloLudo.package/SfAsset.class/instance/asJsonTiddler.st +++ b/RoloLudo.package/SfAsset.class/instance/asJsonTiddler.st @@ -1,3 +1,3 @@ accessing asJsonTiddler - ^ STON toStringPretty: self asTiddler asDictionary. \ No newline at end of file + ^ self asTiddler asJson \ No newline at end of file diff --git a/RoloLudo.package/SfAsset.class/instance/asTiddler.st b/RoloLudo.package/SfAsset.class/instance/asTiddler.st index 55fdd48..998a205 100644 --- a/RoloLudo.package/SfAsset.class/instance/asTiddler.st +++ b/RoloLudo.package/SfAsset.class/instance/asTiddler.st @@ -3,4 +3,5 @@ asTiddler ^ Tiddler new title: self name; tags: 'Starforged ' , self category; - text: self abilitiesAsWikiText \ No newline at end of file + text: self abilitiesAsWikiText; + created: DateAndTime now asString. \ No newline at end of file diff --git a/RoloLudo.package/SfMove.class/README.md b/RoloLudo.package/SfMove.class/README.md new file mode 100644 index 0000000..e69de29 diff --git a/RoloLudo.package/SfMove.class/instance/asTiddler.st b/RoloLudo.package/SfMove.class/instance/asTiddler.st new file mode 100644 index 0000000..069c24b --- /dev/null +++ b/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. \ No newline at end of file diff --git a/RoloLudo.package/SfMove.class/instance/category.st b/RoloLudo.package/SfMove.class/instance/category.st new file mode 100644 index 0000000..04be151 --- /dev/null +++ b/RoloLudo.package/SfMove.class/instance/category.st @@ -0,0 +1,3 @@ +accessing +category + ^ category \ No newline at end of file diff --git a/RoloLudo.package/SfMove.class/instance/fromDictionary..st b/RoloLudo.package/SfMove.class/instance/fromDictionary..st new file mode 100644 index 0000000..12a8358 --- /dev/null +++ b/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 ] \ No newline at end of file diff --git a/RoloLudo.package/SfMove.class/instance/name.st b/RoloLudo.package/SfMove.class/instance/name.st new file mode 100644 index 0000000..22077c2 --- /dev/null +++ b/RoloLudo.package/SfMove.class/instance/name.st @@ -0,0 +1,3 @@ +accessing +name + ^ name \ No newline at end of file diff --git a/RoloLudo.package/SfMove.class/instance/printOn..st b/RoloLudo.package/SfMove.class/instance/printOn..st new file mode 100644 index 0000000..98b1759 --- /dev/null +++ b/RoloLudo.package/SfMove.class/instance/printOn..st @@ -0,0 +1,4 @@ +accessing +printOn: aStream + super printOn: aStream. + aStream nextPutAll: '( ', self name, ' ) '. \ No newline at end of file diff --git a/RoloLudo.package/SfMove.class/instance/progress..st b/RoloLudo.package/SfMove.class/instance/progress..st new file mode 100644 index 0000000..158f7cc --- /dev/null +++ b/RoloLudo.package/SfMove.class/instance/progress..st @@ -0,0 +1,3 @@ +accessing +progress: aBoolean + progress := aBoolean \ No newline at end of file diff --git a/RoloLudo.package/SfMove.class/instance/progress.st b/RoloLudo.package/SfMove.class/instance/progress.st new file mode 100644 index 0000000..bbe947a --- /dev/null +++ b/RoloLudo.package/SfMove.class/instance/progress.st @@ -0,0 +1,3 @@ +accessing +progress + ^ progress \ No newline at end of file diff --git a/RoloLudo.package/SfMove.class/instance/text.st b/RoloLudo.package/SfMove.class/instance/text.st new file mode 100644 index 0000000..3251dea --- /dev/null +++ b/RoloLudo.package/SfMove.class/instance/text.st @@ -0,0 +1,3 @@ +accessing +text + ^ text \ No newline at end of file diff --git a/RoloLudo.package/SfMove.class/properties.json b/RoloLudo.package/SfMove.class/properties.json new file mode 100644 index 0000000..7a55555 --- /dev/null +++ b/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" +} \ No newline at end of file diff --git a/RoloLudo.package/SfOracle.class/README.md b/RoloLudo.package/SfOracle.class/README.md new file mode 100644 index 0000000..e69de29 diff --git a/RoloLudo.package/SfOracle.class/instance/asTiddler.st b/RoloLudo.package/SfOracle.class/instance/asTiddler.st new file mode 100644 index 0000000..14777ce --- /dev/null +++ b/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. \ No newline at end of file diff --git a/RoloLudo.package/SfOracle.class/instance/fromDictionary..st b/RoloLudo.package/SfOracle.class/instance/fromDictionary..st new file mode 100644 index 0000000..6ee54c1 --- /dev/null +++ b/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 . + ]. \ No newline at end of file diff --git a/RoloLudo.package/SfOracle.class/instance/intro..st b/RoloLudo.package/SfOracle.class/instance/intro..st new file mode 100644 index 0000000..aa47ada --- /dev/null +++ b/RoloLudo.package/SfOracle.class/instance/intro..st @@ -0,0 +1,3 @@ +accessing +intro: longerText + intro := longerText \ No newline at end of file diff --git a/RoloLudo.package/SfOracle.class/instance/intro.st b/RoloLudo.package/SfOracle.class/instance/intro.st new file mode 100644 index 0000000..4088955 --- /dev/null +++ b/RoloLudo.package/SfOracle.class/instance/intro.st @@ -0,0 +1,3 @@ +accessing +intro + ^ intro \ No newline at end of file diff --git a/RoloLudo.package/SfOracle.class/instance/name..st b/RoloLudo.package/SfOracle.class/instance/name..st new file mode 100644 index 0000000..89ffdc1 --- /dev/null +++ b/RoloLudo.package/SfOracle.class/instance/name..st @@ -0,0 +1,3 @@ +accessing +name: shortText + name := shortText \ No newline at end of file diff --git a/RoloLudo.package/SfOracle.class/instance/name.st b/RoloLudo.package/SfOracle.class/instance/name.st new file mode 100644 index 0000000..40a2166 --- /dev/null +++ b/RoloLudo.package/SfOracle.class/instance/name.st @@ -0,0 +1,3 @@ +accessing +name + ^ name \ No newline at end of file diff --git a/RoloLudo.package/SfOracle.class/instance/options..st b/RoloLudo.package/SfOracle.class/instance/options..st new file mode 100644 index 0000000..d822cff --- /dev/null +++ b/RoloLudo.package/SfOracle.class/instance/options..st @@ -0,0 +1,3 @@ +accessing +options: anOrderedDictionary + options := anOrderedDictionary \ No newline at end of file diff --git a/RoloLudo.package/SfOracle.class/instance/options.st b/RoloLudo.package/SfOracle.class/instance/options.st new file mode 100644 index 0000000..55a9f18 --- /dev/null +++ b/RoloLudo.package/SfOracle.class/instance/options.st @@ -0,0 +1,3 @@ +accessing +options + ^ options ifNil: [ options := OrderedDictionary new ] \ No newline at end of file diff --git a/RoloLudo.package/SfOracle.class/instance/optionsWikiTextTable.st b/RoloLudo.package/SfOracle.class/instance/optionsWikiTextTable.st new file mode 100644 index 0000000..d55cc07 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/RoloLudo.package/SfOracle.class/instance/printOn..st b/RoloLudo.package/SfOracle.class/instance/printOn..st new file mode 100644 index 0000000..9d8e44b --- /dev/null +++ b/RoloLudo.package/SfOracle.class/instance/printOn..st @@ -0,0 +1,5 @@ +accessing +printOn: aStream + super printOn: aStream. + aStream + nextPutAll: '( ', self name, ' )'. \ No newline at end of file diff --git a/RoloLudo.package/SfOracle.class/instance/roll.st b/RoloLudo.package/SfOracle.class/instance/roll.st new file mode 100644 index 0000000..d83c11c --- /dev/null +++ b/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 ] + ] \ No newline at end of file diff --git a/RoloLudo.package/SfOracle.class/properties.json b/RoloLudo.package/SfOracle.class/properties.json new file mode 100644 index 0000000..ebffca7 --- /dev/null +++ b/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" +} \ No newline at end of file From cb83de542b7eecc1c90d91bca5a2903fd2459e2b Mon Sep 17 00:00:00 2001 From: Offray Luna Date: Sun, 20 Jun 2021 13:41:12 -0500 Subject: [PATCH 2/3] Fixing conflicts. --- .../instance/abilitiesAsWikiTextFor..st | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 RoloLudo.package/SfAsset.class/instance/abilitiesAsWikiTextFor..st diff --git a/RoloLudo.package/SfAsset.class/instance/abilitiesAsWikiTextFor..st b/RoloLudo.package/SfAsset.class/instance/abilitiesAsWikiTextFor..st deleted file mode 100644 index 41db40a..0000000 --- a/RoloLudo.package/SfAsset.class/instance/abilitiesAsWikiTextFor..st +++ /dev/null @@ -1,12 +0,0 @@ -utilities -abilitiesAsWikiTextFor: abilitiesSubset - - | aStream | - aStream := '' writeStream. - abilitiesSubset do: [:abi| - aStream - nextPutAll: '
  • ⬢'; cr; - nextPutAll: ' '; - nextPutAll: abi; cr; - nextPutAll: '
    • '; cr ]. - ^ aStream contents \ No newline at end of file From 6c6361af08855f5b0ec728af14bfd6e2975732a7 Mon Sep 17 00:00:00 2001 From: Offray Luna Date: Sun, 20 Jun 2021 13:57:31 -0500 Subject: [PATCH 3/3] Fixing merge conflicts with "image-sync" branch. --- RoloLudo.package/SfAsset.class/instance/asJsonTiddler.st | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RoloLudo.package/SfAsset.class/instance/asJsonTiddler.st b/RoloLudo.package/SfAsset.class/instance/asJsonTiddler.st index a8ba71f..9fd3b78 100644 --- a/RoloLudo.package/SfAsset.class/instance/asJsonTiddler.st +++ b/RoloLudo.package/SfAsset.class/instance/asJsonTiddler.st @@ -1,3 +1,3 @@ accessing asJsonTiddler - ^ self asTiddler asJson \ No newline at end of file + ^ self asTiddler asJson \ No newline at end of file