Commit Graph
1820 Commits
Author SHA1 Message Date
Wanne db7b59f742 - Adjustment: Now it is possible for merc to sleep only 3 hours (instead of 6) (by Buggler)
o e.g: Razor should sleep only 3 hours

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6357 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-04 16:56:10 +00:00
Wanne 3b8ba34ecf - Bugfix: Only init the profile xml filenames, if exist
o This fixes the crash when starting a "Vanilla" game (Vanilla 1.13 does not have any profile xml filenames)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6356 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-04 16:54:27 +00:00
Wanne 89194ff11b - Expanded militia training to 6x6 square (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6355 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-04 10:28:12 +00:00
Wanne 92c04a4f60 - Translated "Story Backgrounds" to "Merc Story Backgrounds"
- Added missing translation from "Overheating Weapons" to "Merc Story Backgrounds" for non English Versions
- Added "// TODO.Translate" comments to the new texts

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6354 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-04 10:16:05 +00:00
Flugente 4ccc6a5b2a - new feature: backgrounds allow more personalisation of mercenaries
- background feature replaces overheating on startup screen, moved overheating opion to ini

WARNING: GameDir revision >= 1748 is required.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6353 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-03 20:55:33 +00:00
Wanne 0bff118f10 - Bugfix: If mercs "walks on water tiles", the game used the travel-swimming BP points instead of the travel-flat BP points
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6352 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-03 08:32:50 +00:00
Flugente d9e526bcc8 Added 'Ctrl' hotkey to add/remove 5 militia when assigning militia (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6347 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-02 18:03:04 +00:00
silversurfer 8ff9125b37 Bugfix: soldiers killed on roof edges should now properly fall down and not be stuck in dying state anymore
Enhancement: enemy troops should no longer attack empty player vehicles

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6346 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-02 15:33:55 +00:00
Wanne 858707a937 - Fixed unmovable dropoff icon when enemy took back SAM site due to initial DEFAULT_ARRIVAL_SECTOR set to hostile airspace sector (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6344 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-02 08:51:13 +00:00
Wanne 6794dcfbe0 - 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/trunk/GameSource/ja2_v1.13/Build@6343 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-31 16:48:37 +00:00
Kriplo f68f6131b9 Brief: //dnl ch64
- Fixing Tank bursting shells problem, and some other tank related bugs.
Details:
- There are several problem with Tank handling, main was forcing to use gun although already decide to use machinegun which lead to bursting shells.
- Another one was related to machinegun usage as current autofire handling is not supported by TANK BURST animation which had limit to 6 rounds, so decision to fire anything different then 6 lead to complete wrong APs deduction.
- Fix some invalid animation decision as current tank cannot raise gun or move or check for cover.
- Fix problem with wrong return (INT8) although after introduction of 100AP system APs variables are INT16 which create bad APs calculation for tank.
- Fix general problem with burst and autofire when soldier decide to when swap weapons.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6340 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-31 10:22:25 +00:00
Wanne 1bb3f5a56a - Multiplayer Bugfix: Fixed crash in RELEASE version, when entering tactical insertion screen
o The game crashed in RELEASE version, because of uninitialized music variables which were introduced in revision 6296

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6338 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-30 18:21:01 +00:00
Flugente 25cfbd0c9e Fix: wrong game language
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6337 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-29 20:39:14 +00:00
Flugente 4f7f186580 Fix: moved function call to UB
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6336 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-29 20:38:18 +00:00
Wanne 25dd0b084e - UB Improvements / Cleanup (by Jazz)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6334 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-29 11:53:39 +00:00
Wanne a5abf4d91a - UB Improvements / Cleanup (by Jazz)
o Now there are 2 ways to play UB (1.13 and Vanilla): vfs_config.UB113.ini, vfs_config.UBVanilla.ini
o UB: Source Code cleanup: Replaced hardcoded merc profiles with proper ENUMS, ...
o Updated / added UB-Config values


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6330 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-28 17:06:43 +00:00
Flugente ee8d4f6eb9 Assassins use and loose uniforms if uncovered
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6326 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-27 22:48:02 +00:00
Flugente 18a55c89cc Fix: gear icons and assignment icons no longer overlap
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6325 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-27 20:04:36 +00:00
Flugente df7cb392c5 Forbid time compression if hostile civilians or bloodcats are in the sector. Otherwise all travelling squads are delayed over and over again.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6324 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-26 21:57:19 +00:00
Flugente 6ad228e91e soldier tooltips now display energy and morale
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6323 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-26 21:19:31 +00:00
Kriplo 44d98500f1 - in ch58 forget to check if pointer is null which of course lead to CTD, sorry ;-)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6322 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-25 20:55:59 +00:00
Kriplo 571a2940e6 Brief: //dnl ch63
- Fixing AI problems when they use launchers.
Details:
- Seems from implementation of 100AP system and new attachment system and new kind of GL launchers, AI use them improperly or not used at all. Bugs was:
- Bursting grenades from non burst launcher.
- Not use GL if grenade is already in it
- Not firing from rocket launcher if couldn't find hand grenade.
- Refusing to launch grenade from attached GL if couldn't find grenade in other pockets.
- Never fire from single rocket launchers like LAW.
- Incorrect chance to throw calculation for GLs which lead into no decision to throw.
- Whole cylinder of grenades was permanently remove from pocket after reloading launcher.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6321 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-25 20:30:46 +00:00
Flugente 29beae22d5 Fix: game clock patch caused compile errors in editor (by silversurfer)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6320 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-25 20:24:43 +00:00
Flugente 3612cb1279 Fix: face gear items were wrong
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6317 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-25 15:12:47 +00:00
Flugente 3375414e51 Game clock improvements (by Moa)
Before Patch:
Render region for the Game Time and Tooltip region for this region had different x/y coordinate formulas which resulted in missplaced ToolTip on screen resolutions higher then 3.

There where 4 different definitions of Clock position: INTERFACE_CLOCK_X, INTERFACE_CLOCK_TM_X, CLOCK_X, CLOCK_REGION_START_X. Also there where 2 different definitions of the region: CLOCK_STRING_WIDTH, CLOCK_REGION_WIDTH.

Pause Box had a fixed position on screen regardless of resolution mode or screen size.

Two different kinds of defines for the Font where used: CLOCKFONT and CLOCK_FONT

After Patch:
Only 2 different coords are existant for rendering the clock, of which 1 is currently redundant as it is off screen for NIV. The later can be used once the Teampanel in tactical screen can handle the clock while showing the inventory (currently the clock is not rendered when NIV is used), this however requires new graphics for 6/8/10 squatsizes. Once a new location for this case is determined simply update the RenderTEAMPanel(BOOLEAN) accordingly with new if clause for NIV (Offset of LOCATION_NAME_TM_X can be used, or what everis convinient).

Also 2 boundary boxes of the region are present, one for the actual area 66*14 (CLOCK_AREA_WIDTH) and one for a little gap of currently 1 pixel for the mouse region (CLOCK_REGION_OFFSET_X) the later one is kindof not neccessary since the String gets now centered in the Area. But maybe someone will make a mod with small render area but large mouseregion for the clock, who knows :)

Pause Box is now rendered in the center of the screen as intended.

Only one font for the clock! There was no need for a different define, also the CLOCKFONT.sti is not in GameFolder so I changed that and use the COMP font.

All globals are now located in Game Clock.cpp but still get initialized in Interface Panels.cpp since the init function in Game Clock.cpp is called too early and no globals for screen size and resolution are known at this point.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6316 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-25 13:38:21 +00:00
Flugente 127dbc2f90 moved face icons for assignments and various states to a separate library to be independent of face gear icons.
GameDir >= 1738 is required.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6315 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-25 11:58:22 +00:00
Kriplo 638de03d8d Brief: //dnl ch62
- Ignore firing into dying and breathless targets.
Details:
- AI will ignore attack breathless targets if there are other in better condition.
- AI will not fire into dying targets.
- AI should avoid go into creature gas.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6314 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-25 08:40:36 +00:00
Kriplo f06df7741f Brief: //dnl ch61
- Basic support for reducing AI friendly fire.
Details:
- Friendly fire grids are defined during best shot calculation then AI decide depending of soldier character to fire or take other action. Still in autofire accidentally friendly hits could be higher depending of bullets spreading.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6313 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-25 07:36:03 +00:00
Flugente 4ac9cf5ebe Library Updates and 'ext' directory cleanup (by Buggler)
- utfcpp 2.3.4
- libpng 1.2.50
- zlib 1.2.8

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6312 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-24 20:42:14 +00:00
Kriplo 123b46f2c8 59. Brief: //dnl ch59
- Fix problem AI cannot fire when mercs are on roof, AI calculate chance to hit from all stances.
Details:
- Sometimes AI not fire when target is on roof, happens in situation when previous target was on ground because bLevel was not update.
- Instead to calculate ChanceToHit only from STANDING from now AI calculate chance for all stances, so AI should be more eager to attack.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6311 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-24 20:17:16 +00:00
Kriplo 1adc9c542c Brief: //dnl ch58
- Fix several problems which lead into bad or no AI decisions, add optional decision of short autofire.

Details:
- Avoid use of last two locations per turn 
- Fix problems with improper APs calculations for burst and autofire which lead into AI to forcably cancel and end turn for those actions.
- Add option for decide to use short autofire instead of one long to enchance chance to hit.
- After taking cover change facing toward closest enemy to avoid going in status red and rather take proper black decisions.
- Fix bad public noise processing after AI investigate closest disturbance and find nothing, also erase all same noise points in team members if one of them already investigated.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6310 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-23 16:27:36 +00:00
Wanne e49412eae9 - Cosmetic Improvements to MERC hiring page (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6308 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-22 19:35:59 +00:00
Wanne 09dbe4c96f - Fixed loading of vehicle faces (by silversurfer)
o Vehicle faces after index 163 (heli) were not loaded

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6302 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-21 22:27:34 +00:00
Flugente 62aa8acd3e Fix: previous fix was very bad
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6301 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-21 19:14:43 +00:00
Flugente aa82e0010c possible division by 0 for blind soldiers
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6300 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-20 22:53:01 +00:00
Flugente 8b6a8cfe26 Fix: weapon mode wasn't changed back after checking for grenades (by Kriplo)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6299 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-20 22:06:28 +00:00
Flugente 320f82ae7e Fix: game crash when civilians kill other civilians in a town
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6298 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-20 20:55:12 +00:00
Flugente ec07946730 Changed MOVEITEM dropoff gridno to a location that is always guaranteed to exist and be accessible
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6297 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-20 20:15:16 +00:00
Wanne 643612540d - 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/trunk/GameSource/ja2_v1.13/Build@6296 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-20 08:33:32 +00:00
Wanne ab02106512 - 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/trunk/GameSource/ja2_v1.13/Build@6295 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-20 07:15:30 +00:00
Flugente 74f52b3982 Changing MAX_NUMBER_PLAYER_MERCS midgame no longer renders savegames unloadable, as the teamsize is stored in the savegame anyway
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6294 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-19 23:27:50 +00:00
Flugente 4b0094902a Forbid ammo with tracer effects to be used by AI on singleshot-only guns
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6293 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-18 22:40:33 +00:00
Flugente 2852b33ac9 Fix: AI does not ask for surrender if creatures are around, thereby not offering zombies surrender
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6290 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-18 16:45:31 +00:00
Flugente 3fc50d46a3 - Fixed EDB modifier weirdness(by Moa)
- Fix: overheating modifiers on attachments weren't shown correctly

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6289 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-18 16:17:43 +00:00
Flugente b643ddc7f3 Fix: nada items or CTD when 'move item' assignment takes items from a sector that is currently loaded in tactical.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6288 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-18 14:31:55 +00:00
Flugente 6cf45e456e Fixed moveitem dropoff gridno - gear is no longer dropped in inacessible places
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6287 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-16 22:25:29 +00:00
Wanne a08175906d - Improvement of M.E.R.C availability (by silversurfer)
o Now you can change the MercAvailability.xml file during a game

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6286 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-15 20:20:06 +00:00
Flugente 5f4c5e63e5 speed up item movement by lowering the number of inventory accesses
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6282 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-11 21:04:51 +00:00
Wanne 4266ba809d - Bugfix: Prevent merc swapping in tactical while they are talking (by silversurfer)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6281 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-11 19:02:00 +00:00
Flugente 8171fdbe7e new feature: 'Move item' assignment allows quick and easy mass transfer of items between city sectors.
Warning: GameDir >= r1723 is required.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6280 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-08-11 15:22:29 +00:00