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
2,853 Commits 9 Branches 6 Tags
ec52ab30e5b46c1db8006e4569e14c1cd41dbe3f
Commit Graph
2853 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Flugente ec52ab30e5 When trading, mark items that the trader won't buy. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8367 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-15 23:48:34 +00:00
Flugente 87809f222f Gun selection at shopkeepers is pre-sorted by weapon type (by DepressivesBrot) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8366 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-14 22:41:48 +00:00
Flugente 7163e98b6e Mercs won't attack teammates or neutrals (profile-based) if their opinion of them is > 20. For good guys, that value is -20. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8365 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-14 22:22:30 +00:00
Flugente efd9ab4723 New feature: Voicesets are now independent fom profile slots. Voiceset is set in MercProfiles.xml with <usVoiceIndex>. IMP voices are defined in IMPVoices.xml. 
This feature is savegame compatible.

Requires GameDir >= r2357

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8364 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-14 20:20:11 +00:00
Flugente e2c05ce1c6 minor code cleanup 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8363 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-13 20:19:44 +00:00
Flugente 3419fd1c5d dded new character trait "Coward" (charrcter trait #13) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8362 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-12 23:24:41 +00:00
Flugente 556ce68586 Fix: jeeps were not properly counted 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8361 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-12 00:51:46 +00:00
Flugente 1b39535b15 Fix: during retreat, mercs got a morale penalty for being a pacifist, instead of getting it unless they are pacifist 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8360 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-11 23:26:30 +00:00
Flugente 4d48876c1f added new disability "Self-Harming" 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8359 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-11 22:32:33 +00:00
Flugente 322d307980 Fix: background value drink_energyregen not only increased breath gain, but also loss, which was not intended 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8358 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-10 21:21:07 +00:00
Flugente bb6872787d - Fix: if merc cannot complain about his equipment due to being asleep or on duty, retry an hour later 
- Fix: in AIM bios, show max life, not life at start of game
- Fix: typo resulted in AIM mercs not refusing job because of hated mercs present when they should do so
- Dialogue clarification: QUOTE_PRE_NOT_SMART is now used for complaints about food, QUOTE_POST_NOT_SMART to refuse smoking

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8354 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-06 01:17:45 +00:00
Flugente 4ab21a08c2 Fix: crash in pong due to bad iterator usage 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8353 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-04 22:58:38 +00:00
Flugente 88abc6263f New minigame: Pong 
Requires GameDir >= r2353

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8352 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-04 19:32:24 +00:00
Flugente 3ab70dde90 - added new disability "Fear of heights" 
- Fix: wrong backgrounds were filtered out when checking for personality/disability/traits

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8351 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-12-31 12:00:45 +00:00
Flugente 58eb840439 Cleaned up IMP creation code 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8350 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-12-30 17:43:30 +00:00
Flugente d6b7dd4d52 Fix: when buying gear kits from AIM/MERC, prices are incorrect for item stacks 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8349 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-12-30 00:09:15 +00:00
Flugente 200899593e Fix: New IMP gear selection method: If identical items are selected in several slots, only those of one slot are given to the IMP 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8348 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-12-15 21:05:23 +00:00
Flugente 929e0adf66 added comments 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8347 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-12-13 20:05:36 +00:00
Flugente d08b4d13b9 New feature: Minigames are interactive actions that happen in a dedicated screen. For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&goto=347722&#msg_347722 
GameDir >= r2350 is required.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8346 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-12-11 12:43:41 +00:00
Wanne ea9d5f74a5 Fixed a few translations for Chinese version (by TBS) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8344 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-11-29 20:45:03 +00:00
Flugente ae2656b975 Fix: negative price backgrounds don't work as intended 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8343 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-11-22 21:20:14 +00:00
silversurfer 5a602f0b9c Fix: incorrect underground check for cave vision bonus and scouting 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8340 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-11-16 16:41:16 +00:00
Wanne 6c737fefd3 Fixed compilation errors in VS 2005: std::sqrt() -> sqrt() 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8339 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-11-02 13:24:17 +00:00
Flugente 3c836ba191 Items in a slot granted by LBE with the flag LBE_EXPLOSIONPROOF (<ItemFlag> 2147483648) are protected from explosion damage (and cannot cause a chain reaction). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8335 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-10-24 20:15:35 +00:00
Flugente fcfab521fb unified code for enemy/militia gear selection 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8334 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-10-24 18:46:39 +00:00
Flugente d6d4841d85 When loading a savegame with version < WORKERS, set up town worker population to initial rate 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8333 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-10-24 18:44:13 +00:00
silversurfer 372adc37b8 repair and dirt system change: 
Dirt is now part of gun status. The original dirt system has been removed. For details see:
http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=20198&goto=347370&#msg_347370


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8325 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-10-19 15:58:02 +00:00
Sevenfm e9a1f4b352 New feature: delayed grenade explosions: 
- use transformation menu to change explosion mode
- only Normal/Stun/Flashbang type grenades can be delayed
- AI soldiers will avoid staying close to armed grenades\explosives
- use option DELAYED_GRENADE_EXPLOSION to make all hand\GL grenades work as delayed
- new value AP_GRENADE_MODE = 4 in APBPConstants.ini
- new item flag DELAYED_GRENADE_EXPLOSION

Other changes:
- fixed call to sqrt in DrawExplosionWarning() that prevented compiling in VS2010
- correctly update interface after transformations
- PATHAI: AI soldiers will skip gassed tiles if not in gas already
- InGas check: AI soldiers will avoid mustard gas even when wearing gas mask
- Yellow AI: added check to avoid gas/water/bomb using FindNearestUngassedLand
- gas/flare grenades will always explode instantly even when in bad state
- LegalNPCDestination: locations near armed bombs are not legal
- FindBestNearbyCover: avoid locations near armed bombs

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8324 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-10-18 12:39:06 +00:00
Wanne 926b9d9e5c Updated Chinese translation and adjustments in WinFont (by zwwooooo and TBS) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8320 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-10-17 16:38:36 +00:00
Flugente 350e7cd849 If TIME_BOMB_WARNING is true, display a warning animation around any armed time bomb. 
GameDir >= r2345 is recommended.

For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&goto=347349&#msg_347349

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8319 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-10-16 14:32:37 +00:00
Flugente c086b98b4c Fix: tanks and jeeps can only be assigned to enemy patrols if ASD is active 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8318 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-10-16 00:07:23 +00:00
silversurfer 5f4a7e2331 - turned off compiler warning in VS2010 
- fixed compiler error in VS2010

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8317 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-10-15 18:18:10 +00:00
Flugente 68294910b8 - New command: On [Alt] + [N], all team members in the sector try to put on gas masks 
- Fix: gasmask status was not always evaluated correctly

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8315 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-10-14 21:07:49 +00:00
Flugente a0c2b0a39a SAM site repair is now an assignment. For this, old code has been repurposed. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=22916&goto=347318&#msg_347318

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8314 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-10-14 17:20:23 +00:00
Flugente e38e37d99c When buying soda from a machine, check inventory for cash first 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8313 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-10-13 18:22:47 +00:00
Flugente 5b6611bc61 Code change: When loading gun/looking for a default maazine for a gun while no mag with fitting magsize exists, instead take a magazine of same calibre and ammotype that has magsize bigger (but close to) the originally requested magsize. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8312 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-10-07 19:20:53 +00:00
Wanne bdc6aaf460 Updated Chinese text file (by TBS) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8311 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-10-06 18:00:03 +00:00
Flugente 258e9c24a0 New feature: SAM site cover can now overlap, and SAM sites can be hacked to lower their radius. For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23211&goto=347188&#msg_347188 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8309 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-10-05 22:22:50 +00:00
Flugente 8523a1dead Fix: enemy jeeps are not always counted as enemies 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8308 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-10-04 19:57:27 +00:00
Wanne c83847a407 Fix: Item's short name in tactical interface, Chinese characters smearing bug 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8307 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-09-28 08:31:22 +00:00
Wanne 721e9effe9 Updated Chinese Text translations (by TBS) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8304 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-09-28 08:24:27 +00:00
Sevenfm e7fe040722 CalcChanceToHitGun, CalcNewChanceToHitGun: set fCantSeeTarget = true when shooting at empty invisible tile 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8301 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-09-14 07:07:40 +00:00
Sevenfm 17ce3e4473 Replaced Assert(pTempSoldier) in StartInterrupt with NOBODY and NULL checks. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8300 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-09-13 20:14:11 +00:00
Wanne 8c3902e1b6 Fixed compilation error that was popping up when compiling a non English version 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8299 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-09-13 09:18:33 +00:00
silversurfer f1f0ba7aed Fix: Tag <BadSector> was overlooked in the r8295 change causing the game to crash on startup. This is now handled differently and properly. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8297 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-09-12 18:39:52 +00:00
Wanne 1e51250475 Multiplayer: Completely disabled interrupts in a COOP game, because it is still buggy. So the ALT + E workaround on the server (to give turn back to client on stuck interrupt) should not be needed anymore 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8296 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-09-12 18:03:19 +00:00
silversurfer 9395fcc8a2 Enhancement: 
- SCROLL_SPEED_FACTOR in Ja2_Options.ini allows to modify scroll speed
- while reading MovementCosts.xml the game checks now for valid traversal type and asserts instead simply assigning type GROUNDBARRIER

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8295 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-09-11 11:42:48 +00:00
silversurfer cedb77bffb Fixes (by Sevenfm): 
- put back AIM_VISIBILITY calculation in function "CalcNewChanceToHitGun"
- fixed possible NULL pointer condition

Added an indicator to the NCTH cursor to show aiming penalty for moving target.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8294 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-09-03 11:56:00 +00:00
Wanne 835e948735 Fixed compilation errors in VS 2005: std::sqrt() -> sqrt() 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8291 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-08-22 19:24:14 +00:00
Flugente cbf284ce4d Fix: tileset index 0 always present in construct/deconstruct arrays 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8289 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-08-14 18:55:09 +00:00