Fixes ranged weapon faction parsing and ammo group ToJSON

The reason the weapon postables were breaking for ranged weapons
was twofold:

1. Special ammo group values in the `ToJSON` instance were being
set to the `WeaponGroup` value, so were not producing a valid value
for that field.

2. We were attempting to parse the faction from the raw name, so
it was always producing a `Nothing` and thus not filling the
faction training correctly.

This has been tested and confirmed that items from the ranged
weapon compendium are posting correctly even when their sheet has
never been opened (which populates the fields with the default
select options at render). We're also rendering properly if posted
directly from the sheet while still in the compendium.

CHANGELOG.md

@@ -6,6 +6,7 @@
 
 * Fixes bug where weapon nickname references in the HTML templates were broken.
 * Fixes bug where null value role owner references were having illegal operations performed on them.
+* Fixes bug where references on postable weapon templates in chat messages would be broken for items immediately copied from the compendium packs.
 
 ## 0.3.0
 

domain/src/Data/Types/Foundry.hs

@@ -357,7 +357,7 @@ instance ToJSON Weapon where
            , "type"               .= weaponType w
            , "magazineCapacity"   .= weaponMagCap w
            , "ammo"               .= weaponAmmo w
-           , "ammoGroup"          .= weaponGroup w
+           , "ammoGroup"          .= weaponAmmoGroup w
            , "scopeMagnification" .= weaponScopeMag w
            , "scopeMinimum"       .= valueRatio 1
            , "owner"              .= nullJSON

domain/src/Data/Types/Prelude.hs

@@ -133,6 +133,21 @@ data AmmoGroup
   | MRC
   | BruteShot
 
+instance ToJSON AmmoGroup where
+  toJSON = toJSON . ammoGroupToText
+
+ammoGroupToText :: AmmoGroup -> T.Text
+ammoGroupToText ag =
+  case ag of
+    None         -> "none"
+    STD          -> "std"
+    Shotgun      -> "shotgun"
+    Flamethrower -> "flamethrower"
+    Sniper       -> "sniper"
+    Grenade      -> "grenade"
+    MRC          -> "mrc"
+    BruteShot    -> "bruteShot"
+
 newtype AmmoList = AmmoList [Ammunition]
 
 instance ToJSON AmmoList where

domain/src/Domain/Convert/Foundry.hs

@@ -345,7 +345,7 @@ mkRanged :: Maybe Faction
          -> RawRangedBase
          -> Either T.Text FoundryData
 mkRanged mbFaction raw rawBase = do
-  let faction = eitherToMaybe . factionFromText $ rawRangedName raw
+  let faction = eitherToMaybe . factionFromText $ rawRangedFaction raw
       (name, nickname) = mkNameAndNickname $ rawRangedName raw
       weaponType = rawRangedBaseType rawBase
       weaponDetails = Map.lookup (T.toUpper weaponType) weaponDetailsMap

domain/src/Domain/Request.hs

@@ -65,7 +65,7 @@ sheetDataMap =
     [ ( AbilitySheet     , (GID "1007822165", Range "A2:F96")   )
     , ( ArmorSheet       , (GID "226189720" , Range "A2:P199")  )
     , ( EquipmentSheet   , (GID "515202982" , Range "A2:F607")  )
- -- , ( FloodSheet       , (GID "1809814064", Range "A2:AA381") )
+    , ( FloodSheet       , (GID "1809814064", Range "A2:AA381") )
     , ( MeleeWeaponSheet , (GID "346860164" , Range "A2:AH63")  )
     , ( PermutationSheet , (GID "80923077"  , Range "A2:F74")   )
     , ( RangedWeaponSheet, (GID "1510373161", Range "B2:AF397") )