...

7 files changed, 30 insertions, 12 deletions

diff --git a/src/roster-editor/src/ElmModule/Update.elm b/src/roster-editor/src/ElmModule/Update.elm
index f095ee8..ee6f515 100644
--- a/src/roster-editor/src/ElmModule/Update.elm
+++ b/src/roster-editor/src/ElmModule/Update.elm
@@ -69,8 +69,8 @@ update event model =
       (Struct.Event.SelectedArmor ref) ->
          (Update.SetArmor.apply_to new_model ref)
 
-      (Struct.Event.SelectedWeapon (ref, is_main)) ->
-         (Update.SetWeapon.apply_to new_model ref is_main)
+      (Struct.Event.SelectedWeapon ref) ->
+         (Update.SetWeapon.apply_to new_model ref)
 
       (Struct.Event.SelectedGlyph (ref, index)) ->
          (Update.SetGlyph.apply_to new_model ref index)
diff --git a/src/roster-editor/src/Struct/Event.elm b/src/roster-editor/src/Struct/Event.elm
index f3dce39..7574f62 100644
--- a/src/roster-editor/src/Struct/Event.elm
+++ b/src/roster-editor/src/Struct/Event.elm
@@ -27,7 +27,7 @@ type Type =
    | TabSelected Struct.UI.Tab
 
    | SelectedArmor Struct.Armor.Ref
-   | SelectedGlyph Struct.Glyph.Ref
+   | SelectedGlyph (Struct.Glyph.Ref, Int)
    | SelectedGlyphBoard Struct.GlyphBoard.Ref
    | SelectedPortrait Struct.Portrait.Ref
    | SelectedWeapon Struct.Weapon.Ref
diff --git a/src/roster-editor/src/Struct/UI.elm b/src/roster-editor/src/Struct/UI.elm
index 169c883..cd72247 100644
--- a/src/roster-editor/src/Struct/UI.elm
+++ b/src/roster-editor/src/Struct/UI.elm
@@ -6,7 +6,8 @@ module Struct.UI exposing
       -- Tab
       get_displayed_tab,
       set_displayed_tab,
-      reset_displayed_tab
+      reset_displayed_tab,
+      is_selecting_main_weapon
    )
 
 -- Elm -------------------------------------------------------------------------
@@ -26,7 +27,8 @@ type Tab =
 
 type alias Type =
    {
-      displayed_tab : Tab
+      displayed_tab : Tab,
+      is_selecting_main_weapon : Bool
    }
 
 --------------------------------------------------------------------------------
@@ -40,6 +42,7 @@ default : Type
 default =
    {
       displayed_tab = CharacterSelectionTab,
+      is_selecting_main_weapon = False
    }
 
 -- Tab -------------------------------------------------------------------------
@@ -51,3 +54,6 @@ set_displayed_tab tab ui = {ui | displayed_tab = tab}
 
 reset_displayed_tab : Type -> Type
 reset_displayed_tab ui = {ui | displayed_tab = CharacterSelectionTab}
+
+is_selecting_main_weapon : Type -> Bool
+is_selecting_main_weapon ui = ui.is_selecting_main_weapon
diff --git a/src/roster-editor/src/Update/SetWeapon.elm b/src/roster-editor/src/Update/SetWeapon.elm
index 77e46ec..aebc544 100644
--- a/src/roster-editor/src/Update/SetWeapon.elm
+++ b/src/roster-editor/src/Update/SetWeapon.elm
@@ -8,6 +8,7 @@ import Struct.Character
 import Struct.Error
 import Struct.Event
 import Struct.Model
+import Struct.UI
 import Struct.Weapon
 import Struct.WeaponSet
 
@@ -21,10 +22,9 @@ import Struct.WeaponSet
 apply_to : (
       Struct.Model.Type ->
       Struct.Weapon.Ref ->
-      Bool->
       (Struct.Model.Type, (Cmd Struct.Event.Type))
    )
-apply_to model ref is_main =
+apply_to model ref =
    (
       (
          case (model.edited_char, (Dict.get ref model.weapons)) of
@@ -34,7 +34,7 @@ apply_to model ref is_main =
                      (Just
                         (Struct.Character.set_weapons
                            (
-                              if (is_main)
+                              if (Struct.UI.is_selecting_main_weapon model.ui)
                               then
                                  (Struct.WeaponSet.set_active_weapon
                                     weapon
diff --git a/src/roster-editor/src/View/ArmorSelection.elm b/src/roster-editor/src/View/ArmorSelection.elm
index 2e53375..8f8118e 100644
--- a/src/roster-editor/src/View/ArmorSelection.elm
+++ b/src/roster-editor/src/View/ArmorSelection.elm
@@ -5,6 +5,7 @@ import Dict
 
 import Html
 import Html.Attributes
+import Html.Events
 
 -- Roster Editor ---------------------------------------------------------------
 import Struct.Armor
@@ -39,7 +40,10 @@ get_armor_html armor =
    (Html.div
       [
          (Html.Attributes.class "character-card-armor"),
-         (Html.Attributes.class "clickable")
+         (Html.Attributes.class "clickable"),
+         (Html.Events.onClick
+            (Struct.Event.SelectedArmor (Struct.Armor.get_id armor))
+         )
       ]
       [
          (Html.div
diff --git a/src/roster-editor/src/View/PortraitSelection.elm b/src/roster-editor/src/View/PortraitSelection.elm
index a6c20ed..b630ef0 100644
--- a/src/roster-editor/src/View/PortraitSelection.elm
+++ b/src/roster-editor/src/View/PortraitSelection.elm
@@ -5,6 +5,7 @@ import Dict
 
 import Html
 import Html.Attributes
+import Html.Events
 
 import List
 
@@ -21,8 +22,11 @@ get_portrait_html pt =
    (Html.div
       [
          (Html.Attributes.class "character-portrait-and-icon"),
-         (Html.Attributes.class "clickable")
-      ]
+         (Html.Attributes.class "clickable"),
+         (Html.Events.onClick
+            (Struct.Event.SelectedPortrait (Struct.Portrait.get_id pt))
+         )
+     ]
       [
          (Html.div
             [
diff --git a/src/roster-editor/src/View/WeaponSelection.elm b/src/roster-editor/src/View/WeaponSelection.elm
index 0bbe897..04d7410 100644
--- a/src/roster-editor/src/View/WeaponSelection.elm
+++ b/src/roster-editor/src/View/WeaponSelection.elm
@@ -5,6 +5,7 @@ import Dict
 
 import Html
 import Html.Attributes
+import Html.Events
 
 -- Roster Editor ---------------------------------------------------------------
 import Struct.Event
@@ -39,7 +40,10 @@ get_weapon_html weapon =
    (Html.div
       [
          (Html.Attributes.class "character-card-weapon"),
-         (Html.Attributes.class "clickable")
+         (Html.Attributes.class "clickable"),
+         (Html.Events.onClick
+            (Struct.Event.SelectedWeapon (Struct.Weapon.get_id weapon))
+         )
      ]
       [
          (Html.div