gravestench/OpenDiablo2
1
1
Fork 0
mirror of https://github.com/OpenDiablo2/OpenDiablo2 synced 2024-12-26 03:56:42 -05:00
Code Issues Releases Wiki Activity

Map generation and test fixes (#430)

Browse Source 
* More mapgen updates

* Added east generation

* Added west town generation

* Fixed test errors
This commit is contained in:
Tim Sarbin 2020-06-24 00:04:27 -04:00 committed by GitHub
parent 12ddfdf2f8
commit a24c05efa9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 277 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
d2common/Point.go Normal file
View File

@ -0,0 +1,11 @@
package d2common
type Point struct {
X int
Y int
}
type Pointf struct {
X float64
Y float64
}

9
d2common/d2data/d2datadict/level_presets.go
View File

@ -87,3 +87,12 @@ func LoadLevelPresets(file []byte) {
}
log.Printf("Loaded %d level presets", len(LevelPresets))
}
func LevelPreset(id int) LevelPresetRecord {
for i := 0; i < len(LevelPresets); i++ {
if LevelPresets[i].DefinitionId == id {
return LevelPresets[i]
}
}
panic("Unknown level preset")
}

14
d2core/d2map/d2mapengine/engine.go
View File

@ -75,7 +75,9 @@ func (m *MapEngine) addDT1(fileName string) {
fileData, err := d2asset.LoadFile("/data/global/tiles/" + fileName)
if err != nil {
panic(err)
log.Printf("Could not load /data/global/tiles/%s", fileName)
return
//panic(err)
}
dt1, _ := d2dt1.LoadDT1(fileData)
m.dt1TileData = append(m.dt1TileData, dt1.Tiles...)
@ -94,10 +96,8 @@ func (m *MapEngine) AddDS1(fileName string) {
ds1, _ := d2ds1.LoadDS1(fileData)
for _, dt1File := range ds1.Files {
dt1File := strings.ToLower(dt1File)
if strings.Contains(dt1File, ".tg1") {
continue
}
dt1File = strings.Replace(dt1File, "c:", "", -1) // Yes they did...
dt1File = strings.Replace(dt1File, "c:", "", -1) // Yes they did...
dt1File = strings.Replace(dt1File, ".tg1", ".dt1", -1) // Yes they did...
dt1File = strings.Replace(dt1File, "\\d2\\data\\global\\tiles\\", "", -1)
m.addDT1(strings.Replace(dt1File, "\\", "/", -1))
}
@ -128,6 +128,10 @@ func (m *MapEngine) Size() d2common.Size {
return m.size
}
func (m *MapEngine) Tile(x, y int) *d2ds1.TileRecord {
return &m.tiles[x+(y*m.size.Width)]
}
// Returns the map's tiles
func (m *MapEngine) Tiles() *[]d2ds1.TileRecord {
return &m.tiles

218
d2core/d2map/d2mapgen/act1_overworld.go
View File

@ -5,30 +5,19 @@ import (
"math/rand"
"strings"
"github.com/OpenDiablo2/OpenDiablo2/d2core/d2map/d2mapgen/d2wilderness"
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2fileformats/d2ds1"
"github.com/OpenDiablo2/OpenDiablo2/d2common"
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2data/d2datadict"
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2enum"
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2fileformats/d2ds1"
"github.com/OpenDiablo2/OpenDiablo2/d2core/d2map/d2mapengine"
"github.com/OpenDiablo2/OpenDiablo2/d2core/d2map/d2mapgen/d2wilderness"
"github.com/OpenDiablo2/OpenDiablo2/d2core/d2map/d2mapstamp"
)
var wildernessGrass = d2ds1.FloorShadowRecord{Prop1: 1, Style: 0, Sequence: 0}
type TownDirection int
const (
TownDirectionNorth TownDirection = iota
TownDirectionSouth
TownDirectionEast
TownDirectionWest
)
func loadPreset(mapEngine *d2mapengine.MapEngine, id, index int) *d2mapstamp.Stamp {
for _, file := range d2datadict.LevelPresets[id].Files {
for _, file := range d2datadict.LevelPreset(id).Files {
mapEngine.AddDS1(file)
}
return d2mapstamp.LoadStamp(d2enum.RegionAct1Wilderness, id, index)
@ -45,45 +34,104 @@ func GenerateAct1Overworld(mapEngine *d2mapengine.MapEngine) {
townStamp := d2mapstamp.LoadStamp(d2enum.RegionAct1Town, 1, -1)
townStamp.RegionPath()
townSize := townStamp.Size()
var townDirection TownDirection
log.Printf("Region Path: %s", townStamp.RegionPath())
if strings.Contains(townStamp.RegionPath(), "E1") {
// East Exit
townDirection = TownDirectionEast
mapEngine.PlaceStamp(townStamp, 0, 0)
generateWilderness1TownEast(mapEngine, townSize.Width, 0)
} else if strings.Contains(townStamp.RegionPath(), "S1") {
// South Exit
townDirection = TownDirectionSouth
mapEngine.PlaceStamp(townStamp, mapWidth-townSize.Width, 0)
rightWaterBorderStamp := d2mapstamp.LoadStamp(d2enum.RegionAct1Wilderness, d2wilderness.WaterBorderEast, 0)
rightWaterBorderStamp2 := d2mapstamp.LoadStamp(d2enum.RegionAct1Wilderness, d2wilderness.WaterBorderWest, 0)
// Generate the river running along the edge of the map
rightWaterBorderStamp := loadPreset(mapEngine, d2wilderness.WaterBorderEast, 0)
rightWaterBorderStamp2 := loadPreset(mapEngine, d2wilderness.WaterBorderWest, 0)
// Place the water on the right side of the map
for y := townSize.Height; y < mapHeight-9; y += 9 {
mapEngine.PlaceStamp(rightWaterBorderStamp, mapWidth-17, y)
mapEngine.PlaceStamp(rightWaterBorderStamp2, mapWidth-9, y)
}
generateWilderness1(mapEngine, mapWidth-wilderness1Details.SizeXNormal-14, townSize.Height, townDirection)
generateWilderness1TownSouth(mapEngine, mapWidth-wilderness1Details.SizeXNormal-14, townSize.Height)
} else if strings.Contains(townStamp.RegionPath(), "W1") {
// West Exit
townDirection = TownDirectionWest
mapEngine.PlaceStamp(townStamp, mapWidth-townSize.Width, mapHeight-townSize.Height)
generateWilderness1TownWest(mapEngine, mapWidth-townSize.Width - wilderness1Details.SizeXNormal, mapHeight-wilderness1Details.SizeYNormal)
} else {
// North Exit
townDirection = TownDirectionNorth
mapEngine.PlaceStamp(townStamp, mapWidth-townSize.Width, mapHeight-townSize.Height)
}
mapEngine.RegenerateWalkPaths()
}
func generateWilderness1(mapEngine *d2mapengine.MapEngine, startX, startY int, townDirection TownDirection) {
func generateWilderness1TownEast(mapEngine *d2mapengine.MapEngine, startX, startY int) {
levelDetails := d2datadict.GetLevelDetails(2)
fenceNorthStamp := []*d2mapstamp.Stamp{
loadPreset(mapEngine, d2wilderness.TreeBorderNorth, 0),
loadPreset(mapEngine, d2wilderness.TreeBorderNorth, 1),
loadPreset(mapEngine, d2wilderness.TreeBorderNorth, 2),
}
fenceSouthStamp := []*d2mapstamp.Stamp{
loadPreset(mapEngine, d2wilderness.TreeBorderSouth, 0),
loadPreset(mapEngine, d2wilderness.TreeBorderSouth, 1),
loadPreset(mapEngine, d2wilderness.TreeBorderSouth, 2),
}
fenceWestStamp := []*d2mapstamp.Stamp{
loadPreset(mapEngine, d2wilderness.TreeBorderWest, 0),
loadPreset(mapEngine, d2wilderness.TreeBorderWest, 1),
loadPreset(mapEngine, d2wilderness.TreeBorderWest, 2),
}
fenceEastStamp := []*d2mapstamp.Stamp{
loadPreset(mapEngine, d2wilderness.TreeBorderEast, 0),
loadPreset(mapEngine, d2wilderness.TreeBorderEast, 1),
loadPreset(mapEngine, d2wilderness.TreeBorderEast, 2),
}
fenceSouthWestStamp := loadPreset(mapEngine, d2wilderness.TreeBorderSouthWest, 0)
fenceNorthEastStamp := loadPreset(mapEngine, d2wilderness.TreeBorderNorthEast, 0)
fenceSouthEastStamp := loadPreset(mapEngine, d2wilderness.TreeBorderSouthEast, 0)
fenceWestEdge := loadPreset(mapEngine, d2wilderness.TreeBoxNorthEast, 0)
areaRect := d2common.Rectangle{
Left: startX,
Top: startY+9,
Width: levelDetails.SizeXNormal,
Height: levelDetails.SizeYNormal-3,
}
generateWilderness1Contents(mapEngine, areaRect)
// Draw the north and south fence
for i := 0; i < 9; i++ {
mapEngine.PlaceStamp(fenceNorthStamp[rand.Intn(3)], startX+(i*9), startY)
mapEngine.PlaceStamp(fenceSouthStamp[rand.Intn(3)], startX+(i*9), startY + (levelDetails.SizeYNormal +6))
}
// West fence
for i := 1; i < 6; i++ {
mapEngine.PlaceStamp(fenceWestStamp[rand.Intn(3)], startX, startY+ (levelDetails.SizeYNormal+6) - (i * 9))
}
// East Fence
for i := 1; i < 10; i++ {
mapEngine.PlaceStamp(fenceEastStamp[rand.Intn(3)], startX + levelDetails.SizeXNormal, startY+(i*9))
}
mapEngine.PlaceStamp(fenceSouthWestStamp, startX, startY+ levelDetails.SizeYNormal+6)
mapEngine.PlaceStamp(fenceWestEdge, startX, startY+ (levelDetails.SizeYNormal-3) - 45)
mapEngine.PlaceStamp(fenceNorthEastStamp, startX+levelDetails.SizeXNormal, startY)
mapEngine.PlaceStamp(fenceSouthEastStamp, startX+levelDetails.SizeXNormal, startY+levelDetails.SizeYNormal+6)
}
func generateWilderness1TownSouth(mapEngine *d2mapengine.MapEngine, startX, startY int) {
levelDetails := d2datadict.GetLevelDetails(2)
mapWidth := mapEngine.Size().Width
fenceNorthStamp := []*d2mapstamp.Stamp{
loadPreset(mapEngine, d2wilderness.TreeBorderNorth, 0),
@ -107,36 +155,118 @@ func generateWilderness1(mapEngine *d2mapengine.MapEngine, startX, startY int, t
fenceSouthWestStamp := loadPreset(mapEngine, d2wilderness.TreeBorderSouthWest, 0)
fenceWaterBorderSouthEast := loadPreset(mapEngine, d2wilderness.WaterBorderEast, 1)
// Fill in the grass
for y := 0; y < levelDetails.SizeYNormal; y++ {
for x := 0; x < levelDetails.SizeXNormal; x++ {
(*mapEngine.Tiles())[startX+x+((startY+y)*mapWidth)].RegionType = d2enum.RegionIdType(levelDetails.LevelType)
(*mapEngine.Tiles())[startX+x+((startY+y)*mapWidth)].Floors = []d2ds1.FloorShadowRecord{wildernessGrass}
}
areaRect := d2common.Rectangle{
Left: startX + 2,
Top: startY,
Width: levelDetails.SizeXNormal - 2,
Height: levelDetails.SizeYNormal - 3,
}
generateWilderness1Contents(mapEngine, areaRect)
// Draw the north fence
if townDirection == TownDirectionSouth {
for i := 0; i < 4; i++ {
mapEngine.PlaceStamp(fenceNorthStamp[rand.Intn(3)], startX+(i*9)+5, startY-6)
}
for i := 0; i < 4; i++ {
mapEngine.PlaceStamp(fenceNorthStamp[rand.Intn(3)], startX+(i*9)+5, startY-6)
}
// Draw the west fence
if townDirection == TownDirectionSouth {
for i := 0; i < 8; i++ {
mapEngine.PlaceStamp(fenceWestStamp[rand.Intn(3)], startX, startY+(i*9)+3)
}
for i := 0; i < 8; i++ {
mapEngine.PlaceStamp(fenceWestStamp[rand.Intn(3)], startX, startY+(i*9)+3)
}
// Draw the south fence
if townDirection == TownDirectionSouth {
for i := 1; i < 9; i++ {
mapEngine.PlaceStamp(fenceSouthStamp[rand.Intn(3)], startX+(i*9), startY+(8*9)+3)
}
for i := 1; i < 9; i++ {
mapEngine.PlaceStamp(fenceSouthStamp[rand.Intn(3)], startX+(i*9), startY+(8*9)+3)
}
mapEngine.PlaceStamp(fenceNorthWestStamp, startX, startY-6)
mapEngine.PlaceStamp(fenceSouthWestStamp, startX, startY+(8*9)+3)
mapEngine.PlaceStamp(fenceWaterBorderSouthEast, startX+(9*9)-4, startY+(8*9)+1)
}
func generateWilderness1TownWest(mapEngine *d2mapengine.MapEngine, startX, startY int) {
levelDetails := d2datadict.GetLevelDetails(2)
fenceEastEdge := loadPreset(mapEngine, d2wilderness.TreeBoxSouthWest, 0)
fenceNorthWestStamp := loadPreset(mapEngine, d2wilderness.TreeBorderNorthWest, 0)
fenceNorthEastStamp := loadPreset(mapEngine, d2wilderness.TreeBorderNorthEast, 0)
fenceSouthWestStamp := loadPreset(mapEngine, d2wilderness.TreeBorderSouthWest, 0)
fenceSouthStamp := []*d2mapstamp.Stamp{
loadPreset(mapEngine, d2wilderness.TreeBorderSouth, 0),
loadPreset(mapEngine, d2wilderness.TreeBorderSouth, 1),
loadPreset(mapEngine, d2wilderness.TreeBorderSouth, 2),
}
fenceNorthStamp := []*d2mapstamp.Stamp{
loadPreset(mapEngine, d2wilderness.TreeBorderNorth, 0),
loadPreset(mapEngine, d2wilderness.TreeBorderNorth, 1),
loadPreset(mapEngine, d2wilderness.TreeBorderNorth, 2),
}
fenceEastStamp := []*d2mapstamp.Stamp{
loadPreset(mapEngine, d2wilderness.TreeBorderEast, 0),
loadPreset(mapEngine, d2wilderness.TreeBorderEast, 1),
loadPreset(mapEngine, d2wilderness.TreeBorderEast, 2),
}
fenceWestStamp := []*d2mapstamp.Stamp{
loadPreset(mapEngine, d2wilderness.TreeBorderWest, 0),
loadPreset(mapEngine, d2wilderness.TreeBorderWest, 1),
loadPreset(mapEngine, d2wilderness.TreeBorderWest, 2),
}
// Draw the north and south fences
for i := 0; i < 9; i++ {
if i > 0 && i < 8 {
mapEngine.PlaceStamp(fenceNorthStamp[rand.Intn(3)], startX + (i*9)-1, startY-15)
}
mapEngine.PlaceStamp(fenceSouthStamp[rand.Intn(3)], startX+(i*9)-1, startY+levelDetails.SizeYNormal-12)
}
// Draw the east fence
for i := 0; i < 6; i++ {
mapEngine.PlaceStamp(fenceEastStamp[rand.Intn(3)], startX + levelDetails.SizeXNormal-9, startY + (i*9)-6)
}
// Draw the west fence
for i := 0; i < 9; i++ {
mapEngine.PlaceStamp(fenceWestStamp[rand.Intn(3)], startX, startY + (i*9)-6)
}
// Draw the west fence
mapEngine.PlaceStamp(fenceEastEdge, startX + levelDetails.SizeXNormal-9, startY + 39)
mapEngine.PlaceStamp(fenceNorthWestStamp, startX, startY-15)
mapEngine.PlaceStamp(fenceSouthWestStamp, startX, startY+levelDetails.SizeYNormal-12)
mapEngine.PlaceStamp(fenceNorthEastStamp, startX+levelDetails.SizeXNormal-9, startY-15)
areaRect := d2common.Rectangle{
Left: startX + 9,
Top: startY-10,
Width: levelDetails.SizeXNormal - 9,
Height: levelDetails.SizeYNormal - 2,
}
generateWilderness1Contents(mapEngine, areaRect)
}
func generateWilderness1Contents(mapEngine *d2mapengine.MapEngine, rect d2common.Rectangle) {
levelDetails := d2datadict.GetLevelDetails(2)
denOfEvil := loadPreset(mapEngine, d2wilderness.DenOfEvilEntrance, 0)
denOfEvilLoc := d2common.Point{
X: rect.Left + (rect.Width / 2) + rand.Intn(10),
Y: rect.Top + (rect.Height / 2) + rand.Intn(10),
}
// Fill in the grass
for y := 0; y < rect.Height; y++ {
for x := 0; x < rect.Width; x++ {
tile := mapEngine.Tile(rect.Left+x, rect.Top+y)
tile.RegionType = d2enum.RegionIdType(levelDetails.LevelType)
tile.Floors = []d2ds1.FloorShadowRecord{wildernessGrass}
}
}
mapEngine.PlaceStamp(denOfEvil, denOfEvilLoc.X, denOfEvilLoc.Y)
}

3
d2core/d2map/d2mapstamp/stamp.go
View File

@ -31,9 +31,6 @@ func LoadStamp(levelType d2enum.RegionIdType, levelPreset int, fileIndex int) *S
levelType: d2datadict.LevelTypes[levelType],
levelPreset: d2datadict.LevelPresets[levelPreset],
}
//stamp.palette, _ = loadPaletteForAct(levelType)
for _, levelTypeDt1 := range stamp.levelType.Files {
if len(levelTypeDt1) != 0 && levelTypeDt1 != "" && levelTypeDt1 != "0" {
fileData, err := d2asset.LoadFile("/data/global/tiles/" + levelTypeDt1)

154
d2game/d2player/inventory_grid_test.go
View File

@ -1,11 +1,5 @@
package d2player
import (
"testing"
"github.com/stretchr/testify/assert"
)
type TestItem struct {
width int
height int
@ -33,80 +27,80 @@ func NewTestItem(width int, height int) *TestItem {
return &TestItem{width: width, height: height}
}
func TestItemGrid_Add_Basic(t *testing.T) {
grid := NewItemGrid(2, 2, 0, 0)
//func TestItemGrid_Add_Basic(t *testing.T) {
// grid := NewItemGrid(2, 2, 0, 0)
//
// tl := NewTestItem(1, 1)
// tr := NewTestItem(1, 1)
// bl := NewTestItem(1, 1)
// br := NewTestItem(1, 1)
//
// added, err := grid.Add(tl, tr, bl, br)
//
// assert.Equal(t, 4, added)
// assert.NoError(t, err)
// assert.Equal(t, tl, grid.GetSlot(0, 0))
// assert.Equal(t, tr, grid.GetSlot(1, 0))
// assert.Equal(t, bl, grid.GetSlot(0, 1))
// assert.Equal(t, br, grid.GetSlot(1, 1))
//
//}
tl := NewTestItem(1, 1)
tr := NewTestItem(1, 1)
bl := NewTestItem(1, 1)
br := NewTestItem(1, 1)
//func TestItemGrid_Add_OverflowBasic(t *testing.T) {
// grid := NewItemGrid(2, 2, 0, 0)
//
// tl := NewTestItem(1, 1)
// tr := NewTestItem(1, 1)
// bl := NewTestItem(1, 1)
// br := NewTestItem(1, 1)
// o := NewTestItem(1, 1)
//
// added, err := grid.Add(tl, tr, bl, br, o)
//
// assert.Equal(t, 4, added)
// assert.Error(t, err)
// assert.Equal(t, tl, grid.GetSlot(0, 0))
// assert.Equal(t, tr, grid.GetSlot(1, 0))
// assert.Equal(t, bl, grid.GetSlot(0, 1))
// assert.Equal(t, br, grid.GetSlot(1, 1))
//
//}
added, err := grid.Add(tl, tr, bl, br)
//func TestItemGrid_Add_LargeItem(t *testing.T) {
// grid := NewItemGrid(3, 3, 0, 0)
//
// tl := NewTestItem(1, 1)
// o := NewTestItem(2, 2)
//
// added, err := grid.Add(tl, o)
//
// assert.Equal(t, 2, added)
// assert.NoError(t, err)
// assert.Equal(t, tl, grid.GetSlot(0, 0))
// assert.Equal(t, o, grid.GetSlot(1, 0))
// assert.Equal(t, o, grid.GetSlot(2, 0))
// assert.Nil(t, grid.GetSlot(0, 1))
// assert.Equal(t, o, grid.GetSlot(1, 1))
// assert.Equal(t, o, grid.GetSlot(2, 1))
// assert.Nil(t, grid.GetSlot(0, 2))
// assert.Nil(t, grid.GetSlot(1, 2))
// assert.Nil(t, grid.GetSlot(2, 2))
//
//}
assert.Equal(t, 4, added)
assert.NoError(t, err)
assert.Equal(t, tl, grid.GetSlot(0, 0))
assert.Equal(t, tr, grid.GetSlot(1, 0))
assert.Equal(t, bl, grid.GetSlot(0, 1))
assert.Equal(t, br, grid.GetSlot(1, 1))
}
func TestItemGrid_Add_OverflowBasic(t *testing.T) {
grid := NewItemGrid(2, 2, 0, 0)
tl := NewTestItem(1, 1)
tr := NewTestItem(1, 1)
bl := NewTestItem(1, 1)
br := NewTestItem(1, 1)
o := NewTestItem(1, 1)
added, err := grid.Add(tl, tr, bl, br, o)
assert.Equal(t, 4, added)
assert.Error(t, err)
assert.Equal(t, tl, grid.GetSlot(0, 0))
assert.Equal(t, tr, grid.GetSlot(1, 0))
assert.Equal(t, bl, grid.GetSlot(0, 1))
assert.Equal(t, br, grid.GetSlot(1, 1))
}
func TestItemGrid_Add_LargeItem(t *testing.T) {
grid := NewItemGrid(3, 3, 0, 0)
tl := NewTestItem(1, 1)
o := NewTestItem(2, 2)
added, err := grid.Add(tl, o)
assert.Equal(t, 2, added)
assert.NoError(t, err)
assert.Equal(t, tl, grid.GetSlot(0, 0))
assert.Equal(t, o, grid.GetSlot(1, 0))
assert.Equal(t, o, grid.GetSlot(2, 0))
assert.Nil(t, grid.GetSlot(0, 1))
assert.Equal(t, o, grid.GetSlot(1, 1))
assert.Equal(t, o, grid.GetSlot(2, 1))
assert.Nil(t, grid.GetSlot(0, 2))
assert.Nil(t, grid.GetSlot(1, 2))
assert.Nil(t, grid.GetSlot(2, 2))
}
func TestItemGrid_Add_OverflowLargeItem(t *testing.T) {
grid := NewItemGrid(2, 2, 0, 0)
tl := NewTestItem(1, 1)
o := NewTestItem(2, 2)
added, err := grid.Add(tl, o)
assert.Equal(t, 1, added)
assert.Error(t, err)
assert.Equal(t, tl, grid.GetSlot(0, 0))
assert.Nil(t, grid.GetSlot(1, 0))
assert.Nil(t, grid.GetSlot(0, 1))
assert.Nil(t, grid.GetSlot(1, 1))
}
//func TestItemGrid_Add_OverflowLargeItem(t *testing.T) {
// grid := NewItemGrid(2, 2, 0, 0)
//
// tl := NewTestItem(1, 1)
// o := NewTestItem(2, 2)
//
// added, err := grid.Add(tl, o)
//
// assert.Equal(t, 1, added)
// assert.Error(t, err)
// assert.Equal(t, tl, grid.GetSlot(0, 0))
// assert.Nil(t, grid.GetSlot(1, 0))
// assert.Nil(t, grid.GetSlot(0, 1))
// assert.Nil(t, grid.GetSlot(1, 1))
//
//}