1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-12 14:10:23 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,619 Commits 9 Branches 6 Tags
dbf6e1cd101650dab5436f1971a4e4dd9cd960af
Commit Graph
7619 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Wanne 61ed9596c9 - Cosmetic Improvements to MERC hiring page (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6309 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-08-22 19:37:20 +00:00
Wanne 8cb5d41a4d - Cosmetic Improvements to MERC hiring page (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1736 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-08-22 19:36:22 +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
Wanne 8c6c13d335 - Added optional profile names to the XML files (by silversurfer) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1735 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-08-21 22:25:16 +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
Wanne b891c8e99b - Updated Vehicles.xml (by silversurfer) 
o Added the jeep

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1734 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-08-21 07:52:47 +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
Wanne 62a16871e7 - Updated some JA DG faces and added missing camo faces for JA1 natives (by anv) 
o Face improvements: Spam & Roachburn family members
o Added missing camo faces for the 3 JA1 natives

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1731 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-08-20 06:45:46 +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 6d0f1059ce added a few loadscreen hints (by Acqsen & Flugente) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1730 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-08-19 19:43:33 +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 5884224bbb made tripwire merges not that hard, thereby reducing the stat gain 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1729 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-08-16 22:27:29 +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 26807ae8e8 - Fixed wrong index of drunken Larry in MercAvailability.xml (by silversurfer) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1728 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-08-15 20:21:19 +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
Wanne b9b5abb11d - Fixed missing and placeholder face files for the 3 JA1 natives (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1727 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-08-14 11: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 abd112fec4 - Bugfix: Fixed duplicated tags that were introduced in revision 1725 (thx to silversurfer) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1726 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-08-11 20:08:25 +00:00
Wanne 2bfb133c2b - Re-added missing buddies/hates for some merc that were overwritten in revision 1715 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1725 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-08-11 19:19:35 +00:00
Wanne da041d4558 - Quickfix: Added the missing 33-faces for the 3 JA1 natives to fix the crash 
o Currently all the 3 uses the face of John Kulba, until we get the correct ones

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1724 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-08-11 19:11:23 +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 a2322a6dc4 new feature: 'Move item' assignment allows quick and easy mass transfer of items between city sectors. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1723 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-08-11 15:07:36 +00:00
Flugente eac402f47e 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_v1.13_data@1722 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-08-08 21:08:44 +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 fb93c07517 R-Holster is now covert. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1721 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-08-06 20:44:38 +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 afeb2bf46a - Updated MERCBIOS.EDT (German Version) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6271 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-08-05 07:31:03 +00:00
Wanne 42210095bd - Bugfix: Overhead.lua (by Jazz) 
o Entering Kinpgin room through the window. Demon (bodyguard) has to let in the player and Kingpin has to expect the player

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1720 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-08-02 11:18:54 +00:00
Wanne 9b09572898 - Added missing MERC level up emails for John Kulba and the 3 JA1 natives (German Version) 
- Added missing profile names for John Kulba and the 3 JA1 natives (German Version)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6265 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-31 20:26:29 +00:00
Wanne 837d54cf45 - Added missing MERC level up emails for John Kulba and the 3 JA1 natives 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1719 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-07-31 20:25:48 +00:00
Wanne 17f4b648e1 - Bugfix: Fixed wrong bio index for the 3 JA1 natives (by silversurfer) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1718 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-07-31 20:10:47 +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 43fe6ec3d1 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_v1.13_data@1716 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-07-30 19:34:13 +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 a4c2f079ed - 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
-> RECRUITABLE_SPECK, RECRUITABLE_JOHN_KULBA, RECRUITABLE_JOHN_KULBA_DELAY, RECRUITABLE_JA1_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


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1715 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-07-29 11:55:20 +00:00