Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA

CleverRaven · Nov 4, 2019 · 6fded34 · 6fded34
2 parents 1ce3ca0 + 33fcb6e
commit 6fded34
Show file tree

Hide file tree

Showing 32 changed files with 209 additions and 90 deletions.
diff --git a/data/json/furniture_and_terrain/terrain-windows.json b/data/json/furniture_and_terrain/terrain-windows.json
@@ -136,7 +136,16 @@
     "move_cost": 4,
     "coverage": 60,
     "roof": "t_flat_roof",
-    "flags": [ "TRANSPARENT", "FLAMMABLE", "NOITEM", "OPENCLOSE_INSIDE", "MOUNTABLE", "CONNECT_TO_WALL", "THIN_OBSTACLE" ],
+    "flags": [
+      "TRANSPARENT",
+      "FLAMMABLE",
+      "NOITEM",
+      "OPENCLOSE_INSIDE",
+      "MOUNTABLE",
+      "CONNECT_TO_WALL",
+      "THIN_OBSTACLE",
+      "SMALL_PASSAGE"
+    ],
     "close": "t_window_no_curtains",
     "bash": {
       "str_min": 3,
@@ -211,7 +220,16 @@
     "move_cost": 4,
     "coverage": 60,
     "roof": "t_flat_roof",
-    "flags": [ "TRANSPARENT", "FLAMMABLE", "NOITEM", "OPENCLOSE_INSIDE", "MOUNTABLE", "CONNECT_TO_WALL", "THIN_OBSTACLE" ],
+    "flags": [
+      "TRANSPARENT",
+      "FLAMMABLE",
+      "NOITEM",
+      "OPENCLOSE_INSIDE",
+      "MOUNTABLE",
+      "CONNECT_TO_WALL",
+      "THIN_OBSTACLE",
+      "SMALL_PASSAGE"
+    ],
     "examine_action": "curtains",
     "close": "t_window_domestic",
     "bash": {
@@ -337,7 +355,16 @@
     "symbol": "0",
     "color": "yellow",
     "move_cost": 4,
-    "flags": [ "TRANSPARENT", "NOITEM", "FLAMMABLE", "SUPPORTS_ROOF", "MOUNTABLE", "CONNECT_TO_WALL", "THIN_OBSTACLE" ],
+    "flags": [
+      "TRANSPARENT",
+      "NOITEM",
+      "FLAMMABLE",
+      "SUPPORTS_ROOF",
+      "MOUNTABLE",
+      "CONNECT_TO_WALL",
+      "THIN_OBSTACLE",
+      "SMALL_PASSAGE"
+    ],
     "bash": {
       "str_min": 10,
       "str_max": 70,
@@ -371,7 +398,7 @@
       "ter_set": "t_window_empty",
       "items": [ { "item": "glass_shard", "count": [ 6, 10 ] } ]
     },
-    "flags": [ "TRANSPARENT", "SHARP", "FLAMMABLE", "NOITEM", "MOUNTABLE", "CONNECT_TO_WALL" ]
+    "flags": [ "TRANSPARENT", "SHARP", "FLAMMABLE", "NOITEM", "MOUNTABLE", "CONNECT_TO_WALL", "SMALL_PASSAGE" ]
   },
   {
     "type": "terrain",

diff --git a/data/json/item_category.json b/data/json/item_category.json
@@ -3,54 +3,63 @@
     "id": "guns",
     "type": "ITEM_CATEGORY",
     "name": "GUNS",
+    "zone": "LOOT_GUNS",
     "sort_rank": -23
   },
   {
     "id": "magazines",
     "type": "ITEM_CATEGORY",
     "name": "MAGAZINES",
+    "zone": "LOOT_MAGAZINES",
     "sort_rank": -22
   },
   {
     "id": "ammo",
     "type": "ITEM_CATEGORY",
     "name": "AMMO",
+    "zone": "LOOT_AMMO",
     "sort_rank": -21
   },
   {
     "id": "weapons",
     "type": "ITEM_CATEGORY",
     "name": "WEAPONS",
+    "zone": "LOOT_WEAPONS",
     "sort_rank": -20
   },
   {
     "id": "tools",
     "type": "ITEM_CATEGORY",
     "name": "TOOLS",
+    "zone": "LOOT_TOOLS",
     "sort_rank": -19
   },
   {
     "id": "clothing",
     "type": "ITEM_CATEGORY",
     "name": "CLOTHING",
+    "//": "zone is hardcoded due to filthy clothing",
     "sort_rank": -18
   },
   {
     "id": "food",
     "type": "ITEM_CATEGORY",
     "name": "FOOD",
+    "//": "zone is hardcoded",
     "sort_rank": -17
   },
   {
     "id": "drugs",
     "type": "ITEM_CATEGORY",
     "name": "DRUGS",
+    "zone": "LOOT_DRUGS",
     "sort_rank": -16
   },
   {
     "id": "books",
     "type": "ITEM_CATEGORY",
     "name": "BOOKS",
+    "zone": "LOOT_BOOKS",
     "sort_rank": -15
   },
   {
@@ -63,66 +72,77 @@
     "id": "mods",
     "type": "ITEM_CATEGORY",
     "name": "MODS",
+    "zone": "LOOT_MODS",
     "sort_rank": -13
   },
   {
     "id": "mutagen",
     "type": "ITEM_CATEGORY",
     "name": "MUTAGENS",
+    "zone": "LOOT_MUTAGENS",
     "sort_rank": -12
   },
   {
     "id": "bionics",
     "type": "ITEM_CATEGORY",
     "name": "BIONICS",
+    "zone": "LOOT_BIONICS",
     "sort_rank": -12
   },
   {
     "id": "veh_parts",
     "type": "ITEM_CATEGORY",
     "name": "VEHICLE PARTS",
+    "zone": "LOOT_VEHICLE_PARTS",
     "sort_rank": -10
   },
   {
     "id": "other",
     "type": "ITEM_CATEGORY",
     "name": "OTHER",
+    "zone": "LOOT_OTHER",
     "sort_rank": -9
   },
   {
     "id": "fuel",
     "type": "ITEM_CATEGORY",
     "name": "FUEL",
+    "zone": "LOOT_FUEL",
     "sort_rank": -8
   },
   {
     "id": "seeds",
     "type": "ITEM_CATEGORY",
     "name": "SEEDS",
+    "zone": "LOOT_SEEDS",
     "sort_rank": -7
   },
   {
     "id": "chems",
     "type": "ITEM_CATEGORY",
     "name": "CHEMICAL STUFF",
+    "zone": "LOOT_CHEMICAL",
     "sort_rank": 5
   },
   {
     "id": "spare_parts",
     "type": "ITEM_CATEGORY",
     "name": "SPARE PARTS",
+    "zone": "LOOT_SPARE_PARTS",
     "sort_rank": 8
   },
   {
     "id": "artifacts",
     "type": "ITEM_CATEGORY",
     "name": "ARTIFACTS",
+    "zone": "LOOT_ARTIFACTS",
     "sort_rank": 10
   },
   {
     "id": "armor",
     "type": "ITEM_CATEGORY",
     "name": "ARMOR",
+    "//": "zone is hardcoded due to filthy clothing",
     "sort_rank": 20
   },
   {

diff --git a/data/json/recipes/ammo/pistol.json b/data/json/recipes/ammo/pistol.json
@@ -287,6 +287,22 @@
     "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_380", 1 ] ],
     "components": [ [ [ "chem_black_powder", 3 ] ], [ [ "copper", 1 ] ] ]
   },
+  {
+    "result": "bp_57mm",
+    "type": "recipe",
+    "category": "CC_AMMO",
+    "subcategory": "CSC_AMMO_PISTOL",
+    "skill_used": "fabrication",
+    "difficulty": 3,
+    "skills_required": [ "gun", 1 ],
+    "time": "2 m",
+    "batch_time_factors": [ 60, 5 ],
+    "book_learn": [ [ "manual_pistol", 2 ], [ "manual_smg", 2 ], [ "recipe_bullets", 3 ] ],
+    "charges": 1,
+    "reversible": true,
+    "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_57", 1 ] ],
+    "components": [ [ [ "chem_black_powder", 3 ] ], [ [ "copper", 1 ] ] ]
+  },
   {
     "result": "36navy",
     "type": "recipe",

diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json
@@ -3445,7 +3445,7 @@
     "autolearn": true,
     "qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ],
     "tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ], [ [ "forge", 50 ], [ "oxy_torch", 10 ] ] ],
-    "components": [ [ [ "scrap_copper", 2 ], [ "copper", 200 ] ] ]
+    "components": [ [ [ "scrap_copper", 7 ], [ "copper", 175 ] ] ]
   },
   {
     "type": "recipe",

diff --git a/data/json/requirements/ammo.json b/data/json/requirements/ammo.json
@@ -22,6 +22,12 @@
     "//": "Components required for 380 ammo",
     "components": [ [ [ "380_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ] ]
   },
+  {
+    "id": "ammo_57",
+    "type": "requirement",
+    "//": "Components required for 57 ammo",
+    "components": [ [ [ "57mm_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ] ]
+  },
   {
     "id": "ammo_shot",
     "type": "requirement",

diff --git a/data/mods/Magiclysm/Spells/earthshaper.json b/data/mods/Magiclysm/Spells/earthshaper.json
@@ -272,5 +272,26 @@
     "energy_source": "MANA",
     "flags": [ "VERBAL", "SOMATIC", "LOUD" ],
     "extra_effects": [ { "id": "lava_bomb_shrapnel" }, { "id": "lava_bomb_heat" }, { "id": "lava_bomb_ter" } ]
+  },
+  {
+    "id": "clairvoyance",
+    "type": "SPELL",
+    "name": "Clairvoyance",
+    "description": "You close your eyes and the earth surrenders its secrets to you.",
+    "effect": "target_attack",
+    "valid_targets": [ "ally", "hostile", "ground" ],
+    "flags": [ "SOMATIC", "VERBAL", "IGNORE_WALLS" ],
+    "max_level": 20,
+    "min_aoe": 4,
+    "max_aoe": 13,
+    "aoe_increment": 0.5,
+    "spell_class": "EARTHSHAPER",
+    "base_casting_time": 350,
+    "base_energy_cost": 750,
+    "energy_source": "MANA",
+    "difficulty": 4,
+    "field_id": "fd_clairvoyant",
+    "min_field_intensity": 1,
+    "max_field_intensity": 1
   }
 ]
diff --git a/data/mods/Magiclysm/Spells/technomancer.json b/data/mods/Magiclysm/Spells/technomancer.json
@@ -320,5 +320,32 @@
     "min_duration": 3000,
     "max_duration": 6000,
     "duration_increment": 200
+  },
+  {
+    "type": "SPELL",
+    "name": "X-ray Vision",
+    "id": "x-ray",
+    "description": "You fire a cone of X-rays that magically allow you to see that area for a short time.",
+    "valid_targets": [ "hostile", "ground", "ally" ],
+    "flags": [ "CONCENTRATE", "IGNORE_WALLS" ],
+    "effect": "cone_attack",
+    "field_id": "fd_clairvoyant",
+    "min_field_intensity": 1,
+    "max_field_intensity": 1,
+    "difficulty": 6,
+    "min_range": 5,
+    "max_range": 20,
+    "range_increment": 0.75,
+    "max_level": 20,
+    "min_aoe": 15,
+    "max_aoe": 60,
+    "aoe_increment": 1.5,
+    "min_duration": 0,
+    "max_duration": 900,
+    "duration_increment": 45,
+    "base_casting_time": 175,
+    "base_energy_cost": 550,
+    "energy_source": "BIONIC",
+    "spell_class": "TECHNOMANCER"
   }
 ]
diff --git a/data/mods/Magiclysm/field.json b/data/mods/Magiclysm/field.json
@@ -0,0 +1,15 @@
+[
+  {
+    "id": "fd_clairvoyant",
+    "type": "field_type",
+    "intensity_levels": [ { "name": "clairvoyance", "sym": "8", "dangerous": false } ],
+    "decay_amount_factor": 5,
+    "gas_absorption_factor": 12,
+    "dirty_transparency_cache": true,
+    "outdoor_age_speedup": "0 turns",
+    "priority": 8,
+    "half_life": "1 seconds",
+    "phase": "solid",
+    "display_field": false
+  }
+]
diff --git a/data/mods/Magiclysm/itemgroups/spellbooks.json b/data/mods/Magiclysm/itemgroups/spellbooks.json
@@ -24,6 +24,7 @@
       [ "spell_scroll_taze", 25 ],
       [ "spell_scroll_laze", 25 ],
       [ "spell_scroll_lightning_blast", 20 ],
+      [ "spell_scroll_x-ray", 30 ],
       [ "spell_scroll_necrotic_gaze", 50 ]
     ]
   },
@@ -41,6 +42,7 @@
       [ "spell_scroll_druid_naturebow1", 20 ],
       [ "spell_scroll_seismic_stomp", 20 ],
       [ "spell_scroll_eshaper_shardspray", 25 ],
+      [ "spell_scroll_clairvoyance", 30 ],
       [ "spell_scroll_point_flare", 50 ],
       [ "spell_scroll_ice_spike", 50 ],
       [ "spell_scroll_burning_hands", 50 ],

diff --git a/data/mods/Magiclysm/items/spell_scrolls.json b/data/mods/Magiclysm/items/spell_scrolls.json
@@ -618,6 +618,22 @@
     "description": "You summon a gift of the earth which will purify water.  Greater levels yield greater numbers of seeds.",
     "use_action": { "type": "learn_spell", "spells": [ "purify_seed" ] }
   },
+  {
+    "type": "GENERIC",
+    "copy-from": "spell_scroll",
+    "id": "spell_scroll_x-ray",
+    "name": "Scroll of X-ray Vision",
+    "description": "You fire a cone of X-rays that magically allow you to see that area for a short time.",
+    "use_action": { "type": "learn_spell", "spells": [ "x-ray" ] }
+  },
+  {
+    "type": "GENERIC",
+    "copy-from": "spell_scroll",
+    "id": "spell_scroll_clairvoyance",
+    "name": "Scroll of Clairvoyance",
+    "description": "You close your eyes and the earth surrenders its secrets to you.",
+    "use_action": { "type": "learn_spell", "spells": [ "clairvoyance" ] }
+  },
   {
     "type": "GENERIC",
     "copy-from": "spell_scroll",

diff --git a/doc/JSON_FLAGS.md b/doc/JSON_FLAGS.md
@@ -576,6 +576,7 @@ List of known flags, used in both `terrain.json` and `furniture.json`.
 - ```SHARP``` May do minor damage to players/monsters passing through it.
 - ```SHORT``` Feature too short to collide with vehicle protrusions. (mirrors, blades).
 - ```SIGN``` Show written message on examine.
+- ```SMALL_PASSAGE``` This terrain or furniture is too small for large or huge creatures to pass through.
 - ```SUPPORTS_ROOF``` Used as a boundary for roof construction.
 - ```SUPPRESS_SMOKE``` Prevents smoke from fires; used by ventilated wood stoves, etc.
 - ```SWIMMABLE``` Player and monsters can swim through it.

diff --git a/src/activity_item_handling.cpp b/src/activity_item_handling.cpp
@@ -2273,7 +2273,7 @@ void activity_on_turn_move_loot( player_activity &act, player &p )
     }
 
     // If we got here without restarting the activity, it means we're done
-    add_msg( m_info, _( "%s sorted out every item possible." ), p.disp_name() );
+    add_msg( m_info, _( "%s sorted out every item possible." ), p.disp_name( false, true ) );
     if( p.is_npc() ) {
         npc *guy = dynamic_cast<npc *>( &p );
         guy->revert_after_activity();