Commit Graph
363 Commits
Author SHA1 Message Date
Flugente 401323b524 - Fix: the food system doesn't aply to EPCs anymore, thus wont die from lack of food/water
- Fix: MERCS_CAN_DO_ADVANCED_REPAIRS did not work as intended

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5950 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-24 00:52:19 +00:00
Flugente e5f8799d07 reworked prisoner info chance, PRISONER_INFO_DETECT_CHANCE is obsolete
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5927 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-17 00:33:40 +00:00
Flugente 923664ca40 - Fix: When retreating from tactical combat, militia gear was not dropped correctly
- Fix: Under certain circumstances, militia dropped gear twice in autoresolve

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5926 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-16 23:49:28 +00:00
Flugente 0152976365 - began cleaning of buggy LuaInitNPCCode (WIP)
- Fix: enemy NPCs (Mike) cannot surrender
- Fix: in combat, ordering cleaning of guns only applies to the currently selected merc

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5921 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-16 00:24:30 +00:00
Flugente f5f114e52e - if MERCS_CAN_DO_ADVANCED_REPAIRS is TRUE, mercs with the technician trait can raise an item's damage threshold(by merc05)
- Fix: blade weapons ignored their damage chance

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5917 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-10 16:07:08 +00:00
Flugente 29867c0302 Fix: check wether a building is in a town
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5916 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-10 15:33:47 +00:00
Flugente 16d0d1ea8a - Fix: crash when checking for muzzleflash
- Fix: under certain conditions, AI-selffeeding could lead to invalid inventory sizes
- information from prisoner interrogation is about new sectors
- no autoriot in a prison sector if militia is present


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5912 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-09 21:24:08 +00:00
Flugente 86d6d60959 dirt system: added an option that controls wether a gun also gets cleaned on fully repairing it
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5904 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-07 02:21:46 +00:00
Flugente 36f7399d3b - Prisoners of war are now spawned in prison sectors. They have fitting dialogue etc. Harming them slightly lowers global loyalty.
- Prisoner system: added ini options that allow display of surrender strength sum, and externalised surrender strength modifier
- Fix: wrong assignment string in strategic view

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5895 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-05 01:02:59 +00:00
Flugente 50c4982f91 - prisoners give information only on mobile patrols, not on city sectors
- if using militia equipment, items stolen by militia are dropped after combat if their class is distributed to militia by the player
- Fix: do not delete world items with invalid gridno
- Fix: militia drop gear on valid GridNo

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5892 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-03 23:26:03 +00:00
Flugente fc2e10314b - Fix: crash when trying to delete an item with invalid GridNo
- Fix: adjusted squadname when discovering NPCs

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5890 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-03 08:57:26 +00:00
Flugente 72dbd9e33f - fixed an instance of wrong assignment strings
- prisoner decision messagebox now allows to select a specific prison
- Fix: under certain conditions, calling militia reinforcements with militia equipment selection could get sector items with invalid GridNo to become lost

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5888 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-02 19:14:46 +00:00
Flugente b4f60527cd added squadnames to a few locations
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5879 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-02-27 23:13:27 +00:00
Flugente 92cd435806 Fix: militia equipment was not dropped and saved if trashing world
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5878 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-02-27 20:54:40 +00:00
Flugente dfc17ea9c6 Fix: assignment names were incorrect
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5876 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-02-27 01:04:21 +00:00
Wanne b107a916e1 - Disabled Tab hotkey for description tab switching in strategic screen so as not to interfere with militia equipment assignment (use Ctrl+Tab like in tactical screen) (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5873 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-02-26 14:00:48 +00:00
Flugente 2cfe4bd7fc - externalised squad names
- moved Pockets.xml an PocketPopups.xml
- requires GameDir >= r1608

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5872 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-02-25 22:25:45 +00:00
Flugente 59b2549bd6 - new feature: we can now equip militia with gear from sectors, see http://www.bears-pit.com/board/ubbthreads.php/topics/315664.html#Post315664 for more information
- increased the object flag size to UINT64, this breaks savegame compatibility

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5869 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-02-23 18:32:55 +00:00
Wanne 95588dcf81 New Feature: Added shift hotkey to move all when assigning militia (by vertax)
- Completely removes / puts the militia when you click while holding the SHIFT

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5822 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-01-28 14:26:28 +00:00
Wanne 6c91b61e6f Skill Tooltip on Merc Portrait (by Buggler)
- Skills/Traits tooltip over merc portrait in Tactical & Strategic screen
- Fixed Traits tooltip on 'more' popup in personnel screen 
- Increased Energy Bar Color Contrast
- Swapped Mechanical & Explosive Skill in Tactical & Strategic screen to standardize across all screens including AIM, MERC & Personnel screen

Optional Skill Tooltip On Merc Portrait (by Buggler)
- Option to show skill/traits tooltip on merc portrait in AIM/MERC hire screen
- Enhanced merc inventory tooltip to show full BR info in AIM/MERC hire screen
- Fixed BR heavy weapon AP tooltip display bug
- Fixed MERC Exp Lv statistic color

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5802 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-01-22 13:21:01 +00:00
Flugente fb3d410dd9 - a few dialogue box button texts can now be easily changed
- Fix: improved bomb defusal

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5795 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-01-20 05:12:19 +00:00
Wanne a10e216c5f Fixes (by Buggler)
- fixed autoplace object getting lost from merc inventory to sector when another sector shown (CTRL+LMB) 
- fixed LBE autoplace from merc inventory
- fixed CTRL/CTRL+SHIFT behavior when autoplace from merc inv
** Autoplace objects to & from between merc inv & map sector should work proper now (even in another sector inventory)
- fixed missing balance & amount during money withdrawal in vanilla classic

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5781 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-01-13 17:48:12 +00:00
Flugente 153f55ace8 Fix: uninitialised variable could cause crash if subsequent checks failed
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5773 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-01-05 21:35:22 +00:00
Wanne 0b9ff22642 - Deleted unused "SenderNameList.xml" references
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5769 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-01-05 16:37:13 +00:00
Wanne c04898d095 Interface Items & Sector Inv Readability Enhancement (by Buggler)
- Adjusted font colors in Sector Inventory & Interface Panel (increasing dull contrast colors that only shows when activated, highlights & high contrast colors that's always displayed are toned down)
- Changed 'Item Name' font in non-zoomed sector inventory
- Changed 'Ammo Count' font in item description box
- Increased 'Max Bullet' font size in zoomed sector Inventory

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5768 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-01-05 15:20:43 +00:00
Flugente 6239438702 - Fix: moving strategically and then cancelling that order no longer awards stat gains.
- Fix: On rare occasions, huge stat gains were possible when doing surgery after autoresolve.
- pepper spray does not work on soldiers wearing a gas mask

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5760 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-01-03 18:26:48 +00:00
Flugente a107e80c39 - added info on which item caused a spy to be uncovered
- fixed a few warnings
- EPCs are now disguised when recruited
- uniform worn now has influence on allowed gear coolness

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5750 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-12-28 15:27:38 +00:00
Flugente 501df7103c - The facility performance tag now determines the effectiveness of the interrogation assignment (100 = standard).
- Canteens can now be refilled even if the food system is off
- If you set a handcuff's item to class from MISC (<usItemClass>268435456</usItemClass>)to KIT (<usItemClass>8192</usItemClass>), it will be treated as a stack of binders. Repeated use on enemies consumes the item.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5740 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-12-17 21:23:36 +00:00
Flugente 14b782465a Fix: after a riot, prisoners were not reset to 0, leading to a huge buildup over time
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5730 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-12-15 15:12:28 +00:00
Flugente 5335553158 - Fix: prisoner interrogation was stopped even though it shouldn't
- Fix: prison location was displayed wrong

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5721 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-12-09 16:14:24 +00:00
Flugente c68b5e482f - added more messages
- remaining interrogation points are taken over to the next hour

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5713 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-12-05 01:29:08 +00:00
Flugente 3bb14a870b - Prisoner system can now be correctly turned off.
- improved handcuffing checks

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5712 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-12-04 00:57:19 +00:00
Flugente cb9c217bb1 - New Feature: The rosine system now allows to capture enemy soldeirs via using handcuffs on them. They can e transferred to a prison the player controls, and be interrogated there.
- GameDir revision 1568 is required for this feature.
- Savegame compatibility is maintained.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5709 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-12-03 00:50:48 +00:00
Wanne 33f3fefc3b - Bugfix: Fixed assertion error when dismissing a vehicle (by Realist)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5703 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-11-29 14:44:16 +00:00
Wanne cf36441564 - Fixed blitting of town grid markers for adjacent towns (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5698 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-11-23 19:45:13 +00:00
Flugente bb9baf1af6 improved strategic offensives
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5694 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-11-20 22:48:38 +00:00
Flugente 023873b787 - with option ONLY_REPAIR_GUNS_AND_ARMOUR to TRUE, only guns and armour can be repaired when using the advanced repair system
- Fix: crash when repairing without a repair kit

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5693 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-11-19 00:39:23 +00:00
Flugente 0112384652 Fix: under the advanced repair system, items other than guns and armour weren't repairable
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5692 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-11-17 14:20:44 +00:00
Flugente 23e93663fd - New feature: massive counterattacks in all major cities
- Fix: Check for water drums was wrong

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5688 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-11-16 21:16:31 +00:00
Flugente 51342b0669 - Fix: fully repairing a gun did not always clean it
- Fix: need to sleep modifiers from food were applied wrong
- Fix: under certain circumstances, player mercs won an AI interrupt, leading a deadlock or - potentially - AI-controlled player mercs

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5686 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-11-14 01:23:13 +00:00
Flugente 1a7e900df5 - Fix: security check for underflows when adding reinforcements
- Fix: added defined heights for kid's heads and torsos to correctly apply headshots
- Fix: While filling canteens, poisoned water from sectors is only consumed if no water drum is found

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5684 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-11-12 20:10:28 +00:00
Flugente 8ace761e7f - new ini option ZOMBIE_ONLY_HEADSHOTS_PERMANENTLY_KILL: if a zombie is killed via headshot/melee combat, he can't rise again
- new ini option FOOD_MAX_POISONING: determines the maximum amount of food poisoning eating a singel food item can give
- fixed a bug that caused tooltips to display the wrong traits
- fixed a few zombie-related bugs

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5669 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-11-05 22:38:52 +00:00
Wanne 4c232c38c7 Added features (by Buggler)
- 'Ctrl+Tab' for next tab in Enhanced Description Box at Strategic & Tactical Screen ('Tab' also possible in Strategic Screen as previously not in used)
- 'M' for Multiplayer in Main Menu Screen

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5668 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-11-05 09:12:14 +00:00
Wanne 3124310a74 Bugfixes (by Buggler)
- Close old description box to open the new one if nothing in hand while right-clicking on an item in sector stack
- Ctrl + Right-Click to call info description directly for e first item in stack
- Revert partially to have an empty mouse region to close item stack easily when stack is full (r5632)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5657 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-11-01 15:08:04 +00:00
Wanne b1596f0c63 - Removed the "USE_HIGHSPEED_GAMELOOP_TIMER" define. Now highspeed timer and new way of dequeuing events are always enabled when building an executable
o This makes the code more easy to maintain
o Highspeed timer seems to run fine (after months of tests)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5643 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-10-25 19:00:12 +00:00
Flugente 63a09bba5f - new option for militia command menu: crouch/all crouch
- Larry now consumes every drug

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5638 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-10-21 16:57:45 +00:00
Wanne 5957af60aa - Bugfixes (by Buggler)
o Fixed Restrict Mouse Region for Stack Popup Screen. Also a Dirty CTD fix for illegal Holster/Backpack pickup in Strategic Key Panel Popup
o Fixed Item Transfer Exploit in Stack Popup Screen/Item in Hand during Combat mode by using hotkeys to select other mercs in Strategic & Tactical Interface
o Corrected Numerator & Denominator Order for Armor Protection Raw Values in Popup Info text

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5632 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-10-19 08:33:11 +00:00
Wanne 902cd02298 - A few adjustments and minor fixes (by Buggler)
o Externalised Laptop 'Lock&Release' feature
o Minor Fix for Tactical 'Lock&Release' feature
o Show 'Page Numbers' in BobbyR Item Selection Page, AIM Profile Page
o Change Low Stat Color to Dark Grey (Previous: same color w Medium Stat) & its Criteria to < 20 (Previous: <50) for AIM Member Stats
o Laptop\AIM Member Screen: Hotkey BACKSPACE - Back to AIM Mug Shot Index. Close Window if in Conference Mode
o Laptop\MERC Screen: Hotkey BACKSPACE - Back to Merc Homepage
o Repeat Keys for 'Next' & 'Previous' in BobbyR Item Selection Page, AIM Profile Page, Merc Profile Page, Strategic Sector Inventory

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5614 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-10-08 11:00:58 +00:00
Flugente ff157fd96b New feature: random items allow spawn not themselves, but an item from a brad selection
- specify random items in RandomItems.xml
- when the game creates a random item, it searches all vialbe items according to random item class and picks one randomly
- this allows mappers to place items in maps that are more independent of the xml-set used, however the random items themselves msut be the same in map&mod
- can also be used to broaden the enemy gun/item choices selection
- for more reference, see http://www.bears-pit.com/board/ubbthreads.php/topics/310793.html#Post310793

FIX: sector curfew value was interpreted wrong

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5594 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-09-30 21:59:47 +00:00
Wanne 82b10b0e08 - MP Bugfix: Allows the clients too see the sector deployment bullseye as chosen by the host (by haydent)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5588 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-09-30 09:53:19 +00:00