Commit Graph
2672 Commits
Author SHA1 Message Date
Flugente d2be96384f Improved frame selection for frozen soldiers.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8042 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-01-28 21:46:11 +00:00
Flugente 2f84d10f07 If cheats or debug mode are active, the exact amount of disease points is described for each active disease.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8036 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-01-25 19:25:48 +00:00
Flugente 811f18009f New ammotype: cryo ammo deals no damage, but freezes a soldier for two turns (stackable effect). A frozen soldier cannot perform actions, and has drastically lowered damage resistance. For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=22926&start=0&
Requires GameDir >= r2284.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8034 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-01-24 22:54:13 +00:00
Flugente a9778435dd Fix: GROUP pointer can be NULL after MoveSAIGroupToSector is called
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8033 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-01-24 20:40:46 +00:00
Wanne bd6ba9b773 - Multiplayer Bugfix: After synchronizing client data, the cached item names did not get reinitialized
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8031 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-01-24 20:02:39 +00:00
Flugente db51179b2d Fix: changed variable type to prevent possible underflow
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8030 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-01-24 19:12:14 +00:00
inshy a08076617a New translation
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8029 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-01-24 11:41:05 +00:00
Wanne b0207aadcb Reenabled the "AI Viewer" in Strategy screen when pressing F12 in a DEBUG 1.13 version
- The AI Viewer was disabled in Revision 7727 (I don't know why ...)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8028 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-01-23 16:15:38 +00:00
Flugente b4179aeeeb Fix: It is possible to leave a sector while an explosion has been activated but not yet occured. In this case the game waits for the explosion to occur before hadnling AI, resulting in a deadlock. For more info on this bug, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=22909&start=0&
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8026 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-01-17 16:00:42 +00:00
inshy 4cf9f557f8 1) Do not use a "Tab" instead "Space" in the text messages. We don't have symbol for symbol "Tab" in the fonts, so when we use it in the text the game show "A"
2) Fixed mistakes in English
3) New translation for Russian text 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8025 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-01-17 09:54:44 +00:00
Wanne b430965027 Fixed compilation error in VS 2005
- Missing "include <math.h>" in ASD.cpp
- Missing cast argument to FLOAT inside sqrt() function

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8021 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-01-15 08:09:52 +00:00
Flugente 3ce0e04a79 Fix: possible overflow when creating building (by asm-debacle)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8020 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-01-11 18:06:21 +00:00
Flugente f6a3b481e5 Fix: scout trait description
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8019 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-01-10 18:33:14 +00:00
Flugente 3af6748b03 - Fix: compiler warning
- If possible, use the intended macrso to determine sector coordinates

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8018 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-01-10 18:06:55 +00:00
Flugente f09d7818f0 - Moved ASD & Enemy Heli-related settings from JA2_Options.ini to Mod_Settings.ini.
- Enemy Helis can also be unlocked if a certain game progress is reached.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8017 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-01-10 14:46:55 +00:00
Flugente f3acdb5963 If a downed enemy helicopter had soldiers on it, there is a chance that they survived the crash.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8016 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-01-09 22:28:26 +00:00
Flugente 7664342746 - New Feature: Arulco special division controls other features to fight the player. For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=tree&goto=343706&#msg_343706
- New Feature: Enemy helicopters allow the AI to rapidly deploy troops aross the map. For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=tree&goto=343707&#msg_343707. GameDir <= r2279 is required.
- Fix: income of mine 0 was not correctly calculated

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8015 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-01-09 19:45:30 +00:00
Flugente 70b832d0b4 Militia equipment feature improvement:
- Attachments are rated depending on their class. The following attachments are used: Scopes, foregrip, bipod, lasers, sights, muzzle, stock, sling.
- Attachments are rated just like any other item during the militia equipment process is. For now this is simply status * coolness.
- After evaluation, attachments are added in the above order. This means that militia will now take bipod attachments, but always prefer foregrips for their shared slot.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8014 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-01-09 16:55:12 +00:00
silversurfer 50c764ee04 Fix: - additional defenses around Meduna and additional elites where used incorrectly from DifficultySettings.xml
- corrected some typos for parameters from DifficultySettings.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8013 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-01-09 16:27:56 +00:00
Wanne 48413a9242 Fix: Fixed crash, when clicking on "Done" button after "Auto Resolve" has been finished (pGroup NULL pointer)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8008 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-01-03 11:43:38 +00:00
inshy ec66894c75 -Fixed wrong translation...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8007 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-01-01 20:33:42 +00:00
silversurfer dcf8b3abaf AI improvements (by Sevenfm):
Bugfixes:
- Fix: Watched Locations system (never worked in 1.13)
- Fix: LineOfSight test with NO_DISTANCE_LIMIT (stopped on trees previously)

AI/tactical improvements:
- EstimateThrowDamage additionally calculates damage from fragments (important for AI to use frag grenades with low main damage and many fragments)
- EstimateThrowDamage correctly adds IndoorModifier
- Additional checks for RED suppression (check that the soldier will not shoot his friends, check that he has extra clip to reload weapon, check that target is not cowering, don't suppress when flanking)
- ClosestReachableDisturbance will use general noise only if cannot find any enemy
- Allow RED seeking in prone stance if we haven't seen enemy for several turns

Flanking improvements:
- allow YELLOW flanking for CLOSEPATROL at night
- better YELLOW/RED flanking start/stop conditions
- better RED AI behavior when finished flanking (try to reach flanking spot)
- allow RED flanking for CLOSEPATROL soldiers when at night, overcrowded or no other flanking soldiers yet

Optional AI improvements:
AI_EXTRA_SUPPRESSION
- AI will use suppression fire more often in RED state (set minimum AI CTH to 1)

AI_NEW_MORALE
- Better dynamic morale calculation depending on tactical situation.
- Additional min/max limits for AI morale
- Disabled HOPELESS morale for soldiers without guns (they can pick up weapon or attack with hands sometimes)

AI_BETTER_COVER
- Additional checks for line of sight, fresh corpses and overcrowded locations

AI_EXTRA_FLANKING
- Allow flanking for BRAVEAID/BRAVESOLO

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8006 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-12-19 14:22:47 +00:00
silversurfer 2c889635ac Fix: New drug system didn't work and led to crashes of the debug build at start. Data will now be assigned to NewDrug directly instead of going through a placeholder which breaks the vectors.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8005 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-12-14 10:15:09 +00:00
silversurfer 1e54f492ff AI flanking improvement by Sevenfm:
Improved AI RED/YELLOW flanking:
 - better direction calculation (use direction arrays)
 - increased search range 4->8
 - removed incorrectly calculated AP limit (use CalcActionPoints instead)
 - additional direction for flank spot searching
 - prefer desired direction
 - penalize tiles with no cover from noise location
 - penalize tiles too far from noise location
 - don't go into deep water for flanking
 - skip water tiles (can flank over water tiles only if can cross them in one turn)
 - min/max flanking range depends on time of day and base sight range
 - skip buildings when searching for flank spot if not in building already, because soldiers often run into buildings and stop flanking
 - use RUNNING movement mode for flanking instead of default SWATTING
 - only CUNNINGSOLO and CUNNINGAID soldiers flank
 - don't start flanking when no friends between soldier and noise gridno (in 3 directions)
 - stop flanking when no friends between soldier and noise gridno (in 3 directions)
 - stop flanking and reset flank counter in BLACK state
 - avoid map edges when flanking
 - disable flanking for soldiers with limited roaming range (STATIONARY/ONGUARD/CLOSEPATROL/SNIPER)

 In general, AI flanking is much more effective now (it never fully worked previously, especially in turnbased).

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8003 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-11-17 19:19:22 +00:00
Wanne 38e77c7295 Fix: Fixed compilation errors when trying to compile UB version
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8001 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-11-04 08:12:47 +00:00
silversurfer 0ff8256c40 Fix: When talking to a shopkeeper the game could crash with an assertion in Shopkeeper Interface.cpp line 990 because the temp vector wasn't initialized properly.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8000 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-11-03 12:34:31 +00:00
Wanne a3806919ad Bugfix: Allow shooting on "water tiles" instead of showing the "?", if our soldier is on ground level > 0
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7998 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-10-23 14:47:15 +00:00
Wanne 91eef3098c - Equip Milita Improvements: I've written code, which adds attachments to free positions on the gun militia chose to pick up (by navaroe)
- Bugfix: Reinforcements:  Parts of roadblocks were resurrected after reinforcements death (by navaroe)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7995 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-10-15 10:40:58 +00:00
Wanne fbd5cc001f - Updated Chinese translations (by zwwooooo)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7993 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-10-05 19:31:35 +00:00
Wanne 6d08593bd0 MeLoDy Updates
- Increased horizontal table column width to fit longer merc names


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7991 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-09-13 15:21:55 +00:00
Wanne b9a07dd36a MeLoDy Updates
- Increased horizontal table column width to fit longer merc names
- Externalized header texts 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7990 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-09-13 13:49:41 +00:00
Wanne ffdcb827df Externalized Quest strings (Encyclopedia) (FactDescText, QuestDescText) to the language Text files
- See comment // TODO.Translate

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7989 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-09-13 12:00:23 +00:00
Wanne a2589f7034 Bugfixes / Improvements (macros) of Assignments (by Franimus)
- Fixed warning for INT8 overflow on scroll region priority, seemingly had no effect though
- Use new assignment macros
- Bugfix - POWs' activity level being overwritten
- Feature - automatically bandage bleeding mercs on a PATIENT assignment
- Bugfix - mercs treated at facilities should not use mercs' medkits
- Added 3 new enums for facility doctor, patient, and repair
- Bugfix for facility patients not detected as being in a facility
- Bugfix - iBurstAPCost was ignoring half of its calculation due to extraneous semicolon


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7988 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-09-12 11:27:28 +00:00
Flugente 3ab623e452 Externalised ini values: CORPSE_DELAY_UNTIL_ROTTING and CORPSE_DELAY_UNTIL_DONE_ROTTING control when a corpse rots and vanishes.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7981 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-08-19 20:02:00 +00:00
Flugente 8a84db40d4 Fix: enemy tanks spawned by cheats are not added to the sector count
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7980 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-08-18 19:26:41 +00:00
Flugente a87200619a Fix: singleshot launchers are always displayed as out of range
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7979 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-08-18 18:50:10 +00:00
Flugente 96d1177e31 Fix: sectors can't be selected in GETITEM menu
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7978 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-08-17 21:09:44 +00:00
Flugente 5385ae1295 - Fix: cleaning weapons prompt read parameters wrong
- when a merc regains HP via surgery, display the gain
- if an EPC leaves the team, add them to the list of departed characters

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7977 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-08-17 20:00:19 +00:00
silversurfer 873929c410 Fix (by sevenfm): Queen position was not read correctly from Mod_Settings.ini
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7976 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-08-17 17:09:51 +00:00
inshy e251139d99 Do not use a "Tab" instead "Space" in the text messages. We don't have symbol for button "Tab" in the fonts, so when we use it in the text the game show "A"
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7975 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-08-15 18:31:58 +00:00
Flugente 8fa2d4402c Rdio sets no longer need a battery.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7974 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-08-14 20:50:27 +00:00
inshy dfe2dae684 -Translated "MeLoDY" web for Russian language
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7973 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-08-14 11:49:37 +00:00
Flugente 2655b37ddf Fix: ap cost for AI_ACTION_CLIMB_ROOF was wrong and calculated too often
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7972 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-08-13 18:14:57 +00:00
inshy 2d267a9d9b -Fixed grammar in English (It is Ok to use the word "insertion" in Kerberus web???)
-Translated main page of Kerberus web for Russian language

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7970 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-08-13 13:21:21 +00:00
Flugente 7fed5fd5dd - Sandbags no longer need to be filled.
- Item flags 1 and 4 (EMPTY_SANDAG and SHOVEL) are no longer used.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7968 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-08-12 21:14:48 +00:00
Flugente 80bdeff0e4 drinking aclcohol causes less dynamic opinion events, as there were way too many if drinking in a large group
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7967 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-08-12 20:14:14 +00:00
Flugente 6fdde45807 - The 'Improve gear' function in the [Ctrl] + [.] menu improves the gear of all present mercs by replacing their items with sector items with higher status
- Fix: AP costs for item consumption were not substracted

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7966 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-08-11 22:51:00 +00:00
Flugente 80cf6af0ce - Fix: opinion events on drinking alcohol did not happen
- Fix: mercs in transit complain about mercs present in Arulco

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7965 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-08-09 22:21:37 +00:00
Flugente 13875810a4 minor code cleanup
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7963 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-08-08 09:33:28 +00:00
Flugente 5e8ab2af31 Fix: possible access to invalid memory if waypoint is list was corrupted
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7962 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2015-08-07 20:16:15 +00:00