7604 Commits
Author SHA1 Message Date
Flugente ac2ad02b1c added stun gun to enemy item choices
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1626 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-03-24 19:33:26 +00:00
Wanne 95e93c225d Editor Feature (by Buggler)
- Hotkey 'Ctrl+/' & '/' to place item under mouse cursor when in item mode

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5953 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-24 19:27:43 +00:00
Flugente 664eb06bef - bodies are now twohanded
- removed admin shirts from npc inventory

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1625 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-03-24 18:58:29 +00:00
Flugente 90be8171ec upon decapitating or gutting, a knife may take damage
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5952 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-24 18:56:09 +00:00
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
Wanne 728d2f7cfe Editor Fixes (by Buggler)
- Fixed item deletion from item pool when no item selected
- Added Shift, Ctrl, Ctrl+Shift hotkeys to item scrolling click 
- Fixed Rdn button not depressed upon clicking other item buttons
- Fixed B, R, S text not shown for random items

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5949 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-22 14:39:37 +00:00
Flugente 9592be9122 - Fix: random items > 200 were not read
- Fix: preplaced random items turned guns did not have ammo (WIP)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5946 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-21 23:13:39 +00:00
Flugente ba5a5206a2 feature improvement: stealing items from a soldier while disguised has a chance to be discovered even in turnbased.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5943 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-20 23:52:42 +00:00
Flugente 34bc4ea503 Fix: adrenalin drug effect was capped at max APs
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5942 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-20 21:20:06 +00:00
inshy e51649f778 Up for Russian
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5941 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-20 14:36:58 +00:00
Wanne 028a325eda - Added starting gear for the 4 new DG merc (Stella, Smoke, Ears and Moses) (by anv)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1624 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-03-19 12:06:23 +00:00
inshy 5d95d4af81 -Updated French data (by hrvvillers)
-Translated new Russian civ52 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5938 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-18 17:15:16 +00:00
Wanne 94e6a5aa35 - Updated XML files for the new DG-Mercs for the German Version
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5937 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-18 12:52:31 +00:00
Wanne 73ba67f6ea - Added 4 new DG-Merc: Stella, Ears, Smoke and Moses (by anv)
o AIM: Stella, Moses, Smoke
o MERC: Ears
- Moved Rev and Elroy to MERC

Missing stuff:
o Currently the 4 new merc do not have StartingGear. Will be done soon.
o There are no entries set in MercOpinions.xml
o Some texts are missing for the merc in EmailMercAvailable.xml
o Speech is missing

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1623 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-03-18 10:10:53 +00:00
inshy 5d61f473f8 -Some French translation by hrvvillers;
-Some fixes for Russian translation;
-Repair broken Polish letters after converting to UTF-8. Man, you make me cry. If you don't know how - just ask someone or don't do it.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5935 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-18 08:29:13 +00:00
Flugente 5ca112947d - Fix: metal detectors did not detect bombs planted by high-level eplosion experts
- Fix: non-buried explosves retained some bomb parameters after defusing

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5929 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-17 21:41:06 +00:00
Flugente 25471acf1f CalculateForceFromRange() takes an item number instead of an object
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5928 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-17 19:53:59 +00:00
Flugente 9512f4d7ed PRISONER_INFO_DETECT_CHANCE is obsolete
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1621 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-03-17 00:34:15 +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 89666fa78c Fix: applying a rag removed camo, but did not refresh face
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5925 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-16 21:47:26 +00:00
Wanne 05600adf33 Fixes / Improvements (by Buggler)
- Display Item Index No in Map Editor
- Hotkey for squad 11-20 in tactical set the same as strategic screen
- Hotkey previous/next page in save screen changed to PgUp/PgDn

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5924 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-16 14:26:51 +00:00
Wanne 265f5dabf7 - Fixed wrong folder location for *.Pockets.xml (moved from "Inventory" to "Items")
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5923 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-16 14:19:42 +00:00
Flugente db6b0cb917 spies can now test their disguise by using option #6 in the tactical function selection menu - they will evaluate their disguise (see the resulting messages for hints on how to improve disguise)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5922 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-16 02:28:04 +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
Wanne f74e9b54f7 - Added the 4 new DG merc to the German.MercProfiles.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5920 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-12 21:53:07 +00:00
inshy 63c106901b Added new AIM members to all languages
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5919 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-12 17:30:52 +00:00
Wanne bc5344b10a - Added missing MW_SR_HIP_AIM.STI (renamed the original animation file) (thx to Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1620 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-03-10 16:54:50 +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 6483ab9048 added MERCS_CAN_DO_ADVANCED_REPAIRS, DIRT_GLOBAL_MODIFIER and OVERHEATING_TEMPERATURE_GLOBAL_MODIFIER (UB) ini options
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1619 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-03-10 16:04:50 +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 94a55654d1 Fix: militia reinforcements tried to take equipemnt from the wrong sector
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5915 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-10 15:23:36 +00:00
Flugente 6c0d94dadd - DIRT_GLOBAL_MODIFIER is a global modifier to dirt generation
- second cleaning button in menu now orders entire team to clean their guns
- global overheating modifier now also multiplies attachment modifiers
- cleaning kits always use up 1% on use


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5913 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-10 01:15:19 +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
Wanne 44000a98b9 - Added 4 new JA/DG Merc to A.I.M (by anv)
o Hector, Elroy, Mouse and Rev
- Updated Portraits: Vinny, Bud, Screw (by anv)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1618 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-03-09 17:04:58 +00:00
Flugente 787c085b47 Fix: check for a room before punishing a team for damaging a room
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5909 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-09 00:18:17 +00:00
Flugente 14113159bd Fix: NO_STANDING_ANIM_ADJUSTMENT_IN_COMBAT worked on all animations, which caused explosion victims to not update anims correctly. As a fix, we check for individual animations
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5908 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-08 20:09:36 +00:00
inshy 1f96f1a644 Updated French data (by hrvvillers)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5907 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-08 16:23:08 +00:00
Flugente fe8d572068 Fix: ubGunAmmoItem was not set, which could lead to magazines disappearing during reloading
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5906 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-07 20:43:58 +00:00
inshy 35e5d12433 Translated files to French language (by hrvvillers)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5905 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-07 13:41:42 +00:00
Flugente bb47fae308 fixed typo
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1617 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-03-07 02:32:24 +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 e5b7d871b0 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_v1.13_data@1616 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-03-07 02:21:03 +00:00
inshy c14ecd02e1 Translated files to French language (by hrvvillers)
But beware (W

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5901 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-06 12:57:59 +00:00
Flugente 30a7e22a3d new key combinations:
- SHIFT + K: switch to and from riflesling
- SHIFT + K + ALT: switch to knife, or from knife to gun
- SHIFT + K + CTRL: switch to sidearm, or from sidearm to non-sidearm gun
the switches will search for a valid spot for the replaced hand items, thus a LAW won't go into a holster etc.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5900 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-06 00:36:57 +00:00
Flugente 41851c0bf5 added ini option to turn off eating sounds
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1615 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-03-05 21:29:07 +00:00
Flugente ce0a49e4b4 - added ini option to turn off eating sounds
- morale now influences surrender strength
- placing prisoners now accounts for missing xml values
- damaging a building with eplosives alters loyalty depending on attacker's team

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5899 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-05 21:26:58 +00:00
inshy 88cb595c23 Small fixes in translation
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5898 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-05 13:28:35 +00:00
Wanne 581e56dde6 - Added civ52.edt file for the prisoners quotes
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5897 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-03-05 09:10:04 +00:00
Wanne 05bb53d1c7 - Fixed "corrupt" civ52.edt file (prisoners quotes). The file had wrong file size and empty lines
@all: Please use the EdtMegaEditor when editing EDT files, cause other EDT-Editors can damage the file

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1614 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-03-05 09:04:31 +00:00