From d4c8258f5e67a2fada97ff1a937d6ce3e286f1a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A6mer?= <78032176+BigGaemer@users.noreply.github.com>
Date: Thu, 15 May 2025 15:52:05 +0200
Subject: [PATCH] fixed small issue

---
 CHANGELOG                                     |  5 +-
 gradle.properties                             |  2 +-
 .../powers/spirit-powers/ectodiff.json        | 46 +++++++++----------
 3 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index bc326dc..4af97d4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -34,4 +34,7 @@
 - added a description for sun protection enchant
 
 ## 1.20.1-1.0.11
-- forgot to include icarus as new dependency
\ No newline at end of file
+- forgot to include icarus as new dependency
+
+## 1.20.1-1.0.12
+- fixed poorly written conditions for ectoplasm drain (still poorly written but works correctly now)
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 7b75f54..1e02399 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,7 +11,7 @@ parchment_minecraft=1.20.1
 parchment_mappings=2023.09.03
 
 # Mod Properties
-mod_version=1.20.1-1.0.11
+mod_version=1.20.1-1.0.12
 maven_group=com.smithy
 archives_base_name=TerraOriginum
 
diff --git a/src/main/resources/data/terraoriginum/powers/spirit-powers/ectodiff.json b/src/main/resources/data/terraoriginum/powers/spirit-powers/ectodiff.json
index 469abef..9c2b4ef 100644
--- a/src/main/resources/data/terraoriginum/powers/spirit-powers/ectodiff.json
+++ b/src/main/resources/data/terraoriginum/powers/spirit-powers/ectodiff.json
@@ -4,6 +4,29 @@
     "entity_action": {
         "type": "origins:if_else_list",
         "actions": [
+            {
+                "condition": {
+                    "type": "origins:or",
+                    "conditions": [
+                        {
+                            "type": "origins:brightness",
+                            "comparison": "<=",
+                            "compare_to": 0.17948718
+                        }
+                    ]
+                },
+                "action": {
+                    "type": "origins:and",
+                    "actions": [
+                        {
+                            "type": "origins:change_resource",
+                            "resource": "terraoriginum:spirit-powers/ectoplasm",
+                            "change": 4,
+                            "operation": "add"
+                        }
+                    ]
+                }
+            },
             {
                 "condition": {
                     "type": "origins:and",
@@ -111,29 +134,6 @@
                         }
                     ]
                 }
-            },
-            {
-                "condition": {
-                    "type": "origins:or",
-                    "conditions": [
-                        {
-                            "type": "origins:brightness",
-                            "comparison": "<=",
-                            "compare_to": 0.17948718
-                        }
-                    ]
-                },
-                "action": {
-                    "type": "origins:and",
-                    "actions": [
-                        {
-                            "type": "origins:change_resource",
-                            "resource": "terraoriginum:spirit-powers/ectoplasm",
-                            "change": 4,
-                            "operation": "add"
-                        }
-                    ]
-                }
             }
         ]
     }