added rulestext and keywords attribute to card

cardobject/card.go

@@ -26,6 +26,8 @@ type Action struct {
 	Effects     Effects
 	FlavourText FlavourText
 	Tags        Tags
+	Keywords    Keywords
+	RulesText   RulesText
 }
 
 func (a Action) Validate() error {
@@ -37,7 +39,7 @@ func (a Action) ValidateStruct() error {
 }
 
 func (a Action) InteractionText() string {
-	return "§CardName §CastingCost §Class §Effects §FlavourText §Tags"
+	return "§CardName §CastingCost §Class §Effects §FlavourText §Tags §Keywords §RulesText"
 }
 
 type Entity struct {
@@ -49,6 +51,8 @@ type Entity struct {
 	Health      Health
 	FlavourText FlavourText
 	Tags        Tags
+	Keywords    Keywords
+	RulesText   RulesText
 }
 
 func (e Entity) Validate() error {
@@ -60,7 +64,7 @@ func (e Entity) ValidateStruct() error {
 }
 
 func (a Entity) InteractionText() string {
-	return "§CardName §CastingCost §Class §Abilities §Attack §Health §FlavourText §Tags"
+	return "§CardName §CastingCost §Class §Abilities §Attack §Health §FlavourText §Tags §Keywords §RulesText"
 }
 
 type Place struct {
@@ -71,6 +75,8 @@ type Place struct {
 	Health      Health
 	FlavourText FlavourText
 	Tags        Tags
+	Keywords    Keywords
+	RulesText   RulesText
 }
 
 func (p Place) Validate() error {
@@ -82,7 +88,7 @@ func (p Place) ValidateStruct() error {
 }
 
 func (a Place) InteractionText() string {
-	return "§CardName §CastingCost §Class §Abilities §Health §FlavourText §Tags"
+	return "§CardName §CastingCost §Class §Abilities §Health §FlavourText §Tags §Keywords §RulesText"
 }
 
 type Headquarter struct {
@@ -93,6 +99,8 @@ type Headquarter struct {
 	Health      Health
 	FlavourText FlavourText
 	Tags        Tags
+	Keywords    Keywords
+	RulesText   RulesText
 }
 
 func (h Headquarter) Validate() error {
@@ -104,5 +112,5 @@ func (h Headquarter) ValidateStruct() error {
 }
 
 func (a Headquarter) InteractionText() string {
-	return "§CardName §Class §Delay §Abilities §Health §FlavourText §Tags"
+	return "§CardName §Class §Delay §Abilities §Health §FlavourText §Tags §Keywords §RulesText"
 }

cardobject/keyword.go

@@ -52,6 +52,31 @@ const Tribute = "TRIBUTE"
 var possibleKeywords []string = []string{
 	Anthem, Arm, Arrival, Battlecry, Harm, Kill, OnConstruction, OnDeath, OnSpawn, Pay, Periodic, Produce, Repair, Tribute}
 
+type Keywords []Keyword
+
+func (k Keywords) Validate() error {
+	return k.ValidateArray()
+}
+
+func (k Keywords) ValidateArray() error {
+	errorRange := []error{}
+	for _, v := range k {
+		err := v.Validate()
+		if err != nil {
+			errorRange = append(errorRange, err)
+		}
+	}
+	return jsonschema.CombineErrors(errorRange)
+}
+
+func (k Keywords) MinMaxItems() (int, int) {
+	return 1, 3
+}
+
+func (k Keywords) ItemName() string {
+	return jsonschema.ItemNameFromArray(k)
+}
+
 type Keyword jsonschema.BasicString
 
 func (k Keyword) Validate() error {

cardobject/testJsons/actionTest1.json

@@ -10,6 +10,7 @@
       "Culture":false
     },
     "CastingCost":13,
+    "RulesText": "This could be your RulesText",
     "Effects":[
       {
         "TargetEffect":{

cardobject/testJsons/entityTest1.json

@@ -1 +1 @@
-{"Entity":{"CardName":"Name","Tags":["TECHNOCRAT"],"FlavourText":"asdf","Class":{"Technology":false,"Nature":false,"Mysticism":false,"Culture":true},"CastingCost":15,"Abilities":[{"ActivatedAbility":{"path":["children","Entity","children","Abilities","children","Ability","children"],"AbilityCost":{"RessourceCost":{"RessourceCostType":{"Nature":true},"CostAmount":2}}}}],"Health":0,"Attack":0}}
+{"Entity":{"CardName":"Name","Tags":["TECHNOCRAT"],"FlavourText":"asdf","Class":{"Technology":false,"Nature":false,"Mysticism":false,"Culture":true},"CastingCost":15,"RulesText": "This could be your RulesText","Abilities":[{"ActivatedAbility":{"path":["children","Entity","children","Abilities","children","Ability","children"],"AbilityCost":{"RessourceCost":{"RessourceCostType":{"Nature":true},"CostAmount":2}}}}],"Health":0,"Attack":0}}

cardobject/testJsons/place1Test.json

@@ -1 +1 @@
-{"Place":{"CardName":"Mühle","CastingCost":2,"Class":{"Nature":false,"Mysticism":false,"Technology":true,"Culture":false},"Abilities":[],"Health":3,"FlavourText":"lulul","Tags":["PRIMITIVE"]}}
+{"Place":{"CardName":"Mühle","CastingCost":2,"RulesText": "This could be your RulesText","Class":{"Nature":false,"Mysticism":false,"Technology":true,"Culture":false},"Abilities":[],"Health":3,"FlavourText":"lulul","Tags":["PRIMITIVE"]}}

cardobject/validatePrimitives.go

@@ -27,6 +27,8 @@ const maxGrowth = 32
 const minGrowth = 0
 const maxHealth int = 32
 const minHealth int = 0
+const maxRulesTextLength int = 1000
+const minRulesTextLength int = 1
 const maxSimpleInt int = 32
 const minSimpleInt int = 0
 const maxSimpleStringLength = 32
@@ -184,6 +186,25 @@ func (h Health) MinMax() (int, int) {
 	return minHealth, maxHealth
 }
 
+type RulesText jsonschema.BasicString
+
+func (r RulesText) Validate() error {
+	return r.ValidateString()
+}
+
+func (r RulesText) ValidateString() error {
+	minLength, maxLength := r.MinMaxLength()
+	length := len(string(r))
+	if length < minLength || length > maxLength {
+		return errors.New("RulesText must be between " + strconv.Itoa(minLength) + " and " + strconv.Itoa(maxLength) + " characters long")
+	}
+	return nil
+}
+
+func (r RulesText) MinMaxLength() (int, int) {
+	return minRulesTextLength, maxRulesTextLength
+}
+
 type StartingHandsize jsonschema.BasicInt
 
 func (s StartingHandsize) Validate() error {

keywords/card.go

@@ -52,6 +52,8 @@ type action struct {
 	Effects     effects
 	FlavourText cardobject.FlavourText
 	Tags        cardobject.Tags
+	Keywords    cardobject.Keywords
+	RulesText   cardobject.RulesText
 }
 
 func (a action) Resolve() cardobject.Card {
@@ -63,7 +65,9 @@ func (a action) Resolve() cardobject.Card {
 			Class:       a.Class,
 			Effects:     effects,
 			FlavourText: a.FlavourText,
-			Tags:        a.Tags}}
+			Tags:        a.Tags,
+			Keywords:    a.Keywords,
+			RulesText:   a.RulesText}}
 	return card
 }
 
@@ -76,7 +80,7 @@ func (a action) ValidateStruct() error {
 }
 
 func (a action) InteractionText() string {
-	return "§CardName §CastingCost §Class §Effects §FlavourText §Tags"
+	return "§CardName §CastingCost §Class §Effects §FlavourText §Tags §Keywords §RulesText"
 }
 
 type entity struct {
@@ -88,6 +92,8 @@ type entity struct {
 	Health      cardobject.Health
 	FlavourText cardobject.FlavourText
 	Tags        cardobject.Tags
+	Keywords    cardobject.Keywords
+	RulesText   cardobject.RulesText
 }
 
 func (e entity) Resolve() cardobject.Card {
@@ -101,7 +107,9 @@ func (e entity) Resolve() cardobject.Card {
 			Attack:      e.Attack,
 			Health:      e.Health,
 			FlavourText: e.FlavourText,
-			Tags:        e.Tags}}
+			Tags:        e.Tags,
+			Keywords:    e.Keywords,
+			RulesText:   e.RulesText}}
 	return card
 }
 
@@ -114,7 +122,7 @@ func (e entity) ValidateStruct() error {
 }
 
 func (e entity) InteractionText() string {
-	return "§CardName §CastingCost §Class §Abilities §Attack §Health §FlavourText §Tags"
+	return "§CardName §CastingCost §Class §Abilities §Attack §Health §FlavourText §Tags §Keywords §RulesText"
 }
 
 type place struct {
@@ -125,6 +133,8 @@ type place struct {
 	Health      cardobject.Health
 	FlavourText cardobject.FlavourText
 	Tags        cardobject.Tags
+	Keywords    cardobject.Keywords
+	RulesText   cardobject.RulesText
 }
 
 func (p place) Resolve() cardobject.Card {
@@ -137,7 +147,9 @@ func (p place) Resolve() cardobject.Card {
 			Abilities:   abilities,
 			Health:      p.Health,
 			FlavourText: p.FlavourText,
-			Tags:        p.Tags}}
+			Tags:        p.Tags,
+			Keywords:    p.Keywords,
+			RulesText:   p.RulesText}}
 	return card
 }
 
@@ -150,7 +162,7 @@ func (p place) ValidateStruct() error {
 }
 
 func (p place) InteractionText() string {
-	return "§CardName §CastingCost §Class §Abilities §Health §FlavourText §Tags"
+	return "§CardName §CastingCost §Class §Abilities §Health §FlavourText §Tags §Keywords §RulesText"
 }
 
 type headquarter struct {
@@ -161,6 +173,8 @@ type headquarter struct {
 	Health      cardobject.Health
 	FlavourText cardobject.FlavourText
 	Tags        cardobject.Tags
+	Keywords    cardobject.Keywords
+	RulesText   cardobject.RulesText
 }
 
 func (h headquarter) Resolve() cardobject.Card {
@@ -173,7 +187,9 @@ func (h headquarter) Resolve() cardobject.Card {
 			Abilities:   abilities,
 			Health:      h.Health,
 			FlavourText: h.FlavourText,
-			Tags:        h.Tags}}
+			Tags:        h.Tags,
+			Keywords:    h.Keywords,
+			RulesText:   h.RulesText}}
 	return card
 }
 
@@ -186,5 +202,5 @@ func (h headquarter) ValidateStruct() error {
 }
 
 func (h headquarter) InteractionText() string {
-	return "§CardName §Class §Delay §Abilities §Health §Growth §StartingHandSize §Wisdom §FlavourText §Tags"
+	return "§CardName §Class §Delay §Abilities §Health §Growth §StartingHandSize §Wisdom §FlavourText §Tags §Keywords §RulesText"
 }

keywords/testJsons/keywordedCard.json

@@ -13,6 +13,8 @@
     "CastingCost":13,
     "Attack":10,
     "Health":10,
+    "Keywords":["ARM", "PAY"],
+    "RulesText":"This could be your RulesText",
     "Abilities":[
       {
         "Pay":{

keywords/testJsons/resolvedGroundTruth.json

@@ -1 +1 @@
-{"Entity":{"CardName":"Name","CastingCost":13,"Class":{"Nature":false,"Mysticism":false,"Technology":true,"Culture":false},"Abilities":[{"ActivatedAbility":{"AbilityCost":{"ManaCost":{"CostAmount":2}},"Effects":[{"TargetEffect":{"EntityTargetEffect":{"EntitySelector":{"PlayerMode":"YOU","CardMode":"TARGET","EntityZone":"FIELD"},"EntityManipulations":[{"EntityIntManipulation":{"IntProperty":"HEALTH","IntOperator":"ADD","IntValue":{"SimpleIntValue":2},"Keyword":"ARM"}},{"EntityIntManipulation":{"IntProperty":"ATTACK","IntOperator":"ADD","IntValue":{"SimpleIntValue":2},"Keyword":"ARM"}}]}}}]}}],"Attack":10,"Health":10,"FlavourText":"-.-","Tags":["SPIRITUAL"]}}
+{"Entity":{"CardName":"Name","CastingCost":13,"Class":{"Nature":false,"Mysticism":false,"Technology":true,"Culture":false},"Abilities":[{"ActivatedAbility":{"AbilityCost":{"ManaCost":{"CostAmount":2}},"Effects":[{"TargetEffect":{"EntityTargetEffect":{"EntitySelector":{"PlayerMode":"YOU","CardMode":"TARGET","EntityZone":"FIELD"},"EntityManipulations":[{"EntityIntManipulation":{"IntProperty":"HEALTH","IntOperator":"ADD","IntValue":{"SimpleIntValue":2},"Keyword":"ARM"}},{"EntityIntManipulation":{"IntProperty":"ATTACK","IntOperator":"ADD","IntValue":{"SimpleIntValue":2},"Keyword":"ARM"}}]}}}]}}],"Attack":10,"Health":10,"FlavourText":"-.-","Tags":["SPIRITUAL"],"Keywords":["ARM","PAY"],"RulesText":"This could be your RulesText"}}