Merge branch 'CleverRaven:master' into master

data/json/achievements.json

@@ -2238,5 +2238,89 @@
         "description": "Reach a Police Station"
       }
     ]
+  },
+  {
+    "id": "achievement_read_books_250",
+    "type": "achievement",
+    "name": "Avid Reader",
+    "description": "Read any book 250 times",
+    "requirements": [ { "event_statistic": "num_reads_book", "is": ">=", "target": 250, "description": "Read books 250 times" } ]
+  },
+  {
+    "id": "achievement_read_books_500",
+    "type": "achievement",
+    "name": "Dedicated Reader",
+    "description": "Read any book 500 times",
+    "hidden_by": [ "achievement_read_books_250" ],
+    "requirements": [ { "event_statistic": "num_reads_book", "is": ">=", "target": 500, "description": "Read books 500 times" } ]
+  },
+  {
+    "id": "achievement_read_books_1000",
+    "type": "achievement",
+    "name": "Bibliophile",
+    "description": "Read any book 1000 times",
+    "hidden_by": [ "achievement_read_books_500" ],
+    "requirements": [ { "event_statistic": "num_reads_book", "is": ">=", "target": 1000, "description": "Read books 1000 times" } ]
+  },
+  {
+    "id": "achievement_break_3_bones",
+    "type": "achievement",
+    "name": "That's not supposed to bend that way!",
+    "requirements": [ { "event_statistic": "num_broken_bone", "is": ">=", "target": 3, "description": "Break 3 bones" } ]
+  },
+  {
+    "id": "achievement_break_6_bones",
+    "type": "achievement",
+    "name": "Paper mache limbs",
+    "hidden_by": [ "achievement_break_3_bones" ],
+    "requirements": [ { "event_statistic": "num_broken_bone", "is": ">=", "target": 6, "description": "Break 6 bones" } ]
+  },
+  {
+    "id": "achievement_break_10_bones",
+    "type": "achievement",
+    "name": "Amateur Orthopedic Surgeon",
+    "hidden_by": [ "achievement_break_6_bones" ],
+    "requirements": [ { "event_statistic": "num_broken_bone", "is": ">=", "target": 10, "description": "Break 10 bones" } ]
+  },
+  {
+    "id": "achievement_heal_250_damage",
+    "type": "achievement",
+    "name": "Beginner Survivor",
+    "requirements": [ { "event_statistic": "avatar_damage_healed", "is": ">=", "target": 250, "description": "Heal 250 Damage" } ]
+  },
+  {
+    "id": "achievement_heal_1000_damage",
+    "type": "achievement",
+    "name": "Accomplished Survivor",
+    "hidden_by": [ "achievement_heal_250_damage" ],
+    "requirements": [ { "event_statistic": "avatar_damage_healed", "is": ">=", "target": 1000, "description": "Heal 1,000 Damage" } ]
+  },
+  {
+    "id": "achievement_heal_2500_damage",
+    "type": "achievement",
+    "name": "Veteran Survivor",
+    "hidden_by": [ "achievement_heal_1000_damage" ],
+    "requirements": [ { "event_statistic": "avatar_damage_healed", "is": ">=", "target": 2500, "description": "Heal 2,500 Damage" } ]
+  },
+  {
+    "id": "achievement_heal_5000_damage",
+    "type": "achievement",
+    "name": "Hardened Survivor",
+    "hidden_by": [ "achievement_heal_2500_damage" ],
+    "requirements": [ { "event_statistic": "avatar_damage_healed", "is": ">=", "target": 5000, "description": "Heal 5,000 Damage" } ]
+  },
+  {
+    "id": "achievement_reach_LIXA",
+    "type": "achievement",
+    "name": "Brilliant!",
+    "requirements": [
+      {
+        "event_statistic": "num_avatar_enters_LIXA",
+        "is": ">=",
+        "target": 1,
+        "visible": "when_achievement_completed",
+        "description": "Reach a research lab"
+      }
+    ]
   }
 ]

data/json/effects_on_condition/nether_eocs/portal_storm_effect_on_condition.json

@@ -470,6 +470,7 @@
         "min_radius": 3,
         "max_radius": 20,
         "lifespan": [ "7 minutes", "10 minutes" ],
+        "temporary_drop_items": true,
         "spawn_message": "A chunk of reality gets loose and falls on the ground.",
         "spawn_message_plural": "Chunks of reality get loose and fall on the ground."
       }
@@ -489,6 +490,7 @@
         "min_radius": 3,
         "max_radius": 20,
         "lifespan": [ "7 minutes", "10 minutes" ],
+        "temporary_drop_items": true,
         "spawn_message": "Reality twists and deforms as a wriggling chunk of it falls on the ground.",
         "spawn_message_plural": "Reality twists and deforms as wriggling chunks of it fall on the ground."
       }
@@ -508,6 +510,7 @@
         "min_radius": 3,
         "max_radius": 20,
         "lifespan": [ "7 minutes", "10 minutes" ],
+        "temporary_drop_items": true,
         "spawn_message": "A chunk of reality tears itself asunder and takes shape on the ground.",
         "spawn_message_plural": "Chunks of reality tear themselves asunder and take shape on the ground."
       }

data/json/effects_on_condition/scenario_specific_eocs.json

@@ -52,27 +52,69 @@
     "eoc_type": "SCENARIO_SPECIFIC",
     "effect": [
       {
-        "u_spawn_monster": "GROUP_MANSION_ARMORED",
-        "group": true,
-        "real_count": 1,
-        "min_radius": 30,
-        "max_radius": 45,
-        "indoor_only": true
+        "u_location_variable": { "u_val": "mansion_centre" },
+        "target_params": { "om_terrain": "mansion_+4d", "search_range": 2, "z": -1 },
+        "min_radius": 0,
+        "max_radius": 0
       },
+      { "location_variable_adjust": { "u_val": "mansion_centre" }, "x_adjust": 11, "y_adjust": 11 },
+      { "run_eoc_with": "EOC_BANISH_MANSION_MONSTERS", "beta_loc": { "u_val": "mansion_centre" } },
+      { "run_eocs": "EOC_SPAWN_MANSION_MONSTERS" },
+      { "location_variable_adjust": { "u_val": "mansion_centre" }, "z_adjust": 0, "z_override": true },
+      { "run_eoc_with": "EOC_BANISH_MANSION_MONSTERS", "beta_loc": { "u_val": "mansion_centre" } },
+      { "run_eocs": "EOC_SPAWN_MANSION_MONSTERS" },
+      { "location_variable_adjust": { "u_val": "mansion_centre" }, "z_adjust": 1, "z_override": true },
+      { "run_eoc_with": "EOC_BANISH_MANSION_MONSTERS", "beta_loc": { "u_val": "mansion_centre" } },
+      { "run_eocs": "EOC_SPAWN_MANSION_MONSTERS" },
       {
-        "u_spawn_monster": "GROUP_MANSION_START",
+        "u_run_monster_eocs": [ { "id": "EOC_BANISH_MONSTERS_AROUND_PLAYER", "effect": { "run_eocs": "EOC_BANISH_SELF" } } ],
+        "monster_range": 6
+      }
+    ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_BANISH_SELF",
+    "effect": [ { "u_cast_spell": { "id": "BEGONE_SHADOW" } } ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_BANISH_MANSION_MONSTERS",
+    "//": "Banish half the mapgen monsters from the mansion to make room for special scenario ferals",
+    "effect": [
+      {
+        "npc_run_monster_eocs": [
+          {
+            "id": "EOC_BANISH_MONSTERS_AROUND_MANSION_CENTER",
+            "condition": { "math": [ "rand(1)", "==", "0" ] },
+            "effect": { "run_eocs": "EOC_BANISH_SELF" }
+          }
+        ],
+        "monster_range": 36
+      }
+    ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_SPAWN_MANSION_MONSTERS",
+    "//": "Spawn special scenario ferals out from the center of the mansion",
+    "effect": [
+      {
+        "u_spawn_monster": "GROUP_MANSION_ARMORED",
         "group": true,
-        "real_count": 2,
-        "min_radius": 20,
-        "max_radius": 35,
+        "real_count": 1,
+        "min_radius": 0,
+        "max_radius": 36,
+        "target_var": { "u_val": "mansion_centre" },
         "indoor_only": true
       },
       {
         "u_spawn_monster": "GROUP_MANSION_START",
         "group": true,
-        "real_count": 2,
-        "min_radius": 25,
-        "max_radius": 40,
+        "real_count": 20,
+        "min_radius": 0,
+        "max_radius": 36,
+        "target_var": { "u_val": "mansion_centre" },
         "indoor_only": true
       }
     ]

data/json/field_type.json

@@ -2000,8 +2000,8 @@
     "max_duration": "6 seconds",
     "max_intensity": 3,
     "int_dur_factor": "2 seconds",
-    "base_mods": { "hurt_min": [ 2 ], "hurt_chance": [ 1 ] },
-    "scaling_mods": { "hurt_min": [ 2 ] },
+    "base_mods": { "hurt_min": [ 1 ], "hurt_chance": [ 3 ] },
+    "scaling_mods": { "hurt_min": [ 1 ] },
     "show_in_info": true
   },
   {

data/json/items/book/launcher.json

@@ -95,6 +95,11 @@
         "name": { "str": "FM 23-11: 90mm Recoilless Rifle, M67", "str_pl": "copies of FM 23-11: 90mm Recoilless Rifle, M67" },
         "description": "Official U.S. Army manual for using the M67 anti-tank rifle - theory, practice, and essential information.",
         "//": "979-8538902606"
+      },
+      {
+        "id": "manual_launcher_5",
+        "name": { "str": "Jane's Flamethrowers and Firestarters", "str_pl": "copies of Jane's Flamethrowers and Firestarters" },
+        "description": "A detailed, full-colored guide to flamethrowers, incendiary weapons, and napalm.  It builds off of information provided in its sister book, Jane's Mortars and Rocket Launchers, and so it's mostly incomprehensible to anyone without prior knowledge."
       }
     ],
     "weight": "650 g",

data/json/items/book/pistol.json

@@ -124,6 +124,11 @@
           "str_pl": "copies of FM 3-23.35: Combat Training With Pistols, M9 And M11"
         },
         "description": "Official U.S. Army manual detailing how M9 and M11 handguns work, and how to use them safely and effectively."
+      },
+      {
+        "id": "manual_pistol_8",
+        "name": { "str": "Black Powder to Berettas", "str_pl": "copies of Black Powder to Berettas" },
+        "description": "This hardcover book, aimed at the gun nut, provides an illustrated, concise history of the handgun throughout history, including technical specifications and use techniques.  It's difficult to follow without a passing knowledge in pistols, but an experienced handgun user could glean much from it."
       }
     ],
     "weight": "440 g",

data/json/items/book/rifle.json

@@ -140,6 +140,12 @@
         "name": { "str": "The Gun", "str_pl": "copies of The Gun" },
         "description": "A giant, 500-page history about the AK-47—the most popular firearm in the world—and the information around it: the mechanics of the weapon, its usage, maintenance, modifications, and its impact on global conflicts.",
         "//": "978-0743270762"
+      },
+      {
+        "id": "manual_gun_14",
+        "name": { "str": "America's Rifle", "str_pl": "copies of America's Rifle" },
+        "description": "A history book penned by an anonymous author.  Starting from its design by John Garand and ending with the Vietnam War, it provides a detailed run-down of the M1 Garand rifle's use throughout history as well as its design and quirks with the weapon.",
+        "//": "978-0743270762"
       }
     ],
     "weight": "454 g",

data/json/items/book/shotgun.json

@@ -123,6 +123,11 @@
         "name": { "str": "Vintage British Shotguns", "str_pl": "copies of Vintage British Shotguns" },
         "description": "A good guide for both sportsmen and gun collectors, this book contains information about classic shotguns and their usage.",
         "//": "978-0892727742"
+      },
+      {
+        "id": "manual_shotgun_9",
+        "name": { "str": "USMC M1014 technical manual" },
+        "description": "A pocket-sized book printed in 2000 by the United States Marine Corps for official use.  It describes the operation, repair, and cleaning of the Benilli M1014 shotgun.  Though specific to the M4, it can provide a wealth of information to the trained eye."
       }
     ],
     "weight": "400 g",

data/json/items/gun/38.json

@@ -233,6 +233,7 @@
     "type": "GUN",
     "name": { "str_sp": "S&W 619" },
     "description": "A seven-round .357 revolver sold by Smith & Wesson.  Can also fire .38 Special.  It features a fixed rear sight and a reinforced frame.",
+    "ascii_picture": "sw_610",
     "weight": "1074 g",
     "volume": "608 ml",
     "longest_side": "278 mm",