From ed44de9b3365f9473e8692c4c3d72bb43b1ef2fe Mon Sep 17 00:00:00 2001
From: Amidatelion <63753686+amidatelion@users.noreply.github.com>
Date: Fri, 14 Apr 2023 21:55:05 -0400
Subject: [PATCH] bonuses update + maek work remotely fix

---
 cmd/export.go  |  2 +-
 cmd/import.go  |  2 +-
 cmd/parse.go   |  2 +-
 cmd/walk.go    |  2 +-
 export/gear.go | 12 +++++-------
 go.mod         |  1 -
 main.go        |  2 +-
 7 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/cmd/export.go b/cmd/export.go
index 55b8841..e731536 100644
--- a/cmd/export.go
+++ b/cmd/export.go
@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/bloodydoves/bta-wiki-import/export"
+	"bta-wiki-import/export"
 
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
diff --git a/cmd/import.go b/cmd/import.go
index 297589b..ba12f4b 100644
--- a/cmd/import.go
+++ b/cmd/import.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/bloodydoves/bta-wiki-import/importer"
+	"bta-wiki-import/importer"
 
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/parse.go b/cmd/parse.go
index 2c23a0d..e02c2ac 100644
--- a/cmd/parse.go
+++ b/cmd/parse.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/bloodydoves/bta-wiki-import/export"
+	"bta-wiki-import/export"
 
 	"github.com/spf13/cobra"
 )
diff --git a/cmd/walk.go b/cmd/walk.go
index 146cf1e..2283273 100644
--- a/cmd/walk.go
+++ b/cmd/walk.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	"github.com/bloodydoves/bta-wiki-import/export"
+	"bta-wiki-import/export"
 )
 
 var WalkCommand = &cobra.Command{
diff --git a/export/gear.go b/export/gear.go
index 00220bc..cec0787 100644
--- a/export/gear.go
+++ b/export/gear.go
@@ -27,9 +27,7 @@ type GearCustom struct {
 		EngineFactor  float64 `json:",omitempty"`
 	} `json:",omitempty"`
 
-	BonusDescriptions struct {
-		Bonuses []string `json:",omitempty"`
-	} `json:",omitempty"`
+	BonusDescriptions []string `json:",omitempty"`
 
 	EngineHeatBlock struct {
 		HeatSinkCount int `json:",omitempty"`
@@ -217,7 +215,7 @@ func (w Weapon) ToWiki() string {
 	wt.AddArg("BattleValue", w.BattleValue)
 	wt.AddArg("AllowedLocations", w.AllowedLocations)
 	wt.AddArg("DisallowedLocations", w.DisallowedLocations)
-	wt.AddArg("Bonuses", strings.Join(w.Custom.BonusDescriptions.Bonuses, ","))
+	wt.AddArg("Bonuses", strings.Join(w.Custom.BonusDescriptions, ","))
 
 	wt.AddArg("Category", w.Category)
 	wt.AddArg("Type", w.Type)
@@ -265,7 +263,7 @@ func (a CompleteAmmunition) ToWiki() string {
 	wt.AddArg("BattleValue", a.AmmunitionBox.BattleValue)
 	wt.AddArg("AllowedLocations", a.AmmunitionBox.AllowedLocations)
 	wt.AddArg("DisallowedLocations", a.AmmunitionBox.DisallowedLocations)
-	wt.AddArg("Bonuses", strings.Join(a.AmmunitionBox.Custom.BonusDescriptions.Bonuses, ","))
+	wt.AddArg("Bonuses", strings.Join(a.AmmunitionBox.Custom.BonusDescriptions, ","))
 
 	wt.AddArg("AmmoID", a.AmmunitionBox.AmmoID)
 	wt.AddArg("Capacity", a.AmmunitionBox.Capacity)
@@ -289,7 +287,7 @@ func (j JumpJet) ToWiki() string {
 	wt.AddArg("BattleValue", j.BattleValue)
 	wt.AddArg("AllowedLocations", j.AllowedLocations)
 	wt.AddArg("DisallowedLocations", j.DisallowedLocations)
-	wt.AddArg("Bonuses", strings.Join(j.Custom.BonusDescriptions.Bonuses, ","))
+	wt.AddArg("Bonuses", strings.Join(j.Custom.BonusDescriptions, ","))
 
 	wt.AddArg("JumpCapacity", j.JumpCapacity)
 	wt.AddArg("MinTonnage", j.MinTonnage)
@@ -376,7 +374,7 @@ func (g Gear) ToWiki() string {
 	wt.AddArg("ComponentType", g.ComponentType)
 	wt.AddArg("ComponentSubType", g.ComponentSubType)
 	wt.AddArg("BattleValue", g.BattleValue)
-	wt.AddArg("Bonuses", strings.Join(g.Custom.BonusDescriptions.Bonuses, ","))
+	wt.AddArg("Bonuses", strings.Join(g.Custom.BonusDescriptions, ","))
 	wt.AddArg("CustomCategories", strings.Join(categories, ","))
 
 	if g.ComponentType == "HeatSink" {
diff --git a/go.mod b/go.mod
index 99b3f48..6c774c3 100644
--- a/go.mod
+++ b/go.mod
@@ -6,7 +6,6 @@ go 1.19
 
 require (
 	cgt.name/pkg/go-mwclient v1.2.0
-	github.com/bloodydoves/bta-wiki-import v0.0.0-00010101000000-000000000000
 	github.com/sirupsen/logrus v1.9.0
 	github.com/spf13/cobra v1.6.1
 )
diff --git a/main.go b/main.go
index 3462ced..53f46a3 100644
--- a/main.go
+++ b/main.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/bloodydoves/bta-wiki-import/cmd"
+	"bta-wiki-import/cmd"
 )
 
 func main() {