1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,476 Commits 9 Branches 6 Tags
0b683a8ac0556c2985b1d8d929650ca537a83d1a
Commit Graph
735 Commits
Author SHA1 Message Date
Flugente 0b683a8ac0 Fix: after the enemy surrenders, the prisoner handle dialogue would not always appear 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5731 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-12-15 16:06:55 +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 87e0d82cdd - Diving bottle is now worn in the combat pack position instead of vest position 
- Fix: the first food item created via item transformation was spawned rotten if the base item was no food item

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5719 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-12-08 18:54:30 +00:00
Flugente 7e6ec3659e New Feature: scuba gear allows to dive, thereby staying invisible to the enemy as long as you are in deep water. If you are spotted however, the enemy remembers that, and can still see you in deep water. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5718 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-12-08 00:34:52 +00:00
Flugente 0ecc6f224c - taking prisoners is disabled in the palace and the royal bunker 
- improved surrender strength formula

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5715 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-12-07 16:17:33 +00:00
Flugente 91bdc131be when talking to an enemy, the player can offer them the option to surrender, thus capturing all enemies and ending the battle 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5714 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-12-06 00:47:59 +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 6ff06a530e - New Item: Stun gun (#1626) needs batteries and does no damage but knocks out an enemy. Uses new item flag TASER (/1048576) 
- New Item: Pepper Spray (#1627) blinds anyone for a few turns if hit in the face, ammo is (#1628), uses ammoflag AMMO_BLIND (2)
- Fix: possible division by zero in ammotype description

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5711 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-12-03 23:07:00 +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
Sandro d60507a020 - Changed jumping hotkey from >Shift+Mouse Button< to >Ctrl+Shift+Mouse Button< 
- "Flexing" idle animation made rare, unless the merc has Show Off personality.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5702 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-11-26 19:01:25 +00:00
Wanne d3d47da188 - Fixed previous attachment fix (by Realist) 
o If you removed grenade launcher incl. grenade from attachments, a "ghost" items slot was crated
o If this fix causes any weird behaviors with attachments, it can be reverted...

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5699 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-11-25 21:47:42 +00:00
Wanne e0d028bed2 - Fixed CTD that could happen when removing attachments (by Realist) 
o The CTD always happened in Old Attachment System (OAS)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5697 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-11-22 23:16:03 +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 f6ae18533f - Optimized a few code bits 
- Enemy ranks has now size 20 instead of 500
- Fix: losing your disguise makes you lose your disguise again

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5687 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-11-15 00:03:39 +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 004728d2e4 - AI controlled soldiers can now jump through windows 
- new ini option allows to jump through closed windows, smashing them while doing so

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5682 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-11-11 05:31:41 +00:00
MaddMugsy e98c1ce83c -Added check in CONSIDERED_NEUTRAL macro for SOLDIER_COVERT_CIV and SOLDIER_COVERT_SOLDIER flags. This should prevent enemies from targeting a disguised merc with sniper and spread fire. 
-Added screen messages when disguise changes to indicate civilian or soldier disguise
-Enabled mercs disguised as soldiers to carry >2 guns, if the additional guns are covert or hidden


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5679 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-11-09 08:10:23 +00:00
Flugente 5844c7265c if disguised mercs with the covert trait retreat from battle, it is assumed they were on a reconnaissance mission, thus they do not suffer a morale penalty for retreating 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5678 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-11-06 23:28:13 +00:00
Flugente f970116840 Fix: disguising as a soldier did not always work because of string comparisons 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5671 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-11-06 00:55:33 +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
Flugente b9615ff597 Fix: Jim was missing in several assassin-related checks 
The assassins now come in random clothes and are covert initially, making it harder for the player to detect them. Ini option: ASSASSINS_DISGUISED = TRUE/FALSE

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5666 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-11-05 02:03:10 +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
Flugente 04278c7ad9 - new item flag NO_METAL_DETECTION (131072) makes mines an bombs undetectable via metal detector. Also works on action item bombs and mines. Sparing usage is advised. 
- new item flag JUMP_GRENADE (262144) increases the explosion heigth of explosives, can be used to simulate bouncing grenades or jumping mines.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5656 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-10-29 23:08:44 +00:00
Flugente 14561917ec Fix: bombs action items on newer map versions did not get the correct settings 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5651 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-10-28 19:23:15 +00:00
Flugente 43adda0e5b Fix: game should no longer complain about randomitems being invalid arms dealer items 
Reminder: Do NOT put random items into any merchant xml or BR, weirdness can occur here!

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5648 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-10-27 20:20:18 +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 888c76e65c zombies no longer kick in melee 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5641 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-10-23 21:29:56 +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
Flugente 9e058edf5e Fix: it was still possible to resolve random items in the map editor 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5625 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-10-11 19:17:13 +00:00
Wanne 02085a8422 - MP Bugfix: Fixed the nasty interrupt bug (endless clock), when playing in COOP and the pure client got interrupted by the enemy AI (by haydent) 
o As a workaround the server had to press ALT + E to give the turn back to the client. Now this workaround should not be needed (hopefully ) :)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5623 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-10-11 18:20:21 +00:00
Flugente e762c6b0f4 - new <usItemClass>: IC_RANDOMITEM (0x40000000 or 1073741824) is used for random items exclusively. 
- increased ma number of Random Items to 1000
- fix: A certain key combination no longer spawns random NATO ARs

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5618 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-10-10 20:10:49 +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
Wanne 5238ceb3b5 - MP: it just expands and differentiates the different messages generated during an interrupt to aid in debugging and knowing what is going on / what has happened (by haydent) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5604 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-10-02 22:39:49 +00:00
Flugente 7a81a212a9 random items do not spawn food if food system is deactivated 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5599 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-10-01 20:55:19 +00:00
Flugente fc49b33398 - random items can also be results of merges and item transformations 
- removed a few instances of incorrect random item spawning

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5598 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-10-01 20:42:55 +00:00
Wanne 7ef76bbe35 - MP: Externalized hardcoded text (from Revision: 5590) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5597 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-10-01 12:32:49 +00:00
Wanne 9dc6349e6f - Added "XML_RandomItems.cpp" to VS 2005 and VS 2008 tactical project files 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5595 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-10-01 12:22:34 +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 6f812ed45e - MP: COOP-AI Turnbar: adds a AI count to the turn bar (by haydent) 
o TODO: Externalize the text for translation

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5590 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-09-30 09:57:31 +00:00
Flugente 9edcd360a5 - water from swamp sectors is now less poisonous. Also lowered the amount of poison bad food gives. 
- fix: igniting explosives in inventory now correctly triggers faction hostilities.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5579 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-09-20 19:36:31 +00:00
Flugente 446086c506 fixed error in UDB that could crash the game with displays after dirt system 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5578 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-09-19 23:34:41 +00:00
Flugente f24e202fe7 New item flag: ItemFlag ATTENTION_ITEM (4096) makes an item 'interesting' to the AI. Upon checking for general pickup of items, these items have high priority. This can be used to lead the enemy into traps. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5575 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-09-18 22:16:23 +00:00
Flugente 3fdecfbcf4 - fixed an error that could cause clothes to spwan that were not worn 
- upon shooting/stabbing someone, their vest/pants will get unusable. It can be taken off, but no item will appear.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5572 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-09-17 20:42:38 +00:00
Wanne a2b757d76a - Included missing XML_Clothes.cpp file to the project file for VS 2005 and VS 2008 
- Updated old text string for foreign languages

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5571 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-09-16 22:11:09 +00:00
Flugente b7e5b324d1 simplified a few lines concerning traits 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5569 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-09-16 17:44:33 +00:00
Flugente 665917e043 fix: sometimes, wrong clothes were taken off 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5568 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-09-16 15:13:05 +00:00