Skip to content

Commit 73afc16

Browse files
authored
Merge pull request #6540 from IllianiCBT/spaConnections
Added AToW Wealth, Connections, Unlucky*, and Reputation Traits; Combat Sense, and Combat Paralysis SPAs; Integrated These Into CamOps Reputation
2 parents 27b936d + a1adf2c commit 73afc16

File tree

63 files changed

+2960
-1973
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+2960
-1973
lines changed

MekHQ/data/universe/academies/Dragon Knight Orbital University.xml

-287
This file was deleted.

MekHQ/data/universe/defaultspa.xml

+45-6
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,7 @@
208208
<lookupName>gunnery_ballistic</lookupName>
209209
<xpCost>100</xpCost>
210210
<weight>1</weight>
211-
<invalidAbilities>weapon_specialist</invalidAbilities>
212-
<invalidAbilities>specialist</invalidAbilities>
211+
<invalidAbilities>weapon_specialist::specialist</invalidAbilities>
213212
<skillPrereq>
214213
<skill>Gunnery/Mek::Green</skill>
215214
<skill>Gunnery/ProtoMek::Green</skill>
@@ -224,8 +223,7 @@
224223
<lookupName>gunnery_missile</lookupName>
225224
<xpCost>100</xpCost>
226225
<weight>1</weight>
227-
<invalidAbilities>weapon_specialist</invalidAbilities>
228-
<invalidAbilities>specialist</invalidAbilities>
226+
<invalidAbilities>weapon_specialist::specialist</invalidAbilities>
229227
<skillPrereq>
230228
<skill>Gunnery/Mek::Green</skill>
231229
<skill>Gunnery/ProtoMek::Green</skill>
@@ -240,8 +238,7 @@
240238
<lookupName>gunnery_laser</lookupName>
241239
<xpCost>100</xpCost>
242240
<weight>1</weight>
243-
<invalidAbilities>weapon_specialist</invalidAbilities>
244-
<invalidAbilities>specialist</invalidAbilities>
241+
<invalidAbilities>weapon_specialist::specialist</invalidAbilities>
245242
<skillPrereq>
246243
<skill>Gunnery/Mek::Green</skill>
247244
<skill>Gunnery/ProtoMek::Green</skill>
@@ -538,6 +535,48 @@
538535
<skill>Gunnery/Vehicle::Regular</skill>
539536
</skillPrereq>
540537
</ability>
538+
<ability>
539+
<lookupName>atow_combat_paralysis</lookupName>
540+
<xpCost>-400</xpCost>
541+
<weight>1</weight>
542+
<desc>Unit Reputation is decreased by 1 if this character is the campaign commander.
543+
544+
A pilot who has Combat Sense rolls three dice per initiative check, keeping the top two rolls.
545+
546+
If individual initiative is enabled, this penalty applies only to the pilot's unit. Otherwise, the penalty is applied only if the pilot's unit is the force commander.
547+
</desc>
548+
<skillPrereq/>
549+
<removeAbilities>atow_combat_sense</removeAbilities>
550+
</ability>
551+
<ability>
552+
<lookupName>atow_combat_sense</lookupName>
553+
<xpCost>400</xpCost>
554+
<weight>1</weight>
555+
<desc>Unit Reputation is increased by 1 if this character is the campaign commander.
556+
557+
A pilot who has Combat Sense rolls three dice per initiative check, keeping the top two rolls.
558+
559+
If individual initiative is enabled, this bonus applies only to the pilot's unit. Otherwise, the bonus is applied only if the pilot's unit is the force commander.
560+
</desc>
561+
<skillPrereq>
562+
<skill>Gunnery/Mek::Veteran</skill>
563+
<skill>Piloting/Aircraft::Veteran</skill>
564+
<skill>Gunnery/Spacecraft::Veteran</skill>
565+
<skill>Piloting/Spacecraft::Veteran</skill>
566+
<skill>Piloting/Mek::Veteran</skill>
567+
<skill>Piloting/VTOL::Veteran</skill>
568+
<skill>Piloting/Naval::Veteran</skill>
569+
<skill>Gunnery/BattleArmor::Veteran</skill>
570+
<skill>Gunnery/Aerospace::Veteran</skill>
571+
<skill>Piloting/Aerospace::Veteran</skill>
572+
<skill>Gunnery/ProtoMek::Veteran</skill>
573+
<skill>Anti-Mek::Veteran</skill>
574+
<skill>Piloting/Ground Vehicle::Veteran</skill>
575+
<skill>Gunnery/Aircraft::Veteran</skill>
576+
<skill>Gunnery/Vehicle::Veteran</skill>
577+
</skillPrereq>
578+
<removeAbilities>atow_combat_paralysis</removeAbilities>
579+
</ability>
541580
<ability>
542581
<lookupName>tactical_genius</lookupName>
543582
<xpCost>150</xpCost>

0 commit comments

Comments
 (0)