Prefix,Suffix,LevelReq Socketed items on bases, bodyloc, Merc equipment (#74)
* Prefix,Suffix, Socketed with base, bodyloc, Merc equipment Will add better description later: Item that has socketed items now display their linked runes/jewels/gems in accurate order Rare prefix, rare suffix id Magic prefix1,2,3 magic suffix1,2,3 Prefix1 also used to tell wich runeword it is Spirit 20635, cta 20519 , infinity 20566 see : getlocalestring.txt Mercenary equipment now displaying in inventory list . Also has custom location : mercenary instead of equipped Bodyloc : // Body locations LocNone LocationType = "none" LocHead LocationType = "head" LocNeck LocationType = "neck" LocTorso LocationType = "torso" LocLeftArm LocationType = "left_arm" LocRightArm LocationType = "right_arm" LocLeftRing LocationType = "left_ring" LocRightRing LocationType = "right_ring" LocBelt LocationType = "belt" LocFeet LocationType = "feet" LocGloves LocationType = "gloves" LocLeftArmSecondary LocationType = "left_arm_secondary" LocRightArmSecondary LocationType = "right_arm_secondary" Note that if you begin game on secondary slot it will be left_arm then primary will be left_arm_secondary (inversed): With pr 62 (activeweaponslot) we will be able to solve this potential issue. * small optimization * Socketed items to base from pointer new helper functions. AutoAffix offset. * remove helpers fnc, flag isEquipped to HasBeenEquipped * Runewords names mapped * helper function not needed * Optimization * adjust pre-allocations * readd removed itemloc comment * Addex prefix/suffix to rules .nip new structure: [Type], [Quality],[Class], [Name], [Flag], [Color], [Prefix], [Suffix] # Stats Exemple : [name] == ring && [quality] == rare && [suffix] == 174 # Any magic ring with suffix 'of The Apprentice' ( 10 faster cast rate) Will be useful for trophy items with fool/cruel [prefix] == 1416 [prefix] == 1273 * LevelReq + Affixes mapping rare/magic/base/runewords. Nip parser LevelReq * Unique and set items mapping + LevelReq
This commit is contained in:
elb
@@ -80,3 +80,198 @@ var Desc = map[int]Description{
|
||||
{{ $value.UniqueId }}: {ID: {{ $value.UniqueId }}, Name: "{{ $value.Name }}", SelectX: {{ $value.SelectX }}, SelectY: {{ $value.SelectY }}, SelectDX: {{ $value.SelectDX }}, SelectDY: {{ $value.SelectDY }}, OffsetX: {{ $value.OffsetX }}, OffsetY: {{ $value.OffsetY }}, Direction: "{{ $value.Direction }}"},
|
||||
{{- end }}
|
||||
}`
|
||||
const templateRarePrefixes = `// Code generated by cmd/txttocode. DO NOT EDIT.
|
||||
// source: cmd/txttocode/txt/rareprefix.txt
|
||||
package item
|
||||
|
||||
type RarePrefix struct {
|
||||
ID int
|
||||
Name string
|
||||
ItemTypes []string
|
||||
ExcludeTypes []string
|
||||
}
|
||||
|
||||
var RarePrefixDesc = map[int]RarePrefix{
|
||||
{{- range $index, $value := . }}
|
||||
{{ add $index 156 }}: {ID: {{ add $index 156 }}, Name: "{{ $value.name }}", ItemTypes: []string{ {{- $types := slice }}{{- range $i := iterate 7 }}{{- with index $value (printf "itype%d" (add $i 1)) }}{{- if ne . "" }}{{- $types = append $types . }}{{- end }}{{- end }}{{- end }}{{- range $i, $type := $types }}{{if $i}}, {{end}}"{{ $type }}"{{- end -}} }, ExcludeTypes: []string{ {{- $types := slice }}{{- range $i := iterate 4 }}{{- with index $value (printf "etype%d" (add $i 1)) }}{{- if ne . "" }}{{- $types = append $types . }}{{- end }}{{- end }}{{- end }}{{- range $i, $type := $types }}{{if $i}}, {{end}}"{{ $type }}"{{- end -}} }},
|
||||
{{- end }}
|
||||
}`
|
||||
const templateRareSuffixes = `// Code generated by cmd/txttocode. DO NOT EDIT.
|
||||
// source: cmd/txttocode/txt/raresuffix.txt
|
||||
package item
|
||||
|
||||
type RareSuffix struct {
|
||||
ID int
|
||||
Name string
|
||||
ItemTypes []string
|
||||
}
|
||||
|
||||
var RareSuffixDesc = map[int]RareSuffix{
|
||||
{{- range $index, $value := . }}
|
||||
{{ add $index 1 }}: {ID: {{ add $index 1 }}, Name: "{{ $value.name }}", ItemTypes: []string{ {{- $types := slice }}{{- range $i := iterate 7 }}{{- with index $value (printf "itype%d" (add $i 1)) }}{{- if ne . "" }}{{- $types = append $types . }}{{- end }}{{- end }}{{- end }}{{- range $i, $type := $types }}{{if $i}}, {{end}}"{{ $type }}"{{- end -}} }},
|
||||
{{- end }}
|
||||
}`
|
||||
const templateMagicPrefixes = `// Code generated by cmd/txttocode. DO NOT EDIT.
|
||||
// source: cmd/txttocode/txt/magicprefix.txt
|
||||
package item
|
||||
|
||||
type MagicPrefix struct {
|
||||
ID int
|
||||
Name string
|
||||
Rare bool
|
||||
Level int
|
||||
LevelReq int
|
||||
Group int
|
||||
Mods []Mod
|
||||
TransformColor string
|
||||
ItemTypes []string
|
||||
ExcludeTypes []string
|
||||
}
|
||||
|
||||
var MagicPrefixDesc = map[int]MagicPrefix{
|
||||
{{- range $index, $value := . }}
|
||||
{{- if ne $value.Name "" }}
|
||||
{{ add $index 747 }}: {ID: {{ add $index 747 }}, Name: "{{ $value.Name }}", Rare: {{ if eq $value.rare "1" }}true{{ else }}false{{ end }}, Level: {{ if eq $value.level "" }}0{{ else }}{{ $value.level }}{{ end }}, LevelReq: {{ if eq $value.levelreq "" }}0{{ else }}{{ $value.levelreq }}{{ end }}, Group: {{ if eq $value.group "" }}0{{ else }}{{ $value.group }}{{ end }}, Mods: []Mod{ {{- $mods := slice }}{{- if ne $value.mod1code "" }}{{- $mods = append $mods (printf "{Code: \"%s\", Param: \"%s\", Min: %s, Max: %s}" $value.mod1code $value.mod1param (default $value.mod1min "0") (default $value.mod1max "0")) }}{{- end }}{{- if ne $value.mod2code "" }}{{- $mods = append $mods (printf "{Code: \"%s\", Param: \"%s\", Min: %s, Max: %s}" $value.mod2code $value.mod2param (default $value.mod2min "0") (default $value.mod2max "0")) }}{{- end }}{{- if ne $value.mod3code "" }}{{- $mods = append $mods (printf "{Code: \"%s\", Param: \"%s\", Min: %s, Max: %s}" $value.mod3code $value.mod3param (default $value.mod3min "0") (default $value.mod3max "0")) }}{{- end }}{{- range $i, $mod := $mods }}{{if $i}}, {{end}}{{ $mod }}{{- end -}} }, TransformColor: "{{ $value.transformcolor }}", ItemTypes: []string{ {{- $types := slice }}{{- range $i := iterate 7 }}{{- with index $value (printf "itype%d" (add $i 1)) }}{{- if ne . "" }}{{- $types = append $types . }}{{- end }}{{- end }}{{- end }}{{- range $i, $type := $types }}{{if $i}}, {{end}}"{{ $type }}"{{- end -}} }, ExcludeTypes: []string{ {{- $types := slice }}{{- range $i := iterate 5 }}{{- with index $value (printf "etype%d" (add $i 1)) }}{{- if ne . "" }}{{- $types = append $types . }}{{- end }}{{- end }}{{- end }}{{- range $i, $type := $types }}{{if $i}}, {{end}}"{{ $type }}"{{- end -}} }},
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
}`
|
||||
|
||||
const templateMagicSuffixes = `// Code generated by cmd/txttocode. DO NOT EDIT.
|
||||
// source: cmd/txttocode/txt/magicsuffix.txt
|
||||
package item
|
||||
|
||||
type MagicSuffix struct {
|
||||
ID int
|
||||
Name string
|
||||
Rare bool
|
||||
Level int
|
||||
LevelReq int
|
||||
Group int
|
||||
Mods []Mod
|
||||
TransformColor string
|
||||
ItemTypes []string
|
||||
ExcludeTypes []string
|
||||
}
|
||||
|
||||
type Mod struct {
|
||||
Code string
|
||||
Param string
|
||||
Min int
|
||||
Max int
|
||||
}
|
||||
|
||||
var MagicSuffixDesc = map[int]MagicSuffix{
|
||||
{{- range $index, $value := . }}
|
||||
{{- if ne $value.Name "" }}
|
||||
{{ $index }}: {ID: {{ $index }}, Name: "{{ $value.Name }}", Rare: {{ if eq $value.rare "1" }}true{{ else }}false{{ end }}, Level: {{ if eq $value.level "" }}0{{ else }}{{ $value.level }}{{ end }}, LevelReq: {{ if eq $value.levelreq "" }}0{{ else }}{{ $value.levelreq }}{{ end }}, Group: {{ if eq $value.group "" }}0{{ else }}{{ $value.group }}{{ end }}, Mods: []Mod{ {{- $mods := slice }}{{- if ne $value.mod1code "" }}{{- $mods = append $mods (printf "{Code: \"%s\", Param: \"%s\", Min: %s, Max: %s}" $value.mod1code $value.mod1param (default $value.mod1min "0") (default $value.mod1max "0")) }}{{- end }}{{- if ne $value.mod2code "" }}{{- $mods = append $mods (printf "{Code: \"%s\", Param: \"%s\", Min: %s, Max: %s}" $value.mod2code $value.mod2param (default $value.mod2min "0") (default $value.mod2max "0")) }}{{- end }}{{- if ne $value.mod3code "" }}{{- $mods = append $mods (printf "{Code: \"%s\", Param: \"%s\", Min: %s, Max: %s}" $value.mod3code $value.mod3param (default $value.mod3min "0") (default $value.mod3max "0")) }}{{- end }}{{- range $i, $mod := $mods }}{{if $i}}, {{end}}{{ $mod }}{{- end -}} }, TransformColor: "{{ $value.transformcolor }}", ItemTypes: []string{ {{- $types := slice }}{{- range $i := iterate 7 }}{{- with index $value (printf "itype%d" (add $i 1)) }}{{- if ne . "" }}{{- $types = append $types . }}{{- end }}{{- end }}{{- end }}{{- range $i, $type := $types }}{{if $i}}, {{end}}"{{ $type }}"{{- end -}} }, ExcludeTypes: []string{ {{- $types := slice }}{{- range $i := iterate 5 }}{{- with index $value (printf "etype%d" (add $i 1)) }}{{- if ne . "" }}{{- $types = append $types . }}{{- end }}{{- end }}{{- end }}{{- range $i, $type := $types }}{{if $i}}, {{end}}"{{ $type }}"{{- end -}} }},
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
}`
|
||||
|
||||
const templateUniqueItems = `// Code generated by cmd/txttocode. DO NOT EDIT.
|
||||
// source: cmd/txttocode/txt/uniqueitems.txt
|
||||
package item
|
||||
|
||||
type UniqueName string
|
||||
|
||||
const (
|
||||
None UniqueName = ""
|
||||
{{- range $key, $value := . }}
|
||||
{{- if and (ne $value.index "") (ne $value.enabled "0") (ne (index $value "lvl req") "") }}
|
||||
{{- if eq $value.index "Rainbow Facet" }}
|
||||
{{- if contains $value.prop4 "death-skill" }}
|
||||
RainbowFacet{{ replace $value.par4 " " "" }}Death UniqueName = "Rainbow Facet ({{ $value.par4 }} Death)"
|
||||
{{- else if contains $value.prop4 "levelup-skill" }}
|
||||
RainbowFacet{{ replace $value.par4 " " "" }}Level UniqueName = "Rainbow Facet ({{ $value.par4 }} Level)"
|
||||
{{- end }}
|
||||
{{- else }}
|
||||
{{ replace (replace (replace $value.index "'" "") " " "") "-" "" }} UniqueName = "{{ $value.index }}"
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
)
|
||||
|
||||
type UniqueItemInfo struct {
|
||||
Name string
|
||||
Code string
|
||||
LevelReq int
|
||||
Rarity int
|
||||
ID int
|
||||
}
|
||||
|
||||
var UniqueItems = map[UniqueName]UniqueItemInfo{
|
||||
{{- range $key, $value := . }}
|
||||
{{- if and (ne $value.index "") (ne $value.enabled "0") (ne (index $value "lvl req") "") }}
|
||||
{{- if eq $value.index "Rainbow Facet" }}
|
||||
{{- if contains $value.prop4 "death-skill" }}
|
||||
RainbowFacet{{ replace $value.par4 " " "" }}Death: {Name: "Rainbow Facet", Code: "{{ $value.code }}", LevelReq: {{ index $value "lvl req" }}, Rarity: {{ $value.rarity }}, ID: {{ index $value "*ID" }}},
|
||||
{{- else if contains $value.prop4 "levelup-skill" }}
|
||||
RainbowFacet{{ replace $value.par4 " " "" }}Level: {Name: "Rainbow Facet", Code: "{{ $value.code }}", LevelReq: {{ index $value "lvl req" }}, Rarity: {{ $value.rarity }}, ID: {{ index $value "*ID" }}},
|
||||
{{- end }}
|
||||
{{- else }}
|
||||
{{ replace (replace (replace $value.index "'" "") " " "") "-" "" }}: {Name: "{{ $value.index }}", Code: "{{ $value.code }}", LevelReq: {{ index $value "lvl req" }}, Rarity: {{ $value.rarity }}, ID: {{ index $value "*ID" }}},
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
}`
|
||||
|
||||
const templateSetItems = `// Code generated by cmd/txttocode. DO NOT EDIT.
|
||||
// source: cmd/txttocode/txt/setitems.txt
|
||||
package item
|
||||
|
||||
type SetName string
|
||||
type SetItemName string
|
||||
|
||||
const (
|
||||
SetItemNone SetItemName = ""
|
||||
{{- range $key, $value := . }}
|
||||
{{- if ne $value.index "" }}
|
||||
{{ replace (replace (replace $value.index "'" "") " " "") "-" "" }} SetItemName = "{{ $value.index }}"
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
)
|
||||
|
||||
type SetItemInfo struct {
|
||||
Name string
|
||||
SetName string
|
||||
Code string
|
||||
LevelReq int
|
||||
Rarity int
|
||||
ID int
|
||||
}
|
||||
|
||||
var SetItems = map[SetItemName]SetItemInfo{
|
||||
{{- range $key, $value := . }}
|
||||
{{- if ne $value.index "" }}
|
||||
{{ replace (replace (replace $value.index "'" "") " " "") "-" "" }}: {Name: "{{ $value.index }}", SetName: "{{ $value.set }}", Code: "{{ $value.item }}", LevelReq: {{ index $value "lvl req" }}, Rarity: {{ $value.rarity }}, ID: {{ index $value "*ID" }}},
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
}
|
||||
|
||||
var Sets = map[string][]SetItemName{
|
||||
{{- $currentSet := "" }}
|
||||
{{- $setItems := slice }}
|
||||
{{- range $key, $value := . }}
|
||||
{{- if ne $value.index "" }}
|
||||
{{- if ne $currentSet $value.set }}
|
||||
{{- if ne $currentSet "" }}
|
||||
"{{ $currentSet }}": {
|
||||
{{- range $setItems }}
|
||||
{{ . }},
|
||||
{{- end }}
|
||||
},
|
||||
{{- end }}
|
||||
{{- $currentSet = $value.set }}
|
||||
{{- $setItems = slice }}
|
||||
{{- end }}
|
||||
{{- $setItems = append $setItems (printf "%s" (replace (replace (replace $value.index "'" "") " " "") "-" "")) }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- if ne $currentSet "" }}
|
||||
"{{ $currentSet }}": {
|
||||
{{- range $setItems }}
|
||||
{{ . }},
|
||||
{{- end }}
|
||||
},
|
||||
{{- end }}
|
||||
}`
|
||||
|
||||
Reference in New Issue
Block a user