First round of fixes. The game can open now

data/mods/Xedra_Evolved/effects/effects.json

@@ -1894,21 +1894,22 @@
   {
     "type": "effect_type",
     "id": "effect_dream_drainer_speed",
-    "max_duration": "25 s",
     "name": [ "Accelerated" ],
-    "desc": [ "A burst of <color_green>speed</color>." ],
+    "desc": [ "A burst of speed." ],
+    "max_duration": "25 s",
     "apply_message": "You feel your legs are much longer now.",
     "remove_message": "Your body shrinks back into its normal space.",
     "rating": "good",
     "show_intensity": false,
     "enchantments": [ { "values": [ { "value": "SPEED", "add":  70 } ]
-  },
+  } ]
+},
   {
-    "id": "effect_dream_drainer_armor",
     "type": "effect_type",
-    "max_duration": "25 s",
+    "id": "effect_dream_drainer_armor",
     "name": [ "Armored" ],
     "desc": [ "The bug is shielded.  This is a bug if you have it." ],
+    "max_duration": "25 s",
     "rating": "bad",
     "show_intensity": false,
     "show_in_info": true,
@@ -1923,7 +1924,7 @@
           { "value": "ARMOR_COLD", "add": -15 },
           { "value": "ARMOR_ELEC", "add": -15 },
           { "value": "ARMOR_ACID", "add": -15 },
-          { "value": "ARMOR_BULLET", "add": -50 }
+          { "value": "ARMOR_BULLET", "add": -15 }
         ]
       }
     ]
@@ -1940,5 +1941,3 @@
     "show_in_info": true
   }
 ]
-}
-]

data/mods/Xedra_Evolved/eocs/abyssal_hunger_eocs.json

@@ -37,7 +37,7 @@
   },
   {
     "type": "effect_on_condition",
-    "id": "EOC_ABYSSAL_HUNGER_EXIT",
+    "id": "EOC_ABYSSAL_HUNGER_GRANT_SHARD",
     "condition": { "math": [ "abyssal_hunger_level", "!=", "0" ] },
     "effect": [
       { "run_eocs": "EOC_ABYSSAL_HUNGER_EXIT" },

data/mods/Xedra_Evolved/eocs/misc_eoc.json

@@ -87,12 +87,27 @@
   {
     "type": "effect_on_condition",
     "id": "EOC_ATTEMPT_TO_MAKE_STORMWROUGHT_BLOOD",
-    "condition": { "u_location_variable": { "context_val": "test" }, "field": "fd_fatigue", "intensity": 3, "target_max_radius": 5  },
-    "effect": [ { "u_spawn_item": "stormwrought_blood_itert" }, { "u_message": "The ritual harnesses the energies of the tear to infuse some blood with it, leaving behind a small ball of almost-solid blood.  It only needs to bath in the energies of the storms until it is fully charged and it will be ready to use.", "type": "good", "run_eocs": "EOC_CAUSE_EARLY_PORTAL_STORM" } ],
-    "false_effect": [
+    "effect": [
+      { "u_location_variable": { "context_val": "near_tear" }, "field": "fd_fatigue", "target_max_radius": 5 },
+      {
+        "if": { "map_field_id": "fd_fatigue", "loc": { "context_val": "near_tear" } },
+        "then": { "run_eocs": "EOC_ATTEMPT_TO_MAKE_STORMWROUGHT_BLOOD_SUCCESS" },
+        "else": { "run_eocs": "EOC_ATTEMPT_TO_MAKE_STORMWROUGHT_BLOOD_FAIL" }
+      }
+    ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_ATTEMPT_TO_MAKE_STORMWROUGHT_BLOOD_SUCCESS",
+    "effect": [ { "u_spawn_item": "stormwrought_blood_itert" }, { "u_message": "The ritual harnesses the energies of the tear to infuse some blood with it, leaving behind a small ball of almost-solid blood.  It only needs to bath in the energies of the storms until it is fully charged and it will be ready to use.", "type": "good" }, { "run_eocs": "EOC_CAUSE_EARLY_PORTAL_STORM" } ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_ATTEMPT_TO_MAKE_STORMWROUGHT_BLOOD_FAIL",
+    "effect": [
       { "u_message": "Without the proximity of a tear in reality, the ritual fails to harness any energy and the blood boils away.", "type": "bad" }
     ]
-      },
+  },  
       {
         "type": "effect_on_condition",
         "id": "CHARGE_STORMWROUGHT_BLOOD",
@@ -107,7 +122,7 @@
                 { "is_weather": "close_portal_storm" }
               ]
             },
-            { "u_has_items": { "item": "stormwrought_blood_itert" } },
+            { "u_has_item": "stormwrought_blood_itert" },
             "u_is_outside"
           ]
         },
@@ -127,7 +142,7 @@
                   { "u_message": "As the stormwrought blood becomes fully charged, it starts simmering.", "type": "good" },
                   { "u_remove_item_with": "stormwrought_blood_itert" },
                   { "u_spawn_item": "stormwrought_blood_charged", "suppress_message": true },
-                  { "math": [ "u_stormwrought_blood_charge", "==", "0" ] }
+                  { "math": [ "u_stormwrought_blood_charge", "=", "0" ] }
                   ],
                 "false_effect": [
                   {

data/mods/Xedra_Evolved/items/resources.json

@@ -284,6 +284,7 @@
     "description": "The distilled essence of the Fae.  Can be used as part of rituals.",
     "weight": "9 g",
     "volume": "5 ml",
+    "charges": 1,
     "price": "8 USD",
     "price_postapoc": "10 cent",
     "symbol": "~",

data/mods/Xedra_Evolved/items/tools.json

@@ -202,7 +202,7 @@
       "type": "effect_on_conditions",
       "description": "Complete the ritual.",
       "effect_on_conditions": [ "EOC_CHECK_TO_SUMMON_REVENANT" ],
-      "need_wielding": true
+"//": "until the day EoCs can be affected with need_wielding, they won't have it to allow the game to start"
     },
     "volume": "72500 ml",
     "weight": "91500 g",

data/mods/Xedra_Evolved/mapgen/abyssal_hunger_zone.json

@@ -2,7 +2,8 @@
   {
     "type": "palette",
     "id": "abyssal_hunger_palette",
-    "terrain": { "0": "t_abyssal_flesh_floor", "1": "t_abyssal_flesh_wall", "B": "t_abyssal_brain", "T": "f_shard_location" }
+    "terrain": { "0": "t_abyssal_flesh_floor", "1": "t_abyssal_flesh_wall", "B": "t_abyssal_brain", "a": "t_open_air" },
+    "furniture": { "T": "f_shard_location" }
   },
   {
     "type": "mapgen",
@@ -130,30 +131,19 @@
     "color": "magenta_red",
     "move_cost": 0,
     "coverage": 100,
-    "roof": "t_nm_floor_flesh",
+    "roof": "t_abyssal_flesh_roof",
     "connect_groups": "WALL",
     "connects_to": "WALL",
-    "flags": [
-      "NOITEM",
-      "SUPPORTS_ROOF",
-      "WALL",
-      "NO_SCENT",
-      "AUTO_WALL_SYMBOL",
-      "BLOCK_WIND"
-    ],
+    "flags": [ "NOITEM", "SUPPORTS_ROOF", "WALL", "NO_SCENT", "AUTO_WALL_SYMBOL", "BLOCK_WIND" ],
     "looks_like": "t_nm_wall_flesh",
     "bash": {
       "str_min": 99999,
       "str_max": 99999,
       "sound": "please report the bug allowing you to destroy these walls on github.",
       "sound_fail": "whump!",
-      "ter_set": "t_abyssal_flesh_floor",
-      "items": [ { "item": "meat_tainted", "count": [ 1, 1 ] } ]
+      "ter_set": "t_abyssal_flesh_floor"
     }
   },
-
-
-
     {
       "type": "terrain",
       "id": "t_abyssal_flesh_floor",
@@ -163,12 +153,7 @@
       "color": "magenta_white",
       "move_cost": 1,
       "connect_groups": "INDOORFLOOR",
-      "flags": [
-        "TRANSPARENT",
-        "SUPPORTS_ROOF",
-        "INDOORS",
-        "FLAT"
-      ],
+      "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "INDOORS", "FLAT" ],
       "looks_like": "t_nm_floor_flesh"
     },
     {
@@ -180,5 +165,27 @@
       "color": "magenta",
       "move_cost": 2,
       "flags": [ "FLAT" ]
+    },
+    {
+      "type": "terrain",
+      "id": "t_abyssal_brain",
+      "name": "Abyssal Hunger's brain",
+      "description": "A gigantic mass of flesh similar to a brain.",
+      "symbol": "LINE_OXOX",
+      "color": "magenta_red",
+      "move_cost": 0,
+      "coverage": 100,
+      "roof": "t_abyssal_flesh_roof",
+      "connect_groups": "WALL",
+      "connects_to": "WALL",
+      "flags": [ "NOITEM", "SUPPORTS_ROOF", "WALL", "NO_SCENT", "BLOCK_WIND" ],
+      "looks_like": "t_concrete_wall_flesh",
+      "bash": {
+        "str_min": 99999,
+        "str_max": 99999,
+        "sound": "please report the bug allowing you to destroy these on github.",
+        "sound_fail": "whump!",
+        "ter_set": "t_nm_floor_flesh"
+      }
     }
-      ]
+  ]

data/mods/Xedra_Evolved/monsters/monster.json

@@ -333,7 +333,7 @@
     "id": "mon_mosquito_mega",
     "type": "MONSTER",
     "name": { "str": "dream-drainer mosquito" },
-    "description": "Forged from the wildest dreams and the worst nightmares, this gigantic mosquito bloats as its probosis syphons the air, as if it was feeding on some invisible thing.  Looking at it, your mind blurs a little, making you feel that what this monster is sucking are your dreams.",
+    "description": "Forged from the wildest dreams and the worst nightmares, this gigantic mosquito bloats as its proboscis syphons the air, as if it was feeding on some invisible thing.  Looking at it, your mind blurs a little, making you feel that what this monster is sucking are your dreams.",
     "default_faction": "mosquito",
     "bodytype": "flying insect",
     "species": [ "INSECT_FLYING" ],
@@ -350,7 +350,10 @@
     "vision_day": 44,
     "vision_night": 32,
     "harvest": "exempt",
-    "corpse_type": "NO_CORPSE",
+    "death_function": {
+      "corpse_type": "NO_CORPSE",
+      "message": "The %s melts away."
+    },
     "flags": [
       "SEES",
       "SMELLS",
@@ -391,7 +394,7 @@
         "type": "spell",
         "spell_data": { "id": "mon_dream_drainer_spear", "min_level": 5 },
         "cooldown": 30,
-        "monster_message": "%1$s points its probosis at you, and a projectile bursts from it!"
+        "monster_message": "%1$s points its proboscis at you, and a projectile bursts from it!"
       },
       {
         "id": "mon_dream_drainer_bash",
@@ -427,7 +430,10 @@
     "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_body_armor", "wps_humanoid_open_helmet" ],
     "dodge": 0,
     "harvest": "exempt",
-    "corpse_type": "NO_CORPSE",
+    "death_function": {
+      "corpse_type": "NO_CORPSE",
+      "message": "The %s decoheres and is consumed by the moonlight!"
+    },
     "vision_day": 50,
     "vision_night": 60,
     "path_settings": { "max_dist": 30, "allow_open_doors": true, "avoid_traps": true, "avoid_sharp": true },
@@ -465,7 +471,7 @@
         "id": "mon_luna_attuned_revenant_moon_withdrawal",
         "spell_data": { "id": "mon_luna_attuned_revenant_moon_withdrawal", "hit_self": true },
       "allow_no_target": true,
-      "condition": { "not": [ "u_is_outside" ] },
+      "condition": { "not": "u_is_outside" },
       "monster_message": "Without the moonlight shining on it, %1$s is weakened!",
       "cooldown": 10
     },
@@ -474,8 +480,8 @@
       "id": "mon_luna_attuned_revenant_moonless_tantrum",
       "spell_data": { "id": "mon_luna_attuned_revenant_beam" },
     "allow_no_target": true,
-    "condition": { "not": [ "u_is_outside" ] },
-    "monster_message": "%1$s lashes out as it attepmts to be exposed to the moonlight again!",
+    "condition": { "not": "u_is_outside" },
+    "monster_message": "%1$s lashes out as it attempts to be exposed to the moonlight again!",
     "cooldown": 5
   }
     ]
@@ -515,8 +521,11 @@
     ],
     "dodge": 2,
     "harvest": "exempt",
-    "corpse_type": "NO_CORPSE",
-    "vision": 70,
+    "death_function": {
+      "corpse_type": "NO_CORPSE",
+      "message": "The %s melts away."
+    },
+    "vision_day": 70,
     "vision_night": 70,
     "special_attacks": [
       {
@@ -574,8 +583,11 @@
     ],
     "dodge": 2,
     "harvest": "exempt",
-    "corpse_type": "NO_CORPSE",
-    "vision": 5,
+    "death_function": {
+      "corpse_type": "NO_CORPSE",
+      "message": "The %s melts away."
+    },
+    "vision_day": 5,
     "vision_night": 5,
     "flags": [
       "SEES",
@@ -605,7 +617,10 @@
     "aggression": 100,
     "morale": 100,
     "harvest": "exempt",
-    "corpse_type": "NO_CORPSE",
+    "death_function": {
+      "corpse_type": "NO_CORPSE",
+      "message": "The %s melts away."
+    },
     "special_attacks": [
       {
         "type": "spell",
@@ -664,7 +679,10 @@
       }
     ],
     "harvest": "exempt",
-    "corpse_type": "NO_CORPSE",
+    "death_function": {
+      "corpse_type": "NO_CORPSE",
+      "message": "The %s melts away."
+    },
     "flags": [
       "SEES",
       "HEARS",
@@ -693,7 +711,10 @@
     "aggression": 100,
     "morale": 100,
     "harvest": "exempt",
-    "corpse_type": "NO_CORPSE",
+    "death_function": {
+      "corpse_type": "NO_CORPSE",
+      "message": "The %s melts away."
+    },
     "flags": [
       "SEES",
       "HEARS",

data/mods/Xedra_Evolved/monsters/monster_spells.json

@@ -210,7 +210,7 @@
     "id": "mon_dream_drainer_spear",
     "type": "SPELL",
     "name": "Pierce",
-    "description": "Throw a long ethereal spear out of your probosis or finger.",
+    "description": "Throw a long ethereal spear out of your proboscis or finger.",
     "teachable": false,
     "valid_targets": [ "hostile", "ground" ],
     "flags": [ "NO_LEGS", "NO_HANDS", "SILENT", "NO_EXPLOSION_SFX" ],

data/mods/Xedra_Evolved/monsters/monstergroup.json

@@ -291,5 +291,14 @@
       { "monster": "mon_zoomorphic_figure_small", "weight": 40, "cost_multiplier": 0 },
       { "monster": "mon_venus_doll", "weight": 400, "cost_multiplier": 0 }
     ]
+  },
+  {
+    "type": "monstergroup",
+    "name": "GROUP_ABYSSAL_HUNGER_CELLS",
+    "monsters": [
+      { "monster": "mon_grasping_globule", "weight": 100, "cost_multiplier": 0 },
+      { "monster": "mon_bashing_globule", "weight": 100, "cost_multiplier": 0 },
+      { "monster": "mon_spewing_globule", "weight": 50, "cost_multiplier": 0 }
+    ]
   }
 ]

data/mods/Xedra_Evolved/mutations/mutation_eocs.json

@@ -137,37 +137,5 @@
     "id": "consume_human_blood",
     "condition": { "u_has_trait": "VAMPIRE" },
     "effect": [ { "math": [ "u_vitamin('human_blood_vitamin')", "+=", "400 + rand(100)" ] } ]
-  },
-  {
-    "type": "effect_on_condition",
-    "id": "eoc_vampire_blood_to_kcal",
-    "//": "Check if the vampire is underweight or lower for their size category.  If yes, consume some blood to increase their calories.  Conversion rate of 1 blood vitamin to 5 calories, in 500 calories chunks.",
-    "recurrence": [ "1 h", "1 h" ],
-    "condition": { "u_has_trait": "BLOOD_DRINKER" },
-    "deactivate_condition": { "not": { "u_has_trait": "BLOOD_DRINKER" } },
-    "effect": {
-      "run_eocs": {
-        "id": "eoc_vampire_blood_to_kcal_check_convert",
-        "//": "100000 Kcal is within the normal range for a medium-sized character",
-        "effect": { 
-            "math": [ "u_calories_needed", "=", "100000", "u_size", "=", "u_val('size')" ],
-            "switch": { "math": [ "u_size" ] },
-            "cases": [
-              { "case": 1, "effect": [ { "math": [ "u_calories_needed", "/=", "4" ] } ] },
-              { "case": 2, "effect": [ { "math": [ "u_calories_needed", "/=", "2" ] } ] },
-              { "case": 3, "effect": [  ] },
-              { "case": 4, "effect": [ { "math": [ "u_calories_needed", "*=", "1.5" ] } ] },
-              { "case": 5, "effect": [ { "math": [ "u_calories_needed", "*=", "3" ] } ] }
-            ],
-            "run_eocs":{
-              "id": "eoc_vampire_blood_to_kcal_convert",
-              "condition": { "math": [ "u_vitamin('human_blood_vitamin')", ">", "0" ] },
-              "effect": { 
-              "math": [ "u_vitamin('human_blood_vitamin')", "-=", "100", "u_calories()", "+=", "500" ] },
-              "u_message": "Some of your stolen blood is consumed by your body, making it a little less gaunt.", "type": "good"
-            }
-      }
-    }
   }
-}
 ]