Update opcodes 67, 271 and 232

Argent77 · Jan 7, 2025 · a2c877f · a2c877f
1 parent f0f323b
commit a2c877f
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/src/org/infinity/resource/effects/BaseOpcode.java b/src/org/infinity/resource/effects/BaseOpcode.java
@@ -333,8 +333,8 @@ public enum EffectEntry {
   };
 
   public static final String[] SUMMON_CONTROLS = {
-      "Match target", "Match target", "From CRE file", "Match target", "From CRE file", "Hostile", "From CRE file", "",
-      "From CRE file"
+      "Match target (position=effect)", "Match target (position=effect)", "From CRE file (position=effect)",
+      "Match target (position=target)", "From CRE file (position=target)", "Opposite of target (position=effect)"
   };
 
   public static final String[] REGEN_TYPES = {

diff --git a/src/org/infinity/resource/effects/Opcode271.java b/src/org/infinity/resource/effects/Opcode271.java
@@ -7,6 +7,7 @@
 import java.nio.ByteBuffer;
 import java.util.List;
 
+import org.infinity.datatype.Bitmap;
 import org.infinity.datatype.Datatype;
 import org.infinity.datatype.DecNumber;
 import org.infinity.resource.AbstractStruct;
@@ -42,4 +43,12 @@ protected String makeEffectParamsGeneric(Datatype parent, ByteBuffer buffer, int
     list.add(new DecNumber(buffer, offset + 4, 4, AbstractStruct.COMMON_UNUSED));
     return null;
   }
+
+  @Override
+  protected String makeEffectParamsEE(Datatype parent, ByteBuffer buffer, int offset, List<StructEntry> list,
+      boolean isVersion1) {
+    list.add(new DecNumber(buffer, offset, 4, AbstractStruct.COMMON_UNUSED));
+    list.add(new Bitmap(buffer, offset + 4, 4, EFFECT_MODE, new String[] { STRING_DEFAULT, "Disable AI" }));
+    return null;
+  }
 }
diff --git a/src/org/infinity/resource/effects/Opcode323.java b/src/org/infinity/resource/effects/Opcode323.java
@@ -5,6 +5,7 @@
 package org.infinity.resource.effects;
 
 import java.nio.ByteBuffer;
+import java.util.Arrays;
 import java.util.List;
 
 import org.infinity.datatype.Bitmap;
@@ -35,7 +36,18 @@ public Opcode323() {
   protected String makeEffectParamsEE(Datatype parent, ByteBuffer buffer, int offset, List<StructEntry> list,
       boolean isVersion1) {
     list.add(new DecNumber(buffer, offset, 4, EFFECT_VALUE));
-    list.add(new Bitmap(buffer, offset + 4, 4, EFFECT_MODIFIER_TYPE, INC_TYPES));
+    list.add(new Bitmap(buffer, offset + 4, 4, EFFECT_MODIFIER_TYPE, Arrays.copyOfRange(INC_TYPES, 0, 2)));
     return null;
   }
+
+  @Override
+  protected int makeEffectSpecial(Datatype parent, ByteBuffer buffer, int offset, List<StructEntry> list,
+      String resType, int param1, int param2) {
+    if (Profile.isEnhancedEdition()) {
+      list.add(new Bitmap(buffer, offset, 4, EFFECT_MODE, new String[] { STRING_DEFAULT, "Relative to target level" }));
+      return offset + 4;
+    } else {
+      return super.makeEffectSpecial(parent, buffer, offset, list, resType, param1, param2);
+    }
+  }
 }