From 29a2a58d0e5b3167ca4098715341caef1db17f83 Mon Sep 17 00:00:00 2001 From: Jeffrey Duroyon Date: Mon, 11 May 2020 00:03:32 +0200 Subject: [PATCH] feat: add json format --- storage/model/cage.go | 2 +- storage/model/game.go | 8 ++++---- storage/model/hamster.go | 40 ++++++++++++++++++++-------------------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/storage/model/cage.go b/storage/model/cage.go index c1618d4..6d19aaf 100644 --- a/storage/model/cage.go +++ b/storage/model/cage.go @@ -1,5 +1,5 @@ package model type Cage struct { - Hamsters []*Hamster + Hamsters []*Hamster `json:"hamsters"` } diff --git a/storage/model/game.go b/storage/model/game.go index 8155846..2e8bce1 100644 --- a/storage/model/game.go +++ b/storage/model/game.go @@ -1,8 +1,8 @@ package model type Game struct { - ID string - server Server - Cages []*Cage - SelledHamster []*Hamster + ID string `json:"game_id"` + Server Server `json:"server"` + Cages []*Cage `json:"cages"` + SoldHamster []*Hamster `json:"sold_hamsters"` } diff --git a/storage/model/hamster.go b/storage/model/hamster.go index 1d919e9..2f58209 100644 --- a/storage/model/hamster.go +++ b/storage/model/hamster.go @@ -30,24 +30,24 @@ const ( var GlobalHamsterNumber = 1 type Hamster struct { - ID string - Name string - Number int - Sexe string - Age int // in days - Father *Hamster - Mother *Hamster - HungerLevel int8 - ThirstLevel int8 - Weight float64 - Height float64 - Alive bool - Selled bool - Gestation bool - GestationPeriod int8 - GestationCooldown int8 - GestationFather *Hamster - Child []*Hamster + ID string `json:"id"` + Name string `json:"name"` + Number int `json:"number"` + Sexe string `json:"sexe"` + Age int `json:"age"` + Father *Hamster `json:"father"` + Mother *Hamster `json:"mother"` + HungerLevel int8 `json:"hunger_level"` + ThirstLevel int8 `json:"thirst_level"` + Weight float64 `json:"weight"` + Height float64 `json:"height"` + Alive bool `json:"alive"` + Sold bool `json:"sold"` + Gestation bool `json:"gestation"` + GestationPeriod int8 `json:"gestation_period"` + GestationCooldown int8 `json:"gestation_cooldown"` + GestationFather *Hamster `json:"gestation_father"` + Child []*Hamster `json:"childs"` } func (h *Hamster) Die() { @@ -100,7 +100,7 @@ func (h *Hamster) Fuck(another *Hamster) (bool, error) { } func Born(father *Hamster, mother *Hamster) ([]*Hamster, error) { - if !mother.Alive || mother.Selled { + if !mother.Alive || mother.Sold { return nil, errors.New("the mother is not here") } if mother.GestationPeriod != TotalGestationPeriod { @@ -125,7 +125,7 @@ func Born(father *Hamster, mother *Hamster) ([]*Hamster, error) { HungerLevel: Full, ThirstLevel: Full, Alive: true, - Selled: false, + Sold: false, Gestation: false, GestationPeriod: 0, GestationCooldown: 30,