Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Minor Bug Fixes #2

Merged
merged 2 commits into from
Feb 14, 2020
Merged

Minor Bug Fixes #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86b59b4
fix bug with shana and lavitz
mcred Feb 14, 2020
93e2b1d
split weapons into user catagories
mcred Feb 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions internal/app/characters/Lavitz.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ package characters

func Lavitz() Character {
return Character{
XP: Attribute{0x558,4,true},
HP: Attribute{0x560,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},
XP: Attribute{0x584,4,true},
HP: Attribute{0x534,2,true}, //TODO map this
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},
}
}
14 changes: 7 additions & 7 deletions internal/app/characters/Shana.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ package characters

func Shana() Character {
return Character{
XP: Attribute{0x584,4,true},
HP: Attribute{0x534,2,true}, //TODO map this
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},
XP: Attribute{0x558,4,true},
HP: Attribute{0x560,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},
}
}
32 changes: 31 additions & 1 deletion internal/app/inventory/Weapons.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package inventory

func Weapons() Inventory {
func Swords() Inventory {
return []Item {
{0,"Broad Sword"},
{1,"Bastard Sword"},
Expand All @@ -10,38 +10,68 @@ func Weapons() Inventory {
{5,"Fairy Sword"},
{6,"Claymore"},
{7,"Soul Eater"},
}
}

func Axes() Inventory {
return []Item {
{8,"Axe"},
{9,"Tomahawk"},
{10,"Battle Axe"},
{11,"Great Axe"},
{12,"Indora's Axe"},
}
}

func Daggers() Inventory {
return []Item{
{13,"Rapier"},
{19,"Demon Stiletto"},
{14,"Shadow Cutter"},
{15,"Dancing Dagger"},
{16,"Flamberge"},
{17,"Gladius"},
{18,"Dragon Buster"},
}
}

func Spears() Inventory {
return []Item {
{20,"Spear"},
{21,"Lance"},
{26,"Twister Glaive"},
{22,"Glaive"},
{23,"Spear Of Terror"},
{24,"Partisan"},
{25,"Halberd"},
}
}

func Bows() Inventory {
return []Item {
{27,"Short Bow"},
{28,"Sparkle Arrow"},
{29,"Long Bow"},
{30,"Bemusing Arrow"},
{31,"Virulent Arrow"},
{33,"Arrow Of Force"},
{32,"Detonate Arrow"},
}
}

func Maces() Inventory {
return []Item {
{34,"Mace"},
{35,"Morning Star"},
{36,"War Hammer"},
{37,"Heavy Mace"},
{39,"Pretty Hammer"},
{38,"Basher"},
}
}

func Knuckles() Inventory {
return []Item {
{40,"Iron Knuckle"},
{41,"Beast Fang"},
{42,"Diamond Claw"},
Expand Down
6 changes: 3 additions & 3 deletions internal/app/ui/Form.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ func CharacterForm(slot *storage.Slot, card *storage.Card, w fyne.Window) *fyne.
box1 := widget.NewVBox()
box1.Append(widget.NewLabel("Dart"))
box1.Append(widget.NewLabel("Weapon"))
box1.Append(createSelect(inventory.Weapons(), dart.Weapon, slot))
box1.Append(createSelect(inventory.Swords(), dart.Weapon, slot))
box1.Append(widget.NewLabel("Armor"))
box1.Append(createSelect(inventory.Armor(), dart.Chest, slot))
box1.Append(widget.NewLabel("Headgear"))
Expand All @@ -47,7 +47,7 @@ func CharacterForm(slot *storage.Slot, card *storage.Card, w fyne.Window) *fyne.
box2 := widget.NewVBox()
box2.Append(widget.NewLabel("Shana"))
box2.Append(widget.NewLabel("Weapon"))
box2.Append(createSelect(inventory.Weapons(), shana.Weapon, slot))
box2.Append(createSelect(inventory.Bows(), shana.Weapon, slot))
box2.Append(widget.NewLabel("Armor"))
box2.Append(createSelect(inventory.Armor(), shana.Chest, slot))
box2.Append(widget.NewLabel("Headgear"))
Expand All @@ -61,7 +61,7 @@ func CharacterForm(slot *storage.Slot, card *storage.Card, w fyne.Window) *fyne.
box3 := widget.NewVBox()
box3.Append(widget.NewLabel("Lavitz"))
box3.Append(widget.NewLabel("Weapon"))
box3.Append(createSelect(inventory.Weapons(), lavitz.Weapon, slot))
box3.Append(createSelect(inventory.Spears(), lavitz.Weapon, slot))
box3.Append(widget.NewLabel("Armor"))
box3.Append(createSelect(inventory.Armor(), lavitz.Chest, slot))
box3.Append(widget.NewLabel("Headgear"))
Expand Down
5 changes: 4 additions & 1 deletion scripts/package.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
#!/usr/bin/env bash

fyne package -executable ./build/LODeditor -os darwin -icon ./assets/icon.png
set -ex

#export PATH=$PATH:$(go env GOPATH)/bin
fyne package -executable ./build/LODeditor -os darwin -icon ./assets/icon.png