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,793 Commits 9 Branches 6 Tags
f06df7741f342b09d2a2040c203a4fd0ee7db0fe
Commit Graph
1793 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Kriplo f06df7741f Brief: //dnl ch61 
- Basic support for reducing AI friendly fire.
Details:
- Friendly fire grids are defined during best shot calculation then AI decide depending of soldier character to fire or take other action. Still in autofire accidentally friendly hits could be higher depending of bullets spreading.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6313 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-08-25 07:36:03 +00:00
Flugente 4ac9cf5ebe Library Updates and 'ext' directory cleanup (by Buggler) 
- utfcpp 2.3.4
- libpng 1.2.50
- zlib 1.2.8

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6312 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-08-24 20:42:14 +00:00
Kriplo 123b46f2c8 59. Brief: //dnl ch59 
- Fix problem AI cannot fire when mercs are on roof, AI calculate chance to hit from all stances.
Details:
- Sometimes AI not fire when target is on roof, happens in situation when previous target was on ground because bLevel was not update.
- Instead to calculate ChanceToHit only from STANDING from now AI calculate chance for all stances, so AI should be more eager to attack.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6311 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-08-24 20:17:16 +00:00
Kriplo 1adc9c542c Brief: //dnl ch58 
- Fix several problems which lead into bad or no AI decisions, add optional decision of short autofire.

Details:
- Avoid use of last two locations per turn 
- Fix problems with improper APs calculations for burst and autofire which lead into AI to forcably cancel and end turn for those actions.
- Add option for decide to use short autofire instead of one long to enchance chance to hit.
- After taking cover change facing toward closest enemy to avoid going in status red and rather take proper black decisions.
- Fix bad public noise processing after AI investigate closest disturbance and find nothing, also erase all same noise points in team members if one of them already investigated.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6310 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-08-23 16:27:36 +00:00
Wanne e49412eae9 - Cosmetic Improvements to MERC hiring page (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6308 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-08-22 19:35:59 +00:00
Wanne 09dbe4c96f - Fixed loading of vehicle faces (by silversurfer) 
o Vehicle faces after index 163 (heli) were not loaded

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6302 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-08-21 22:27:34 +00:00
Flugente 62aa8acd3e Fix: previous fix was very bad 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6301 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-08-21 19:14:43 +00:00
Flugente aa82e0010c possible division by 0 for blind soldiers 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6300 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-08-20 22:53:01 +00:00
Flugente 8b6a8cfe26 Fix: weapon mode wasn't changed back after checking for grenades (by Kriplo) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6299 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-08-20 22:06:28 +00:00
Flugente 320f82ae7e Fix: game crash when civilians kill other civilians in a town 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6298 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-08-20 20:55:12 +00:00
Flugente ec07946730 Changed MOVEITEM dropoff gridno to a location that is always guaranteed to exist and be accessible 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6297 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-08-20 20:15:16 +00:00
Wanne 643612540d - Bugfix: Externalized Music (Music.lua) (by Jazz) 
o Added missing:
6 - creature start battle  (CREATURE_BATTLE_xxx.wav or CREATURE_BATTLE_xxx.ogg)
7 - creepy music  (CREEPY_xxx.wav or CREEPY_xxx.ogg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6296 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-08-20 08:33:32 +00:00
Wanne ab02106512 - New Externalization: Externalized the used music to an OPTIONAL "Scripts\Music.lua" file (by Jazz) 
o This file is OPTIONAL and if not available, the game uses the default music tracks
o With the user of the Music.lua script file, you can play different musics and types for each sector (*.WAV or *.OGG)
o An example of the usage has been added to "Docs\Externalized Music Example.zip"
o See comments from the Music.lua scripts below

--[[
AddMusic(SectorX,SectorY,SectorZ,MusicType,MusicID)

MusicType :
1 - standard music, sector no enemy (NOTHING_xxx.wav or NOTHING_xxx.ogg)
2 - enemy in sector  (TENSOR_xxx.wav or TENSOR_xxx.ogg)
3 - start battle  (BATTLE_xxx.wav or BATTLE_xxx.ogg)
4 - victory  (TRIUMPH_xxx.wav or TRIUMPH_xxx.ogg)
5 - death merc  (DEATH_xxx.wav or DEATH_xxx.ogg)

xxx - number file

MusicID - id of music

Put to "Music" folder ogg or wav file. We number the names of files NOTHING_0.wav... NOTHING_10.wav ... etc

Example :
AddMusic(1,10,0,1,0) -- add to sector A10, music type "1" and file NOTHING_0.wav or NOTHING_0.ogg.
AddMusic(1,10,1,1,0) -- add to sector A10_B1, music type "1" and file NOTHING_0.wav or NOTHING_0.ogg.
AddMusic(1,9,0,2,10) -- add to sector A9, music type "2" and file TENSOR_10.wav or TENSOR_10.ogg.

for x = 1,16 do
        for y = 1,16 do
		AddMusic(x,y,0,1,10) -- add to all sector, music type "1" and file NOTHING_10.wav or NOTHING_10.ogg.
	end
end

]]

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6295 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-08-20 07:15:30 +00:00
Flugente 74f52b3982 Changing MAX_NUMBER_PLAYER_MERCS midgame no longer renders savegames unloadable, as the teamsize is stored in the savegame anyway 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6294 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-08-19 23:27:50 +00:00
Flugente 4b0094902a Forbid ammo with tracer effects to be used by AI on singleshot-only guns 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6293 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-08-18 22:40:33 +00:00
Flugente 2852b33ac9 Fix: AI does not ask for surrender if creatures are around, thereby not offering zombies surrender 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6290 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-08-18 16:45:31 +00:00
Flugente 3fc50d46a3 - Fixed EDB modifier weirdness(by Moa) 
- Fix: overheating modifiers on attachments weren't shown correctly

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6289 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-08-18 16:17:43 +00:00
Flugente b643ddc7f3 Fix: nada items or CTD when 'move item' assignment takes items from a sector that is currently loaded in tactical. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6288 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-08-18 14:31:55 +00:00
Flugente 6cf45e456e Fixed moveitem dropoff gridno - gear is no longer dropped in inacessible places 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6287 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-08-16 22:25:29 +00:00
Wanne a08175906d - Improvement of M.E.R.C availability (by silversurfer) 
o Now you can change the MercAvailability.xml file during a game

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6286 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-08-15 20:20:06 +00:00
Flugente 5f4c5e63e5 speed up item movement by lowering the number of inventory accesses 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6282 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-08-11 21:04:51 +00:00
Wanne 4266ba809d - Bugfix: Prevent merc swapping in tactical while they are talking (by silversurfer) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6281 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-08-11 19:02:00 +00:00
Flugente 8171fdbe7e new feature: 'Move item' assignment allows quick and easy mass transfer of items between city sectors. 
Warning: GameDir >= r1723 is required.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6280 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-08-11 15:22:29 +00:00
Flugente fd8b146296 added and adjusted the following features by zwwooooo to help restoring IoV to a pure item mod: 
- externalized the brightness vision range modifiers to allow for different ratios of day/night vision range
- added <PercentRangeBonus> as a complement to <Rangebonus>
- added the possibility for LBE vests to function as plate carriers

These were the missing features from IoV previously not in the 1.13 trunk. Thereby, IoV is now fully compatible to the current trunk (by DepressivesBrot)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6279 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-08-08 21:08:04 +00:00
Flugente a543b33c4b Fix: adding new mercs to the MERC webpage in an ongoing campaign destroyed sort order and made mercs unavailable (by silversurfer) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6278 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-08-08 20:49:41 +00:00
Flugente ea478960dd - Fix: when disguised mercs with suspicious gear were spotted, messages were print out, but no uncovering occured 
- Disguised mercs no longer 'stop' when they see a new enemy, as otherwise movement becomes tedious.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6274 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-08-06 20:43:44 +00:00
Wanne 44b9bf41d8 - Bugfix: <PercentReloadTimeAPReduction> and <PercentBurstFireAPReduction> from "Items.xml" was not working (by silversurfer) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6264 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-31 20:08:16 +00:00
Flugente 71274fdf55 - new function: militia can be ordered to pick up gear from sector in tactical, just like ordering them to drop it. does not work in combat for obvious reason. 
- if militia stand in water and are ordered to drop their equipment, they will drop it on land.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6263 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-31 18:59:32 +00:00
Flugente 64f7d6e616 new item tag <ItemChoiceTimeSetting> forbids AI from picking an item at night if set to 1 and at day if set to 2 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6262 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-30 19:32:49 +00:00
Flugente 8f5ac3a935 Fix: NCTH throws error if not firing at soldier 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6261 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-30 18:17:54 +00:00
Flugente 5742725c19 - Fix: recent code additions broke savegame compatibility. Some code now also works for UB, as otherwise code gets needlessly complicated. 
- Improved code

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6260 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-30 18:02:53 +00:00
Flugente b53fe0cd72 Militia equipped from sector inventory take along NVGs/sunglasses to use them later 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6259 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-29 20:04:45 +00:00
Wanne c74e13fb5c - Added playable mercs: John Kulba (the tourist) and 3 JA1 natives (Elio, Juan, Wahan) (by anv) 
o Added faces (except camo faces), speech, bio, ...
o All those 4 mercs are available at M.E.R.C
o Added INI options for enabling/disabling recruitable Speck, Kulba and natives
o If enabled, Kulba becomes available as a MERC merc after finishing escort quest, delay is configurable (two weeks by default). He won't be available earlier even if MERC_WEBSITE_ALL_MERCS_AVAILABLE is set to TRUE
see: http://www.bears-pit.com/board/ubbthreads.php/topics/298288/47.html

- Improvement: MERC mercs get unlocked according to their own availability conditions, not to their order in MercAvailability.xml


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6258 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-29 11:48:53 +00:00
Wanne 0e3865a4ef - Fixed a few compilation warnings (uninitialized variables, ...) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6257 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-29 09:15:21 +00:00
Wanne 76d517be0c - Fixed compilation errors when trying to compile a UB-Version (#define JA2UB & define JA2UBMAPS) 
o The compilation was broken when enabling Speck as a playable mercs in JA2 113 (revision 6215)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6256 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-29 09:05:08 +00:00
Wanne 4982281ddb NCTH: Minor Adjustments (by silversurfer) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6255 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-29 07:39:13 +00:00
Flugente 828b7758d4 - more reasonable food poisoning values 
- Settings were never read

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6254 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-28 18:32:55 +00:00
Flugente cf5e7ea3af Fix: if militia moves strategically, sometimes gear would be moved unnecessary. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6250 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-28 15:19:58 +00:00
Flugente 8c2df1803a If COVERT_ELITES_DETECT_NEXTTILE is set to TRUE, elite soldiers will uncover spies disguised as soldiers next to them if more experienced. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6249 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-28 14:05:45 +00:00
Flugente cfe8ea5ea5 - Feature improvement: enemy soldiers can now free captured comrades 
- Fix: when jumping through windows, AI soldiers no longer need to end their turn to avoid a deadlock

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6248 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-26 21:50:08 +00:00
Wanne 4e3e07ed55 - Translated Chinese Text (by zwwooooo) 
- Added missing text string to all the languages (except English)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6246 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-26 07:21:58 +00:00
Flugente 6a1b923abc Fix: wrong item name displayed when uncovered 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6245 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-25 22:05:45 +00:00
Flugente bc49864000 Fix: crash when transforming attached items on guns with magsize modifiers 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6244 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-25 21:43:04 +00:00
Flugente 1860fee5b8 increased possible number of soldier/militia profiles to 300 for each category 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6243 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-25 18:11:16 +00:00
Flugente 7964e90c0a Fix: preplaced items with incompatible attachments causes entire sector inventories to vanish if entering the sector a second time 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6242 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-25 17:32:15 +00:00
Flugente f835b04598 spies lose cover if they try to handcuff but fail 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6241 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-25 17:30:48 +00:00
Wanne acf4968253 - HackFix: Crash on maps with isolated entry points (by silversurfer) 
o see http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/312260/Re_BUGZILLA_report_all_bugs_he.html#Post312260
o see http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/312612/Re_BUGZILLA_report_all_bugs_he.html#Post312612
o The main problem of the crash is, that some memory gets overwritten -> Workaround (hackfix): Increased the array for the map edgepoints to a fixed size of 400 so we can avoid the crash
o Of course this is not the best fix (because of increased memory usage), so if someone can improve the fix, do it :)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6240 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-25 08:38:43 +00:00
Wanne a5bbc40756 - Bugfix: Mike & Iggy: Fixed wrong ";" (thx to silversurfer) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6239 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-22 08:00:50 +00:00
Wanne 4dcdd17a91 - Bugfix: After Mike has been recruited, he could still show up as an enemy later in the game (a Mike clone) (by anv and silversurfer) 
o Similar fix is also applied for Iggy

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6238 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-21 21:23:53 +00:00
Wanne 7ae802505c - Bugfix: After loading a game, mercs gearkits are bugged and game crashes when hiring a merc (by silversurfer) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6237 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-21 21:19:12 +00:00