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

- added an example clothes merge

Browse Source 
- added clothes to Keith's merchant inventory

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1541 4f8fa57e-7814-0410-bad4-adc449f26b7c
This commit is contained in:
Flugente
2012-09-16 14:54:27 +00:00
parent 92ff3c669c
commit 86b72ab0fe
4 changed files with 110 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gamedir/Data-1.13/TableData/Clothes.xml
+8 -1
View File
@@ -69,7 +69,7 @@
<CLOTHES> <CLOTHES>
<uiIndex>8</uiIndex> <uiIndex>8</uiIndex>
<szName>GYELLOWSHIRT</szName> <szName>light green</szName>
<Vest>GYELLOWSHIRT</Vest> <Vest>GYELLOWSHIRT</Vest>
</CLOTHES> </CLOTHES>
@@ -126,5 +126,12 @@
<szName>Bluejeans</szName> <szName>Bluejeans</szName>
<Pants>BLUEPANTS</Pants> <Pants>BLUEPANTS</Pants>
</CLOTHES> </CLOTHES>
<CLOTHES>
<uiIndex>18</uiIndex>
<szName>white t-shirt and jeans</szName>
<Vest>WHITEVEST</Vest>
<Pants>BLUEPANTS</Pants>
</CLOTHES>
</CLOTHESLIST> </CLOTHESLIST>
gamedir/Data-1.13/TableData/Items.xml
+9 -11
View File
@@ -47346,19 +47346,17 @@
<szBRDesc>Since when does this shop sell cheap clothes?</szBRDesc> <szBRDesc>Since when does this shop sell cheap clothes?</szBRDesc>
<usItemClass>8192</usItemClass> <usItemClass>8192</usItemClass>
<nasLayoutClass>1</nasLayoutClass> <nasLayoutClass>1</nasLayoutClass>
<ubGraphicType>1</ubGraphicType> <ubGraphicType>2</ubGraphicType>
<ubGraphicNum>513</ubGraphicNum> <ubGraphicNum>148</ubGraphicNum>
<ubWeight>1</ubWeight> <ubWeight>12</ubWeight>
<ubPerPocket>8</ubPerPocket> <ubPerPocket>8</ubPerPocket>
<ItemSize>13</ItemSize> <ItemSize>13</ItemSize>
<usPrice>250</usPrice> <usPrice>110</usPrice>
<ubCoolness>5</ubCoolness> <ubCoolness>5</ubCoolness>
<Damageable>1</Damageable> <Damageable>1</Damageable>
<WaterDamages>1</WaterDamages> <WaterDamages>1</WaterDamages>
<ShowStatus>1</ShowStatus> <ShowStatus>1</ShowStatus>
<BR_NewInventory>3</BR_NewInventory> <clothestype>18</clothestype>
<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
<ItemFlag>4096</ItemFlag>
<STAND_MODIFIERS /> <STAND_MODIFIERS />
<CROUCH_MODIFIERS /> <CROUCH_MODIFIERS />
<PRONE_MODIFIERS /> <PRONE_MODIFIERS />
@@ -48473,10 +48471,10 @@
</ITEM> </ITEM>
<ITEM> <ITEM>
<uiIndex>1616</uiIndex> <uiIndex>1616</uiIndex>
<szItemName>Bright yellow shirt</szItemName> <szItemName>Light green shirt</szItemName>
<szLongItemName>Bright yellow shirt</szLongItemName> <szLongItemName>Light green shirt</szLongItemName>
<szItemDesc>A totally unremarkable bright yellow T-shirt.</szItemDesc> <szItemDesc>A totally unremarkable light green yellow T-shirt.</szItemDesc>
<szBRName>Bright yellow shirt</szBRName> <szBRName>Light green shirt</szBRName>
<szBRDesc>Apparently we sell clothes now. Well, this is a T-shirt, you know?</szBRDesc> <szBRDesc>Apparently we sell clothes now. Well, this is a T-shirt, you know?</szBRDesc>
<usItemClass>8192</usItemClass> <usItemClass>8192</usItemClass>
<nasLayoutClass>1</nasLayoutClass> <nasLayoutClass>1</nasLayoutClass>
gamedir/Data-1.13/TableData/Merges.xml
+8
View File
@@ -3873,4 +3873,12 @@
<mergeType>1</mergeType> <mergeType>1</mergeType>
<APCost>32</APCost> <APCost>32</APCost>
</MERGE> </MERGE>
<MERGE>
<firstItemIndex>1612</firstItemIndex>
<secondItemIndex>1619</secondItemIndex>
<firstResultingItemIndex>1577</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>4</mergeType>
<APCost>32</APCost>
</MERGE>
</MERGELIST> </MERGELIST>
gamedir/Data-1.13/TableData/NPCInventory/KeithInventory.xml
+85
View File
@@ -431,5 +431,90 @@
<uiIndex>88</uiIndex> <uiIndex>88</uiIndex>
<sItemIndex>1576</sItemIndex> <sItemIndex>1576</sItemIndex>
<ubOptimalNumber>1</ubOptimalNumber> <ubOptimalNumber>1</ubOptimalNumber>
</INVENTORY>
<INVENTORY>
<uiIndex>89</uiIndex>
<sItemIndex>1606</sItemIndex>
<ubOptimalNumber>0</ubOptimalNumber>
</INVENTORY>
<INVENTORY>
<uiIndex>90</uiIndex>
<sItemIndex>1607</sItemIndex>
<ubOptimalNumber>1</ubOptimalNumber>
</INVENTORY>
<INVENTORY>
<uiIndex>91</uiIndex>
<sItemIndex>1608</sItemIndex>
<ubOptimalNumber>1</ubOptimalNumber>
</INVENTORY>
<INVENTORY>
<uiIndex>92</uiIndex>
<sItemIndex>1609</sItemIndex>
<ubOptimalNumber>1</ubOptimalNumber>
</INVENTORY>
<INVENTORY>
<uiIndex>93</uiIndex>
<sItemIndex>1610</sItemIndex>
<ubOptimalNumber>1</ubOptimalNumber>
</INVENTORY>
<INVENTORY>
<uiIndex>94</uiIndex>
<sItemIndex>1611</sItemIndex>
<ubOptimalNumber>0</ubOptimalNumber>
</INVENTORY>
<INVENTORY>
<uiIndex>95</uiIndex>
<sItemIndex>1612</sItemIndex>
<ubOptimalNumber>1</ubOptimalNumber>
</INVENTORY>
<INVENTORY>
<uiIndex>96</uiIndex>
<sItemIndex>1613</sItemIndex>
<ubOptimalNumber>1</ubOptimalNumber>
</INVENTORY>
<INVENTORY>
<uiIndex>97</uiIndex>
<sItemIndex>1614</sItemIndex>
<ubOptimalNumber>0</ubOptimalNumber>
</INVENTORY>
<INVENTORY>
<uiIndex>98</uiIndex>
<sItemIndex>1615</sItemIndex>
<ubOptimalNumber>1</ubOptimalNumber>
</INVENTORY>
<INVENTORY>
<uiIndex>99</uiIndex>
<sItemIndex>1616</sItemIndex>
<ubOptimalNumber>1</ubOptimalNumber>
</INVENTORY>
<INVENTORY>
<uiIndex>100</uiIndex>
<sItemIndex>1617</sItemIndex>
<ubOptimalNumber>1</ubOptimalNumber>
</INVENTORY>
<INVENTORY>
<uiIndex>101</uiIndex>
<sItemIndex>1618</sItemIndex>
<ubOptimalNumber>0</ubOptimalNumber>
</INVENTORY>
<INVENTORY>
<uiIndex>102</uiIndex>
<sItemIndex>1619</sItemIndex>
<ubOptimalNumber>1</ubOptimalNumber>
</INVENTORY>
<INVENTORY>
<uiIndex>103</uiIndex>
<sItemIndex>1620</sItemIndex>
<ubOptimalNumber>0</ubOptimalNumber>
</INVENTORY>
<INVENTORY>
<uiIndex>104</uiIndex>
<sItemIndex>1621</sItemIndex>
<ubOptimalNumber>1</ubOptimalNumber>
</INVENTORY>
<INVENTORY>
<uiIndex>105</uiIndex>
<sItemIndex>1622</sItemIndex>
<ubOptimalNumber>1</ubOptimalNumber>
</INVENTORY> </INVENTORY>
</INVENTORYLIST> </INVENTORYLIST>