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,658 Commits 9 Branches 6 Tags
8fb494ff539bc66bbcc5a5ecea0b920b95ee3aba
Commit Graph
166 Commits
Author SHA1 Message Date
Flugente 8fb494ff53 new disabilities: 
- 'deaf' reduces hearing ability
- 'shortsighted' reduces sight range

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6049 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-02 00:15:51 +00:00
Flugente 130acec2e8 captured prisoners can now be bandaged even if life >= OKLIFE 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6028 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-27 15:57:11 +00:00
Flugente 603a36826f increased number of merc opinions to 255 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6012 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-16 22:34:49 +00:00
feynman 8f3bff764b Forgot to commit the source changes in the last commit. Sorry. So, here they are. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5999 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-14 15:54:56 +00:00
Flugente 25de719d79 Fix: under certain circumstances, militia gear was not dropped correctly (a result of fixing the 'drop gear twice' bug) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5997 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-14 13:32:10 +00:00
Flugente a466e7348a - cleaned up drug code 
- moved trait cth modifiers into a SOLDIERTYPE member function

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5989 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-08 21:13:54 +00:00
Flugente e043ce0e70 Fix: name display repeated name if two names were used in one sentence 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5985 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-04 23:24:09 +00:00
Flugente a7a4ce09ef Fix: applying canteens on other persons did not work when food system was on 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5979 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-03 19:42:00 +00:00
Flugente 2f1c433c22 wrapped the SOLDIERTYPE member variable name in GetName(). This will allow easier manipulation with pre/suffixes, ranks, titles etc. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5976 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-02 22:00:02 +00:00
Flugente 8137c04207 - wrapped fortify ap costs 
- Fix: drug effects weren't adjusted in turnbased

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5970 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-01 17:45:47 +00:00
Flugente 1435e4a679 - Fix: applying canteens/camo/clothes on persons still cost them APs 
- Fix: planting bombs was impossible

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5964 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-29 22:32:13 +00:00
Flugente 49932ef904 - new feature: items can be applied to other persons 
- reduced cyanide drug effect to more reasonable values

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5962 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-27 22:06:26 +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
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
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
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 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
Flugente 50c4982f91 - prisoners give information only on mobile patrols, not on city sectors 
- if using militia equipment, items stolen by militia are dropped after combat if their class is distributed to militia by the player
- Fix: do not delete world items with invalid gridno
- Fix: militia drop gear on valid GridNo

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5892 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-03 23:26:03 +00:00
Flugente 59b2549bd6 - new feature: we can now equip militia with gear from sectors, see http://www.bears-pit.com/board/ubbthreads.php/topics/315664.html#Post315664 for more information 
- increased the object flag size to UINT64, this breaks savegame compatibility

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5869 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-02-23 18:32:55 +00:00
Flugente d55a57007d When talking to an enemy, we can surrender to him if he hasn't asked us to before. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5793 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-19 20:22:51 +00:00
Wanne 56e08dbeae Fixes (by Buggler) 
- Fixed allow exception to Dr Q. skill trait code not fully functional
- Swapped Dr Q. skill trait xml order so that when exception disabled, he will still have his night ops minor skill due to code execution order
- Externalized allow_exception ID number for modding

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5791 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-15 20:04:41 +00:00
Wanne 29e432037b - Fixed Ambidextrous being discarded when affected merc has max allowed major traits + ambidextrous due to it being classified as 'TwoStagedTrait'/major trait (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5785 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-14 12:28:20 +00:00
Flugente ab2b52b5d8 Fix: forgot to continously check for items 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5778 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-06 04:04:35 +00:00
Flugente 9ea7ebf393 New Feature: Multi-turn actions allow mercs to perform actions intended on a specific gridno over multiple turns. Currently demonstrated on the adding/removing/filling of sandbags. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5777 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-06 03:51:09 +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 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
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 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
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
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 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
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 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 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
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
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 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
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 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