- You can also open them with VS 2012
- I just changed the toolset for all projects to V100 (VS 2010) instead of V120 (VS 2013), because I don't have VS 2013 installed. If anyone can't compile with VS 2013, we simply switch back to V120 toolset
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6639 3b4a5df2-a311-0410-b5c6-a8a6f20db521
- ridiculous amount of tags: attack, hit, miss, kill, head pop, blinded, type of attack, is target a zombie...
- ripostes to merc quotes,
- taunts can now make noise,
- bumped up amount of taunts to respectable 733, mostly thanks to your contributions guys,
- accidently squashed bug with incorrect noise notifications ("hears scream" instead of "hears explosion" etc.)
Ripostes
At the moment enemies can react to quotes "enemy detected", "1st enemy detected", "multiple enemies detected", "bullet flew by", "under heavy fire", as these are most likely to be used in combat. In the first three cases, riposting enemy will be chosen randomly from all enemy witnesses, latter two - last enemy to attack this merc will taunt.
Enemy's riposte will come as soon as merc quote is finished.
Noisy taunts
Taunts can be handled like other noises in game - shots, explosions, etc., meaning:
- they will be displayed only if someone from our team is close enough to hear them,
- they can be heard even if you don't see enemy (with twist of his name changed to "unknown voice". Yay.)
- volume of taunts is configurable in .ini.
see: http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/327830/4.html
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6628 3b4a5df2-a311-0410-b5c6-a8a6f20db521
- Added hotkeys in personnel screen
o 'LEFT ARROW' and 'RIGHTARROW' for merc scrolling;
o 'UP ARROW' and 'DOWN ARROW' for switching between stats, employment and inventory;
o 'Shift + TAB' for switching between current team and departures
- Fixed hardcoded text in personnel screen
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6622 3b4a5df2-a311-0410-b5c6-a8a6f20db521
1) Fixed small bug when MAPELEMENT_PLAYER_MINE_PRESENT was set after planting explosives with remote detonator.
2) Arming bomb with only remote defuse attached is not allowed.
3) Showing item locator before "add blueflag" messagebox is disabled for our mines as it was annoying and you anyway know that it is here.
4) Total weight for throwing range is calculated for all items (previously it was calculated only for grenades).
5) Grenade-throwing formula and demolitions bonus applied only for hand-thrown grenades (check for TOSSCURS). Previously it was applied for launched grenades too.
6) Changed grenade throwing range formula from
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6606 3b4a5df2-a311-0410-b5c6-a8a6f20db521
- Fixed enemy garrison group troops & elites spawning numbers as per ArmyComposition.xml description (thanks to Moa)
- Refactored random stats code to separate function for future reuses
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6581 3b4a5df2-a311-0410-b5c6-a8a6f20db521
- Fixed wrong X/Y coordinates of some title positions
- Externalized hardcoded "I.M.P. Prejudices" and "I.M.P. Background" texts to the language cpp files
- A few more minor cosmetics
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6563 3b4a5df2-a311-0410-b5c6-a8a6f20db521
- no more jump with backpack (keys 'j' and 'J'). This is more consistent. Sometimes the soldier got stuck in the fence as some functions did not allow jumping and others did.
- Pickup items from ground will now cost AP.
- Backpack, Scubba fins and swimming background AP modificattion is now shown in path and is considered when calculating new path. No pathing through fences when wearing backpack. More likely to create path through water when wearing scubba fins.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6543 3b4a5df2-a311-0410-b5c6-a8a6f20db521
- Currently MercProfiles.xml contains 5 records for buddies and 5 for foes + 1 per "learn to", but in code only 2 first + "learn to" are handled. I changed it so all possible buddies and foes can be used, and it's possible to add their specific like/dislike quotes to quote .edts.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6538 3b4a5df2-a311-0410-b5c6-a8a6f20db521
- Hitting CTRL + V in Debug Build now writes all the data into file SGPVideoDump.txt (This can show instances of not removed objects ...)
- Fixed guiMAPINV was not disposed
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6525 3b4a5df2-a311-0410-b5c6-a8a6f20db521
- The problem were the new NATIONALITY enum values which conflicted with the language build defines
- I added a "_NAT" postfix to the nationality enum values (e.g: CHINESE_NAT)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6522 3b4a5df2-a311-0410-b5c6-a8a6f20db521
- Externalized victory sector and gridno
- Fixed initial game loading screen not using file specified in SectorLoadscreens.xml when starting other than A9 sector
- Fixed no time delay for interrogation meanwhile scene
- Added space to 'moveitem' string
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6518 3b4a5df2-a311-0410-b5c6-a8a6f20db521
-SGP debugging now works again (corrected some typos and one missing include).
-Memmory debugging works again (wrong types corrected)
-Laptop screen heigth macro and all references is now usable. (was 'C: y + A' 'D: B - C' which translates to 'D: B - y + A' instead of 'D: B - y - A')
-Laptop screens do not need to rerender as often then before as the laptop screen width/heigth macros works now and invalidating screen will do the trick -> almost no render calls neccessary.
-MercProfile.ubMiscFlag was used instead of .ubMiscFlag2 -> enter sector action schedule for soldiers which dont need to be insertered is now canceled as intended
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6509 3b4a5df2-a311-0410-b5c6-a8a6f20db521
- Externalized airport sectors
- Leave equipment in Drassen used airport sector instead of bobbyr shipping location, allowing possibility of separate airport and bobbyr location
- Used actual sector names instead of Omerta and Drassen hardcoded text in leave equipment message prompt
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6503 3b4a5df2-a311-0410-b5c6-a8a6f20db521
- Externalized BR shipping destination
- Externalized Drassen item dropoff grid no
- Used profile name instead of hardcoded value on message prompt for marrying Daryl, sparing Krott and finding queen's POW sector
- Hid names on message prompt when attempt to talk to out of LOS hidden NPC
Mapeditor (by Buggler)
- Show index no within usItemClass on item selection screen for another easy reference
- Lighten quantity and selected tiles color in tile selection screen
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6500 3b4a5df2-a311-0410-b5c6-a8a6f20db521
- AWOL scientist location
- Brothel sector
- Call Kingpin over for boxing match
- fact Tony in building
- meet Carmen for reward
- moved John & Mary unescort sector from Mod_Settings.ini to LUA
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6495 3b4a5df2-a311-0410-b5c6-a8a6f20db521
- Set USE_WINFONTS = 1, if you play Chinese version of 1.13, otherwise 0 (Default)
- This is the first step in a process making only ONE executable file for ALL the different languages
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6488 3b4a5df2-a311-0410-b5c6-a8a6f20db521
- Queen Palace & Interrogate meanwhile stuff
- Initial POW stuff in Alma
- Sectors for triggering Meduna outskirts meanwhile scene
- Add Iggy to location when game progress condition met
- Add Rat to location after creature meanwhile scene
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6479 3b4a5df2-a311-0410-b5c6-a8a6f20db521
- 'Kingpin wants his money' history log hardcoded location to his actual location
- John & Mary sector to disappear on quest completion
- Dynamo prison sector for Matt's quest
- Joey primary & alternate location to be found
- Spike sector relocation when assassins are sent
- Weapon cache locations
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6477 3b4a5df2-a311-0410-b5c6-a8a6f20db521
- improved processing of sector stash (opening/closing)
- improved loading speed of save games
- improved processing of items droped by militia (most noteable after autoresolve)
- and some other code related changes
see: http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/325332/FIX_improve_loading_speed_of_s.html#Post325332
Notes:
removed some functions, still in code so but renamed to *_OLD() because they are from Sirtech and should be kept as I have read in "§18) If possible, we don't just delete the old code, but comment it out (or #ifdef it out) for reference. We delete it only if it's really necessary."
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6434 3b4a5df2-a311-0410-b5c6-a8a6f20db521
Each setting in ini now has the effect that the user expects, he now sees the correct restrictions on the map, and is able to adjust manually as neccessary
- RESTRICT_ROAMING = TRUE
activates the manual adjustable restrictions based on exploration and/or conquest.
Any of the following settings can be mixed as you like
- ALLOW_MILITIA_MOVEMENT_THROUGH_EXPLORED_SECTORS = TRUE
Exploration based: any liberated sector is potentially accessible for mobile militia.
You need to load the map and defeat all enemies. Walking through on strategic view is unsufficient!
- ALLOW_DYNAMIC_RESTRICTED_ROAMING = TRUE
Conquest based: Liberating a town will increase the accessible sector count.
See Data-1.13/TableData/Map/DynamicRestrictions.XML
- ALLOW_MILITIA_MOVEMENT_THROUGH_MINOR_CITIES = TRUE
Mobile militia can move thru cities where militia training is not allowed(e.g. Tixa, San Mona, Omerta,...)
In earlier versions those cities where allready included in DynamicRestrictions.XML which rendered this setting allmost useless.
NOTE:
Older savegames have still the 'gray' sector restriction set.
Those will be converted to 'red' according to the settings in Ja2_Options.INI on load.
see: http://www.bears-pit.com/board/ubbthreads.php/topics/325133/Re_Fix_Catched_the_mobiles.html#Post325133
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6400 3b4a5df2-a311-0410-b5c6-a8a6f20db521
o The new music code is now surrounded by a define called NEWMUSIC
o Jazz will rework the new music code in the future
o For now we have the old music code back, which should fix the mentioned bugs
-> Music in the main menu is starting again from beginning when going from preferences screen back to main menu screen
-> The battle tracks can play only 5-15 second then they start from all over again
-> The win music after tactical battle never run
-> ...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6381 3b4a5df2-a311-0410-b5c6-a8a6f20db521
o On modified maps Kyle couldn't reach the temp money for the reward. Now there is a new parameter in Mod_Settings.ini called KYLE_MONEY_POSITION = x. The default for x is 14952 which is for vanilla map.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6343 3b4a5df2-a311-0410-b5c6-a8a6f20db521
o Now there are 2 ways to play UB (1.13 and Vanilla): vfs_config.UB113.ini, vfs_config.UBVanilla.ini
o UB: Source Code cleanup: Replaced hardcoded merc profiles with proper ENUMS, ...
o Updated / added UB-Config values
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6330 3b4a5df2-a311-0410-b5c6-a8a6f20db521
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
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
- If a name is available for the enemy, the name will be shown and if INDIVIDUAL_ENEMY_RANK = TRUE also the rank will be shown
- The name will be shown if INDIVIDUAL_ENEMY_NAMES = TRUE or SOLDIER_PROFILES_ENEMY = TRUE. If both are true, then the name will be taken from the enemies profiles
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6236 3b4a5df2-a311-0410-b5c6-a8a6f20db521
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
Wanne