New merc (somewhat): Similar to Larry's two personalities, Buns now has an alternate personality as well.

For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=tree&th=23806&goto=354149&#msg_354149

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2430 4f8fa57e-7814-0410-bad4-adc449f26b7c
This commit is contained in:
Flugente
2018-07-25 20:11:27 +00:00
parent 4a9405b227
commit 6b5e1b7aa4
124 changed files with 502 additions and 431 deletions
@@ -1291,9 +1291,9 @@
</AIM>
<AIM>
<uiIndex>215</uiIndex>
<description></description>
<description>Buns</description>
<ProfilId>-1</ProfilId>
<AimBioID>-1</AimBioID>
<AimBioID>17</AimBioID>
</AIM>
<AIM>
<uiIndex>216</uiIndex>
+15 -18
View File
@@ -416,24 +416,12 @@
<uiIndex>17</uiIndex>
<szName>Nurse/Soldier/Shooter</szName>
<szShortName>Nurse/Soldier/Shooter</szShortName>
<szDescription>That combination will definitely spice up your resume.</szDescription>
<wisdom>2</wisdom>
<agility>2</agility>
<dexterity>3</dexterity>
<marksmanship>8</marksmanship>
<medical>7</medical>
<szDescription>That combination definitely spices up your resume.</szDescription>
<ap_inventory>-10</ap_inventory>
<resistance_disease>5</resistance_disease>
<resistance_fear>8</resistance_fear>
<resistance_suppression>3</resistance_suppression>
<resistance_physical>3</resistance_physical>
<speed_bandaging>30</speed_bandaging>
<marksmanship>2</marksmanship>
<disease_diagnose>10</disease_diagnose>
<carrystrength>6</carrystrength>
<spotter>5</spotter>
<travel_foot>4</travel_foot>
<ap_fortify>-3</ap_fortify>
<carrystrength>3</carrystrength>
<prisonguard>10</prisonguard>
<increased_maxcth>3</increased_maxcth>
<smoker>2</smoker>
<no_male>1</no_male>
@@ -4102,11 +4090,20 @@
<no_female>1</no_female>
</BACKGROUND>
<!-- Empty -->
<!-- chaotic Buns -->
<BACKGROUND>
<uiIndex>215</uiIndex>
<szName>Placeholder</szName>
<szShortName>Placeholder</szShortName>
<szDescription>Not needed!</szDescription>
<szName>Split personality</szName>
<szShortName>Split personality</szShortName>
<szDescription>Since contracting PTSD, Buns involuntarily switches to a second&#10;personality under high stress. Her alternate persona is highly aggressive.</szDescription>
<ap_assault>6</ap_assault>
<resistance_fear>20</resistance_fear>
<resistance_physical>10</resistance_physical>
<interrogation>20</interrogation>
<cth_blades>10</cth_blades>
<stealth>5</stealth>
<fortify_assignment>-25</fortify_assignment>
<smoker>1</smoker>
<no_male>1</no_male>
<no_female>1</no_female>
</BACKGROUND>
+20 -1
View File
@@ -28,6 +28,7 @@
<fCanReInfect>0</fCanReInfect>
<fHideSymbol>0</fHideSymbol>
<fDisgusting>1</fDisgusting>
<fSpecialFlagPTSDBuns>0</fSpecialFlagPTSDBuns>
<sEffStatAGI>0</sEffStatAGI>
<sEffStatDEX>0</sEffStatDEX>
<sEffStatSTR>0</sEffStatSTR>
@@ -71,6 +72,7 @@
<fCanReInfect>0</fCanReInfect>
<fHideSymbol>0</fHideSymbol>
<fDisgusting>1</fDisgusting>
<fSpecialFlagPTSDBuns>0</fSpecialFlagPTSDBuns>
<sEffStatAGI>0</sEffStatAGI>
<sEffStatDEX>0</sEffStatDEX>
<sEffStatSTR>0</sEffStatSTR>
@@ -114,6 +116,7 @@
<fCanReInfect>0</fCanReInfect>
<fHideSymbol>0</fHideSymbol>
<fDisgusting>0</fDisgusting>
<fSpecialFlagPTSDBuns>0</fSpecialFlagPTSDBuns>
<sEffStatAGI>0</sEffStatAGI>
<sEffStatDEX>-10</sEffStatDEX>
<sEffStatSTR>0</sEffStatSTR>
@@ -157,6 +160,7 @@
<fCanReInfect>0</fCanReInfect>
<fHideSymbol>0</fHideSymbol>
<fDisgusting>0</fDisgusting>
<fSpecialFlagPTSDBuns>0</fSpecialFlagPTSDBuns>
<sEffStatAGI>0</sEffStatAGI>
<sEffStatDEX>-30</sEffStatDEX>
<sEffStatSTR>0</sEffStatSTR>
@@ -200,6 +204,7 @@
<fCanReInfect>0</fCanReInfect>
<fHideSymbol>0</fHideSymbol>
<fDisgusting>1</fDisgusting>
<fSpecialFlagPTSDBuns>0</fSpecialFlagPTSDBuns>
<sEffStatAGI>0</sEffStatAGI>
<sEffStatDEX>0</sEffStatDEX>
<sEffStatSTR>-7</sEffStatSTR>
@@ -243,6 +248,7 @@
<fCanReInfect>0</fCanReInfect>
<fHideSymbol>0</fHideSymbol>
<fDisgusting>1</fDisgusting>
<fSpecialFlagPTSDBuns>0</fSpecialFlagPTSDBuns>
<sEffStatAGI>0</sEffStatAGI>
<sEffStatDEX>0</sEffStatDEX>
<sEffStatSTR>0</sEffStatSTR>
@@ -287,6 +293,7 @@
<fCanReInfect>0</fCanReInfect>
<fHideSymbol>0</fHideSymbol>
<fDisgusting>1</fDisgusting>
<fSpecialFlagPTSDBuns>0</fSpecialFlagPTSDBuns>
<sEffStatAGI>0</sEffStatAGI>
<sEffStatDEX>0</sEffStatDEX>
<sEffStatSTR>0</sEffStatSTR>
@@ -330,6 +337,7 @@
<fCanReInfect>0</fCanReInfect>
<fHideSymbol>0</fHideSymbol>
<fDisgusting>1</fDisgusting>
<fSpecialFlagPTSDBuns>0</fSpecialFlagPTSDBuns>
<sEffStatAGI>-10</sEffStatAGI>
<sEffStatDEX>0</sEffStatDEX>
<sEffStatSTR>0</sEffStatSTR>
@@ -373,6 +381,7 @@
<fCanReInfect>1</fCanReInfect>
<fHideSymbol>0</fHideSymbol>
<fDisgusting>1</fDisgusting>
<fSpecialFlagPTSDBuns>0</fSpecialFlagPTSDBuns>
<sEffStatAGI>0</sEffStatAGI>
<sEffStatDEX>0</sEffStatDEX>
<sEffStatSTR>0</sEffStatSTR>
@@ -416,6 +425,7 @@
<fCanReInfect>0</fCanReInfect>
<fHideSymbol>0</fHideSymbol>
<fDisgusting>0</fDisgusting>
<fSpecialFlagPTSDBuns>0</fSpecialFlagPTSDBuns>
<sEffStatAGI>-5</sEffStatAGI>
<sEffStatDEX>-5</sEffStatDEX>
<sEffStatSTR>0</sEffStatSTR>
@@ -459,6 +469,7 @@
<fCanReInfect>1</fCanReInfect>
<fHideSymbol>1</fHideSymbol>
<fDisgusting>0</fDisgusting>
<fSpecialFlagPTSDBuns>0</fSpecialFlagPTSDBuns>
<sEffStatAGI>0</sEffStatAGI>
<sEffStatDEX>0</sEffStatDEX>
<sEffStatSTR>0</sEffStatSTR>
@@ -494,7 +505,7 @@
<InfectionChance_WOUND_DEX>0</InfectionChance_WOUND_DEX>
<InfectionChance_WOUND_STR>0</InfectionChance_WOUND_STR>
<InfectionChance_WOUND_WIS>50</InfectionChance_WOUND_WIS>
<InfectionChance_WOUND_TRAUMATIC>10</InfectionChance_WOUND_TRAUMATIC>
<InfectionChance_WOUND_TRAUMATIC>40</InfectionChance_WOUND_TRAUMATIC>
<InfectionChance_BADFOOD>0</InfectionChance_BADFOOD>
<InfectionChance_BADWATER>0</InfectionChance_BADWATER>
<fCanBeCured>0</fCanBeCured>
@@ -502,6 +513,7 @@
<fCanReInfect>0</fCanReInfect>
<fHideSymbol>1</fHideSymbol>
<fDisgusting>0</fDisgusting>
<fSpecialFlagPTSDBuns>1</fSpecialFlagPTSDBuns>
<sEffStatAGI>0</sEffStatAGI>
<sEffStatDEX>0</sEffStatDEX>
<sEffStatSTR>0</sEffStatSTR>
@@ -545,6 +557,7 @@
<fCanReInfect>1</fCanReInfect>
<fHideSymbol>1</fHideSymbol>
<fDisgusting>0</fDisgusting>
<fSpecialFlagPTSDBuns>0</fSpecialFlagPTSDBuns>
<sEffStatAGI>-50</sEffStatAGI>
<sEffStatDEX>0</sEffStatDEX>
<sEffStatSTR>0</sEffStatSTR>
@@ -588,6 +601,7 @@
<fCanReInfect>1</fCanReInfect>
<fHideSymbol>1</fHideSymbol>
<fDisgusting>0</fDisgusting>
<fSpecialFlagPTSDBuns>0</fSpecialFlagPTSDBuns>
<sEffStatAGI>0</sEffStatAGI>
<sEffStatDEX>-20</sEffStatDEX>
<sEffStatSTR>0</sEffStatSTR>
@@ -631,6 +645,7 @@
<fCanReInfect>1</fCanReInfect>
<fHideSymbol>1</fHideSymbol>
<fDisgusting>0</fDisgusting>
<fSpecialFlagPTSDBuns>0</fSpecialFlagPTSDBuns>
<sEffStatAGI>0</sEffStatAGI>
<sEffStatDEX>0</sEffStatDEX>
<sEffStatSTR>-20</sEffStatSTR>
@@ -646,6 +661,7 @@
<moralemodifier>1.0</moralemodifier>
</DISEASE>
<DISEASE>
<!-- we receive this via drug consumption -->
<uiIndex>15</uiIndex>
<szName>Drug Addiction</szName>
<szFatName>|D|r|u|g |A|d|d|i|c|t|i|o|n</szFatName>
@@ -674,6 +690,7 @@
<fCanReInfect>1</fCanReInfect>
<fHideSymbol>1</fHideSymbol>
<fDisgusting>1</fDisgusting>
<fSpecialFlagPTSDBuns>0</fSpecialFlagPTSDBuns>
<sEffStatAGI>-20</sEffStatAGI>
<sEffStatDEX>-40</sEffStatDEX>
<sEffStatSTR>-20</sEffStatSTR>
@@ -717,6 +734,7 @@
<fCanReInfect>1</fCanReInfect>
<fHideSymbol>1</fHideSymbol>
<fDisgusting>0</fDisgusting>
<fSpecialFlagPTSDBuns>0</fSpecialFlagPTSDBuns>
<sEffStatAGI>-20</sEffStatAGI>
<sEffStatDEX>0</sEffStatDEX>
<sEffStatSTR>0</sEffStatSTR>
@@ -761,6 +779,7 @@
<fCanReInfect>1</fCanReInfect>
<fHideSymbol>1</fHideSymbol>
<fDisgusting>0</fDisgusting>
<fSpecialFlagPTSDBuns>0</fSpecialFlagPTSDBuns>
<sEffStatAGI>0</sEffStatAGI>
<sEffStatDEX>0</sEffStatDEX>
<sEffStatSTR>0</sEffStatSTR>
+1 -1
View File
@@ -1076,7 +1076,7 @@
</NAME>
<NAME>
<uiIndex>215</uiIndex>
<description></description>
<description>Buns</description>
<Hidden>0</Hidden>
</NAME>
<NAME>
@@ -23612,6 +23612,7 @@
</GEARKIT>
</MERCGEAR>
<MERCGEAR>
<!-- chaotic Buns, doesn't need dedicated starting gear as you can only hire normal Buns -->
<mIndex>215</mIndex>
<mName />
<GEARKIT>
File diff suppressed because it is too large Load Diff
+85 -81
View File
@@ -136,7 +136,7 @@
<!-- (0) Not -->
<!-- (1) Somewhat -->
<!-- (2) Very -->
<!-- (3) Genleman -->
<!-- (3) Gentleman -->
<!-- Carelevels (Appearance, Refinement, HatedNationality -->
@@ -192,7 +192,10 @@
IRAQI, // 40
SYRIAN,
BELGIAN,
PORTOGUESE, -->
PORTOGUESE,
BELARUSIAN_NAT,
SERBIAN_NAT, // 45
PAISTANI_NAT, -->
<MERCPROFILES>
<PROFILE>
@@ -18385,8 +18388,8 @@
<bEvolution>0</bEvolution>
<bOldSkillTrait>0</bOldSkillTrait>
<bOldSkillTrait2>0</bOldSkillTrait2>
<bNewSkillTrait1>20</bNewSkillTrait1>
<bNewSkillTrait2>0</bNewSkillTrait2>
<bNewSkillTrait1>9</bNewSkillTrait1>
<bNewSkillTrait2>20</bNewSkillTrait2>
<bNewSkillTrait3>0</bNewSkillTrait3>
<bBuddy1>247</bBuddy1>
<bBuddy2>255</bBuddy2>
@@ -20821,98 +20824,99 @@
</PROFILE>
<PROFILE>
<uiIndex>215</uiIndex>
<Type>0</Type>
<zName></zName>
<zNickname></zNickname>
<ubFaceIndex>215</ubFaceIndex>
<Type>1</Type>
<zName>Monica "Buns" Sondergaard</zName>
<zNickname>Buns</zNickname>
<ubFaceIndex>17</ubFaceIndex>
<usVoiceIndex>215</usVoiceIndex>
<usEyesX>0</usEyesX>
<usEyesY>0</usEyesY>
<usMouthX>0</usMouthX>
<usMouthY>0</usMouthY>
<usEyesX>12</usEyesX>
<usEyesY>10</usEyesY>
<usMouthX>10</usMouthX>
<usMouthY>28</usMouthY>
<uiEyeDelay>0</uiEyeDelay>
<uiMouthDelay>0</uiMouthDelay>
<uiBlinkFrequency>0</uiBlinkFrequency>
<uiExpressionFrequency>0</uiExpressionFrequency>
<PANTS></PANTS>
<VEST></VEST>
<SKIN></SKIN>
<HAIR></HAIR>
<bSex>0</bSex>
<ubBodyType>0</ubBodyType>
<uiBlinkFrequency>3000</uiBlinkFrequency>
<uiExpressionFrequency>2000</uiExpressionFrequency>
<PANTS>TANPANTS</PANTS>
<VEST>WHITEVEST</VEST>
<SKIN>PINKSKIN</SKIN>
<HAIR>BROWNHEAD</HAIR>
<bSex>1</bSex>
<ubBodyType>3</ubBodyType>
<uiBodyTypeSubFlags>0</uiBodyTypeSubFlags>
<bAttitude>0</bAttitude>
<bCharacterTrait>0</bCharacterTrait>
<bDisability>0</bDisability>
<ubNeedForSleep>0</ubNeedForSleep>
<bReputationTolerance>0</bReputationTolerance>
<bDeathRate>0</bDeathRate>
<bLifeMax>0</bLifeMax>
<bLife>0</bLife>
<bStrength>0</bStrength>
<bAgility>0</bAgility>
<bDexterity>0</bDexterity>
<bWisdom>0</bWisdom>
<bMarksmanship>0</bMarksmanship>
<bExplosive>0</bExplosive>
<bLeadership>0</bLeadership>
<bMedical>0</bMedical>
<bMechanical>0</bMechanical>
<bExpLevel>0</bExpLevel>
<bEvolution>0</bEvolution>
<bOldSkillTrait>0</bOldSkillTrait>
<bOldSkillTrait2>0</bOldSkillTrait2>
<bNewSkillTrait1>0</bNewSkillTrait1>
<bNewSkillTrait2>0</bNewSkillTrait2>
<bNewSkillTrait3>0</bNewSkillTrait3>
<bBuddy1>0</bBuddy1>
<bBuddy2>0</bBuddy2>
<bBuddy3>0</bBuddy3>
<bBuddy4>0</bBuddy4>
<bBuddy5>0</bBuddy5>
<bLearnToLike>0</bLearnToLike>
<bLearnToLikeTime>0</bLearnToLikeTime>
<bHated1>0</bHated1>
<bHatedTime1>0</bHatedTime1>
<bHated2>0</bHated2>
<bHatedTime2>0</bHatedTime2>
<bHated3>0</bHated3>
<bAttitude>6</bAttitude>
<bCharacterTrait>11</bCharacterTrait>
<bDisability>12</bDisability>
<ubNeedForSleep>8</ubNeedForSleep>
<bReputationTolerance>65</bReputationTolerance>
<bDeathRate>40</bDeathRate>
<bLifeMax>79</bLifeMax>
<bLife>79</bLife>
<bStrength>59</bStrength>
<bAgility>78</bAgility>
<bDexterity>87</bDexterity>
<bWisdom>93</bWisdom>
<bMarksmanship>78</bMarksmanship>
<bExplosive>52</bExplosive>
<bLeadership>7</bLeadership>
<bMedical>12</bMedical>
<bMechanical>13</bMechanical>
<bExpLevel>2</bExpLevel>
<bEvolution>0</bEvolution>
<bOldSkillTrait>8</bOldSkillTrait>
<bOldSkillTrait2>13</bOldSkillTrait2>
<bNewSkillTrait1>4</bNewSkillTrait1>
<bNewSkillTrait2>11</bNewSkillTrait2>
<bNewSkillTrait3>15</bNewSkillTrait3>
<bBuddy1>255</bBuddy1>
<bBuddy2>255</bBuddy2>
<bBuddy3>255</bBuddy3>
<bBuddy4>255</bBuddy4>
<bBuddy5>255</bBuddy5>
<bLearnToLike>255</bLearnToLike>
<bLearnToLikeTime>255</bLearnToLikeTime>
<bHated1>255</bHated1>
<bHatedTime1>18</bHatedTime1>
<bHated2>255</bHated2>
<bHatedTime2>34</bHatedTime2>
<bHated3>255</bHated3>
<bHatedTime3>0</bHatedTime3>
<bHated4>0</bHated4>
<bHated4>255</bHated4>
<bHatedTime4>0</bHatedTime4>
<bHated5>0</bHated5>
<bHated5>255</bHated5>
<bHatedTime5>0</bHatedTime5>
<bLearnToHate>0</bLearnToHate>
<bLearnToHateTime>0</bLearnToHateTime>
<bLearnToHate>255</bLearnToHate>
<bLearnToHateTime>44</bLearnToHateTime>
<bRace>0</bRace>
<bNationality>0</bNationality>
<bAppearance>0</bAppearance>
<bAppearanceCareLevel>0</bAppearanceCareLevel>
<bRefinement>0</bRefinement>
<bRefinementCareLevel>0</bRefinementCareLevel>
<bHatedNationality>-1</bHatedNationality>
<bHatedNationalityCareLevel>0</bHatedNationalityCareLevel>
<bRacist>0</bRacist>
<bSexist>0</bSexist>
<sSalary>0</sSalary>
<uiWeeklySalary>0</uiWeeklySalary>
<uiBiWeeklySalary>0</uiBiWeeklySalary>
<bMedicalDeposit>0</bMedicalDeposit>
<sMedicalDepositAmount>0</sMedicalDepositAmount>
<usOptionalGearCost>0</usOptionalGearCost>
<bArmourAttractiveness>-1</bArmourAttractiveness>
<bMainGunAttractiveness>-1</bMainGunAttractiveness>
<bNationality>6</bNationality>
<bAppearance>3</bAppearance>
<bAppearanceCareLevel>2</bAppearanceCareLevel>
<bRefinement>2</bRefinement>
<bRefinementCareLevel>2</bRefinementCareLevel>
<bHatedNationality>18</bHatedNationality>
<bHatedNationalityCareLevel>1</bHatedNationalityCareLevel>
<bRacist>2</bRacist>
<bSexist>2</bSexist>
<sSalary>725</sSalary>
<uiWeeklySalary>4700</uiWeeklySalary>
<uiBiWeeklySalary>8500</uiBiWeeklySalary>
<bMedicalDeposit>1</bMedicalDeposit>
<sMedicalDepositAmount>1800</sMedicalDepositAmount>
<usOptionalGearCost>1979</usOptionalGearCost>
<bArmourAttractiveness>30</bArmourAttractiveness>
<bMainGunAttractiveness>45</bMainGunAttractiveness>
<fGoodGuy>0</fGoodGuy>
<usApproachFactorFriendly>0</usApproachFactorFriendly>
<usApproachFactorDirect>0</usApproachFactorDirect>
<usApproachFactorThreaten>0</usApproachFactorThreaten>
<usApproachFactorRecruit>0</usApproachFactorRecruit>
<usApproachFactorFriendly>25</usApproachFactorFriendly>
<usApproachFactorDirect>65</usApproachFactorDirect>
<usApproachFactorThreaten>200</usApproachFactorThreaten>
<usApproachFactorRecruit>50</usApproachFactorRecruit>
<sSectorX>0</sSectorX>
<sSectorY>0</sSectorY>
<sSectorZ>0</sSectorZ>
<ubCivilianGroup>0</ubCivilianGroup>
<bTown>0</bTown>
<bTownAttachment>0</bTownAttachment>
<usBackground>215</usBackground>
</PROFILE>
<PROFILE>
<uiIndex>216</uiIndex>
+7 -7
View File
@@ -2366,14 +2366,14 @@
</PROFILE>
<PROFILE>
<uiIndex>215</uiIndex>
<Name></Name>
<Name>Buns</Name>
<QuoteExpHeadShotOnly>0</QuoteExpHeadShotOnly>
<QuoteExpTeamSpecific>0</QuoteExpTeamSpecific>
<QuoteExpGenderCode>0</QuoteExpGenderCode>
<QuoteExpGotGunOrUsedGun>0</QuoteExpGotGunOrUsedGun>
<QuoteExpPassingDislike>0</QuoteExpPassingDislike>
<QuoteExpWitnessQueenBugDeath>0</QuoteExpWitnessQueenBugDeath>
<QuoteExpWitnessDeidrannaDeath>0</QuoteExpWitnessDeidrannaDeath>
<QuoteExpTeamSpecific>1</QuoteExpTeamSpecific>
<QuoteExpGenderCode>2</QuoteExpGenderCode>
<QuoteExpGotGunOrUsedGun>62</QuoteExpGotGunOrUsedGun>
<QuoteExpPassingDislike>3</QuoteExpPassingDislike>
<QuoteExpWitnessQueenBugDeath>1</QuoteExpWitnessQueenBugDeath>
<QuoteExpWitnessDeidrannaDeath>1</QuoteExpWitnessDeidrannaDeath>
</PROFILE>
<PROFILE>
<uiIndex>216</uiIndex>
@@ -1076,8 +1076,8 @@
</PROFILE>
<PROFILE>
<uiIndex>215</uiIndex>
<Name></Name>
<EnabledSound>0</EnabledSound>
<Name>Buns</Name>
<EnabledSound>1</EnabledSound>
</PROFILE>
<PROFILE>
<uiIndex>216</uiIndex>