siina/dorfylegends
siina/ dorfylegends
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

additional fields, structures

This commit is contained in:
Robert Janetzko 2022-04-29 12:21:27 +00:00
parent 1387a2938e
commit e210a3e3dd
18 changed files with 317 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
analyze/df/analyze.go
View File

@ -151,15 +151,27 @@ func CreateMetadata(a *AnalyzeData) (*Metadata, error) {
}
}
additional := make(map[string]Field)
if afs, ok := a.Overwrites.AdditionalFields[typeNames[k]]; ok {
for _, add := range afs {
additional[add.Name] = Field{
Name: add.Name,
Type: add.Type,
Legend: "add",
}
}
}
objects[typeNames[k]] = Object{
Name: typeNames[k],
Id: a.Fields[k+PATH_SEPARATOR+"id"] != nil,
Named: a.Fields[k+PATH_SEPARATOR+"name"] != nil,
Typed: a.Fields[k+PATH_SEPARATOR+"type"] != nil,
SubTypes: getSubtypes(a, k),
SubTypeOf: getSubtypeOf(k),
SubType: getSubtype(k),
Fields: objFields,
Name: typeNames[k],
Id: a.Fields[k+PATH_SEPARATOR+"id"] != nil,
Named: a.Fields[k+PATH_SEPARATOR+"name"] != nil,
Typed: a.Fields[k+PATH_SEPARATOR+"type"] != nil,
SubTypes: getSubtypes(a, k),
SubTypeOf: getSubtypeOf(k),
SubType: getSubtype(k),
Fields: objFields,
Additional: additional,
}
}
}

17
analyze/df/generate.go
View File

@ -7,14 +7,15 @@ import (
)
type Object struct {
Name string `json:"name"`
Id bool `json:"id,omitempty"`
Named bool `json:"named,omitempty"`
Typed bool `json:"typed,omitempty"`
SubTypes *[]Subtype `json:"subtypes,omitempty"`
SubTypeOf *string `json:"subtypeof,omitempty"`
SubType *string `json:"subtype,omitempty"`
Fields map[string]Field `json:"fields"`
Name string `json:"name"`
Id bool `json:"id,omitempty"`
Named bool `json:"named,omitempty"`
Typed bool `json:"typed,omitempty"`
SubTypes *[]Subtype `json:"subtypes,omitempty"`
SubTypeOf *string `json:"subtypeof,omitempty"`
SubType *string `json:"subtype,omitempty"`
Fields map[string]Field `json:"fields"`
Additional map[string]Field `json:"additional"`
}
type Subtype struct {

3
analyze/df/generate_backend.go
View File

@ -102,6 +102,9 @@ type {{ $obj.Name }} struct {
{{- if not (not $obj.SubTypes) }}
Details {{ $obj.Name }}Details
{{- end }}
{{- range $fname, $field := $obj.Additional }}
{{ $field.TypeLine }} // {{ $fname }}
{{- end }}
}
func New{{ $obj.Name }}() *{{ $obj.Name }} {

23
analyze/df/structure.go
View File

@ -51,8 +51,9 @@ func NewFieldData() *FieldData {
}
type AnalyzeData struct {
Fields map[string]*FieldData
SubTypes map[string]*map[string]*Subtype
Fields map[string]*FieldData
SubTypes map[string]*map[string]*Subtype
Overwrites *Overwrites
}
func NewAnalyzeData() *AnalyzeData {
@ -78,6 +79,16 @@ func LoadAnalyzeData() (*AnalyzeData, error) {
a := NewAnalyzeData()
json.Unmarshal(data, a)
data, err = ioutil.ReadFile("overwrites.json")
if err != nil {
return nil, err
}
overwrites := &Overwrites{}
json.Unmarshal(data, overwrites)
a.Overwrites = overwrites
return a, nil
}
@ -120,8 +131,14 @@ type AnalyzeContext struct {
overwrites *Overwrites
}
type AdditionalField struct {
Name string
Type string
}
type Overwrites struct {
ForceEnum map[string]bool
ForceEnum map[string]bool
AdditionalFields map[string][]AdditionalField
}
func analyze(file string, a *AnalyzeData) error {

8
analyze/overwrites.json
View File

@ -2,5 +2,13 @@
"ForceEnum": {
"df_world|historical_events|historical_event+HfDied|cause": true,
"df_world|historical_events|historical_event+HfDied|death_cause": true
},
"AdditionalFields": {
"Structure": [
{
"Name": "SiteId",
"Type": "int"
}
]
}
}

2
backend/model/context.go
View File

@ -112,7 +112,7 @@ func (c *Context) site(id int, prefix string) string {
func (c *Context) structure(siteId, structureId int) string {
if x, ok := c.World.Sites[siteId]; ok {
if y, ok := x.Structures[structureId]; ok {
return fmt.Sprintf(`<a class="structure" href="/site/%d/structure/%d">%s</a>`, siteId, structureId, util.Title(y.Name()))
return fmt.Sprintf(`<a class="structure" href="/site/%d/structure/%d"><i class="%s fa-xs"></i>&nbsp;%s</a>`, siteId, structureId, y.Icon(), util.Title(y.Name()))
}
}
return "UNKNOWN STRUCTURE"

4
backend/model/extensions.go
View File

@ -144,6 +144,10 @@ func (s *Site) Type() string {
return s.Type_.String()
}
func (s *Structure) Type() string {
return s.Type_.String()
}
func (w *WorldConstruction) Type() string {
return w.Type_.String()
}

3
backend/model/functions.go
View File

@ -10,6 +10,9 @@ import (
var LinkHf = func(w *DfWorld, id int) template.HTML { return template.HTML((&Context{World: w}).hf(id)) }
var LinkEntity = func(w *DfWorld, id int) template.HTML { return template.HTML((&Context{World: w}).entity(id)) }
var LinkSite = func(w *DfWorld, id int) template.HTML { return template.HTML((&Context{World: w}).site(id, "")) }
var LinkStructure = func(w *DfWorld, siteId, id int) template.HTML {
return template.HTML((&Context{World: w}).structure(siteId, id))
}
var LinkRegion = func(w *DfWorld, id int) template.HTML { return template.HTML((&Context{World: w}).region(id)) }
var LinkWorldConstruction = func(w *DfWorld, id int) template.HTML {
return template.HTML((&Context{World: w}).worldConstruction(id))

30
backend/model/icons.go
View File

@ -64,6 +64,36 @@ func (x *Site) Icon() string {
return ""
}
func (x *Structure) Icon() string {
switch x.Type_ {
case StructureType_CountingHouse:
return "fa-solid fa-coins"
case StructureType_Dungeon:
return "fa-solid fa-dungeon"
case StructureType_Guildhall:
return "fa-solid fa-wrench"
case StructureType_InnTavern:
return "fa-solid fa-utensils"
case StructureType_Keep:
return "fa-brands fa-fort-awesome"
case StructureType_Library:
return "fa-solid fa-book"
case StructureType_Market:
return "fa-solid fa-store"
case StructureType_MeadHall:
return "fa-solid fa-warehouse"
case StructureType_Temple:
return "fa-solid fa-landmark-dome"
case StructureType_Tomb:
return "fa-solid fa-circle-stop"
case StructureType_Tower:
return "fa-solid fa-chess-rook"
case StructureType_UnderworldSpire:
return "fa-solid fa-monument"
}
return ""
}
func (x *WorldConstruction) Icon() string {
switch x.Type_ {
case WorldConstructionType_Bridge:

1
backend/model/model.go
View File

@ -19033,6 +19033,7 @@ type Structure struct {
Subtype StructureSubtype `json:"subtype" legend:"base"` // subtype
Type_ StructureType `json:"type" legend:"both"` // type
WorshipHfid int `json:"worshipHfid" legend:"base"` // worship_hfid
SiteId int `json:"siteId" legend:"add"` // SiteId
}
func NewStructure() *Structure {

4
backend/model/parse.go
View File

@ -143,9 +143,7 @@ BaseLoop:
}
ioutil.WriteFile("same.json", same, 0644)
for _, e := range world.HistoricalEvents {
e.Details.Html(&Context{World: world})
}
world.Process()
return world, nil
}

16
backend/model/process.go Normal file
View File

@ -0,0 +1,16 @@
package model
func (w *DfWorld) Process() {
// set site in structure
for _, site := range w.Sites {
for _, structure := range site.Structures {
structure.SiteId = site.Id_
}
}
// check events texts
for _, e := range w.HistoricalEvents {
e.Details.Html(&Context{World: w})
}
}

26
backend/server/server.go
View File

@ -54,6 +54,11 @@ func StartServer(world *model.DfWorld, static embed.FS) {
srv.RegisterWorldPage("/sites", "sites.html", func(p Parms) any { return grouped(srv.context.world.Sites) })
srv.RegisterWorldResourcePage("/site/{id}", "site.html", func(id int) any { return srv.context.world.Sites[id] })
srv.RegisterWorldPage("/structures", "structures.html", func(p Parms) any {
return flatGrouped(srv.context.world.Sites, func(s *model.Site) []*model.Structure { return util.Values(s.Structures) })
})
srv.RegisterWorldResourcePage("/structure/{id}", "site.html", func(id int) any { return srv.context.world.Sites[id/100].Structures[id%100] })
srv.RegisterWorldPage("/worldconstructions", "worldconstructions.html", func(p Parms) any { return grouped(srv.context.world.WorldConstructions) })
srv.RegisterWorldResourcePage("/worldconstruction/{id}", "worldconstruction.html", func(id int) any { return srv.context.world.WorldConstructions[id] })
@ -261,7 +266,26 @@ type namedTyped interface {
model.Typed
}
func grouped[T namedTyped](input map[int]T) map[string][]T {
func flatGrouped[K comparable, U any, V namedTyped](input map[K]U, mapper func(U) []V) map[string][]V {
output := make(map[string][]V)
for _, x := range input {
for _, v := range mapper(x) {
k := v.Type()
if v.Name() != "" {
output[k] = append(output[k], v)
}
}
}
for _, v := range output {
sort.Slice(v, func(i, j int) bool { return v[i].Name() < v[j].Name() })
}
return output
}
func grouped[K comparable, T namedTyped](input map[K]T) map[string][]T {
output := make(map[string][]T)
for _, v := range input {

1
backend/server/templates.go
View File

@ -29,6 +29,7 @@ func (srv *DfServer) LoadTemplates() {
"getEntity": func(id int) *model.Entity { return srv.context.world.Entities[id] },
"site": func(id int) template.HTML { return model.LinkSite(srv.context.world, id) },
"getSite": func(id int) *model.Site { return srv.context.world.Sites[id] },
"structure": func(siteId, id int) template.HTML { return model.LinkStructure(srv.context.world, siteId, id) },
"region": func(id int) template.HTML { return model.LinkRegion(srv.context.world, id) },
"getRegion": func(id int) *model.Region { return srv.context.world.Regions[id] },
"worldconstruction": func(id int) template.HTML { return model.LinkWorldConstruction(srv.context.world, id) },

152
backend/templates/hf.html
View File

@ -3,51 +3,131 @@
{{define "title"}}{{ title .Name }}{{end}}
{{define "content"}}
<h1>{{ title .Name }}</h1>
{{ .Race }} (*{{ .BirthYear }}{{ if ge .DeathYear 0 }} †{{ .DeathYear }}{{ end }})
<h3>{{ title .Name }}</h3>
{{if .Female }}
<i class="fa-solid fa-venus fa-xs"></i>
{{else}}
<i class="fa-solid fa-mars fa-xs"></i>
{{end}}
{{ .Race }} (*{{ .BirthYear }}{{ if ge .DeathYear 0 }} †{{ .DeathYear }}{{ end }})
{{- if or (ne 0 (len .EntityFormerPositionLink)) (ne 0 (len .EntityPositionLink)) }}
<h3>Positions</h3>
<ul>
{{- range $i := .EntityFormerPositionLink }}
<li>
{{ ((getEntity $i.EntityId).Position $i.PositionProfileId).Name }} of {{ entity $i.EntityId }} ({{
$i.StartYear }} - {{ $i.EndYear }})
</li>
<div class="row mt-3">
<div class="col-4">
{{- if ne 0 (len .SiteLink) }}
<h5>Sites</h5>
<ul>
{{- range $i := .SiteLink }}
<li>
{{ site $i.SiteId }} ({{ $i.LinkType }})
</li>
{{- end }}
</ul>
{{- end }}
{{- if or (ne 0 (len .EntityFormerPositionLink)) (ne 0 (len .EntityPositionLink)) }}
<h5>Positions</h5>
<ul>
{{- range $i := .EntityFormerPositionLink }}
<li>
{{ ((getEntity $i.EntityId).Position $i.PositionProfileId).Name }} of {{ entity $i.EntityId }} ({{
$i.StartYear }} - {{ $i.EndYear }})
</li>
{{- end }}
{{- range $i := .EntityPositionLink }}
<li>
of {{ entity $i.EntityId }}
</li>
{{- end }}
</ul>
{{- end }}
</div>
{{- if ne 0 (len .HfLink) }}
<div class="col-4">
<h5>Related Figures</h5>
<ul>
{{- range $i := .HfLink }}
<li>
{{ hf $i.Hfid }} ({{ $i.LinkType }})
</li>
{{- end }}
</ul>
</div>
{{- end }}
{{- range $i := .EntityPositionLink }}
<li>
of {{ entity $i.EntityId }}
</li>
{{- if ne 0 (len .EntityLink) }}
<div class="col-4">
<h5>Related Entities</h5>
<ul>
{{- range $i := .EntityLink }}
<li>
{{ entity $i.EntityId }} ({{ $i.LinkType }})
</li>
{{- end }}
</ul>
</div>
{{- end }}
</ul>
{{- end }}
</div>
{{- if ne 0 (len .HfLink) }}
<h3>Related Figures</h3>
<ul>
{{- range $i := .HfLink }}
<li>
{{ hf $i.Hfid }} ({{ $i.LinkType }})
</li>
<div class="row">
{{- if ne 0 (len .EntityReputation) }}
<div class="col-4">
<h5>Entity Reputations</h5>
<ul>
{{- range $i := .EntityReputation }}
<li>
{{ entity $i.EntityId }}
<ul>
{{if gt .UnsolvedMurders 0}}<li>Unsolved Murders: {{.UnsolvedMurders}}</li>{{end}}
{{if gt .FirstAgelessYear 0}}<li>First Suspected Ageless Year: {{.FirstAgelessYear}}</li>{{end}}
</ul>
</li>
{{- end }}
</ul>
</div>
{{- end }}
</ul>
{{- end }}
{{- if ne 0 (len .EntityLink) }}
<h3>Related Entities</h3>
<ul>
{{- range $i := .EntityLink }}
<li>
{{ entity $i.EntityId }} ({{ $i.LinkType }})
</li>
{{- if ne 0 (len .VagueRelationship) }}
<div class="col-4">
<h5>Relationships</h5>
<ul>
{{- range $i := .VagueRelationship }}
<li>
{{ hf $i.Hfid }} (TODO)
</li>
{{- end }}
</ul>
</div>
{{- end }}
</ul>
{{- end }}
<h3>Events</h3>
{{- if ne 0 (len .IntrigueActor) }}
<div class="col-8">
<h5>Intrigue Actors</h5>
<ul>
{{- range $i := .IntrigueActor }}
<li>
{{if ne .EntityId -1}}{{entity .EntityId}}{{else}}{{ hf .Hfid }}{{end}} - {{.Role}} - {{.Strategy}}
</li>
{{- end }}
</ul>
</div>
{{- end }}
{{- if ne 0 (len .IntriguePlot) }}
<div class="col-4">
<h5>Intrigue Plots</h5>
<ul>
{{- range $i := .IntriguePlot }}
<li>
{{ .Type_ }}{{if .OnHold}} (on hold){{end}}
</li>
{{- end }}
</ul>
</div>
{{- end }}
</div>
<h5>Events</h5>
{{ template "events.html" events . }}
{{ json . }}
{{ json . }}
{{end}}

23
backend/templates/reputations Normal file
View File

@ -0,0 +1,23 @@
{{if ge .RepHero 0}}<li>Hero: $r.repHero</li>{{end}}
{{if ge .RepViolent 0}}<li>Violent: $r.repViolent</li>{{end}}
{{if ge .RepPsychopath 0}}<li>Psychopath: $r.repPsychopath</li>{{end}}
{{if ge .RepEnemyFighter 0}}<li>Enemy Fighter: $r.repEnemyFighter</li>{{end}}
{{if ge .RepFriendlyFighter 0}}<li>Enemy Fighter: $r.repEnemyFighter</li>{{end}}
{{if ge .RepKiller 0}}<li>Killer: $r.repKiller</li>{{end}}
{{if ge .RepMurderer 0}}<li>Murderer: $r.repMurderer</li>{{end}}
{{if ge .RepPoet 0}}<li>Poet: $r.repPoet</li>{{end}}
{{if ge .RepBard 0}}<li>Bard: $r.repBard</li>{{end}}
{{if ge .RepDancer 0}}<li>Dancer: $r.repDancer</li>{{end}}
{{if ge .RepStoryteller 0}}<li>Storyteller: $r.repStoryteller</li>{{end}}
{{if ge .RepTreasureHunter 0}}<li>Treasure Hunter: $r.repTreasureHunter</li>{{end}}
{{if ge .RepPreacher 0}}<li>Preacher: $r.repPreacher</li>{{end}}
{{if ge .RepBrigand 0}}<li>Brigand: $r.repBrigand</li>{{end}}
{{if ge .RepIntruder 0}}<li>Intruder: $r.repIntruder</li>{{end}}
{{if ge .RepMonster 0}}<li>Monster: $r.repMonster</li>{{end}}
{{if ge .RepThief 0}}<li>Thief: $r.repThief</li>{{end}}
{{if ge .RepHatedGroup 0}}<li>Member of Hated Group: $r.repHatedGroup</li>{{end}}
{{if ge .RepRespectedGroup 0}}<li>Member of Respected Group: $r.repRespectedGroup</li>{{end}}
{{if ge .RepHunter 0}}<li>Hunter: $r.repHunter</li>{{end}}
{{if ge .RepLoyalSoldier 0}}<li>Loyal Soldier: $r.repLoyalSoldier</li>{{end}}
{{if ge .RepComrade 0}}<li>Comrade: $r.repComrade</li>{{end}}
{{if ge .RepBully 0}}<li>Bully: $r.repBully</li>{{end}}

6
backend/templates/site.html
View File

@ -3,10 +3,10 @@
{{define "title"}}{{ title .Name }}{{end}}
{{define "content"}}
<h1>{{ title .Name }}</h1>
<h3>Events</h3>
<h3>{{ title .Name }}</h3>
{{ .Type_ }}
<h5 class="mt-3">Events</h5>
{{ template "events.html" events . }}
<p>{{ json . }}</p>

33
backend/templates/structures.html Normal file
View File

@ -0,0 +1,33 @@
{{template "layout.html" .}}
{{define "title"}}Structures{{end}}
{{define "content"}}
<h3>Structures</h3>
<nav>
<div class="nav nav-tabs" id="nav-tab" role="tablist">
{{- range $t, $v := .}}
<button class="nav-link{{ ifFirst $ $t " active" }}" data-bs-toggle="tab" data-bs-target="#nav-{{kebab $t}}" type="button"
role="tab">{{$t}} ({{ len $v }})</button>
{{- end}}
</div>
</nav>
<div class="tab-content" id="nav-tabContent">
{{- range $t, $v := . }}
<div class="tab-pane{{ ifFirst $ $t " active" }}" id="nav-{{kebab $t}}" role="tabpanel" aria-labelledby="nav-home-tab">
<table>
<tr>
<th width="100%">Name</th>
</tr>
{{- range $v }}{{- if not (eq .Name "") }}
<tr>
<td>{{ structure .SiteId .Id }}</td>
</tr>
{{- end}}{{- end}}
</table>
</div>
{{- end}}
</div>
{{- end }}