Skip to content

Commit dbde32d

Browse files
committed
mounts are in items now
1 parent b55ae82 commit dbde32d

File tree

6 files changed

+5
-46
lines changed

6 files changed

+5
-46
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
github.com/dlclark/regexp2 v1.11.5
1313
github.com/docker/docker v28.5.2+incompatible
1414
github.com/dofusdude/ankabuffer v0.1.0
15-
github.com/dofusdude/dodumap v0.6.10
15+
github.com/dofusdude/dodumap v0.7.0
1616
github.com/spf13/cobra v1.10.2
1717
github.com/spf13/viper v1.21.0
1818
github.com/xhhuango/json v1.19.0

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ github.com/dofusdude/ankabuffer v0.1.0 h1:yMLJu3iN0JBjBS/Hjh/VtwUHwUJSGx4rEixt9+
5555
github.com/dofusdude/ankabuffer v0.1.0/go.mod h1:H84vCl3zg8ibH+h6mFGvYxrLEIBOpnjYVi3WJXBFbNg=
5656
github.com/dofusdude/dodumap v0.6.10 h1:3KI9aB8aaSS/wNkcbkT567+RjRfSToLjG8zD8NhZIcs=
5757
github.com/dofusdude/dodumap v0.6.10/go.mod h1:51KG2eMd02UJnXErOubAukVftYuJproDHqJcbIHSzIE=
58+
github.com/dofusdude/dodumap v0.7.0 h1:h5QeFL/pNeBHrvp+3VWmazpiUgGz/QljtHh2R1gYmeE=
59+
github.com/dofusdude/dodumap v0.7.0/go.mod h1:51KG2eMd02UJnXErOubAukVftYuJproDHqJcbIHSzIE=
5860
github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
5961
github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
6062
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=

images.go

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ func DownloadImagesLauncher(hashJson *ankabuffer.Manifest, bin int, maxConcurren
542542
}
543543
}
544544

545-
const totalDownloads = 14 // just to buffer, must be at least the number of go routines started below
545+
const totalDownloads = 13 // just to buffer, must be at least the number of go routines started below
546546

547547
feedbacks := make(chan string)
548548

@@ -583,22 +583,6 @@ func DownloadImagesLauncher(hashJson *ankabuffer.Manifest, bin int, maxConcurren
583583
}()
584584
}
585585

586-
// -- mounts --
587-
if !ignoresRegex(ignore, "images-mounts") {
588-
wg.Add(1) // 2
589-
go func() {
590-
defer wg.Done()
591-
semaphore <- struct{}{}
592-
fileNames := []HashFile{
593-
{Filename: "Dofus_Data/StreamingAssets/Content/Picto/UI/mount_assets_.bundle", FriendlyName: "mount_images.imagebundle"},
594-
}
595-
596-
lowRes := 64
597-
highRes := 256
598-
download_unpack_clean_dedup_multires(errorChan, "Mounts", bin, hashJson, dir, filepath.Join(dir, "img", "mount"), fileNames, semaphore, feedbacks, "mounts", map[string]*int{"small": &lowRes, "big": &highRes})
599-
}()
600-
}
601-
602586
// -- emotes --
603587
if !ignoresRegex(ignore, "images-emotes") {
604588
wg.Add(1) // 3

items.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ func DownloadItems(hashJson *ankabuffer.Manifest, bin int, version int, dir stri
3131
{Filename: "Dofus_Data/StreamingAssets/Content/Data/data_assets_companionspellsdataroot.asset.bundle", FriendlyName: "companion_spells.asset.bundle"},
3232
{Filename: "Dofus_Data/StreamingAssets/Content/Data/data_assets_companionsdataroot.asset.bundle", FriendlyName: "companions.asset.bundle"},
3333
{Filename: "Dofus_Data/StreamingAssets/Content/Data/data_assets_areasdataroot.asset.bundle", FriendlyName: "areas.asset.bundle"},
34-
{Filename: "Dofus_Data/StreamingAssets/Content/Data/data_assets_mountfamiliesdataroot.asset.bundle", FriendlyName: "mount_family.asset.bundle"},
3534
{Filename: "Dofus_Data/StreamingAssets/Content/Data/data_assets_servergametypesdataroot.asset.bundle", FriendlyName: "server_game_types.asset.bundle"},
3635
{Filename: "Dofus_Data/StreamingAssets/Content/Data/data_assets_characteristiccategoriesdataroot.asset.bundle", FriendlyName: "chars_categories.asset.bundle"},
3736
{Filename: "Dofus_Data/StreamingAssets/Content/Data/data_assets_creaturebonestypesdataroot.asset.bundle", FriendlyName: "creature_bone_types.asset.bundle"},
@@ -76,7 +75,6 @@ func DownloadItems(hashJson *ankabuffer.Manifest, bin int, version int, dir stri
7675
{Filename: "Dofus_Data/StreamingAssets/Content/Data/data_assets_mapreferencesdataroot.asset.bundle", FriendlyName: "map_references.asset.bundle"},
7776
{Filename: "Dofus_Data/StreamingAssets/Content/Data/data_assets_mapsinformationdataroot.asset.bundle", FriendlyName: "maps_information.asset.bundle"},
7877
{Filename: "Dofus_Data/StreamingAssets/Content/Data/data_assets_monstersuperracesdataroot.asset.bundle", FriendlyName: "monsters_super_races.asset.bundle"},
79-
{Filename: "Dofus_Data/StreamingAssets/Content/Data/data_assets_mountbehaviorsdataroot.asset.bundle", FriendlyName: "mount_behaviors.asset.bundle"},
8078
{Filename: "Dofus_Data/StreamingAssets/Content/Data/data_assets_ornamentsdataroot.asset.bundle", FriendlyName: "ornaments.asset.bundle"},
8179
{Filename: "Dofus_Data/StreamingAssets/Content/Data/data_assets_skillsdataroot.asset.bundle", FriendlyName: "skills.asset.bundle"},
8280
{Filename: "Dofus_Data/StreamingAssets/Content/Data/data_assets_smileypacksdataroot.asset.bundle", FriendlyName: "smiley_packs.asset.bundle"},

main.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
)
1919

2020
var (
21-
DodudaVersion = "v0.6.18"
21+
DodudaVersion = "v0.7.0"
2222
DodudaShort = "doduda - Dofus data CLI"
2323
DodudaLong = "CLI for Dofus asset downloading and unpacking."
2424
DodudaVersionHelp = DodudaShort + "\n" + DodudaVersion + "\nhttps://github.com/dofusdude/doduda"
@@ -136,7 +136,6 @@ For Dofus 3
136136
- achievements
137137
- spell_states
138138
- items
139-
- mounts
140139
- emotes
141140
- class_heads
142141
- alignment

mapping.go

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -105,18 +105,6 @@ func Map(dir string, indent string, persistenceDir string, release string, headl
105105
mappedItemPath := filepath.Join(dir, "MAPPED_ITEMS.json")
106106
marshalSave(mappedItems, mappedItemPath, indent)
107107

108-
if isChannelClosed(updatesChan) {
109-
os.Exit(1)
110-
}
111-
if headless {
112-
updatesChan <- "Mounts 🧠"
113-
} else {
114-
updatesChan <- "Mounts " + ui.HelpStyle("mapping")
115-
}
116-
mappedMounts := mapping.MapMounts(gameData, &languageData)
117-
mappedMountsPath := filepath.Join(dir, "MAPPED_MOUNTS.json")
118-
marshalSave(mappedMounts, mappedMountsPath, indent)
119-
120108
if isChannelClosed(updatesChan) {
121109
os.Exit(1)
122110
}
@@ -177,18 +165,6 @@ func Map(dir string, indent string, persistenceDir string, release string, headl
177165
mappedItemPath := filepath.Join(dir, "MAPPED_ITEMS.json")
178166
marshalSave(mappedItems, mappedItemPath, indent)
179167

180-
if isChannelClosed(updatesChan) {
181-
os.Exit(1)
182-
}
183-
if headless {
184-
updatesChan <- "Mounts 🧠"
185-
} else {
186-
updatesChan <- "Mounts " + ui.HelpStyle("mapping")
187-
}
188-
mappedMounts := mapping.MapMountsUnity(gameData, &languageData)
189-
mappedMountsPath := filepath.Join(dir, "MAPPED_MOUNTS.json")
190-
marshalSave(mappedMounts, mappedMountsPath, indent)
191-
192168
if isChannelClosed(updatesChan) {
193169
os.Exit(1)
194170
}

0 commit comments

Comments
 (0)