RE CV: switch back to old item technique

biorand · Mar 19, 2024 · 4a5ceb1 · 4a5ceb1
1 parent cb2db38
commit 4a5ceb1
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 12 deletions.
diff --git a/IntelOrca.Biohazard.BioRand/RECV/ReCvItemHelper.cs b/IntelOrca.Biohazard.BioRand/RECV/ReCvItemHelper.cs
@@ -224,10 +224,8 @@ public ItemAttribute GetItemAttributes(byte item)
                 case ReCvItemIds.EnhancedHandgun:
                     return ItemAttribute.Ammo;
                 case ReCvItemIds.Memo:
-                    return ItemAttribute.Document;
                 case ReCvItemIds.BoardClip:
                 case ReCvItemIds.Card:
-                    return ItemAttribute.Key;
                 case ReCvItemIds.NewspaperClip:
                     return ItemAttribute.Document;
                 case ReCvItemIds.LugerReplica:

diff --git a/IntelOrca.Biohazard.BioRand/RECV/ReCvRandomiser.cs b/IntelOrca.Biohazard.BioRand/RECV/ReCvRandomiser.cs
@@ -131,6 +131,7 @@ public override void Generate(RandoConfig config, IRandoProgress progress, FileR
                 throw new BioRandUserException("RE3 installation must be enabled to randomize RE3.");
             }
 
+            config.IncludeDocuments = false;
             config.SwapCharacters = false;
             config.RandomNPCs = false;
             config.RandomEnemies = false;
@@ -376,16 +377,16 @@ private unsafe void TestEdits(GameData gameData)
 #if DEBUG
             // QuickDoor(RdtId.Parse("10B"), 0);
 
-            var rrdt = gameData.GetRdt(RdtId.Parse("1021"))!;
-            rrdt.PostModifications.Add(() =>
-            {
-                var rdtBuilder = ((RdtCv)rrdt.RdtFile).ToBuilder();
-                rdtBuilder.Enemies.RemoveAt(rdtBuilder.Enemies.Count - 1);
-                rdtBuilder.Enemies.RemoveAt(rdtBuilder.Enemies.Count - 1);
-                rdtBuilder.Enemies.RemoveAt(rdtBuilder.Enemies.Count - 1);
-                rdtBuilder.Enemies.RemoveAt(rdtBuilder.Enemies.Count - 1);
-                rrdt.RdtFile = rdtBuilder.ToRdt();
-            });
+            // var rrdt = gameData.GetRdt(RdtId.Parse("1021"))!;
+            // rrdt.PostModifications.Add(() =>
+            // {
+            //     var rdtBuilder = ((RdtCv)rrdt.RdtFile).ToBuilder();
+            //     rdtBuilder.Enemies.RemoveAt(rdtBuilder.Enemies.Count - 1);
+            //     rdtBuilder.Enemies.RemoveAt(rdtBuilder.Enemies.Count - 1);
+            //     rdtBuilder.Enemies.RemoveAt(rdtBuilder.Enemies.Count - 1);
+            //     rdtBuilder.Enemies.RemoveAt(rdtBuilder.Enemies.Count - 1);
+            //     rrdt.RdtFile = rdtBuilder.ToRdt();
+            // });
 #endif
         }
 

diff --git a/IntelOrca.Biohazard.BioRand/Rdt.cs b/IntelOrca.Biohazard.BioRand/Rdt.cs
@@ -248,6 +248,22 @@ private void SetItem(byte id, byte? itemId, short? globalId, ushort type, ushort
             if (Version == BioVersion.BiohazardCv)
             {
                 var rdtBuilder = ((RdtCv)RdtFile).ToBuilder();
+
+#if !OLD_ITEM_TECHNIQUE
+                itemId = itemId ?? id;
+                if (globalId != null)
+                {
+                    var aot = rdtBuilder.Aots[id];
+                    itemId = aot.Stage;
+                }
+                if (rdtBuilder.Items.Count > itemId)
+                {
+                    var item = rdtBuilder.Items[itemId.Value];
+                    item.Type = (item.Type & 0xFFFF) | (type << 16);
+                    rdtBuilder.Items[itemId.Value] = item;
+                    RdtFile = rdtBuilder.ToRdt();
+                }
+#else
                 if (globalId == null)
                 {
                     itemId = itemId ?? id;
@@ -272,6 +288,7 @@ private void SetItem(byte id, byte? itemId, short? globalId, ushort type, ushort
                     // rdtBuilder.Aots[id] = aot;
                     CvAddItemPickupCodes(id, itemId.Value, (byte)type, globalId.Value);
                 }
+#endif
             }
             else
             {