7604 Commits
Author SHA1 Message Date
Sevenfm fea2a0d12b Items.cpp: MAXATTACHMENTS limit
lighting.cpp: check return values

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8258 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-06-25 09:18:47 +00:00
Sevenfm d2c1579786 HandleSnitchExposition: assignment instead of value check
HourlySnitchUpdate: NUM_PROFILES limit
Strategic AI.cpp: MAP_WORLD_X * MAP_WORLD_Y limit
RemoveMPButtonsForMapScreen: MAX_MP_BUTTONS limit
WrapString: '/0' char instead of '\0'

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8257 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-06-25 09:04:58 +00:00
Sevenfm 120507a9fd UpdateStrategicDetectionLevel fix: reset detection level
ScoutIsPresentInSquad: allow scouting only if soldier is not in a vehicle and not on assignment
StartCivQuote fix: uninitialized ubCivQuoteID2

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8256 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-06-25 08:48:40 +00:00
Wanne dadd2d9f3f Update - 2016-06-22: Deadly Games German Translated Mercs for 1.13 - BETA (by firebat)
- updates to Wally
- updates to Eli
- updates to Postie
- updates to Bernie
- updates to Dyno
- updates to Screw
- updates to Sparky
- updates to Pops
- updates to Skitz
- updates to Vinny
- updates to Ears
- updates to Doc
- updates to Juan
- updates to Speck
- updates to Mike

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@8255 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-06-24 07:16:23 +00:00
Flugente 0955d6ddfd Fix: bad LUA functions (by sevenfm)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8254 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-06-18 21:30:39 +00:00
Flugente 503523a9fa New feature: localized weather adds more weather types, different weather can happen in different sectors at the same time.
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23094&#msg_345949

Requires GameDir >= r2325

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8253 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-06-18 20:57:03 +00:00
Flugente 5d6efa0a77 New feature: localized weather adds more weather types, different weather can happen in different sectors at the same time.
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23094&#msg_345949

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2325 4f8fa57e-7814-0410-bad4-adc449f26b7c
2016-06-18 20:55:38 +00:00
Flugente facadda6e8 Fix: potential random memory access
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8252 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-06-17 18:28:50 +00:00
Wanne 2ef792e9af Update - 2016-06-08: Deadly Games German Translated Mercs for 1.13 - BETA (by firebat)
- John Kulba
- IMP 169 Fix


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@8251 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-06-08 17:50:57 +00:00
Wanne 5a2fce0f28 Update - 2016-06-08: Deadly Games German Translated Mercs for 1.13 - BETA (by firebat)
- updates to Mike
- updates to Reuban
- updates to Elroy
- updates to Turtle
- updates to Moses
- updates to Bernie
- updates to Screw
- updates to Leon
- updates to Sparky
- updates to Hector
- updates to Mitch
- updates to Raffi
- updates to Kaboom
- updates to Rev
- updates to Wink
- updates to Beth
- updates to Lance


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@8250 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-06-08 17:48:00 +00:00
silversurfer 6e1676c94f Fix (by Sevenfm): height difference penalty calculation for cowering targets in OCTH was using wrong target
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8249 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-06-06 14:45:23 +00:00
silversurfer 5307881cb7 Fixes (by Sevenfm):
- incorrect sized array for secondary item stat regions
- incorrect check for secondary item stat display removed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8248 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-06-05 13:23:26 +00:00
silversurfer 90ff5d5626 Fix: AimLevels bonus was displayed for OCTH although it doesn't apply there
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8247 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-06-04 09:56:46 +00:00
silversurfer c6fedf2403 Fix (by 3iff): item 1720 was incorrectly labeled as "rifle sling" on BR
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2324 4f8fa57e-7814-0410-bad4-adc449f26b7c
2016-06-01 14:37:22 +00:00
Flugente 2c85d6dc03 Fix: determining a militia path in strategic map could cause the sector militia size to be cut to MAX_STRATEGIC_ENEMY_GROUP_SIZE
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8243 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-28 15:07:44 +00:00
Wanne 1b74043e2d Update - 2016-05-27: Deadly Games German Translated Mercs for 1.13 - BETA (by firebat)
- updates to It
- updates to Lance
- updates to Rusty
- updates to Samuel
- updates to Spike
- updates to Kelly
- updates to Stella
- updates to Mouse
- updates to Bud
- updates to Elio
- updates to Leech
- updates to Jimmy
- updates to Snake
- updates to Smoke
- updates to Needle
- updates to Bob
- updates to Gary
- updates to Spam
- updates to Boss

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@8242 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-27 12:20:04 +00:00
silversurfer 7b288c5c83 Fix (by Sevenfm):
- Armor search routine could crash if EffectiveArmour returns 0

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8241 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-27 11:08:22 +00:00
silversurfer 7f6d44183a Fix (by Sevenfm): breath points for walking with a weapon raised were calculated incorrectly
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8240 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-27 07:55:44 +00:00
silversurfer 671b4527ac Fixes (by Sevenfm):
- Armor search routine had incorrect calculations
- Tiles adjacent to buildings could be assigned to a building

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8239 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-27 07:52:32 +00:00
Flugente d8c79675e7 Fix: armour comparison compares helmet with vest/legs and is unsafe
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8238 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-26 19:05:58 +00:00
Flugente c20232a740 Fix: when starting a new campaign, NULL the StrategicMap flagmask
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8237 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-26 12:27:49 +00:00
Flugente 88d60c8df1 Fix: corpses on a roof cannot be interacted with
Note that once a rooftop corpse has been decapitated, it cannot be accessed again, due to as of yet unclear structure handling.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8236 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-26 11:17:04 +00:00
Flugente 2defb8259b Fix: after firing an underbarrel GL, it was possible to reload via leftclick for a short time, leading to reload of main gun with a grenade
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8235 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-25 19:39:10 +00:00
Flugente 4e498b1a5d Fix: ASD update function not periodicaly called. This bug only exists in campaigns started before r8015.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8233 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-24 19:19:48 +00:00
Wanne c676a48cd5 Fix: Added explicit BOOLEAN check for pSoldier->bVisible (by sevenfm)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8230 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-23 05:24:45 +00:00
Flugente db00927287 - Fix: same militia profile is used several times in autoresolve
- Fix: sometimes no battle repoer is written for autoresolve
- Fix: no militia profile found in autoresolve due to bad sector

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8229 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-22 23:04:05 +00:00
Flugente 74bebdd454 - colour TestTable scrollbar
- militia website sector filter uses longer names
- prisoner surrender dialogue explains how many prisoners were captured, and allows selecting prison via dropdown selection
- explain soldier relation boundaries on Melody website

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8228 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-20 22:39:29 +00:00
Flugente c0d25c3cb7 Fix: mobile militia (ALLOW_MOBILE_MILITIA = TRUE) could get 'lost' if moving
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8227 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-20 19:07:04 +00:00
silversurfer b3df6f702b AI and tactics improvements (by Sevenfm):
New options:
 AI_YELLOW_FLANKING - yellow flanking is disabled by default
 IMPROVED_TACTICAL_UI - use name color to show soldier's status (disguised, drunk)

Removed obsolete options:
 SHOW_COVER_INDICATOR
 SHOW_ENEMY_RANK_ICON
 SHOW_ENEMY_AWARENESS


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2323 4f8fa57e-7814-0410-bad4-adc449f26b7c
2016-05-20 18:27:42 +00:00
silversurfer 196a1eb84d AI and tactics improvements (by Sevenfm):
New options:
 AI_YELLOW_FLANKING - yellow flanking is disabled by default
 IMPROVED_TACTICAL_UI - use name color to show soldier's status (disguised, drunk)

Removed obsolete options:
 SHOW_COVER_INDICATOR
 SHOW_ENEMY_RANK_ICON
 SHOW_ENEMY_AWARENESS

Fixes and improvements:
 - collapsed enemies should not taunt
 - if soldier is unconscious, he can't see anything or anybody
 - ClosestReachableDisturbance - performance improvement
 - allow InternalGoAsFarAsPossibleTowards to jump over fences

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8226 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-20 18:25:33 +00:00
Flugente e86b24821c sped up reload function
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8225 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-19 21:58:07 +00:00
Flugente 310fa7d57c Fix: incorrect check (by sevenfm)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8224 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-18 19:13:38 +00:00
Flugente 79f964b134 Shopkeeper in San Mona (C6) now buys almost any armour, and sells early to midgame ones
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2322 4f8fa57e-7814-0410-bad4-adc449f26b7c
2016-05-18 18:16:31 +00:00
Flugente 5a84b7b748 Fix: on various actions in the strategic screen (open inventory, dynamic dialogue) the message list is turned on and off
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8223 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-18 18:13:45 +00:00
Flugente 1565a9f67c 'Improve Gear'-function now also merges magazines and fills up ammo stacks
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8221 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-17 21:37:42 +00:00
Flugente b9575fcbee If Skyrider can't fly due to being out of fuel, warn the player
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8220 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-16 20:54:01 +00:00
Flugente 41a9c7104d Fix: crash in release exe due to bad initialisation
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8218 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-16 16:25:32 +00:00
Flugente 5df191a263 New disability: Hemophiliac causes mercs to bleed a lot faster, even for tiny wounds
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8217 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-16 15:17:11 +00:00
Flugente 4c6ac2c672 New disability: Hemophiliac causes mercs to bleed a lot faster, even for tiny wounds
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2321 4f8fa57e-7814-0410-bad4-adc449f26b7c
2016-05-16 15:03:52 +00:00
Flugente 645b42bc8b Fix: UB compilation error
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8216 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-16 12:37:24 +00:00
Flugente 381acc74a4 If we manually disguise a merc, immediately test the disguise
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8215 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-16 10:31:47 +00:00
Flugente 6460e9d325 Fix: unable to save after loading an older savegame
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8213 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-15 22:53:19 +00:00
Flugente 7bb401b1fb New feature: We can now create non-profile-based merchants via lua.scripts.
Requires GameDir >= r2320.

For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23061&goto=345526&#msg_345526

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8212 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-15 17:11:29 +00:00
Flugente d639452893 New feature: We can now create non-profile-based merchants via lua.scripts.
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23061&goto=345526&#msg_345526

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2320 4f8fa57e-7814-0410-bad4-adc449f26b7c
2016-05-15 17:09:14 +00:00
Flugente d594ba0e67 If a merc intentionally removes the diguise property via the [Ctrl] + [.] menu, the disguise property will not be reapplied until new clothes are applied, even if COVERT_STRIPIFUNCOVERED is set to FALSE in Skills_Settings.ini. This allows dressing up mercs in other colours without them being subject to covert mechanics.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8211 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-13 17:25:02 +00:00
Flugente 312249a0b6 Fixed typos (by Elestir)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2319 4f8fa57e-7814-0410-bad4-adc449f26b7c
2016-05-13 16:59:09 +00:00
Flugente e2004c06ee Changes to covert operations feature (by sevenfm): If the new skill setting COVERT_STRIPIFUNCOVERED is FALSE,
- we can only disguise successfully if we haven't been seen recently (last 3 turns)
- disabled automatic clothes stripping when uncovered
- redisguise automatically if spy haven't been seen by enemy recently and wears correct clothes

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2318 4f8fa57e-7814-0410-bad4-adc449f26b7c
2016-05-12 22:28:37 +00:00
Flugente 284910e2d5 Changes to covert operations feature (by sevenfm): If the new skill setting COVERT_STRIPIFUNCOVERED is FALSE,
- we can only disguise successfully if we haven't been seen recently (last 3 turns)
- disabled automatic clothes stripping when uncovered
- redisguise automatically if spy haven't been seen by enemy recently and wears correct clothes

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8210 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-12 22:27:54 +00:00
Wanne e702c43603 Update - 2016-05-11: Deadly Games German Translated Mercs for 1.13 - alpha (by firebat)
- added various Gap-files
- updates to Beth
- updates to Ears
- updates to Bud
- updates to Weasel

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@8209 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2016-05-12 14:20:02 +00:00
Flugente c7fe1a9df6 - made Rifle LAMs useable by FAMAS and FN FAL
- made Grippod useable by FN FAL

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2317 4f8fa57e-7814-0410-bad4-adc449f26b7c
2016-05-10 18:56:42 +00:00