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
1,792 Commits 9 Branches 6 Tags
4ac9cf5ebe3ffa9decbf85a86dcc29dc6dd00791
Commit Graph
404 Commits
Author SHA1 Message Date
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 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
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
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
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
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 a4998d6309 Fix: exp bonus from interrogation was too high 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6229 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-14 18:58:41 +00:00
Flugente a1f49b3ca3 Feature improvement: the prisoner system now distinguishes between different types of prisoners (admin, regular, elite). Advanced troops are harder to interrogate, but have a high chance of retaining their rank, should they join yor militia. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6219 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-12 23:54:50 +00:00
Wanne 957e8cc76c Added Speck as a playable merc (by anv) 
o Speck can be hired by M.E.R.C
o From now on, as long as Speck is hired (or dead, or POW, or travelling), he won't be sitting on Speck Com nor sending you emails. However, is he's able to, he'll comment on current situation from battlefield: player owing money, Flo getting married, MERC merc dying, etc., so keeping him alive might be a good idea
o GameDir data revision >= 1701

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6215 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-11 19:54:50 +00:00
Wanne e48ad7ad56 - Bugfixes (by Jazz) 
o ActionItems: Problem with the adding of  new actions to the file ActionItems.xml.
o LuaInitNPCs: Wrong data type for fUpdateHistory (int -> bool)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6212 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-10 21:55:22 +00:00
Wanne c7f5dda4d7 - Bugfix: ETA Travel Popup screen location was wrong (not initialized) in the new additional screen resolutions (by silversurfer) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6184 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-01 18:38:04 +00:00
Wanne 4c7e235e81 - Reworked LuaInitNPCs.cpp\h, Luaglobal.cpp\h and few cosmetic changes (by Jazz) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6181 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-30 19:16:35 +00:00
Wanne 7033074a01 New Lua Externalization (Quests.lua) (by Jazz) 
- New File "Quests.lua"
- Modders can now define new events relating to tasks (from 0 to 254)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6139 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-19 11:19:57 +00:00
Wanne 8f41617845 - Encyclopedia / Briefing Room Updates (by Jazz) 
o Improved record
o Restart game of Briefing Rooms
o New Action for NPC (recruiting / unrecruiting)
NPC_ACTION_RECRUIT_PROFILE_TO_EPC = 700
NPC_ACTION_UNRECRUIT_EPC = 701

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6120 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-13 22:34:43 +00:00
Flugente c38e079edc - interrogation point calculation was suboptimal 
- Fix: removed unnecessary check
- robots cannot climb roofs, windows, fences or walls anymore

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6103 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-28 21:32:40 +00:00
Flugente 9bd26015e5 cleaned up code: some comiler-warnings fixed, obsolete code removed (oops..and some whitespace stuff) (by CleaningWoman) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6102 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-27 21:01:04 +00:00
Flugente f92f70c78d cleaned up code: various stuff (out-of-bounds, null-pointer, uninitialized vars,...) (by CleaningWoman) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6101 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-27 20:38:52 +00:00
Flugente bd5233db0f Fix: use xml vehicle names 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6085 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-17 23:20:13 +00:00
Wanne 0078b01d9b - Sorted Training Attribute strings to be same order as stats display (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6062 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-04 15:08:25 +00:00
Flugente 3bc5ff75cc significantly cleaned up includes (by IoP) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6056 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-02 22:42:08 +00:00
Wanne 3083ac66b3 - Bugfix: LoadScreenHints 
o Added support for language specific (German, Russian, ...) LoadScreenHints (*.LoadScreenHints.xml)
o Added support for long (multi line) load screen hints (there will be an automatic line break in long load screen hints text)
o Reset load screen hint text to 0 (no display), because otherwise the old load screen will also be shown underneath the correct new one which resulted in an unreadable text mess

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6053 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-02 19:50:21 +00:00
Flugente 6cbcc995de replaced a few hardcoded numbers with enums/ini setting 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6047 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-01 17:03:31 +00:00
Flugente 2455c2c467 changed hardcoded numbers to enums in preparation for total merc number increase 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6042 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-30 21:31:04 +00:00
Flugente c4aa1da949 Fix: non-green-militia-tabooed objects did not retain their taboo value after inspection 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6027 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-27 02:09:24 +00:00
Flugente bcbe006a4a feature improvement: if MILITIA_USE_SECTOR_EQUIPMENT_CLASS_SPECIFIC_TABOOS is TRUE, one can taboo equipment for specific militia classes 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6026 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-27 00:59:38 +00:00
Flugente 40979fce1c code changes: 
- the amount of food points one gets for eating now depends on the current food situation
- food/drink percentage now goes from 0 to 200%, with 100% being the optimal value

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6024 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-26 00:54:22 +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 e8d9acba8c - added team-specific modifiers for AI suppression 
- Fix: incorrect platoon spawning wehn initializing Cambria counter attack

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5996 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-11 21:33:28 +00:00
Wanne 738d31e29b - Reworked the initialization of LUA functions, fixed and added new ones (by Jazz) 
o You also need to update the GameDir, cause some LUA scripts have been changed and fixed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5995 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-11 19:16:34 +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 6bf3775c3b cleaned up trait name displays 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5980 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-04 21:10:28 +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
Wanne a0486b6b3f - Allows militia training for town sectors even when <townUsesLoyalty> tag set to FALSE (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5959 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-25 19:23:00 +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
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 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 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 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 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 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 36f7399d3b - Prisoners of war are now spawned in prison sectors. They have fitting dialogue etc. Harming them slightly lowers global loyalty. 
- Prisoner system: added ini options that allow display of surrender strength sum, and externalised surrender strength modifier
- Fix: wrong assignment string in strategic view

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5895 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-05 01:02:59 +00:00