1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,476 Commits 9 Branches 6 Tags
0b683a8ac0556c2985b1d8d929650ca537a83d1a
Commit Graph
1476 Commits
This Branch
This Branch
All Branches
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 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
Wanne c3ac6a5d1f - Added an ini option (ALL_NAMED_NPCS_DECIDE_ACTION) which enables proper realtime decision making for any named NPC (i.e. NPCs tied to a profile). As a result such NPCs are not required to be in CIV_TEAM anymore. (by Realist) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5720 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-12-08 22:05:20 +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
Wanne 15b096d41c - Added a few // TODO.Translate comments 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5710 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-12-03 19:43:57 +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
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 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
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 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 3a6e4260a5 Fix: settings had wrong location 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5689 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-11-16 21:34:02 +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 38bcb34702 Features (by Buggler) 
- More AIM sorting options. Default: Sort by Name
Laptop\AIM Homepage Screen
- Hotkeys 'm': Members Sorting page
- Hotkeys 'l': Links page
- Hotkeys 'h': History page
- Hotkeys 'p': Policies page
Laptop\AIM Sorting Screen
- Hotkeys BACKSPACE: Back to AIM Homepage Screen
- Hotkeys 'm': Mug Shot Index page
- Hotkeys 'f': Member page
- Hotkeys 'a': Alumni page
Laptop\AIM Mug Shot Index Screen
- Hotkeys BACKSPACE: Back to AIM Sorting Screen
- Hotkeys LEFT ARROW: Previous Page
- Hotkeys RIGHT ARROW: Next Page

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5636 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-10-21 16:10:49 +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
Wanne dfbb390371 - Developer feature: This is great for when in windowed mode eg development and your mouse is leaving the game window all the time to go to VS or another game instance on your desktop. (by haydent) 
o this just means the screen stays put and not scrolling around like mad
o also the way it is coded, if the setting isnt there in the ini it just acts like usual.
o this also requires matching setting in Ja2.ini

;******************************************************************************************************************************
; Enable/Disable Mouse Scrolling of tactical view
;******************************************************************************************************************************

DISABLE_MOUSE_SCROLLING = 1

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5602 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-10-02 07:41:43 +00:00
Wanne 873dfb9577 - MP: Bugfix: Fix for the bullet stock bug (by haydent) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5601 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-10-02 07:39:26 +00:00
Wanne f22265468a - MP: Bugfix: client wasnt getting update via turn bar that server got interrupt (by haydent) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5600 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-10-02 07:38:38 +00:00