Merge branch 'master' into fix_customization

data/core/game_balance.json

@@ -104,6 +104,34 @@
     "stype": "bool",
     "value": false
   },
+  {
+    "type": "EXTERNAL_OPTION",
+    "name": "SPAWN_CITY_HORDE_THRESHOLD",
+    "info": "Minimum city size to guarantee extra zombies are spawned in cities.  0 means all cities spawn extra zombies.  Negative values disable extra city zombies.",
+    "stype": "int",
+    "value": 4
+  },
+  {
+    "type": "EXTERNAL_OPTION",
+    "name": "SPAWN_CITY_HORDE_SMALL_CITY_CHANCE",
+    "info": "Probability of a city smaller than SPAWN_HORDE_THRESHOLD having city zombies spawned, express in 'one in x' fashion .",
+    "stype": "int",
+    "value": 16
+  },
+  {
+    "type": "EXTERNAL_OPTION",
+    "name": "SPAWN_CITY_HORDE_SPREAD",
+    "info": "A scaling factor that determines how far from the center of cities extra zombies spawn, multiplied by city size, when city hordes are indicated.",
+    "stype": "float",
+    "value": 1.5
+  },
+  {
+    "type": "EXTERNAL_OPTION",
+    "name": "SPAWN_CITY_HORDE_SCALAR",
+    "info": "A scaling factor that determines how many zombies are spawned in cites, multiplied by city size, when city hordes are indicated.",
+    "stype": "float",
+    "value": 80.0
+  },
   {
     "type": "EXTERNAL_OPTION",
     "name": "SPAWN_ANIMAL_DENSITY",

data/json/itemgroups/Weapons_Mods_Ammo/guns.json

@@ -768,7 +768,7 @@
       { "item": "m60_semi", "prob": 5 },
       { "item": "oa93", "prob": 3 },
       { "item": "steyr_aug", "prob": 5 },
-      { "item": "fn_fal", "prob": 40 },
+      { "item": "fn_fal_semi", "variant": "fal_dsa", "prob": 40 },
       { "item": "hk_g3", "prob": 40 },
       { "item": "hk_g36", "prob": 30 },
       { "item": "m1918", "prob": 30 },

data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json

@@ -1494,7 +1494,7 @@
     "subtype": "collection",
     "ammo": 100,
     "entries": [
-      { "item": "fn_fal", "charges-min": 0, "charges-max": 20 },
+      { "item": "fn_fal_semi", "charges-min": 0, "charges-max": 20 },
       { "item": "falmag" },
       { "item": "falmag", "prob": 50 },
       { "group": "on_hand_308" }

data/json/items/gun/308.json

@@ -1,6 +1,6 @@
 [
   {
-    "id": "fn_fal",
+    "id": "fn_fal_semi",
     "copy-from": "rifle_semi_vintage",
     "looks_like": "modular_ar15",
     "type": "GUN",

data/json/monsters/robofac_robots.json

@@ -105,7 +105,7 @@
         "type": "gun",
         "cooldown": 1,
         "move_cost": 150,
-        "gun_type": "fn_fal",
+        "gun_type": "fn_fal_semi",
         "ammo_type": "762_51",
         "fake_skills": [ [ "gun", 8 ], [ "rifle", 8 ] ],
         "fake_dex": 12,

data/json/obsoletion/migration_items.json

@@ -335,5 +335,10 @@
     "id": "rm4504",
     "type": "MIGRATION",
     "replace": "pressurized_tank_modern"
+  },
+  {
+    "id": "fn_fal",
+    "type": "MIGRATION",
+    "replace": "fn_fal_semi"
   }
 ]

data/json/recipes/weapon/magazines.json

@@ -239,7 +239,7 @@
     "skills_required": [ "gun", 1 ],
     "time": "20 m",
     "autolearn": true,
-    "tools": [ [ [ "fn_fal", -1 ] ], [ [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ] ],
+    "tools": [ [ [ "fn_fal_semi", -1 ] ], [ [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ] ],
     "using": [ [ "308_casehead", 1 ] ],
     "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ],
     "components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring", 1 ] ], [ [ "duct_tape", 40 ] ] ]

data/mods/Generic_Guns/firearms/gg_firearms_migration.json

@@ -336,7 +336,7 @@
       "sig_assault_rifle",
       "steyr_aug",
       "iwi_tavor_x95_300blk",
-      "fn_fal",
+      "fn_fal_semi",
       "m1a",
       "sks",
       "mosin44",

data/mods/MindOverMatter/effectoncondition/eoc_learn_recipes.json

@@ -25,12 +25,16 @@
       { "u_learn_recipe": "practice_clair_night_vision" },
       { "u_learn_recipe": "practice_clair_danger_sense" },
       { "u_learn_recipe": "practice_clair_speed_reading" },
+      { "u_learn_recipe": "practice_clair_aura_sight" },
       { "u_learn_recipe": "practice_clair_spot_weakness" },
       { "u_learn_recipe": "practice_clair_ranged_enhance" },
       { "u_learn_recipe": "practice_clair_voyance" },
       { "u_learn_recipe": "practice_clair_dodge_power" },
-      { "u_learn_recipe": "practice_clair_clear_sight" },
+      { "u_learn_recipe": "practice_clair_craft_bonus" },
       { "u_learn_recipe": "practice_clair_see_map" },
+      { "u_learn_recipe": "practice_clair_perfect_shot" },
+      { "u_learn_recipe": "practice_clair_clear_sight" },
+      { "u_learn_recipe": "practice_clair_group_tactics" },
       { "u_learn_recipe": "practice_clair_omniscience" }
     ]
   },
@@ -66,6 +70,7 @@
       { "u_learn_recipe": "practice_photokinetic_camouflage" },
       { "u_learn_recipe": "practice_photokinetic_rad_immunity" },
       { "u_learn_recipe": "practice_photokinetic_light_arms" },
+      { "u_learn_recipe": "practice_photokinetic_hide_ugly" },
       { "u_learn_recipe": "practice_photokinetic_light_image" },
       { "u_learn_recipe": "practice_photokinetic_radio" },
       { "u_learn_recipe": "practice_photokinetic_invisibility" },

data/mods/MindOverMatter/effectoncondition/eoc_on_power_use_events.json

@@ -7,7 +7,10 @@
         "run_eocs": [
           "EOC_BIOKIN_REMOVE_METABOLISM_ENHANCE",
           "EOC_CLAIR_REMOVE_SPEED_READ",
-          "EOC_PHOTO_REMOVE_LIGHT_LOCAL",
+          "EOC_CLAIR_REMOVE_SEE_AURAS",
+          "EOC_CLAIR_REMOVE_CRAFT_BONUS",
+          "EOC_PHOTOKIN_REMOVE_LIGHT_LOCAL",
+          "EOC_PHOTOKIN_REMOVE_HIDE_UGLY",
           "EOC_PHOTOKIN_REMOVE_RADIO",
           "EOC_PYRO_REMOVE_FIRE_TOOL",
           "EOC_PYRO_REMOVE_TORCH_WELD",
@@ -17,7 +20,8 @@
           "EOC_TELEPATH_REMOVE_TELEPATHIC_CONCENTRATION"
         ]
       },
-      { "u_lose_effect": "effect_telepath_invisibility" }
+      { "u_lose_effect": "effect_telepath_invisibility" },
+      { "u_lose_effect": "effect_clair_perfect_shot" }
     ]
   },
   {
@@ -29,6 +33,8 @@
       "or": [
         { "u_has_trait": "CLAIR_SPEED_READ" },
         { "u_has_effect": "effect_clair_speed_reader" },
+        { "u_has_effect": "effect_clair_see_auras" },
+        { "u_has_effect": "effect_clair_craft_bonus" },
         { "u_has_effect": "effect_photokin_light_local" },
         { "u_has_item": "pyrokinetic_fire_tool" },
         { "u_has_item": "pyrokinetic_torch_weld" },
@@ -69,6 +75,8 @@
       "or": [
         { "u_has_trait": "CLAIR_SPEED_READ" },
         { "u_has_effect": "effect_clair_speed_reader" },
+        { "u_has_effect": "effect_clair_see_auras" },
+        { "u_has_effect": "effect_clair_craft_bonus" },
         { "u_has_effect": "effect_photokin_light_local" },
         { "u_has_item": "pyrokinetic_fire_tool" },
         { "u_has_item": "pyrokinetic_torch_weld" },
@@ -109,6 +117,9 @@
       "or": [
         { "u_has_trait": "CLAIR_SPEED_READ" },
         { "u_has_effect": "effect_clair_speed_reader" },
+        { "u_has_effect": "effect_clair_see_auras" },
+        { "u_has_effect": "effect_clair_craft_bonus" },
+        { "u_has_effect": "effect_clair_perfect_shot" },
         { "u_has_effect": "effect_photokin_light_local" },
         { "u_has_item": "pyrokinetic_fire_tool" },
         { "u_has_item": "pyrokinetic_torch_weld" },
@@ -149,6 +160,9 @@
       "or": [
         { "u_has_trait": "CLAIR_SPEED_READ" },
         { "u_has_effect": "effect_clair_speed_reader" },
+        { "u_has_effect": "effect_clair_see_auras" },
+        { "u_has_effect": "effect_clair_craft_bonus" },
+        { "u_has_effect": "effect_clair_perfect_shot" },
         { "u_has_effect": "effect_photokin_light_local" },
         { "u_has_item": "pyrokinetic_fire_tool" },
         { "u_has_item": "pyrokinetic_torch_weld" },
@@ -191,6 +205,9 @@
           "or": [
             { "u_has_trait": "CLAIR_SPEED_READ" },
             { "u_has_effect": "effect_clair_speed_reader" },
+            { "u_has_effect": "effect_clair_see_auras" },
+            { "u_has_effect": "effect_clair_craft_bonus" },
+            { "u_has_effect": "effect_clair_perfect_shot" },
             { "u_has_effect": "effect_photokin_light_local" },
             { "u_has_item": "pyrokinetic_fire_tool" },
             { "u_has_item": "pyrokinetic_torch_weld" },

data/mods/MindOverMatter/effectoncondition/eoc_power_effects.json

@@ -112,95 +112,68 @@
     "id": "EOC_END_PSI_POWERS",
     "//": "This should remove absolutely all powers.",
     "effect": [
-      { "u_lose_effect": "effect_biokin_physical" },
-      { "u_lose_effect": "effect_biokin_pkill_1" },
-      { "u_lose_effect": "effect_biokin_pkill_2" },
-      { "u_lose_effect": "effect_biokin_pkill_3" },
-      { "u_lose_effect": "effect_biokin_pkill_4" },
-      { "u_lose_effect": "effect_biokin_pkill_5" },
-      { "u_lose_effect": "effect_biokin_pkill_6" },
-      { "u_lose_effect": "effect_biokin_flexibility" },
-      { "u_lose_effect": "effect_biokin_hammerhand" },
-      { "u_remove_item_with": "biokin_hammerhand_item" },
-      { "u_lose_effect": "effect_biokin_enhance_mobility" },
-      { "u_remove_item_with": "biokin_enhance_mobility_item_1" },
-      { "u_remove_item_with": "biokin_enhance_mobility_item_2" },
-      { "u_remove_item_with": "biokin_enhance_mobility_item_3" },
-      { "u_remove_item_with": "biokin_enhance_mobility_item_4" },
-      { "u_remove_item_with": "biokin_enhance_mobility_item_5" },
-      { "u_remove_item_with": "biokin_enhance_mobility_item_6" },
+      {
+        "run_eocs": [
+          "EOC_BIOKIN_REMOVE_OVERCOME_PAIN",
+          "EOC_BIOKIN_REMOVE_PHYSICAL_ENHANCE",
+          "EOC_BIOKIN_REMOVE_BREATHE_SKIN",
+          "EOC_BIOKIN_REMOVE_CLIMATE_CONTROL",
+          "EOC_BIOKIN_REMOVE_ENHANCE_MOBILITY",
+          "EOC_BIOKIN_REMOVE_HAMMERHAND",
+          "EOC_BIOKIN_REMOVE_REFLEX_ENHANCE",
+          "EOC_BIOKIN_REMOVE_METABOLISM_ENHANCE",
+          "EOC_CLAIR_REMOVE_NIGHT_EYES",
+          "EOC_CLAIR_REMOVE_SPEED_READ",
+          "EOC_CLAIR_REMOVE_DANGER_SENSE",
+          "EOC_CLAIR_REMOVE_SEE_AURAS",
+          "EOC_CLAIR_REMOVE_RANGED_ENHANCE",
+          "EOC_CLAIR_REMOVE_DODGE_POWER",
+          "EOC_CLAIR_REMOVE_CRAFT_BONUS",
+          "EOC_CLAIR_REMOVE_CLEAR_SIGHT",
+          "EOC_CLAIR_REMOVE_GROUP_TACTICS",
+          "EOC_ELECTROKIN_REMOVE_SEE_ELECTRICITY",
+          "EOC_ELECTROKIN_REMOVE_PERSONAL_BATTERY",
+          "EOC_ELECTROKIN_REMOVE_REDUCE_PAIN",
+          "EOC_PHOTOKIN_REMOVE_LIGHT_LOCAL",
+          "EOC_PHOTOKIN_REMOVE_RAD_IMMUNITY",
+          "EOC_PHOTOKIN_REMOVE_HIDE_UGLY",
+          "EOC_PHOTOKIN_REMOVE_RADIO",
+          "EOC_PYRO_REMOVE_FIRE_TOOL",
+          "EOC_PYRO_REMOVE_WARMTH_CLOAK",
+          "EOC_PYRO_REMOVE_TORCH_WELD",
+          "EOC_TELEKIN_REMOVE_MOMENTUM",
+          "EOC_TELEKIN_REMOVE_TELEKINETIC_STRENGTH",
+          "EOC_TELEKIN_REMOVE_SHIELD",
+          "EOC_TELEKIN_REMOVE_JACKING_TOOL",
+          "EOC_TELEKIN_REMOVE_LEVITATION",
+          "EOC_TELEPATH_REMOVE_TELEPATHIC_CONCENTRATION",
+          "EOC_TELEPATH_REMOVE_TELEPATHIC_SHIELD",
+          "EOC_TELEPATH_REMOVE_TELEPATHIC_MORALE",
+          "EOC_TELEPATH_REMOVE_SENSE_MINDS",
+          "EOC_TELEPORT_REMOVE_STRIDE",
+          "EOC_VITAKIN_REMOVE_HEALTH_POWER"
+        ]
+      },
       { "u_lose_effect": "effect_biokin_armor_skin" },
-      { "u_lose_effect": "effect_biokin_climate_control" },
       { "u_lose_effect": "effect_biokin_sealed" },
       { "u_lose_effect": "effect_biokin_combat_dance" },
       { "u_lose_effect": "effect_biokin_perfected_motion" },
-      { "u_lose_effect": "effect_clair_night_eyes_1" },
-      { "u_lose_effect": "effect_clair_night_eyes_2" },
-      { "u_lose_effect": "effect_clair_night_eyes_3" },
-      { "u_lose_effect": "effect_clair_night_eyes_4" },
-      { "u_lose_effect": "effect_clair_night_eyes_5" },
-      { "u_lose_effect": "effect_clair_night_eyes_6" },
-      { "u_lose_effect": "effect_clair_night_eyes_7" },
-      { "u_lose_effect": "effect_clair_night_eyes_8" },
-      { "u_lose_effect": "effect_clair_premonition" },
-      { "u_lose_trait": "CLAIR_SPEED_READ" },
-      { "u_lose_effect": "effect_clair_speed_reader" },
-      { "u_lose_effect": "effect_clair_ranged_enhance" },
       { "u_lose_effect": "effect_clair_sense_rads_self" },
       { "u_remove_item_with": "clair_sense_rad_item" },
-      { "u_lose_effect": "effect_clair_dodge" },
-      { "u_lose_effect": "effect_clair_clear_sight" },
+      { "u_lose_effect": "effect_clair_perfect_shot" },
       { "u_lose_effect": "effect_clair_omniscence" },
-      { "u_lose_effect": "effect_electrokin_see_electricity" },
       { "u_lose_effect": "effect_electrokin_zap_enemies" },
       { "u_lose_effect": "effect_electrokin_melee_attacks" },
-      { "u_lose_effect": "effect_electrokin_personal_battery" },
       { "u_lose_effect": "effect_electrokinetic_speed_boost" },
-      { "u_lose_effect": "effect_photokin_light_local" },
       { "u_lose_effect": "effect_photokin_dodge" },
-      { "u_lose_effect": "effect_photokinetic_radio" },
-      { "u_remove_item_with": "item_photokinetic_radio" },
-      { "u_remove_item_with": "item_photokinetic_radio_on" },
       { "u_lose_effect": "effect_photokin_invisibility" },
       { "u_lose_effect": "effect_photokin_arms" },
-      { "u_lose_effect": "effect_pyrokinetic_cloak" },
-      { "u_remove_item_with": "pyrokinetic_fire_tool" },
-      { "u_remove_item_with": "pyrokinetic_torch_weld" },
       { "u_lose_effect": "effect_pyrokinetic_aura" },
       { "u_lose_effect": "effect_pyrokinetic_flame_immunity" },
-      { "u_lose_effect": "effect_telekinetic_momentum" },
       { "u_lose_effect": "effect_telekinetic_slowfall" },
-      { "u_lose_effect": "effect_telekinetic_strength" },
-      { "u_lose_effect": "effect_telekinetic_armor" },
-      { "u_remove_item_with": "telekin_lifting_jack_1" },
-      { "u_remove_item_with": "telekin_lifting_jack_2" },
-      { "u_remove_item_with": "telekin_lifting_jack_3" },
-      { "u_remove_item_with": "telekin_lifting_jack_4" },
-      { "u_remove_item_with": "telekin_lifting_jack_5" },
-      { "u_remove_item_with": "telekin_lifting_jack_6" },
-      { "u_remove_item_with": "telekin_lifting_jack_7" },
-      { "u_remove_item_with": "telekin_lifting_jack_8" },
-      { "u_remove_item_with": "telekin_lifting_jack_9" },
-      { "u_remove_item_with": "telekin_lifting_jack_10" },
-      { "u_remove_item_with": "telekin_lifting_jack_11" },
-      { "u_remove_item_with": "telekin_lifting_jack_12" },
-      { "u_remove_item_with": "telekin_lifting_jack_13" },
-      { "u_remove_item_with": "telekin_lifting_jack_14" },
-      { "u_remove_item_with": "telekin_lifting_jack_15" },
-      { "u_remove_item_with": "telekin_lifting_jack_16" },
-      { "u_remove_item_with": "telekin_lifting_jack_17" },
-      { "u_remove_item_with": "telekin_lifting_jack_18" },
-      { "u_remove_item_with": "telekin_lifting_jack_19" },
-      { "u_remove_item_with": "telekin_lifting_jack_20" },
-      { "u_lose_effect": "effect_telekinetic_levitation" },
       { "u_lose_effect": "effect_telekinetic_aegis" },
-      { "u_lose_effect": "effect_telepathic_learning_bonus" },
-      { "u_lose_effect": "effect_telepath_sense_minds" },
-      { "u_lose_effect": "effect_telepathic_morale" },
       { "u_lose_effect": "effect_telepath_invisibility" },
       { "u_lose_effect": "effect_telepath_network_effect" },
-      { "u_lose_effect": "effect_teleport_stride" },
-      { "u_lose_effect": "effect_vita_health" },
       { "u_lose_effect": "effect_vitakin_purge_rads" },
       { "u_lose_effect": "effect_vita_super_heal" },
       { "u_lose_effect": "effect_vita_return_from_death" },
@@ -226,14 +199,18 @@
           "EOC_CLAIR_REMOVE_NIGHT_EYES",
           "EOC_CLAIR_REMOVE_SPEED_READ",
           "EOC_CLAIR_REMOVE_DANGER_SENSE",
+          "EOC_CLAIR_REMOVE_SEE_AURAS",
           "EOC_CLAIR_REMOVE_RANGED_ENHANCE",
           "EOC_CLAIR_REMOVE_DODGE_POWER",
+          "EOC_CLAIR_REMOVE_CRAFT_BONUS",
           "EOC_CLAIR_REMOVE_CLEAR_SIGHT",
+          "EOC_CLAIR_REMOVE_GROUP_TACTICS",
           "EOC_ELECTROKIN_REMOVE_SEE_ELECTRICITY",
           "EOC_ELECTROKIN_REMOVE_PERSONAL_BATTERY",
           "EOC_ELECTROKIN_REMOVE_REDUCE_PAIN",
           "EOC_PHOTOKIN_REMOVE_LIGHT_LOCAL",
           "EOC_PHOTOKIN_REMOVE_RAD_IMMUNITY",
+          "EOC_PHOTOKIN_REMOVE_HIDE_UGLY",
           "EOC_PHOTOKIN_REMOVE_RADIO",
           "EOC_PYRO_REMOVE_FIRE_TOOL",
           "EOC_PYRO_REMOVE_WARMTH_CLOAK",