use storage as a dot import

Signed-off-by: Derek Smart <[email protected]>
mcred · Feb 20, 2020 · 4f18e26 · 4f18e26
1 parent 6cb1c84
commit 4f18e26
Show file tree

Hide file tree

Showing 15 changed files with 105 additions and 107 deletions.
diff --git a/internal/app/characters/Albert.go b/internal/app/characters/Albert.go
@@ -1,19 +1,19 @@
 package characters
 
 import (
-	"LODeditor/internal/app/storage"
+	. "LODeditor/internal/app/storage"
 )
 
 func Albert() Character { //TODO MAP
 	return Character{
 		ID:        05,
 		Name:      "Albert",
-		XP:        storage.Attribute{0x608,4,true},
-		HP:        storage.Attribute{0x610,2,true},
-		Weapon:    storage.Attribute{0x61C,1,false},
-		Helmet:    storage.Attribute{0x61D,1,false},
-		Chest:     storage.Attribute{0x61E,1,false},
-		Boots:     storage.Attribute{0x61F,1,false},
-		Accessory: storage.Attribute{0x620,1,false},
+		XP:        Attribute{0x608,4,true},
+		HP:        Attribute{0x610,2,true},
+		Weapon:    Attribute{0x61C,1,false},
+		Helmet:    Attribute{0x61D,1,false},
+		Chest:     Attribute{0x61E,1,false},
+		Boots:     Attribute{0x61F,1,false},
+		Accessory: Attribute{0x620,1,false},
 	}
 }
diff --git a/internal/app/characters/Character.go b/internal/app/characters/Character.go
@@ -1,19 +1,19 @@
 package characters
 
 import (
-	"LODeditor/internal/app/storage"
+	. "LODeditor/internal/app/storage"
 )
 
 type Character struct {
 	ID        int
 	Name      string
-	XP        storage.Attribute
-	HP        storage.Attribute
-	Weapon    storage.Attribute
-	Helmet    storage.Attribute
-	Chest     storage.Attribute
-	Boots     storage.Attribute
-	Accessory storage.Attribute
+	XP        Attribute
+	HP        Attribute
+	Weapon    Attribute
+	Helmet    Attribute
+	Chest     Attribute
+	Boots     Attribute
+	Accessory Attribute
 }
 
 func GetCharacters() []Character {

diff --git a/internal/app/characters/Dart.go b/internal/app/characters/Dart.go
@@ -1,19 +1,19 @@
 package characters
 
 import (
-	"LODeditor/internal/app/storage"
+	. "LODeditor/internal/app/storage"
 )
 
 func Dart() Character {
 	return Character{
 		ID:        0,
 		Name:      "Dart",
-		XP:        storage.Attribute{0x52C,4,true},
-		HP:        storage.Attribute{0x534,2,true},
-		Weapon:    storage.Attribute{0x540,1,false},
-		Helmet:    storage.Attribute{0x541,1,false},
-		Chest:     storage.Attribute{0x542,1,false},
-		Boots:     storage.Attribute{0x543,1,false},
-		Accessory: storage.Attribute{0x544,1,false},
+		XP:        Attribute{0x52C,4,true},
+		HP:        Attribute{0x534,2,true},
+		Weapon:    Attribute{0x540,1,false},
+		Helmet:    Attribute{0x541,1,false},
+		Chest:     Attribute{0x542,1,false},
+		Boots:     Attribute{0x543,1,false},
+		Accessory: Attribute{0x544,1,false},
 	}
 }
diff --git a/internal/app/characters/Haschel.go b/internal/app/characters/Haschel.go
@@ -1,19 +1,19 @@
 package characters
 
 import (
-	"LODeditor/internal/app/storage"
+	. "LODeditor/internal/app/storage"
 )
 
 func Haschel() Character { //TODO MAP
 	return Character{
 		ID:        04,
 		Name:      "Haschel",
-		XP:        storage.Attribute{0x5DC,4,true},
-		HP:        storage.Attribute{0x5E4,2,true},
-		Weapon:    storage.Attribute{0x5F0,1,false},
-		Helmet:    storage.Attribute{0x5F1,1,false},
-		Chest:     storage.Attribute{0x5F2,1,false},
-		Boots:     storage.Attribute{0x5F3,1,false},
-		Accessory: storage.Attribute{0x5F4,1,false},
+		XP:        Attribute{0x5DC,4,true},
+		HP:        Attribute{0x5E4,2,true},
+		Weapon:    Attribute{0x5F0,1,false},
+		Helmet:    Attribute{0x5F1,1,false},
+		Chest:     Attribute{0x5F2,1,false},
+		Boots:     Attribute{0x5F3,1,false},
+		Accessory: Attribute{0x5F4,1,false},
 	}
 }
diff --git a/internal/app/characters/Kongol.go b/internal/app/characters/Kongol.go
@@ -1,19 +1,19 @@
 package characters
 
 import (
-	"LODeditor/internal/app/storage"
+	. "LODeditor/internal/app/storage"
 )
 
 func Kongol() Character { //TODO map
 	return Character{
 		ID:        07,
 		Name:      "Kongol",
-		XP:        storage.Attribute{0x660,4,true},
-		HP:        storage.Attribute{0x668,2,true},
-		Weapon:    storage.Attribute{0x674,1,false},
-		Helmet:    storage.Attribute{0x675,1,false},
-		Chest:     storage.Attribute{0x676,1,false},
-		Boots:     storage.Attribute{0x677,1,false},
-		Accessory: storage.Attribute{0x678,1,false},
+		XP:        Attribute{0x660,4,true},
+		HP:        Attribute{0x668,2,true},
+		Weapon:    Attribute{0x674,1,false},
+		Helmet:    Attribute{0x675,1,false},
+		Chest:     Attribute{0x676,1,false},
+		Boots:     Attribute{0x677,1,false},
+		Accessory: Attribute{0x678,1,false},
 	}
 }
diff --git a/internal/app/characters/Lavitz.go b/internal/app/characters/Lavitz.go
@@ -1,19 +1,19 @@
 package characters
 
 import (
-	"LODeditor/internal/app/storage"
+	. "LODeditor/internal/app/storage"
 )
 
 func Lavitz() Character {
 	return Character{
 		ID:        1,
 		Name:      "Lavitz",
-		XP:        storage.Attribute{0x558,4,true},
-		HP:        storage.Attribute{0x560,2,true},
-		Weapon:    storage.Attribute{0x56C,1,false},
-		Helmet:    storage.Attribute{0x56D,1,false},
-		Chest:     storage.Attribute{0x56E,1,false},
-		Boots:     storage.Attribute{0x56F,1,false},
-		Accessory: storage.Attribute{0x570,1,false},
+		XP:        Attribute{0x558,4,true},
+		HP:        Attribute{0x560,2,true},
+		Weapon:    Attribute{0x56C,1,false},
+		Helmet:    Attribute{0x56D,1,false},
+		Chest:     Attribute{0x56E,1,false},
+		Boots:     Attribute{0x56F,1,false},
+		Accessory: Attribute{0x570,1,false},
 	}
 }
diff --git a/internal/app/characters/Meru.go b/internal/app/characters/Meru.go
@@ -1,19 +1,19 @@
 package characters
 
 import (
-	"LODeditor/internal/app/storage"
+	. "LODeditor/internal/app/storage"
 )
 
 func Meru() Character { //TODO map
 	return Character{
 		ID:        06,
 		Name:      "Meru",
-		XP:        storage.Attribute{0x634,4,true},
-		HP:        storage.Attribute{0x63C,2,true},
-		Weapon:    storage.Attribute{0x648,1,false},
-		Helmet:    storage.Attribute{0x649,1,false},
-		Chest:     storage.Attribute{0x64A,1,false},
-		Boots:     storage.Attribute{0x64B,1,false},
-		Accessory: storage.Attribute{0x64C,1,false},
+		XP:        Attribute{0x634,4,true},
+		HP:        Attribute{0x63C,2,true},
+		Weapon:    Attribute{0x648,1,false},
+		Helmet:    Attribute{0x649,1,false},
+		Chest:     Attribute{0x64A,1,false},
+		Boots:     Attribute{0x64B,1,false},
+		Accessory: Attribute{0x64C,1,false},
 	}
 }
diff --git a/internal/app/characters/Miranda.go b/internal/app/characters/Miranda.go
@@ -1,19 +1,19 @@
 package characters
 
 import (
-	"LODeditor/internal/app/storage"
+	. "LODeditor/internal/app/storage"
 )
 
 func Miranda() Character { //TODO Map
 	return Character{
 		ID:        8,
 		Name:      "Miranda",
-		XP:        storage.Attribute{0x68C,4,true},
-		HP:        storage.Attribute{0x694,2,true},
-		Weapon:    storage.Attribute{0x6A0,1,false},
-		Helmet:    storage.Attribute{0x6A1,1,false},
-		Chest:     storage.Attribute{0x6A2,1,false},
-		Boots:     storage.Attribute{0x6A3,1,false},
-		Accessory: storage.Attribute{0x6A4,1,false},
+		XP:        Attribute{0x68C,4,true},
+		HP:        Attribute{0x694,2,true},
+		Weapon:    Attribute{0x6A0,1,false},
+		Helmet:    Attribute{0x6A1,1,false},
+		Chest:     Attribute{0x6A2,1,false},
+		Boots:     Attribute{0x6A3,1,false},
+		Accessory: Attribute{0x6A4,1,false},
 	}
 }
diff --git a/internal/app/characters/Rose.go b/internal/app/characters/Rose.go
@@ -1,19 +1,19 @@
 package characters
 
 import (
-	"LODeditor/internal/app/storage"
+	. "LODeditor/internal/app/storage"
 )
 
 func Rose() Character {
 	return Character{
 		ID:        3,
 		Name:      "Rose",
-		XP:        storage.Attribute{0x5B0,4,true},
-		HP:        storage.Attribute{0x5B8,2,true},
-		Weapon:    storage.Attribute{0x5C4,1,false},
-		Helmet:    storage.Attribute{0x5C5,1,false},
-		Chest:     storage.Attribute{0x5C6,1,false},
-		Boots:     storage.Attribute{0x5C7,1,false},
-		Accessory: storage.Attribute{0x5C8,1,false},
+		XP:        Attribute{0x5B0,4,true},
+		HP:        Attribute{0x5B8,2,true},
+		Weapon:    Attribute{0x5C4,1,false},
+		Helmet:    Attribute{0x5C5,1,false},
+		Chest:     Attribute{0x5C6,1,false},
+		Boots:     Attribute{0x5C7,1,false},
+		Accessory: Attribute{0x5C8,1,false},
 	}
 }
diff --git a/internal/app/characters/Shana.go b/internal/app/characters/Shana.go
@@ -1,19 +1,19 @@
 package characters
 
 import (
-	"LODeditor/internal/app/storage"
+	. "LODeditor/internal/app/storage"
 )
 
 func Shana() Character {
 	return Character{
 		ID:        2,
 		Name:      "Shana",
-		XP:        storage.Attribute{0x584,4,true},
-		HP:        storage.Attribute{0x58C,2,true},
-		Weapon:    storage.Attribute{0x598,1,false},
-		Helmet:    storage.Attribute{0x599,1,false},
-		Chest:     storage.Attribute{0x59A,1,false},
-		Boots:     storage.Attribute{0x59B,1,false},
-		Accessory: storage.Attribute{0x59C,1,false},
+		XP:        Attribute{0x584,4,true},
+		HP:        Attribute{0x58C,2,true},
+		Weapon:    Attribute{0x598,1,false},
+		Helmet:    Attribute{0x599,1,false},
+		Chest:     Attribute{0x59A,1,false},
+		Boots:     Attribute{0x59B,1,false},
+		Accessory: Attribute{0x59C,1,false},
 	}
 }
diff --git a/internal/app/common/Collectibles.go b/internal/app/common/Collectibles.go
@@ -1,10 +1,10 @@
 package common
 
-import "LODeditor/internal/app/storage"
+import . "LODeditor/internal/app/storage"
 
-func Gold() storage.Attribute {
-	return storage.Attribute{0x294, 4, true}
+func Gold() Attribute {
+	return Attribute{0x294, 4, true}
 }
-func GoldDisplay() storage.Attribute {
-	return storage.Attribute{0x19C, 4, true}
+func GoldDisplay() Attribute {
+	return Attribute{0x19C, 4, true}
 }
diff --git a/internal/app/common/Positions.go b/internal/app/common/Positions.go
@@ -1,24 +1,24 @@
 package common
 
-import "LODeditor/internal/app/storage"
+import . "LODeditor/internal/app/storage"
 
-func First() storage.Attribute {
-	return storage.Attribute{0x288,1,false}
+func First() Attribute {
+	return Attribute{0x288,1,false}
 }
-func FirstDisplay() storage.Attribute {
-	return storage.Attribute{0x188,1,false}
+func FirstDisplay() Attribute {
+	return Attribute{0x188,1,false}
 }
 
-func Second() storage.Attribute {
-	return storage.Attribute{0x28C,1,false}
+func Second() Attribute {
+	return Attribute{0x28C,1,false}
 }
-func SecondDisplay() storage.Attribute {
-	return storage.Attribute{0x18C,1,false}
+func SecondDisplay() Attribute {
+	return Attribute{0x18C,1,false}
 }
 
-func Third() storage.Attribute {
-	return storage.Attribute{0x290,1,false}
+func Third() Attribute {
+	return Attribute{0x290,1,false}
 }
-func ThirdDisplay() storage.Attribute {
-	return storage.Attribute{0x190,1,false}
+func ThirdDisplay() Attribute {
+	return Attribute{0x190,1,false}
 }
diff --git a/internal/app/inventory/Armor.go b/internal/app/inventory/Armor.go
@@ -1,6 +1,5 @@
 package inventory
 
-
 func Armor() Inventory {
 	return []Item{
 		{46,"Leather Armor"},

diff --git a/internal/app/inventory/Helms.go b/internal/app/inventory/Helms.go
@@ -1,6 +1,5 @@
 package inventory
 
-
 func Helms() Inventory {
 	return []Item{
 		{76,"Bandana"},