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

- Added Dyno and Turtle to M.E.R.C (by anv)

Browse Source 
- Reworked camo faces and created non camo face for Shadow and Monk (by anv)
- Reworked Smoke animated portrait (by anv)
- Added small 65 and 33 portraits for IMP 218 (previously she used the same as IMP 219) (by anv)
- see: http://www.bears-pit.com/board/ubbthreads.php/topics/298288/28/Jagged_Alliance_Deadly_Games_M.html


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1627 4f8fa57e-7814-0410-bad4-adc449f26b7c
This commit is contained in:
Wanne
2013-03-24 19:50:15 +00:00
parent ac2ad02b1c
commit 7d40215eb3
25 changed files with 439 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gamedir/Data-1.13/TableData/MercAvailability.xml
+39 -15
View File
@@ -155,6 +155,18 @@ If you want to hide any merc from M.E.R.C website, just delete the entry.
</MERC>
<MERC>
<uiIndex>9</uiIndex>
<Name>Turtle</Name>
<Drunk>0</Drunk>
<uiAlternateIndex>-1</uiAlternateIndex>
<StartMercsAvailable>1</StartMercsAvailable>
<NewMercsAvailable>0</NewMercsAvailable>
<MercBioID>26</MercBioID>
<ProfilId>253</ProfilId>
<usMoneyPaid>0</usMoneyPaid>
<usDay>0</usDay>
</MERC>
<MERC>
<uiIndex>10</uiIndex>
<Name>Postie</Name>
<Drunk>0</Drunk>
<uiAlternateIndex>-1</uiAlternateIndex>
@@ -166,7 +178,7 @@ If you want to hide any merc from M.E.R.C website, just delete the entry.
<usDay>2</usDay>
</MERC>
<MERC>
<uiIndex>10</uiIndex>
<uiIndex>11</uiIndex>
<Name>Ears</Name>
<Drunk>0</Drunk>
<uiAlternateIndex>-1</uiAlternateIndex>
@@ -178,7 +190,19 @@ If you want to hide any merc from M.E.R.C website, just delete the entry.
<usDay>5</usDay>
</MERC>
<MERC>
<uiIndex>11</uiIndex>
<uiIndex>12</uiIndex>
<Name>Dyno</Name>
<Drunk>0</Drunk>
<uiAlternateIndex>-1</uiAlternateIndex>
<StartMercsAvailable>0</StartMercsAvailable>
<NewMercsAvailable>0</NewMercsAvailable>
<MercBioID>25</MercBioID>
<ProfilId>252</ProfilId>
<usMoneyPaid>400</usMoneyPaid>
<usDay>5</usDay>
</MERC>
<MERC>
<uiIndex>13</uiIndex>
<Name>Leon</Name>
<Drunk>0</Drunk>
<uiAlternateIndex>-1</uiAlternateIndex>
@@ -190,7 +214,7 @@ If you want to hide any merc from M.E.R.C website, just delete the entry.
<usDay>10</usDay>
</MERC>
<MERC>
<uiIndex>12</uiIndex>
<uiIndex>14</uiIndex>
<Name>Sparky</Name>
<Drunk>0</Drunk>
<uiAlternateIndex>-1</uiAlternateIndex>
@@ -202,7 +226,7 @@ If you want to hide any merc from M.E.R.C website, just delete the entry.
<usDay>2</usDay>
</MERC>
<MERC>
<uiIndex>13</uiIndex>
<uiIndex>15</uiIndex>
<Name>Beth</Name>
<Drunk>0</Drunk>
<uiAlternateIndex>-1</uiAlternateIndex>
@@ -214,7 +238,7 @@ If you want to hide any merc from M.E.R.C website, just delete the entry.
<usDay>2</usDay>
</MERC>
<MERC>
<uiIndex>14</uiIndex>
<uiIndex>16</uiIndex>
<Name>Sam</Name>
<Drunk>0</Drunk>
<uiAlternateIndex>-1</uiAlternateIndex>
@@ -226,7 +250,7 @@ If you want to hide any merc from M.E.R.C website, just delete the entry.
<usDay>10</usDay>
</MERC>
<MERC>
<uiIndex>15</uiIndex>
<uiIndex>17</uiIndex>
<Name>Bubba</Name>
<Drunk>0</Drunk>
<uiAlternateIndex>-1</uiAlternateIndex>
@@ -238,7 +262,7 @@ If you want to hide any merc from M.E.R.C website, just delete the entry.
<usDay>8</usDay>
</MERC>
<MERC>
<uiIndex>16</uiIndex>
<uiIndex>18</uiIndex>
<Name>Larry</Name>
<Drunk>0</Drunk>
<uiAlternateIndex>-1</uiAlternateIndex>
@@ -250,7 +274,7 @@ If you want to hide any merc from M.E.R.C website, just delete the entry.
<usDay>15</usDay>
</MERC>
<MERC>
<uiIndex>17</uiIndex>
<uiIndex>19</uiIndex>
<Name>Larry</Name>
<Drunk>1</Drunk>
<uiAlternateIndex>7</uiAlternateIndex>
@@ -262,7 +286,7 @@ If you want to hide any merc from M.E.R.C website, just delete the entry.
<usDay>0</usDay>
</MERC>
<MERC>
<uiIndex>18</uiIndex>
<uiIndex>20</uiIndex>
<Name>Numb</Name>
<Drunk>0</Drunk>
<uiAlternateIndex>-1</uiAlternateIndex>
@@ -274,7 +298,7 @@ If you want to hide any merc from M.E.R.C website, just delete the entry.
<usDay>20</usDay>
</MERC>
<MERC>
<uiIndex>19</uiIndex>
<uiIndex>21</uiIndex>
<Name>Tex</Name>
<Drunk>0</Drunk>
<uiAlternateIndex>-1</uiAlternateIndex>
@@ -286,7 +310,7 @@ If you want to hide any merc from M.E.R.C website, just delete the entry.
<usDay>21</usDay>
</MERC>
<MERC>
<uiIndex>20</uiIndex>
<uiIndex>22</uiIndex>
<Name>Biggins</Name>
<Drunk>0</Drunk>
<uiAlternateIndex>-1</uiAlternateIndex>
@@ -298,7 +322,7 @@ If you want to hide any merc from M.E.R.C website, just delete the entry.
<usDay>23</usDay>
</MERC>
<MERC>
<uiIndex>21</uiIndex>
<uiIndex>23</uiIndex>
<Name>Cougar</Name>
<Drunk>0</Drunk>
<uiAlternateIndex>-1</uiAlternateIndex>
@@ -310,7 +334,7 @@ If you want to hide any merc from M.E.R.C website, just delete the entry.
<usDay>25</usDay>
</MERC>
<MERC>
<uiIndex>22</uiIndex>
<uiIndex>24</uiIndex>
<Name>Gaston</Name>
<Drunk>0</Drunk>
<uiAlternateIndex>-1</uiAlternateIndex>
@@ -322,7 +346,7 @@ If you want to hide any merc from M.E.R.C website, just delete the entry.
<usDay>30</usDay>
</MERC>
<MERC>
<uiIndex>23</uiIndex>
<uiIndex>25</uiIndex>
<Name>Stogie</Name>
<Drunk>0</Drunk>
<uiAlternateIndex>-1</uiAlternateIndex>
@@ -335,7 +359,7 @@ If you want to hide any merc from M.E.R.C website, just delete the entry.
</MERC>
<!-- Spooky is an optional merc and not enabled in default 1.13. If you want to enable him, just remove the comment
<MERC>
<uiIndex>24</uiIndex>
<uiIndex>26</uiIndex>
<Name>Spooky</Name>
<Drunk>0</Drunk>
<uiAlternateIndex>-1</uiAlternateIndex>