Updated filters

source/behavior/entities/filters/filters/clock_time.json

@@ -11,13 +11,13 @@
       "description": "Compares the current 24 hour time with an int value in the range[0, 24000]"
     },
     "operator": {
-      "$ref": "./types/base_operator.json",
+      "$ref": "./types/operator.json",
       "description": "(Optional) The comparison to apply with 'value'.",
       "default": "equals",
       "title": "Operator"
     },
     "subject": {
-      "$ref": "./types/base_subject.json",
+      "$ref": "./types/subject.json",
       "description": "(Optional) The subject of this filter test.",
       "default": "self",
       "title": "Subject"

source/behavior/entities/filters/filters/distance_to_nearest_player.json

@@ -6,8 +6,8 @@
   "required": ["value"],
   "properties": {
     "test": { "type": "string", "title": "Test Property", "description": "Compares the distance to the nearest Player with a float value." },
-    "operator": { "$ref": "./types/base_operator.json", "description": "(Optional) The comparison to apply with 'value'.", "title": "Operator" },
-    "subject": { "$ref": "./types/base_subject.json", "description": "(Optional) The subject of this filter test.", "title": "Subject" },
+    "operator": { "$ref": "./types/operator.json", "description": "(Optional) The comparison to apply with 'value'.", "title": "Operator" },
+    "subject": { "$ref": "./types/subject.json", "description": "(Optional) The subject of this filter test.", "title": "Subject" },
     "value": { "type": "number", "description": "(Required) A floating point value.", "title": "Value" }
   }
 }

source/behavior/entities/filters/filters/has_ability.json

@@ -6,8 +6,8 @@
   "required": ["value"],
   "properties": {
     "test": { "type": "string", "title": "Test Property", "description": "Returns true when the subject entity has the named ability." },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": {
       "type": "string",
       "description": "(Required) The Ability type to test",

source/behavior/entities/filters/filters/has_biome_tag.json

@@ -6,8 +6,8 @@
   "required": ["value"],
   "properties": {
     "test": { "type": "string", "title": "Test Property", "description": "Tests whether the biome the subject is in has the specified tag." },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": { "description": "(Required) The tag to look for", "type": "string", "title": "Value" }
   }
 }

source/behavior/entities/filters/filters/has_component.json

@@ -6,8 +6,8 @@
   "required": ["value"],
   "properties": {
     "test": { "type": "string", "title": "Test Property", "description": "Returns true when the subject entity contains the named component." },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": { "type": "string", "description": "TODO description: value", "title": "Value" }
   }
 }

source/behavior/entities/filters/filters/has_container_open.json

@@ -5,8 +5,8 @@
   "description": "Returns true when the subject Player entity has opened a container.",
   "properties": {
     "test": { "type": "string", "title": "Test", "description": "The test property" },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": {
       "description": "True or false.",
       "oneOf": [

source/behavior/entities/filters/filters/has_damage.json

@@ -6,8 +6,8 @@
   "required": ["value"],
   "properties": {
     "test": { "type": "string", "title": "Test Property", "description": "Returns true when the subject entity receives the named damage type." },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": { "type": "string", "description": "The Damage type to test", "$ref": "../../../../general/entity/damage_source.json", "title": "Value" }
   }
 }

source/behavior/entities/filters/filters/has_equipment.json

@@ -17,8 +17,8 @@
       "enum": ["any", "armor", "feet", "hand", "head", "leg", "torso"],
       "title": "Domain"
     },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": {
       "description": "The item name to look for",
       "type": "string",

source/behavior/entities/filters/filters/has_mob_effect.json

@@ -6,8 +6,8 @@
   "required": ["value"],
   "properties": {
     "test": { "type": "string", "title": "Test Property", "description": "Tests whether the Subject has the specified mob effect." },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": { "type": "string", "description": "TODO description: value", "title": "Value" }
   }
 }

source/behavior/entities/filters/filters/has_ranged_weapon.json

@@ -5,8 +5,8 @@
   "description": "Returns true when the subject entity is holding a ranged weapon like a bow or crossbow.",
   "properties": {
     "test": { "type": "string", "title": "Test", "description": "The test property" },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": {
       "description": "True or false.",
       "oneOf": [

source/behavior/entities/filters/filters/has_tag.json

@@ -6,8 +6,8 @@
   "required": ["value"],
   "properties": {
     "test": { "type": "string", "title": "Test Property", "description": "Returns true if the subject entity has the tag provided." },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": { "type": "string", "description": "The tag as a string", "pattern": "[a-zA-Z0-9_]+", "title": "Value" }
   }
 }

source/behavior/entities/filters/filters/has_target.json

@@ -5,8 +5,8 @@
   "description": "Returns true if the subject entity has a valid target.",
   "properties": {
     "test": { "type": "string", "title": "Test", "description": "The test property" },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": {
       "description": "True or false.",
       "oneOf": [

source/behavior/entities/filters/filters/has_trade_supply.json

@@ -9,8 +9,8 @@
       "title": "Test Property",
       "description": "Tests whether the target has any trade supply left. Will return false if the target cannot be traded with."
     },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",

source/behavior/entities/filters/filters/hourly_clock_time.json

@@ -11,8 +11,8 @@
       "description": "Compares the current 24 hour time with an int value in the range[0, 24000]",
       "const": "hourly_clock_time"
     },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": { "type": "integer", "description": "An integer value.", "minimum": 0, "maximum": 24000, "title": "Value" }
   }
 }

source/behavior/entities/filters/filters/in_block.json

@@ -10,13 +10,13 @@
       "description": "Returns true when the subject entity is inside a specified Block type."
     },
     "operator": {
-      "$ref": "./types/base_operator.json",
+      "$ref": "./types/operator.json",
       "description": "(Optional) The comparison to apply with 'value'.",
       "default": "equals",
       "title": "Operator"
     },
     "subject": {
-      "$ref": "./types/base_subject.json",
+      "$ref": "./types/subject.json",
       "description": "(Optional) The subject of this filter test.",
       "default": "self",
       "title": "Subject"

source/behavior/entities/filters/filters/in_caravan.json

@@ -5,8 +5,8 @@
   "description": "Returns true if the subject entity is in a caravan.",
   "properties": {
     "test": { "type": "string", "title": "Test Property", "description": "Returns true if the subject entity is in a caravan." },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",

source/behavior/entities/filters/filters/in_clouds.json

@@ -5,8 +5,8 @@
   "description": "Returns true when the subject entity is in the clouds.",
   "properties": {
     "test": { "type": "string", "title": "Test Property", "description": "Returns true when the subject entity is in the clouds." },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",

source/behavior/entities/filters/filters/in_contact_with_water.json

@@ -9,8 +9,8 @@
       "title": "Test Property",
       "description": "Returns true when the subject entity in contact with any water: water, rain, splash water bottle."
     },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": {
       "title": "Value",
       "description": "(Optional) true or false.",

source/behavior/entities/filters/filters/in_lava.json

@@ -5,8 +5,8 @@
   "description": "Returns true when the subject entity is in lava.",
   "properties": {
     "test": { "type": "string", "title": "Test Property", "description": "Returns true when the subject entity is in lava." },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",

source/behavior/entities/filters/filters/in_nether.json

@@ -5,8 +5,8 @@
   "description": "Returns true when the subject entity is in Nether.",
   "properties": {
     "test": { "type": "string", "title": "Test", "description": "The test property" },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": {
       "description": "True or false.",
       "oneOf": [

source/behavior/entities/filters/filters/in_water.json

@@ -5,8 +5,8 @@
   "description": "Returns true when the subject entity is in water.",
   "properties": {
     "test": { "type": "string", "title": "Test Property", "description": "Returns true when the subject entity is in water." },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",

source/behavior/entities/filters/filters/in_water_or_rain.json

@@ -5,8 +5,8 @@
   "description": "Returns true when the subject entity is in water or rain.",
   "properties": {
     "test": { "type": "string", "title": "Test Property", "description": "Returns true when the subject entity is in water or rain." },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",

source/behavior/entities/filters/filters/inactivity_timer.json

@@ -6,8 +6,8 @@
   "required": ["value"],
   "properties": {
     "test": { "type": "string", "title": "Test", "description": "The test property" },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": { "description": "The Family name to look for", "type": "integer", "title": "Value" }
   }
 }

source/behavior/entities/filters/filters/is_altitude.json

@@ -10,8 +10,8 @@
       "title": "Test Property",
       "description": "Tests the current altitude against a provided value. 0= bedrock elevation."
     },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": { "type": "integer", "description": "The altitude value to compare with", "minimum": 0, "title": "Value" }
   }
 }

source/behavior/entities/filters/filters/is_avoiding_mobs.json

@@ -5,8 +5,8 @@
   "description": "Returns true if the subject entity is fleeing from other mobs.",
   "properties": {
     "test": { "type": "string", "title": "Test Property", "description": "Returns true if the subject entity is fleeing from other mobs." },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",

source/behavior/entities/filters/filters/is_biome.json

@@ -6,8 +6,8 @@
   "required": ["value"],
   "properties": {
     "test": { "type": "string", "title": "Test Property", "description": "Tests whether the Subject is currently in the named biome." },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": {
       "description": "The Biome type to test",
       "type": "string",

source/behavior/entities/filters/filters/is_block.json

@@ -6,8 +6,8 @@
   "required": ["value"],
   "properties": {
     "test": { "type": "string", "title": "Test", "description": "The test property" },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": { "description": "The Family name to look for", "type": "string", "title": "Value" }
   }
 }

source/behavior/entities/filters/filters/is_brightness.json

@@ -10,8 +10,8 @@
       "title": "Test Property",
       "description": "Tests the current brightness against a provided value in the range (0.0f, 1.0f)."
     },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": { "description": "The brightness value to compare with.", "type": "number", "minimum": 0.0, "maximum": 1.0, "title": "Value" }
   }
 }

source/behavior/entities/filters/filters/is_climbing.json

@@ -5,8 +5,8 @@
   "description": "Returns true if the subject entity is climbing.",
   "properties": {
     "test": { "type": "string", "title": "Test Property", "description": "Returns true if the subject entity is climbing." },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",

source/behavior/entities/filters/filters/is_color.json

@@ -6,8 +6,8 @@
   "required": ["value"],
   "properties": {
     "test": { "type": "string", "title": "Test Property", "description": "Returns true if the subject entity is the named color." },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": {
       "description": "The Palette Color to test",
       "type": "string",

source/behavior/entities/filters/filters/is_daytime.json

@@ -5,8 +5,8 @@
   "description": "Returns true during the daylight hours.",
   "properties": {
     "test": { "type": "string", "title": "Test Property", "description": "Returns true during the daylight hours." },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",

source/behavior/entities/filters/filters/is_difficulty.json

@@ -6,8 +6,8 @@
   "required": ["value"],
   "properties": {
     "test": { "type": "string", "title": "Test Property", "description": "Tests the current difficulty level of the game." },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": {
       "description": "The game's difficulty level to test",
       "type": "string",

source/behavior/entities/filters/filters/is_family.json

@@ -6,8 +6,8 @@
   "required": ["value"],
   "properties": {
     "test": { "type": "string", "title": "Test Property", "description": "Returns true when the subject entity is a member of the named family." },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": { "description": "The Family name to look for", "type": "string", "title": "Value" }
   }
 }

source/behavior/entities/filters/filters/is_game_rule.json

@@ -6,8 +6,8 @@
   "required": ["domain"],
   "properties": {
     "domain": { "description": "The Game Rule to test.", "title": "Domain" },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": { "description": "Tests whether a named game rule is active.", "default": true, "type": "boolean", "title": "Value" }
   }
 }

source/behavior/entities/filters/filters/is_humid.json

@@ -5,8 +5,8 @@
   "description": "Tests whether the Subject is in an area with humidity",
   "properties": {
     "test": { "type": "string", "title": "Test Property", "description": "Tests whether the Subject is in an area with humidity" },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",

source/behavior/entities/filters/filters/is_immobile.json

@@ -5,8 +5,8 @@
   "description": "Returns true if the subject entity is immobile. An entity is immobile if it lacks AI goals, has just changed dimensions or if it is a mob and has no health.",
   "properties": {
     "test": { "type": "string", "title": "Test Property", "description": "The test property" },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",

source/behavior/entities/filters/filters/is_in_village.json

@@ -5,8 +5,8 @@
   "description": "Tests whether the Subject is inside the bounds of a village.",
   "properties": {
     "test": { "type": "string", "title": "Test Property", "description": "The test property" },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",

source/behavior/entities/filters/filters/is_leashed.json

@@ -5,8 +5,8 @@
   "description": "Returns true if the subject entity is leashed.",
   "properties": {
     "test": { "type": "string", "title": "Test Property", "description": "The test property" },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",

source/behavior/entities/filters/filters/is_leashed_to.json

@@ -5,8 +5,8 @@
   "description": "Returns true if the subject entity leashed to the calling entity.",
   "properties": {
     "test": { "type": "string", "title": "Test", "description": "The test property" },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": {
       "description": "True or false.",
       "oneOf": [

source/behavior/entities/filters/filters/is_mark_variant.json

@@ -5,8 +5,8 @@
   "description": "Returns true if the subject entity is the mark variant number provided.",
   "properties": {
     "test": { "type": "string", "title": "Test Property", "description": "The test property" },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": { "type": "integer", "description": "The altitude value to compare with", "minimum": 0, "title": "Value" }
   },
   "additionalProperties": false

source/behavior/entities/filters/filters/is_moving.json

@@ -5,8 +5,8 @@
   "description": "Returns true if the subject entity is moving.",
   "properties": {
     "test": { "type": "string", "title": "Test Property", "description": "The test property" },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",

source/behavior/entities/filters/filters/is_owner.json

@@ -5,8 +5,8 @@
   "description": "Returns true if the subject entity is the owner of the calling entity.",
   "properties": {
     "test": { "type": "string", "title": "Test Property", "description": "The test property" },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",

source/behavior/entities/filters/filters/is_persistent.json

@@ -5,8 +5,8 @@
   "description": "Tests if the subject's persistence matches the bool value passed in.",
   "properties": {
     "test": { "type": "string", "title": "Test", "description": "The test property" },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": {
       "description": "True or false.",
       "oneOf": [

source/behavior/entities/filters/filters/is_riding.json

@@ -5,8 +5,8 @@
   "description": "Returns true if the subject entity is riding on another entity.",
   "properties": {
     "test": { "type": "string", "title": "Test Property", "description": "The test property" },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",

source/behavior/entities/filters/filters/is_skin_id.json

@@ -5,8 +5,8 @@
   "description": "Returns true if the subject entity is the skin id number provided.",
   "properties": {
     "test": { "type": "string", "title": "Test Property", "description": "The test property" },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": { "type": "integer", "description": "The altitude value to compare with", "title": "Value" }
   }
 }

source/behavior/entities/filters/filters/is_sleeping.json

@@ -5,8 +5,8 @@
   "description": "Tests whether the Subject is sleeping.",
   "properties": {
     "test": { "type": "string", "title": "Test", "description": "The test property" },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": {
       "description": "True or false.",
       "oneOf": [

source/behavior/entities/filters/filters/is_sneaking.json

@@ -5,8 +5,8 @@
   "description": "Returns true if the subject entity is sneaking.",
   "properties": {
     "test": { "type": "string", "title": "Test Property", "description": "The test property" },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",

source/behavior/entities/filters/filters/is_snow_covered.json

@@ -5,8 +5,8 @@
   "description": "Tests whether the Subject is in an area with snow cover",
   "properties": {
     "test": { "type": "string", "title": "Test Property", "description": "The test property" },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",

source/behavior/entities/filters/filters/is_target.json

@@ -5,8 +5,8 @@
   "description": "Returns true if the subject entity is the target of the calling entity.",
   "properties": {
     "test": { "type": "string", "title": "Test Property", "description": "The test property" },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",

source/behavior/entities/filters/filters/is_temperature_type.json

@@ -6,8 +6,8 @@
   "required": ["value"],
   "properties": {
     "test": { "type": "string", "title": "Test Property", "description": "The test property" },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": {
       "description": "The Biome temperature catagory to test",
       "type": "string",

source/behavior/entities/filters/filters/is_temperature_value.json

@@ -6,8 +6,8 @@
   "required": ["value"],
   "properties": {
     "test": { "type": "string", "title": "Test Property", "description": "The test property" },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": { "description": "The Biome temperature value to compare with.", "type": "number", "minimum": 0.0, "maximum": 1.0, "title": "Value" }
   }
 }

source/behavior/entities/filters/filters/is_underground.json

@@ -5,8 +5,8 @@
   "description": "Returns true when the subject entity is underground. An entity is considered underground if there are non-solid blocks above it.",
   "properties": {
     "test": { "type": "string", "title": "Test Property", "description": "The test property" },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",

source/behavior/entities/filters/filters/is_underwater.json

@@ -5,8 +5,8 @@
   "description": "Returns true when the subject entity is under water. An entity is considered underwater if it is completely submerged in water blocks.",
   "properties": {
     "test": { "type": "string", "title": "Test Property", "description": "The test property" },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",

source/behavior/entities/filters/filters/is_variant.json

@@ -6,8 +6,8 @@
   "required": ["value"],
   "properties": {
     "test": { "type": "string", "title": "Test Property", "description": "The test property" },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": { "type": "integer", "description": "The altitude value to compare with", "title": "Value" }
   }
 }

source/behavior/entities/filters/filters/is_visible.json

@@ -5,8 +5,8 @@
   "description": "Returns true if the subject entity is visible.",
   "properties": {
     "test": { "type": "string", "title": "Test Property", "description": "The test property" },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",

source/behavior/entities/filters/filters/light_level.json

@@ -6,8 +6,8 @@
   "required": ["value"],
   "properties": {
     "test": { "type": "string", "title": "Test", "description": "The test property" },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": { "description": "An integer value.", "type": "integer", "title": "Value", "minimum": 0, "maximum": 16 }
   }
 }

source/behavior/entities/filters/filters/moon_intensity.json

@@ -6,8 +6,8 @@
   "required": ["value"],
   "properties": {
     "test": { "type": "string", "title": "Test Property", "description": "The test property" },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": { "description": "A floating point value.", "type": "number", "minimum": 0, "maximum": 1, "title": "Value" }
   }
 }

source/behavior/entities/filters/filters/moon_phase.json

@@ -6,8 +6,8 @@
   "required": ["value"],
   "properties": {
     "test": { "type": "string", "title": "Test Property", "description": "The test property" },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": { "type": "integer", "description": "An integer value.", "minimum": 0, "maximum": 7, "title": "Value" }
   }
 }

source/behavior/entities/filters/filters/on_ground.json

@@ -5,8 +5,8 @@
   "description": "Returns true when the subject entity is on ground.",
   "properties": {
     "test": { "type": "string", "title": "Test Property", "description": "The test property" },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",

source/behavior/entities/filters/filters/on_ladder.json

@@ -5,8 +5,8 @@
   "description": "Returns true when the subject entity is on a ladder.",
   "properties": {
     "test": { "type": "string", "title": "Test Property", "description": "The test property" },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": {
       "title": "Value",
       "description": "True or false.",

source/behavior/entities/filters/filters/random_chance.json

@@ -6,8 +6,8 @@
   "required": ["value"],
   "properties": {
     "test": { "type": "string", "title": "Test", "description": "The test property" },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": { "description": "An integer value.", "type": "integer", "title": "Value" }
   }
 }

source/behavior/entities/filters/filters/rider_count.json

@@ -6,8 +6,8 @@
   "required": ["value"],
   "properties": {
     "test": { "type": "string", "title": "Test", "description": "The test property" },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": { "description": "An integer value.", "type": "integer", "title": "Value" }
   }
 }

source/behavior/entities/filters/filters/surface_mob.json

@@ -5,8 +5,8 @@
   "description": "Tests if the subject is a surface mob.",
   "properties": {
     "test": { "type": "string", "title": "Test", "description": "The test property" },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": {
       "description": "True or false.",
       "oneOf": [

source/behavior/entities/filters/filters/trusts.json

@@ -5,8 +5,8 @@
   "description": "Returns true if the subject is trusted by entity.",
   "properties": {
     "test": { "type": "string", "title": "Test", "description": "The test property" },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": {
       "description": "True or false.",
       "oneOf": [

source/behavior/entities/filters/filters/weather.json

@@ -6,8 +6,8 @@
   "required": ["value"],
   "properties": {
     "test": { "type": "string", "title": "Test", "description": "The test property" },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": { "description": "The Family name to look for", "type": "string", "title": "Value" }
   }
 }

source/behavior/entities/filters/filters/weather_at_position.json

@@ -6,8 +6,8 @@
   "required": ["value"],
   "properties": {
     "test": { "type": "string", "title": "Test", "description": "The test property" },
-    "operator": { "$ref": "./types/base_operator.json" },
-    "subject": { "$ref": "./types/base_subject.json" },
+    "operator": { "$ref": "./types/operator.json" },
+    "subject": { "$ref": "./types/subject.json" },
     "value": { "description": "The Family name to look for", "type": "string", "title": "Value" }
   }
 }