Removed unneeded small bit sizes

Author: mudgen

contracts/Aavegotchi/facets/AavegotchiGameFacet.sol

@@ -46,7 +46,7 @@ contract AavegotchiGameFacet is Modifiers {
         available_ = s.aavegotchiNamesUsed[LibAavegotchi.validateAndLowerName(_name)];
     }
 
-    function currentHaunt() external view returns (uint16 hauntId_, Haunt memory haunt_) {
+    function currentHaunt() external view returns (uint256 hauntId_, Haunt memory haunt_) {
         hauntId_ = s.currentHauntId;
         haunt_ = s.haunts[hauntId_];
     }
@@ -86,11 +86,11 @@ contract AavegotchiGameFacet is Modifiers {
         return skillPoints - usedSkillPoints;
     }
 
-    function aavegotchiLevel(uint32 _experience) external pure returns (uint256 level_) {
+    function aavegotchiLevel(uint256 _experience) external pure returns (uint256 level_) {
         level_ = LibAavegotchi.aavegotchiLevel(_experience);
     }
 
-    function xpUntilNextLevel(uint32 _experience) external pure returns (uint256 requiredXp_) {
+    function xpUntilNextLevel(uint256 _experience) external pure returns (uint256 requiredXp_) {
         requiredXp_ = LibAavegotchi.xpUntilNextLevel(_experience);
     }
 
@@ -184,7 +184,7 @@ contract AavegotchiGameFacet is Modifiers {
         // handles underflow
         require(availableSkillPoints(_tokenId) >= totalUsed, "AavegotchiGameFacet: Not enough skill points");
         //Increment used skill points
-        s.aavegotchis[_tokenId].usedSkillPoints += uint16(totalUsed);
+        s.aavegotchis[_tokenId].usedSkillPoints += totalUsed;
         emit SpendSkillpoints(_tokenId, _values);
     }
 }

contracts/Aavegotchi/facets/DAOFacet.sol

@@ -15,10 +15,10 @@ contract DAOFacet is Modifiers {
     event AddCollateralType(AavegotchiCollateralTypeIO _collateralType);
     event AddItemType(ItemType _itemType);
     event CreateHaunt(uint256 indexed _hauntId, uint256 _hauntMaxSize, uint256 _portalPrice, bytes32 _bodyColor);
-    event GrantExperience(uint256[] _tokenIds, uint32[] _xpValues);
+    event GrantExperience(uint256[] _tokenIds, uint256[] _xpValues);
     event AddWearableSet(WearableSet _wearableSet);
     event GameManagerTransferred(address indexed previousGameManager, address indexed newGameManager);
-    event ItemTypeMaxQuantity(uint256[] _itemIds, uint32[] _maxQuanities);
+    event ItemTypeMaxQuantity(uint256[] _itemIds, uint256[] _maxQuanities);
 
     /***********************************|
    |             Read Functions         |
@@ -58,11 +58,11 @@ contract DAOFacet is Modifiers {
         s.collateralTypeInfo[_collateralType].modifiers = _modifiers;
     }
 
-    function updateItemTypeMaxQuantity(uint256[] calldata _itemIds, uint32[] calldata _maxQuantities) external onlyOwnerOrDaoOrGameManager {
+    function updateItemTypeMaxQuantity(uint256[] calldata _itemIds, uint256[] calldata _maxQuantities) external onlyOwnerOrDaoOrGameManager {
         require(_itemIds.length == _maxQuantities.length, "DAOFacet: _itemIds length not the same as _newQuantities length");
         for (uint256 i; i < _itemIds.length; i++) {
             uint256 itemId = _itemIds[i];
-            uint32 maxQuantity = _maxQuantities[i];
+            uint256 maxQuantity = _maxQuantities[i];
             require(maxQuantity >= s.itemTypes[itemId].totalQuantity, "DAOFacet: maxQuantity is greater than existing quantity");
             s.itemTypes[itemId].maxQuantity = maxQuantity;
         }
@@ -105,17 +105,17 @@ contract DAOFacet is Modifiers {
             require(totalQuantity <= s.itemTypes[itemId].maxQuantity, "DAOFacet: Total item type quantity exceeds max quantity");
 
             LibItems.addToOwner(_to, itemId, quantity);
-            s.itemTypes[itemId].totalQuantity = uint32(totalQuantity);
+            s.itemTypes[itemId].totalQuantity = totalQuantity;
         }
         emit LibERC1155.TransferBatch(sender, address(0), _to, _itemIds, _quantities);
         LibERC1155.onERC1155BatchReceived(sender, address(0), _to, _itemIds, _quantities, "");
     }
 
-    function grantExperience(uint256[] calldata _tokenIds, uint32[] calldata _xpValues) external onlyOwnerOrDaoOrGameManager {
+    function grantExperience(uint256[] calldata _tokenIds, uint256[] calldata _xpValues) external onlyOwnerOrDaoOrGameManager {
         require(_tokenIds.length == _xpValues.length, "DAOFacet: IDs must match XP array length");
         for (uint256 i; i < _tokenIds.length; i++) {
             uint256 tokenId = _tokenIds[i];
-            uint32 xp = _xpValues[i];
+            uint256 xp = _xpValues[i];
             require(xp <= 1000, "DAOFacet: Cannot grant more than 1000 XP at a time");
 
             //To test (Dan): Deal with overflow here? - Handling it just in case

contracts/Aavegotchi/facets/ItemsFacet.sol

@@ -255,7 +255,7 @@ contract ItemsFacet is Modifiers {
             //Increase kinship
             if (itemType.kinshipBonus > 0) {
                 uint256 kinship = (uint256(int256(itemType.kinshipBonus)) * quantity) + s.aavegotchis[_tokenId].interactionCount;
-                s.aavegotchis[_tokenId].interactionCount = uint16(kinship);
+                s.aavegotchis[_tokenId].interactionCount = kinship;
             } else if (itemType.kinshipBonus < 0) {
                 uint256 kinshipBonus = LibAppStorage.abs(itemType.kinshipBonus) * quantity;
                 if (s.aavegotchis[_tokenId].interactionCount > kinshipBonus) {
@@ -284,11 +284,10 @@ contract ItemsFacet is Modifiers {
             //Increase experience
             if (itemType.experienceBonus > 0) {
                 uint256 experience = (uint256(itemType.experienceBonus) * quantity) + s.aavegotchis[_tokenId].experience;
-                require(experience <= type(uint32).max, "ItemsFacet: Experience beyond max value");
-                s.aavegotchis[_tokenId].experience = uint32(experience);
+                s.aavegotchis[_tokenId].experience = experience;
             }
 
-            itemType.totalQuantity -= uint32(quantity);
+            itemType.totalQuantity -= quantity;
             LibAavegotchi.interact(_tokenId);
             LibERC1155Marketplace.updateERC1155Listing(address(this), itemId, sender);
         }

contracts/Aavegotchi/facets/ShopFacet.sol

@@ -88,7 +88,7 @@ contract ShopFacet {
             require(itemType.canPurchaseWithGhst, "ShopFacet: Can't purchase item type with GHST");
             uint256 totalQuantity = itemType.totalQuantity + quantity;
             require(totalQuantity <= itemType.maxQuantity, "ShopFacet: Total item type quantity exceeds max quantity");
-            itemType.totalQuantity = uint32(totalQuantity);
+            itemType.totalQuantity = totalQuantity;
             totalPrice += quantity * itemType.ghstPrice;
             LibItems.addToOwner(_to, itemId, quantity);
         }

contracts/Aavegotchi/libraries/LibAavegotchi.sol

@@ -110,7 +110,7 @@ library LibAavegotchi {
         singlePortalAavegotchiTraits_.collateralType = collateralType;
 
         AavegotchiCollateralTypeInfo memory collateralInfo = s.collateralTypeInfo[collateralType];
-        uint16 conversionRate = collateralInfo.conversionRate;
+        uint256 conversionRate = collateralInfo.conversionRate;
 
         //Get rarity multiplier
         uint256 multiplier = rarityMultiplier(singlePortalAavegotchiTraits_.numericTraits);