auto update

linonetwo · Dec 6, 2024 · cf478ea · cf478ea
1 parent 06061c7
commit cf478ea
Show file tree

Hide file tree

Showing 91 changed files with 1,322 additions and 1,936 deletions.
diff --git a/Kenan-Structured-Modpack/Arcana/chargen/professions.json b/Kenan-Structured-Modpack/Arcana/chargen/professions.json
@@ -495,7 +495,7 @@
   },
   {
     "type": "profession",
-    "ident": "arcanist_operator",
+    "id": "arcanist_operator",
     "name": "Arcane Operative",
     "description": "You have embraced modern technology and mystical power alike, armed and augmented to investigate anomalies, procure artifacts, and help ensure the arcane stayed hidden from everyday life.  Once of the Cleansing Flame, whether you went rogue or still honor their ideals, you must use what you've learned to survive.",
     "spells": [ { "id": "arcana_magic_capacitance", "level": 1 } ],

diff --git a/Kenan-Structured-Modpack/Arcana/effects.json b/Kenan-Structured-Modpack/Arcana/effects.json
@@ -139,8 +139,12 @@
       "stamina_chance": [ 6 ],
       "sleepiness_min": [ 1 ],
       "sleepiness_tick": [ 300 ],
-      "sleepiness_chance": [ 6, 12 ]
-    }
+      "sleepiness_chance": [ 6, 12 ],
+      "hit_mod": [ -1, 0 ],
+      "dodge_mod": [ -1, 0 ],
+      "bash_mod": [ 5 ]
+    },
+    "show_in_info": true
   },
   {
     "type": "effect_type",
@@ -165,8 +169,13 @@
       "stamina_tick": [ 30 ],
       "stamina_chance": [ 6, 12 ],
       "sleepiness_min": [ -1 ],
-      "sleepiness_chance": [ 12 ]
-    }
+      "sleepiness_chance": [ 12 ],
+      "hit_mod": [ 2 ],
+      "dodge_mod": [ 2 ],
+      "bash_mod": [ -2, -1 ],
+      "cut_mod": [ -2, -1 ]
+    },
+    "show_in_info": true
   },
   {
     "type": "effect_type",
@@ -273,9 +282,10 @@
       "dex_mod": [ -1, 0 ],
       "hurt_min": [ 2, 1 ],
       "hurt_chance": [ 2, 3 ],
-      "hit_mod": [ -2 ],
-      "dodge_mod": [ -3 ]
-    }
+      "hit_mod": [ -1, 0 ],
+      "dodge_mod": [ -1, 0 ]
+    },
+    "show_in_info": true
   },
   {
     "type": "effect_type",
@@ -538,8 +548,9 @@
     "max_duration": "120 m",
     "max_intensity": 120,
     "int_dur_factor": "1 m",
-    "base_mods": { "str_mod": [ 1 ] },
-    "scaling_mods": { "str_mod": [ 0.0825 ] }
+    "base_mods": { "str_mod": [ 1 ], "bash_mod": [ 1 ] },
+    "scaling_mods": { "str_mod": [ 0.0825 ], "bash_mod": [ 0.0825 ] },
+    "show_in_info": true
   },
   {
     "type": "effect_type",
@@ -552,8 +563,15 @@
     "max_duration": "120 m",
     "max_intensity": 120,
     "int_dur_factor": "1 m",
-    "base_mods": { "dex_mod": [ 1 ], "speed_mod": [ 3 ], "stamina_min": [ 1 ] },
-    "scaling_mods": { "dex_mod": [ 0.0825 ], "speed_mod": [ 0.38 ], "stamina_min": [ 0.08 ] }
+    "base_mods": { "dex_mod": [ 1 ], "speed_mod": [ 5 ], "stamina_min": [ 1 ], "hit_mod": [ 1 ], "dodge_mod": [ 1 ] },
+    "scaling_mods": {
+      "dex_mod": [ 0.0825 ],
+      "speed_mod": [ 0.38 ],
+      "stamina_min": [ 0.08 ],
+      "hit_mod": [ 0.0825 ],
+      "dodge_mod": [ 0.0825 ]
+    },
+    "show_in_info": true
   },
   {
     "type": "effect_type",

diff --git a/Kenan-Structured-Modpack/Arcana/furniture_and_terrain/terrain.json b/Kenan-Structured-Modpack/Arcana/furniture_and_terrain/terrain.json
@@ -18,7 +18,7 @@
     "looks_like": "t_rock_wall",
     "name": "dark stone wall",
     "description": "A wall of bricks made out of what looks like basalt, chiseled into a perfectly smooth surface.",
-    "symbol": "LINE_OXOX",
+    "symbol": "#",
     "color": "light_gray",
     "move_cost": 0,
     "coverage": 100,
@@ -33,7 +33,7 @@
     "looks_like": "t_rock_wall",
     "name": "engraved wall",
     "description": "A wall of bricks made out of what looks like basalt, heavily engraved with strange markings that give off a peculiar glow.",
-    "symbol": "LINE_OXOX",
+    "symbol": "#",
     "color": "light_gray",
     "move_cost": 0,
     "coverage": 100,
@@ -94,7 +94,7 @@
     "name": "wall",
     "looks_like": "t_wall",
     "description": "A typical wall of sturdy brick construction, plastered over with drywall to give some semblance of comfort to this dreary place.  Paint job is the all too common and neutral off-white or cream color.",
-    "symbol": "LINE_OXOX",
+    "symbol": "#",
     "color": "light_gray",
     "move_cost": 0,
     "coverage": 100,

diff --git a/Kenan-Structured-Modpack/Arcana/items/tool_armor.json b/Kenan-Structured-Modpack/Arcana/items/tool_armor.json
@@ -94,7 +94,8 @@
           "mutations": [ "ARCANA_MASK_INSIGHT_EFFECT" ],
           "values": [ { "value": "BONUS_DODGE", "add": 2 } ],
           "ench_effects": [ { "effect": "mask_blind_immunity", "intensity": 1 } ]
-        }
+        },
+        { "id": "THERMAL_VISION_GOOD" }
       ]
     },
     "use_action": {
@@ -129,7 +130,7 @@
       "type": "transform",
       "ammo_scale": 0
     },
-    "extend": { "flags": [ "SUN_GLASSES", "BLIND", "IR_EFFECT", "PARTIAL_DEAF" ] }
+    "extend": { "flags": [ "SUN_GLASSES", "BLIND", "PARTIAL_DEAF" ] }
   },
   {
     "id": "somen_clairvoyance_xl",
@@ -157,7 +158,8 @@
           "mutations": [ "ARCANA_MASK_INSIGHT_EFFECT" ],
           "values": [ { "value": "BONUS_DODGE", "add": 2 } ],
           "ench_effects": [ { "effect": "mask_blind_immunity", "intensity": 1 } ]
-        }
+        },
+        { "id": "THERMAL_VISION_GOOD" }
       ]
     },
     "use_action": {
@@ -191,7 +193,7 @@
       "type": "transform",
       "ammo_scale": 0
     },
-    "extend": { "flags": [ "SUN_GLASSES", "BLIND", "IR_EFFECT", "PARTIAL_DEAF" ] }
+    "extend": { "flags": [ "SUN_GLASSES", "BLIND", "PARTIAL_DEAF" ] }
   },
   {
     "id": "armor_wyrm",

diff --git a/Kenan-Structured-Modpack/Arcana/modinfo.json b/Kenan-Structured-Modpack/Arcana/modinfo.json
@@ -5,7 +5,7 @@
     "name": "<color_cyan>Arcana and Magic Items</color>",
     "authors": [ "Chaosvolt" ],
     "description": "Adds a host of craftable magic items and spells, centered around the use of Arcana skill to research and exploit otherworldly monsters and anomalies.",
-    "version": "DDA version, update 10/28/2024",
+    "version": "DDA version, update 11/23/2024",
     "category": "content",
     "dependencies": [ "dda" ]
   }

diff --git a/Kenan-Structured-Modpack/Arcana/mutations/mutations_dragonblood.json b/Kenan-Structured-Modpack/Arcana/mutations/mutations_dragonblood.json
@@ -435,7 +435,7 @@
     "category": [ "DRAGONBLOOD" ],
     "encumbrance_covered": [ [ "hand_l", 5 ], [ "hand_r", 5 ] ],
     "flags": [ "UNARMED_BONUS" ],
-    "enchantments": [ { "condition": { "not": "u_has_weapon" }, "values": [ { "value": "ITEM_DAMAGE_CUT", "add": 7 } ] } ]
+    "enchantments": [ { "condition": { "not": "u_has_weapon" }, "melee_damage_bonus": [ { "type": "cut", "add": 7 } ] } ]
   },
   {
     "type": "mutation",

diff --git a/Kenan-Structured-Modpack/Arcana/npcs/COMMON_TALK.json b/Kenan-Structured-Modpack/Arcana/npcs/COMMON_TALK.json
@@ -25,48 +25,48 @@
       {
         "text": "Thank you.  I think I've gathered enough information, I should go bring this back to the person who sent me.",
         "effect": [
-          { "u_add_var": "johnathan_prelude_data_5", "type": "mission", "context": "rural_church", "value": "yes" },
-          { "npc_add_var": "johnathan_prelude_mid", "type": "mission", "context": "rural_church", "value": "yes" }
+          { "u_add_var": "johnathan_prelude_data_5", "value": "yes" },
+          { "npc_add_var": "johnathan_prelude_mid", "value": "yes" }
         ],
-        "condition": { "u_has_var": "johnathan_prelude_data_4", "type": "mission", "context": "rural_church", "value": "yes" },
+        "condition": { "compare_string": [ "yes", { "u_val": "johnathan_prelude_data_4" } ] },
         "switch": true,
         "topic": "TALK_DONE"
       },
       {
         "text": "That should help.  I'll see if anyone else knows more, maybe one more report should help.",
         "effect": [
-          { "u_add_var": "johnathan_prelude_data_4", "type": "mission", "context": "rural_church", "value": "yes" },
-          { "npc_add_var": "johnathan_prelude_mid", "type": "mission", "context": "rural_church", "value": "yes" }
+          { "u_add_var": "johnathan_prelude_data_4", "value": "yes" },
+          { "npc_add_var": "johnathan_prelude_mid", "value": "yes" }
         ],
-        "condition": { "u_has_var": "johnathan_prelude_data_3", "type": "mission", "context": "rural_church", "value": "yes" },
+        "condition": { "compare_string": [ "yes", { "u_val": "johnathan_prelude_data_3" } ] },
         "switch": true,
         "topic": "TALK_DONE"
       },
       {
         "text": "Thanks!  I'll keep asking around, just in case anyone else knows of any other attacks.",
         "effect": [
-          { "u_add_var": "johnathan_prelude_data_3", "type": "mission", "context": "rural_church", "value": "yes" },
-          { "npc_add_var": "johnathan_prelude_mid", "type": "mission", "context": "rural_church", "value": "yes" }
+          { "u_add_var": "johnathan_prelude_data_3", "value": "yes" },
+          { "npc_add_var": "johnathan_prelude_mid", "value": "yes" }
         ],
-        "condition": { "u_has_var": "johnathan_prelude_data_2", "type": "mission", "context": "rural_church", "value": "yes" },
+        "condition": { "compare_string": [ "yes", { "u_val": "johnathan_prelude_data_2" } ] },
         "switch": true,
         "topic": "TALK_DONE"
       },
       {
         "text": "That helps, I'll see if anyone else knows of other attacks that might be connected.",
         "effect": [
-          { "u_add_var": "johnathan_prelude_data_2", "type": "mission", "context": "rural_church", "value": "yes" },
-          { "npc_add_var": "johnathan_prelude_mid", "type": "mission", "context": "rural_church", "value": "yes" }
+          { "u_add_var": "johnathan_prelude_data_2", "value": "yes" },
+          { "npc_add_var": "johnathan_prelude_mid", "value": "yes" }
         ],
-        "condition": { "u_has_var": "johnathan_prelude_data_1", "type": "mission", "context": "rural_church", "value": "yes" },
+        "condition": { "compare_string": [ "yes", { "u_val": "johnathan_prelude_data_1" } ] },
         "switch": true,
         "topic": "TALK_DONE"
       },
       {
         "text": "That should help, I'll keep asking around to see if anyone has more information.",
         "effect": [
-          { "u_add_var": "johnathan_prelude_data_1", "type": "mission", "context": "rural_church", "value": "yes" },
-          { "npc_add_var": "johnathan_prelude_mid", "type": "mission", "context": "rural_church", "value": "yes" }
+          { "u_add_var": "johnathan_prelude_data_1", "value": "yes" },
+          { "npc_add_var": "johnathan_prelude_mid", "value": "yes" }
         ],
         "switch": true,
         "default": true,

diff --git a/Kenan-Structured-Modpack/Arcana/npcs/TALK_ARSONIST.json b/Kenan-Structured-Modpack/Arcana/npcs/TALK_ARSONIST.json
@@ -7,13 +7,9 @@
         "text": "I've been sent to ask about recent attacks on survivors by anomalous creatures.  Know anything about that?",
         "condition": {
           "and": [
-            { "u_has_var": "johnathan_prelude_mid", "type": "mission", "context": "rural_church", "value": "yes" },
-            {
-              "not": { "npc_has_var": "johnathan_prelude_mid", "type": "mission", "context": "rural_church", "value": "yes" }
-            },
-            {
-              "not": { "u_has_var": "johnathan_prelude_data_5", "type": "mission", "context": "rural_church", "value": "yes" }
-            }
+            { "compare_string": [ "yes", { "u_val": "johnathan_prelude_mid" } ] },
+            { "not": { "compare_string": [ "yes", { "npc_val": "johnathan_prelude_mid" } ] } },
+            { "not": { "compare_string": [ "yes", { "u_val": "johnathan_prelude_data_5" } ] } }
           ]
         },
         "topic": "TALK_ARSONIST_GM_PRELUDE"
@@ -34,10 +30,8 @@
         "topic": "TALK_ARSONIST_CF_REP_MISSION_4",
         "condition": {
           "and": [
-            { "not": { "u_has_var": "sofia_allies_secured", "type": "mission", "context": "rural_church", "value": "yes" } },
-            {
-              "not": { "npc_has_var": "sofia_refugee_convinced", "type": "mission", "context": "rural_church", "value": "yes" }
-            },
+            { "not": { "compare_string": [ "yes", { "u_val": "sofia_allies_secured" } ] } },
+            { "not": { "compare_string": [ "yes", { "npc_val": "sofia_refugee_convinced" } ] } },
             { "u_has_mission": "MISSION_CF_REP_4" }
           ]
         }
@@ -48,10 +42,7 @@
     "type": "talk_topic",
     "id": "TALK_ARSONIST_CF_REP_MISSION_4",
     "dynamic_line": {
-      "u_has_var": "tacoma_started",
-      "type": "knowledge",
-      "context": "flag",
-      "value": "yes",
+      "compare_string": [ "yes", { "u_val": "knowledge_flag_tacoma_started" } ],
       "yes": "Yeah, I guess they have that ranch thing set up out there, and every so often people like me stop by.  Guessing you mean some other bunch of people though?  What're they like?",
       "no": "Most I've seen are small groups holed up in buildings and the like.  Couple other holdouts here and there I guess.  What sort of work were you talking about, though?"
     },
@@ -60,7 +51,7 @@
         "text": "It's a group operating out of a rural church along the roadside, I was asked to see if I could find another trading partner for them.",
         "switch": true,
         "topic": "TALK_ARSONIST_CF_REP_MISSION_4_DESCRIBE",
-        "condition": { "u_has_var": "tacoma_started", "type": "knowledge", "context": "flag", "value": "yes" }
+        "condition": { "compare_string": [ "yes", { "u_val": "knowledge_flag_tacoma_started" } ] }
       },
       {
         "text": "There's a decent-sized holdout I was asked to help find another trading partner for.",
@@ -87,7 +78,7 @@
       {
         "text": "Thanks!  I've talked to a few others as well, that should be enough to get word out.  I should go check up on them.",
         "effect": [
-          { "u_add_var": "sofia_allies_secured", "type": "mission", "context": "rural_church", "value": "yes" },
+          { "u_add_var": "sofia_allies_secured", "value": "yes" },
           {
             "mapgen_update": "arcana_cf_4_wasteland_scavengers_1",
             "om_terrain": "cf_church_1",
@@ -117,25 +108,25 @@
             "search_range": 256
           }
         ],
-        "condition": { "u_has_var": "sofia_ally_seeking_2", "type": "mission", "context": "flag", "value": "yes" },
+        "condition": { "compare_string": [ "yes", { "u_val": "sofia_ally_seeking_2" } ] },
         "switch": true,
         "topic": "TALK_DONE"
       },
       {
         "text": "Thanks!  I might talk to someone else to help get word out.",
         "effect": [
-          { "u_add_var": "sofia_ally_seeking_2", "type": "mission", "context": "flag", "value": "yes" },
-          { "npc_add_var": "sofia_refugee_convinced", "type": "mission", "context": "rural_church", "value": "yes" }
+          { "u_add_var": "sofia_ally_seeking_2", "value": "yes" },
+          { "npc_add_var": "sofia_refugee_convinced", "value": "yes" }
         ],
-        "condition": { "u_has_var": "sofia_ally_seeking_1", "type": "mission", "context": "flag", "value": "yes" },
+        "condition": { "compare_string": [ "yes", { "u_val": "sofia_ally_seeking_1" } ] },
         "switch": true,
         "topic": "TALK_DONE"
       },
       {
         "text": "Thanks!  I'll see if talking to a couple other people will help.",
         "effect": [
-          { "u_add_var": "sofia_ally_seeking_1", "type": "mission", "context": "flag", "value": "yes" },
-          { "npc_add_var": "sofia_refugee_convinced", "type": "mission", "context": "rural_church", "value": "yes" }
+          { "u_add_var": "sofia_ally_seeking_1", "value": "yes" },
+          { "npc_add_var": "sofia_refugee_convinced", "value": "yes" }
         ],
         "switch": true,
         "default": true,

diff --git a/Kenan-Structured-Modpack/Arcana/npcs/TALK_BLOOD_MAGE_APPRENTICE.json b/Kenan-Structured-Modpack/Arcana/npcs/TALK_BLOOD_MAGE_APPRENTICE.json
@@ -6,7 +6,7 @@
     "responses": [
       {
         "text": "\"The moonlit sky anoints the worthy, who seek The Path home.\"",
-        "condition": { "u_has_var": "horace_password_known", "type": "flag", "context": "shrike", "value": "yes" },
+        "condition": { "compare_string": [ "yes", { "u_val": "horace_password_known" } ] },
         "topic": "TALK_BLOOD_MAGE_APPRENTICE_PASSWORD"
       },
       {

diff --git a/Kenan-Structured-Modpack/Arcana/npcs/TALK_BLOOD_MAGE_SHRIKE_ROGUE.json b/Kenan-Structured-Modpack/Arcana/npcs/TALK_BLOOD_MAGE_SHRIKE_ROGUE.json
@@ -14,7 +14,7 @@
     "responses": [
       {
         "text": "\"The moonlit sky anoints the worthy, who seek The Path home.\"",
-        "condition": { "u_has_var": "horace_password_known", "type": "flag", "context": "shrike", "value": "yes" },
+        "condition": { "compare_string": [ "yes", { "u_val": "horace_password_known" } ] },
         "topic": "TALK_BLOOD_MAGE_SHRIKE_ROGUE_PASSWORD"
       },
       {
@@ -82,10 +82,7 @@
         "condition": { "u_has_any_trait": [ "PROF_CLEANSINGFLAME", "PROF_CLEANSINGFLAME2" ] },
         "topic": "TALK_BLOOD_MAGE_SHRIKE_ROGUE_LANIUS"
       },
-      {
-        "text": "One of Elena's shrikes said to tell you that.",
-        "topic": "TALK_BLOOD_MAGE_SHRIKE_ROGUE_ELENA"
-      },
+      { "text": "One of Elena's shrikes said to tell you that.", "topic": "TALK_BLOOD_MAGE_SHRIKE_ROGUE_ELENA" },
       { "text": "[ATTACK] …", "topic": "TALK_DONE", "effect": "insult_combat" }
     ]
   },