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

Merge branch '1dot13:master' into 1dot13-gamedir-dev

Browse Source
This commit is contained in:
Hazapuza
2025-02-05 23:00:27 +02:00
committed by GitHub
parent 0c03e4d6ad eba78de7ad
commit 5022e5d1f9
18 changed files with 35 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gamedir/Data-1.13/TableData/Inventory/MercStartingGear.xml
+7 -4
View File
@@ -20788,12 +20788,15 @@
<mVestStatus>95</mVestStatus>
<mWeapon>8</mWeapon>
<mWeaponStatus>91</mWeaponStatus>
<mBig0>80</mBig0>
<mBig0Status>100</mBig0Status>
<mBig0Quantity>2</mBig0Quantity>
<mBig0>399</mBig0>
<mBig0>80</mBig0>
<mBig0Status>100</mBig0Status>
<mBig0Quantity>2</mBig0Quantity>
<mBig1>82</mBig1>
<mBig1Status>100</mBig1Status>
<mBig1Quantity>2</mBig1Quantity>
<mBig2>399</mBig2>
<mBig2Status>100</mBig2Status>
<mBig2Quantity>4</mBig2Quantity>
<lVest>1090</lVest>
<lVestStatus>100</lVestStatus>
</GEARKIT>
gamedir/Data-1.13/TableData/Items/Items.xml
+3 -3
View File
@@ -47624,7 +47624,7 @@
<AttachmentClass>33554432</AttachmentClass>
<nasAttachmentClass>2</nasAttachmentClass>
<nasLayoutClass>1</nasLayoutClass>
<ubClassIndex>16</ubClassIndex>
<ubClassIndex>1581</ubClassIndex>
<ubGraphicType>1</ubGraphicType>
<ubGraphicNum>149</ubGraphicNum>
<ubWeight>2</ubWeight>
@@ -49175,7 +49175,7 @@
<szBRDesc>Let there be light! Batteries included.</szBRDesc>
<usItemClass>128</usItemClass>
<nasLayoutClass>1</nasLayoutClass>
<ubClassIndex>49</ubClassIndex>
<ubClassIndex>1636</ubClassIndex>
<ubCursor>2</ubCursor>
<ubGraphicType>2</ubGraphicType>
<ubGraphicNum>161</ubGraphicNum>
@@ -49212,7 +49212,7 @@
<szBRDesc>Not for sale through BR.</szBRDesc>
<usItemClass>128</usItemClass>
<nasLayoutClass>1</nasLayoutClass>
<ubClassIndex>49</ubClassIndex>
<ubClassIndex>1637</ubClassIndex>
<ubCursor>2</ubCursor>
<ubGraphicType>2</ubGraphicType>
<ubGraphicNum>161</ubGraphicNum>
gamedir/Data-1.13/TableData/Items/LoadBearingEquipment.xml
+6 -6
View File
@@ -463,7 +463,7 @@
<LOADBEARINGEQUIPMENT>
<lbeIndex>23</lbeIndex> <!-- Tactical Tailor 3-Day Pack -->
<lbeClass>3</lbeClass>
<lbeCombo>0</lbeCombo>
<lbeCombo>2</lbeCombo>
<lbeFilledSize>29</lbeFilledSize>
<lbeAvailableVolume>0</lbeAvailableVolume>
<lbePocketsAvailable>0</lbePocketsAvailable>
@@ -483,7 +483,7 @@
<LOADBEARINGEQUIPMENT>
<lbeIndex>24</lbeIndex> <!-- Blackhawk Patrol Pack -->
<lbeClass>3</lbeClass>
<lbeCombo>0</lbeCombo>
<lbeCombo>2</lbeCombo>
<lbeFilledSize>30</lbeFilledSize>
<lbeAvailableVolume>0</lbeAvailableVolume>
<lbePocketsAvailable>0</lbePocketsAvailable>
@@ -1823,7 +1823,7 @@
<LOADBEARINGEQUIPMENT>
<lbeIndex>91</lbeIndex> <!-- Sniper Drag Bag -->
<lbeClass>4</lbeClass>
<lbeCombo>2</lbeCombo>
<lbeCombo>4</lbeCombo>
<lbeFilledSize>32</lbeFilledSize>
<lbeAvailableVolume>0</lbeAvailableVolume>
<lbePocketsAvailable>0</lbePocketsAvailable>
@@ -1961,7 +1961,7 @@
<lbePocketIndex12>0</lbePocketIndex12>
</LOADBEARINGEQUIPMENT>
<LOADBEARINGEQUIPMENT>
<lbeIndex>98</lbeIndex> <!-- 3.11 ILBE Gen II Main Ruck -->
<lbeIndex>98</lbeIndex> <!-- 3.11 USMC Backpack -->
<lbeClass>4</lbeClass>
<lbeCombo>1</lbeCombo>
<lbeFilledSize>34</lbeFilledSize>
@@ -1981,7 +1981,7 @@
<lbePocketIndex12>0</lbePocketIndex12>
</LOADBEARINGEQUIPMENT>
<LOADBEARINGEQUIPMENT>
<lbeIndex>99</lbeIndex> <!-- 3.11 ILBE Gen II Assault Pack -->
<lbeIndex>99</lbeIndex> <!-- 3.11 USMC combatpack -->
<lbeClass>3</lbeClass>
<lbeCombo>1</lbeCombo>
<lbeFilledSize>30</lbeFilledSize>
@@ -2123,7 +2123,7 @@
<LOADBEARINGEQUIPMENT>
<lbeIndex>106</lbeIndex> <!-- Tactical Sling -->
<lbeClass>4</lbeClass>
<lbeCombo>1</lbeCombo>
<lbeCombo>3</lbeCombo>
<lbeFilledSize>34</lbeFilledSize>
<lbeAvailableVolume>0</lbeAvailableVolume>
<lbePocketsAvailable>0</lbePocketsAvailable>
gamedir/Data-1.13/TableData/Lookup/ExplosionType.xml
+2 -2
View File
@@ -46,10 +46,10 @@
</ExplosionType>
<ExplosionType>
<id>11</id>
<name>???</name>
<name>Roof Collapse</name>
</ExplosionType>
<ExplosionType>
<id>12</id>
<name>???</name>
<name>White Smoke</name>
</ExplosionType>
</JA2Data>
gamedir/Data-1.13/TableData/Lookup/Silhouette.xml
+5 -1
View File
@@ -216,8 +216,12 @@
<id>53</id>
<name>Throw Knife</name>
</Silhouette>
<Silhouette>
<Silhouette>
<id>54</id>
<name>Short Riflex1</name>
</Silhouette>
<Silhouette>
<id>55</id>
<name>Belt Feeder</name>
</Silhouette>
</JA2Data>
gamedir/Data-UB/Scripts/intro.lua
+4 -4
View File
@@ -20,10 +20,10 @@ Video = {
}
IntroType = {
INTRO_HELI_CRASH = 0,
INTRO_BEGINNING = 1, -- set when viewing the intro at the begining of the game
INTRO_ENDING = 2, -- set when viewing the end game video.
INTRO_SPLASH = 3,
INTRO_BEGINNING = 0, -- set when viewing the intro at the begining of the game
INTRO_ENDING = 1, -- set when viewing the end game video.
INTRO_SPLASH = 2,
INTRO_HELI_CRASH = 3,
}
ScreenTypes =
gamedir/Data/Intro/HELI_FLYBY.SMK
BIN
View File
Binary file not shown.
gamedir/Data/Intro/HELI_NOSKY.SMK
BIN
View File
Binary file not shown.
gamedir/Data/Intro/HELI_SKY.SMK
BIN
View File
Binary file not shown.
gamedir/Data/Intro/OMERTA.SMK
BIN
View File
Binary file not shown.
gamedir/Data/Intro/PRAGUE.SMK
BIN
View File
Binary file not shown.
gamedir/Data/Intro/PRAGUE_CR.SMK
BIN
View File
Binary file not shown.
gamedir/Data/Intro/REBEL_CR.SMK
BIN
View File
Binary file not shown.
gamedir/Data/Intro/SPLASHSCREEN.SMK
BIN
View File
Binary file not shown.
gamedir/Data/Intro/TALONSOFTID_ENDHOLD.SMK
BIN
View File
Binary file not shown.
gamedir/Data/Intro/THRONE_MIG.SMK
BIN
View File
Binary file not shown.
gamedir/Data/Intro/THRONE_NOMIG.SMK
BIN
View File
Binary file not shown.
gamedir/Data/TableData/Lookup/ExplosionType.xml
+8
View File
@@ -44,4 +44,12 @@
<id>10</id>
<name>Signal Shell</name>
</ExplosionType>
<ExplosionType>
<id>11</id>
<name>Roof Collapse</name>
</ExplosionType>
<ExplosionType>
<id>12</id>
<name>White Smoke</name>
</ExplosionType>
</JA2Data>