Skip to content

Commit

Permalink
renamed metal to iron
Browse files Browse the repository at this point in the history
  • Loading branch information
nlsui committed Apr 7, 2020
1 parent 80be56b commit 817b88a
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion ressources.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ type ressources struct {
Food bool `json:",omitempty"`
Lumber bool `json:",omitempty"`
Mana bool `json:",omitempty"`
Metal bool `json:",omitempty"`
Iron bool `json:",omitempty"`
Generic bool `json:",omitempty"`
}
4 changes: 2 additions & 2 deletions ressourcesString.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ func(r *ressources) toString() string {
if(r.Mana){
ressourceList = append(ressourceList, strconv.FormatBool(r.Mana) + " Mana")
}
if(r.Metal){
ressourceList = append(ressourceList, strconv.FormatBool(r.Metal) + " Metal")
if(r.Iron){
ressourceList = append(ressourceList, strconv.FormatBool(r.Iron) + " Iron")
}
if(r.Generic){
ressourceList = append(ressourceList, strconv.FormatBool(r.Generic) + " Generic")
Expand Down
4 changes: 2 additions & 2 deletions schema/ressourcesSchema.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
"Mana": {
"type": "boolean"
},
"Metal": {
"Iron": {
"type": "boolean"
}
},
"additionalProperties": false,
"description": "§Energy, §Food, §Lumber, §Mana, §Metal, §Generic"
"description": "§Energy, §Food, §Lumber, §Mana, §Iron, §Generic"
}
2 changes: 1 addition & 1 deletion testJsons/hq2Test.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"Headquarter":{"UniqueName":"Fortress, Castle of Knights","Name":"Fortress, Castle of Knights","Tags":["KNIGHT"],"Text":"happens here","Abilities":[{"ActivatedAbility":{"AbilityCost":2,"MultipleUse":true,"Effects":[{"TargetEffect":{"EntityTargetEffect":{"EntitySelector":{"PlayerMode":"TARGET","Zone":"FIELD","CardMode":"ALL","CardCondition":{"TagCondition":{"TagComparator":"EQUAL","TagValue":"KNIGHT"}}},"EntityManipulations":[{"EntityIntManipulation":{"IntProperty":"ATTACK","IntOperator":"ADD","IntValue":1}}]}}}]}},{"TriggeredAbility":{"Cause":{"TimeEventListener":{"TimeEvent":"TICKSTART"}},"Effects":[{"ProductionEffect":{"ProductionAmount":3,"ProductionType":{"Lumber":true,"Metal":true}}}]}}],"Health":10}}
{"Headquarter":{"UniqueName":"Fortress, Castle of Knights","Name":"Fortress, Castle of Knights","Tags":["KNIGHT"],"Text":"happens here","Abilities":[{"ActivatedAbility":{"AbilityCost":2,"MultipleUse":true,"Effects":[{"TargetEffect":{"EntityTargetEffect":{"EntitySelector":{"PlayerMode":"TARGET","Zone":"FIELD","CardMode":"ALL","CardCondition":{"TagCondition":{"TagComparator":"EQUAL","TagValue":"KNIGHT"}}},"EntityManipulations":[{"EntityIntManipulation":{"IntProperty":"ATTACK","IntOperator":"ADD","IntValue":1}}]}}}]}},{"TriggeredAbility":{"Cause":{"TimeEventListener":{"TimeEvent":"TICKSTART"}},"Effects":[{"ProductionEffect":{"ProductionAmount":3,"ProductionType":{"Lumber":true,"Iron":true}}}]}}],"Health":10}}
2 changes: 1 addition & 1 deletion testJsons/hq2TestRead.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"ProductionEffect":{
"ProductionAmount": 3,
"ProductionType": {
"Metal": true,
"Iron": true,
"Lumber": true,
}
}
Expand Down
2 changes: 1 addition & 1 deletion testJsons/hq3Test.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"Headquarter":{"UniqueName":"Townhall, gathering of peasants","Name":"Townhall, gathering of peasants","Tags":["PRIMITIVE"],"Text":"peasantville","Abilities":[{"TriggeredAbility":{"Cause":{"TimeEventListener":{"TimeEvent":"TICKSTART"}},"Effects":[{"ProductionEffect":{"ProductionAmount":3,"ProductionType":{"Food":true,"Lumber":true,"Metal":true}}}]}}],"Health":10}}
{"Headquarter":{"UniqueName":"Townhall, gathering of peasants","Name":"Townhall, gathering of peasants","Tags":["PRIMITIVE"],"Text":"peasantville","Abilities":[{"TriggeredAbility":{"Cause":{"TimeEventListener":{"TimeEvent":"TICKSTART"}},"Effects":[{"ProductionEffect":{"ProductionAmount":3,"ProductionType":{"Food":true,"Lumber":true,"Iron":true}}}]}}],"Health":10}}
2 changes: 1 addition & 1 deletion testJsons/hq3TestRead.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"ProductionType": {
"Food": true,
"Lumber": true,
"Metal": true
"Iron": true
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion testJsons/place3Test.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"Place":{"Name":"Chapel","Tags":["PRIMITIVE"],"Text":"RIP","CostType":{"Lumber":true,"Metal":true},"CastingCost":1,"Abilities":[{"ActivatedAbility":{"AbilityCost":1,"MultipleUse":false,"Effects":[{"TargetEffect":{"EntityTargetEffect":{"EntitySelector":{"PlayerMode":"TARGET","Zone":"FIELD","CardMode":"TARGET","CardCondition":{"TagCondition":{"TagComparator":"EQUAL","TagValue":"SPIRITUAL"}}},"EntityManipulations":[{"EntityAbilityManipulation":{"AbilityOperator":"GAIN","Ability":{"TriggeredAbility":{"Cause":{"TimeEventListener":{"TimeEvent":"TICKSTART"}},"Effects":[{"TargetEffect":{"EntityTargetEffect":{"EntitySelector":{"PlayerMode":"TARGET","Zone":"FIELD","CardMode":"TARGET","CardCondition":{"TagCondition":{"TagComparator":"EQUAL","TagValue":"SPIRITUAL"}}},"EntityManipulations":[{"EntityIntManipulation":{"IntProperty":"HEALTH","IntOperator":"ADD","IntValue":1}}]}}}]}}}}]}}}]}},{"TriggeredAbility":{"Cause":{"TimeEventListener":{"TimeEvent":"TICKSTART"}},"Effects":[{"TargetEffect":{"EntityTargetEffect":{"EntitySelector":{"PlayerMode":"TARGET","Zone":"DUSTPILE","CardMode":"TARGET"},"ZoneChange":{"Zone":"VOID","Player":"OWNERS"}}}}]}}],"Health":2}}
{"Place":{"Name":"Chapel","Tags":["PRIMITIVE"],"Text":"RIP","CostType":{"Lumber":true,"Iron":true},"CastingCost":1,"Abilities":[{"ActivatedAbility":{"AbilityCost":1,"MultipleUse":false,"Effects":[{"TargetEffect":{"EntityTargetEffect":{"EntitySelector":{"PlayerMode":"TARGET","Zone":"FIELD","CardMode":"TARGET","CardCondition":{"TagCondition":{"TagComparator":"EQUAL","TagValue":"SPIRITUAL"}}},"EntityManipulations":[{"EntityAbilityManipulation":{"AbilityOperator":"GAIN","Ability":{"TriggeredAbility":{"Cause":{"TimeEventListener":{"TimeEvent":"TICKSTART"}},"Effects":[{"TargetEffect":{"EntityTargetEffect":{"EntitySelector":{"PlayerMode":"TARGET","Zone":"FIELD","CardMode":"TARGET","CardCondition":{"TagCondition":{"TagComparator":"EQUAL","TagValue":"SPIRITUAL"}}},"EntityManipulations":[{"EntityIntManipulation":{"IntProperty":"HEALTH","IntOperator":"ADD","IntValue":1}}]}}}]}}}}]}}}]}},{"TriggeredAbility":{"Cause":{"TimeEventListener":{"TimeEvent":"TICKSTART"}},"Effects":[{"TargetEffect":{"EntityTargetEffect":{"EntitySelector":{"PlayerMode":"TARGET","Zone":"DUSTPILE","CardMode":"TARGET"},"ZoneChange":{"Zone":"VOID","Player":"OWNERS"}}}}]}}],"Health":2}}
2 changes: 1 addition & 1 deletion testJsons/place3TestRead.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"Text":"RIP",
"CostType": {
"Lumber":true,
"Metal":true
"Iron":true
},
"CastingCost":1,
"Abilities": [
Expand Down

0 comments on commit 817b88a

Please sign in to comment.