starting to chip away at struct refactoring

Author: abstrct

x/structs/keeper/fleet_cache.go

@@ -259,17 +259,17 @@ func (cache *FleetCache) PeaceDeal() (){
     cache.SetLocationToPlanet(cache.GetOwner().GetPlanet())
 }
 
-func (cache *FleetCache) BuildInitiateReadiness(structure *types.Struct, structType *types.StructType, ambit types.Ambit, ambitSlot uint64) (error) {
+func (cache *FleetCache) BuildInitiateReadiness(structure *types.Struct, structType *StructTypeCache, ambit types.Ambit, ambitSlot uint64) (error) {
     if structure.GetOwner() != cache.GetOwnerId() {
-         return types.NewStructOwnershipError(structure.Id, cache.GetOwnerId(), structure.GetOwner()).WithLocation("fleet", cache.GetFleetId())
+         return types.NewStructOwnershipError(structure.GetStructId(), cache.GetOwnerId(), structure.GetOwner()).WithLocation("fleet", cache.GetFleetId())
     }
 
     if cache.IsAway() {
         return types.NewFleetStateError(cache.GetFleetId(), "away", "build")
     }
 
 
-    if structType.Type != types.CommandStruct {
+    if structType.GetStructType().Type != types.CommandStruct {
         if !cache.HasCommandStruct() {
             return types.NewFleetCommandError(cache.GetFleetId(), "no_command_struct")
         }
@@ -279,7 +279,7 @@ func (cache *FleetCache) BuildInitiateReadiness(structure *types.Struct, structT
         }
     }
 
-    if (structType.Category != types.ObjectType_fleet) {
+    if (structType.GetStructType().Category != types.ObjectType_fleet) {
         return types.NewStructLocationError(structType.GetId(), ambit.String(), "outside_planet")
     }
 
@@ -288,7 +288,7 @@ func (cache *FleetCache) BuildInitiateReadiness(structure *types.Struct, structT
         return types.NewStructLocationError(structType.GetId(), ambit.String(), "invalid_ambit")
     }
 
-    if structType.Type == types.CommandStruct {
+    if structType.GetStructType().Type == types.CommandStruct {
         if cache.HasCommandStruct() {
             return types.NewStructBuildError(structType.GetId(), "fleet", cache.GetFleetId(), "command_exists")
         }

x/structs/keeper/planet_cache.go

@@ -303,12 +303,12 @@ func (cache *PlanetCache) IsSuccessful(successRate fraction.Fraction) bool {
 	return randomnessCheck
 }
 
-func (cache *PlanetCache) BuildInitiateReadiness(structure *types.Struct, structType *types.StructType, ambit types.Ambit, ambitSlot uint64) (error) {
+func (cache *PlanetCache) BuildInitiateReadiness(structure *types.Struct, structType *StructTypeCache, ambit types.Ambit, ambitSlot uint64) (error) {
     if structure.GetOwner() != cache.GetOwnerId() {
-         return types.NewStructOwnershipError(structure.Id, cache.GetOwnerId(), structure.GetOwner()).WithLocation("planet", cache.GetPlanetId())
+         return types.NewStructOwnershipError(structure.GetStructId(), cache.GetOwnerId(), structure.GetOwner()).WithLocation("planet", cache.GetPlanetId())
     }
 
-    if structType.Type == types.CommandStruct {
+    if structType.GetStructType().Type == types.CommandStruct {
         return types.NewStructLocationError(structType.GetId(), ambit.String(), "command_struct_fleet_only")
     }
 
@@ -324,7 +324,7 @@ func (cache *PlanetCache) BuildInitiateReadiness(structure *types.Struct, struct
         return types.NewFleetCommandError(cache.GetOwner().GetFleetId(), "command_offline")
     }
 
-    if (structType.Category != types.ObjectType_planet) {
+    if (structType.GetStructType().Category != types.ObjectType_planet) {
         return types.NewStructLocationError(structType.GetId(), ambit.String(), "outside_planet")
     }