Support PlaceParam2

diff --git a/itemdef.go b/itemdef.go
index f203d7e680ab49916718e16a6a1e473a51ba7a05..304d48ba77c2ac78c26adcc75df4adf67ab3aa45 100644 (file)
--- a/itemdef.go
+++ b/itemdef.go
@@ -52,5 +52,7 @@ type ItemDef struct {
 
        ShortDesc string
 
+       PlaceParam2 uint8
+
        //mt:end
 }

diff --git a/serialize.go b/serialize.go
index b32c63a4f914125289315c3e3bc278a5144383a6..e2dbd5342be88c1e98318202587c5944f94f9be7 100644 (file)
--- a/serialize.go
+++ b/serialize.go
@@ -23761,6 +23761,8 @@ func (obj *ItemDef) serialize(w io.Writer) {
                                InvOverlay, WieldOverlay Texture
 
                                ShortDesc string
+
+                               PlaceParam2 uint8
                        }))(obj)).Type).serialize(w)
                }); err != nil {
                        if err == io.EOF {
@@ -23800,6 +23802,8 @@ func (obj *ItemDef) serialize(w io.Writer) {
                        InvOverlay, WieldOverlay Texture
 
                        ShortDesc string
+
+                       PlaceParam2 uint8
                }))(obj)).Name))) > math.MaxUint16 {
                        chk(ErrTooLong)
                }
@@ -23836,6 +23840,8 @@ func (obj *ItemDef) serialize(w io.Writer) {
                                InvOverlay, WieldOverlay Texture
 
                                ShortDesc string
+
+                               PlaceParam2 uint8
                        }))(obj)).Name))))
                        write16(w, uint16(x))
                }
@@ -23872,6 +23878,8 @@ func (obj *ItemDef) serialize(w io.Writer) {
                                InvOverlay, WieldOverlay Texture
 
                                ShortDesc string
+
+                               PlaceParam2 uint8
                        }))(obj)).Name))[:])
                        chk(err)
                }
@@ -23907,6 +23915,8 @@ func (obj *ItemDef) serialize(w io.Writer) {
                        InvOverlay, WieldOverlay Texture
 
                        ShortDesc string
+
+                       PlaceParam2 uint8
                }))(obj)).Desc))) > math.MaxUint16 {
                        chk(ErrTooLong)
                }
@@ -23943,6 +23953,8 @@ func (obj *ItemDef) serialize(w io.Writer) {
                                InvOverlay, WieldOverlay Texture
 
                                ShortDesc string
+
+                               PlaceParam2 uint8
                        }))(obj)).Desc))))
                        write16(w, uint16(x))
                }
@@ -23979,6 +23991,8 @@ func (obj *ItemDef) serialize(w io.Writer) {
                                InvOverlay, WieldOverlay Texture
 
                                ShortDesc string
+
+                               PlaceParam2 uint8
                        }))(obj)).Desc))[:])
                        chk(err)
                }
@@ -24015,6 +24029,8 @@ func (obj *ItemDef) serialize(w io.Writer) {
                                InvOverlay, WieldOverlay Texture
 
                                ShortDesc string
+
+                               PlaceParam2 uint8
                        }))(obj)).InvImg).serialize(w)
                }); err != nil {
                        if err == io.EOF {
@@ -24055,6 +24071,8 @@ func (obj *ItemDef) serialize(w io.Writer) {
                                InvOverlay, WieldOverlay Texture
 
                                ShortDesc string
+
+                               PlaceParam2 uint8
                        }))(obj)).WieldImg).serialize(w)
                }); err != nil {
                        if err == io.EOF {
@@ -24094,6 +24112,8 @@ func (obj *ItemDef) serialize(w io.Writer) {
                        InvOverlay, WieldOverlay Texture
 
                        ShortDesc string
+
+                       PlaceParam2 uint8
                }))(obj)).WieldScale {
                        {
                                x := ((*(*(struct {
@@ -24128,6 +24148,8 @@ func (obj *ItemDef) serialize(w io.Writer) {
                                        InvOverlay, WieldOverlay Texture
 
                                        ShortDesc string
+
+                                       PlaceParam2 uint8
                                }))(obj)).WieldScale)[local298]
                                write32(w, math.Float32bits(x))
                        }
@@ -24165,6 +24187,8 @@ func (obj *ItemDef) serialize(w io.Writer) {
                                InvOverlay, WieldOverlay Texture
 
                                ShortDesc string
+
+                               PlaceParam2 uint8
                        }))(obj)).StackMax
                        write16(w, uint16(x))
                }
@@ -24201,6 +24225,8 @@ func (obj *ItemDef) serialize(w io.Writer) {
                                InvOverlay, WieldOverlay Texture
 
                                ShortDesc string
+
+                               PlaceParam2 uint8
                        }))(obj)).Usable
                        if x {
                                write8(w, 1)
@@ -24241,6 +24267,8 @@ func (obj *ItemDef) serialize(w io.Writer) {
                                InvOverlay, WieldOverlay Texture
 
                                ShortDesc string
+
+                               PlaceParam2 uint8
                        }))(obj)).CanPointLiquids
                        if x {
                                write8(w, 1)
@@ -24281,6 +24309,8 @@ func (obj *ItemDef) serialize(w io.Writer) {
                                InvOverlay, WieldOverlay Texture
 
                                ShortDesc string
+
+                               PlaceParam2 uint8
                        }))(obj)).ToolCaps).serialize(w)
                }); err != nil {
                        if err == io.EOF {
@@ -24320,6 +24350,8 @@ func (obj *ItemDef) serialize(w io.Writer) {
                        InvOverlay, WieldOverlay Texture
 
                        ShortDesc string
+
+                       PlaceParam2 uint8
                }))(obj)).Groups)) > math.MaxUint16 {
                        chk(ErrTooLong)
                }
@@ -24356,6 +24388,8 @@ func (obj *ItemDef) serialize(w io.Writer) {
                                InvOverlay, WieldOverlay Texture
 
                                ShortDesc string
+
+                               PlaceParam2 uint8
                        }))(obj)).Groups)))
                        write16(w, uint16(x))
                }
@@ -24391,6 +24425,8 @@ func (obj *ItemDef) serialize(w io.Writer) {
                        InvOverlay, WieldOverlay Texture
 
                        ShortDesc string
+
+                       PlaceParam2 uint8
                }))(obj)).Groups {
                        if err := pcall(func() {
                                (((*(*(struct {
@@ -24425,6 +24461,8 @@ func (obj *ItemDef) serialize(w io.Writer) {
                                        InvOverlay, WieldOverlay Texture
 
                                        ShortDesc string
+
+                                       PlaceParam2 uint8
                                }))(obj)).Groups)[local299]).serialize(w)
                        }); err != nil {
                                if err == io.EOF {
@@ -24465,6 +24503,8 @@ func (obj *ItemDef) serialize(w io.Writer) {
                        InvOverlay, WieldOverlay Texture
 
                        ShortDesc string
+
+                       PlaceParam2 uint8
                }))(obj)).PlacePredict))) > math.MaxUint16 {
                        chk(ErrTooLong)
                }
@@ -24501,6 +24541,8 @@ func (obj *ItemDef) serialize(w io.Writer) {
                                InvOverlay, WieldOverlay Texture
 
                                ShortDesc string
+
+                               PlaceParam2 uint8
                        }))(obj)).PlacePredict))))
                        write16(w, uint16(x))
                }
@@ -24537,6 +24579,8 @@ func (obj *ItemDef) serialize(w io.Writer) {
                                InvOverlay, WieldOverlay Texture
 
                                ShortDesc string
+
+                               PlaceParam2 uint8
                        }))(obj)).PlacePredict))[:])
                        chk(err)
                }
@@ -24573,6 +24617,8 @@ func (obj *ItemDef) serialize(w io.Writer) {
                                InvOverlay, WieldOverlay Texture
 
                                ShortDesc string
+
+                               PlaceParam2 uint8
                        }))(obj)).PlaceSnd).serialize(w)
                }); err != nil {
                        if err == io.EOF {
@@ -24613,6 +24659,8 @@ func (obj *ItemDef) serialize(w io.Writer) {
                                InvOverlay, WieldOverlay Texture
 
                                ShortDesc string
+
+                               PlaceParam2 uint8
                        }))(obj)).PlaceFailSnd).serialize(w)
                }); err != nil {
                        if err == io.EOF {
@@ -24653,6 +24701,8 @@ func (obj *ItemDef) serialize(w io.Writer) {
                                InvOverlay, WieldOverlay Texture
 
                                ShortDesc string
+
+                               PlaceParam2 uint8
                        }))(obj)).PointRange
                        write32(w, math.Float32bits(x))
                }
@@ -24689,6 +24739,8 @@ func (obj *ItemDef) serialize(w io.Writer) {
                                InvOverlay, WieldOverlay Texture
 
                                ShortDesc string
+
+                               PlaceParam2 uint8
                        }))(obj)).Palette).serialize(w)
                }); err != nil {
                        if err == io.EOF {
@@ -24729,6 +24781,8 @@ func (obj *ItemDef) serialize(w io.Writer) {
                                InvOverlay, WieldOverlay Texture
 
                                ShortDesc string
+
+                               PlaceParam2 uint8
                        }))(obj)).Color
                        w.Write([]byte{x.A, x.R, x.G, x.B})
                }
@@ -24765,6 +24819,8 @@ func (obj *ItemDef) serialize(w io.Writer) {
                                InvOverlay, WieldOverlay Texture
 
                                ShortDesc string
+
+                               PlaceParam2 uint8
                        }))(obj)).InvOverlay).serialize(w)
                }); err != nil {
                        if err == io.EOF {
@@ -24805,6 +24861,8 @@ func (obj *ItemDef) serialize(w io.Writer) {
                                InvOverlay, WieldOverlay Texture
 
                                ShortDesc string
+
+                               PlaceParam2 uint8
                        }))(obj)).WieldOverlay).serialize(w)
                }); err != nil {
                        if err == io.EOF {
@@ -24844,6 +24902,8 @@ func (obj *ItemDef) serialize(w io.Writer) {
                        InvOverlay, WieldOverlay Texture
 
                        ShortDesc string
+
+                       PlaceParam2 uint8
                }))(obj)).ShortDesc))) > math.MaxUint16 {
                        chk(ErrTooLong)
                }
@@ -24880,6 +24940,8 @@ func (obj *ItemDef) serialize(w io.Writer) {
                                InvOverlay, WieldOverlay Texture
 
                                ShortDesc string
+
+                               PlaceParam2 uint8
                        }))(obj)).ShortDesc))))
                        write16(w, uint16(x))
                }
@@ -24916,9 +24978,49 @@ func (obj *ItemDef) serialize(w io.Writer) {
                                InvOverlay, WieldOverlay Texture
 
                                ShortDesc string
+
+                               PlaceParam2 uint8
                        }))(obj)).ShortDesc))[:])
                        chk(err)
                }
+               {
+                       x := (*(*(struct {
+                               Type ItemType
+
+                               Name, Desc string
+
+                               InvImg, WieldImg Texture
+                               WieldScale       [3]float32
+
+                               StackMax uint16
+
+                               Usable          bool
+                               CanPointLiquids bool
+
+                               ToolCaps ToolCaps
+
+                               Groups []Group
+
+                               PlacePredict string
+
+                               PlaceSnd, PlaceFailSnd SoundDef
+
+                               PointRange float32
+
+                               // Set index in Palette with "palette_index" item meta field,
+                               // this overrides Color.
+                               Palette Texture
+                               Color   color.NRGBA
+
+                               // Texture overlays.
+                               InvOverlay, WieldOverlay Texture
+
+                               ShortDesc string
+
+                               PlaceParam2 uint8
+                       }))(obj)).PlaceParam2
+                       write8(w, uint8(x))
+               }
                {
                        buf := w
                        w := ow
@@ -24989,6 +25091,8 @@ func (obj *ItemDef) deserialize(r io.Reader) {
                                InvOverlay, WieldOverlay Texture
 
                                ShortDesc string
+
+                               PlaceParam2 uint8
                        }))(obj)).Type).deserialize(r)
                }); err != nil {
                        if err == io.EOF {
@@ -25039,6 +25143,8 @@ func (obj *ItemDef) deserialize(r io.Reader) {
                        InvOverlay, WieldOverlay Texture
 
                        ShortDesc string
+
+                       PlaceParam2 uint8
                }))(obj)).Name) = string(local302)
                var local304 []uint8
                var local305 uint16
@@ -25083,6 +25189,8 @@ func (obj *ItemDef) deserialize(r io.Reader) {
                        InvOverlay, WieldOverlay Texture
 
                        ShortDesc string
+
+                       PlaceParam2 uint8
                }))(obj)).Desc) = string(local304)
                if err := pcall(func() {
                        ((*(*(struct {
@@ -25117,6 +25225,8 @@ func (obj *ItemDef) deserialize(r io.Reader) {
                                InvOverlay, WieldOverlay Texture
 
                                ShortDesc string
+
+                               PlaceParam2 uint8
                        }))(obj)).InvImg).deserialize(r)
                }); err != nil {
                        if err == io.EOF {
@@ -25157,6 +25267,8 @@ func (obj *ItemDef) deserialize(r io.Reader) {
                                InvOverlay, WieldOverlay Texture
 
                                ShortDesc string
+
+                               PlaceParam2 uint8
                        }))(obj)).WieldImg).deserialize(r)
                }); err != nil {
                        if err == io.EOF {
@@ -25196,6 +25308,8 @@ func (obj *ItemDef) deserialize(r io.Reader) {
                        InvOverlay, WieldOverlay Texture
 
                        ShortDesc string
+
+                       PlaceParam2 uint8
                }))(obj)).WieldScale {
                        {
                                p := &((*(*(struct {
@@ -25230,6 +25344,8 @@ func (obj *ItemDef) deserialize(r io.Reader) {
                                        InvOverlay, WieldOverlay Texture
 
                                        ShortDesc string
+
+                                       PlaceParam2 uint8
                                }))(obj)).WieldScale)[local306]
                                *p = math.Float32frombits(read32(r))
                        }
@@ -25267,6 +25383,8 @@ func (obj *ItemDef) deserialize(r io.Reader) {
                                InvOverlay, WieldOverlay Texture
 
                                ShortDesc string
+
+                               PlaceParam2 uint8
                        }))(obj)).StackMax
                        *p = read16(r)
                }
@@ -25303,6 +25421,8 @@ func (obj *ItemDef) deserialize(r io.Reader) {
                                InvOverlay, WieldOverlay Texture
 
                                ShortDesc string
+
+                               PlaceParam2 uint8
                        }))(obj)).Usable
                        switch n := read8(r); n {
                        case 0:
@@ -25346,6 +25466,8 @@ func (obj *ItemDef) deserialize(r io.Reader) {
                                InvOverlay, WieldOverlay Texture
 
                                ShortDesc string
+
+                               PlaceParam2 uint8
                        }))(obj)).CanPointLiquids
                        switch n := read8(r); n {
                        case 0:
@@ -25389,6 +25511,8 @@ func (obj *ItemDef) deserialize(r io.Reader) {
                                InvOverlay, WieldOverlay Texture
 
                                ShortDesc string
+
+                               PlaceParam2 uint8
                        }))(obj)).ToolCaps).deserialize(r)
                }); err != nil {
                        if err == io.EOF {
@@ -25433,6 +25557,8 @@ func (obj *ItemDef) deserialize(r io.Reader) {
                        InvOverlay, WieldOverlay Texture
 
                        ShortDesc string
+
+                       PlaceParam2 uint8
                }))(obj)).Groups) = make([]Group, local307)
                for local308 := range (*(*(struct {
                        Type ItemType
@@ -25466,6 +25592,8 @@ func (obj *ItemDef) deserialize(r io.Reader) {
                        InvOverlay, WieldOverlay Texture
 
                        ShortDesc string
+
+                       PlaceParam2 uint8
                }))(obj)).Groups {
                        if err := pcall(func() {
                                (((*(*(struct {
@@ -25500,6 +25628,8 @@ func (obj *ItemDef) deserialize(r io.Reader) {
                                        InvOverlay, WieldOverlay Texture
 
                                        ShortDesc string
+
+                                       PlaceParam2 uint8
                                }))(obj)).Groups)[local308]).deserialize(r)
                        }); err != nil {
                                if err == io.EOF {
@@ -25551,6 +25681,8 @@ func (obj *ItemDef) deserialize(r io.Reader) {
                        InvOverlay, WieldOverlay Texture
 
                        ShortDesc string
+
+                       PlaceParam2 uint8
                }))(obj)).PlacePredict) = string(local309)
                if err := pcall(func() {
                        ((*(*(struct {
@@ -25585,6 +25717,8 @@ func (obj *ItemDef) deserialize(r io.Reader) {
                                InvOverlay, WieldOverlay Texture
 
                                ShortDesc string
+
+                               PlaceParam2 uint8
                        }))(obj)).PlaceSnd).deserialize(r)
                }); err != nil {
                        if err == io.EOF {
@@ -25625,6 +25759,8 @@ func (obj *ItemDef) deserialize(r io.Reader) {
                                InvOverlay, WieldOverlay Texture
 
                                ShortDesc string
+
+                               PlaceParam2 uint8
                        }))(obj)).PlaceFailSnd).deserialize(r)
                }); err != nil {
                        if err == io.EOF {
@@ -25665,6 +25801,8 @@ func (obj *ItemDef) deserialize(r io.Reader) {
                                InvOverlay, WieldOverlay Texture
 
                                ShortDesc string
+
+                               PlaceParam2 uint8
                        }))(obj)).PointRange
                        *p = math.Float32frombits(read32(r))
                }
@@ -25701,6 +25839,8 @@ func (obj *ItemDef) deserialize(r io.Reader) {
                                InvOverlay, WieldOverlay Texture
 
                                ShortDesc string
+
+                               PlaceParam2 uint8
                        }))(obj)).Palette).deserialize(r)
                }); err != nil {
                        if err == io.EOF {
@@ -25741,6 +25881,8 @@ func (obj *ItemDef) deserialize(r io.Reader) {
                                InvOverlay, WieldOverlay Texture
 
                                ShortDesc string
+
+                               PlaceParam2 uint8
                        }))(obj)).Color
                        *p = color.NRGBA{A: read8(r), R: read8(r), G: read8(r), B: read8(r)}
                }
@@ -25777,6 +25919,8 @@ func (obj *ItemDef) deserialize(r io.Reader) {
                                InvOverlay, WieldOverlay Texture
 
                                ShortDesc string
+
+                               PlaceParam2 uint8
                        }))(obj)).InvOverlay).deserialize(r)
                }); err != nil {
                        if err == io.EOF {
@@ -25817,6 +25961,8 @@ func (obj *ItemDef) deserialize(r io.Reader) {
                                InvOverlay, WieldOverlay Texture
 
                                ShortDesc string
+
+                               PlaceParam2 uint8
                        }))(obj)).WieldOverlay).deserialize(r)
                }); err != nil {
                        if err == io.EOF {
@@ -25867,7 +26013,47 @@ func (obj *ItemDef) deserialize(r io.Reader) {
                        InvOverlay, WieldOverlay Texture
 
                        ShortDesc string
+
+                       PlaceParam2 uint8
                }))(obj)).ShortDesc) = string(local311)
+               {
+                       p := &(*(*(struct {
+                               Type ItemType
+
+                               Name, Desc string
+
+                               InvImg, WieldImg Texture
+                               WieldScale       [3]float32
+
+                               StackMax uint16
+
+                               Usable          bool
+                               CanPointLiquids bool
+
+                               ToolCaps ToolCaps
+
+                               Groups []Group
+
+                               PlacePredict string
+
+                               PlaceSnd, PlaceFailSnd SoundDef
+
+                               PointRange float32
+
+                               // Set index in Palette with "palette_index" item meta field,
+                               // this overrides Color.
+                               Palette Texture
+                               Color   color.NRGBA
+
+                               // Texture overlays.
+                               InvOverlay, WieldOverlay Texture
+
+                               ShortDesc string
+
+                               PlaceParam2 uint8
+                       }))(obj)).PlaceParam2
+                       *p = read8(r)
+               }
                if r.N > 0 {
                        chk(fmt.Errorf("%d bytes of trailing data", r.N))
                }