Commit Graph
1760 Commits
Author SHA1 Message Date
Flugente ac3ffbd9e7 TOPTION_MERCENARY_FORMATIONS toggles wether mercenaries walk in formation when more than one is selected.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1775 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-17 19:09:35 +00:00
Wanne eb459db10b - Added comments to Samsites.xml (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1774 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-17 14:45:49 +00:00
Wanne 9ebb2471e4 Mobile Militia Improvements (by moa)
o see: http://www.bears-pit.com/board/ubbthreads.php/topics/325133/Re_Fix_Catched_the_mobiles.html#Post325133


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1773 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-13 06:33:28 +00:00
Wanne 0bd3963f28 - Updated LoadScreenHints.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1772 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-12 11:21:31 +00:00
Wanne dcbde7fc46 - Restored German code page file (german.cp)
o To use the german codepage, you cann add the entry CODE_PAGE = german.cp in your ja2.ini file

- Updated LoadScreenHints.xml
o Added a few new hints
o Reworked some existing hints

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1771 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-12 11:05:20 +00:00
Wanne 511c9c1ea8 - Added new hints (by Faalagorn)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1770 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-12 07:22:29 +00:00
Wanne 625d880a09 - Added new hint (by DepressivesBrot)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1769 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-12 07:18:34 +00:00
Wanne 73566b0e10 git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1768 4f8fa57e-7814-0410-bad4-adc449f26b7c 2013-09-11 09:33:48 +00:00
Wanne 197239a51d - Added new hint (by Off_Topic)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1767 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-11 08:59:13 +00:00
Wanne 162e3f8710 - Deleted the Manuals from the "Docs" root folder
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1766 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-11 08:52:50 +00:00
Wanne e02a618658 Restructured / cleaned "Docs" folder
- The "Docs" folder now only contains the Manuals, Hotkeys, Compatibility Fixes ... and a link to the additional 1.13 Documents Folder
- Additional 1.13 SVN Documents: https://ja2svn.dyndns.org/source/ja2/trunk/Documents
- see: http://www.bears-pit.com/board/ubbthreads.php/topics/325007.html#Post325007






git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1765 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-11 08:46:37 +00:00
Wanne 1a7474ce74 - Fixed (Improved) create cutscene not playing after liberating 3 mine sectors (by Jazz)
o Reworked / optimized LUA script

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1764 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-11 07:30:18 +00:00
Wanne 70013ecee1 - Bugfix: Creature Quest Cutscene was not triggered
o There was a wrong condition in LUA script (In the ja2 source code this condition works, but not in LUA!!!)
-> WRONG:   if ( giLairID )           -> this is always triggered as TRUE and therefore never starts the cutscene
-> CORRECT: if ( giLairID ~= 0 )      -> if the quest has not started ( value != 0), start the cutscene

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1763 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-10 11:24:11 +00:00
Wanne 4e322cea5a - Fixed X-Y coordinate mixed up for CheckConditionsForTriggeringCreatureQuest (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1762 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-10 07:25:38 +00:00
Wanne 3dba3dee26 - Added link to the new mercenary spreadsheet (by Faalagorn)
- Deleted old mercenary spreadsheets

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1761 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-09 08:48:03 +00:00
silversurfer 8d400f8bbc changed IMP starting gear
Expert Snipers won't get a 10x scope anymore. They get a 2x scope instead. A 10x scope is useless at the start and when we buy or find a sniper rifle it usually has a 10x scope anyway.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1760 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-08 19:25:11 +00:00
silversurfer 33a0080de1 New parameters in CTHConstants.ini:
IRON_SIGHT_PERFORMANCE_BONUS
This makes the base aperture in NCTH smaller by x percent when using Iron Sights or other 1x sights.

LASER_PERFORMANCE_BONUS_HIP
LASER_PERFORMANCE_BONUS_IRON
LASER_PERFORMANCE_BONUS_SCOPE
These also make the base aperture in NCTH smaller by x percent when a laser is used with the respective sight. This replaces the old Projection Factor if one of the values is != 0. To continue using Projection Factor leave these three parameters at 0.




git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1759 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-07 11:58:13 +00:00
Flugente 4f0173345c BACKPACKWEIGHT_LOWERS_AP controls wether backpack weight affects APs negatively
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1758 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-05 19:43:07 +00:00
Flugente beda4107e8 (feature adjustment) Food properties are now shown in DB (by Moa)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1757 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-05 17:36:05 +00:00
Wanne ad1c104538 - Correct a few sentences "LoadScreenHints.xml"
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1756 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-05 13:01:54 +00:00
Flugente 9a9c210746 - aligned texts
- added <insurance> tag to backgrounds

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1755 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-04 23:33:03 +00:00
Flugente 0987191f43 - added more backgrounds
- added new backgrounds to mercs
- <no_male> and <no_female> prohibit specific backgrounds to show up on IMP generation
- <cth_vs_creatures> modifies gun CTH when aiming at creatures

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1754 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-04 21:09:21 +00:00
Wanne 0e7fb3b00a - Added new hints to LoadScreenHints.xml (by Off_Topic)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1753 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-04 17:17:24 +00:00
Wanne 55ffda0240 - Deleted old UB executables
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1752 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-04 11:09:50 +00:00
Wanne 242232cecf - Turned on the new Feature "Merc Story Backgrounds" for the 1.13 Mod per default (-> awesome mini feature)
- Fixed crash on startup of "Vanilla" mod
o Missing Backgrounds.xml
o Made the initialization of the "SoldierProfileEnemy*.xml" files optional, because the "Vanilla" mod does not need it
- Updated Ja2_Settings.INI

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1751 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-04 10:45:26 +00:00
Wanne 7a8c727741 - Fixed B_map icon contrast and transparency issue (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1750 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-04 10:29:20 +00:00
Wanne 64bdbe450d - Added new hints and tips to the LoadScreenHints.xml (by Uriens)
- Added missing OVERHEATING property in "TableData/LoadScreenHints.xml"


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1749 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-04 10:06:21 +00:00
Flugente baf0a60594 - new feature: backgrounds allow more personalisation of mercenaries
- background feature replaces overheating on startup screen, moved overheating opion to ini

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1748 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-03 20:40:56 +00:00
Wanne 4e3eb01e65 - Bugfix: Fixed issue with the Leather Shop Deed quest (by silversurfer)
o On modified maps Kyle couldn't reach the temp money for the reward. Now there is a new parameter in Mod_Settings.ini called KYLE_MONEY_POSITION = x. The default for x is 14952 which is for vanilla map.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1747 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-01 16:07:46 +00:00
Wanne dab64f4e9f - LUA Script Bugfix (by silversurfer)
o Added missing ProfileID parameter when calling the LUA method: CheckFact( fact, profileID )

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1746 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-08-30 20:40:20 +00:00
Wanne f8431f558c - Corrected comments and ini references (by Faalagorn)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1745 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-08-30 14:09:18 +00:00
Wanne 111d5226ec - UB Improvements / Cleanup (by Jazz)
o Deleted unused Inventory XML files

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1744 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-08-29 11:57:12 +00:00
Wanne 2b7d9a05a7 - UB Improvements / Cleanup (by Jazz)
o added the lacking items of UB to files "the "Data\TableData\Items\Items.xml". 
o Necessary "Hand Cannon" were moved to the task Raul, to files H11_0_ExtraItems_xxx.xml. 
o The instruction Morrisa will be generated after destruction of Morrisa automatically. 
o All scripts lua were modified for UB

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1743 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-08-29 11:56:11 +00:00
Flugente e9d3115ee7 Clothes can be cut into rags.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1742 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-08-28 19:55:49 +00:00
Wanne 7a1cf8171b - UB Improvements / Cleanup (by Jazz)
o Deleted old / unused files and added / updated new files
o Fixed problems with the icons of objects laid on the ground (wrong ja2set.dat)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1741 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-08-28 17:09:45 +00:00
Wanne beb8cbffd4 - Bugfix: Fixed too long sentences in Email.edt for John Kulba (thx to Inshy for reporting)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1740 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-08-28 16:34:03 +00:00
Flugente 60c837d358 soldier tooltips now display energy and morale
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1739 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-08-26 21:23:22 +00:00
Flugente 56b971ce75 moved face icons for assignments and various states to a separate library to be independent of face gear icons
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1738 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-08-25 11:57:34 +00:00
Flugente 5763fe9d73 - Updated faces and added missing camo faces for Spike and Leech (by anv)
- fixed Sparky relationships and quotes (by anv)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1737 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-08-24 23:08:25 +00:00
Wanne 85aa8bac65 - Cosmetic Improvements to MERC hiring page (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1736 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-08-22 19:36:22 +00:00
Wanne d3355d1c07 - Added optional profile names to the XML files (by silversurfer)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1735 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-08-21 22:25:16 +00:00
Wanne 8905dcc21b - Updated Vehicles.xml (by silversurfer)
o Added the jeep

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1734 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-08-21 07:52:47 +00:00
Wanne 94cffbcb63 - Bugfix: Externalized Music (Music.lua) (by Jazz)
o Added missing:
6 - creature start battle  (CREATURE_BATTLE_xxx.wav or CREATURE_BATTLE_xxx.ogg)
7 - creepy music  (CREEPY_xxx.wav or CREEPY_xxx.ogg)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1733 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-08-20 08:34:32 +00:00
Wanne f805684010 - New Externalization: Externalized the used music to an OPTIONAL "Scripts\Music.lua" file (by Jazz)
o This file is OPTIONAL and if not available, the game uses the default music tracks
o With the user of the Music.lua script file, you can play different musics and types for each sector (*.WAV or *.OGG)
o An example of the usage has been added to "Docs\Externalized Music Example.zip"
o See comments from the Music.lua scripts below

--[[
AddMusic(SectorX,SectorY,SectorZ,MusicType,MusicID)

MusicType :
1 - standard music, sector no enemy (NOTHING_xxx.wav or NOTHING_xxx.ogg)
2 - enemy in sector  (TENSOR_xxx.wav or TENSOR_xxx.ogg)
3 - start battle  (BATTLE_xxx.wav or BATTLE_xxx.ogg)
4 - victory  (TRIUMPH_xxx.wav or TRIUMPH_xxx.ogg)
5 - death merc  (DEATH_xxx.wav or DEATH_xxx.ogg)

xxx - number file

MusicID - id of music

Put to "Music" folder ogg or wav file. We number the names of files NOTHING_0.wav... NOTHING_10.wav ... etc

Example :
AddMusic(1,10,0,1,0) -- add to sector A10, music type "1" and file NOTHING_0.wav or NOTHING_0.ogg.
AddMusic(1,10,1,1,0) -- add to sector A10_B1, music type "1" and file NOTHING_0.wav or NOTHING_0.ogg.
AddMusic(1,9,0,2,10) -- add to sector A9, music type "2" and file TENSOR_10.wav or TENSOR_10.ogg.

for x = 1,16 do
        for y = 1,16 do
		AddMusic(x,y,0,1,10) -- add to all sector, music type "1" and file NOTHING_10.wav or NOTHING_10.ogg.
	end
end

]]

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1732 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-08-20 07:21:55 +00:00
Wanne 7bbe67776b - Updated some JA DG faces and added missing camo faces for JA1 natives (by anv)
o Face improvements: Spam & Roachburn family members
o Added missing camo faces for the 3 JA1 natives

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1731 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-08-20 06:45:46 +00:00
Flugente 25acada9c1 added a few loadscreen hints (by Acqsen & Flugente)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1730 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-08-19 19:43:33 +00:00
Flugente 1f42603859 made tripwire merges not that hard, thereby reducing the stat gain
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1729 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-08-16 22:27:29 +00:00
Wanne 27dfcb84a4 - Fixed wrong index of drunken Larry in MercAvailability.xml (by silversurfer)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1728 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-08-15 20:21:19 +00:00
Wanne c150b517da - Fixed missing and placeholder face files for the 3 JA1 natives (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1727 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-08-14 11:20:06 +00:00
Wanne 62b01d0637 - Bugfix: Fixed duplicated tags that were introduced in revision 1725 (thx to silversurfer)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1726 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-08-11 20:08:25 +00:00