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

New feature: Getting and using intel allows for more spy-related roleplay

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2401 4f8fa57e-7814-0410-bad4-adc449f26b7c
This commit is contained in:
Flugente
2018-02-18 23:12:21 +00:00
parent 30759b3e7f
commit 9cf666a038
13 changed files with 1608 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gamedir/Data-1.13/TableData/CivGroupNames.xml
+5 -3
View File
@@ -262,12 +262,14 @@
<Loyalty>1</Loyalty>
<fCanBeCaptured>0</fCanBeCaptured>
</NAME>
<!-- black market dealer and bodyguards -->
<NAME>
<uiIndex>34</uiIndex>
<Enabled>0</Enabled>
<szGroup>Empty Slot34</szGroup>
<AddToBattle>0</AddToBattle>
<Enabled>1</Enabled>
<szGroup>Black Market</szGroup>
<AddToBattle>1</AddToBattle>
<Loyalty>0</Loyalty>
<fCanBeCaptured>0</fCanBeCaptured>
</NAME>
<NAME>
<uiIndex>35</uiIndex>
gamedir/Data-1.13/TableData/Inventory/MercStartingGear.xml
+4 -28
View File
@@ -24787,7 +24787,7 @@
<mWeaponStatus>86</mWeaponStatus>
<mBig0>77</mBig0>
<mBig0Status>100</mBig0Status>
<mBig0Quantity>2</mBig0Quantity>
<mBig0Quantity>4</mBig0Quantity>
<mBig0Drop>0</mBig0Drop>
<mBig1>0</mBig1>
<mBig1Status>0</mBig1Status>
@@ -24842,40 +24842,29 @@
<mWeaponStatus>86</mWeaponStatus>
<mBig0>77</mBig0>
<mBig0Status>100</mBig0Status>
<mBig0Quantity>2</mBig0Quantity>
<mBig0Quantity>4</mBig0Quantity>
<mBig1>201</mBig1>
<mBig1Status>99</mBig1Status>
<mBig1Quantity>1</mBig1Quantity>
<mSmall0>1627</mSmall0>
<mSmall0Status>98</mSmall0Status>
<mSmall0Quantity>1</mSmall0Quantity>
<mSmall1>1628</mSmall1>
<mSmall1Status>100</mSmall1Status>
<mSmall1Quantity>1</mSmall1Quantity>
<lVest>1090</lVest>
<lVestStatus>84</lVestStatus>
<lRightThigh>1200</lRightThigh>
<lRightThighStatus>88</lRightThighStatus>
</GEARKIT>
<GEARKIT>
<mAbsolutePrice>-1</mAbsolutePrice>
<mWeapon>3</mWeapon>
<mWeaponStatus>86</mWeaponStatus>
<mBig0>71</mBig0>
<mBig0Status>100</mBig0Status>
<mBig0Quantity>3</mBig0Quantity>
<mBig1>201</mBig1>
<mBig1Status>99</mBig1Status>
<mBig1Quantity>1</mBig1Quantity>
<mSmall0>1627</mSmall0>
<mSmall0Status>98</mSmall0Status>
<mSmall0Quantity>1</mSmall0Quantity>
<mSmall1>214</mSmall1>
<mSmall1Status>100</mSmall1Status>
<mSmall1Quantity>1</mSmall1Quantity>
<mSmall2>1751</mSmall2>
<lVest>1090</lVest>
<lVestStatus>84</lVestStatus>
<lRightThigh>1091</lRightThigh>
<lRightThighStatus>88</lRightThighStatus>
</GEARKIT>
<GEARKIT>
<mAbsolutePrice>-1</mAbsolutePrice>
@@ -24888,16 +24877,11 @@
<mBig0Quantity>3</mBig0Quantity>
<mBig1>201</mBig1>
<mBig1Status>99</mBig1Status>
<mBig1Quantity>1</mBig1Quantity>
<mSmall0>1627</mSmall0>
<mSmall0Status>98</mSmall0Status>
<mSmall0Quantity>1</mSmall0Quantity>
<lVest>1090</lVest>
<lVestStatus>84</lVestStatus>
<lLeftThigh>1204</lLeftThigh>
<lLeftThighStatus>90</lLeftThighStatus>
<lRightThigh>1092</lRightThigh>
<lRightThighStatus>88</lRightThighStatus>
</GEARKIT>
<GEARKIT>
<mAbsolutePrice>-1</mAbsolutePrice>
@@ -24910,22 +24894,14 @@
<mBig0Quantity>3</mBig0Quantity>
<mBig1>201</mBig1>
<mBig1Status>99</mBig1Status>
<mBig1Quantity>1</mBig1Quantity>
<mBig2>210</mBig2>
<mBig2Status>90</mBig2Status>
<mBig2Quantity>1</mBig2Quantity>
<mSmall0>1627</mSmall0>
<mSmall0Status>98</mSmall0Status>
<mSmall0Quantity>1</mSmall0Quantity>
<mSmall1>1628</mSmall1>
<mSmall1Status>100</mSmall1Status>
<mSmall1Quantity>1</mSmall1Quantity>
<lVest>1090</lVest>
<lVestStatus>84</lVestStatus>
<lLeftThigh>1204</lLeftThigh>
<lLeftThighStatus>90</lLeftThighStatus>
<lRightThigh>1092</lRightThigh>
<lRightThighStatus>88</lRightThighStatus>
</GEARKIT>
</MERCGEAR>
<MERCGEAR>
gamedir/Data-1.13/TableData/Items/Items.xml
+29
View File
@@ -7767,6 +7767,7 @@
<Repairable>1</Repairable>
<Metal>1</Metal>
<Electronic>1</Electronic>
<ItemFlag>8</ItemFlag>
<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
<STAND_MODIFIERS />
<CROUCH_MODIFIERS />
@@ -52033,4 +52034,32 @@
<CROUCH_MODIFIERS />
<PRONE_MODIFIERS />
</ITEM>
<ITEM>
<uiIndex>1751</uiIndex>
<szItemName>Camera</szItemName>
<szLongItemName>Camera</szLongItemName>
<szItemDesc>You can use this camera to document the highlights of your holidays. Or whatever else you want documented.</szItemDesc>
<szBRName>Camera</szBRName>
<szBRDesc>Use this simple to use camera to take pictures of all the funny shenanigans/gruesome atrocities you come across during your holidays/tour of duty. Whatever works.</szBRDesc>
<usItemClass>268435456</usItemClass>
<nasLayoutClass>1</nasLayoutClass>
<ItemFlag>8</ItemFlag>
<ubGraphicType>1</ubGraphicType>
<ubGraphicNum>903</ubGraphicNum>
<ubWeight>8</ubWeight>
<ubPerPocket>4</ubPerPocket>
<ItemSize>16</ItemSize>
<usPrice>200</usPrice>
<ubCoolness>2</ubCoolness>
<Sinks>1</Sinks>
<Damageable>1</Damageable>
<Repairable>1</Repairable>
<Metal>1</Metal>
<Electronic>1</Electronic>
<BR_NewInventory>3</BR_NewInventory>
<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
<STAND_MODIFIERS />
<CROUCH_MODIFIERS />
<PRONE_MODIFIERS />
</ITEM>
</ITEMLIST>
gamedir/Data-1.13/TableData/Map/SectorNames.xml
+8 -16
View File
@@ -160,7 +160,6 @@
<szDetailedExploredName>Omerta</szDetailedExploredName>
<sWaterType>0</sWaterType>
<usNaturalDirt>150</usNaturalDirt>
<usCurfewValue>2</usCurfewValue>
<usCivilianPopulation>4</usCivilianPopulation>
<rainchance>50</rainchance>
<sandstormchance>0</sandstormchance>
@@ -173,7 +172,6 @@
<szDetailedExploredName>Omerta</szDetailedExploredName>
<sWaterType>0</sWaterType>
<usNaturalDirt>150</usNaturalDirt>
<usCurfewValue>2</usCurfewValue>
<usCivilianPopulation>30</usCivilianPopulation>
<rainchance>50</rainchance>
<sandstormchance>0</sandstormchance>
@@ -1089,7 +1087,6 @@
<szDetailedExploredName>Cambria</szDetailedExploredName>
<sWaterType>1</sWaterType>
<usNaturalDirt>100</usNaturalDirt>
<usCurfewValue>1</usCurfewValue>
<usCivilianPopulation>100</usCivilianPopulation>
<rainchance>40</rainchance>
<sandstormchance>0</sandstormchance>
@@ -1192,7 +1189,7 @@
<szDetailedExploredName>Grumm</szDetailedExploredName>
<sWaterType>3</sWaterType>
<usNaturalDirt>100</usNaturalDirt>
<usCurfewValue>2</usCurfewValue>
<usCurfewValue>1</usCurfewValue>
<usCivilianPopulation>150</usCivilianPopulation>
<rainchance>50</rainchance>
<sandstormchance>0</sandstormchance>
@@ -1382,7 +1379,6 @@
<szDetailedExploredName>Grumm</szDetailedExploredName>
<sWaterType>3</sWaterType>
<usNaturalDirt>100</usNaturalDirt>
<usCurfewValue>1</usCurfewValue>
<usCivilianPopulation>200</usCivilianPopulation>
<rainchance>55</rainchance>
<sandstormchance>0</sandstormchance>
@@ -1395,7 +1391,6 @@
<szDetailedExploredName>Grumm Mine</szDetailedExploredName>
<sWaterType>3</sWaterType>
<usNaturalDirt>150</usNaturalDirt>
<usCurfewValue>1</usCurfewValue>
<usCivilianPopulation>200</usCivilianPopulation>
<rainchance>50</rainchance>
<sandstormchance>0</sandstormchance>
@@ -1456,7 +1451,6 @@
<szDetailedExploredName>Cambria Mine</szDetailedExploredName>
<sWaterType>0</sWaterType>
<usNaturalDirt>130</usNaturalDirt>
<usCurfewValue>1</usCurfewValue>
<usCivilianPopulation>200</usCivilianPopulation>
<rainchance>35</rainchance>
<sandstormchance>2</sandstormchance>
@@ -2341,7 +2335,7 @@
<szDetailedExploredName>Coastal, road</szDetailedExploredName>
<sWaterType>2</sWaterType>
<usNaturalDirt>140</usNaturalDirt>
<usCurfewValue>2</usCurfewValue>
<usCurfewValue>1</usCurfewValue>
<rainchance>80</rainchance>
<sandstormchance>0</sandstormchance>
</SECTOR>
@@ -2353,7 +2347,7 @@
<szDetailedExploredName>Swamp, road</szDetailedExploredName>
<sWaterType>3</sWaterType>
<usNaturalDirt>450</usNaturalDirt>
<usCurfewValue>2</usCurfewValue>
<usCurfewValue>1</usCurfewValue>
<rainchance>90</rainchance>
<sandstormchance>0</sandstormchance>
<snakechance>50</snakechance>
@@ -2380,7 +2374,7 @@
<szDetailedExploredName>Forest, road</szDetailedExploredName>
<sWaterType>0</sWaterType>
<usNaturalDirt>160</usNaturalDirt>
<usCurfewValue>2</usCurfewValue>
<usCurfewValue>1</usCurfewValue>
<rainchance>50</rainchance>
<sandstormchance>0</sandstormchance>
</SECTOR>
@@ -2392,7 +2386,7 @@
<szDetailedExploredName>Forest, road</szDetailedExploredName>
<sWaterType>0</sWaterType>
<usNaturalDirt>160</usNaturalDirt>
<usCurfewValue>2</usCurfewValue>
<usCurfewValue>1</usCurfewValue>
<rainchance>50</rainchance>
<sandstormchance>0</sandstormchance>
</SECTOR>
@@ -2538,7 +2532,6 @@
<szDetailedExploredName>Meduna Airport</szDetailedExploredName>
<sWaterType>1</sWaterType>
<usNaturalDirt>100</usNaturalDirt>
<usCurfewValue>1</usCurfewValue>
<sRadioScanModifier>2</sRadioScanModifier>
<usCivilianPopulation>100</usCivilianPopulation>
<rainchance>60</rainchance>
@@ -2552,7 +2545,7 @@
<szDetailedExploredName>Meduna, SAM Site</szDetailedExploredName>
<sWaterType>1</sWaterType>
<usNaturalDirt>100</usNaturalDirt>
<usCurfewValue>2</usCurfewValue>
<usCurfewValue>1</usCurfewValue>
<sRadioScanModifier>2</sRadioScanModifier>
<usCivilianPopulation>50</usCivilianPopulation>
<rainchance>60</rainchance>
@@ -2566,7 +2559,7 @@
<szDetailedExploredName>Meduna</szDetailedExploredName>
<sWaterType>1</sWaterType>
<usNaturalDirt>100</usNaturalDirt>
<usCurfewValue>2</usCurfewValue>
<usCurfewValue>1</usCurfewValue>
<usCivilianPopulation>100</usCivilianPopulation>
<rainchance>50</rainchance>
<sandstormchance>0</sandstormchance>
@@ -2579,7 +2572,7 @@
<szDetailedExploredName>Tropical, road</szDetailedExploredName>
<sWaterType>0</sWaterType>
<usNaturalDirt>250</usNaturalDirt>
<usCurfewValue>2</usCurfewValue>
<usCurfewValue>1</usCurfewValue>
<rainchance>70</rainchance>
<sandstormchance>0</sandstormchance>
</SECTOR>
@@ -2738,7 +2731,6 @@
<szDetailedExploredName>Meduna</szDetailedExploredName>
<sWaterType>1</sWaterType>
<usNaturalDirt>100</usNaturalDirt>
<usCurfewValue>1</usCurfewValue>
<usCivilianPopulation>300</usCivilianPopulation>
<rainchance>50</rainchance>
<sandstormchance>0</sandstormchance>
gamedir/Data-1.13/TableData/MercProfiles.xml
+257 -257
View File
File diff suppressed because it is too large Load Diff
gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_49_Inventory.xml
+1
View File
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<INVENTORYLIST>
<!-- the inventory of this merchant (black market, 68) is set exclusively in Overhead.lua in AddArmsDealerAdditionalIntelData() -->
<INVENTORY>
<uiIndex>0</uiIndex>
<sItemIndex>0</sItemIndex>
gamedir/Data-1.13/TableData/NPCInventory/Merchants.xml
+22
View File
@@ -1632,4 +1632,26 @@ uiFlags must be of
<allInventoryAlwaysAvailable>0</allInventoryAlwaysAvailable>
<nonprofile_loyaltyrequired>0</nonprofile_loyaltyrequired> <!-- no loyalty required -->
</MERCHANT>
<MERCHANT>
<uiIndex>68</uiIndex>
<szName>Black Market dealer San Mona (C6)</szName>
<dBuyModifier>1.0</dBuyModifier>
<dSellModifier>1.0</dSellModifier>
<ubShopKeeperID>200</ubShopKeeperID> <!-- Important: no profile -->
<ubTypeOfArmsDealer>1</ubTypeOfArmsDealer>
<iInitialCash>400</iInitialCash>
<uiFlags>16777216</uiFlags> <!-- accepts only intel, no money -->
<dailyIncrement>400</dailyIncrement>
<dailyMaximum>800</dailyMaximum>
<dailyRetained>400</dailyRetained>
<minCoolness>1</minCoolness>
<maxCoolness>10</maxCoolness>
<addToCoolness>10</addToCoolness>
<coolnessProgressRate>100</coolnessProgressRate>
<daysDelayMin>1</daysDelayMin>
<daysDelayMax>2</daysDelayMax>
<useBRSetting>0</useBRSetting>
<allInventoryAlwaysAvailable>1</allInventoryAlwaysAvailable> <!-- doesn't always have everything -->
<nonprofile_loyaltyrequired>0</nonprofile_loyaltyrequired> <!-- needs to trust you somewhat before he trades with you -->
</MERCHANT>
</MERCHANTSLIST>