bonuses update + maek work remotely fix

bloodydoves · Apr 15, 2023 · ed44de9 · ed44de9
1 parent c738493
commit ed44de9
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/bloodydoves/bta-wiki-import/cmd"
+	"bta-wiki-import/cmd"
 )
 
 func main() {