mirror of
https://github.com/OpenDiablo2/OpenDiablo2
synced 2024-06-25 00:25:23 +00:00
fc87b2be7a
* Remove weapons, armor, misc, itemCommon, itemTyps datadict singletons - removed loader calls from d2app - removed the HeroObjects singleton from `d2core/d2inventory` - added an InventoryItemFactory in d2inventory - package-level functions that use data records are now methods of the InventoryItemFactory - renamed ItemGenerator in d2item to ItemFactory - package-level functions that use records are now methods of ItemFactory - d2map.MapEntityFactory now has an item factory instance for creating items - fixed a bug in unique item record loader where it loaded an empty record - added a PlayerStateFactory for creating a player state (uses the asset manager) - updated the test inventory/equipment code in d2player to handle errors from the ItemFactory - character select and character creation screens have a player state and inventory item factory - updated item tests to use the item factory * minor edit * Removed d2datadict.Experience singleton added a HeroStatsFactory, much like the other factories. The factory gets an asset manager reference in order to use data records. * removed d2datadict.AutoMagic singleton * removed d2datadict.AutoMap singleton * removed d2datadict.BodyLocations singleton * removed d2datadict.Books singleton * Removed singletons for level records - removed loader calls in d2app - changed type references from d2datadict to d2records - added a `MapGenerator` in d2mapgen which uses thew asset manager and map engine - package-level map generation functions are now MapGenerator methods - `d2datadict.GetLevelDetails(id int)` is now a method of the RecordManager * remove SkillCalc and MissileCalc singletons * Removed CharStats and ItemStatCost singletons - added an ItemStatFactory which uses the asset manager to create stats - package-level functions for stats in d2item are now StatFactory methods - changed type references from d2datadict to d2records - `d2player.GetAllPlayerStates` is now a method of the `PlayerStateFactory` * Removed DkillDesc and Skills singletons from d2datadict - removed loader calls from d2app - diablo2stats.Stat instances are given a reference to the factory for doing record lookups * update the stats test to use mock a asset manager and stat factory * fixed diablo2stats tests and diablo2item tests * removed CompCodes singleton from d2datadict * remove cubemain singleton from d2datadict * removed DifficultyLevels singleton from d2datadict * removed ElemTypes singleton from d2datadict * removed events.go loader from d2datadict (was unused) * removed Gems singleton from d2datadict * removed Hireling and Inventory singletons from d2datadict * removed MagicPrefix and MagicSuffix singletons from d2datadict * removed ItemRatios singleton from d2datadict * removed Missiles singleton from d2datadict * removed MonModes singleton * Removed all monster and npc singletons from d2datadict - MapStamp instances now get a reference to their factory for doing record lookups * removed SoundEntry and SoundEnviron singletons from d2datadict
56 lines
1.7 KiB
Go
56 lines
1.7 KiB
Go
package d2netpacket
|
|
|
|
import (
|
|
"encoding/json"
|
|
|
|
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2enum"
|
|
"github.com/OpenDiablo2/OpenDiablo2/d2core/d2hero"
|
|
"github.com/OpenDiablo2/OpenDiablo2/d2core/d2inventory"
|
|
"github.com/OpenDiablo2/OpenDiablo2/d2networking/d2netpacket/d2netpackettype"
|
|
)
|
|
|
|
// AddPlayerPacket contains the data required to create a Player entity.
|
|
// It is sent by the server to create the entity for a newly connected
|
|
// player on a client.
|
|
type AddPlayerPacket struct {
|
|
ID string `json:"id"`
|
|
Name string `json:"name"`
|
|
X int `json:"x"`
|
|
Y int `json:"y"`
|
|
HeroType d2enum.Hero `json:"hero"`
|
|
Equipment d2inventory.CharacterEquipment `json:"equipment"`
|
|
Stats *d2hero.HeroStatsState `json:"heroStats"`
|
|
Skills map[int]*d2hero.HeroSkill `json:"heroSkills"`
|
|
}
|
|
|
|
// CreateAddPlayerPacket returns a NetPacket which declares an
|
|
// AddPlayerPacket with the data in given parameters.
|
|
func CreateAddPlayerPacket(id, name string, x, y int, heroType d2enum.Hero,
|
|
stats *d2hero.HeroStatsState, skills map[int]*d2hero.HeroSkill, equipment d2inventory.CharacterEquipment) NetPacket {
|
|
addPlayerPacket := AddPlayerPacket{
|
|
ID: id,
|
|
Name: name,
|
|
X: x,
|
|
Y: y,
|
|
HeroType: heroType,
|
|
Equipment: equipment,
|
|
Stats: stats,
|
|
Skills: skills,
|
|
}
|
|
b, _ := json.Marshal(addPlayerPacket)
|
|
|
|
return NetPacket{
|
|
PacketType: d2netpackettype.AddPlayer,
|
|
PacketData: b,
|
|
}
|
|
}
|
|
|
|
func UnmarshalAddPlayer(packet []byte) (AddPlayerPacket, error) {
|
|
var p AddPlayerPacket
|
|
if err := json.Unmarshal(packet, &p); err != nil {
|
|
return p, err
|
|
}
|
|
|
|
return p, nil
|
|
}
|