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

Merge branch 'master' into loading-screens-multi-res

Browse Source
This commit is contained in:
Andrzej Fałkowski
2023-08-31 23:29:07 +02:00
parent fb692db5ca e15f3c14a0
commit f2c4a7e0bd
34 changed files with 3913 additions and 557 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gamedir/Data-1.13/Scripts/strategicmap.lua
+16 -2
View File
@@ -657,9 +657,16 @@ function HandleSectorTacticalEntry( sSectorX, sSectorY, bSectorZ, fHasEverBeenPl
CreateArmedCivilain(CivGroup.BOUNTYHUNTER_CIV_GROUP, SoldierClass.SOLDIER_CLASS_ARMY, 13032, hostile)
CreateArmedCivilain(CivGroup.BOUNTYHUNTER_CIV_GROUP, SoldierClass.SOLDIER_CLASS_ELITE, 19291, hostile)
-- dont spawn in deep water
-- dont spawn in deep water (B14)
if (sSectorX == 14 and sSectorY == 2) then
CreateArmedCivilain(CivGroup.BOUNTYHUNTER_CIV_GROUP, SoldierClass.SOLDIER_CLASS_ELITE, 16533, hostile)
-- dont spawn in bush (B8)
elseif (sSectorX == 8 and sSectorY == 2) then
CreateArmedCivilain(CivGroup.BOUNTYHUNTER_CIV_GROUP, SoldierClass.SOLDIER_CLASS_ELITE, 13239, hostile)
-- dont spawn in cornfield (B12)
elseif (sSectorX == 12 and sSectorY == 2) then
CreateArmedCivilain(CivGroup.BOUNTYHUNTER_CIV_GROUP, SoldierClass.SOLDIER_CLASS_ELITE, 13860, hostile)
-- spawn at common GridNo in all other possible sectors
else
CreateArmedCivilain(CivGroup.BOUNTYHUNTER_CIV_GROUP, SoldierClass.SOLDIER_CLASS_ELITE, 13557, hostile)
end
@@ -677,9 +684,16 @@ function HandleSectorTacticalEntry( sSectorX, sSectorY, bSectorZ, fHasEverBeenPl
CreateArmedCivilain(CivGroup.BOUNTYHUNTER_CIV_GROUP, SoldierClass.SOLDIER_CLASS_ARMY, 13032, hostile)
CreateArmedCivilain(CivGroup.BOUNTYHUNTER_CIV_GROUP, SoldierClass.SOLDIER_CLASS_ELITE, 19291, hostile)
-- dont spawn in deep water
-- dont spawn in deep water (B14)
if (sSectorX == 14 and sSectorY == 2) then
CreateArmedCivilain(CivGroup.BOUNTYHUNTER_CIV_GROUP, SoldierClass.SOLDIER_CLASS_ELITE, 16533, hostile)
-- dont spawn in bush (B8)
elseif (sSectorX == 8 and sSectorY == 2) then
CreateArmedCivilain(CivGroup.BOUNTYHUNTER_CIV_GROUP, SoldierClass.SOLDIER_CLASS_ELITE, 13239, hostile)
-- dont spawn in cornfield (B12)
elseif (sSectorX == 12 and sSectorY == 2) then
CreateArmedCivilain(CivGroup.BOUNTYHUNTER_CIV_GROUP, SoldierClass.SOLDIER_CLASS_ELITE, 13860, hostile)
-- spawn at common GridNo in all other possible sectors
else
CreateArmedCivilain(CivGroup.BOUNTYHUNTER_CIV_GROUP, SoldierClass.SOLDIER_CLASS_ELITE, 13557, hostile)
end
gamedir/Data-1.13/TableData/Items/Items.xml
+2
View File
@@ -199,6 +199,7 @@
<emptybloodbag>0</emptybloodbag>
<medicalsplint>0</medicalsplint>
<sFireResistance>0</sFireResistance>
<usAdministrationModifier>0</usAdministrationModifier>
<RobotDamageReduction>1.0</RobotDamageReduction>
<RobotStrBonus>0</RobotStrBonus>
<RobotAgiBonus>0</RobotAgiBonus>
@@ -32065,6 +32066,7 @@
<Electronic>1</Electronic>
<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
<usHackingModifier>50</usHackingModifier>
<usAdministrationModifier>20</usAdministrationModifier>
<STAND_MODIFIERS />
<CROUCH_MODIFIERS />
<PRONE_MODIFIERS />
gamedir/Data-1.13/TableData/Map/ExtraItems/A2_0_ExtraItems_Experienced.xml
+13
View File
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
see the ExtraSectorItems-Readme.txt for details
-->
<ExtraItems>
<Item>
<uiIndex>201</uiIndex>
<quantity>2</quantity>
<condition>100</condition>
<gridno>18174</gridno>
<visible>1</visible>
</Item>
</ExtraItems>
gamedir/Data-1.13/TableData/Map/ExtraItems/A2_0_ExtraItems_Expert.xml
+13
View File
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
see the ExtraSectorItems-Readme.txt for details
-->
<ExtraItems>
<Item>
<uiIndex>205</uiIndex>
<quantity>2</quantity>
<condition>100</condition>
<gridno>18174</gridno>
<visible>1</visible>
</Item>
</ExtraItems>
gamedir/Data-1.13/TableData/Map/ExtraItems/A2_0_ExtraItems_Insane.xml
+13
View File
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
see the ExtraSectorItems-Readme.txt for details
-->
<ExtraItems>
<Item>
<uiIndex>257</uiIndex>
<quantity>1</quantity>
<condition>100</condition>
<gridno>18174</gridno>
<visible>1</visible>
</Item>
</ExtraItems>
gamedir/Data-1.13/TableData/Map/ExtraItems/A2_0_ExtraItems_Novice.xml
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
see the ExtraSectorItems-Readme.txt for details
-->
<ExtraItems>
<Item>
<uiIndex>201</uiIndex>
<quantity>2</quantity>
<condition>100</condition>
<gridno>18174</gridno>
<visible>1</visible>
</Item>
<Item>
<uiIndex>1029</uiIndex>
<quantity>1</quantity>
<condition>100</condition>
<gridno>18174</gridno>
<visible>1</visible>
</Item>
</ExtraItems>
gamedir/Data-1.13/TableData/Map/ExtraItems/A9_0_ExtraItems_Experienced.xml
+13
View File
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
see the ExtraSectorItems-Readme.txt for details
-->
<ExtraItems>
<Item>
<uiIndex>1022</uiIndex>
<quantity>4</quantity>
<condition>100</condition>
<gridno>12298</gridno>
<visible>1</visible>
</Item>
</ExtraItems>
gamedir/Data-1.13/TableData/Map/ExtraItems/A9_0_ExtraItems_Expert.xml
+13
View File
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
see the ExtraSectorItems-Readme.txt for details
-->
<ExtraItems>
<Item>
<uiIndex>1022</uiIndex>
<quantity>2</quantity>
<condition>100</condition>
<gridno>12298</gridno>
<visible>1</visible>
</Item>
</ExtraItems>
gamedir/Data-1.13/TableData/Map/ExtraItems/A9_0_ExtraItems_Insane.xml
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
see the ExtraSectorItems-Readme.txt for details
-->
<ExtraItems>
<Item>
<uiIndex>1022</uiIndex>
<quantity>1</quantity>
<condition>100</condition>
<gridno>12298</gridno>
<visible>1</visible>
</Item>
<Item>
<uiIndex>257</uiIndex>
<quantity>1</quantity>
<condition>100</condition>
<gridno>12298</gridno>
<visible>1</visible>
</Item>
</ExtraItems>
gamedir/Data-1.13/TableData/Map/ExtraItems/A9_0_ExtraItems_Novice.xml
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
see the ExtraSectorItems-Readme.txt for details
-->
<ExtraItems>
<Item>
<uiIndex>1022</uiIndex>
<quantity>4</quantity>
<condition>100</condition>
<gridno>12298</gridno>
<visible>1</visible>
</Item>
<Item>
<uiIndex>245</uiIndex>
<quantity>1</quantity>
<condition>100</condition>
<gridno>12298</gridno>
<visible>1</visible>
</Item>
</ExtraItems>
gamedir/Data-1.13/TableData/Map/ExtraItems/C5_0_ExtraItems_Experienced.xml
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
see the ExtraSectorItems-Readme.txt for details
-->
<ExtraItems>
<Item>
<uiIndex>1754</uiIndex>
<quantity>2</quantity>
<condition>100</condition>
<gridno>5523</gridno>
<visible>1</visible>
</Item>
<Item>
<uiIndex>222</uiIndex>
<quantity>2</quantity>
<condition>100</condition>
<gridno>5523</gridno>
<visible>1</visible>
</Item>
</ExtraItems>
gamedir/Data-1.13/TableData/Map/ExtraItems/C5_0_ExtraItems_Expert.xml
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
see the ExtraSectorItems-Readme.txt for details
-->
<ExtraItems>
<Item>
<uiIndex>1753</uiIndex>
<quantity>2</quantity>
<condition>100</condition>
<gridno>5523</gridno>
<visible>1</visible>
</Item>
<Item>
<uiIndex>245</uiIndex>
<quantity>1</quantity>
<condition>100</condition>
<gridno>5523</gridno>
<visible>1</visible>
</Item>
</ExtraItems>
gamedir/Data-1.13/TableData/Map/ExtraItems/C5_0_ExtraItems_Insane.xml
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
see the ExtraSectorItems-Readme.txt for details
-->
<ExtraItems>
<Item>
<uiIndex>257</uiIndex>
<quantity>2</quantity>
<condition>100</condition>
<gridno>5523</gridno>
<visible>1</visible>
</Item>
<Item>
<uiIndex>255</uiIndex>
<quantity>1</quantity>
<condition>100</condition>
<gridno>5523</gridno>
<visible>1</visible>
</Item>
</ExtraItems>
gamedir/Data-1.13/TableData/Map/ExtraItems/C5_0_ExtraItems_Novice.xml
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
see the ExtraSectorItems-Readme.txt for details
-->
<ExtraItems>
<Item>
<uiIndex>49</uiIndex>
<quantity>1</quantity>
<condition>100</condition>
<gridno>5523</gridno>
<visible>1</visible>
</Item>
<Item>
<uiIndex>222</uiIndex>
<quantity>4</quantity>
<condition>100</condition>
<gridno>5523</gridno>
<visible>1</visible>
</Item>
</ExtraItems>
gamedir/Data-1.13/TableData/Map/ExtraItems/Extra Sector Items readme.txt
+76
View File
@@ -0,0 +1,76 @@
This is an old 1.13 Feature which seems to be hidden for Modders long time.
This feature has been reworked by Headrock
(edit: and since it got lost again, now revived)
-------------------------
XML filename format:
-------------------------
\tabledata\Map\ExtraItems\[SectorGrid]_[ZLevel]_ExtraItems_[DifficultyName].xml
Examples:
\TableData\Map\ExtraItems\A9_0_ExtraItems_Novice.xml -> for entering the A9 surface sector (Omerta) when playing novice difficulty.
(edit: -> underground-levels see [NOTE] below)
The following "DifficultyNames" are valid:
- Novice
- Experienced
- Expert
- Insane
-------------------------
XML content format:
-------------------------
<ExtraItems>
<Item>
<uiIndex>#</uiIndex>
<quantity>#</quantity>
<condition>#</condition>
<gridno>#</gridno>
<visible>#</visible>
</Item>
</ExtraItems>
-------------------------
XML notes:
-------------------------
- For clarity, uiIndex should always come first. However, I've set it so that the position of uiIndex
in the list is not relevant (so long as it exists). Most XMLs work that way, and I think that's fine.
- All other tags can come in any order.
- Quantity can be set to any number, but will only create an item (or more) if above 0.
Quantity of 0 or less will not crash the game, it simply won't create items.
If this tag is completely omitted, the game will create one item by default.
- Condition can be set to 1-100. If it is set outside these values, the item will not be created
(the game won't crash). If this tag is completely omitted, the item will have 100 condition.
- Gridno can be set to any positive number, including 0. However, if it is out of bounds,
the game will generate a screen message that it could not place the item, but will not crash the game.
Obviously, there is no rational default for this tag, so it must always be included.
- Visible can be set to 0 or 1. When 1, will create an item that is visible from the moment you enter the map.
Otherwise, a merc must spot the item by simple sight, like all other items on the map.
If this tag is omitted, the item is created with 0 visibility by default (must be spotted).
- if GridNo is at closed container (like a crate, furniture, etc.), visible should be set to 1 (hidden)
- random-items can also be used
- As I understand, that's happening in realtime. So it's probably advised to not overdo it
It's meant to add a few goodies (differing on which difficulty level we're at), not to replace the item-placement via mapeditor
- added a few example files to portrait the idea
[NOTE: It's a bummer, but it doesn't seem to work with underground-levels. That might be an old issue, at least all examples I found, even going back to v4870, also only had ground-level in use as well. So, for the time being, it only works on ground-level (using only 0 for level, like in "A9_0_ExtraItems_Novice.xml")]
(edited 22.08.2023)
gamedir/Data-1.13/TableData/Map/ExtraItems/H14_0_ExtraItems_Experienced.xml
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
see the ExtraSectorItems-Readme.txt for details
-->
<ExtraItems>
<Item>
<uiIndex>121</uiIndex>
<quantity>2</quantity>
<condition>100</condition>
<gridno>12413</gridno>
<visible>1</visible>
</Item>
<Item>
<uiIndex>123</uiIndex>
<quantity>1</quantity>
<condition>100</condition>
<gridno>12413</gridno>
<visible>1</visible>
</Item>
</ExtraItems>
gamedir/Data-1.13/TableData/Map/ExtraItems/H14_0_ExtraItems_Expert.xml
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
see the ExtraSectorItems-Readme.txt for details
-->
<ExtraItems>
<Item>
<uiIndex>116</uiIndex>
<quantity>3</quantity>
<condition>100</condition>
<gridno>12413</gridno>
<visible>1</visible>
</Item>
<Item>
<uiIndex>981</uiIndex>
<quantity>4</quantity>
<condition>100</condition>
<gridno>12413</gridno>
<visible>1</visible>
</Item>
</ExtraItems>
gamedir/Data-1.13/TableData/Map/ExtraItems/H14_0_ExtraItems_Insane.xml
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
see the ExtraSectorItems-Readme.txt for details
-->
<ExtraItems>
<Item>
<uiIndex>257</uiIndex>
<quantity>2</quantity>
<condition>100</condition>
<gridno>12413</gridno>
<visible>1</visible>
</Item>
<Item>
<uiIndex>264</uiIndex>
<quantity>3</quantity>
<condition>100</condition>
<gridno>12413</gridno>
<visible>1</visible>
</Item>
</ExtraItems>
gamedir/Data-1.13/TableData/Map/ExtraItems/H14_0_ExtraItems_Novice.xml
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
see the ExtraSectorItems-Readme.txt for details
-->
<ExtraItems>
<Item>
<uiIndex>112</uiIndex>
<quantity>5</quantity>
<condition>100</condition>
<gridno>12413</gridno>
<visible>1</visible>
</Item>
<Item>
<uiIndex>123</uiIndex>
<quantity>4</quantity>
<condition>100</condition>
<gridno>12413</gridno>
<visible>1</visible>
</Item>
</ExtraItems>
gamedir/Data-1.13/TableData/MercProfiles.xml
+32 -3
View File
@@ -195,7 +195,36 @@
PORTOGUESE,
BELARUSIAN_NAT,
SERBIAN_NAT, // 45
PAISTANI_NAT, -->
PAISTANI_NAT,
ALBANIAN_NAT,
ARGENTINIAN_NAT,
ARMENIAN_NAT,
AZERBAIJANI_NAT, // 50
BOLIVIAN_NAT,
CHILEAN_NAT,
CIRCASSIAN_NAT,
COLUMBIAN_NAT,
EGYPTIAN_NAT, // 55
ETHIOPIAN_NAT,
GEORGIAN_NAT,
JORDANIAN_NAT,
KAZAKHSTANI_NAT,
KENYAN_NAT, // 60
KOREAN_NAT,
KYRGYZSTANI_NAT,
MONGOLIAN_NAT,
PALESTINIAN_NAT,
PANAMANIAN_NAT, // 65
RHODESIAN_NAT,
SALVADORAN_NAT,
SAUDI_NAT,
SOMALI_NAT,
THAI_NAT, // 70
UKRAINIAN_NAT,
UZBEKISTANI_NAT,
WELSH_NAT,
YAZIDI_NAT,
ZIMBABWEAN_NAT, // 75 -->
<MERCPROFILES>
<PROFILE>
@@ -24942,8 +24971,8 @@
<bOldSkillTrait2>9</bOldSkillTrait2>
<bNewSkillTrait1>23</bNewSkillTrait1>
<bNewSkillTrait2>14</bNewSkillTrait2>
<bNewSkillTrait3>15</bNewSkillTrait3>
<bNewSkillTrait4>20</bNewSkillTrait4>
<bNewSkillTrait3>20</bNewSkillTrait3>
<bNewSkillTrait4>0</bNewSkillTrait4>
<bBuddy1>59</bBuddy1>
<bBuddy2>60</bBuddy2>
<bBuddy3>255</bBuddy3>