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
7,604 Commits 9 Branches 6 Tags
master
Commit Graph
7604 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Wanne bf65559bef - Removed HIGHSPEED_TIMER option from the ja2.ini. Highspeed timer is now always ON 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5766 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-05 15:06:21 +00:00
Wanne 2323581d1c - Removed HIGHSPEED_TIMER option from the ja2.ini. Highspeed timer is now always ON 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1586 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-01-05 15:06:10 +00:00
Flugente cd35516037 added missing icon for alternate weapon holding (by Sandro) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5765 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-04 23:34:54 +00:00
Flugente 79d6bb46ed - external feeding checks for invalid gridno 
- reordered xmls
- new feature: class specific gun and item choices allows finetuning of a soldier's equipment

WARNING! This exe needs GameDir revision >= 1584, as xmls have been reordered!
More info under http://www.bears-pit.com/board/ubbthreads.php/topics/313782/Re_New_feature_Class_specific_.html#Post313782

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5764 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-04 23:25:35 +00:00
Flugente 864877846f - reordered xmls 
- new feature: class specific gun and item choices allows finetuning of a soldier's equipment

More info under http://www.bears-pit.com/board/ubbthreads.php/topics/313782/Re_New_feature_Class_specific_.html#Post313782

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1584 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-01-04 23:22:41 +00:00
Flugente 695a5013c0 if NO_STANDING_ANIM_ADJUSTMENT_IN_COMBAT is true, in turnbased combat, mercs do not automatically change animation from 'running' to 'standing' after arriving at target lcoation (same for walking etc.). This saves AP if we decide to immediately continue moving to another location. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5763 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-04 21:45:01 +00:00
Flugente 52fb1849f4 if NO_STANDING_ANIM_ADJUSTMENT_IN_COMBAT is true, in turnbased combat, mercs do not automatically change animation from 'running' to 'standing' after arriving at target lcoation (same for walking etc.). This saves AP if we decide to immediately continue moving to another location. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1583 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-01-04 21:40: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 e388ec4d3d added new scuba gear picture and pepper spray sounds (by Shanga) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1582 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-01-03 17:12:24 +00:00
Flugente dbdffeaa03 added missing texts 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5759 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-03 16:27:19 +00:00
Wanne 1ef02e9053 - Deleted old outdated ja2.exe (5520) 
- Added text file with download url to D.Brot's SkyDrive for the latest development executables

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1581 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-01-03 10:43:28 +00:00
Wanne 1b4fce2704 - Laptop features & Fixes (by Buggler) 
0 Fixed AIM starting gear 1-5 hotkey upon buying equipment
0 Standardized Hotkey 'Shift' + ArrowKeys/Buttons to jump 10 pages for AIM Members, BR Shopping Screen & MERC
0 Added Hotkey 'Ctrl' + ArrowKeys/Buttons go to first/last index for AIM Members, BR Shopping Screen & MERC
0 Added Hotkey 'Enter' for the most commonly-used button in AIM pages
0 Added Stat Color in MERCS

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5758 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-03 10:17:21 +00:00
Flugente 7990b2e09b The enemy now counts disguised spies as 'theirs' when offered surrender option. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5757 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-03 04:10:00 +00:00
Flugente 7356ae5411 - added new pics for various items (by Shanga) 
- enemy assassin feature is 'off' per default, in order not to freak out unwary new players


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1580 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-01-03 04:06:06 +00:00
Flugente 058ab3b967 - enemy assassin feature is 'off' per default, in order not to freak out unwary new players 
- spies are uncovered near corpses only if their uniforms indicate they were allies of the observer
- added helpful comments, should anyone ever want to use pits

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5756 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-03 01:33:29 +00:00
Wanne a14d8b5396 - Big Maps Radarmap creation (interim fix) (by Buggler) 
o interim fix for radar map sti creation based on DBrot bigger overview code; only works when map editor resolution >= 1680x1050 & map size <= 360x360
o will revert to old radarmap generation (top left 160x160) if condition not satisfied due to current method uses video buffer of overhead map

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5755 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-02 22:16:01 +00:00
Flugente b4ac68db44 Fix: missing entries for VS2005 & VS2008 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5754 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-01 14:55:44 +00:00
Flugente e193f05865 - New Feature: enemy assassins disguise as militia and can ambush player mercs 
- Fix: invalid GridNo for mounting weapons

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5753 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-12-30 19:20:36 +00:00
Flugente 3df488e061 New Feature: enemy assassins disguise as militia and can ambush player mercs 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1579 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-12-30 19:17:36 +00:00
Flugente 3e859f91a8 - removed compile warnings 
- Fix: sometimes, capturing the last enemy did not end combat as it should
- code change: POW are no longer considered visible opponents. This avoids the error of incorrect sight counters (a bit similar to dying enemies)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5752 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-12-29 17:24:16 +00:00
Flugente 4eccdec2ee - Fix: new clothes are not damaged 
- Fix: changing clothes in sight of enemies no longer auto-hides
- Fix: opponent refresh for captured soldiers should work now
- Fix: prisons must have been liberated once to be able to send prisoners there
- adjusted spy trait for new animations
- Fix: allied militia no longer uncovers player spies

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5751 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-12-29 03:13:12 +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
Wanne 97695d6544 - Translated Chinese texts (by Lejardo) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5749 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-12-26 12:27:47 +00:00
inshy 367344816b Added missing line to subtitles and added missing speech files (thanks to RadicalRex) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5747 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-12-22 12:11:35 +00:00
Flugente 5e848ed633 added missing xml 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1578 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-12-20 01:23:11 +00:00
Flugente 68652036ab New Feature: The number of merchants has increased, and their values have been externalised. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5744 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-12-20 01:05:45 +00:00
Flugente 933970b599 Fix: The UDB descriptions for ARMOUR PIERCING were wrong. Lower is better, not higher. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5743 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-12-20 00:58:36 +00:00
Flugente aea481e5a0 New Feature: The number of merchants has increased, and their values have been externalised. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1577 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-12-20 00:29:33 +00:00
Flugente 69ffc56b53 - The facility performance tag now determines the effectiveness of the interrogation assignment (100 = standard). 
- 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 (see item #1632).
- added 'stack of binders' item to Jake and Sam inventories.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1576 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-12-17 21:26:03 +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
Sandro 2d5e8b1583 ° Fixed the bug when prone soldiers went to standing position after being suppressed instead of going to prone cowering animation. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5739 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2012-12-17 14:26:34 +00:00
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 bd4f8c670e - 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_v1.13_data@1574 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-12-08 22:05:52 +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 843c2ba9f2 - Diving bottle is now worn in the combat pack position instead of vest position 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1573 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-12-08 18:55:44 +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 c32aa8947c New Feature: scuba gear allows to dive, thereby staying invisible to the enemy as long as you are in deep water. If you where spotted however, the enemy remembers that, and can see still you in deep water 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1572 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-12-08 00:33:27 +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 0316223f32 - allowed to check militia in Tixa 
- added pepper spray to a few mercs

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1570 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-12-03 23:29:11 +00:00
Flugente de94eb605b - added stun gun and pepper spray (only placeholder images for now). 
- Fix: Kobra had wrong nasAttachmentClass

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1569 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-12-03 23:08:48 +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
Flugente 288b0ed284 New Feature: The prisoner system allows to capture enemy soldiers by using handcuffs on them. They can be transferred to a prison the player controls, and be interrogated there. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1568 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-12-03 00:30:42 +00:00