Skip to content
Snippets Groups Projects
Commit affb045c authored by Pregmodder's avatar Pregmodder
Browse files

Merge branch 'pregmod-master' into 'pregmod-master'

Pregmod v1021-57

See merge request !861
parents e6963258 3dd9f1b8
No related branches found
No related tags found
2 merge requests!1155Pregmod master,!861Pregmod v1021-57
...@@ -471,11 +471,11 @@ ...@@ -471,11 +471,11 @@
<</if>> <</if>>
<<if $inbreeding == 1>> <<if $inbreeding == 1>>
<<if $activeSlave.face > -100 && random(1,100) > 60>> <<if $activeSlave.face > -100 && random(1,100) > 60>>
<<set $activeSlave.face -= random(2,40)>> <<set $activeSlave.face -= random(2,20)>>
<</if>> <</if>>
<<if $activeSlave.intelligence > -3 && random(1,100) < 60>> <<if $activeSlave.intelligence > -3 && random(1,100) < 40>>
<<set $activeSlave.intelligence -= 1>> <<set $activeSlave.intelligence -= 1>>
<<if $activeSlave.intelligence > -3 && random(1,100) < 30>> <<if $activeSlave.intelligence > -3 && random(1,100) < 20>>
<<set $activeSlave.intelligence -= 1>> <<set $activeSlave.intelligence -= 1>>
<</if>> <</if>>
<</if>> <</if>>
...@@ -497,12 +497,12 @@ ...@@ -497,12 +497,12 @@
<<set $activeSlave.intelligence = $mergeMom.intelligence>> <<set $activeSlave.intelligence = $mergeMom.intelligence>>
<</if>> <</if>>
<<if $inbreeding == 1>> <<if $inbreeding == 1>>
<<if $activeSlave.face > -100 && random(1,100) < 70>> <<if $activeSlave.face > -100 && random(1,100) < 50>>
<<set $activeSlave.face -= random(5,40)>> <<set $activeSlave.face -= random(5,20)>>
<</if>> <</if>>
<<if $activeSlave.intelligence > -3 && random(1,100) < 90>> <<if $activeSlave.intelligence > -3 && random(1,100) < 50>>
<<set $activeSlave.intelligence -= 1>> <<set $activeSlave.intelligence -= 1>>
<<if $activeSlave.intelligence > -3 && random(1,100) < 60>> <<if $activeSlave.intelligence > -3 && random(1,100) < 30>>
<<set $activeSlave.intelligence -= 1>> <<set $activeSlave.intelligence -= 1>>
<</if>> <</if>>
<</if>> <</if>>
......
...@@ -35,8 +35,8 @@ ...@@ -35,8 +35,8 @@
<<if $securityForceArcologyUpgrades >=4>>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ''Hangar:''<</if>> <<if $securityForceArcologyUpgrades >=4>>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ''Hangar:''<</if>>
/* 7 upgrades */ <<nobr>><<if $securityForceAircraftPower == 0 && $securityForceArcologyUpgrades >=4>>The aerial fleet primarily consists of light transport VTOLs equipped with non-lethal weaponry.<<elseif $securityForceAircraftPower == 1>>The aerial fleet's light transport VTOLs have been upgraded with additional fire-power and lethal weaponry.<<elseif $securityForceAircraftPower == 2>>The aerial fleet's VTOLs have been upgraded to higher-capacity variants with heavier weaponry.<<elseif $securityForceAircraftPower == 3>>The aerial fleet's medium transport VTOLs have been upgraded with enhanced armour and customized cargo compartments to better transport captured stock.<<elseif $securityForceAircraftPower == 4>>The aerial fleet has acquired specialized attack VTOLs to complement and escort its advanced transport fleet, as well as to provide close air support.<<elseif $securityForceAircraftPower == 5>>The aerial fleet has upgraded its attack VTOLs for enhanced lethality, and further improved the armour and armament of its transport VTOLs, ensuring that the airfleet of the $securityForceName is amongst the most capable still in operation in the area.<<elseif $securityForceAircraftPower == 6>>The aerial fleet has upgraded its attack VTOLs for enhanced lethality/speed, and further improved the armour and armament of its transport VTOLs, ensuring that the airfleet of the $securityForceName is amongst the most capable still in operation in the area.<<elseif $securityForceAircraftPower == 7>>The aerial fleet has 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 the $securityForceName is amongst the most capable still in operation in the area.<</if>> /* 7 upgrades */ <<nobr>><<if $securityForceAircraftPower == 0 && $securityForceArcologyUpgrades >=4>>The aerial fleet primarily consists of light transport VTOLs equipped with non-lethal weaponry.<<elseif $securityForceAircraftPower == 1>>The aerial fleet's light transport VTOLs have been upgraded with additional fire-power and lethal weaponry.<<elseif $securityForceAircraftPower == 2>>The aerial fleet's VTOLs have been upgraded to higher-capacity variants with heavier weaponry.<<elseif $securityForceAircraftPower == 3>>The aerial fleet's medium transport VTOLs have been upgraded with enhanced armour and customized cargo compartments to better transport captured stock.<<elseif $securityForceAircraftPower == 4>>The aerial fleet has acquired specialized attack VTOLs to complement and escort its advanced transport fleet, as well as to provide close air support.<<elseif $securityForceAircraftPower == 5>>The aerial fleet has upgraded its attack VTOLs for enhanced lethality, and further improved the armour and armament of its transport VTOLs, ensuring that the airfleet of the $securityForceName is amongst the most capable still in operation in the area.<<elseif $securityForceAircraftPower == 6>>The aerial fleet has upgraded its attack VTOLs for enhanced lethality/speed, and further improved the armour and armament of its transport VTOLs, ensuring that the airfleet of the $securityForceName is amongst the most capable still in operation in the area.<<elseif $securityForceAircraftPower == 7>>The aerial fleet has 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 the $securityForceName is amongst the most capable still in operation in the area.<</if>>
/* 8 upgrades */ <<if $securityForceSpacePlanePower == 1>>A basic two engine SpacePlane has been 'borrowed' from the old world.<<elseif $securityForceSpacePlanePower == 2>>Upgraded the Space Plane's shielding, reducing both potential heat damage and radar signature.<<elseif $securityForceSpacePlanePower == 3>>Mounted another engine on top of the Space Plane's tail.<<elseif $securityForceSpacePlanePower == 4>>Modernised the elecontrics.<<elseif $securityForceSpacePlanePower == 5>>Modernised the fuel lines to increase efficency.<<elseif $securityForceSpacePlanePower == 6>>Modernised the Space Plane's engines to allow for more efficent fuel.<<elseif $securityForceSpacePlanePower == 7>>Reduced Space Plane's weight and reworked the body to reduce drag.<<elseif $securityForceSpacePlanePower == 8>>Increased the SpacePlane's crew comfort and life support systems to increase operational time.<</if>> /* 8 upgrades */ <<if $securityForceSpacePlanePower == 1>>A basic two engine SpacePlane has been 'borrowed' from the old world.<<elseif $securityForceSpacePlanePower == 2>>Upgraded the Space Plane's shielding, reducing both potential heat damage and radar signature.<<elseif $securityForceSpacePlanePower == 3>>Mounted another engine on top of the Space Plane's tail.<<elseif $securityForceSpacePlanePower == 4>>Modernised the elecontrics.<<elseif $securityForceSpacePlanePower == 5>>Modernised the fuel lines to increase efficency.<<elseif $securityForceSpacePlanePower == 6>>Modernised the Space Plane's engines to allow for more efficent fuel.<<elseif $securityForceSpacePlanePower == 7>>Reduced Space Plane's weight and reworked the body to reduce drag.<<elseif $securityForceSpacePlanePower == 8>>Increased the SpacePlane's crew comfort and life support systems to increase operational time.<</if>>
/* 3 upgrades */ <<if $securityForceFortressZeppelin == 1>>A basic Fortress Zeppelin has been 'borrowed' from the old world.<<elsif $securityForceFortressZeppelin == 2>>Modernised the armor.<<elseif $securityForceFortressZeppelin == 3>>Modernised the weaponry.<</if>> /* 3 upgrades */ <<if $securityForceFortressZeppelin == 1>>A basic Fortress Zeppelin has been 'borrowed' from the old world.<<elseif $securityForceFortressZeppelin == 2>>Modernised the armor.<<elseif $securityForceFortressZeppelin == 3>>Modernised the weaponry.<</if>>
/* 5 upgrades */ <<if $securityForceAC130 == 1>>A basic AC-130 has been 'borrowed' from the old world.<<elsif $securityForceAC130 == 2>>Modernised the AC-130's armor.<<elseif $securityForceAC130 == 3>>Modernised the AC-130's weaponry.<<elseif $securityForceAC130 == 4>>Modernised the AC-130's eletronics.<<elseif $securityForceAC130 == 5>>Modernised the AC-130's crew seating.<</if>><</nobr>> /* 5 upgrades */ <<if $securityForceAC130 == 1>>A basic AC-130 has been 'borrowed' from the old world.<<elseif $securityForceAC130 == 2>>Modernised the AC-130's armor.<<elseif $securityForceAC130 == 3>>Modernised the AC-130's weaponry.<<elseif $securityForceAC130 == 4>>Modernised the AC-130's eletronics.<<elseif $securityForceAC130 == 5>>Modernised the AC-130's crew seating.<</if>><</nobr>>
<<nobr>><<if $securityForceArcologyUpgrades >= 2>>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ''Drone Bay:''<</if>> <<nobr>><<if $securityForceArcologyUpgrades >= 2>>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ''Drone Bay:''<</if>>
/* 6 upgrades */ <br><<if $securityForceDronePower == 0>>The drone bay contains a small number of 're-purposed' non-military drones from the arcology's original contingent.<<elseif $securityForceDronePower == 1>>The drone bay has replaced the security drones with basic, lightly-armoured military combat models possessing integrated small arms.<<elseif $securityForceDronePower == 2>>The drone bay has replaced its basic military drones with more advanced models and added a number of support drones carrying heavy weaponry to its fleet.<<elseif $securityForceDronePower == 3>>The drone bay has acquired even more advanced models of both the standard combat drones and the heavy support drones, and expanded its numbers of both.<<elseif $securityForceDronePower == 4>>The drone bay has acted to upgrade both the standard and support models of drones to carry basic electromagnetic weaponry, improving their overall combat effectiveness.<<elseif $securityForceDronePower == 5>>The drone bay has 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.<<elseif $securityForceDronePower == 6>>The drone bay has acquired even lighter advanced armoured combat Drones with electromagnetic weaponry, advanced heavy Drones with electromagnetic support weaponry, and specialized Drones for reconnaissance, capture, and swarm tactics.<</if>><</nobr>> /* 6 upgrades */ <br><<if $securityForceDronePower == 0>>The drone bay contains a small number of 're-purposed' non-military drones from the arcology's original contingent.<<elseif $securityForceDronePower == 1>>The drone bay has replaced the security drones with basic, lightly-armoured military combat models possessing integrated small arms.<<elseif $securityForceDronePower == 2>>The drone bay has replaced its basic military drones with more advanced models and added a number of support drones carrying heavy weaponry to its fleet.<<elseif $securityForceDronePower == 3>>The drone bay has acquired even more advanced models of both the standard combat drones and the heavy support drones, and expanded its numbers of both.<<elseif $securityForceDronePower == 4>>The drone bay has acted to upgrade both the standard and support models of drones to carry basic electromagnetic weaponry, improving their overall combat effectiveness.<<elseif $securityForceDronePower == 5>>The drone bay has 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.<<elseif $securityForceDronePower == 6>>The drone bay has acquired even lighter advanced armoured combat Drones with electromagnetic weaponry, advanced heavy Drones with electromagnetic support weaponry, and specialized Drones for reconnaissance, capture, and swarm tactics.<</if>><</nobr>>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment