Implemented hierarchy of Instant and Permanent Cards

uca-argentina · Jul 8, 2020 · 73463f2 · 73463f2
1 parent 09dfb79
commit 73463f2
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 67 deletions.
diff --git a/repository/IngSoft2-Model/Acceleration.class.st b/repository/IngSoft2-Model/Acceleration.class.st
@@ -1,20 +1,10 @@
 Class {
 	#name : #Acceleration,
-	#superclass : #Card,
+	#superclass : #PermanentCard,
 	#category : #'IngSoft2-Model-Card'
 }
 
-{ #category : #'as yet unclassified' }
-Acceleration >> isPermanent [
-	^true.
-]
-
 { #category : #playing }
 Acceleration >> triggerEffectFor: aGame [
 	aGame moveActualPlayerForward: 1
 ]
-
-{ #category : #playing }
-Acceleration >> useEffectFor: aGame by: aPlayer [
-	aGame addPermanent: self by: aPlayer
-]
diff --git a/repository/IngSoft2-Model/Cancellation.class.st b/repository/IngSoft2-Model/Cancellation.class.st
@@ -1,6 +1,6 @@
 Class {
 	#name : #Cancellation,
-	#superclass : #Card,
+	#superclass : #InstantCard,
 	#category : #'IngSoft2-Model-Card'
 }
 
@@ -11,16 +11,6 @@ Cancellation class >> to: aTarget [
 	^ self new initializeWithTarget: aTarget
 ]
 
-{ #category : #comparing }
-Cancellation >> isPermanent [
-	^false.
-]
-
-{ #category : #playing }
-Cancellation >> triggerEffectFor: aGame [ 
-
-]
-
 { #category : #playing }
 Cancellation >> useEffectFor: aGame by: aPlayer [
 	((target isValid) and: (aGame hasActivatedPermanents)) ifFalse: [InvalidAction signal: 'Invalid Card Usage'].

diff --git a/repository/IngSoft2-Model/InstantCard.class.st b/repository/IngSoft2-Model/InstantCard.class.st
@@ -0,0 +1,14 @@
+Class {
+	#name : #InstantCard,
+	#superclass : #Card,
+	#category : #'IngSoft2-Model-Card'
+}
+
+{ #category : #comparing }
+InstantCard >> isPermanent [
+	^false
+]
+
+{ #category : #playing }
+InstantCard >> triggerEffectFor: aGame [
+]
diff --git a/repository/IngSoft2-Model/Overload.class.st b/repository/IngSoft2-Model/Overload.class.st
@@ -1,6 +1,6 @@
 Class {
 	#name : #Overload,
-	#superclass : #Card,
+	#superclass : #PermanentCard,
 	#category : #'IngSoft2-Model-Card'
 }
 
@@ -11,19 +11,8 @@ Overload class >> to: aTarget [
 	^ self new initializeWithTarget: aTarget
 ]
 
-{ #category : #comparing }
-Overload >> isPermanent [
-	^true.
-]
-
 { #category : #playing }
 Overload >> triggerEffectFor: aGame [ 
 
 	target objective = aGame actualPlayer ifTrue: [ aGame moveActualPlayerBackwards: 2 ].
 ]
-
-{ #category : #playing }
-Overload >> useEffectFor: aGame by: aPlayer [
-	target isValid.
-	aGame addPermanent: self by: aPlayer
-]
diff --git a/repository/IngSoft2-Model/PermanentCard.class.st b/repository/IngSoft2-Model/PermanentCard.class.st
@@ -0,0 +1,15 @@
+Class {
+	#name : #PermanentCard,
+	#superclass : #Card,
+	#category : #'IngSoft2-Model-Card'
+}
+
+{ #category : #comparing }
+PermanentCard >> isPermanent [
+	^true
+]
+
+{ #category : #'as yet unclassified' }
+PermanentCard >> useEffectFor: aGame by: aPlayer [
+	aGame addPermanent: self by: aPlayer
+]
diff --git a/repository/IngSoft2-Model/Redo.class.st b/repository/IngSoft2-Model/Redo.class.st
@@ -1,19 +1,9 @@
 Class {
 	#name : #Redo,
-	#superclass : #Card,
+	#superclass : #InstantCard,
 	#category : #'IngSoft2-Model-Card'
 }
 
-{ #category : #comparing }
-Redo >> isPermanent [
-	^false.
-]
-
-{ #category : #playing }
-Redo >> triggerEffectFor: aGame [
-
-]
-
 { #category : #playing }
 Redo >> useEffectFor: aGame by: aPlayer [
 	| aCard |

diff --git a/repository/IngSoft2-Model/Repeat.class.st b/repository/IngSoft2-Model/Repeat.class.st
@@ -1,18 +1,9 @@
 Class {
 	#name : #Repeat,
-	#superclass : #Card,
+	#superclass : #InstantCard,
 	#category : #'IngSoft2-Model-Card'
 }
 
-{ #category : #comparing }
-Repeat >> isPermanent [
-	^false.
-]
-
-{ #category : #playing }
-Repeat >> triggerEffectFor: aGame [
-]
-
 { #category : #playing }
 Repeat >> useEffectFor: aGame by: aPlayer [
 	aGame repeatLastEffect.

diff --git a/repository/IngSoft2-Model/Speed.class.st b/repository/IngSoft2-Model/Speed.class.st
@@ -1,6 +1,6 @@
 Class {
 	#name : #Speed,
-	#superclass : #Card,
+	#superclass : #PermanentCard,
 	#category : #'IngSoft2-Model-Card'
 }
 
@@ -11,19 +11,8 @@ Speed class >> to: aTarget [
 	^ self new initializeWithTarget: aTarget
 ]
 
-{ #category : #comparing }
-Speed >> isPermanent [
-	^true.
-]
-
 { #category : #playing }
 Speed >> triggerEffectFor: aGame [
 	target objective = aGame actualPlayer
 		ifTrue: [ aGame moveActualPlayerForward: 1 ]
 ]
-
-{ #category : #playing }
-Speed >> useEffectFor: aGame by: aPlayer [
-	target isValid.
-	aGame addPermanent: self by: aPlayer
-]