diff --git a/.squot-materialize b/.squot-materialize index 325218c..cd99e39 100644 --- a/.squot-materialize +++ b/.squot-materialize @@ -1,64 +1,72 @@ [ SquotTonelMapper { #package : MCPackage { - #name : 'BaselineOfSqueakKara' + #name : 'SqueakKara' }, #path : FSAbsolutePath [ 'src' ] }, - SquotTonelMapper { - #package : MCPackage { - #name : 'SqueakKara-Core' - }, - #path : @4 - }, - SquotTonelMapper { - #package : MCPackage { - #name : 'SqueakKara-Tests' - }, - #path : @4 - }, SquotImageMapper { #path : FSAbsolutePath [ 'assets', - 'Trunk.png' + 'Cloverleaf.png' ], #encoding : Class [ #PNGReadWriter ] }, SquotImageMapper { #path : FSAbsolutePath [ 'assets', - 'Cloverleaf.png' + 'Kara-FacingLeft.png' ], - #encoding : Class [ #PNGReadWriter ] + #encoding : @7 }, SquotImageMapper { #path : FSAbsolutePath [ 'assets', - 'Kara-FacingUp.png' + 'Kara-FacingDown.png' ], - #encoding : Class [ #PNGReadWriter ] + #encoding : @7 }, SquotImageMapper { #path : FSAbsolutePath [ 'assets', 'Kara-FacingRight.png' ], - #encoding : Class [ #PNGReadWriter ] + #encoding : @7 + }, + SquotTonelMapper { + #package : MCPackage { + #name : 'SqueakKara-Tests' + }, + #path : FSAbsolutePath [ + 'src' + ] + }, + SquotTonelMapper { + #package : MCPackage { + #name : 'BaselineOfSqueakKara' + }, + #path : @16 }, SquotImageMapper { #path : FSAbsolutePath [ 'assets', - 'Kara-FacingDown.png' + 'Kara-FacingUp.png' ], - #encoding : Class [ #PNGReadWriter ] + #encoding : @7 }, SquotImageMapper { #path : FSAbsolutePath [ 'assets', - 'Kara-FacingLeft.png' + 'Trunk.png' ], - #encoding : Class [ #PNGReadWriter ] + #encoding : @7 + }, + SquotTonelMapper { + #package : MCPackage { + #name : 'SqueakKara-Core' + }, + #path : @16 } -] +] \ No newline at end of file diff --git a/src/SqueakKara-Core/SKEnvironment.class.st b/src/SqueakKara-Core/SKEnvironment.class.st index 98f24e0..8ff46f7 100644 --- a/src/SqueakKara-Core/SKEnvironment.class.st +++ b/src/SqueakKara-Core/SKEnvironment.class.st @@ -113,7 +113,7 @@ SKEnvironment >> initialize [ { #category : #initialization, - #'squeak_changestamp' : 'JJG 6/18/2024 18:47' + #'squeak_changestamp' : 'KD 6/23/2024 19:35' } SKEnvironment >> initializeWithChallenge1 [ @@ -123,6 +123,40 @@ SKEnvironment >> initializeWithChallenge1 [ self workspace: (SKWorkspace newWithKara: self kara). self executer: (SKExecuter new). (self executer kara) kara: self kara. + self executeControls: SKExecuteControls new. + executeControls environment: self. +] + +{ + #category : #initialization, + #'squeak_changestamp' : 'KD 6/23/2024 19:40' +} +SKEnvironment >> initializeWithChallenge2 [ + + + self grid: (SKGrid newWithExtent: 9 @ 2). + self kara: self grid challenge2. + self workspace: (SKWorkspace newWithKara: self kara). + self executer: (SKExecuter new). + (self executer kara) kara: self kara. + self executeControls: SKExecuteControls new. + executeControls environment: self. +] + +{ + #category : #initialization, + #'squeak_changestamp' : 'KD 6/23/2024 19:59' +} +SKEnvironment >> initializeWithChallenge3 [ + + + self grid: (SKGrid newWithExtent: 9 @ 3). + self kara: self grid challenge3. + self workspace: (SKWorkspace newWithKara: self kara). + self executer: (SKExecuter new). + (self executer kara) kara: self kara. + self executeControls: SKExecuteControls new. + executeControls environment: self. ] { diff --git a/src/SqueakKara-Core/SKExecuteControls.class.st b/src/SqueakKara-Core/SKExecuteControls.class.st index 5246a02..86afa7c 100644 --- a/src/SqueakKara-Core/SKExecuteControls.class.st +++ b/src/SqueakKara-Core/SKExecuteControls.class.st @@ -218,20 +218,20 @@ SKExecuteControls >> initialize [ { #category : #texture, - #'squeak_changestamp' : 'EB 6/22/2024 15:02' + #'squeak_changestamp' : 'KD 6/23/2024 19:51' } SKExecuteControls >> pauseTextureFilename [ - ^'Trunk.png' + ^'Kara-FacingUp.png' ] { #category : #texture, - #'squeak_changestamp' : 'EB 6/22/2024 14:55' + #'squeak_changestamp' : 'KD 6/23/2024 19:51' } SKExecuteControls >> runTextureFilename [ - ^'Trunk.png' + ^'Cloverleaf.png' ] { diff --git a/src/SqueakKara-Core/SKGrid.class.st b/src/SqueakKara-Core/SKGrid.class.st index d38f0c4..e58325b 100644 --- a/src/SqueakKara-Core/SKGrid.class.st +++ b/src/SqueakKara-Core/SKGrid.class.st @@ -51,14 +51,14 @@ SKGrid >> addHorizontalLineAt: aCoordinate [ { #category : #texture, - #'squeak_changestamp' : 'JJG 6/12/2024 16:40' + #'squeak_changestamp' : 'KD 6/23/2024 19:52' } SKGrid >> addTexture [ 1 to: self gridHeight - 1 do: [:anInteger | - self addVerticalLineAt: anInteger]. - 1 to: self gridWidth - 1 do: [:anInteger | self addHorizontalLineAt: anInteger]. + 1 to: self gridWidth - 1 do: [:anInteger | + self addVerticalLineAt: anInteger]. ] { @@ -140,6 +140,45 @@ SKGrid >> challenge1 [ ] +{ + #category : #challenges, + #'squeak_changestamp' : 'KD 6/23/2024 19:54' +} +SKGrid >> challenge2 [ + + SKTrunk newInGrid: self at: 3 @ 2. + SKTrunk newInGrid: self at: 5 @ 2. + SKTrunk newInGrid: self at: 7 @ 2. + + SKCloverleaf newInGrid: self at: 9 @ 2. + + ^SKKara newInGrid: self at: 1 @ 2. + +] + +{ + #category : #challenges, + #'squeak_changestamp' : 'KD 6/23/2024 19:59' +} +SKGrid >> challenge3 [ + + SKTrunk newInGrid: self at: 2 @ 1. + SKTrunk newInGrid: self at: 3 @ 1. + SKTrunk newInGrid: self at: 4 @ 1. + SKTrunk newInGrid: self at: 5 @ 1. + SKTrunk newInGrid: self at: 6 @ 1. + + SKTrunk newInGrid: self at: 4 @ 3. + SKTrunk newInGrid: self at: 5 @ 3. + SKTrunk newInGrid: self at: 6 @ 3. + SKTrunk newInGrid: self at: 7 @ 3. + SKTrunk newInGrid: self at: 8 @ 3. + SKTrunk newInGrid: self at: 9 @ 3. + + ^SKKara newInGrid: self at: 1 @ 2. + +] + { #category : #initialization, #'squeak_changestamp' : 'LK 5/24/2024 11:18' diff --git a/src/SqueakKara-Core/SKLandingPage.class.st b/src/SqueakKara-Core/SKLandingPage.class.st index fccd79d..5afe465 100644 --- a/src/SqueakKara-Core/SKLandingPage.class.st +++ b/src/SqueakKara-Core/SKLandingPage.class.st @@ -16,21 +16,21 @@ SKLandingPage >> actionExample1 [ { #category : #actions, - #'squeak_changestamp' : 'LK 6/21/2024 23:02' + #'squeak_changestamp' : 'KD 6/23/2024 19:42' } SKLandingPage >> actionExample2 [ - SKEnvironment basicNew initializeWithChallenge1. + SKEnvironment basicNew initializeWithChallenge2. self delete ] { #category : #actions, - #'squeak_changestamp' : 'LK 6/21/2024 23:02' + #'squeak_changestamp' : 'KD 6/23/2024 19:42' } SKLandingPage >> actionExample3 [ - SKEnvironment basicNew initializeWithChallenge1. + SKEnvironment basicNew initializeWithChallenge3. self delete ]