Remove laserturret

CleverRaven · May 19, 2020 · affa0bd · affa0bd
1 parent f8f9f52
commit affa0bd
Show file tree

Hide file tree

Showing 12 changed files with 79 additions and 137 deletions.
diff --git a/data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_advtech.json b/data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_advtech.json
@@ -83,12 +83,6 @@
     "subtype": "distribution",
     "entries": [ { "item": "9mm", "prob": 8 } ]
   },
-  {
-    "type": "item_group",
-    "id": "laserturret",
-    "subtype": "distribution",
-    "entries": [ { "item": "cerberus_laser", "prob": 1 } ]
-  },
   {
     "type": "item_group",
     "id": "turret_rifle",

diff --git a/data/json/itemgroups/main.json b/data/json/itemgroups/main.json
@@ -15,7 +15,6 @@
       { "item": "bio_blade", "prob": 10 },
       { "item": "bio_speed", "prob": 10 },
       { "item": "bot_c4_hack", "prob": 30 },
-      { "item": "bot_laserturret", "prob": 20 },
       { "item": "c4", "prob": 50 },
       { "item": "canister_goo", "prob": 80 },
       { "item": "cleansuit", "prob": 100 },
@@ -87,7 +86,6 @@
     "subtype": "distribution",
     "entries": [
       { "item": "12mm", "prob": 10 },
-      { "item": "bot_laserturret", "prob": 10 },
       { "item": "alloy_plate", "prob": 10 },
       { "item": "plasma_gun", "prob": 10 },
       { "item": "can_sealer", "prob": 10 },

diff --git a/data/json/itemgroups/military.json b/data/json/itemgroups/military.json
@@ -259,7 +259,6 @@
       { "item": "match_trigger", "prob": 2 },
       { "item": "grapnel", "prob": 1 },
       { "item": "bucket", "prob": 4 },
-      { "item": "bot_laserturret", "prob": 1 },
       { "item": "sheath", "prob": 13 },
       { "item": "bootsheath", "prob": 8 },
       { "item": "toolbox", "prob": 1 },

diff --git a/data/json/items/corpses/inactive_bots.json b/data/json/items/corpses/inactive_bots.json
@@ -134,29 +134,6 @@
       "skill2": "computer"
     }
   },
-  {
-    "id": "bot_laserturret",
-    "type": "TOOL",
-    "name": { "str": "inactive laser turret" },
-    "description": "This is an inactive laser turret.  Using this item involves turning it on and placing it on the ground, where it will attach itself.  If reprogrammed and rewired successfully the turret will identify you as a friendly, and attack all enemies with its revolving laser cannons.  It requires sunlight in order to fire.",
-    "weight": "40750 g",
-    "volume": "30 L",
-    "price": 600000,
-    "price_postapoc": 12000,
-    "to_hit": -3,
-    "bashing": 8,
-    "material": [ "steel", "plastic" ],
-    "symbol": ";",
-    "color": "white",
-    "use_action": {
-      "type": "place_monster",
-      "monster_id": "mon_laserturret",
-      "difficulty": 6,
-      "moves": 100,
-      "skill1": "electronics",
-      "skill2": "computer"
-    }
-  },
   {
     "id": "bot_antimateriel",
     "type": "TOOL",

diff --git a/data/json/items/generic.json b/data/json/items/generic.json
@@ -2933,15 +2933,6 @@
     "weight": "100 kg",
     "copy-from": "broken_turret"
   },
-  {
-    "type": "GENERIC",
-    "id": "broken_laserturret",
-    "symbol": ",",
-    "color": "green",
-    "name": { "str": "broken laser turret" },
-    "weight": "110 kg",
-    "copy-from": "broken_turret"
-  },
   {
     "type": "GENERIC",
     "id": "broken_secubot",

diff --git a/data/json/items/obsolete.json b/data/json/items/obsolete.json
@@ -2679,5 +2679,37 @@
       [ "underbarrel", 1 ]
     ],
     "magazines": [ [ "545x39", [ "ak74mag", "rpk74mag" ] ] ]
+  },
+  {
+    "id": "bot_laserturret",
+    "type": "TOOL",
+    "name": { "str": "inactive laser turret" },
+    "description": "This is an inactive laser turret.  Using this item involves turning it on and placing it on the ground, where it will attach itself.  If reprogrammed and rewired successfully the turret will identify you as a friendly, and attack all enemies with its revolving laser cannons.  It requires sunlight in order to fire.",
+    "weight": "40750 g",
+    "volume": "30 L",
+    "price": 600000,
+    "price_postapoc": 12000,
+    "to_hit": -3,
+    "bashing": 8,
+    "material": [ "steel", "plastic" ],
+    "symbol": ";",
+    "color": "white",
+    "use_action": {
+      "type": "place_monster",
+      "monster_id": "mon_laserturret",
+      "difficulty": 6,
+      "moves": 100,
+      "skill1": "electronics",
+      "skill2": "computer"
+    }
+  },
+  {
+    "type": "GENERIC",
+    "id": "broken_laserturret",
+    "symbol": ",",
+    "color": "green",
+    "name": { "str": "broken laser turret" },
+    "weight": "110 kg",
+    "copy-from": "broken_turret"
   }
 ]
diff --git a/data/json/monsters/obsolete.json b/data/json/monsters/obsolete.json
@@ -367,5 +367,42 @@
     "special_attacks": [ [ "CHICKENBOT", 4 ] ],
     "death_function": [ "BROKEN" ],
     "flags": [ "SEES", "HEARS", "BASHES", "NO_BREATHE", "ELECTRONIC", "PRIORITIZE_TARGETS", "DROPS_AMMO" ]
+  },
+  {
+    "id": "mon_laserturret",
+    "type": "MONSTER",
+    "name": { "str": "laser turret" },
+    "description": "The TX-5LR Cerberus is an upgrade to its predecessors.  It features a state of the art revolving laser cannon system with three barrels that charge from solar cells embedded in its hull.",
+    "default_faction": "military",
+    "species": [ "ROBOT" ],
+    "diff": 20,
+    "volume": "30000 ml",
+    "weight": "40750 g",
+    "hp": 30,
+    "speed": 100,
+    "material": [ "steel" ],
+    "symbol": "2",
+    "color": "white",
+    "aggression": 100,
+    "morale": 100,
+    "armor_bash": 14,
+    "armor_cut": 16,
+    "armor_bullet": 13,
+    "vision_day": 50,
+    "revert_to_itype": "bot_laserturret",
+    "special_attacks": [
+      {
+        "type": "gun",
+        "cooldown": 1,
+        "gun_type": "laser_cannon",
+        "fake_skills": [ [ "gun", 4 ], [ "rifle", 8 ] ],
+        "ranges": [ [ 0, 30, "DEFAULT" ] ],
+        "require_sunlight": true
+      }
+    ],
+    "special_when_hit": [ "RETURN_FIRE", 100 ],
+    "death_drops": {  },
+    "death_function": [ "BROKEN" ],
+    "flags": [ "SEES", "NOHEAD", "ELECTRONIC", "COLDPROOF", "IMMOBILE", "NO_BREATHE" ]
   }
 ]
diff --git a/data/json/monsters/turrets.json b/data/json/monsters/turrets.json
@@ -75,43 +75,6 @@
     "death_function": [ "FOCUSEDBEAM" ],
     "flags": [ "SEES", "NOHEAD", "ELECTRONIC", "COLDPROOF", "IMMOBILE", "NO_BREATHE", "PRIORITIZE_TARGETS" ]
   },
-  {
-    "id": "mon_laserturret",
-    "type": "MONSTER",
-    "name": { "str": "laser turret" },
-    "description": "The TX-5LR Cerberus is an upgrade to its predecessors.  It features a state of the art revolving laser cannon system with three barrels that charge from solar cells embedded in its hull.",
-    "default_faction": "military",
-    "species": [ "ROBOT" ],
-    "diff": 20,
-    "volume": "30000 ml",
-    "weight": "40750 g",
-    "hp": 30,
-    "speed": 100,
-    "material": [ "steel" ],
-    "symbol": "2",
-    "color": "white",
-    "aggression": 100,
-    "morale": 100,
-    "armor_bash": 14,
-    "armor_cut": 16,
-    "armor_bullet": 13,
-    "vision_day": 50,
-    "revert_to_itype": "bot_laserturret",
-    "special_attacks": [
-      {
-        "type": "gun",
-        "cooldown": 1,
-        "gun_type": "laser_cannon",
-        "fake_skills": [ [ "gun", 4 ], [ "rifle", 8 ] ],
-        "ranges": [ [ 0, 30, "DEFAULT" ] ],
-        "require_sunlight": true
-      }
-    ],
-    "special_when_hit": [ "RETURN_FIRE", 100 ],
-    "death_drops": {  },
-    "death_function": [ "BROKEN" ],
-    "flags": [ "SEES", "NOHEAD", "ELECTRONIC", "COLDPROOF", "IMMOBILE", "NO_BREATHE" ]
-  },
   {
     "id": "mon_turret_bmg",
     "type": "MONSTER",

diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json
@@ -948,28 +948,6 @@
       [ [ "copbot_chassis", 1 ] ]
     ]
   },
-  {
-    "result": "broken_laserturret",
-    "type": "uncraft",
-    "skill_used": "electronics",
-    "difficulty": 4,
-    "time": "1 h",
-    "using": [ [ "soldering_standard", 10 ] ],
-    "qualities": [ { "id": "SCREW", "level": 1 } ],
-    "components": [
-      [ [ "ai_module", 1 ] ],
-      [ [ "gun_module", 1 ] ],
-      [ [ "targeting_module", 1 ] ],
-      [ [ "identification_module", 1 ] ],
-      [ [ "sensor_module", 1 ] ],
-      [ [ "laser_cannon", 1 ] ],
-      [ [ "medium_storage_battery", 1 ] ],
-      [ [ "solar_cell", 4 ] ],
-      [ [ "power_supply", 1 ] ],
-      [ [ "robot_controls", 1 ] ],
-      [ [ "turret_chassis", 1 ] ]
-    ]
-  },
   {
     "result": "broken_science_bot",
     "type": "uncraft",

diff --git a/data/json/recipes/recipe_electronics.json b/data/json/recipes/recipe_electronics.json
@@ -1294,39 +1294,6 @@
       [ [ "spring", 2 ] ]
     ]
   },
-  {
-    "type": "recipe",
-    "result": "bot_laserturret",
-    "category": "CC_ELECTRONIC",
-    "subcategory": "CSC_ELECTRONIC_OTHER",
-    "skill_used": "electronics",
-    "skills_required": [ [ "mechanics", 8 ], [ "computer", 5 ] ],
-    "difficulty": 8,
-    "time": "30 m",
-    "reversible": true,
-    "decomp_learn": 9,
-    "book_learn": [ [ "recipe_lab_elec", 8 ] ],
-    "using": [ [ "soldering_standard", 14 ] ],
-    "qualities": [
-      { "id": "SCREW", "level": 1 },
-      { "id": "SCREW_FINE", "level": 1 },
-      { "id": "WRENCH", "level": 2 },
-      { "id": "WRENCH_FINE", "level": 1 }
-    ],
-    "components": [
-      [ [ "ai_module", 1 ] ],
-      [ [ "gun_module", 1 ] ],
-      [ [ "targeting_module", 1 ] ],
-      [ [ "identification_module", 1 ] ],
-      [ [ "sensor_module", 1 ] ],
-      [ [ "laser_cannon", 1 ] ],
-      [ [ "medium_storage_battery", 1 ] ],
-      [ [ "solar_cell", 4 ] ],
-      [ [ "power_supply", 1 ] ],
-      [ [ "robot_controls", 1 ] ],
-      [ [ "turret_chassis", 1 ] ]
-    ]
-  },
   {
     "type": "recipe",
     "result": "bot_rifleturret",

diff --git a/data/json/recipes/recipe_obsolete.json b/data/json/recipes/recipe_obsolete.json
@@ -2469,5 +2469,15 @@
     "type": "recipe",
     "result": "control_laptop",
     "obsolete": true
+  },
+  {
+    "type": "recipe",
+    "result": "bot_laserturret",
+    "obsolete": true
+  },
+  {
+    "type": "recipe",
+    "result": "broken_laserturret",
+    "obsolete": true
   }
 ]
diff --git a/src/iuse_actor.cpp b/src/iuse_actor.cpp
@@ -936,10 +936,6 @@ int place_monster_iuse::use( player &p, item &it, bool, const tripoint & ) const
         }
         newmon.friendly = -1;
     }
-    // TODO: add a flag instead of monster id or something?
-    if( newmon.type->id == mtype_id( "mon_laserturret" ) && !g->is_in_sunlight( newmon.pos() ) ) {
-        p.add_msg_if_player( _( "A flashing LED on the laser turret appears to indicate low light." ) );
-    }
     return 1;
 }