Slight rebalancing, adds Power Armor Interface Mk. II

wito · Jun 8, 2013 · 1ba2641b5bf8edc1c90c57980575e90ce3e9cf10 · 1ba2641
1 parent c8ecb7b
commit 1ba2641b5bf8edc1c90c57980575e90ce3e9cf10
Unified Split

Showing with 50 additions and 8 deletions.

+5 −0 bionics.cpp

+42 −6 data/raw/recipes.json

+1 −0 itypedef.cpp

+2 −2 player.cpp
diff --git a/bionics.cpp b/bionics.cpp
@@ -1002,6 +1002,11 @@ the movements of creatures below the ground.");
    bionics["bio_power_armor_interface"] = new bionic_data("Power Armor Interface", false, true, 1, 10, "\
 Interfaces your power system with the internal charging port on suits of power armor.");
+  
+    bionics["bio_power_armor_interface_mkII"] = new bionic_data("Power Armor Interface Mk. II", false, true, 1, 50, "\
+  
+Interfaces your power system with the internal charging port on suits of power armor.\n\
+  
+The Mk. II was designed by DoubleTech Inc., to meet the popularity of the Mk. II\n\
+  
+power armor series.");
+  
+
    //Fault Bionics from here on out.
    bionics["bio_dis_shock"] = new bionic_data("Electrical Discharge", false, false, 0, 0, "\
 A malfunctioning bionic which occasionally discharges electricity through\n\

diff --git a/data/raw/recipes.json b/data/raw/recipes.json
@@ -4445,6 +4445,42 @@
        },
+  
+        {
+  
+            "result": "bio_power_armor_interface_mkII",
+  
+            "category": "CC_ELECTRONIC",
+  
+            "skill_pri": "electronics",
+  
+            "difficulty": 9,
+  
+            "time": 50000,
+  
+            "reversible": true,
+  
+            "autolearn": true,
+  
+            "tools": [
+  
+                         [
+  
+                             ["screwdriver", -1],
+  
+                             ["toolset", -1]
+  
+                         ],
+  
+                         [
+  
+                             ["soldering_iron", 20],
+  
+                             ["toolset", 2]
+  
+                         ]
+  
+                     ],
+  
+            "components": [
+  
+                              [
+  
+                                  ["power_supply", 5]
+  
+                              ],
+  
+                              [
+  
+                                  ["amplifier", 3]
+  
+                              ],
+  
+                              [
+  
+                                  ["plut_cell", 5]
+  
+                              ],
+  
+                              [
+  
+                                  ["burnt_out_bionic", 1],
+  
+                                  ["processor", 2]
+  
+                              ]
+  
+                          ]
+  
+        },
+  
+
+  
+
        {
            "result": "bio_evap",
            "category": "CC_ELECTRONIC",
@@ -4483,11 +4519,11 @@
            "result": "bio_laser",
            "category": "CC_ELECTRONIC",
            "skill_pri": "electronics",
-  
-            "difficulty": 7,
+  
+            "difficulty": 9,
            "time": 50000,
            "reversible": true,
            "autolearn": false,
-  
-            "decomp_learn": 5,
+  
+            "decomp_learn": 7,
            "tools": [
                         [
                             ["screwdriver", -1],
@@ -4594,7 +4630,7 @@
            "result": "bio_armor_head",
            "category": "CC_ELECTRONIC",
            "skill_pri": "electronics",
-  
-            "difficulty": 7,
+  
+            "difficulty": 6,
            "time": 50000,
            "reversible": true,
            "autolearn": true,
@@ -4633,7 +4669,7 @@
            "result": "bio_armor_arms",
            "category": "CC_ELECTRONIC",
            "skill_pri": "electronics",
-  
-            "difficulty": 7,
+  
+            "difficulty": 6,
            "time": 50000,
            "reversible": true,
            "autolearn": true,
@@ -4672,7 +4708,7 @@
            "result": "bio_armor_torso",
            "category": "CC_ELECTRONIC",
            "skill_pri": "electronics",
-  
-            "difficulty": 7,
+  
+            "difficulty": 6,
            "time": 50000,
            "reversible": true,
            "autolearn": true,
@@ -4711,7 +4747,7 @@
            "result": "bio_armor_legs",
            "category": "CC_ELECTRONIC",
            "skill_pri": "electronics",
-  
-            "difficulty": 7,
+  
+            "difficulty": 6,
            "time": 50000,
            "reversible": true,
            "autolearn": true,

diff --git a/itypedef.cpp b/itypedef.cpp
@@ -367,6 +367,7 @@ BIO_SINGLE("bio_laser", 2, 7200, c_red, 5);
 BIO_SINGLE("bio_emp", 2, 7200, c_red, 5);
 // power armor
 BIO_SINGLE("bio_power_armor_interface", 20, 1200, c_yellow, 1);
+  
+BIO_SINGLE("bio_power_armor_interface_mkII", 8, 10000, c_yellow, 8);
 SOFTWARE("software_useless", "misc software", 300, SW_USELESS, 0, "\
 A miscellaneous piece of hobby software. Probably useless.");

diff --git a/player.cpp b/player.cpp
@@ -2481,7 +2481,7 @@ bool player::in_climate_control(game *g)
    for (int i = 0; i < worn.size(); i++)
    {
        if ((dynamic_cast<it_armor*>(worn[i].type))->is_power_armor() &&
-  
-           (has_active_item("UPS_on") || has_active_bionic("bio_power_armor_interface")))
+  
+            (has_active_item("UPS_on") || has_active_bionic("bio_power_armor_interface") || has_active_bionic("bio_power_armor_interface_mkII")))
        {
            return true;
        }
@@ -6487,7 +6487,7 @@ int player::encumb(body_part bp, int &layers, int &armorenc)
        if (armor->covers & mfb(bp))
        {
-  
-            if (armor->is_power_armor() && (has_active_item("UPS_on") || has_active_bionic("bio_power_armor_interface")))
+  
+           if (armor->is_power_armor() && (has_active_item("UPS_on") || has_active_bionic("bio_power_armor_interface") || has_active_bionic("bio_power_armor_interface_mkII")))
            {
                armorenc += armor->encumber - 4;
            }