Support for 1.3 patch. Expanded FastSell logic

Author: flibdev

UI-Improvements/CHANGELOG.md

@@ -0,0 +1,34 @@
+# Changelog
+
+## [1.3.0] - 2021-09-02
+
+Support for Cyberpunk 2077 Patch 1.3
+
+### Added
+
+ - Vendor - Fast Buy & Sell
+   - Allows you to sell entire stacks or expensive items without any additional dialogs
+   - Limits sales to vendor money total
+   - Also limits all buy/sell actions to player/vendor money total
+   - Fast Sell is bound to the "Activate Secondary" input event, right click by default
+   - Button hint text works in English and Russian, currently unsure about other languages
+ - RPGManager - Mod Slots
+   - Fixes LMG mods slots
+
+
+### Changed
+
+ - Requires redscript 0.3 or newer
+ - Changed all method replacements to wraps where possible
+   - Reduces issues caused by patch changes
+   - Should improve compatibility between mods
+ - Added names to the multiple "Other" shard groups
+ - Fixed minor issue with phone dialer menu sorting
+
+### Removed
+
+ - Quest - Vehicle Previews
+   - Feature was added by CDPR in Patch 1.3
+ - Dialer Menu - By Timestamp
+   - Removed redundant version of phone menu sorting.
+   - Plan is to reenable this variant when Mod Settings are available

UI-Improvements/r6/scripts/flib/Crafting-MaxAmmo.reds

@@ -34,23 +34,10 @@ protected func flibGetAmmoCraftingMaximum(itemData: wref<gameItemData>) -> Int32
 }
 
 /// Added ammo max check
-@replaceMethod(CraftingSystem)
+@wrapMethod(CraftingSystem)
 public final const func GetMaxCraftingAmount(itemData: wref<gameItemData>) -> Int32 {
-  let currentQuantity: Int32;
-  let currentResult: Int32;
-  let transactionSystem: ref<TransactionSystem> = GameInstance.GetTransactionSystem(this.GetGameInstance());
-  let requiredIngredients: array<IngredientData> = this.GetItemCraftingCost(itemData);
-  let result: Int32 = 10000000;
-  let i: Int32 = 0;
-  while i < ArraySize(requiredIngredients) {
-    currentQuantity = transactionSystem.GetItemQuantity(this.m_playerCraftBook.GetOwner(), ItemID.CreateQuery(requiredIngredients[i].id.GetID()));
-    if currentQuantity > requiredIngredients[i].quantity {
-      result = Min(result, currentQuantity / requiredIngredients[i].quantity);
-    } else {
-      return 0;
-    };
-    i += 1;
-  };
+  let result: Int32 = wrappedMethod(itemData);
+
   if (itemData.HasTag(n"Ammo")) {
     return Min(result, this.flibGetAmmoCraftingMaximum(itemData));
   }

UI-Improvements/r6/scripts/flib/DialerMenu-ByName.reds

@@ -9,6 +9,6 @@ public func SortItem(left: ref<IScriptable>, right: ref<IScriptable>) -> Bool {
   return this.m_compareBuilder
     .BoolTrue(leftData.questRelated, rightData.questRelated)
     .BoolTrue(ArraySize(leftData.unreadMessages) > 0, ArraySize(rightData.unreadMessages) > 0)
-    .UnicodeStringAsc(GetLocalizedText(leftData.localizedName), GetLocalizedText(rightData.localizedName))
+    .StringAsc(GetLocalizedText(leftData.localizedName), GetLocalizedText(rightData.localizedName))
     .GetBool();
 }

UI-Improvements/r6/scripts/flib/DialerMenu-ByTimestamp.reds

@@ -1,57 +1,19 @@
 
-@replaceMethod(CraftingSystem)
+@wrapMethod(CraftingSystem)
 public final const func CanItemBeDisassembled(itemData: wref<gameItemData>) -> Bool {
-  if NotEquals(itemData, null) {
-    return !itemData.HasTag(n"Quest")
-        && !itemData.HasTag(n"UnequipBlocked")
-        && !RPGManager.IsItemIconic(itemData)
-        && NotEquals(ItemActionsHelper.GetDisassembleAction(itemData.GetID()), null);
+  if IsDefined(itemData) {
+    return !RPGManager.IsItemIconic(itemData) && wrappedMethod(itemData);
   };
   return false;
 }
 
-@replaceMethod(Vendor)
+@wrapMethod(Vendor)
 public final const func PlayerCanSell(itemID: ItemID, allowQuestItems: Bool, excludeEquipped: Bool) -> Bool {
-  let hasInverseTag: Bool;
-  let i: Int32;
-  let inverseFilterTags: array<CName>;
-  let itemData: wref<gameItemData>;
-  let itemTags: array<CName>;
-  let player: wref<GameObject>;
-  let filterTags: array<CName> = this.m_vendorRecord.CustomerFilterTags();
-  if allowQuestItems {
-    ArrayRemove(filterTags, n"Quest");
-  };
-  inverseFilterTags = TDB.GetCNameArray(this.m_vendorRecord.GetID() + t".customerInverseFilterTags");
-  itemTags = RPGManager.GetItemRecord(itemID).Tags();
-  player = GetPlayer(this.m_gameInstance);
-  itemData = GameInstance.GetTransactionSystem(this.m_gameInstance).GetItemData(player, itemID);
+  let player: wref<GameObject> = GetPlayer(this.m_gameInstance);
+  let itemData: wref<gameItemData> = GameInstance.GetTransactionSystem(this.m_gameInstance).GetItemData(player, itemID);
   // Prevent any sale of iconic items
-  if RPGManager.IsItemIconic(itemData) {
+  if IsDefined(itemData) && RPGManager.IsItemIconic(itemData) {
     return false;
   }
-  if excludeEquipped && EquipmentSystem.GetInstance(player).IsEquipped(player, itemID) {
-    return false;
-  };
-  if ArraySize(inverseFilterTags) > 0 {
-    i = 0;
-    while i < ArraySize(inverseFilterTags) {
-      if itemData.HasTag(inverseFilterTags[i]) {
-        hasInverseTag = true;
-      } else {
-        i += 1;
-      };
-    };
-    if !hasInverseTag {
-      return false;
-    };
-  };
-  i = 0;
-  while i < ArraySize(filterTags) {
-    if itemData.HasTag(filterTags[i]) {
-      return false;
-    };
-    i += 1;
-  };
-  return true;
+  return wrappedMethod(itemID, allowQuestItems, excludeEquipped);
 }

UI-Improvements/r6/scripts/flib/IconicItems-PreventRemoval.reds

@@ -3,8 +3,6 @@
 Implementation of custom sorting at runtime for the Messages screen
 
 @see file:shared/VirtualNestedList.reds
-
-
 */
 
 /// @section MessengerContactDataView

UI-Improvements/r6/scripts/flib/Messages-CustomSort.reds

@@ -14,18 +14,7 @@ protected func PreSortItems(compareBuilder: ref<CompareBuilder>, left: ref<Virut
   let rightShard = ShardsNestedListDataView.flibGetShardGroupFromListData(right);
 
   if IsDefined(leftShard) && IsDefined(leftShard) {
-    switch this.f_sortOrder {
-      case flibSortOrder.Timestamp:
-        compareBuilder
-          .BoolTrue(leftShard.m_isNew, rightShard.m_isNew)
-          .GameTimeDesc(leftShard.m_timeStamp, rightShard.m_timeStamp);
-        break;
-      case flibSortOrder.Name:
-        compareBuilder.StringAsc(GetLocalizedText(leftShard.m_title), GetLocalizedText(rightShard.m_title));
-        break;
-      default:
-        break;
-    }
+    compareBuilder.StringAsc(GetLocalizedText(leftShard.m_title), GetLocalizedText(rightShard.m_title));
   }
 }
 
@@ -158,7 +147,7 @@ private final func PopulateData() -> Void {
 
   i = 0;
   while i < ArraySize(items) {
-    if this.ProcessItem(items[i], data, level, AsRef(newEntries)) {
+    if this.ProcessItem(items[i], data, level, newEntries) {
       counter += 1;
     }
     i += 1;