Skip to content

Commit

Permalink
Add professions and resource system
Browse files Browse the repository at this point in the history
  • Loading branch information
BenOvermyer committed Jul 20, 2019
1 parent 792f1fd commit 332ba23
Show file tree
Hide file tree
Showing 96 changed files with 3,237 additions and 2,139 deletions.
6 changes: 6 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

577 changes: 577 additions & 0 deletions .idea/workspace.xml

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions .idea/world.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# Change Log

## 0.4.0 (2019-07-20)

Massive rework of resources and institution of professions.

### Change List

- Add professions
- Use professions everywhere, including for resource generation and for characters
- Add resource system to replace existing "trade goods" resources

## 0.3.2 (2019-07-19)

Changes to food.
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.3.2
0.4.0
20 changes: 10 additions & 10 deletions pkg/animal/bigcats.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,31 +7,31 @@ import (

func getBigCats() []Animal {
animals := []Animal{
Animal{
{
Name: "bobcat",
PluralName: "bobcats",
},
Animal{
{
Name: "cheetah",
PluralName: "cheetahs",
},
Animal{
{
Name: "cougar",
PluralName: "cougars",
},
Animal{
{
Name: "jaguar",
PluralName: "jaguars",
},
Animal{
{
Name: "leopard",
PluralName: "leopards",
},
Animal{
{
Name: "lion",
PluralName: "lions",
},
Animal{
{
Name: "tiger",
PluralName: "tigers",
},
Expand All @@ -50,19 +50,19 @@ func getBigCats() []Animal {
a.MaxTemperature = 10
a.Size = size.GetCategoryByName("medium")
a.Resources = []resource.Resource{
resource.Resource{
{
Name: a.Name + " hide",
Origin: a.Name,
Type: "hide",
Commonality: 5,
},
resource.Resource{
{
Name: a.Name + " fangs",
Origin: a.Name,
Type: "teeth",
Commonality: 3,
},
resource.Resource{
{
Name: a.Name,
Origin: a.Name,
Type: "meat",
Expand Down
8 changes: 4 additions & 4 deletions pkg/animal/birds.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

func getBirds() []Animal {
birds := []Animal{
Animal{
{
Name: "flamingo",
PluralName: "flamingos",
EatsAnimals: false,
Expand All @@ -21,7 +21,7 @@ func getBirds() []Animal {
MinTemperature: 5,
MaxTemperature: 10,
Resources: []resource.Resource{
resource.Resource{
{
Name: "flamingo feathers",
Origin: "flamingo",
Type: "feather",
Expand All @@ -30,7 +30,7 @@ func getBirds() []Animal {
},
Size: size.GetCategoryByName("tiny"),
},
Animal{
{
Name: "peacock",
PluralName: "peacocks",
EatsAnimals: false,
Expand All @@ -44,7 +44,7 @@ func getBirds() []Animal {
MinTemperature: 5,
MaxTemperature: 10,
Resources: []resource.Resource{
resource.Resource{
{
Name: "peacock feathers",
Origin: "peacock",
Type: "feather",
Expand Down
12 changes: 6 additions & 6 deletions pkg/animal/canines.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ import (

func getCanines() []Animal {
animals := []Animal{
Animal{
{
Name: "coyote",
PluralName: "coyotes",
},
Animal{
{
Name: "fox",
PluralName: "foxes",
},
Animal{
{
Name: "wolf",
PluralName: "wolves",
},
Expand All @@ -34,19 +34,19 @@ func getCanines() []Animal {
a.MaxTemperature = 10
a.Size = size.GetCategoryByName("medium")
a.Resources = []resource.Resource{
resource.Resource{
{
Name: a.Name + " hide",
Origin: a.Name,
Type: "hide",
Commonality: 4,
},
resource.Resource{
{
Name: a.Name + " fangs",
Origin: a.Name,
Type: "teeth",
Commonality: 4,
},
resource.Resource{
{
Name: a.Name,
Origin: a.Name,
Type: "meat",
Expand Down
16 changes: 8 additions & 8 deletions pkg/animal/equines.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ import (

func getEquines() []Animal {
animals := []Animal{
Animal{
{
Name: "horse",
PluralName: "horses",
},
Animal{
{
Name: "donkey",
PluralName: "donkeys",
},
Animal{
{
Name: "zebra",
PluralName: "zebras",
},
Expand All @@ -32,31 +32,31 @@ func getEquines() []Animal {
a.MaxTemperature = 10
a.Size = size.GetCategoryByName("medium")
a.Resources = []resource.Resource{
resource.Resource{
{
Name: a.Name + " hide",
Origin: a.Name,
Type: "hide",
Commonality: 3,
},
resource.Resource{
{
Name: a.Name + " milk",
Origin: a.Name,
Type: "milk",
Commonality: 3,
},
resource.Resource{
{
Name: a.Name,
Origin: a.Name,
Type: "meat",
Commonality: 3,
},
resource.Resource{
{
Name: a.Name,
Origin: a.Name,
Type: "mount",
Commonality: 7,
},
resource.Resource{
{
Name: a.Name,
Origin: a.Name,
Type: "pack animal",
Expand Down
Loading

0 comments on commit 332ba23

Please sign in to comment.