reduce code duplication

alaingilbert · Sep 12, 2018 · 6aa053c · 6aa053c
1 parent 0e9861c
commit 6aa053c
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/ogame.go b/ogame.go
@@ -194,27 +194,27 @@ type Building interface {
 	Levelable
 }
 
-// Ship ...
-type Ship interface {
+type DefenderObj interface {
 	BaseOgameObj
 	GetStructuralIntegrity(Researches) int
 	GetShieldPower(Researches) int
 	GetWeaponPower(Researches) int
+	GetRapidfireFrom() map[ID]int
+}
+
+// Ship ...
+type Ship interface {
+	DefenderObj
 	GetCargoCapacity() int
 	GetBaseSpeed() int
 	GetSpeed(researches Researches) int
 	GetFuelConsumption() int
-	GetRapidfireFrom() map[ID]int
 	GetRapidfireAgainst() map[ID]int
 }
 
 // Defense ...
 type Defense interface {
-	BaseOgameObj
-	GetStructuralIntegrity(Researches) int
-	GetShieldPower(Researches) int
-	GetWeaponPower(Researches) int
-	GetRapidfireFrom() map[ID]int
+	DefenderObj
 }
 
 // ObjsStruct ...