1dot13/gamedir
1
0
Fork 0
mirror of https://github.com/1dot13/gamedir.git synced 2026-07-22 13:40:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #97 from kitty624/dev-gamedir

Browse Source 
New item PPE Bag
This commit is contained in:
Kitty
2024-11-07 08:14:14 +01:00
committed by GitHub
parent b9f77e8483 0981111ab4
commit 157ca0fc8f
12 changed files with 213 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Data-1.13/BigItems/p2item244.sti
BIN
View File
Binary file not shown.
Data-1.13/BigItems/p2item245.sti
BIN
View File
Binary file not shown.
Data-1.13/Interface/MDP2ITEMS.STI
BIN
View File
Binary file not shown.
Data-1.13/TableData/Inventory/MercStartingGear.xml
+17 -5
View File
@@ -2306,12 +2306,12 @@
<mBig2Quantity>3</mBig2Quantity> <mBig2Quantity>3</mBig2Quantity>
<mSmall0>201</mSmall0> <mSmall0>201</mSmall0>
<mSmall1>214</mSmall1> <mSmall1>214</mSmall1>
<mSmall5>1710</mSmall5> <mSmall5>1764</mSmall5>
<mSmall6>1711</mSmall6> <mSmall6>1712</mSmall6>
<mSmall7>1712</mSmall7> <mSmall7>1712</mSmall7>
<lVest>1090</lVest> <lVest>1090</lVest>
<lLeftThigh>1091</lLeftThigh> <lLeftThigh>1091</lLeftThigh>
<lRightThigh>1091</lRightThigh> <lRightThigh>1205</lRightThigh>
<lCPack>1098</lCPack> <lCPack>1098</lCPack>
</GEARKIT> </GEARKIT>
<GEARKIT> <GEARKIT>
@@ -2333,8 +2333,8 @@
<mSmall3Quantity>2</mSmall3Quantity> <mSmall3Quantity>2</mSmall3Quantity>
<mSmall4>75</mSmall4> <mSmall4>75</mSmall4>
<mSmall4Quantity>2</mSmall4Quantity> <mSmall4Quantity>2</mSmall4Quantity>
<mSmall5>1710</mSmall5> <mSmall5>1764</mSmall5>
<mSmall6>1711</mSmall6> <mSmall6>1712</mSmall6>
<mSmall7>1712</mSmall7> <mSmall7>1712</mSmall7>
<lVest>1090</lVest> <lVest>1090</lVest>
<lLeftThigh>1092</lLeftThigh> <lLeftThigh>1092</lLeftThigh>
@@ -25206,7 +25206,13 @@
<mSmall1>71</mSmall1> <mSmall1>71</mSmall1>
<mSmall1Status>100</mSmall1Status> <mSmall1Status>100</mSmall1Status>
<mSmall1Quantity>1</mSmall1Quantity> <mSmall1Quantity>1</mSmall1Quantity>
<mSmall2>1764</mSmall2>
<mSmall2Status>100</mSmall2Status>
<mSmall2Quantity>1</mSmall2Quantity>
<lVest>1090</lVest>
<lVestStatus>100</lVestStatus>
<lLeftThigh>1091</lLeftThigh> <lLeftThigh>1091</lLeftThigh>
<lLeftThighStatus>100</lLeftThighStatus>
<lRightThigh>1204</lRightThigh> <lRightThigh>1204</lRightThigh>
<lRightThighStatus>92</lRightThighStatus> <lRightThighStatus>92</lRightThighStatus>
</GEARKIT> </GEARKIT>
@@ -28632,6 +28638,12 @@
<mSmall0Quantity>2</mSmall0Quantity> <mSmall0Quantity>2</mSmall0Quantity>
<mSmall3>1756</mSmall3> <mSmall3>1756</mSmall3>
<mSmall3Quantity>2</mSmall3Quantity> <mSmall3Quantity>2</mSmall3Quantity>
<mSmall4>1764</mSmall4>
<mSmall4Status>100</mSmall4Status>
<mSmall4Quantity>1</mSmall4Quantity>
<mSmall5>1758</mSmall5>
<mSmall5Status>100</mSmall5Status>
<mSmall5Quantity>1</mSmall5Quantity>
<lVest>1090</lVest> <lVest>1090</lVest>
<lVestStatus>99</lVestStatus> <lVestStatus>99</lVestStatus>
<lRightThigh>1200</lRightThigh> <lRightThigh>1200</lRightThigh>
Data-1.13/TableData/Items/AttachmentComboMerges.xml
+46 -21
View File
@@ -2,8 +2,8 @@
<ATTACHMENTCOMBOMERGELIST> <ATTACHMENTCOMBOMERGELIST>
<ATTACHMENTCOMBOMERGE> <ATTACHMENTCOMBOMERGE>
<uiIndex>0</uiIndex> <uiIndex>0</uiIndex>
<usItem>305</usItem> <usItem>305</usItem> <!-- Aluminum Rod -->
<usAttachment1>306</usAttachment1> <usAttachment1>306</usAttachment1> <!-- Spring -->
<usAttachment2>0</usAttachment2> <usAttachment2>0</usAttachment2>
<usAttachment3>0</usAttachment3> <usAttachment3>0</usAttachment3>
<usAttachment4>0</usAttachment4> <usAttachment4>0</usAttachment4>
@@ -23,13 +23,13 @@
<usAttachment18>0</usAttachment18> <usAttachment18>0</usAttachment18>
<usAttachment19>0</usAttachment19> <usAttachment19>0</usAttachment19>
<usAttachment20>0</usAttachment20> <usAttachment20>0</usAttachment20>
<usResult>307</usResult> <usResult>307</usResult> <!-- Rod & Spring -->
</ATTACHMENTCOMBOMERGE> </ATTACHMENTCOMBOMERGE>
<ATTACHMENTCOMBOMERGE> <ATTACHMENTCOMBOMERGE>
<uiIndex>1</uiIndex> <uiIndex>1</uiIndex>
<usItem>308</usItem> <usItem>308</usItem> <!-- Steel Tube -->
<usAttachment1>309</usAttachment1> <usAttachment1>309</usAttachment1> <!-- Glue -->
<usAttachment2>304</usAttachment2> <usAttachment2>304</usAttachment2> <!-- Duct Tape -->
<usAttachment3>0</usAttachment3> <usAttachment3>0</usAttachment3>
<usAttachment4>0</usAttachment4> <usAttachment4>0</usAttachment4>
<usAttachment5>0</usAttachment5> <usAttachment5>0</usAttachment5>
@@ -48,13 +48,13 @@
<usAttachment18>0</usAttachment18> <usAttachment18>0</usAttachment18>
<usAttachment19>0</usAttachment19> <usAttachment19>0</usAttachment19>
<usAttachment20>0</usAttachment20> <usAttachment20>0</usAttachment20>
<usResult>310</usResult> <usResult>310</usResult> <!-- Gun Barrel Extender -->
</ATTACHMENTCOMBOMERGE> </ATTACHMENTCOMBOMERGE>
<ATTACHMENTCOMBOMERGE> <ATTACHMENTCOMBOMERGE>
<uiIndex>2</uiIndex> <uiIndex>2</uiIndex>
<usItem>318</usItem> <usItem>318</usItem> <!-- FumblePak -->
<usAttachment1>319</usAttachment1> <usAttachment1>319</usAttachment1> <!-- X-ray Tube -->
<usAttachment2>320</usAttachment2> <usAttachment2>320</usAttachment2> <!-- Pack of Gum -->
<usAttachment3>0</usAttachment3> <usAttachment3>0</usAttachment3>
<usAttachment4>0</usAttachment4> <usAttachment4>0</usAttachment4>
<usAttachment5>0</usAttachment5> <usAttachment5>0</usAttachment5>
@@ -73,12 +73,12 @@
<usAttachment18>0</usAttachment18> <usAttachment18>0</usAttachment18>
<usAttachment19>0</usAttachment19> <usAttachment19>0</usAttachment19>
<usAttachment20>0</usAttachment20> <usAttachment20>0</usAttachment20>
<usResult>321</usResult> <usResult>321</usResult> <!-- X-ray Device -->
</ATTACHMENTCOMBOMERGE> </ATTACHMENTCOMBOMERGE>
<ATTACHMENTCOMBOMERGE> <ATTACHMENTCOMBOMERGE>
<uiIndex>3</uiIndex> <uiIndex>3</uiIndex>
<usItem>315</usItem> <usItem>315</usItem> <!-- LameBoy Display -->
<usAttachment1>316</usAttachment1> <usAttachment1>316</usAttachment1> <!-- Copper Wire -->
<usAttachment2>0</usAttachment2> <usAttachment2>0</usAttachment2>
<usAttachment3>0</usAttachment3> <usAttachment3>0</usAttachment3>
<usAttachment4>0</usAttachment4> <usAttachment4>0</usAttachment4>
@@ -98,12 +98,12 @@
<usAttachment18>0</usAttachment18> <usAttachment18>0</usAttachment18>
<usAttachment19>0</usAttachment19> <usAttachment19>0</usAttachment19>
<usAttachment20>0</usAttachment20> <usAttachment20>0</usAttachment20>
<usResult>317</usResult> <usResult>317</usResult> <!-- Display Unit -->
</ATTACHMENTCOMBOMERGE> </ATTACHMENTCOMBOMERGE>
<ATTACHMENTCOMBOMERGE> <ATTACHMENTCOMBOMERGE>
<uiIndex>4</uiIndex> <uiIndex>4</uiIndex>
<usItem>264</usItem> <usItem>264</usItem> <!-- Platinum Watch -->
<usAttachment1>316</usAttachment1> <usAttachment1>316</usAttachment1> <!-- Copper Wire -->
<usAttachment2>0</usAttachment2> <usAttachment2>0</usAttachment2>
<usAttachment3>0</usAttachment3> <usAttachment3>0</usAttachment3>
<usAttachment4>0</usAttachment4> <usAttachment4>0</usAttachment4>
@@ -123,13 +123,13 @@
<usAttachment18>0</usAttachment18> <usAttachment18>0</usAttachment18>
<usAttachment19>0</usAttachment19> <usAttachment19>0</usAttachment19>
<usAttachment20>0</usAttachment20> <usAttachment20>0</usAttachment20>
<usResult>223</usResult> <usResult>223</usResult> <!-- Detonator -->
</ATTACHMENTCOMBOMERGE> </ATTACHMENTCOMBOMERGE>
<ATTACHMENTCOMBOMERGE> <ATTACHMENTCOMBOMERGE>
<uiIndex>5</uiIndex> <uiIndex>5</uiIndex>
<usItem>1360</usItem> <usItem>1360</usItem> <!-- MERC Wrist Watch -->
<usAttachment1>1360</usAttachment1> <usAttachment1>1360</usAttachment1> <!-- MERC Wrist Watch -->
<usAttachment2>1360</usAttachment2> <usAttachment2>1360</usAttachment2> <!-- MERC Wrist Watch -->
<usAttachment3>0</usAttachment3> <usAttachment3>0</usAttachment3>
<usAttachment4>0</usAttachment4> <usAttachment4>0</usAttachment4>
<usAttachment5>0</usAttachment5> <usAttachment5>0</usAttachment5>
@@ -148,6 +148,31 @@
<usAttachment18>0</usAttachment18> <usAttachment18>0</usAttachment18>
<usAttachment19>0</usAttachment19> <usAttachment19>0</usAttachment19>
<usAttachment20>0</usAttachment20> <usAttachment20>0</usAttachment20>
<usResult>1360</usResult> <usResult>1360</usResult> <!-- MERC Wrist Watch -->
</ATTACHMENTCOMBOMERGE>
<ATTACHMENTCOMBOMERGE>
<uiIndex>6</uiIndex>
<usItem>1763</usItem> <!-- Empy PPE Bag -->
<usAttachment1>1710</usAttachment1> <!-- Surgical mask -->
<usAttachment2>1711</usAttachment2> <!-- Surgical gloves -->
<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>1764</usResult> <!-- PPE Bag -->
</ATTACHMENTCOMBOMERGE> </ATTACHMENTCOMBOMERGE>
</ATTACHMENTCOMBOMERGELIST> </ATTACHMENTCOMBOMERGELIST>
Data-1.13/TableData/Items/Items.xml
+66
View File
@@ -51302,6 +51302,9 @@
<szBRDesc>If you are a doctor or live in an Asian mega-city, you will need these.</szBRDesc> <szBRDesc>If you are a doctor or live in an Asian mega-city, you will need these.</szBRDesc>
<usItemClass>268435456</usItemClass> <usItemClass>268435456</usItemClass>
<nasLayoutClass>1</nasLayoutClass> <nasLayoutClass>1</nasLayoutClass>
<nasAttachmentClass>1</nasAttachmentClass>
<AttachmentPoint>8</AttachmentPoint>
<AttachToPointAPCost>15</AttachToPointAPCost>
<ubGraphicType>2</ubGraphicType> <ubGraphicType>2</ubGraphicType>
<ubGraphicNum>224</ubGraphicNum> <ubGraphicNum>224</ubGraphicNum>
<ubWeight>1</ubWeight> <ubWeight>1</ubWeight>
@@ -51311,7 +51314,10 @@
<ubCoolness>3</ubCoolness> <ubCoolness>3</ubCoolness>
<Damageable>1</Damageable> <Damageable>1</Damageable>
<WaterDamages>1</WaterDamages> <WaterDamages>1</WaterDamages>
<Sinks>1</Sinks>
<ShowStatus>1</ShowStatus>
<Medical>1</Medical> <Medical>1</Medical>
<Attachment>1</Attachment>
<BR_NewInventory>20</BR_NewInventory> <BR_NewInventory>20</BR_NewInventory>
<diseaseprotectionface>1</diseaseprotectionface> <diseaseprotectionface>1</diseaseprotectionface>
<DiseaseSystemExclusive>1</DiseaseSystemExclusive> <DiseaseSystemExclusive>1</DiseaseSystemExclusive>
@@ -51328,6 +51334,10 @@
<szBRDesc>Useful for doctors. Not for keeping your hands warm.</szBRDesc> <szBRDesc>Useful for doctors. Not for keeping your hands warm.</szBRDesc>
<usItemClass>268435456</usItemClass> <usItemClass>268435456</usItemClass>
<nasLayoutClass>1</nasLayoutClass> <nasLayoutClass>1</nasLayoutClass>
<nasAttachmentClass>1</nasAttachmentClass>
<AttachmentPoint>8</AttachmentPoint>
<AttachToPointAPCost>15</AttachToPointAPCost>
<Attachment>1</Attachment>
<ubGraphicType>2</ubGraphicType> <ubGraphicType>2</ubGraphicType>
<ubGraphicNum>225</ubGraphicNum> <ubGraphicNum>225</ubGraphicNum>
<ubWeight>1</ubWeight> <ubWeight>1</ubWeight>
@@ -51337,7 +51347,10 @@
<ubCoolness>3</ubCoolness> <ubCoolness>3</ubCoolness>
<Damageable>1</Damageable> <Damageable>1</Damageable>
<WaterDamages>1</WaterDamages> <WaterDamages>1</WaterDamages>
<Sinks>1</Sinks>
<ShowStatus>1</ShowStatus>
<Medical>1</Medical> <Medical>1</Medical>
<Attachment>1</Attachment>
<BR_NewInventory>20</BR_NewInventory> <BR_NewInventory>20</BR_NewInventory>
<diseaseprotectionhand>1</diseaseprotectionhand> <diseaseprotectionhand>1</diseaseprotectionhand>
<DiseaseSystemExclusive>1</DiseaseSystemExclusive> <DiseaseSystemExclusive>1</DiseaseSystemExclusive>
@@ -52781,4 +52794,57 @@
<CROUCH_MODIFIERS /> <CROUCH_MODIFIERS />
<PRONE_MODIFIERS /> <PRONE_MODIFIERS />
</ITEM> </ITEM>
<ITEM>
<uiIndex>1763</uiIndex>
<szItemName>Empty PPE Bag</szItemName>
<szLongItemName>Empty PPE Bag</szLongItemName>
<szItemDesc>Protect your PPE from wear and tear. Safely store masks and gloves and keep your inventory tidy. Perfect for a long tour in unhealthy conditions.</szItemDesc>
<szBRName>Empty PPE Bag</szBRName>
<szBRDesc>Perfect storage for masks and gloves, keep your inventory tidy and your PPE in prime condition. Mask and gloves not included.</szBRDesc>
<usItemClass>268435456</usItemClass>
<nasLayoutClass>1</nasLayoutClass>
<AvailableAttachmentPoint>8</AvailableAttachmentPoint>
<ubGraphicType>2</ubGraphicType>
<ubGraphicNum>244</ubGraphicNum>
<ubWeight>4</ubWeight>
<ubPerPocket>1</ubPerPocket>
<ItemSize>11</ItemSize>
<usPrice>20</usPrice>
<ubCoolness>3</ubCoolness>
<Medical>1</Medical>
<Sinks>1</Sinks>
<ShowStatus>1</ShowStatus>
<BR_NewInventory>20</BR_NewInventory>
<BR_UsedInventory>3</BR_UsedInventory>
<DiseaseSystemExclusive>1</DiseaseSystemExclusive>
<STAND_MODIFIERS />
<CROUCH_MODIFIERS />
<PRONE_MODIFIERS />
</ITEM>
<ITEM>
<uiIndex>1764</uiIndex>
<szItemName>PPE Bag</szItemName>
<szLongItemName>PPE Bag</szLongItemName>
<szItemDesc>This small bag holds minimum PPE (mask and gloves), protecting against infection risk born by airborne diseases and contact with infected persons. Perfect for frolicing through a disease riddled country.</szItemDesc>
<szBRName>PPE Bag</szBRName>
<szBRDesc>Not for sale through BR.</szBRDesc>
<usItemClass>268435456</usItemClass>
<nasLayoutClass>1</nasLayoutClass>
<ubGraphicType>2</ubGraphicType>
<ubGraphicNum>245</ubGraphicNum>
<ubWeight>5</ubWeight>
<ubPerPocket>1</ubPerPocket>
<ItemSize>11</ItemSize>
<usPrice>25</usPrice>
<ubCoolness>4</ubCoolness>
<Medical>1</Medical>
<Sinks>1</Sinks>
<ShowStatus>1</ShowStatus>
<diseaseprotectionface>1</diseaseprotectionface>
<diseaseprotectionhand>1</diseaseprotectionhand>
<DiseaseSystemExclusive>1</DiseaseSystemExclusive>
<STAND_MODIFIERS />
<CROUCH_MODIFIERS />
<PRONE_MODIFIERS />
</ITEM>
</ITEMLIST> </ITEMLIST>
Data-1.13/TableData/Items/Merges.xml
+12 -12
View File
@@ -2073,17 +2073,17 @@
<APCost>20</APCost> <APCost>20</APCost>
</MERGE> </MERGE>
<MERGE> <MERGE>
<firstItemIndex>299</firstItemIndex> <firstItemIndex>299</firstItemIndex> <!-- Utility Knife -->
<secondItemIndex>1016</secondItemIndex> <secondItemIndex>1016</secondItemIndex> <!-- Gameboy -->
<firstResultingItemIndex>315</firstResultingItemIndex> <firstResultingItemIndex>315</firstResultingItemIndex> <!-- LameBoy Display -->
<secondResultingItemIndex>0</secondResultingItemIndex> <secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType> <mergeType>6</mergeType>
<APCost>60</APCost> <APCost>60</APCost>
</MERGE> </MERGE>
<MERGE> <MERGE>
<firstItemIndex>299</firstItemIndex> <firstItemIndex>299</firstItemIndex> <!-- Utility Knife -->
<secondItemIndex>267</secondItemIndex> <secondItemIndex>267</secondItemIndex> <!-- Portable TV -->
<firstResultingItemIndex>318</firstResultingItemIndex> <firstResultingItemIndex>318</firstResultingItemIndex> <!-- FumblePack -->
<secondResultingItemIndex>0</secondResultingItemIndex> <secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType> <mergeType>6</mergeType>
<APCost>60</APCost> <APCost>60</APCost>
@@ -2585,17 +2585,17 @@
<APCost>32</APCost> <APCost>32</APCost>
</MERGE> </MERGE>
<MERGE> <MERGE>
<firstItemIndex>317</firstItemIndex> <firstItemIndex>317</firstItemIndex> <!-- Display Unit -->
<secondItemIndex>321</secondItemIndex> <secondItemIndex>321</secondItemIndex> <!-- X-ray Device -->
<firstResultingItemIndex>324</firstResultingItemIndex> <firstResultingItemIndex>324</firstResultingItemIndex> <!-- X-ray Detector -->
<secondResultingItemIndex>0</secondResultingItemIndex> <secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>5</mergeType> <mergeType>5</mergeType>
<APCost>32</APCost> <APCost>32</APCost>
</MERGE> </MERGE>
<MERGE> <MERGE>
<firstItemIndex>321</firstItemIndex> <firstItemIndex>321</firstItemIndex> <!-- X-ray Device -->
<secondItemIndex>317</secondItemIndex> <secondItemIndex>317</secondItemIndex> <!-- Display Unit -->
<firstResultingItemIndex>324</firstResultingItemIndex> <firstResultingItemIndex>324</firstResultingItemIndex> <!-- X-ray Detector -->
<secondResultingItemIndex>0</secondResultingItemIndex> <secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>5</mergeType> <mergeType>5</mergeType>
<APCost>32</APCost> <APCost>32</APCost>
Data-1.13/TableData/NPCInventory/AdditionalDealer_21_Inventory.xml
+20
View File
@@ -160,4 +160,24 @@
<sItemIndex>1728</sItemIndex> <sItemIndex>1728</sItemIndex>
<ubOptimalNumber>1</ubOptimalNumber> <ubOptimalNumber>1</ubOptimalNumber>
</INVENTORY> </INVENTORY>
<INVENTORY>
<uiIndex>32</uiIndex>
<sItemIndex>1710</sItemIndex>
<ubOptimalNumber>3</ubOptimalNumber>
</INVENTORY>
<INVENTORY>
<uiIndex>33</uiIndex>
<sItemIndex>1711</sItemIndex>
<ubOptimalNumber>3</ubOptimalNumber>
</INVENTORY>
<INVENTORY>
<uiIndex>34</uiIndex>
<sItemIndex>1763</sItemIndex>
<ubOptimalNumber>3</ubOptimalNumber>
</INVENTORY>
<INVENTORY>
<uiIndex>35</uiIndex>
<sItemIndex>1764</sItemIndex>
<ubOptimalNumber>1</ubOptimalNumber>
</INVENTORY>
</INVENTORYLIST> </INVENTORYLIST>
Data-1.13/TableData/NPCInventory/AdditionalDealer_28_Inventory.xml
+17 -2
View File
@@ -43,12 +43,12 @@
<INVENTORY> <INVENTORY>
<uiIndex>8</uiIndex> <uiIndex>8</uiIndex>
<sItemIndex>1710</sItemIndex> <sItemIndex>1710</sItemIndex>
<ubOptimalNumber>4</ubOptimalNumber> <ubOptimalNumber>6</ubOptimalNumber>
</INVENTORY> </INVENTORY>
<INVENTORY> <INVENTORY>
<uiIndex>9</uiIndex> <uiIndex>9</uiIndex>
<sItemIndex>1711</sItemIndex> <sItemIndex>1711</sItemIndex>
<ubOptimalNumber>4</ubOptimalNumber> <ubOptimalNumber>6</ubOptimalNumber>
</INVENTORY> </INVENTORY>
<INVENTORY> <INVENTORY>
<uiIndex>10</uiIndex> <uiIndex>10</uiIndex>
@@ -90,4 +90,19 @@
<sItemIndex>1756</sItemIndex> <sItemIndex>1756</sItemIndex>
<ubOptimalNumber>6</ubOptimalNumber> <ubOptimalNumber>6</ubOptimalNumber>
</INVENTORY> </INVENTORY>
<INVENTORY>
<uiIndex>18</uiIndex>
<sItemIndex>1758</sItemIndex>
<ubOptimalNumber>4</ubOptimalNumber>
</INVENTORY>
<INVENTORY>
<uiIndex>19</uiIndex>
<sItemIndex>1763</sItemIndex>
<ubOptimalNumber>4</ubOptimalNumber>
</INVENTORY>
<INVENTORY>
<uiIndex>20</uiIndex>
<sItemIndex>1764</sItemIndex>
<ubOptimalNumber>2</ubOptimalNumber>
</INVENTORY>
</INVENTORYLIST> </INVENTORYLIST>
Data-1.13/TableData/NPCInventory/Merchants.xml
+30 -30
View File
@@ -640,7 +640,7 @@ uiFlags must be of
<szName>additional dealer 3</szName> <szName>additional dealer 3</szName>
<dBuyModifier>1.0</dBuyModifier> <dBuyModifier>1.0</dBuyModifier>
<dSellModifier>1.0</dSellModifier> <dSellModifier>1.0</dSellModifier>
<ubShopKeeperID>255</ubShopKeeperID> <ubShopKeeperID>255</ubShopKeeperID>
<ubTypeOfArmsDealer>0</ubTypeOfArmsDealer> <ubTypeOfArmsDealer>0</ubTypeOfArmsDealer>
<iInitialCash>800</iInitialCash> <iInitialCash>800</iInitialCash>
<uiFlags>268435456</uiFlags> <uiFlags>268435456</uiFlags>
@@ -1017,7 +1017,7 @@ uiFlags must be of
<!-- The inventory files are numbered, for example, slot 40 uses AdditionalDealer_21_Inventory.xml, and so on --> <!-- The inventory files are numbered, for example, slot 40 uses AdditionalDealer_21_Inventory.xml, and so on -->
<MERCHANT> <MERCHANT>
<uiIndex>40</uiIndex> <uiIndex>40</uiIndex>
<szName>A10 bunker rebel quartermaster</szName> <szName>A10 bunker rebel quartermaster</szName> <!-- 21 (AdditionalDealer_21_Inventory.xml) -->
<dBuyModifier>0.2</dBuyModifier> <dBuyModifier>0.2</dBuyModifier>
<dSellModifier>0.5</dSellModifier> <dSellModifier>0.5</dSellModifier>
<ubShopKeeperID>200</ubShopKeeperID> <!-- Important: no profile --> <ubShopKeeperID>200</ubShopKeeperID> <!-- Important: no profile -->
@@ -1040,7 +1040,7 @@ uiFlags must be of
<!-- as there are several stores, we need to set up several merchantes, otherwise they'll share inventory and money --> <!-- as there are several stores, we need to set up several merchantes, otherwise they'll share inventory and money -->
<MERCHANT> <MERCHANT>
<uiIndex>41</uiIndex> <uiIndex>41</uiIndex>
<szName>general store Drassen (D13)</szName> <szName>general store Drassen (D13)</szName> <!-- 22 -->
<dBuyModifier>0.7</dBuyModifier> <dBuyModifier>0.7</dBuyModifier>
<dSellModifier>1.0</dSellModifier> <dSellModifier>1.0</dSellModifier>
<ubShopKeeperID>200</ubShopKeeperID> <ubShopKeeperID>200</ubShopKeeperID>
@@ -1062,7 +1062,7 @@ uiFlags must be of
</MERCHANT> </MERCHANT>
<MERCHANT> <MERCHANT>
<uiIndex>42</uiIndex> <uiIndex>42</uiIndex>
<szName>general store Alma (I14)</szName> <szName>general store Alma (I14)</szName> <!-- 23 -->
<dBuyModifier>0.7</dBuyModifier> <dBuyModifier>0.7</dBuyModifier>
<dSellModifier>1.0</dSellModifier> <dSellModifier>1.0</dSellModifier>
<ubShopKeeperID>200</ubShopKeeperID> <ubShopKeeperID>200</ubShopKeeperID>
@@ -1084,7 +1084,7 @@ uiFlags must be of
</MERCHANT> </MERCHANT>
<MERCHANT> <MERCHANT>
<uiIndex>43</uiIndex> <uiIndex>43</uiIndex>
<szName>general store Cambria (G9)</szName> <szName>general store Cambria (G9)</szName> <!-- 24 -->
<dBuyModifier>0.7</dBuyModifier> <!-- slightly worse than Keith --> <dBuyModifier>0.7</dBuyModifier> <!-- slightly worse than Keith -->
<dSellModifier>1.05</dSellModifier> <dSellModifier>1.05</dSellModifier>
<ubShopKeeperID>200</ubShopKeeperID> <ubShopKeeperID>200</ubShopKeeperID>
@@ -1106,7 +1106,7 @@ uiFlags must be of
</MERCHANT> </MERCHANT>
<MERCHANT> <MERCHANT>
<uiIndex>44</uiIndex> <uiIndex>44</uiIndex>
<szName>general store Grumm (H1)</szName> <szName>general store Grumm (H1)</szName> <!-- 25 -->
<dBuyModifier>0.7</dBuyModifier> <dBuyModifier>0.7</dBuyModifier>
<dSellModifier>1.0</dSellModifier> <dSellModifier>1.0</dSellModifier>
<ubShopKeeperID>200</ubShopKeeperID> <ubShopKeeperID>200</ubShopKeeperID>
@@ -1128,7 +1128,7 @@ uiFlags must be of
</MERCHANT> </MERCHANT>
<MERCHANT> <MERCHANT>
<uiIndex>45</uiIndex> <uiIndex>45</uiIndex>
<szName>general store San Mona (C5)</szName> <szName>general store San Mona (C5)</szName> <!-- 26 -->
<dBuyModifier>0.7</dBuyModifier> <dBuyModifier>0.7</dBuyModifier>
<dSellModifier>1.0</dSellModifier> <dSellModifier>1.0</dSellModifier>
<ubShopKeeperID>200</ubShopKeeperID> <ubShopKeeperID>200</ubShopKeeperID>
@@ -1150,7 +1150,7 @@ uiFlags must be of
</MERCHANT> </MERCHANT>
<MERCHANT> <MERCHANT>
<uiIndex>46</uiIndex> <uiIndex>46</uiIndex>
<szName>posh general store Meduna (O4)</szName> <szName>posh general store Meduna (O4)</szName> <!-- 27 -->
<dBuyModifier>0.7</dBuyModifier> <dBuyModifier>0.7</dBuyModifier>
<dSellModifier>1.0</dSellModifier> <dSellModifier>1.0</dSellModifier>
<ubShopKeeperID>200</ubShopKeeperID> <ubShopKeeperID>200</ubShopKeeperID>
@@ -1172,7 +1172,7 @@ uiFlags must be of
</MERCHANT> </MERCHANT>
<MERCHANT> <MERCHANT>
<uiIndex>47</uiIndex> <uiIndex>47</uiIndex>
<szName>pharmacy Cambria (G9)</szName> <szName>pharmacy Cambria (G9)</szName> <!-- 28 -->
<dBuyModifier>1.0</dBuyModifier> <dBuyModifier>1.0</dBuyModifier>
<dSellModifier>1.0</dSellModifier> <dSellModifier>1.0</dSellModifier>
<ubShopKeeperID>200</ubShopKeeperID> <ubShopKeeperID>200</ubShopKeeperID>
@@ -1194,7 +1194,7 @@ uiFlags must be of
</MERCHANT> </MERCHANT>
<MERCHANT> <MERCHANT>
<uiIndex>48</uiIndex> <uiIndex>48</uiIndex>
<szName>pharmacy Meduna (O4)</szName> <szName>pharmacy Meduna (O4)</szName> <!-- 29 -->
<dBuyModifier>1.0</dBuyModifier> <dBuyModifier>1.0</dBuyModifier>
<dSellModifier>1.0</dSellModifier> <dSellModifier>1.0</dSellModifier>
<ubShopKeeperID>200</ubShopKeeperID> <ubShopKeeperID>200</ubShopKeeperID>
@@ -1216,7 +1216,7 @@ uiFlags must be of
</MERCHANT> </MERCHANT>
<MERCHANT> <MERCHANT>
<uiIndex>49</uiIndex> <uiIndex>49</uiIndex>
<szName>restaurant Cambria (G9)</szName> <szName>restaurant Cambria (G9)</szName> <!-- 30 -->
<dBuyModifier>1.0</dBuyModifier> <dBuyModifier>1.0</dBuyModifier>
<dSellModifier>1.0</dSellModifier> <dSellModifier>1.0</dSellModifier>
<ubShopKeeperID>200</ubShopKeeperID> <ubShopKeeperID>200</ubShopKeeperID>
@@ -1238,7 +1238,7 @@ uiFlags must be of
</MERCHANT> </MERCHANT>
<MERCHANT> <MERCHANT>
<uiIndex>50</uiIndex> <uiIndex>50</uiIndex>
<szName>restaurant Grumm (H1)</szName> <szName>restaurant Grumm (H1)</szName> <!-- 31 -->
<dBuyModifier>1.0</dBuyModifier> <dBuyModifier>1.0</dBuyModifier>
<dSellModifier>1.0</dSellModifier> <dSellModifier>1.0</dSellModifier>
<ubShopKeeperID>200</ubShopKeeperID> <ubShopKeeperID>200</ubShopKeeperID>
@@ -1260,7 +1260,7 @@ uiFlags must be of
</MERCHANT> </MERCHANT>
<MERCHANT> <MERCHANT>
<uiIndex>51</uiIndex> <uiIndex>51</uiIndex>
<szName>restaurant Balime gas station (L10)</szName> <szName>restaurant Balime gas station (L10)</szName> <!-- 32 -->
<dBuyModifier>1.0</dBuyModifier> <dBuyModifier>1.0</dBuyModifier>
<dSellModifier>1.0</dSellModifier> <dSellModifier>1.0</dSellModifier>
<ubShopKeeperID>200</ubShopKeeperID> <ubShopKeeperID>200</ubShopKeeperID>
@@ -1282,7 +1282,7 @@ uiFlags must be of
</MERCHANT> </MERCHANT>
<MERCHANT> <MERCHANT>
<uiIndex>52</uiIndex> <uiIndex>52</uiIndex>
<szName>restaurant San Mona (C5)</szName> <szName>restaurant San Mona (C5)</szName> <!-- 33 -->
<dBuyModifier>1.0</dBuyModifier> <dBuyModifier>1.0</dBuyModifier>
<dSellModifier>1.0</dSellModifier> <dSellModifier>1.0</dSellModifier>
<ubShopKeeperID>200</ubShopKeeperID> <ubShopKeeperID>200</ubShopKeeperID>
@@ -1304,7 +1304,7 @@ uiFlags must be of
</MERCHANT> </MERCHANT>
<MERCHANT> <MERCHANT>
<uiIndex>53</uiIndex> <uiIndex>53</uiIndex>
<szName>restaurant Meduna 1 (O4)</szName> <szName>restaurant Meduna 1 (O4)</szName> <!-- 34 -->
<dBuyModifier>1.0</dBuyModifier> <dBuyModifier>1.0</dBuyModifier>
<dSellModifier>1.0</dSellModifier> <dSellModifier>1.0</dSellModifier>
<ubShopKeeperID>200</ubShopKeeperID> <ubShopKeeperID>200</ubShopKeeperID>
@@ -1326,7 +1326,7 @@ uiFlags must be of
</MERCHANT> </MERCHANT>
<MERCHANT> <MERCHANT>
<uiIndex>54</uiIndex> <uiIndex>54</uiIndex>
<szName>restaurant Meduna 2 (O4)</szName> <szName>restaurant Meduna 2 (O4)</szName> <!-- 35 -->
<dBuyModifier>1.0</dBuyModifier> <dBuyModifier>1.0</dBuyModifier>
<dSellModifier>1.0</dSellModifier> <dSellModifier>1.0</dSellModifier>
<ubShopKeeperID>200</ubShopKeeperID> <ubShopKeeperID>200</ubShopKeeperID>
@@ -1348,7 +1348,7 @@ uiFlags must be of
</MERCHANT> </MERCHANT>
<MERCHANT> <MERCHANT>
<uiIndex>55</uiIndex> <uiIndex>55</uiIndex>
<szName>wine store Drassen (D13)</szName> <szName>wine store Drassen (D13)</szName> <!-- 36 -->
<dBuyModifier>1.0</dBuyModifier> <dBuyModifier>1.0</dBuyModifier>
<dSellModifier>1.0</dSellModifier> <dSellModifier>1.0</dSellModifier>
<ubShopKeeperID>200</ubShopKeeperID> <ubShopKeeperID>200</ubShopKeeperID>
@@ -1370,7 +1370,7 @@ uiFlags must be of
</MERCHANT> </MERCHANT>
<MERCHANT> <MERCHANT>
<uiIndex>56</uiIndex> <uiIndex>56</uiIndex>
<szName>wine store Alma (I14)</szName> <szName>wine store Alma (I14)</szName> <!-- 37 -->
<dBuyModifier>1.0</dBuyModifier> <dBuyModifier>1.0</dBuyModifier>
<dSellModifier>1.0</dSellModifier> <dSellModifier>1.0</dSellModifier>
<ubShopKeeperID>200</ubShopKeeperID> <ubShopKeeperID>200</ubShopKeeperID>
@@ -1392,7 +1392,7 @@ uiFlags must be of
</MERCHANT> </MERCHANT>
<MERCHANT> <MERCHANT>
<uiIndex>57</uiIndex> <uiIndex>57</uiIndex>
<szName>wine store Cambria (G9)</szName> <szName>wine store Cambria (G9)</szName> <!-- 38 -->
<dBuyModifier>1.0</dBuyModifier> <dBuyModifier>1.0</dBuyModifier>
<dSellModifier>1.0</dSellModifier> <dSellModifier>1.0</dSellModifier>
<ubShopKeeperID>200</ubShopKeeperID> <ubShopKeeperID>200</ubShopKeeperID>
@@ -1414,7 +1414,7 @@ uiFlags must be of
</MERCHANT> </MERCHANT>
<MERCHANT> <MERCHANT>
<uiIndex>58</uiIndex> <uiIndex>58</uiIndex>
<szName>wine store Grumm (H1)</szName> <szName>wine store Grumm (H1)</szName> <!-- 39 -->
<dBuyModifier>1.0</dBuyModifier> <dBuyModifier>1.0</dBuyModifier>
<dSellModifier>1.0</dSellModifier> <dSellModifier>1.0</dSellModifier>
<ubShopKeeperID>200</ubShopKeeperID> <ubShopKeeperID>200</ubShopKeeperID>
@@ -1436,7 +1436,7 @@ uiFlags must be of
</MERCHANT> </MERCHANT>
<MERCHANT> <MERCHANT>
<uiIndex>59</uiIndex> <uiIndex>59</uiIndex>
<szName>wine store San Mona (C5)</szName> <szName>wine store San Mona (C5)</szName> <!-- 40 -->
<dBuyModifier>1.0</dBuyModifier> <dBuyModifier>1.0</dBuyModifier>
<dSellModifier>1.0</dSellModifier> <dSellModifier>1.0</dSellModifier>
<ubShopKeeperID>200</ubShopKeeperID> <ubShopKeeperID>200</ubShopKeeperID>
@@ -1458,7 +1458,7 @@ uiFlags must be of
</MERCHANT> </MERCHANT>
<MERCHANT> <MERCHANT>
<uiIndex>60</uiIndex> <uiIndex>60</uiIndex>
<szName>drug dealer Cambria ruins (F9)</szName> <szName>drug dealer Cambria ruins (F9)</szName> <!-- 41 -->
<dBuyModifier>1.0</dBuyModifier> <dBuyModifier>1.0</dBuyModifier>
<dSellModifier>1.3</dSellModifier> <dSellModifier>1.3</dSellModifier>
<ubShopKeeperID>200</ubShopKeeperID> <ubShopKeeperID>200</ubShopKeeperID>
@@ -1480,7 +1480,7 @@ uiFlags must be of
</MERCHANT> </MERCHANT>
<MERCHANT> <MERCHANT>
<uiIndex>61</uiIndex> <uiIndex>61</uiIndex>
<szName>tool shop Grumm (H1)</szName> <szName>tool shop Grumm (H1)</szName> <!-- 42 -->
<dBuyModifier>1.0</dBuyModifier> <dBuyModifier>1.0</dBuyModifier>
<dSellModifier>1.3</dSellModifier> <dSellModifier>1.3</dSellModifier>
<ubShopKeeperID>200</ubShopKeeperID> <ubShopKeeperID>200</ubShopKeeperID>
@@ -1502,7 +1502,7 @@ uiFlags must be of
</MERCHANT> </MERCHANT>
<MERCHANT> <MERCHANT>
<uiIndex>62</uiIndex> <uiIndex>62</uiIndex>
<szName>hunting store San Mona (C6)</szName> <szName>hunting store San Mona (C6)</szName> <!-- 43 -->
<dBuyModifier>1.0</dBuyModifier> <dBuyModifier>1.0</dBuyModifier>
<dSellModifier>1.0</dSellModifier> <dSellModifier>1.0</dSellModifier>
<ubShopKeeperID>200</ubShopKeeperID> <ubShopKeeperID>200</ubShopKeeperID>
@@ -1524,7 +1524,7 @@ uiFlags must be of
</MERCHANT> </MERCHANT>
<MERCHANT> <MERCHANT>
<uiIndex>63</uiIndex> <uiIndex>63</uiIndex>
<szName>construction materials store San Mona (C6)</szName> <szName>construction materials store San Mona (C6)</szName> <!-- 44 -->
<dBuyModifier>1.0</dBuyModifier> <dBuyModifier>1.0</dBuyModifier>
<dSellModifier>1.0</dSellModifier> <dSellModifier>1.0</dSellModifier>
<ubShopKeeperID>200</ubShopKeeperID> <ubShopKeeperID>200</ubShopKeeperID>
@@ -1546,7 +1546,7 @@ uiFlags must be of
</MERCHANT> </MERCHANT>
<MERCHANT> <MERCHANT>
<uiIndex>64</uiIndex> <uiIndex>64</uiIndex>
<szName>luxury store Balime (L12)</szName> <szName>luxury store Balime (L12)</szName> <!-- 45 -->
<dBuyModifier>1.0</dBuyModifier> <dBuyModifier>1.0</dBuyModifier>
<dSellModifier>2.0</dSellModifier> <dSellModifier>2.0</dSellModifier>
<ubShopKeeperID>200</ubShopKeeperID> <ubShopKeeperID>200</ubShopKeeperID>
@@ -1568,7 +1568,7 @@ uiFlags must be of
</MERCHANT> </MERCHANT>
<MERCHANT> <MERCHANT>
<uiIndex>65</uiIndex> <uiIndex>65</uiIndex>
<szName>luxury store Meduna (O4)</szName> <szName>luxury store Meduna (O4)</szName> <!-- 46 -->
<dBuyModifier>1.0</dBuyModifier> <dBuyModifier>1.0</dBuyModifier>
<dSellModifier>2.0</dSellModifier> <dSellModifier>2.0</dSellModifier>
<ubShopKeeperID>200</ubShopKeeperID> <ubShopKeeperID>200</ubShopKeeperID>
@@ -1590,7 +1590,7 @@ uiFlags must be of
</MERCHANT> </MERCHANT>
<MERCHANT> <MERCHANT>
<uiIndex>66</uiIndex> <uiIndex>66</uiIndex>
<szName>restaurant San Mona (C6)</szName> <szName>restaurant San Mona (C6)</szName> <!-- 47 -->
<dBuyModifier>1.0</dBuyModifier> <dBuyModifier>1.0</dBuyModifier>
<dSellModifier>1.0</dSellModifier> <dSellModifier>1.0</dSellModifier>
<ubShopKeeperID>200</ubShopKeeperID> <ubShopKeeperID>200</ubShopKeeperID>
@@ -1612,7 +1612,7 @@ uiFlags must be of
</MERCHANT> </MERCHANT>
<MERCHANT> <MERCHANT>
<uiIndex>67</uiIndex> <uiIndex>67</uiIndex>
<szName>armour store San Mona (C6)</szName> <szName>armour store San Mona (C6)</szName> <!-- 48 -->
<dBuyModifier>0.66</dBuyModifier> <dBuyModifier>0.66</dBuyModifier>
<dSellModifier>1.1</dSellModifier> <dSellModifier>1.1</dSellModifier>
<ubShopKeeperID>200</ubShopKeeperID> <ubShopKeeperID>200</ubShopKeeperID>
@@ -1634,7 +1634,7 @@ uiFlags must be of
</MERCHANT> </MERCHANT>
<MERCHANT> <MERCHANT>
<uiIndex>68</uiIndex> <uiIndex>68</uiIndex>
<szName>Black Market dealer San Mona (C6)</szName> <szName>Black Market dealer San Mona (C6)</szName> <!-- 49, but Blackmarket Inventory is set in Overhead.lua instead -->
<dBuyModifier>1.0</dBuyModifier> <dBuyModifier>1.0</dBuyModifier>
<dSellModifier>1.0</dSellModifier> <dSellModifier>1.0</dSellModifier>
<ubShopKeeperID>200</ubShopKeeperID> <!-- Important: no profile --> <ubShopKeeperID>200</ubShopKeeperID> <!-- Important: no profile -->
Data-1.13/TableData/NPCInventory/TinaInventory.xml
+5
View File
@@ -165,4 +165,9 @@
<sItemIndex>1709</sItemIndex> <sItemIndex>1709</sItemIndex>
<ubOptimalNumber>3</ubOptimalNumber> <ubOptimalNumber>3</ubOptimalNumber>
</INVENTORY> </INVENTORY>
<INVENTORY>
<uiIndex>33</uiIndex>
<sItemIndex>1763</sItemIndex>
<ubOptimalNumber>5</ubOptimalNumber>
</INVENTORY>
</INVENTORYLIST> </INVENTORYLIST>
Data-1.13/tilesets/0/SMP2ITEMS.STI
BIN
View File
Binary file not shown.