Commit Graph
73 Commits
Author SHA1 Message Date
Wanne 0a62ebd22b ************************************************************
* Merged GameDir from Development Trunk: Revision 4063 *
************************************************************
- Merged from SVN: https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1257 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-01-18 10:24:49 +00:00
Wanne 43c1e39f60 - Fixed data\TableData\Magazines.xml
- Fixed "MINIMUM_CTH_DIVISOR" default value in Data\ja2_options.ini

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1247 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-11-02 09:24:09 +00:00
Wanne 32e0fd4416 - Moved language specific XML files (e.g: German.*.xml, Russian.*.xml, ...) to language specific SVN GameDir folder: https://81.169.133.124/source/ja2/trunk/GameData
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1235 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-09-14 16:36:54 +00:00
Wanne 0db4b8c783 New EXE Release (Build: 3358)
New Map Editor Release (Build: 3358)

New Features
-------

- Map Editor can now load/save big sector maps.
- Control hardcoded list of unclickable ("bad") sectors via XML file.
o On the strategic map, the player cannot click or highlight specific
  sectors (e.g. A4, A5). Introduce a <BadSector> tag in MovementCosts.xml
  that flags a sector as "bad". (<BadSector>1</BadSector>)
- Move hardcoded underground sectors initialization to Lua script file. (by Realist)
o Locate "initunderground.lua" at data-xyz\scripts ("xyz" subject to change).
  Lua script allows easily adding underground sectors at arbitrary locations and defining enemy garrisons and creature population.
  Also enables underground bloodcat population.
- Changed order of properties in GameSettings.cpp
- Sorted Data-1.13\ja2_options.ini
- Translated missing HAM 3.6 German Texts


Bugfixes
------

- In Method CreateDestroyMouseRegionsForFacilityAssignmentMenu()
- HAM 3.6 fixes
- Turns out that the program is saving the number of used Placement Slots to the temp file fine, 
  but if that number is equal to the limit of how many enemies/civvies are allowed in a sector by the INI settings, 
  it leads to an assertion error instead when trying to re-load that sector. (by Headrock)
- The DEBUG only setting "fEnableInventoryPoolQ" is now only enabled in a DEBUG version. 
  In all other builds it is set to FALSE.


Info Map Editor
-------
Q: How can I create Big Maps with the Editor?
A: 1.) Start the new Map Editor.exe file
   2.) The Map Editor should load a map automatically
   3.) You see now 2 new text boxes (Rows, Cols) in the taskbar
   4.) Enter the size of the new map in the Rows text box. It should not be greater than 2000
       Cols always have the same size than Rows. That's why you can't enter a number for Cols.
       Normal maps have a size of 160 rows X 160 cols
   5.) Now click on New map" or load an existing map
   6.) The map should have now the new size you entered for Rows
       If you loaded a map, the original map is placed in the center of the new big map
   7.) Make any changes you like to the map
   8.) Save the map. Depending on the mapsize it could take some minutes
   9.) The map will be saved in the Profiles folder

Q: How can I easy navigate in the editor in big maps?
A: 1.) Use the arrow keys to scroll. For fast scrolling press SHIFT + Arrow keys.
   2.) Press "i" and you get an overview of the map.
       Use the Arrow keys to scroll. By pressing also SHIFT you scroll much faster

Q: What is the version 1.12 checkbox?
A: If this checkbox is checked, the map will be saved in version 1.13 (vanilla JA2) format

Q: What limitions for big maps has the current Map Editor?
A: 1.) Radar maps are not created correctly for big maps. Only the upper left corner of the map is shown in the radar map
   2.) NPC-Scripts are bound to grid numbers. They are not yet converted to the new grid numbers when altering a normal map
   3.) There are a lot of hardcoded grid numbers in the source code, so they only work with normal maps
   4.) For now you should only create big maps, that do not have any NPCs on it, that trigger special actions
       For outdoor maps or town maps (that do not have any NPCs special actions) big maps work fine

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1213 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-03-07 18:46:35 +00:00
Wanne d60e1c75c8 - Bugfix: FacilityTypes.xml (Data/TableData/Map)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1212 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-03-01 22:32:58 +00:00
Wanne 104b9a09f0 New EXE Release (Build: 3342)
New Features
-------

- Added Big Maps Project support. You will not see any differences until I release the new Big Maps project Map Editor
o This will allow playing really big tactical maps (up to 2000 rows X 2000 cols, instead of "normal" 160 rows X 160 cols)

- Added Multiplayer v1.5
o Most important feature in this version is the synchronization of explosives (grenades, TNT, ...) and fixes some bugs

Info
-------

- Because of the Big Maps Project integration most of the structures have changed and you HAVE TO START A NEW GAME
o If you don't want to use the new EXE, I have renamed the previous release EXE to "ja2_3329.exe" and you can continue playing with your existing savegames.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1211 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-03-01 19:08:06 +00:00
Wanne 31c05993f1 New EXE Release (Build: 3329) incl. HAM 3.6
Bugfixes
--------
- Fixed NPC and PC movement errors
- Fixed boxers in San Mona do not leave the boxing ring after the fight
- Fixed Darren does not pay the cash after you won the boxing fight
- Removed a line of code which fiddled with chance to hit calculation.
- Cover Display now works correctly with multiple enemies.
- Cover Display has no problems with stance anymore.
- Enhanced IMP Creation: When choosing female, after leaving color choosing, the "email" button is removed. That's because the code tries to remove a button which do not exist (for big/small body) so it grabs the first one around (fixed by Sandro)
- Fixed CTD when throwing item (grenade, rock, throwing knife, ...) in tactical when item description box is open

New Features
------------
- HAM 3.6 (by Headrock)
o For more infos see: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=243620&page=1&fpart=1



git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1208 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-02-21 22:22:32 +00:00
Starwalker c3a9c1591f Corrected a few things, like attachment errors (e.g. default attachment does not exist in vanilla JA2).
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1205 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-12-16 09:12:19 +00:00
Starwalker 8588772eb5 Corrections for some items from UB
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1204 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-12-15 08:50:59 +00:00
inshy a3e1be82ab -Updated Dutch xml-files (translation by Tais)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1190 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-09-07 08:31:48 +00:00
Wanne 634d2ba440 New EXE Release (Build: 3042)
New Features
------------
- Spread Patterns MOD
o TableData/SpreadPattern.xml & additional (optional) <spreadPattern> Tag in TableData/Items.xml

Bugfixes
--------
o Mine income was not correctly initialized in GameSettings
o Need for soldier sleep was calculated wrong
o Stop Time when Skyrider arrives in the destination sector
o On "sell all" also unreachable items were sold
o Stop time compression when shipment and email arrives
o Fixed duplication of items from shipment. This bug occured, when loading a savegame with at least 2 depending shipment orders
o Re-enabled stealing from delivery sector (ja2_options.ini: STEALING_FROM_SHIPMENTS_DISABLED)
o Re-enabled & externalized chance that whole shipment is lost (ja2_options.ini: CHANCE_OF_SHIPMENT_LOST)
o Re-enabled delivery from John Kulba

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1159 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-06-28 18:05:27 +00:00
Wanne cd1da68973 - Added new Files and Folders which are used for VFS and Multiplayer
- Updated XML files in Data\TableData
- Moved Document files to new folder named "Docs"

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1134 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-06-04 21:09:26 +00:00
Wanne 47423aa10b - Updated Chinese.ShippingDestinations.xml
- New "Map Editor" (build: 2736): No map editor changes so far, but it should fix the problem with ja2.set -> "displaying white rectangles"

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1128 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-05-24 20:32:51 +00:00
Wanne 4596b79383 Added ShippingDestinations.xml files for Chinese, Dutch, Italian and Polish version (but they are all in English yet)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1125 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-05-06 13:26:06 +00:00
Wanne b169986d98 - Added German.ShippingDestinations.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1124 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-05-06 13:22:53 +00:00
inshy 4f729c8275 Added ShippingDestinations.xml for russian language.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1122 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-05-06 11:17:34 +00:00
Wanne 7a39fa6d22 - Added new files for Dealtar's and Zilpin's Airport Externalization (no new EXE build yet)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1115 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-04-21 20:31:57 +00:00
Wanne bae9954cc2 New ja2.exe (build: 2651)
New Features:
- Headrock's HAM 2.8:
- Zathras' Multiplayer UI Patch

Bugfixes:
- New option "Force turn mode" is always disabled when playing a multiplayer game
- Max Merc limit in multiplayer was not evaluated when hiring merc
- Press "ESC" while green progress bar on laptop loads -> Buttons are still visible although Laptop is closes
- Fixed szSoundEffects definition
- Minor fix to allow the bullet graphic to render properly when the shopkeeper panel is open.
- Fixed a bug when creating the application, it was only possible to start ONE instance of the game. Now it is possible to start as many instances of the game you would like.
- Temporary fix for game freeze when a path contains duplicate tiles

Also non English Versions (German and Russian) of ja2.exe are available
How to update these Versions from SVN, take a look at the Bears Pit thread:
http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=201700&page=1#Post201700 

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1104 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-04-01 13:41:26 +00:00
Wanne 20e96af7c3 Added XMLs for Italian and Dutch version for Data\TableData and Data-1.13\TableData (by Inshy)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1070 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-01-21 13:34:07 +00:00
Wanne 26edfcba16 Added Chinese XML Files for Data\TableData and Data-1.13\TableData
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1069 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-01-20 21:25:46 +00:00
Wanne cd9b29d043 Updated/Added XML-files in Data\TableData for Polish and French version
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1064 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-12-31 10:57:29 +00:00
Wanne ffd0e933d4 New XML Editor (Version 0.38)
- Removed unused files from TableData/Lookup folder. This files are created automatically from the XML Editor
- XML Editor now deletes the file "JA2Data.xsd" on startup and recreates it
- You can change the default maximum AP values (default = 100) for the XML editor in "XMLEditorInit.xml"

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1051 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-11-14 13:32:18 +00:00
Wanne f8be4686e6 New Exe Build (2417)
- Only internal source changes to make Polish release in the future
- The updated GameDir files in this Revision are needed for this new Exe Build.

German and Russian EXE / GameDir files can be found here:
http://ja2.h758491.serverkompetenz.net/Wanne/Build_2417

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1050 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-11-14 11:56:47 +00:00
Starwalker 0b21577d97 new Russian descriptions (Inshy)
corrected armours.xml (Inshy)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1037 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-09-09 06:24:09 +00:00
Starwalker b1978e6615 Dragunov SVD was set to 7.62x54R, which does not exist in the original JA2, and there is no ammo of this caliber available. Therefore I set this gun back to 7.62x39mm, as it was in original JA2.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1036 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-09-03 09:51:37 +00:00
lalien b25d33f783 Polish translation from inshy
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1031 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-08-12 23:01:31 +00:00
lalien db0c13aa8b Changed/translated Russian descriptions
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1024 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-07-07 15:03:38 +00:00
Wanne ad40a9492e updated Data/TableData/German.Items.xml (thx to Dr Deagle)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1002 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-05-17 21:29:39 +00:00
Wanne 859efc6c00 - New Exe Build 2013 (fixed item duplication bug)
- Updated Russian specific xml files

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@982 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-04-13 12:47:03 +00:00
Starwalker 52d7cbc6bb added (empty) other Polish language xml-files for later Polish-language support code to find. Translation needed!
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@972 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-03-31 13:46:56 +00:00
Starwalker 2619f8d70f added (empty) other Polish language xml-files for later Polish-language support code to find. Translation needed!
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@971 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-03-31 13:46:48 +00:00
Starwalker c048a2a1a2 added (empty) Polish language xml-file for later Polish-language support code to find. Translation needed!
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@970 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-03-31 13:43:25 +00:00
Wanne 20cc315369 - added empty LBEClass.xml, PocketSize.xml, Silhouette.xml to the Data\TableData folder, so the XML Editor can start without any error, if the "Data" folder is selected in the XMLEditorInit.xml file.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@966 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-03-25 16:02:20 +00:00
Wanne f42ad5a186 - added empty NIV xml files for "Data" folder, so we can start an old inventory game without getting a runtime error
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@965 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-03-24 10:47:23 +00:00
Starwalker 3bb01780b8 added the new explosive internal item at #270, so Overhaul's fix should be workin with vanilla JA2 as well. Also made a new explosive entry for this item in explosives.xml.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@876 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-09-13 08:31:45 +00:00
Overhaul 20df3ca6cf Corrected spelling errors and typos in SectorLoadScreens.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@874 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-09-11 09:54:56 +00:00
Wanne fc297a992a - Reworked Data\TableData folder so it reflects the classic/ub items and weapons (uiIndex <= 335)
- Corrected xml files and added needed STIs to get the xml editor working with the "Data" folder

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@867 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-08-28 17:56:51 +00:00
Wanne 40dcef0399 Corrected AttachmentInfo.xml, so it works with the xml editor
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@866 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-08-26 12:44:35 +00:00
Wanne 0c27cc47d4 Added some missing tags to the xml files, so they can load in the xml editor
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@865 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-08-26 11:24:36 +00:00
Wanne 7cf994b19d Added missing files to the Data folder, so the xml editor will work when selecting the Data folder in the XMLEditorInit.xml.
The xml editor can only read from STI files and not from SLF-Archiv.
Some xml files in the Data\TableData folder are invalid for the xml editor, so they needs to be corrected first to use the xml editor.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@864 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-08-25 16:40:27 +00:00
Wanne a671931ceb Corrected EnemyMiscDrops.xml, because the xml editor did not work with this version.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@862 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-08-25 15:36:16 +00:00
Overhaul bd40fa3bcb Fixed sector load screens. E4 was described twice, C6 was overwritten by C7, and A10 was set to allow an alternate random but had no alternate random defined.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@851 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-08-13 06:21:23 +00:00
Wanne fccb585aba Changed: I noticed from Data\sound.log, that the filename "DOORCR_B.wav" in TableData\Sounds\Sounds.xml is used, but does not exist in the JA2 folder. So I replaced "DOORCR_B.wav" with the existing filename "DOORCR.wav".
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@850 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-08-11 19:07:15 +00:00
Wanne 34a683cacb - new: Externalized sector loadscreens to TableData\Map\SectorLoadscreens.xml (Ja2_Options.INI Setting: USE_EXTERNALIZED_LOADSCREENS)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@810 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-21 14:32:11 +00:00
AcyForsythe de6c87675c - Added INI options for RESTRICT_ROAMING and REVEAL_ITEMS_AFTER_COMBAT
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@773 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-04-25 23:09:00 +00:00
MaddMugsy 1faa6a9e55 -Data folder xml files updated for use w/XML Editor
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@709 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-02-22 22:42:24 +00:00
Wanne d4e410f629 - fix: RUNTIME-ERROR after starting the game. The problem occured in ArmyComposition.xml in the comment block. "--" is not allowed in the comment block. Strange, don't ask me why ;-)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@591 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-19 18:47:12 +00:00
Lesh 1db5aa5005 - comments on army externalization (3/3)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@589 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-19 15:35:22 +00:00
Lesh 520df9152e - army xmls comments, files: 2 of 3
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@586 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-16 17:06:18 +00:00
Lesh afcd1f0b55 - army xml set added
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@581 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-14 14:26:14 +00:00