thefish/alchemyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix flags loading

Browse Source
This commit is contained in:
thefish 2022-10-18 06:37:11 +03:00
parent def43265de
commit f52e235799
2 changed files with 251 additions and 243 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

315
engine/items/itemprops/ip_test.go
View File

@ -1,18 +1,18 @@
package itemprops package itemprops
import ( import (
"encoding/json" "encoding/json"
"github.com/rs/zerolog" "github.com/rs/zerolog"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"github.com/shopspring/decimal" "github.com/shopspring/decimal"
"github.com/stretchr/testify/suite" "github.com/stretchr/testify/suite"
"os" "os"
"testing" "testing"
"time" "time"
) )
type IpTestSuite struct { type IpTestSuite struct {
suite.Suite suite.Suite
} }
// метод для установки тестовых данных для всего набора, запускается до всего прочего // метод для установки тестовых данных для всего набора, запускается до всего прочего
@ -30,179 +30,180 @@ func (suite *IpTestSuite) SetupTest() {}
func (suite *IpTestSuite) TearDownTest() {} func (suite *IpTestSuite) TearDownTest() {}
func TestApi(t *testing.T) { func TestApi(t *testing.T) {
tests := new(IpTestSuite) tests := new(IpTestSuite)
suite.Run(t, tests) suite.Run(t, tests)
} }
func (suite *IpTestSuite) TestMaterialWeightAndVolume() { func (suite *IpTestSuite) TestMaterialWeightAndVolume() {
// плотность https://tekkos.ru/katalog/poleznaya-informatsiya/tablica-plotnosti-stali-kg-m3.html // плотность https://tekkos.ru/katalog/poleznaya-informatsiya/tablica-plotnosti-stali-kg-m3.html
// ударная вязкость https://nposanef.ru/DOCUMENTS/PB-03-605-03/PB-03-605-03_Tab-2.6.pdf // ударная вязкость https://nposanef.ru/DOCUMENTS/PB-03-605-03/PB-03-605-03_Tab-2.6.pdf
// температура плавления http://zaozmi.ru/polezno/temperatura_plavleniya_metallov.html // температура плавления http://zaozmi.ru/polezno/temperatura_plavleniya_metallov.html
// температура кипения http://temperatures.ru/pages/temperatura_plavleniya_i_kipeniya // температура кипения http://temperatures.ru/pages/temperatura_plavleniya_i_kipeniya
// Пределы прочности некоторых материалов https://sevparitet.ru/raznoe/koefficient-uprugosti-tablica.html // Пределы прочности некоторых материалов https://sevparitet.ru/raznoe/koefficient-uprugosti-tablica.html
metalMaterialFlags := MaterialFlags{ metalMaterialFlags := MaterialFlags{
ConductsElictricity: true, ConductsElictricity: true,
BlocksLiquid: true, BlocksLiquid: true,
AcidResistant: true, AcidResistant: true,
BlocksGas: true, BlocksGas: true,
Flammable: false, Flammable: false,
ConductsHeat: true, ConductsHeat: true,
Radiates: true, Radiates: true,
} }
woodMaterialFlags := MaterialFlags{ woodMaterialFlags := MaterialFlags{
ConductsElictricity: false, ConductsElictricity: false,
BlocksLiquid: true, BlocksLiquid: true,
AcidResistant: false, AcidResistant: false,
BlocksGas: true, BlocksGas: true,
Flammable: true, Flammable: true,
ConductsHeat: false, ConductsHeat: false,
Radiates: false, Radiates: false,
} }
teststeel := Material{ teststeel := Material{
Name: "teststeel", Name: "teststeel",
Flags: metalMaterialFlags, Flags: metalMaterialFlags,
Density: DimensionItemDensity{decimal.NewFromInt(7800)}, Density: DimensionItemDensity{decimal.NewFromInt(7800)},
FractureToughness: DimensionFractureToughness{decimal.NewFromInt(30)}, FractureToughness: DimensionFractureToughness{decimal.NewFromInt(30)},
MeltingPoint: DimensionItemNullTemperature{decimal.NullDecimal{decimal.NewFromInt(1400), true}}, MeltingPoint: DimensionItemNullTemperature{decimal.NullDecimal{decimal.NewFromInt(1400), true}},
BoilingPoint: DimensionItemNullTemperature{decimal.NullDecimal{decimal.NewFromInt(3200), true}}, BoilingPoint: DimensionItemNullTemperature{decimal.NullDecimal{decimal.NewFromInt(3200), true}},
} }
testOakWood := Material{ testOakWood := Material{
Name: "testoakwood", Name: "testoakwood",
Flags: woodMaterialFlags, Flags: woodMaterialFlags,
Density: DimensionItemDensity{decimal.NewFromInt(700)}, Density: DimensionItemDensity{decimal.NewFromInt(700)},
FractureToughness: DimensionFractureToughness{decimal.NewFromFloat(4.5)}, FractureToughness: DimensionFractureToughness{decimal.NewFromFloat(4.5)},
MeltingPoint: DimensionItemNullTemperature{decimal.NullDecimal{decimal.NewFromInt(600), true}}, //загорается при 600 град Цельсия MeltingPoint: DimensionItemNullTemperature{decimal.NullDecimal{decimal.NewFromInt(600), true}}, //загорается при 600 град Цельсия
} }
testCube := ItemPhysics{ testCube := ItemPhysics{
Material: teststeel, Material: teststeel,
DimensionItemRigidity: DimensionItemRigidity{decimal.NewFromInt(65)}, DimensionItemRigidity: DimensionItemRigidity{decimal.NewFromInt(65)},
DimensionItemSize: DimensionItemSize{ DimensionItemSize: DimensionItemSize{
Width: decimal.NewFromFloat(0.1), Width: decimal.NewFromFloat(0.1),
Height: decimal.NewFromFloat(0.1), Height: decimal.NewFromFloat(0.1),
Depth: decimal.NewNullDecimal(decimal.NewFromFloat(0.1)), Depth: decimal.NewNullDecimal(decimal.NewFromFloat(0.1)),
Thickness: decimal.NullDecimal{}, Thickness: decimal.NullDecimal{},
}, },
DimensionItemTemperature: DimensionItemTemperature{decimal.NewFromInt(20)}, DimensionItemTemperature: DimensionItemTemperature{decimal.NewFromInt(20)},
} }
suite.Equal(decimal.NewFromFloat(7.8).String(), testCube.Weight().String()) suite.Equal(decimal.NewFromFloat(7.8).String(), testCube.Weight().String())
suite.Equal(decimal.NewFromFloat(0.001).String(), testCube.Volume().String()) suite.Equal(decimal.NewFromFloat(0.001).String(), testCube.Volume().String())
testOakCube := ItemPhysics{ testOakCube := ItemPhysics{
Material: testOakWood, Material: testOakWood,
DimensionItemRigidity: DimensionItemRigidity{decimal.NewFromInt(4)}, DimensionItemRigidity: DimensionItemRigidity{decimal.NewFromInt(4)},
DimensionItemSize: DimensionItemSize{ DimensionItemSize: DimensionItemSize{
Width: decimal.NewFromFloat(0.1), Width: decimal.NewFromFloat(0.1),
Height: decimal.NewFromFloat(0.1), Height: decimal.NewFromFloat(0.1),
Depth: decimal.NewNullDecimal(decimal.NewFromFloat(0.1)), Depth: decimal.NewNullDecimal(decimal.NewFromFloat(0.1)),
Thickness: decimal.NullDecimal{}, Thickness: decimal.NullDecimal{},
}, },
DimensionItemTemperature: DimensionItemTemperature{decimal.NewFromInt(20)}, DimensionItemTemperature: DimensionItemTemperature{decimal.NewFromInt(20)},
} }
//oakwood is ~10 times lighter than steel //oakwood is ~10 times lighter than steel
suite.Equal(decimal.NewFromFloat(0.7).String(), testOakCube.Weight().String()) suite.Equal(decimal.NewFromFloat(0.7).String(), testOakCube.Weight().String())
suite.Equal(decimal.NewFromFloat(0.001).String(), testOakCube.Volume().String()) suite.Equal(decimal.NewFromFloat(0.001).String(), testOakCube.Volume().String())
testCuirass := ItemPhysics{ testCuirass := ItemPhysics{
Material: teststeel, Material: teststeel,
DimensionItemRigidity: DimensionItemRigidity{decimal.NewFromInt(55)}, DimensionItemRigidity: DimensionItemRigidity{decimal.NewFromInt(55)},
DimensionItemSize: DimensionItemSize{ DimensionItemSize: DimensionItemSize{
Width: decimal.NewFromFloat(0.5), //60 cm wide Width: decimal.NewFromFloat(0.5), //60 cm wide
Height: decimal.NewFromFloat(0.8), //80 cm high Height: decimal.NewFromFloat(0.8), //80 cm high
Depth: decimal.NewNullDecimal(decimal.NewFromFloat(0.4)), //50 cm deep Depth: decimal.NewNullDecimal(decimal.NewFromFloat(0.4)), //50 cm deep
Thickness: decimal.NewNullDecimal(decimal.NewFromFloat(0.001)), // 1mm thick Thickness: decimal.NewNullDecimal(decimal.NewFromFloat(0.001)), // 1mm thick
}, },
DimensionItemTemperature: DimensionItemTemperature{}, DimensionItemTemperature: DimensionItemTemperature{},
} }
//12.1992 kg HEAVY ARMOR IS HEAVY //12.1992 kg HEAVY ARMOR IS HEAVY
suite.Equal(decimal.NewFromFloat(12.1992).String(), testCuirass.Weight().String()) suite.Equal(decimal.NewFromFloat(12.1992).String(), testCuirass.Weight().String())
//0.001564 m3 of steel //0.001564 m3 of steel
suite.Equal(decimal.NewFromFloat(0.001564).String(), testCuirass.Volume().String()) suite.Equal(decimal.NewFromFloat(0.001564).String(), testCuirass.Volume().String())
} }
func (suite *IpTestSuite) TestMaterialSerialization() { func (suite *IpTestSuite) TestMaterialSerialization() {
metalMaterialFlags := MaterialFlags{ metalMaterialFlags := MaterialFlags{
ConductsElictricity: true, ConductsElictricity: true,
BlocksLiquid: true, BlocksLiquid: true,
AcidResistant: true, AcidResistant: true,
BlocksGas: true, BlocksGas: true,
Flammable: false, Flammable: false,
ConductsHeat: true, ConductsHeat: true,
Radiates: true, Radiates: true,
} }
woodMaterialFlags := MaterialFlags{ woodMaterialFlags := MaterialFlags{
ConductsElictricity: false, ConductsElictricity: false,
BlocksLiquid: true, BlocksLiquid: true,
AcidResistant: false, AcidResistant: false,
BlocksGas: true, BlocksGas: true,
Flammable: true, Flammable: true,
ConductsHeat: false, ConductsHeat: false,
Radiates: false, Radiates: false,
} }
teststeel := Material{ teststeel := Material{
Name: "teststeel", Name: "teststeel",
Flags: metalMaterialFlags, Flags: metalMaterialFlags,
Density: DimensionItemDensity{decimal.NewFromInt(7800)}, Density: DimensionItemDensity{decimal.NewFromInt(7800)},
FractureToughness: DimensionFractureToughness{decimal.NewFromInt(30)}, FractureToughness: DimensionFractureToughness{decimal.NewFromInt(30)},
MeltingPoint: DimensionItemNullTemperature{decimal.NullDecimal{decimal.NewFromInt(1400), true}}, MeltingPoint: DimensionItemNullTemperature{decimal.NullDecimal{decimal.NewFromInt(1400), true}},
BoilingPoint: DimensionItemNullTemperature{decimal.NullDecimal{decimal.NewFromInt(3200), true}}, BoilingPoint: DimensionItemNullTemperature{decimal.NullDecimal{decimal.NewFromInt(3200), true}},
} }
testOakWood := Material{ testOakWood := Material{
Name: "testoakwood", Name: "testoakwood",
Flags: woodMaterialFlags, Flags: woodMaterialFlags,
Density: DimensionItemDensity{decimal.NewFromInt(700)}, Density: DimensionItemDensity{decimal.NewFromInt(700)},
FractureToughness: DimensionFractureToughness{decimal.NewFromFloat(4.5)}, FractureToughness: DimensionFractureToughness{decimal.NewFromFloat(4.5)},
MeltingPoint: DimensionItemNullTemperature{decimal.NullDecimal{decimal.NewFromInt(600), true}}, //загорается при 600 град Цельсия MeltingPoint: DimensionItemNullTemperature{decimal.NullDecimal{decimal.NewFromInt(600), true}}, //загорается при 600 град Цельсия
} }
bytes, err := json.Marshal(teststeel) bytes, err := json.Marshal(teststeel)
suite.NoError(err) suite.NoError(err)
suite.Equal( suite.Equal(
`{"name":"teststeel","material_flags":{"conducts_elictricity":true,"blocks_liquid":true,"acid_resistant":true,"blocks_gas":true,"flammable":false,"conducts_heat":true,"radiates":true},"density":"7800","fracture_toughness":"30","melting_point":"1400","boiling_point":"3200"}`, `{"name":"teststeel","material_flags":{"conducts_elictricity":true,"blocks_liquid":true,"acid_resistant":true,"blocks_gas":true,"flammable":false,"conducts_heat":true,"radiates":true},"density":"7800","fracture_toughness":"30","melting_point":"1400","boiling_point":"3200"}`,
string(bytes), string(bytes),
) )
bytes, err = json.Marshal(testOakWood) bytes, err = json.Marshal(testOakWood)
suite.NoError(err) suite.NoError(err)
suite.Equal(`{"name":"testoakwood","material_flags":{"conducts_elictricity":false,"blocks_liquid":true,"acid_resistant":false,"blocks_gas":true,"flammable":true,"conducts_heat":false,"radiates":false},"density":"700","fracture_toughness":"4.5","melting_point":"600","boiling_point":null}`, suite.Equal(`{"name":"testoakwood","material_flags":{"conducts_elictricity":false,"blocks_liquid":true,"acid_resistant":false,"blocks_gas":true,"flammable":true,"conducts_heat":false,"radiates":false},"density":"700","fracture_toughness":"4.5","melting_point":"600","boiling_point":null}`,
string(bytes), string(bytes),
) )
} }
func (suite *IpTestSuite) TestMaterialDeserialization() { func (suite *IpTestSuite) TestMaterialDeserialization() {
logger := log.Output(zerolog.ConsoleWriter{Out: os.Stdout, TimeFormat: time.RFC3339}) logger := log.Output(zerolog.ConsoleWriter{Out: os.Stdout, TimeFormat: time.RFC3339})
mm, err := NewMaterialMap("../../..", logger) mm, err := NewMaterialMap("../../..", logger)
suite.NoError(err) suite.NoError(err)
metalMaterialFlags := MaterialFlags{ metalMaterialFlags := MaterialFlags{
ConductsElictricity: true, ConductsElictricity: true,
BlocksLiquid: true, BlocksLiquid: true,
AcidResistant: true, AcidResistant: true,
BlocksGas: true, BlocksGas: true,
Flammable: false, Flammable: false,
ConductsHeat: true, ConductsHeat: true,
Radiates: true, Radiates: true,
} }
teststeel := Material{ teststeel := Material{
Name: "teststeel", Name: "steel",
Flags: metalMaterialFlags, Flags: metalMaterialFlags,
Density: DimensionItemDensity{decimal.NewFromInt(7800)}, Density: DimensionItemDensity{decimal.NewFromInt(7800)},
FractureToughness: DimensionFractureToughness{decimal.NewFromInt(30)}, FractureToughness: DimensionFractureToughness{decimal.NewFromInt(30)},
MeltingPoint: DimensionItemNullTemperature{decimal.NullDecimal{decimal.NewFromInt(1400), true}}, MeltingPoint: DimensionItemNullTemperature{decimal.NullDecimal{decimal.NewFromInt(1400), true}},
BoilingPoint: DimensionItemNullTemperature{decimal.NullDecimal{decimal.NewFromInt(3200), true}}, BoilingPoint: DimensionItemNullTemperature{decimal.NullDecimal{decimal.NewFromInt(3200), true}},
} }
_ = teststeel loadedsteel := mm["steel"]
_ = mm suite.Equalf(teststeel, *loadedsteel, "error: %s")
_ = mm
} }

179
engine/items/itemprops/material.go
View File

@ -1,109 +1,116 @@
package itemprops package itemprops
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"github.com/rs/zerolog" "github.com/rs/zerolog"
"io/ioutil" "io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
"strings" "strings"
) )
type Material struct { type Material struct {
Id string `json:"id"` Id string `json:"id"`
Name string `json:"name"` Name string `json:"name"`
Flags MaterialFlags `json:"material_flags"` Flags MaterialFlags `json:"material_flags"`
Density DimensionItemDensity `json:"density"` Density DimensionItemDensity `json:"density"`
FractureToughness DimensionFractureToughness `json:"fracture_toughness"` FractureToughness DimensionFractureToughness `json:"fracture_toughness"`
MeltingPoint DimensionItemNullTemperature `json:"melting_point,omitempty"` MeltingPoint DimensionItemNullTemperature `json:"melting_point,omitempty"`
BoilingPoint DimensionItemNullTemperature `json:"boiling_point,omitempty"` BoilingPoint DimensionItemNullTemperature `json:"boiling_point,omitempty"`
} }
func (m Material) Unmarshal() {} func (m Material) Unmarshal() {}
type MaterialFlags struct { type MaterialFlags struct {
ConductsElictricity bool `json:"conducts_elictricity"` ConductsElictricity bool `json:"conducts_elictricity"`
BlocksLiquid bool `json:"blocks_liquid"` BlocksLiquid bool `json:"blocks_liquid"`
AcidResistant bool `json:"acid_resistant"` AcidResistant bool `json:"acid_resistant"`
BlocksGas bool `json:"blocks_gas"` BlocksGas bool `json:"blocks_gas"`
Flammable bool `json:"flammable"` Flammable bool `json:"flammable"`
ConductsHeat bool `json:"conducts_heat"` ConductsHeat bool `json:"conducts_heat"`
Radiates bool `json:"radiates"` Radiates bool `json:"radiates"`
} }
type MaterialMap map[string]Material type MaterialMap map[string]*Material
type tt map[string]MaterialMap type tt map[string]MaterialMap
func NewMaterialMap(path string, logger zerolog.Logger) (*MaterialMap, error) { func NewMaterialMap(path string, logger zerolog.Logger) (MaterialMap, error) {
mm := &MaterialMap{} mm := make(MaterialMap)
tmp := make(map[string][]interface{}) tmp := make(map[string][]interface{})
flags := make(map[string]*MaterialFlags) flags := make(map[string]*MaterialFlags)
err := filepath.Walk(path+"/assets/materials", err := filepath.Walk(path+"/assets/materials",
func(path string, info os.FileInfo, err error) error { func(path string, info os.FileInfo, err error) error {
if err != nil { if err != nil {
return err return err
} }
if strings.HasSuffix(path, ".json") { if strings.HasSuffix(path, ".json") {
splt := strings.Split(path, "/") splt := strings.Split(path, "/")
logger.Info().Msgf("loading %s %d", splt[len(splt)-1], info.Size()) logger.Info().Msgf("loading %s %d", splt[len(splt)-1], info.Size())
bytes, err := ioutil.ReadFile(path) bytes, err := ioutil.ReadFile(path)
if err != nil { if err != nil {
return err return err
} }
ttmp := make(map[string][]interface{}) ttmp := make(map[string][]interface{})
err = json.Unmarshal(bytes, &ttmp) err = json.Unmarshal(bytes, &ttmp)
if err != nil { if err != nil {
return err return err
} }
for idx, _ := range ttmp { for idx, _ := range ttmp {
tmp[idx] = append(tmp[idx], ttmp[idx]...) tmp[idx] = append(tmp[idx], ttmp[idx]...)
} }
} }
return nil return nil
}) })
_ = flags _ = flags
if lst, ok := tmp["material_flags"]; ok { if lst, ok := tmp["material_flags"]; ok {
for _, item := range lst { for _, item := range lst {
ttt := item.(map[string]interface{}) ttt := item.(map[string]interface{})
_ = ttt _ = ttt
for clause, item2 := range ttt { for clause, item2 := range ttt {
bts, err := json.Marshal(item2) bts, err := json.Marshal(item2)
if err != nil { if err != nil {
return nil, fmt.Errorf("Could not marshal back:%w", err) return nil, fmt.Errorf("Could not marshal back:%w", err)
} }
flags[clause] = &MaterialFlags{} flags[clause] = &MaterialFlags{}
err = json.Unmarshal(bts, flags[clause]) err = json.Unmarshal(bts, flags[clause])
if err != nil { if err != nil {
return nil, fmt.Errorf("Could not unmarshal to material_flags:%w", err) return nil, fmt.Errorf("Could not unmarshal to material_flags:%w", err)
} }
} }
} }
} }
logger.Info().Msgf("loaded %d material flag sets", len(flags)) logger.Info().Msgf("loaded %d material flag sets", len(flags))
if lst, ok := tmp["materials"]; ok { if lst, ok := tmp["materials"]; ok {
for _, item := range lst { for _, item := range lst {
ttt := item.(map[string]interface{}) ttt := item.(map[string]interface{})
_ = ttt _ = ttt
for clause, item2 := range ttt { for clause, item2 := range ttt {
bts, err := json.Marshal(item2) toReplace := item2.(map[string]interface{})["material_flags"]
if err != nil {
return nil, fmt.Errorf("Could not marshal back:%w", err) if ref, ok := toReplace.(map[string]interface{})["$ref"]; ok {
} rfs := strings.Split(ref.(string), "/")
flags[clause] = &MaterialFlags{} referredFlag := rfs[len(rfs)-1]
err = json.Unmarshal(bts, flags[clause]) item2.(map[string]interface{})["material_flags"] = flags[referredFlag]
if err != nil { }
return nil, fmt.Errorf("Could not unmarshal to material_flags:%w", err) bts, err := json.Marshal(item2)
} if err != nil {
} return nil, fmt.Errorf("Could not marshal back:%w", err)
} }
} mm[clause] = &Material{}
return mm, err err = json.Unmarshal(bts, mm[clause])
if err != nil {
return nil, fmt.Errorf("Could not unmarshal to material_flags:%w", err)
}
}
}
}
return mm, err
} }