Use the simplified pantheon for culture religion

pkg/culture/religion.go

@@ -8,7 +8,7 @@ import (
 // Religion is a culture's religion
 type Religion struct {
 	Class              ReligionClass
-	Pantheon           pantheon.Pantheon
+	Pantheon           pantheon.SimplifiedPantheon
 	GatheringPlaceName string
 }
 
@@ -23,27 +23,13 @@ type ReligionClass struct {
 func (culture Culture) generateReligion() Religion {
 	religion := Religion{}
 
-	deities := make(map[string]pantheon.Deity)
-
 	religion.Class = randomReligionClass()
 	religion.GatheringPlaceName = religion.randomGatheringPlaceName()
 
 	if religion.Class.PantheonMaxSize > 0 {
-		religion.Pantheon = pantheon.Generate(religion.Class.PantheonMaxSize, culture.Language)
-	}
-
-	for _, deity := range religion.Pantheon.Deities {
-		if deity.Gender.Name == "male" {
-			deity.Name = culture.Language.RandomGenderedName("male")
-		} else {
-			deity.Name = culture.Language.RandomGenderedName("female")
-		}
-		deities[deity.Name] = deity
+		religion.Pantheon = pantheon.GenerateForDisplay(religion.Class.PantheonMaxSize, culture.Language)
 	}
 
-	religion.Pantheon.Deities = deities
-	religion.Pantheon.Deities = religion.Pantheon.GenerateRelationships()
-
 	return religion
 }
 

pkg/pantheon/deities.go

@@ -22,10 +22,10 @@ type Deity struct {
 
 // SimplifiedDeity is a display version of deity
 type SimplifiedDeity struct {
-	Name        string
-	Gender string
-	Domains     []string
-	Description string
+	Name        string `json:"name"`
+	Gender	    string `json:"gender"`
+	Domains     []string `json:"domains"`
+	Description string `json:"description"`
 }
 
 // GenerateDeity generates a random deity
@@ -62,7 +62,7 @@ func (pantheon Pantheon) GenerateDeity(lang language.Language) Deity {
 
 	deity.PersonalityTraits = deity.getRandomTraits()
 
-	deity.Name = lang.RandomName()
+	deity.Name = lang.RandomGenderedName(deity.Gender.Name)
 
 	return deity
 }
@@ -73,7 +73,7 @@ func randomDeityNameFromMap(deities map[string]Deity) string {
 		names = append(names, d.Name)
 	}
 
-	return names[rand.Intn(len(names)-1)]
+	return names[rand.Intn(len(names))]
 }
 
 func (deity Deity) simplify() SimplifiedDeity {
@@ -110,12 +110,14 @@ func (deity Deity) simplify() SimplifiedDeity {
 
 	relationships := []string{}
 
-	for _, r := range deity.Relationships {
-		relationship = r.Descriptor + " " + r.Target
-		relationships = append(relationships, relationship)
-	}
+	if len(deity.Relationships) > 0 {
+		for _, r := range deity.Relationships {
+			relationship = r.Descriptor + " " + r.Target
+			relationships = append(relationships, relationship)
+		}
 
-	description += deity.Name + " " + words.CombinePhrases(relationships) + "."
+		description += deity.Name + " " + words.CombinePhrases(relationships) + "."
+	}
 
 	sd.Description = description
 

pkg/pantheon/pantheon.go

@@ -13,7 +13,7 @@ type Pantheon struct {
 
 // SimplifiedPantheon is a simplified version of the data for display
 type SimplifiedPantheon struct {
-	Deities []SimplifiedDeity
+	Deities []SimplifiedDeity `json:"deities"`
 }
 
 // Generate creates a random pantheon of deities
@@ -30,7 +30,9 @@ func Generate(maxSize int, lang language.Language) Pantheon {
 		pantheon.Deities[deity.Name] = deity
 	}
 
-	pantheon.Deities = pantheon.GenerateRelationships()
+	if len(pantheon.Deities) > 1 {
+		pantheon.Deities = pantheon.GenerateRelationships()
+	}
 
 	return pantheon
 }