Commit Graph
1412 Commits
Author SHA1 Message Date
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
Flugente 3e30b296cf - removed the CLOTHES_CIVILIAN-flag, as it is not needed anymore
- the Strip function now removes the covert tags, or takes off custom clothes if already not covert
- fix: XML_Clothes.cpp was not included

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5567 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-09-16 14:56:45 +00:00
Flugente 829c3140ae New feature: clothes items allow colouring of your mercs. See http://www.bears-pit.com/board/ubbthreads.php/topics/310208.html#Post310208 for more information.
This feature requires GameDir r1540 or greater to work.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5566 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-09-16 02:57:45 +00:00
Flugente 3d6bc97289 Feature improvement: tripwire, tripwire mines and directional eplosives can now be planted with the map editor.
- The action item system has been repaired for this. It has never worked correctly prior to this, but the errors never occured.
- New items from GameDir 1538 are required for this to work. They are direct copies of existing items, except for a new tag, <usActionItemFlag>.
- The name of the new action items should clarify in the editor what an item does.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5565 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-09-15 02:28:18 +00:00
Flugente 3cc8153a61 - fixed an issue saving the map in vanilla mode (by DepressivesBrot)
- fixed a minor cosmetic issue (loading wrong frame for the overhead map) (by DepressivesBrot)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5564 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-09-13 19:53:14 +00:00
Flugente 692fff36ed Fix: commented out a code section that altered morale events depending on our current height
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5555 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-09-05 19:23:13 +00:00
Flugente d0e27b0229 Enhancements of the MOLLE Feature (by DepressivesBrot):
- Added: Separate message for 'no space' (used 'already there' as a placeholder before)
- Fixed: Exchanging attachments when we are near capacity for the carrier
- Fixed: The LBE shown in the description box now changes as well and as soon as you add/remove an attachment
- Changed: The attachment now transfers the first non-zero pocket to the carrier instead of simply the first
- Added: Tooltips now show the currently used and the available space of a carrier.

- Added: A modifier for the explosive damage in confined spaces (by DepressivesBrot). Implemented on a per-item basis using the new float tag <bIndoorModifier> in Explosives.xml (0.5 means 150% damage, 1.0 means 200% etc.)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5552 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-09-04 19:27:01 +00:00
Flugente 02c53cdf16 fixed a bug that caused crashes when using food system, external feeding or covert ops while TOPTION_SHOW_TACTICAL_FACE_ICONS was false
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5547 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-09-02 21:39:59 +00:00
Flugente 41bc80dc3c - reworked the tripwire nework flags. This will allow much more complex networks in the future. WARNING: planted tripwires in savegames from previous savegames will behave strangely with this version.
- externalised texts for cleaning, food, corpse handling and covert ops
- tripwire can now be defused even if it does not have a blue flag. When having a wirecutter in the main hand, click on the planted tripwire while crouched, the defuse dialogue will show up.
- corpses spawned from items will behave according to the zombie spawn rules
- fixed a few glitches with the covert ops trait
- fixed a bug that gave the 'mounted' bonus on a roof

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5546 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-09-02 20:38:17 +00:00
Wanne da441439ac - Added missing text entries to the _*Text.cpp files
- Removed unused gzWeaponStatsFasthelp[ 32 ] from text files
- Fixed compilation warning in LOS.cpp
- Translated a few text entries for Chinese Version (by zwwooooo)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5543 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-31 09:00:45 +00:00
lalien a535c48c49 - fixed key ring icon position for all resolutions
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5540 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-27 20:56:05 +00:00
Flugente 623dcca3ed fix: carrying corpses did not raise suspicion like it should
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5539 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-27 20:48:39 +00:00
Flugente 6a05d44d85 - added second weapon cleaning operation to clean all guns
- added missing texts
- cleaned up tripwire-related code

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5538 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-27 20:25:50 +00:00
Flugente 2ebe96ca59 New Attachment: the rifle grenade device (<AttachmentClass>33554432</AttachmentClass>) acts as a GL on the barrel slot, but blocks all other firing modes, and uses up one bullet.
It is strongly advised not to use this in combination with other underbarrel GLs.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5537 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-26 18:59:37 +00:00
Flugente 3dbdd4b2ad added a global modifier to singleshot temperature (for those who feel the current values are too low or high).
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5535 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-25 17:27:28 +00:00
Flugente e83afa8aa0 added stealing, cutting fences (and with that building fortifications) to the list of suspicious actions for the covert trait
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5534 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-25 16:45:42 +00:00
Flugente fd445fe5ed New feature: Covert ops
- you can disguise members of your team as civilians or soldiers and, if careful, avoid detection by the enemy.
- For more info, see http://www.bears-pit.com/board/ubbthreads.php/topics/309312/New_feature_Covert_operations.html#Post309312
- GameDir revision >= 1529 is needed for this feature

- fixed a bug that could cause inventory items to be treated like armed bombs
- bloodcats can now be skinned

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5529 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-24 23:52:55 +00:00
lalien fa1586b22b - loading screen stretching for all resolutions fix
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5526 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-24 14:45:25 +00:00
lalien 3a599c1e2f - loading screen stretching for all resolutions fixed
- warning in GameSettings.cpp fixed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5522 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-24 13:55:06 +00:00
Wanne 18f2420a2e - Updated Version: 5520
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5521 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-24 13:31:48 +00:00
Wanne 7a8475fb45 - Bugfix: If loadscreen does not exist, the filename was not outputted
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5519 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-24 12:55:59 +00:00
Wanne 6671e0a8f8 - Bugfix: Fixed problem, that the correct loadscreen never was not found, although is exists
- Cleaned up the Loading Screen.cpp file

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5518 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-24 12:35:01 +00:00
Wanne 114f0064c4 - Removed the "JA113NODEMO" define
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5514 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-24 08:15:20 +00:00
Wanne 061ea16cea - Removed the "ENABLE_DISPLAY_EXPLOSIVES" define
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5513 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-24 07:59:13 +00:00
Wanne 9fc9f09472 - Removed the "ENABLE_RIFLE_SLING" define
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5512 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-24 07:52:17 +00:00
Wanne 2b98099a34 - Now every executable (1.13, UB and Demo) uses the ja2.ini file to initialize the game
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5501 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-23 23:33:26 +00:00
Wanne 3961431e8d - Bugfix: Skyrider stuck in sector (Bugzilla #562)
o I reverted the changes from revision 4724 and hopefully this fixes the "skyrider stuck in sector" bug

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5499 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-23 14:54:23 +00:00
lalien 56ae482ee2 - added full screen main menu image for all resolutions
- added xml options mor main menu 
	- StretchImage		if 1 the image is stretched to the screen size
	- CenterImage		if 1 the image is centered in X
	- ImagePositionRelative	if 0 the image is displayed on the same place on any resolution, ignored when StretchImage is active
- removed obsolete tags
- new buttons in main menu: "n" new game, "q" quit



git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5498 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-23 14:08:42 +00:00
Flugente 544314276c - grenaded can now also be armed in the inventory like bombs
- fix: underbarrel weapons no longer influence dirt generation


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5492 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-22 19:54:35 +00:00
Flugente 30e13e1e26 New feature: The M.E.R.C. website now also has gearkits (by JMich)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5490 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-21 20:36:47 +00:00
lalien 3136327c5a reapplied lost Russian letters fix from revision 4877
-Fixed some problems with russian letters in IMP page (by ViSoR)
-Added 2 letters for French (Ligatures Æ, æ, Œ, œ). Now we have support for all French alphabet
-Converted French text to UTF-8 for simple use in ather OS Language

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5489 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-21 10:31:12 +00:00
lalien 82bfc8d9f4 added loading screen stretching for all resolutions
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5488 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-21 10:26:23 +00:00
Wanne 7e3b802ab6 - Fixed compilation error (in DecideAction.cpp), when ENABLE_ZOMBIES was enabled in builddefines.h
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5487 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-21 09:04:07 +00:00
Flugente 20b40ed761 - food system: auto consumption now starts at -10% instead of -25%
- Moved key commands: 'Ctrl' + '.' now opens a message box. The commands to fill canteens and to clean weapons can be called from there. In the future, similar commands can be placed here

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5485 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-20 20:57:07 +00:00
Wanne a64d8a9323 - Fixed compilation error in Chinese version
- Translated a few texts for Chinese version (by zwwooooo)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5481 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-18 16:25:38 +00:00
Flugente 8275a1231b New feature: advanced repair/dirt system
- items now have an internal repair value that can be lowered through damage taken. They can only be repaired up to that value by your mercs, onyl smiths can fully restore it to 100%
- guns get dirty over time, especially when shooting. Thsi can cause them to jam. Use cleaning kits (item #1576) to clean them by pressing 'Alt' + '.'
- more on this feature in http://www.bears-pit.com/board/ubbthreads.php/topics/308926/New_feature_advanced_repair_di.html#Post308926
- this requires GameDir revision 1496 or higher

WARING! THIS BREAKS SAVEGAME COMPATIBIITY!

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5480 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-18 00:03:40 +00:00
Flugente 50b849997b - savegames prior to r5471 (Sandro's new features) are now compatible with the current version
- fix: incorrect group deletion caused crash when switching from assignment to truck

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5474 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-15 19:54:36 +00:00
Flugente cddfbcb9f9 fix: vehicles no longer digest food, and no longer auto-consume food
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5473 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-14 23:36:34 +00:00
Wanne cde4ce4229 4 new tags in Items.xml that modify skill checks. (by JMich)
- LockPickModifier modifies the lockpick chance by a specific number. If the number is positive, it is proportional to the locksmith kit's status, if the number is negative, it will always be the same. Tag is ignored if the item isn't a LocksmithKit. FindLocksmithKit should return the one that gives the biggest bonus, but it may have trouble with stacked lockpicks. Hovering over the "Locksmith Kit" icon in UDB should tell you how much of a bonus (or penalty) that item gives you.

- CrowbarModifier increases your chances to force open by using a crowbar by the number indicated. Default vanilla crowbar has a bonus of 20, so an item with a bonus of 10 will be worse than a crowbar (but possibly smaller). FindUsableCrowbar should return the item with the biggest bonus. Tag is ignored if the item isn't a Crowbar. Hovering over the "Crowbar" Icon in UDB should tell you by how much your chances are improved, though if the item is also a weapon, the icon isn't visible.

- RepairModifier modifies a toolkit's effectiveness by that percentage. If you try to repair with a shoddy toolkit that has a RepairModifier of -20, you'll be 80% as effective, while repairing with an excellent toolkit that has a RepairModifier of 20 means you are 120% as effective. When checking if you have a toolkit at hand, it should select the one with the biggest bonus. Tag is ignored if item isn't also a Toolkit. Hovering over the "Toolkit" icon in UDB should tell you how effective the repair kit is.

- DisarmModifier increases your chances to disarm a trap by the indicated amount, modified by the Diffusal Kit's status. The FindDisarmKit should return the item with the biggest bonus, though it uses the top item in a stack. Currently using the "Wirecutters" icon in UDB, hovering over it should tell you by how much your trap disarm chance is improved.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5472 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-14 15:04:02 +00:00
Wanne 21dd880240 Sandro's feature pack (by Sandro)
- Dual Burst/Autofire Enabled
- Alternative Weapon Holding (firing from hip + pistol with one hand)
- Energy Cost on Weapon Manipulation (holding it shouldered, firing)
- Suppression Effectiveness Modified by Caliber and Gun Loudness
- No Enemy Auto-ready Weapon Option
- Fancy Big Merc Rifle Holding Animations
- More Random Idle Animations
- Kick in HtH Implemented
- Jumping Implemented
- (Included Fix for IIS with Martial Arts Bonus)
- further infos: http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/308884/A_Small_Compilation_of_New_Fea.html#Post308884
- you also need the latest GameDir files!


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5471 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-14 12:19:57 +00:00
Flugente a61d724335 - fix: combo food/drug items have to be eaten if drug effect was already attributed
- new food situation level for the transition from food refusal to dangerous levels
- more useful stat damage warings for food

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5468 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-13 21:25:51 +00:00
Flugente 660d8d126f - added new item flag for camo-removing items, to remove hard-coded value (CAMO_REMOVAL, #1024)
- fixed a bug that caused incorrect deduction of kit points

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5467 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-13 20:53:50 +00:00
Wanne ef981b5342 - Bugfix: Finding and swapping shadow tiles when swapping a structure tile (by Realist)
o example: When cutting a fence tile, the proper shadow tile was not swapped and correctly updated

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5465 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-13 08:51:48 +00:00
Flugente 3cf0e5210c fix: sector entering still behaved weird
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5459 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-11 17:52:12 +00:00
Flugente 333633b782 - fixed a bug that caused bad pointers when accessing the sector inventory and then entering it
- fixed: reinforcements can happen in turnbased again
- codechange: stacks of ammo item scan now be used to feed a gun from the inventory

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5458 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-11 17:07:28 +00:00
Flugente 7e8b51ad34 Fixes (by DepressivesBrot):
- fixed some text errors
- enabled 'mark remaining hostiles' for all resolution and maps

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5454 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-08 20:46:36 +00:00
Flugente e8a6d58175 fix: night vision bonus wasn#t given correctly when using scope modes
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5450 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-08-07 21:25:29 +00:00