Skip to content

Commit

Permalink
Revert "Merge branch 'code-execution'"
Browse files Browse the repository at this point in the history
This reverts commit b3b2f9d, reversing
changes made to d1a50b9.
  • Loading branch information
KarlDuda committed Jun 23, 2024
1 parent b3b2f9d commit ef1cd69
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 96 deletions.
16 changes: 1 addition & 15 deletions .squot-materialize
Original file line number Diff line number Diff line change
Expand Up @@ -75,24 +75,10 @@
],
#encoding : @4
},
SquotTonelMapper {
#package : MCPackage {
#name : 'SqueakKara-Tests'
},
#path : FSAbsolutePath [
'src'
]
},
SquotTonelMapper {
#package : MCPackage {
#name : 'BaselineOfSqueakKara'
},
#path : @16
},
SquotImageMapper {
#path : FSAbsolutePath [
'assets',
'Kara-FacingUp.png'
'Kara-FacingDown.png'
],
#encoding : @4
}
Expand Down
36 changes: 1 addition & 35 deletions src/SqueakKara-Core/SKEnvironment.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ SKEnvironment >> initialize [

{
#category : #initialization,
#'squeak_changestamp' : 'KD 6/23/2024 19:35'
#'squeak_changestamp' : 'JJG 6/18/2024 18:47'
}
SKEnvironment >> initializeWithChallenge1 [

Expand All @@ -123,40 +123,6 @@ 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.
]

{
Expand Down
45 changes: 3 additions & 42 deletions src/SqueakKara-Core/SKGrid.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,14 @@ SKGrid >> addHorizontalLineAt: aCoordinate [

{
#category : #texture,
#'squeak_changestamp' : 'KD 6/23/2024 19:52'
#'squeak_changestamp' : 'JJG 6/12/2024 16:40'
}
SKGrid >> addTexture [

1 to: self gridHeight - 1 do: [:anInteger |
self addHorizontalLineAt: anInteger].
1 to: self gridWidth - 1 do: [:anInteger |
self addVerticalLineAt: anInteger].
1 to: self gridWidth - 1 do: [:anInteger |
self addHorizontalLineAt: anInteger].
]

{
Expand Down Expand Up @@ -140,45 +140,6 @@ 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'
Expand Down
8 changes: 4 additions & 4 deletions src/SqueakKara-Core/SKLandingPage.class.st
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,21 @@ SKLandingPage >> actionExample1 [

{
#category : #actions,
#'squeak_changestamp' : 'KD 6/23/2024 19:42'
#'squeak_changestamp' : 'LK 6/21/2024 23:02'
}
SKLandingPage >> actionExample2 [

SKEnvironment basicNew initializeWithChallenge2.
SKEnvironment basicNew initializeWithChallenge1.
self delete
]

{
#category : #actions,
#'squeak_changestamp' : 'KD 6/23/2024 19:42'
#'squeak_changestamp' : 'LK 6/21/2024 23:02'
}
SKLandingPage >> actionExample3 [

SKEnvironment basicNew initializeWithChallenge3.
SKEnvironment basicNew initializeWithChallenge1.
self delete
]

Expand Down

0 comments on commit ef1cd69

Please sign in to comment.