diff --git a/player variables documentation - Pregmod.txt b/player variables documentation - Pregmod.txt
index 94b37177b7ca67cbb31e17bbbeb7f03a2aec84c1..0c466759cd63dcc57b771f4e6c4951d6d9f90d5c 100644
--- a/player variables documentation - Pregmod.txt
+++ b/player variables documentation - Pregmod.txt
@@ -230,8 +230,8 @@ your warfare skill
accepts int between -100 and 100
Hacking:
-your gacking skill
-accepts int between -100 and >= 100
+your hacking skill
+accepts int between -100 and 100
slaving:
diff --git a/src/js/economyJS.tw b/src/js/economyJS.tw
index 9e5b7f75b9dae50d9758293cee0ade164625f9c9..325af134220356c5932c391b7dd55912a8aaf211 100644
--- a/src/js/economyJS.tw
+++ b/src/js/economyJS.tw
@@ -7,7 +7,7 @@ window.Job = Object.freeze({
SERVANT: 'work as a servant', SERVER: 'be a servant', STEWARD: 'be the Stewardess', CLUB: 'serve in the club', DJ: 'be the DJ',
JAIL: 'be confined in the cellblock', WARDEN: 'be the Wardeness', CLINIC: 'get treatment in the clinic', NURSE: 'be the Nurse',
HGTOY: 'live with your Head Girl', SCHOOL: 'learn in the schoolroom', TEACHER: 'be the Schoolteacher', SPA: 'rest in the spa', ATTEND: 'be the Attendant'});
-window.PersonalAttention = Object.freeze({TRADE: 'trading', WAR: 'warfare', SLAVEING: 'slaving', ENGINEERING: 'engineering', MEDICINE: 'medicine', MAID: 'upkeep'});
+window.PersonalAttention = Object.freeze({TRADE: 'trading', WAR: 'warfare', SLAVEING: 'slaving', ENGINEERING: 'engineering', MEDICINE: 'medicine', MAID: 'upkeep', HACKING: 'hacking'});
window.getCost = function(array) {
var rulesCost = State.variables.rulesCost;
@@ -269,7 +269,7 @@ window.getCost = function(array) {
costs += 10000*State.variables.AgeEffectOnTrainerPricingPC;
} else if(State.variables.personalAttention === PersonalAttention.MEDICINE) {
costs += 10000*State.variables.AgeEffectOnTrainerPricingPC;
- } else if(State.variables.personalAttention === PersonalAttention.hacking) {
+ } else if(State.variables.personalAttention === PersonalAttention.HACKING) {
costs += 10000*State.variables.AgeEffectOnTrainerPricingPC;
}
}
diff --git a/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw b/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw
index b69f774507011dc0960d79568b77d979c4eefd71..046ad8e33a6f74d4f7db1142e2733f36b2500986 100755
--- a/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw
+++ b/src/pregmod/SecForceEX/SpecialForceUpgradeDec.tw
@@ -33,13 +33,13 @@
<br>After pooling resources between several departmental R&D teams, $securityForceName now has a faster and much more efficient custom network.
<<case 14>>
Has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, tri barreled electromagnetic railgun artillery 406 cm pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful arcology wide electromagnetic forcefield has been installed, giving $securityForceName an immense superiority in local firepower.
- <br>After pooling resources between several departmental R&D teams, $securityForceName now has a faster and much more efficient custom network.<br>'Borowed' old world designs for a kill house.
+ <br>After pooling resources between several departmental R&D teams, $securityForceName now has a faster and much more efficient custom network. <br>'Borowed' old world designs for a kill house.
<<case 15>>
Has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, tri barreled electromagnetic railgun artillery 406 cm pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful arcology wide electromagnetic forcefield has been installed, giving $securityForceName an immense superiority in local firepower.
- <br>After pooling resources between several departmental R&D teams, $securityForceName now has a faster and much more efficient custom network.<br>Added electronics to the kill house.
+ <br>After pooling resources between several departmental R&D teams, $securityForceName now has a faster and much more efficient custom network. <br>Added electronics to the kill house.
<<case 16>>
Has (mostly) taken on the appearance of a professional military installation, with clearly defined soldier and logistical areas, dedicated support and recreation facilities, and advanced command and control apparatus. As final measures, quad heavy, long range, tri barreled electromagnetic railgun artillery 406 cm pieces have been installed in fortified EMP/jammer resistant casemates along the aerial launch pads and a powerful arcology wide electromagnetic forcefield has been installed, giving $securityForceName an immense superiority in local firepower.
- <br>After pooling resources between several departmental R&D teams, $securityForceName now has a faster and much more efficient custom network.<br>Added VR support to the kill house.
+ <br>After pooling resources between several departmental R&D teams, $securityForceName now has a faster and much more efficient custom network. <br>Added VR support to the kill house.
<</switch>>
<br><br>
@@ -60,7 +60,7 @@
<<if $FacilitySupport == 1>>
<br><br>
''$facilitysupportName:''
-<<if $LieutenantColonel == 2>><<SlaveFullName $LieutenantColonel>> is the Lieutenant Colonel of $securityForceName, primarily in charge of $FacilitySupportName.<</if>> <<if $FacilitySupportSlaves > 0>>There are $FacilitySupportSlaves slaves serving in $FacilitySupportName.<</if>> The <<if $FacilitySupportUpgrade == 3>>quantum teleportation system greatly improves efficiency<<elseif $FacilitySupportUpgrade == 2>>rapid tube system somewhat improves efficiency<<elseif $FacilitySupportUpgrade == 1>>specialized pathways slightly improves efficiency<<else>>general pathways does nothing to improve efficiency<</if>>.
+<<if $LieutenantColonel == 2>><<SlaveFullName $LieutenantColonel>> is the Lieutenant Colonel of $securityForceName, primarily in charge of $FacilitySupportName. <</if>> <<if $FacilitySupportSlaves > 0>>There are $FacilitySupportSlaves slaves serving in $FacilitySupportName. <</if>> The <<if $FacilitySupportUpgrade == 3>>quantum teleportation system greatly improves efficiency<<elseif $FacilitySupportUpgrade == 2>>rapid tube system somewhat improves efficiency<<elseif $FacilitySupportUpgrade == 1>>specialized pathways slightly improves efficiency<<else>>general pathways does nothing to improve efficiency<</if>>.
<br><<link "Enter the building then send a slave to serve in the HQ and facilities of $securityForceName">>
<<goto "FacilitySupport">>
<</link>>
@@ -186,11 +186,11 @@
<<case 7>>
Upgraded its attack VTOLs for enhanced lethality/speed/armour, and further improved the armour and armament of its transport VTOLs, ensuring that the airfleet of $securityForceName is amongst the most capable still in operation in the area.
<<case 8>>
- Upgraded its attack VTOLs for enhanced lethality/speed/armour, and further improved the armour and armament of its transport VTOLs, ensuring that the airfleet of $securityForceName is amongst the most capable still in operation in the area.<br>Also It now possesses a basic old world bomber.
+ Upgraded its attack VTOLs for enhanced lethality/speed/armour, and further improved the armour and armament of its transport VTOLs, ensuring that the airfleet of $securityForceName is amongst the most capable still in operation in the area. <br>Also It now possesses a basic old world bomber.
<<case 9>>
- Upgraded its attack VTOLs for enhanced lethality/speed/armour, and further improved the armour and armament of its transport VTOLs, ensuring that the airfleet of $securityForceName is amongst the most capable still in operation in the area.<br>Improved the bomber's engines.
+ Upgraded its attack VTOLs for enhanced lethality/speed/armour, and further improved the armour and armament of its transport VTOLs, ensuring that the airfleet of $securityForceName is amongst the most capable still in operation in the area. <br>Improved the bomber's engines.
<<case 10>>
- Upgraded its attack VTOLs for enhanced lethality/speed/armour, and further improved the armour and armament of its transport VTOLs, ensuring that the airfleet of $securityForceName is amongst the most capable still in operation in the area.<br>Improved the bomber's engines and armour.
+ Upgraded its attack VTOLs for enhanced lethality/speed/armour, and further improved the armour and armament of its transport VTOLs, ensuring that the airfleet of $securityForceName is amongst the most capable still in operation in the area. <br>Improved the bomber's engines and armour.
<</switch>>
<<if $securityForceSpacePlanePower > 0>>
<br>''Space Plane:''
@@ -206,19 +206,19 @@
<<case 5>>
Upgraded the shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the tail,modernized the electronics in addition to the fuel lines to increase efficiency.
<<case 6>>
- Upgraded the shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the tail.Modernized; the electronics in addition to the fuel lines to increase efficiency and the engines to allow for more efficient fuel.
+ Upgraded the shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the tail. Modernized; the electronics in addition to the fuel lines to increase efficiency and the engines to allow for more efficient fuel.
<<case 7>>
- Upgraded the shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the tail.Modernized; the electronics in addition to the fuel lines to increase efficiency and the engines to allow for more efficient fuel.Reduced the weight and reworked the body to reduce drag.
+ Upgraded the shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the tail. Modernized; the electronics in addition to the fuel lines to increase efficiency and the engines to allow for more efficient fuel. Reduced the weight and reworked the body to reduce drag.
<<case 8>>
- Upgraded the shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the tail.Modernized; the electronics in addition to the fuel lines to increase efficiency and the engines to allow for more efficient fuel.Reduced the weight and reworked the body to reduce drag.Increased the crew comfort and life support systems to increase operational time.
+ Upgraded the shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the tail. Modernized; the electronics in addition to the fuel lines to increase efficiency and the engines to allow for more efficient fuel. Reduced the weight and reworked the body to reduce drag. Increased the crew comfort and life support systems to increase operational time.
<<case 9>>
- Upgraded the shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the tail.Modernized; the electronics in addition to the fuel lines to increase efficiency and the engines to allow for more efficient fuel.Reduced the weight and reworked the body to reduce drag.Increased the crew comfort and life support systems to increase operational time.Added an additional engine per wing which greatly increases acceleration and raises the top speed to mach 15, making the Space Plane of $securityForceName untouchable.
+ Upgraded the shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the tail. Modernized; the electronics in addition to the fuel lines to increase efficiency and the engines to allow for more efficient fuel. Reduced the weight and reworked the body to reduce drag. Increased the crew comfort and life support systems to increase operational time. Added an additional engine per wing which greatly increases acceleration and raises the top speed to mach 15, making the Space Plane of $securityForceName untouchable.
<<case 10>>
- Upgraded the shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the tail.Modernized; the electronics in addition to the fuel lines to increase efficiency and the engines to allow for more efficient fuel.Reduced the weight and reworked the body to reduce drag.Increased the crew comfort and life support systems to increase operational time.Added an additional engine per wing which greatly increases acceleration and raises the top speed to mach 15, making the Space Plane of $securityForceName untouchable.Replaced the skin of $securityForceName Space Plane with a basic optical illusion kit.
+ Upgraded the shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the tail. Modernized; the electronics in addition to the fuel lines to increase efficiency and the engines to allow for more efficient fuel. Reduced the weight and reworked the body to reduce drag. Increased the crew comfort and life support systems to increase operational time. Added an additional engine per wing which greatly increases acceleration and raises the top speed to mach 15, making the Space Plane of $securityForceName untouchable. Replaced the skin of $securityForceName Space Plane with a basic optical illusion kit.
<<case 11>>
- Upgraded the shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the tail.Modernized; the electronics in addition to the fuel lines to increase efficiency and the engines to allow for more efficient fuel.Reduced the weight and reworked the body to reduce drag.Increased the crew comfort and life support systems to increase operational time.Added an additional engine per wing which greatly increases acceleration and raises the top speed to mach 15, making the Space Plane of $securityForceName untouchable.Replaced the skin of $securityForceName Space Plane with an advanced optical illusion kit.
+ Upgraded the shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the tail. Modernized; the electronics in addition to the fuel lines to increase efficiency and the engines to allow for more efficient fuel. Reduced the weight and reworked the body to reduce drag. Increased the crew comfort and life support systems to increase operational time. Added an additional engine per wing which greatly increases acceleration and raises the top speed to mach 15, making the Space Plane of $securityForceName untouchable. Replaced the skin of $securityForceName Space Plane with an advanced optical illusion kit.
<<case 12>>
- Upgraded the shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the tail.Modernized; the electronics in addition to the fuel lines to increase efficiency and the engines to allow for more efficient fuel.Reduced the weight and reworked the body to reduce drag.Increased the crew comfort and life support systems to increase operational time.Added VTOL capabilites into an additional engine per wing which greatly increases acceleration and raises the top speed to mach 15, making the Space Plane of $securityForceName untouchable.Replaced the skin of $securityForceName Space Plane with an advanced optical illusion kit.
+ Upgraded the shielding, reducing both potential heat damage and radar signature,mounted another engine on top of the tail. Modernized; the electronics in addition to the fuel lines to increase efficiency and the engines to allow for more efficient fuel. Reduced the weight and reworked the body to reduce drag. Increased the crew comfort and life support systems to increase operational time. Added VTOL capabilites into an additional engine per wing which greatly increases acceleration and raises the top speed to mach 15, making the Space Plane of $securityForceName untouchable. Replaced the skin of $securityForceName Space Plane with an advanced optical illusion kit.
<</switch>>
<</if>>
<<if $securityForceFortressZeppelin > 0>>
@@ -281,7 +281,7 @@
<<case 4>>
Has acted to upgrade both the standard and support models of drones to carry basic electromagnetic weaponry, improving their overall combat effectiveness.
<<case 5>>
- Improved the electromagnetic armament of it's drones by mounting both miniaturized and heavy railguns on them. In addition further sourcing numerous models of drones for roles as diverse as reconnaissance, independent slave capture and swarming tactics.
+ Improved the electromagnetic armament of its drones by mounting both miniaturized and heavy railguns on them. In addition further sourcing numerous models of drones for roles as diverse as reconnaissance, independent slave capture and swarming tactics.
<<case 6>>
Acquired even lighter advanced armoured combat Drones with electromagnetic weaponry, advanced heavy Drones with electromagnetic support weaponry along with specialized Drones for reconnaissance, capture, and swarm tactics.
<<case 7>>
@@ -304,41 +304,41 @@
<<case 3>>
Modernized the electronics, wiring and circuitry.
<<case 4>>
- Modernized the electronics, wiring and circuitry.Installed a basic localized communications jammer to the Satellite (excludes your own frequencies with little to no leeway) that will "slightly" anger locals until it is deactivated.
+ Modernized the electronics, wiring and circuitry. Installed a basic localized communications jammer to the Satellite (excludes your own frequencies with little to no leeway) that will "slightly" anger locals until it is deactivated.
<<case 5>>
- Modernized the electronics, wiring and circuitry.An advanced communications jammer is installed in the Satellite, increasing the AO localization, reducing the number of effected equipment.
+ Modernized the electronics, wiring and circuitry. An advanced communications jammer is installed in the Satellite, increasing the AO localization, reducing the number of effected equipment.
<<case 6>>
- Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer power by 25% (now can damage effected equipment).
+ Modernized the electronics, wiring and circuitry. Boosted the advanced comms jammer power by 25% (now can damage effected equipment).
<<case 7>>
- Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment).
+ Modernized the electronics, wiring and circuitry. Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment).
<<case 8>>
- Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment).The Satellite is now equipped with a basic EMP generator (advanced EMP hardening was applied before the insulation and activation) will "slightly" anger locals until it is deactivated.
+ Modernized the electronics, wiring and circuitry. Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment). The Satellite is now equipped with a basic EMP generator (advanced EMP hardening was applied before the insulation and activation) will "slightly" anger locals until it is deactivated.
<<case 9>>
- Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment).The Satellite is now equipped with an advanced EMP generator by, increasing the AO localization which reduces the quantity of effected equipment.
+ Modernized the electronics, wiring and circuitry. Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment). The Satellite is now equipped with an advanced EMP generator by, increasing the AO localization which reduces the quantity of effected equipment.
<<case 10>>
- Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 25% (now can damage effected equipment).
+ Modernized the electronics, wiring and circuitry. Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 25% (now can damage effected equipment).
<<case 11>>
- Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 50% (now can destroy effected equipment).
+ Modernized the electronics, wiring and circuitry. Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 50% (now can destroy effected equipment).
<<case 12>>
- Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 50% (now can destroy effected equipment).Provided R&D funds to be able to shoot a concentrated beam of pure energy that is able to level an entire city block. It required overhauling the battery system and shielding.
+ Modernized the electronics, wiring and circuitry. Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 50% (now can destroy effected equipment). Provided R&D funds to be able to shoot a concentrated beam of pure energy that is able to level an entire city block. It required overhauling the battery system and shielding.
<<case 13>>
- Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 50% (now can destroy effected equipment).Provided R&D funds to focus the bean enough to level a suburb.
+ Modernized the electronics, wiring and circuitry. Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 50% (now can destroy effected equipment). Provided R&D funds to focus the bean enough to level a suburb.
<<case 14>>
- Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 50% (now can destroy effected equipment).Provided R&D funds to focus the beam enough to level a box of houses.
+ Modernized the electronics, wiring and circuitry. Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 50% (now can destroy effected equipment). Provided R&D funds to focus the beam enough to level a box of houses.
<<case 15>>
- Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 50% (now can destroy effected equipment).Provided R&D funds to focus the beam enough to level a single house.
+ Modernized the electronics, wiring and circuitry. Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 50% (now can destroy effected equipment). Provided R&D funds to focus the beam enough to level a single house.
<<case 16>>
- Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 50% (now can destroy effected equipment).Provided R&D funds to focus the beam enough to level 366 cm.
+ Modernized the electronics, wiring and circuitry. Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 50% (now can destroy effected equipment). Provided R&D funds to focus the beam enough to level 366 cm.
<<case 17>>
- Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 50% (now can destroy effected equipment).Provided R&D funds to focus the beam enough to level 30 cm.
+ Modernized the electronics, wiring and circuitry. Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 50% (now can destroy effected equipment). Provided R&D funds to focus the beam enough to level 30 cm.
<<case 18>>
- Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 50% (now can destroy effected equipment).Provided R&D funds to focus the beam enough to level 15 cm.
+ Modernized the electronics, wiring and circuitry. Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 50% (now can destroy effected equipment). Provided R&D funds to focus the beam enough to level 15 cm.
<<case 19>>
- Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 50% (now can destroy effected equipment).Provided R&D funds to switch the 15 cm wide beam from lazer to nanites.
+ Modernized the electronics, wiring and circuitry. Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 50% (now can destroy effected equipment). Provided R&D funds to switch the 15 cm wide beam from lazer to nanites.
<<case 20>>
- Modernized the electronics, wiring and circuitry.Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 50% (now can destroy effected equipment).Provided R&D funds to switch the 15 cm wide beam from lazer to nanites and allow the bleam to be split (if needed)
+ Modernized the electronics, wiring and circuitry. Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 50% (now can destroy effected equipment). Provided R&D funds to switch the 15 cm wide beam from lazer to nanites and allow the bleam to be split (if needed).
<<case 21>>
- Modernized the electronics (in addition to overclocking), wiring and circuitry.Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 50% (now can destroy effected equipment).Provided R&D funds to switch the 15 cm wide beam from lazer to nanites and allow the bleam to be split (if needed)
+ Modernized the electronics (in addition to overclocking), wiring and circuitry. Boosted the advanced comms jammer's power by 50% (now can destroy effected equipment) and the output of the advanced EMP generator by 50% (now can destroy effected equipment). Provided R&D funds to switch the 15 cm wide beam from lazer to nanites and allow the bleam to be split (if needed).
<</switch>>
<</if>>
<<if $securityForceGiantRobot > 0>>
@@ -351,31 +351,31 @@
<<case 3>>
Upgraded the wiring, circuitry and power efficiency.
<<case 4>>
- Upgraded the wiring, circuitry and power efficiency.Reduced the weight.
+ Upgraded the wiring, circuitry and power efficiency. Reduced the weight.
<<case 5>>
- Upgraded the wiring, circuitry, power efficiency and battery capacity.Reduced the weight.
+ Upgraded the wiring, circuitry, power efficiency and battery capacity. Reduced the weight.
<<case 6>>
- Upgraded the wiring, circuitry, power efficiency,battery capacity and armour.Reduced the weight.
+ Upgraded the wiring, circuitry, power efficiency,battery capacity and armour. Reduced the weight.
<<case 7>>
Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles plus a massive long sword in addition to quad 356 cm back mounted electromagnetic cannons.
<<case 8>>
Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles plus a massive long sword in addition to quad 356 cm back mounted electromagnetic cannons and the amount of pilots to two via a synced neural link.
<<case 9>>
- Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles plus a massive long sword in addition to quad 356 cm back mounted electromagnetic cannons. Increased the number of pilots to two via a synced neural link.Improved the life support systems, allowing for longer operational time.
+ Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles plus a massive long sword in addition to quad 356 cm back mounted electromagnetic cannons. Increased the number of pilots to two via a synced neural link. Improved the life support systems, allowing for longer operational time.
<<case 10>>
- Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles plus a massive long sword in addition to quad 356 cm back mounted electromagnetic cannons. Increased the number of pilots to two via a synced neural link.Improved the life support systems, allowing for longer operational time.Replaced the skin of $securityForceName's giant robot with a basic optical illusion kit.
+ Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles plus a massive long sword in addition to quad 356 cm back mounted electromagnetic cannons. Increased the number of pilots to two via a synced neural link. Improved the life support systems, allowing for longer operational time. Replaced the skin of $securityForceName's giant robot with a basic optical illusion kit.
<<case 11>>
- Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles plus a massive long sword in addition to quad 356 cm back mounted electromagnetic cannons. Increased the number of pilots to two via a synced neural link.Improved the life support systems, allowing for longer operational time.Replaced the skin of $securityForceName's giant robot with an advanced optical illusion kit.
+ Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles plus a massive long sword in addition to quad 356 cm back mounted electromagnetic cannons. Increased the number of pilots to two via a synced neural link. Improved the life support systems, allowing for longer operational time. Replaced the skin of $securityForceName's giant robot with an advanced optical illusion kit.
<<case 12>>
- Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles, a massive long sword, quad 356 cm back mounted nanite rather than electromagnetic cannons. Increased the number of pilots to two via a synced neural link.Improved the life support systems, allowing for longer operational time.Replaced the skin of $securityForceName's giant robot with an advanced optical illusion kit.
+ Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles, a massive long sword, quad 356 cm back mounted nanite rather than electromagnetic cannons. Increased the number of pilots to two via a synced neural link. Improved the life support systems, allowing for longer operational time. Replaced the skin of $securityForceName's giant robot with an advanced optical illusion kit.
<<case 13>>
- Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles, a massive long sword, quad 356 cm back mounted nanite rather than electromagnetic cannons. Increased the number of pilots to two via a synced neural link.Improved the life support systems, allowing for longer operational time.Replaced the skin of $securityForceName's giant robot with an advanced optical illusion kit. Added hover capabilites.
+ Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles, a massive long sword, quad 356 cm back mounted nanite rather than electromagnetic cannons. Increased the number of pilots to two via a synced neural link. Improved the life support systems, allowing for longer operational time. Replaced the skin of $securityForceName's giant robot with an advanced optical illusion kit. Added hover capabilites.
<<case 14>>
- Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles, a massive long sword, quad 356 cm back mounted nanite rather than electromagnetic cannons and a massive wrist mounted shield. Increased the number of pilots to two via a synced neural link.Improved the life support systems, allowing for longer operational time.Replaced the skin of $securityForceName's giant robot with an advanced optical illusion kit. Added hover capabilites.
+ Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles, a massive long sword, quad 356 cm back mounted nanite rather than electromagnetic cannons and a massive wrist mounted shield. Increased the number of pilots to two via a synced neural link. Improved the life support systems, allowing for longer operational time. Replaced the skin of $securityForceName's giant robot with an advanced optical illusion kit. Added hover capabilites.
<<case 15>>
- Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles, a massive long sword, quad 356 cm back mounted nanite rather than electromagnetic cannons,a massive wrist mounted shield and eletric fists. Increased the number of pilots to two via a synced neural link.Improved the life support systems, allowing for longer operational time.Replaced the skin of $securityForceName's giant robot with an advanced optical illusion kit. Added hover capabilites.
+ Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles, a massive long sword, quad 356 cm back mounted nanite rather than electromagnetic cannons,a massive wrist mounted shield and eletric fists. Increased the number of pilots to two via a synced neural link. Improved the life support systems, allowing for longer operational time. Replaced the skin of $securityForceName's giant robot with an advanced optical illusion kit. Added hover capabilites.
<<case 16>>
- Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles, a massive long sword, quad 356 cm back mounted nanite rather than electromagnetic cannons,a massive wrist mounted shield and eletric fists. Increased the number of pilots to two via a synced neural link.Improved the life support systems, allowing for longer operational time.Replaced the skin of $securityForceName's giant robot with an advanced optical illusion kit. Added hover capabilites. Overclocked the movement systems allowing for greater mobility.
+ Upgraded the wiring, circuitry, power efficiency, battery capacity, armour and weapons to include heat seeking missiles, a massive long sword, quad 356 cm back mounted nanite rather than electromagnetic cannons,a massive wrist mounted shield and eletric fists. Increased the number of pilots to two via a synced neural link. Improved the life support systems, allowing for longer operational time. Replaced the skin of $securityForceName's giant robot with an advanced optical illusion kit. Added hover capabilites. Overclocked the movement systems allowing for greater mobility.
<</switch>>
<</if>>
<<if $securityForceMissileSilo > 0>>
@@ -421,13 +421,13 @@
<<case 3>>
Modernized the engines for speed and silence.
<<case 4>>
- Modernized the engines for speed and silence.Upgraded the hull for silence.
+ Modernized the engines for speed and silence. Upgraded the hull for silence.
<<case 5>>
- Modernized the engines for speed and silence.Upgraded the hull for silence and weaponry.
+ Modernized the engines for speed and silence. Upgraded the hull for silence and weaponry.
<<case 6>>
- Modernized the engines for speed and silence.Upgraded the hull for silence, weaponry and air scrubbers, allowing it to stay submerged for longer.
+ Modernized the engines for speed and silence. Upgraded the hull for silence, weaponry and air scrubbers, allowing it to stay submerged for longer.
<<case 7>>
- Modernized the engines for speed and silence.Upgraded the hull for silence, weaponry and air scrubbers, allowing it to stay submerged for longer. Overclocked the sonar, increasing it's ping speed.
+ Modernized the engines for speed and silence. Upgraded the hull for silence, weaponry and air scrubbers, allowing it to stay submerged for longer. Overclocked the sonar, increasing its ping speed.
<</switch>>
<</if>>
<<if $securityForceHeavyAmphibiousTransport > 0>>
diff --git a/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw b/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw
index 9ac8baa658e6ac9d05d51aec4b88fe26dfa06f06..6a07ca4453213d32ae3c321c31f39589497ac79c 100755
--- a/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw
+++ b/src/pregmod/SecForceEX/SpecialForceUpgradeOptions.tw
@@ -48,9 +48,9 @@
<br><<link "Barracks">>
<<replace "#resultX">><br><br>
"Sure, boss." she says, nodding. "Expanding the facilities here should help us support more cool shit." She laughs, picks up a tablet, and taps a few commands on it. "I'll get right on it."
- <<set $securityForceUpgradeToken = 1, $securityForceArcologyUpgrades++, $cash -= _arcCost*$Env*$HackingSkillMultiplier>>
+ <<set $securityForceUpgradeToken = 1, $securityForceArcologyUpgrades++, $cash -= _arcCost*$Env>>
<</replace>>
- <</link>> // Costs <<print cashFormat(_arcCost*$Env*$HackingSkillMultiplier)>> //
+ <</link>> // Costs <<print cashFormat(_arcCost*$Env)>> //
<<elseif $securityForceUpgradeToken == 0 && $securityForceArcologyUpgrades == 13>>
<br><<link "Barracks">>
<<replace "#resultX">><br><br>
diff --git a/src/pregmod/managePersonalAffairs.tw b/src/pregmod/managePersonalAffairs.tw
index 58c0aeca9ba3454e8816699a4f3a8cde8bccb13b..4d1b9d99b0959a21a0683d7f302ecb98d4ba1461 100644
--- a/src/pregmod/managePersonalAffairs.tw
+++ b/src/pregmod/managePersonalAffairs.tw
@@ -229,7 +229,7 @@ You ponder what skills may be useful in running your arcology.
<<elseif $PC.hacking >= -60>>
Where is the "any" key?
<<elseif $PC.hacking >= -80>>
- You can push the power button button, good job.
+ You can push the power button, good job.
<<else>>
This black box thingy is magical.
<</if>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 047e92db6ea72aa46040a87c21cbdbd9b84cdaae..bff39053936120523b6e7dbb2e2e9a59258ccedf 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -1136,18 +1136,18 @@
<<if ndef $arcologies[0].embargoTarget>>
<<set $arcologies[0].embargoTarget = -1>>
<</if>>
-<<if ndef $arcologies[0].hackingfinanical>>
- <<set $arcologies[0].hackingfinanical = 1>>
+<<if ndef $arcologies[0].hackingEconomic>>
+ <<set $arcologies[0].hackingEconomic = 1>>
<</if>>
-<<if ndef $arcologies[0].hackingfinanicalFinanicalTarget>>
- <<set $arcologies[0].hackingfinanicalFinanicalTarget = -1>>
-<</if>>
-<<if ndef $arcologies[0].hackingReputation>>
- <<set $arcologies[0].hackingReputation = 1>>
+<<if ndef $arcologies[0].hackingEconomicTarget>>
+ <<set $arcologies[0].hackingEconomicTarget = -1>>
<</if>>
<<if ndef $arcologies[0].hackingReputationTarget>>
<<set $arcologies[0].hackingReputationTarget = -1>>
<</if>>
+<<if ndef $arcologies[0].hackingReputation>>
+ <<set $arcologies[0].hackingReputation = 1>>
+<</if>>
<<if ndef $arcologies[0].influenceTarget>>
<<set $arcologies[0].influenceTarget = -1>>
<</if>>
diff --git a/src/uncategorized/SFMBarracks.tw b/src/uncategorized/SFMBarracks.tw
index 97518a6aa01f0c9ba082f255c40c81f86c4479ab..d391de1a7c116b08f10af78adba1ef729b752606 100644
--- a/src/uncategorized/SFMBarracks.tw
+++ b/src/uncategorized/SFMBarracks.tw
@@ -271,7 +271,7 @@
<<if $PC.slaving < 10>>
//Yes, the rope normally goes around the wrist first and no where near the mouth.//
<<elseif $PC.slaving >= 100>>
- //Now should we go out there and capture some slaves, master?//
+ //Now should we go out and capture some slaves, master?//
<<elseif $PC.slaving >= 60>>
//Feel feel to tie me up any time.//
<<elseif $PC.slaving >= 30>>
@@ -289,7 +289,7 @@
<<if $PC.engineering < 10>>
//Good job, you know what a hammer now looks like.//
<<elseif $PC.engineering >= 100>>
- //Time to for you to out there and build something.//
+ //Time to for you go out and build something.//
<<elseif $PC.engineering >= 60>>
//Feel free to 'nail' me any time.//
<<elseif $PC.engineering >= 30>>
@@ -305,15 +305,15 @@
<<replace "#result4">>
<br>
<<if $PC.hacking < 10>>
- //Good job you know what a on button now does.//
+ //Good job you know what pushing the power button does.//
<<elseif $PC.hacking >= 100>>
- //Time to for you to out there and tinker with a system.//
+ //Time to for you go out and tinker with a system.//
<<elseif $PC.hacking >= 60>>
//Feel free to 'plug into' me any time.//
<<elseif $PC.hacking >= 30>>
//Currect srew driver holding procedure acquired.//
<<elseif $PC.hacking >= 10>>
- //You can now some what use a mouse.//
+ //You can now somewhat use a mouse.//
<</if>>
<</replace>>
<</link>>
diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw
index e3954188180af58f7ba2ee0f13d1a285b968ff0d..2799b628580762c336c9806f61c37886f2d19ebd 100644
--- a/src/uncategorized/costsReport.tw
+++ b/src/uncategorized/costsReport.tw
@@ -227,7 +227,7 @@
<<case medicine>>
__Medicine__
<<case hacking>>
- __hacking__
+ __Hacking__
<</switch>>
trainer fees: <<print cashFormat(_cost)>>
<br>
diff --git a/src/uncategorized/neighborDescription.tw b/src/uncategorized/neighborDescription.tw
index 0b017047deaf73ca7167665023cd2f6412dde40c..22b93490c22536966512e50f430c60736dfbb4e0 100644
--- a/src/uncategorized/neighborDescription.tw
+++ b/src/uncategorized/neighborDescription.tw
@@ -40,26 +40,7 @@ The arcology has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trun
<<else>>
behind
<</if>>
-its neighbors.
-
-<<if $arcologies[0].hackingFinanical == 1 && $arcologies[$i].name == $arcologies[0].hackingFinanicalTarget>>
- <br>You have gained @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcologies[$i].prosperity*random(100-$economicUncertainty,100+$economicUncertainty))/100))>>m,@@ from your hacking campaign.
- <<set $arcologies[$i].prosperity -= random (5,10)>>
-<<elseif $arcologies[0].hackingFinanical == 2 && $arcologies[$i].name == $arcologies[0].hackingFinanicalTarget>>
- <br>You have gained @@.yellowgreen;<<print cashFormat(Math.trunc((0.3*$arcologies[$i].prosperity*random(100-$economicUncertainty,100+$economicUncertainty))/100))>>m,@@ from your hacking campaign
- <<set $arcologies[$i].prosperity -= random (10,20)>>
-<<elseif $arcologies[0].hackingFinanical == 3 && $arcologies[$i].name == $arcologies[0].hackingFinanicalTarget>>
- <br>You have gained @@.yellowgreen;<<print cashFormat(Math.trunc((0.3*$arcologies[$i].prosperity*random(100-$economicUncertainty,100+$economicUncertainty))/100))>>m,@@ from your hacking campaign
- <<set $arcologies[$i].prosperity -= random (30,35)>>
-<</if>>
-
-<<if $arcologies[0].hackingReputation == 1 && $arcologies[$i].name == $arcologies[0].hackingReputationTarget>>
- <<set $arcologies[$i].prosperity -= random (5,10), $activeArcology.PCminority += $activeArcology.PCminority+.1, $activeArcology.ownership -= $activeArcology.ownership-.1>>
-<<elseif $arcologies[0].hackingReputation == 2 && $arcologies[$i].name == $arcologies[0].hackingReputationTarget>>
- <<set $arcologies[$i].prosperity -= random (5,10), $activeArcology.PCminority += $activeArcology.PCminority+.2, $activeArcology.ownership -= $activeArcology.ownership-.2>>
-<<elseif $arcologies[0].hackingReputation == 3 && $arcologies[$i].name == $arcologies[0].hackingReputationTarget>>
- <<set $arcologies[$i].prosperity -= random (5,10), $activeArcology.PCminority += $activeArcology.PCminority+.3, $activeArcology.ownership -= $activeArcology.ownership-.3>>
-<</if>>
+its neighbors.
<<set $desc = 0>>
<<set $seed = []>>
diff --git a/src/uncategorized/neighborInteract.tw b/src/uncategorized/neighborInteract.tw
index 9875ed6d64fd2cab4bd270538e93dd939d3fda57..6ddf681886e7cb328daf2061f3c5d7c8420317c0 100644
--- a/src/uncategorized/neighborInteract.tw
+++ b/src/uncategorized/neighborInteract.tw
@@ -65,24 +65,45 @@
<</for>>
<</if>>
+<<if $PC.hacking > 0>>
<br>
-
-<<if $arcologies[0].hackingfinanicalFinanicalTarget == -1>>
- You are not engaged in cyber warfare against a neighboring arcology.
-<<else>>
- <<for $i = 0; $i < $arcologies.length; $i++>>
- <<if $arcologies[$i].direction == $arcologies[0].hackingfinanicalFinanicalTarget>>
- You have targeted ''$arcologies[$i].name'' for cyber warfare.
- <<break>>
+ <<if $arcologies[0].hackingEconomicTarget == -1>>
+ You are not engaged in cyber warfare against a neighboring arcology.
+ <<else>>
+ <<for $i = 0; $i < $arcologies.length; $i++>>
+ <<if $arcologies[$i].direction == $arcologies[0].hackingEconomicTarget>>
+ You have targeted ''$arcologies[$i].name'' for cyber warfare.
+ <<break>>
+ <</if>>
+ <</for>>
+ <br> Its planned impacts will be
+ <<if $arcologies[0].hackingfinanical == 3>>
+ ''widespread.'' [[Moderate|Neighbor Interact][$arcologies[0].hackingfinanical -= 1]]
+ <<elseif $arcologies[0].hackingfinanical == 2>>
+ ''limited.'' [[Intensify|Neighbor Interact][$arcologies[0].hackingfinanical += 1]] | [[Moderate|Neighbor Interact][$arcologies[0].hackingfinanical -= 1]]
+ <<else>>
+ ''nominal.'' [[Intensify|Neighbor Interact][$arcologies[0].hackingfinanical += 1]]
+ <</if>>
<</if>>
- <</for>>
- <br> Its planned impacts will be
- <<if $arcologies[0].hackingfinanical == 3>>
- ''widespread.'' [[Moderate|Neighbor Interact][$arcologies[0].hackingfinanical -= 1]]
- <<elseif $arcologies[0].hackingfinanical == 2>>
- ''limited.'' [[Intensify|Neighbor Interact][$arcologies[0].hackingfinanical += 1]] | [[Moderate|Neighbor Interact][$arcologies[0].hackingfinanical -= 1]]
+
+ <br>
+ <<if $arcologies[0].hackingReputationTarget == -1>>
+ You are not engaged in character assassination against a neighboring arcology.
<<else>>
- ''nominal.'' [[Intensify|Neighbor Interact][$arcologies[0].hackingfinanical += 1]]
+ <<for $i = 0; $i < $arcologies.length; $i++>>
+ <<if $arcologies[$i].direction == $arcologies[0].hackingReputationTarget>>
+ You have targeted ''$arcologies[$i].name'' for character assassination.
+ <<break>>
+ <</if>>
+ <</for>>
+ <br> Its planned impacts will be
+ <<if $arcologies[0].hackingReputation == 3>>
+ ''widespread.'' [[Moderate|Neighbor Interact][$arcologies[0].hackingReputation -= 1]]
+ <<elseif $arcologies[0].hackingReputation == 2>>
+ ''limited.'' [[Intensify|Neighbor Interact][$arcologies[0].hackingReputation += 1]] | [[Moderate|Neighbor Interact][$arcologies[0].hackingReputation -= 1]]
+ <<else>>
+ ''nominal.'' [[Intensify|Neighbor Interact][$arcologies[0].hackingReputation += 1]]
+ <</if>>
<</if>>
<</if>>
@@ -188,11 +209,14 @@
<</if>>
<</for>>
-<br> [[Target for economic warfare|Neighbor Interact][$arcologies[0].embargoTarget = $activeArcology.direction]]
-<br> [[Target for cryber finanical warfare|Neighbor Interact][$arcologies[0].hackingFinanicalTarget = $activeArcology.direction]]
-<br> [[Target for cryber reputation warfare|Neighbor Interact][$arcologies[0].hackingReputationTarget = $activeArcology.direction]]
+<br>
+[[Target for economic warfare|Neighbor Interact][$arcologies[0].embargoTarget = $activeArcology.direction]] |
+<<if $PC.hacking > 0>>
+ [[Target for cryber finanical warfare|Neighbor Interact][$arcologies[0].hackingEconomicTarget = $activeArcology.direction]]|
+ [[Target their leadership for character assassination|Neighbor Interact][$arcologies[0].hackingReputationTarget = $activeArcology.direction]]|
+<</if>>
<<if $desc.length > 0>>
- | [[Set as influence target|Neighbor Interact][$arcologies[0].influenceTarget = $activeArcology.direction]]
+ [[Set as influence target|Neighbor Interact][$arcologies[0].influenceTarget = $activeArcology.direction]]
<</if>>
<br> You own ''$activeArcology.PCminority%'' of $activeArcology.name.
<<set $seed = 500*Math.trunc($activeArcology.prosperity*(1+($activeArcology.demandFactor/100)))>>
diff --git a/src/uncategorized/neighborsDevelopment.tw b/src/uncategorized/neighborsDevelopment.tw
index 87e358b72b751f373b5b71d461499ef9c7b69b11..d0c8a7e684f5b66ea9a1795f8db491a7dc38aa72 100644
--- a/src/uncategorized/neighborsDevelopment.tw
+++ b/src/uncategorized/neighborsDevelopment.tw
@@ -479,7 +479,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<<if $arcologies[$i].PCminority > 0>>
<<set $rents = ($arcologies[$i].prosperity*$arcologies[$i].PCminority*2)+random(1,100)>>
<<set $cash += $rents>>
- This week, you made @@.yellowgreen;<<print cashFormat($rents)>>@@ from your holdings in this arcology.
+ <br>This week, you made @@.yellowgreen;<<print cashFormat($rents)>>@@ from your holdings in this arcology.
<</if>>
/* AI ARCOLOGY RENAMING */
@@ -507,6 +507,31 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol
<</if>>
<</for>>
+<<if $PC.hacking > 0>>
+ /* FINANICAL WARFARE */
+
+ <<for $j = 0; $j < $arcologies.length; $j++>>
+ <<if $arcologies[$i].direction == $arcologies[$j].hackingEconomicTarget>>
+ <<set $arcologies[$i].prosperity -= $arcologies[$j].hackingEconomic*2.5, _WarSpoils = 25000*$arcologies[$j].hackingEconomic*2.5>>
+ <<if $arcologies[$j].direction != 0>>
+ <<set $arcologies[$j].prosperity -= $arcologies[$j].hackingEconomic*2.5>>
+ <</if>>
+ $arcologies[$i].name targets $arcologies[$j].name for @@.red;digial finanical warfare@@. Gaining <<print cashFormat(_WarSpoils)>> this week as spoils of war.
+ <</if>>
+ <</for>>
+
+ /* REPUTATION WARFARE */
+ <<for $j = 0; $j < $arcologies.length; $j++>>
+ <<if $arcologies[$i].direction == $arcologies[$j].hackingReputationTarget>>
+ <<set $arcologies[$i].prosperity -= $arcologies[$j].hackingReputation*1.5,$activeArcology.ownership -= $arcologies[$j].hackingReputation/4, $activeArcology.PCminority += $arcologies[$j].hackingReputation/4>>
+ <<if $arcologies[$j].direction != 0>>
+ <<set $arcologies[$j].prosperity -= $arcologies[$j].hackingReputation*1.5,$activeArcology.ownership -= $arcologies[$j].hackingReputation/4, $activeArcology.PCminority += $arcologies[$j].hackingReputation/4>>
+ <</if>>
+ $arcologies[$i].name targets the leadership for $arcologies[$j].name for @@.red;character assassination@@.
+ <</if>>
+ <</for>>
+<</if>>
+
/* FUTURE SOCIETY PROGRESS */
<<set _societiesAdopted = 0>>
diff --git a/src/uncategorized/pRivalryActions.tw b/src/uncategorized/pRivalryActions.tw
index 820551484c9af36b04e08f45d3da3ca246b1aff5..f2cdfa3cdbb9d78062d99bccb208357b98c7dd50 100644
--- a/src/uncategorized/pRivalryActions.tw
+++ b/src/uncategorized/pRivalryActions.tw
@@ -3985,7 +3985,7 @@ You remind yourself that success in this conflict will not be defined by the tra
<</if>>
You go back to your work.
<</replace>>
-<</link>> //This option is available due to your @@.springgreen;military background and skills in addition to your techncial mastery,@@ . This will immediately end the conflict with a chance of enslaving your rival//
+<</link>> //This option is available due to your @@.springgreen;military background and skills in addition to your hacking mastery,@@. This will immediately end the conflict with a chance of enslaving your rival//
<</if>>
<</if>>
</span>
diff --git a/src/uncategorized/persBusiness.tw b/src/uncategorized/persBusiness.tw
index 30d167a3172996be15876f17d8e1c0b59b262b21..f020118451204c47601a3a9b68c0ec684d3d55fe 100644
--- a/src/uncategorized/persBusiness.tw
+++ b/src/uncategorized/persBusiness.tw
@@ -491,28 +491,28 @@
<</if>>
<<if _oldSkill <= 10>>
<<if $PC.hacking > 10>>
- You now have @@.green;basic knowledge@@ about how to be a hacking.
+ You now have @@.green;basic knowledge@@ about how to hack.
<<else>>
- You have made progress towards a basic knowledge of hacking work.
+ You have made progress towards a basic knowledge of hacking.
<</if>>
<<elseif _oldSkill <= 30>>
<<if $PC.hacking > 30>>
- You now have @@.green;some skill@@ as a hacking.
+ You now have @@.green;some skill@@ at hacking.
<<else>>
- You have made progress towards being skilled in hacking work.
+ You have made progress towards being skilled in hacking.
<</if>>
<<elseif _oldSkill <= 60>>
<<if $PC.hacking > 60>>
You are now an @@.green;expert hacking.@@
<<else>>
- You have made progress towards being an expert in hacking work.
+ You have made progress towards being an expert in hacking.
<</if>>
<<else>>
<<if $PC.hacking >= 100>>
<<set $personalAttention = "sex">>
You are now a @@.green;master hacking.@@
<<else>>
- You have made progress towards mastering hacking work.
+ You have made progress towards mastering hacking.
<</if>>
<</if>>
diff --git a/src/uncategorized/personalAttentionSelect.tw b/src/uncategorized/personalAttentionSelect.tw
index f1aeb871548486d1af90a3a3ac68fb3e5796ad4a..06e3dba1506d3bb54892de3178ed9b45eec87911 100644
--- a/src/uncategorized/personalAttentionSelect.tw
+++ b/src/uncategorized/personalAttentionSelect.tw
@@ -67,20 +67,20 @@
<</if>>
<</if>>
<<if $PC.hacking >= 100>>
- <br>//You are a master hacking.//
+ <br>//You are a master hacker.//
<<else>>
<br>
<<if $PC.hacking > 60>>
- //You are an expert hacking.//
+ //You are an expert at hacking.//
<<elseif $PC.hacking > 30>>
- //You have some skill as a hacking.//
+ //You have some skill at hacking.//
<<elseif $PC.hacking > 10>>
- //You have basic knowledge as a hacking.//
+ //You have basic knowledge at hacking.//
<</if>>
<<if $personalAttention == "hacking">>
- You are training in the ways of a hacking.
+ You are training in the ways of hacking.
<<elseif $PC.hacking < 100 && $PC.actualAge < $IsPastPrimePC>>
- [[Hire a network threat specialist to train you in network threats|Main][$personalAttention = "hacking"]]
+ [[Hire a master hacker to train you in hacking|Main][$personalAttention = "hacking"]]
<</if>>
<</if>>
<<if $PC.slaving >= 100>>
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index 7f45413558bd4497566a9604cd1e23b9110e31e2..ad61368c161538d1ec61318c735d16680f985b7d 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -513,11 +513,11 @@
<</if>>
<<if $PC.hacking >= 50>>
<<if $securityForceActive == 1 || $mercenaries >= 1 || $activeUnits > 0 || $Bodyguard != 0 || $cash >= 20000>>
- <<set $recruit.push("Held POW")>>
+ <<set $recruit.push("held pow")>>
<</if>>
<<if $familyTesting == 1 && $securityForceActive == 1 || $mercenaries >= 1 || $activeUnits > 0 || $Bodyguard != 0 || $cash >= 20000>>
<<if $PC.mother == 0>>
- <<set $recruit.push("Lost mother")>>
+ <<set $recruit.push("lost mother")>>
<</if>>
<</if>>
@@ -570,7 +570,7 @@
<<if $seeDicks != 0>> /*XY ACQUISITIONS*/
<<if ($familyTesting == 1 && $PC.father == 0) && $securityForceActive == 1 || $mercenaries >= 1 || $activeUnits > 0 || $Bodyguard != 0 || $cash >= 20000>>
- <<set $recruit.push("Lost father")>>
+ <<set $recruit.push("lost father")>>
<</if>>
<<set $recruit.push("male debtor")>>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index 5d86c325d166cf8c59f937f59c67ba125987f86b..0d471b88de507234101b42485ae8a0890c84efe9 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -1735,12 +1735,12 @@ As you are heading back to your penthouse from inspecting a new line of sex shop
<</if>>
Every push, every desperate contraction must be agonizing to her. Fortunately you know what to do, however, it will not come cheap. Hour after hour you work with the girl, her dept to you growing ever higher, until you finally manage to coax the newborn from her battered body. She smiles at her baby before losing consciousness, she is in really bad shape. Odds are her child will grow up an orphan, even if you call in her debt.
-<<case "Held POW">>
+<<case "held pow">>
<<set $activeSlaveOneTimeMinAge = $fertilityAge>>
<<set $activeSlaveOneTimeMaxAge = 22>>
<<include "Generate XX Slave">>
- <<set $activeSlave.origin = "You helped her free her from a POW camp after her country abanded, leaving her deeply indebted to you.">>
+ <<set $activeSlave.origin = "You helped her free her from a POW camp after her country abandoned, leaving her deeply indebted to you.">>
<<set $activeSlave.devotion = random(0,20)>>
<<set $activeSlave.trust = random(0,20)>>
<<set $activeSlave.health = -80>>
@@ -1754,7 +1754,7 @@ Every push, every desperate contraction must be agonizing to her. Fortunately yo
<</if>>
<<set $activeSlave.vagina = 1>>
- While digging through the database of a POW camp for shits and gigles you find that a <<if $activeSlave.visualAge > 17>>fully grown<<elseif $activeSlave.visualAge > 12>>teenage<<else>>child<</if>> soldier abonded by her nation. You decide to send a small sqaud <<if $securityForceActive ==1>> $securityForceName <<elseif $mercenaries >= 1>> $mercenariesTitle <<elseif $activeUnits > 0>> your army <<elseif $Bodyguard != 0>> your bodyguard $bodyguard.name and a few loyal slaves <<elseif $cash >= 20000>> hired mercs <<set $cash -= 20000>> <</if>> to free the prisoner then transport her to a safe house.
+ While digging through the database of a POW camp for shits and gigles you find that a <<if $activeSlave.visualAge > 17>>fully grown<<elseif $activeSlave.visualAge > 12>>teenage<<else>>child<</if>> soldier abonded by her nation. You decide to send a small squad <<if $securityForceActive ==1>> $securityForceName <<elseif $mercenaries >= 1>> $mercenariesTitle <<elseif $activeUnits > 0>> your army <<elseif $Bodyguard != 0>> your bodyguard $bodyguard.name and a few loyal slaves <<elseif $cash >= 20000>> hired mercs <<set $cash -= 20000>> <</if>> to free the prisoner then transport her to a safe house.
Upon their arrival they see that she has been,
<<if $seeExtreme == 1>>
@@ -1763,11 +1763,11 @@ Every push, every desperate contraction must be agonizing to her. Fortunately yo
her wounds are still visable.
<</if>>
-<<case "Lost mother">>
+<<case "lost mother">>
<<set $activeSlave.age = $PC.actualAge+14>>
<<include "Generate XX Slave">>
- <<set $activeSlave.origin = "You helped her free her from a POW camp after her country abanded, leaving her deeply indebted to you.">>
+ <<set $activeSlave.origin = "You helped her free her from a POW camp after her country abandoned, leaving her deeply indebted to you.">>
<<set $activeSlave.devotion = random(0,20)>>
<<set $activeSlave.trust = random(0,20)>>
<<set $activeSlave.health = -80>>
@@ -1778,13 +1778,13 @@ Every push, every desperate contraction must be agonizing to her. Fortunately yo
<<set $activeSlave.vagina = 1>>
<<set $activeSlave.ID == $PC.mother>>
- After countless searching you have found your long lost mother. You decide to send a small sqaud <<if $securityForceActive ==1>> $securityForceName <<elseif $mercenaries >= 1>> $mercenariesTitle <<elseif $activeUnits > 0>> your army <<elseif $Bodyguard != 0>> your bodyguard $bodyguard.name and a few loyal slaves <<elseif $cash >= 20000>> hired mercs <<set $cash -= 20000>> <</if>> to free the prisoner then transport her to a safe house.
+ After countless searching you have found your long lost mother. You decide to send a small squad <<if $securityForceActive ==1>> $securityForceName <<elseif $mercenaries >= 1>> $mercenariesTitle <<elseif $activeUnits > 0>> your army <<elseif $Bodyguard != 0>> your bodyguard $bodyguard.name and a few loyal slaves <<elseif $cash >= 20000>> hired mercs <<set $cash -= 20000>> <</if>> to free the prisoner then transport her to a safe house.
-<<case "Lost father">>
+<<case "lost father">>
<<set $activeSlave.age = $PC.actualAge+14>>
<<include "Generate XY Slave">>
- <<set $activeSlave.origin = "You helped her free her from a POW camp after her country abanded, leaving her deeply indebted to you.">>
+ <<set $activeSlave.origin = "You helped her free her from a POW camp after her country abandoned, leaving her deeply indebted to you.">>
<<set $activeSlave.devotion = random(0,20)>>
<<set $activeSlave.trust = random(0,20)>>
<<set $activeSlave.health = -80>>
@@ -1795,7 +1795,7 @@ Every push, every desperate contraction must be agonizing to her. Fortunately yo
<<set $activeSlave.dick = 10>>
<<set $activeSlave.ID == $PC.father>>
- After countless searching you have found your long lost father. You decide to send a small sqaud <<if $securityForceActive ==1>> $securityForceName <<elseif $mercenaries >= 1>> $mercenariesTitle <<elseif $activeUnits > 0>> your army <<elseif $Bodyguard != 0>> your bodyguard $bodyguard.name and a few loyal slaves <<elseif $cash >= 20000>> hired mercs <<set $cash -= 20000>> <</if>> to free the prisoner then transport him to a safe house.
+ After countless searching you have found your long lost father. You decide to send a small squad <<if $securityForceActive ==1>> $securityForceName <<elseif $mercenaries >= 1>> $mercenariesTitle <<elseif $activeUnits > 0>> your army <<elseif $Bodyguard != 0>> your bodyguard $bodyguard.name and a few loyal slaves <<elseif $cash >= 20000>> hired mercs <<set $cash -= 20000>> <</if>> to free the prisoner then transport him to a safe house.
<</switch>> /* END SLAVE GENERATION AND INTRODUCTION */
@@ -1841,11 +1841,11 @@ Every push, every desperate contraction must be agonizing to her. Fortunately yo
<<replace "#result">>
<<switch $recruit>>
<<case "Lost mother">>
- With your order recived your mother is quickly black baged and brought to your penthouse.
+ With your order recived your mother is quickly black bagged and brought to your penthouse.
<<case "Lost father">>
- With your order recived your father is quickly black baged and brought to your penthouse.
+ With your order recived your father is quickly black bagged and brought to your penthouse.
<<case "Held POW">>
- With your order recived the POW is quickly black baged and brought to your penthouse.
+ With your order recived the POW is quickly black bagged and brought to your penthouse.
<<case "female recruit">>
You complete the legalities and biometric scanning quickly and without fuss. $activeSlave.slaveName bounces nervously on her heels. Finally she works up her courage and asks, <<if $HeadGirl.clothes != "no clothing">>"Can I have <<if $HeadGirl.clothes == "choosing her own clothes">>a cute outfit<<else>>$HeadGirl.clothes<</if>> like $HeadGirl.slaveName?"<<else>>"Can I work with $HeadGirl.slaveName?"<</if>> Your sternly tell her to call you <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>, to ask questions only with permission, and to strip. She looks at $HeadGirl.slaveName, but $HeadGirl.slaveName returns her look with no compassion at all and tells her to do what you say. Looking suddenly fearful, $activeSlave.slaveName strips. Once your inspection of her body reaches her anus, she becomes suddenly nervous. "A-am I going to have t-to do butt stuff, <<Master>>?"
<<case "male recruit">>
@@ -1973,11 +1973,11 @@ Every push, every desperate contraction must be agonizing to her. Fortunately yo
<<replace "#result">>
<<switch $recruit>>
<<case "Lost mother">>
- With your order recived your mother is quickly black baged and sent to your bidder.
+ With your order recived your mother is quickly black bagged and sent to your bidder.
<<case "Lost father">>
- With your order recived your father is quickly black baged and sent to your bidder.
+ With your order recived your father is quickly black bagged and sent to your bidder.
<<case "Held POW">>
- With your order recived the POW is quickly black baged and sent to your bidder.
+ With your order recived the POW is quickly black bagged and sent to your bidder.
<<case "female recruit">>
You complete the legalities and biometric scanning quickly and without fuss. $activeSlave.slaveName bounces nervously on her heels. Finally she works up her courage and asks, <<if $HeadGirl.clothes != "no clothing">>"Can I have <<if $HeadGirl.clothes == "choosing her own clothes">>a cute outfit<<else>>$HeadGirl.clothes<</if>> like $HeadGirl.slaveName?"<<else>>"Can I work with $HeadGirl.slaveName?"<</if>> Your answer appears in the form of a purchasing agent, here to take her away. As he restrains the disbelieving girl, you tell her she's been purchased by a brothel, so she's going to be fucked about 70,000 times before she gets to be too old and is retired, so she can be sure she won't be bored. She releases a wail of utter despair, quickly cut off by a sturdy bag being fastened over her head.
<<case "male recruit">>