Fixed variable handler bugs

Iteranya · Nov 19, 2024 · 380c05d · 380c05d
1 parent 5d0aa01
commit 380c05d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/main/java/org/arsparadox/mobtalkerredux/MobTalkerItem.java b/src/main/java/org/arsparadox/mobtalkerredux/MobTalkerItem.java
@@ -31,7 +31,7 @@ public InteractionResult interactLivingEntity(ItemStack stack, Player player, Li
         try{
             // Check if the entity has a custom name
             if (target.getCustomName() != null) {
-                String entityName = target.getCustomName().getString();
+                String entityName = target.getCustomName().getString().toLowerCase().replace(" ", "_");
 
                 if (!world.isClientSide()) { // Only run on the server side
 

diff --git a/src/main/java/org/arsparadox/mobtalkerredux/vn/controller/vnmodules/DialogueHandler.java b/src/main/java/org/arsparadox/mobtalkerredux/vn/controller/vnmodules/DialogueHandler.java
@@ -22,14 +22,18 @@ public static void processConditional(Map<String, Object> condition, VisualNovel
         Object value = condition.get("value");
         long end = (long) condition.get("end");
 
-        System.out.println("Is it day time???: "+vn.isDay);
-
         switch (conditionType) {
             case "equal":
-                result = (var != null) && var.equals(value);
+                result = (var != null && value != null) &&
+                        ((var instanceof Number && value instanceof Number)
+                                ? ((Number) var).doubleValue() == ((Number) value).doubleValue()
+                                : var.equals(value));
                 break;
             case "not_equal":
-                result = (var == null) || !var.equals(value);
+                result = (var == null || value == null) ||
+                        ((var instanceof Number && value instanceof Number)
+                                ? ((Number) var).doubleValue() != ((Number) value).doubleValue()
+                                : !var.equals(value));
                 break;
             case "less_than":
                 result = (var instanceof Number && value instanceof Number) && ((Number) var).doubleValue() < ((Number) value).doubleValue();

diff --git a/src/main/java/org/arsparadox/mobtalkerredux/vn/controller/vnmodules/VariableHandler.java b/src/main/java/org/arsparadox/mobtalkerredux/vn/controller/vnmodules/VariableHandler.java
@@ -30,7 +30,7 @@ public static void modifyVariable(String variable, String operation, Object valu
                         ((Number) value).doubleValue();
                 variables.put(variable, result);
             }
-        } else if (operation.equals("substract_var")) {
+        } else if (operation.equals("subtract_var")) {
             if (variables.get(variable) instanceof Number && value instanceof Number) {
                 double result = ((Number) variables.get(variable)).doubleValue() -
                         ((Number) value).doubleValue();