mirror of
https://github.com/1dot13/source.git
synced 2026-09-09 14:46:05 +02:00
Merges: All Types of T-Shirts now can be cut to Rags (for Molotovs) with any non-throwing Knife. Officers Coat can also be cut. Bloody knifes can be cleaned with a Rag.
German.Items: corrected some Grammar, Corrected U-238 to U-235, squeezed Dyneema descriptions (too long for BR), Improved Text for old Aimpoint. ATN: I did _NOT_ checked, if U-238 is also wrong in English! ATN: Gameboy + Copper still don't work. Not found the Bug for now :-( git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@771 4f8fa57e-7814-0410-bad4-adc449f26b7c
This commit is contained in:
Sergeant_Kolja
@@ -1,5 +1,77 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<MERGELIST>
|
||||
<MERGE>
|
||||
<firstItemIndex>37</firstItemIndex>
|
||||
<secondItemIndex>194</secondItemIndex>
|
||||
<firstResultingItemIndex>1022</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>0</secondResultingItemIndex>
|
||||
<mergeType>6</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>37</firstItemIndex>
|
||||
<secondItemIndex>195</secondItemIndex>
|
||||
<firstResultingItemIndex>1022</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>0</secondResultingItemIndex>
|
||||
<mergeType>6</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>37</firstItemIndex>
|
||||
<secondItemIndex>291</secondItemIndex>
|
||||
<firstResultingItemIndex>1022</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>0</secondResultingItemIndex>
|
||||
<mergeType>6</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>37</firstItemIndex>
|
||||
<secondItemIndex>296</secondItemIndex>
|
||||
<firstResultingItemIndex>1022</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>0</secondResultingItemIndex>
|
||||
<mergeType>6</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>54</firstItemIndex>
|
||||
<secondItemIndex>194</secondItemIndex>
|
||||
<firstResultingItemIndex>1022</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>0</secondResultingItemIndex>
|
||||
<mergeType>6</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>54</firstItemIndex>
|
||||
<secondItemIndex>195</secondItemIndex>
|
||||
<firstResultingItemIndex>1022</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>0</secondResultingItemIndex>
|
||||
<mergeType>6</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>54</firstItemIndex>
|
||||
<secondItemIndex>291</secondItemIndex>
|
||||
<firstResultingItemIndex>1022</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>0</secondResultingItemIndex>
|
||||
<mergeType>6</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>54</firstItemIndex>
|
||||
<secondItemIndex>296</secondItemIndex>
|
||||
<firstResultingItemIndex>1022</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>0</secondResultingItemIndex>
|
||||
<mergeType>6</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>62</firstItemIndex>
|
||||
<secondItemIndex>1022</secondItemIndex>
|
||||
<firstResultingItemIndex>38</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>1022</secondResultingItemIndex>
|
||||
<mergeType>4</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>136</firstItemIndex>
|
||||
<secondItemIndex>137</secondItemIndex>
|
||||
@@ -576,6 +648,102 @@
|
||||
<mergeType>1</mergeType>
|
||||
<APCost>8</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>299</firstItemIndex>
|
||||
<secondItemIndex>194</secondItemIndex>
|
||||
<firstResultingItemIndex>1022</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>0</secondResultingItemIndex>
|
||||
<mergeType>6</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>299</firstItemIndex>
|
||||
<secondItemIndex>195</secondItemIndex>
|
||||
<firstResultingItemIndex>1022</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>0</secondResultingItemIndex>
|
||||
<mergeType>6</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>299</firstItemIndex>
|
||||
<secondItemIndex>291</secondItemIndex>
|
||||
<firstResultingItemIndex>1022</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>0</secondResultingItemIndex>
|
||||
<mergeType>6</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>299</firstItemIndex>
|
||||
<secondItemIndex>296</secondItemIndex>
|
||||
<firstResultingItemIndex>1022</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>0</secondResultingItemIndex>
|
||||
<mergeType>6</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>300</firstItemIndex>
|
||||
<secondItemIndex>194</secondItemIndex>
|
||||
<firstResultingItemIndex>1022</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>0</secondResultingItemIndex>
|
||||
<mergeType>6</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>300</firstItemIndex>
|
||||
<secondItemIndex>195</secondItemIndex>
|
||||
<firstResultingItemIndex>1022</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>0</secondResultingItemIndex>
|
||||
<mergeType>6</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>300</firstItemIndex>
|
||||
<secondItemIndex>291</secondItemIndex>
|
||||
<firstResultingItemIndex>1022</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>0</secondResultingItemIndex>
|
||||
<mergeType>6</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>300</firstItemIndex>
|
||||
<secondItemIndex>296</secondItemIndex>
|
||||
<firstResultingItemIndex>1022</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>0</secondResultingItemIndex>
|
||||
<mergeType>6</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>301</firstItemIndex>
|
||||
<secondItemIndex>194</secondItemIndex>
|
||||
<firstResultingItemIndex>1022</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>0</secondResultingItemIndex>
|
||||
<mergeType>6</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>301</firstItemIndex>
|
||||
<secondItemIndex>195</secondItemIndex>
|
||||
<firstResultingItemIndex>1022</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>0</secondResultingItemIndex>
|
||||
<mergeType>6</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>301</firstItemIndex>
|
||||
<secondItemIndex>291</secondItemIndex>
|
||||
<firstResultingItemIndex>1022</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>0</secondResultingItemIndex>
|
||||
<mergeType>6</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>301</firstItemIndex>
|
||||
<secondItemIndex>296</secondItemIndex>
|
||||
<firstResultingItemIndex>1022</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>0</secondResultingItemIndex>
|
||||
<mergeType>6</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>311</firstItemIndex>
|
||||
<secondItemIndex>312</secondItemIndex>
|
||||
@@ -616,6 +784,206 @@
|
||||
<mergeType>1</mergeType>
|
||||
<APCost>8</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>593</firstItemIndex>
|
||||
<secondItemIndex>194</secondItemIndex>
|
||||
<firstResultingItemIndex>1022</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>0</secondResultingItemIndex>
|
||||
<mergeType>6</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>593</firstItemIndex>
|
||||
<secondItemIndex>195</secondItemIndex>
|
||||
<firstResultingItemIndex>1022</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>0</secondResultingItemIndex>
|
||||
<mergeType>6</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>593</firstItemIndex>
|
||||
<secondItemIndex>291</secondItemIndex>
|
||||
<firstResultingItemIndex>1022</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>0</secondResultingItemIndex>
|
||||
<mergeType>6</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>593</firstItemIndex>
|
||||
<secondItemIndex>296</secondItemIndex>
|
||||
<firstResultingItemIndex>1022</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>0</secondResultingItemIndex>
|
||||
<mergeType>6</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>594</firstItemIndex>
|
||||
<secondItemIndex>194</secondItemIndex>
|
||||
<firstResultingItemIndex>1022</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>0</secondResultingItemIndex>
|
||||
<mergeType>6</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>594</firstItemIndex>
|
||||
<secondItemIndex>195</secondItemIndex>
|
||||
<firstResultingItemIndex>1022</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>0</secondResultingItemIndex>
|
||||
<mergeType>6</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>594</firstItemIndex>
|
||||
<secondItemIndex>291</secondItemIndex>
|
||||
<firstResultingItemIndex>1022</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>0</secondResultingItemIndex>
|
||||
<mergeType>6</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>594</firstItemIndex>
|
||||
<secondItemIndex>296</secondItemIndex>
|
||||
<firstResultingItemIndex>1022</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>0</secondResultingItemIndex>
|
||||
<mergeType>6</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>595</firstItemIndex>
|
||||
<secondItemIndex>194</secondItemIndex>
|
||||
<firstResultingItemIndex>1022</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>0</secondResultingItemIndex>
|
||||
<mergeType>6</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>595</firstItemIndex>
|
||||
<secondItemIndex>195</secondItemIndex>
|
||||
<firstResultingItemIndex>1022</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>0</secondResultingItemIndex>
|
||||
<mergeType>6</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>595</firstItemIndex>
|
||||
<secondItemIndex>291</secondItemIndex>
|
||||
<firstResultingItemIndex>1022</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>0</secondResultingItemIndex>
|
||||
<mergeType>6</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>595</firstItemIndex>
|
||||
<secondItemIndex>296</secondItemIndex>
|
||||
<firstResultingItemIndex>1022</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>0</secondResultingItemIndex>
|
||||
<mergeType>6</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>597</firstItemIndex>
|
||||
<secondItemIndex>1022</secondItemIndex>
|
||||
<firstResultingItemIndex>596</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>1022</secondResultingItemIndex>
|
||||
<mergeType>4</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>598</firstItemIndex>
|
||||
<secondItemIndex>194</secondItemIndex>
|
||||
<firstResultingItemIndex>1022</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>0</secondResultingItemIndex>
|
||||
<mergeType>6</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>598</firstItemIndex>
|
||||
<secondItemIndex>195</secondItemIndex>
|
||||
<firstResultingItemIndex>1022</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>0</secondResultingItemIndex>
|
||||
<mergeType>6</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>598</firstItemIndex>
|
||||
<secondItemIndex>291</secondItemIndex>
|
||||
<firstResultingItemIndex>1022</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>0</secondResultingItemIndex>
|
||||
<mergeType>6</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>598</firstItemIndex>
|
||||
<secondItemIndex>296</secondItemIndex>
|
||||
<firstResultingItemIndex>1022</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>0</secondResultingItemIndex>
|
||||
<mergeType>6</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>599</firstItemIndex>
|
||||
<secondItemIndex>194</secondItemIndex>
|
||||
<firstResultingItemIndex>1022</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>0</secondResultingItemIndex>
|
||||
<mergeType>6</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>599</firstItemIndex>
|
||||
<secondItemIndex>195</secondItemIndex>
|
||||
<firstResultingItemIndex>1022</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>0</secondResultingItemIndex>
|
||||
<mergeType>6</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>599</firstItemIndex>
|
||||
<secondItemIndex>291</secondItemIndex>
|
||||
<firstResultingItemIndex>1022</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>0</secondResultingItemIndex>
|
||||
<mergeType>6</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>599</firstItemIndex>
|
||||
<secondItemIndex>296</secondItemIndex>
|
||||
<firstResultingItemIndex>1022</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>0</secondResultingItemIndex>
|
||||
<mergeType>6</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>600</firstItemIndex>
|
||||
<secondItemIndex>194</secondItemIndex>
|
||||
<firstResultingItemIndex>1022</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>0</secondResultingItemIndex>
|
||||
<mergeType>6</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>600</firstItemIndex>
|
||||
<secondItemIndex>195</secondItemIndex>
|
||||
<firstResultingItemIndex>1022</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>0</secondResultingItemIndex>
|
||||
<mergeType>6</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>600</firstItemIndex>
|
||||
<secondItemIndex>291</secondItemIndex>
|
||||
<firstResultingItemIndex>1022</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>0</secondResultingItemIndex>
|
||||
<mergeType>6</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>600</firstItemIndex>
|
||||
<secondItemIndex>296</secondItemIndex>
|
||||
<firstResultingItemIndex>1022</firstResultingItemIndex>
|
||||
<secondResultingItemIndex>0</secondResultingItemIndex>
|
||||
<mergeType>6</mergeType>
|
||||
<APCost>5</APCost>
|
||||
</MERGE>
|
||||
<MERGE>
|
||||
<firstItemIndex>874</firstItemIndex>
|
||||
<secondItemIndex>177</secondItemIndex>
|
||||
|
||||
Reference in New Issue
Block a user