Merge pull request #28 from mcred/develop

Fixes #17
Fixes #15
Fixes #14

internal/app/characters/Character.go

@@ -5,15 +5,35 @@ import (
 )
 
 type Character struct {
-	ID        int
-	Name      string
-	XP        Attribute
-	HP        Attribute
-	Weapon    Attribute
-	Helmet    Attribute
-	Chest     Attribute
-	Boots     Attribute
-	Accessory Attribute
+	ID        	int
+	Name      	string
+	XP        	Attribute
+	HP        	Attribute
+	MP			Attribute
+	SP			Attribute
+	Level		Attribute
+	Weapon    	Attribute
+	Helmet    	Attribute
+	Chest     	Attribute
+	Boots     	Attribute
+	Accessory 	Attribute
+}
+
+func CreateCharacter(ID int, name string, root int) Character {
+	return Character{
+		ID:        ID,
+		Name:      name,
+		XP:        Attribute{root,4,true},
+		HP:        Attribute{root + 8,2,true},
+		MP:        Attribute{root + 10,2,true},
+		SP:        Attribute{root + 12,2,true},
+		Level:     Attribute{root + 18,1,false},
+		Weapon:    Attribute{root + 20,1,false},
+		Helmet:    Attribute{root + 21,1,false},
+		Chest:     Attribute{root + 22,1,false},
+		Boots:     Attribute{root + 23,1,false},
+		Accessory: Attribute{root + 24,1,false},
+	}
 }
 
 func GetCharacters() []Character {

internal/app/characters/Characters.go

@@ -0,0 +1,37 @@
+package characters
+
+func Dart() Character {
+	return CreateCharacter(0,"Dart",0x52C)
+}
+
+func Lavitz() Character {
+	return CreateCharacter(1,"Lavitz",0x558)
+}
+
+func Shana() Character {
+	return CreateCharacter(2,"Shana",0x584)
+}
+
+func Rose() Character {
+	return CreateCharacter(3,"Rose",0x5B0)
+}
+
+func Haschel() Character {
+	return CreateCharacter(4,"Haschel",0x5DC)
+}
+
+func Albert() Character {
+	return CreateCharacter(5,"Albert",0x608)
+}
+
+func Meru() Character {
+	return CreateCharacter(6,"Meru",0x634)
+}
+
+func Kongol() Character {
+	return CreateCharacter(7,"Kongol",0x660)
+}
+
+func Miranda() Character {
+	return CreateCharacter(8,"Miranda",0x68C)
+}

internal/app/ui/Form.go

@@ -78,19 +78,25 @@ func createPartyForm(s *Slot) *fyne.Container {
 
 func createCharacterBox(b *widget.Box, c characters.Character, w inventory.Inventory, s *Slot, window fyne.Window) {
 	b.Append(widget.NewLabel(c.Name))
-
+	b.Append(widget.NewLabel("Level"))
+	b.Append(createCharEntry(c.Level, s))
+	b.Append(widget.NewLabel("EXP"))
+	b.Append(createCharEntry(c.XP, s))
 	b.Append(widget.NewLabel("HP"))
 	b.Append(createCharEntry(c.HP, s))
-
-	b.Append(widget.NewLabel("Weapon"))
+	b.Append(widget.NewLabel("MP"))
+	b.Append(createCharEntry(c.MP, s))
+	b.Append(widget.NewLabel("SP"))
+	b.Append(createCharEntry(c.SP, s))
+	//b.Append(widget.NewLabel("Weapon"))
 	b.Append(createCharSelect(w, c.Weapon, s))
-	b.Append(widget.NewLabel("Armor"))
+	//b.Append(widget.NewLabel("Armor"))
 	b.Append(createCharSelect(inventory.Armor(), c.Chest, s))
-	b.Append(widget.NewLabel("Headgear"))
+	//b.Append(widget.NewLabel("Headgear"))
 	b.Append(createCharSelect(inventory.Helms(), c.Helmet, s))
-	b.Append(widget.NewLabel("Boots"))
+	//b.Append(widget.NewLabel("Boots"))
 	b.Append(createCharSelect(inventory.Boots(), c.Boots, s))
-	b.Append(widget.NewLabel("Accessories"))
+	//b.Append(widget.NewLabel("Accessories"))
 	b.Append(createCharSelect(inventory.Accessories(), c.Accessory, s))
 }