1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-02 14:36:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

1. Bugfix - Vince's medkits had their statuses reset to zero with the new version of the JA:DG mercs

Browse Source 
2. Bugfix - Dr. Q's 4th trait was removed with the new version of the JA:DG mercs
3. 7.62x51mm ammo box sizes increased to 22.
4. P4-P9Item files removed.
5. USE_XML_TILESETS and NUM_P_ITEMS options added to Ja2Options.ini
6. USE_XML_TILESETS removed from ja2.ini 


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1445 4f8fa57e-7814-0410-bad4-adc449f26b7c
This commit is contained in:
MaddMugsy
2012-05-30 10:16:15 +00:00
parent f64bdf01a1
commit a80e4000cd
32 changed files with 183 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gamedir/Data-1.13/TableData/AttachmentComboMerges.xml
+108
View File
@@ -5,6 +5,24 @@
<usItem>305</usItem>
<usAttachment1>306</usAttachment1>
<usAttachment2>0</usAttachment2>
<usAttachment3>0</usAttachment3>
<usAttachment4>0</usAttachment4>
<usAttachment5>0</usAttachment5>
<usAttachment6>0</usAttachment6>
<usAttachment7>0</usAttachment7>
<usAttachment8>0</usAttachment8>
<usAttachment9>0</usAttachment9>
<usAttachment10>0</usAttachment10>
<usAttachment11>0</usAttachment11>
<usAttachment12>0</usAttachment12>
<usAttachment13>0</usAttachment13>
<usAttachment14>0</usAttachment14>
<usAttachment15>0</usAttachment15>
<usAttachment16>0</usAttachment16>
<usAttachment17>0</usAttachment17>
<usAttachment18>0</usAttachment18>
<usAttachment19>0</usAttachment19>
<usAttachment20>0</usAttachment20>
<usResult>307</usResult>
</ATTACHMENTCOMBOMERGE>
<ATTACHMENTCOMBOMERGE>
@@ -12,6 +30,24 @@
<usItem>308</usItem>
<usAttachment1>309</usAttachment1>
<usAttachment2>304</usAttachment2>
<usAttachment3>0</usAttachment3>
<usAttachment4>0</usAttachment4>
<usAttachment5>0</usAttachment5>
<usAttachment6>0</usAttachment6>
<usAttachment7>0</usAttachment7>
<usAttachment8>0</usAttachment8>
<usAttachment9>0</usAttachment9>
<usAttachment10>0</usAttachment10>
<usAttachment11>0</usAttachment11>
<usAttachment12>0</usAttachment12>
<usAttachment13>0</usAttachment13>
<usAttachment14>0</usAttachment14>
<usAttachment15>0</usAttachment15>
<usAttachment16>0</usAttachment16>
<usAttachment17>0</usAttachment17>
<usAttachment18>0</usAttachment18>
<usAttachment19>0</usAttachment19>
<usAttachment20>0</usAttachment20>
<usResult>310</usResult>
</ATTACHMENTCOMBOMERGE>
<ATTACHMENTCOMBOMERGE>
@@ -19,6 +55,24 @@
<usItem>318</usItem>
<usAttachment1>319</usAttachment1>
<usAttachment2>320</usAttachment2>
<usAttachment3>0</usAttachment3>
<usAttachment4>0</usAttachment4>
<usAttachment5>0</usAttachment5>
<usAttachment6>0</usAttachment6>
<usAttachment7>0</usAttachment7>
<usAttachment8>0</usAttachment8>
<usAttachment9>0</usAttachment9>
<usAttachment10>0</usAttachment10>
<usAttachment11>0</usAttachment11>
<usAttachment12>0</usAttachment12>
<usAttachment13>0</usAttachment13>
<usAttachment14>0</usAttachment14>
<usAttachment15>0</usAttachment15>
<usAttachment16>0</usAttachment16>
<usAttachment17>0</usAttachment17>
<usAttachment18>0</usAttachment18>
<usAttachment19>0</usAttachment19>
<usAttachment20>0</usAttachment20>
<usResult>321</usResult>
</ATTACHMENTCOMBOMERGE>
<ATTACHMENTCOMBOMERGE>
@@ -26,6 +80,24 @@
<usItem>315</usItem>
<usAttachment1>316</usAttachment1>
<usAttachment2>0</usAttachment2>
<usAttachment3>0</usAttachment3>
<usAttachment4>0</usAttachment4>
<usAttachment5>0</usAttachment5>
<usAttachment6>0</usAttachment6>
<usAttachment7>0</usAttachment7>
<usAttachment8>0</usAttachment8>
<usAttachment9>0</usAttachment9>
<usAttachment10>0</usAttachment10>
<usAttachment11>0</usAttachment11>
<usAttachment12>0</usAttachment12>
<usAttachment13>0</usAttachment13>
<usAttachment14>0</usAttachment14>
<usAttachment15>0</usAttachment15>
<usAttachment16>0</usAttachment16>
<usAttachment17>0</usAttachment17>
<usAttachment18>0</usAttachment18>
<usAttachment19>0</usAttachment19>
<usAttachment20>0</usAttachment20>
<usResult>317</usResult>
</ATTACHMENTCOMBOMERGE>
<ATTACHMENTCOMBOMERGE>
@@ -33,6 +105,24 @@
<usItem>264</usItem>
<usAttachment1>316</usAttachment1>
<usAttachment2>0</usAttachment2>
<usAttachment3>0</usAttachment3>
<usAttachment4>0</usAttachment4>
<usAttachment5>0</usAttachment5>
<usAttachment6>0</usAttachment6>
<usAttachment7>0</usAttachment7>
<usAttachment8>0</usAttachment8>
<usAttachment9>0</usAttachment9>
<usAttachment10>0</usAttachment10>
<usAttachment11>0</usAttachment11>
<usAttachment12>0</usAttachment12>
<usAttachment13>0</usAttachment13>
<usAttachment14>0</usAttachment14>
<usAttachment15>0</usAttachment15>
<usAttachment16>0</usAttachment16>
<usAttachment17>0</usAttachment17>
<usAttachment18>0</usAttachment18>
<usAttachment19>0</usAttachment19>
<usAttachment20>0</usAttachment20>
<usResult>223</usResult>
</ATTACHMENTCOMBOMERGE>
<ATTACHMENTCOMBOMERGE>
@@ -40,6 +130,24 @@
<usItem>1360</usItem>
<usAttachment1>1360</usAttachment1>
<usAttachment2>1360</usAttachment2>
<usAttachment3>0</usAttachment3>
<usAttachment4>0</usAttachment4>
<usAttachment5>0</usAttachment5>
<usAttachment6>0</usAttachment6>
<usAttachment7>0</usAttachment7>
<usAttachment8>0</usAttachment8>
<usAttachment9>0</usAttachment9>
<usAttachment10>0</usAttachment10>
<usAttachment11>0</usAttachment11>
<usAttachment12>0</usAttachment12>
<usAttachment13>0</usAttachment13>
<usAttachment14>0</usAttachment14>
<usAttachment15>0</usAttachment15>
<usAttachment16>0</usAttachment16>
<usAttachment17>0</usAttachment17>
<usAttachment18>0</usAttachment18>
<usAttachment19>0</usAttachment19>
<usAttachment20>0</usAttachment20>
<usResult>1360</usResult>
</ATTACHMENTCOMBOMERGE>
</ATTACHMENTCOMBOMERGELIST>
gamedir/Data-1.13/TableData/Items.xml
+18 -19
View File
@@ -12,6 +12,15 @@
<nasAttachmentClass>0</nasAttachmentClass>
<nasLayoutClass>0</nasLayoutClass>
<AvailableAttachmentPoint>0</AvailableAttachmentPoint>
<AvailableAttachmentPoint>0</AvailableAttachmentPoint>
<AvailableAttachmentPoint>0</AvailableAttachmentPoint>
<AvailableAttachmentPoint>0</AvailableAttachmentPoint>
<AvailableAttachmentPoint>0</AvailableAttachmentPoint>
<AvailableAttachmentPoint>0</AvailableAttachmentPoint>
<AvailableAttachmentPoint>0</AvailableAttachmentPoint>
<AvailableAttachmentPoint>0</AvailableAttachmentPoint>
<AvailableAttachmentPoint>0</AvailableAttachmentPoint>
<AvailableAttachmentPoint>0</AvailableAttachmentPoint>
<AttachmentPoint>0</AttachmentPoint>
<AttachToPointAPCost>0</AttachToPointAPCost>
<ubClassIndex>0</ubClassIndex>
@@ -38,6 +47,7 @@
<NotBuyable>1</NotBuyable>
<Attachment>0</Attachment>
<HiddenAttachment>0</HiddenAttachment>
<BlockIronSight>0</BlockIronSight>
<BigGunList>0</BigGunList>
<SciFi>0</SciFi>
<NotInEditor>0</NotInEditor>
@@ -91,16 +101,6 @@
<DefaultAttachment>0</DefaultAttachment>
<DefaultAttachment>0</DefaultAttachment>
<DefaultAttachment>0</DefaultAttachment>
<DefaultAttachment>0</DefaultAttachment>
<DefaultAttachment>0</DefaultAttachment>
<DefaultAttachment>0</DefaultAttachment>
<DefaultAttachment>0</DefaultAttachment>
<DefaultAttachment>0</DefaultAttachment>
<DefaultAttachment>0</DefaultAttachment>
<DefaultAttachment>0</DefaultAttachment>
<DefaultAttachment>0</DefaultAttachment>
<DefaultAttachment>0</DefaultAttachment>
<DefaultAttachment>0</DefaultAttachment>
<BrassKnuckles>0</BrassKnuckles>
<Crowbar>0</Crowbar>
<BloodiedItem>0</BloodiedItem>
@@ -165,7 +165,6 @@
<overheatCooldownModificator>0.0</overheatCooldownModificator>
<overheatJamThresholdModificator>0.0</overheatJamThresholdModificator>
<overheatDamageThresholdModificator>0.0</overheatDamageThresholdModificator>
<BlockIronSight>0</BlockIronSight>
<PoisonPercentage>0</PoisonPercentage>
<STAND_MODIFIERS>
<FlatBase>0</FlatBase>
@@ -8884,7 +8883,7 @@
<uiIndex>310</uiIndex>
<szItemName>Extender</szItemName>
<szLongItemName>Gun Barrel Extender</szLongItemName>
<szItemDesc>attach this nifty chunk of hardware to any gun barrel and watch your range soar.</szItemDesc>
<szItemDesc>Attach this nifty chunk of hardware to any gun barrel and watch your range soar.</szItemDesc>
<szBRName>Gun Barrel Extender</szBRName>
<szBRDesc>Not for sale through BR.</szBRDesc>
<usItemClass>268435456</usItemClass>
@@ -43135,7 +43134,7 @@
<ubGraphicNum>811</ubGraphicNum>
<ubWeight>18</ubWeight>
<ubPerPocket>1</ubPerPocket>
<ItemSize>20</ItemSize>
<ItemSize>22</ItemSize>
<usPrice>375</usPrice>
<ubCoolness>4</ubCoolness>
<Metal>1</Metal>
@@ -43159,7 +43158,7 @@
<ubGraphicNum>812</ubGraphicNum>
<ubWeight>18</ubWeight>
<ubPerPocket>1</ubPerPocket>
<ItemSize>20</ItemSize>
<ItemSize>22</ItemSize>
<usPrice>250</usPrice>
<ubCoolness>4</ubCoolness>
<Metal>1</Metal>
@@ -43183,7 +43182,7 @@
<ubGraphicNum>811</ubGraphicNum>
<ubWeight>18</ubWeight>
<ubPerPocket>1</ubPerPocket>
<ItemSize>20</ItemSize>
<ItemSize>22</ItemSize>
<usPrice>336</usPrice>
<ubCoolness>5</ubCoolness>
<Metal>1</Metal>
@@ -43209,7 +43208,7 @@
<ubGraphicNum>812</ubGraphicNum>
<ubWeight>18</ubWeight>
<ubPerPocket>1</ubPerPocket>
<ItemSize>20</ItemSize>
<ItemSize>22</ItemSize>
<usPrice>225</usPrice>
<ubCoolness>5</ubCoolness>
<Metal>1</Metal>
@@ -43235,7 +43234,7 @@
<ubGraphicNum>813</ubGraphicNum>
<ubWeight>18</ubWeight>
<ubPerPocket>1</ubPerPocket>
<ItemSize>20</ItemSize>
<ItemSize>22</ItemSize>
<usPrice>875</usPrice>
<ubCoolness>6</ubCoolness>
<Metal>1</Metal>
@@ -43260,7 +43259,7 @@
<ubGraphicNum>814</ubGraphicNum>
<ubWeight>18</ubWeight>
<ubPerPocket>1</ubPerPocket>
<ItemSize>20</ItemSize>
<ItemSize>22</ItemSize>
<usPrice>500</usPrice>
<ubCoolness>6</ubCoolness>
<Metal>1</Metal>
@@ -43288,7 +43287,7 @@
<ubGraphicNum>815</ubGraphicNum>
<ubWeight>18</ubWeight>
<ubPerPocket>1</ubPerPocket>
<ItemSize>20</ItemSize>
<ItemSize>22</ItemSize>
<usPrice>750</usPrice>
<ubCoolness>6</ubCoolness>
<Metal>1</Metal>
gamedir/Data-1.13/TableData/MercProfiles.xml
+1
View File
@@ -2911,6 +2911,7 @@
<bNewSkillTrait1>6</bNewSkillTrait1>
<bNewSkillTrait2>6</bNewSkillTrait2>
<bNewSkillTrait3>9</bNewSkillTrait3>
<bNewSkillTrait4>13</bNewSkillTrait4>
<bBuddy1>255</bBuddy1>
<bBuddy2>255</bBuddy2>
<bBuddy3>255</bBuddy3>
gamedir/Data-1.13/TableData/MercStartingGear.xml
+2 -2
View File
@@ -15179,11 +15179,11 @@
<mWeaponDrop>0</mWeaponDrop>
<mWeaponStatus>0</mWeaponStatus>
<mBig0>202</mBig0>
<mBig0Status>1</mBig0Status>
<mBig0Status>100</mBig0Status>
<mBig0Quantity>1</mBig0Quantity>
<mBig0Drop>1</mBig0Drop>
<mBig1>201</mBig1>
<mBig1Status>1</mBig1Status>
<mBig1Status>100</mBig1Status>
<mBig1Quantity>2</mBig1Quantity>
<mBig1Drop>1</mBig1Drop>
<mBig2>0</mBig2>