mirror of
https://github.com/1dot13/source.git
synced 2026-08-05 14:00:23 +02:00
MERGED source code from development trunk revision 4545 up to latest current revision 4882
Development Trunk: https://ja2svn.dyndns.org/source/ja2/branches/Wanne/JA2%201.13%20MP A detailed list of all the features (changes) is visible in the history log of the development trunk: INFO: The source code for the official 2011 release (4870) has been branched here: https://ja2svn.dyndns.org/source/ja2/branches/JA2_rev.4870_2011 This commit contains the following features: *** Externalized Vehicles *** o Now with this feature we can add/remove vehicles o New XML File: TableData\Vehicles.xml o Added a new function parameter to lua file Scripts\Overhead lua to set up the helicopter in method: SetUpHelicopterForPlayer() o Added example mini (Docs\Externalized Vehicles Example.zip) mod which adds 2 additional vehicles (hummer and ice-cream truck to sector A9) *** Up to 255 save slots *** - There is a "Next" and "Prev" button where you can scroll through the save slots - It is now possible to load the automatic save (SAVE_EVERY_N_HOURS) from the load screen. This is the first slot after the quickload slot - Added the 2 alternate players end turn saves (which can be enabled/disabled in option screen) to the save/load game form *** New Feature: Externalized emails from Emails.edt to XML*** o This feature can be enabled/disabled in the Source: --> See email.cpp: If "ReadXMLEmail" == FALSE, then normal way (read from Email.edt) otherwise read from XML files o 2 new XML files: TableData\Email\EmailMercAvailable.xml and EmailMercLevelUp.xml o Renamed SenderNamesList.xml to EmailSenderNamesList.xml and moved from TableData folder to TableData\Email folder o Names for mercenaries are get from the file MercProfiles.xml and different names get from the file EmailSenderNamesList.xml *** Externalized Hidden Towns (Tixa, Orta) *** o Now it is possible to add new hidden towns (locations) o See file: TableData/Map/Cities.xml o New variable in TableData/Map/Cities.xml - hiddenTown: 0 = show on strategy map, 1 = Hide on strategy map - townIcon: 1 = on, 0 = off (This is the icon you see on the strategy map) - szIconFile: The path to the sti icon file (eg: interface\prison.sti, interface\my_icon.sti) - iconPosition: The x,y position of the icon on the strategy map *** Encyclopedia and Briefing Room, reachable from the laptop *** o 2 new ja2_options.ini properties: BRIEFING_ROOM, ENCYCLOPEDIA o demonstration video: http://www.youtube.com/watch?v=7CIXdXWLrAo o Added Example usage of the Briefing Room - Extract it in your JA2 1.13 folder and use the latest development executable - The briefing room can be reached from the laptop. Enter SN5631 for the code and then click the "Exit" button - See "Info_BriefingRoom.txt" and "BriefingRoom_Mission1.png" *** Improved interrupt system (IIS) *** o This system changes the way interrupts work. See: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=290787#Post290787 o Option system (see ja2_options.ini: IMPROVED_INTERRUPT_SYSTEM) o A few more settings for the interrupt system in ja2_options.ini o INFO: Multiplayer games always use the "old" interrupt system, not matter what the user selects in the ja2_options.ini *** Walking and sidestepping with weapon raised *** o Enable/disable the walking/sidestepping with raised weapon in ja2_options.ini: ALLOW_WALKING_WITH_WEAPON_RAISED o You can set an AP/BP modifier when walking/sidestepping with weapon raised in APBPConstants.ini: AP_MODIFIER_WEAPON_READY o The following feature apply when you walk/sidestep with weapon raised: -> limited angle of view, but you can see more farther when the weapon has a scope -> better change for interrupts if you see an enemy -> less APs and BPs when shooting, because the weapon is already raised -> It should cost more APs when walking. Maybe you can export the additional AP and BP modifier to the APBPConstants.ini *** Increase squad size to 8 (800x600) and 8 and 10 (1024x768) *** o Squad sizes (dependend on the screen resolution) can be selected in the start new game screen o In a multiplayer game, the squad size will always be 6, because it does not work with more soldiers/squad *** Added UB-1.13 source code *** o Merged the UB-1.13 source code (Revision: 4721) from svn: http://subversion.assembla.com/svn/ub-source113 o If you want to build UB-EXE or UB-MapEditor, just enable the 2 defines (JA2UB and JA2UBMAPS) in "builddefines.h" o The UB-Verion reads from "ja2_UB.ini" instead of "ja2.ini" o There are 2 new XML files - Layout\LayoutMainMenu.xml - MapAction\ActionItems.xml o There are 2 new LUA-Script files - Scripts\ExplosionControl.lua - Scripts\InterfaceDialogue.lua *** Hide enemy health text / enemy hit count *** o ja2_options.ini: HIDE_ENEMY_HEALTH_TEXT, HIDE_ENEMY_HIT_COUNT o both new settings only have effect in a singleplayer game o see: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=128840&page=1 git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4885 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -19,33 +19,6 @@ void this_is_the_Ja25DutchText_public_symbol(void){;}
|
||||
|
||||
// VERY TRUNCATED FILE COPIED FROM JA2.5 FOR ITS FEATURES FOR JA2 GOLD
|
||||
|
||||
STR16 zNewTacticalMessages[]=
|
||||
{
|
||||
//L"Range to target: %d tiles, Brightness: %d/%d",
|
||||
L"Attaching the transmitter to your laptop computer.",
|
||||
L"You cannot afford to hire %s",
|
||||
L"For a limited time, the above fee covers the cost of the entire mission and includes the equipment listed below.",
|
||||
L"Hire %s now and take advantage of our unprecedented 'one fee covers all' pricing. Also included in this unbelievable offer is the mercenary's personal equipment at no charge.",
|
||||
L"Fee",
|
||||
L"There is someone else in the sector...",
|
||||
//L"Gun Range: %d tiles, Chance to hit: %d percent",
|
||||
L"Display Cover",
|
||||
L"Line of Sight",
|
||||
L"New Recruits cannot arrive there.",
|
||||
L"Since your laptop has no transmitter, you won't be able to hire new team members. Perhaps this would be a good time to load a saved game or start over!",
|
||||
L"%s hears the sound of crumpling metal coming from underneath Jerry's body. It sounds disturbingly like your laptop antenna being crushed.", //the %s is the name of a merc. @@@ Modified
|
||||
L"After scanning the note left behind by Deputy Commander Morris, %s senses an oppurtinity. The note contains the coordinates for launching missiles against different towns in Arulco. It also gives the coodinates of the origin - the missile facility.",
|
||||
L"Noticing the control panel, %s figures the numbers can be reveresed, so that the missile might destroy this very facility. %s needs to find an escape route. The elevator appears to offer the fastest solution...",
|
||||
L"This is an IRON MAN game and you cannot save when enemies are around.", // @@@ new text
|
||||
L"(Cannot save during combat)", //@@@@ new text
|
||||
L"The current campaign name is greater than 30 characters.", // @@@ new text
|
||||
L"The current campaign cannot be found.", // @@@ new text
|
||||
L"Campaign: Default ( %S )", // @@@ new text
|
||||
L"Campaign: %S", // @@@ new text
|
||||
L"You have selected the campaign %S. This campaign is a player-modified version of the original Unfinished Business campaign. Are you sure you wish to play the %S campaign?", // @@@ new text
|
||||
L"In order to use the editor, please select a campaign other than the default.", ///@@new
|
||||
};
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
// SANDRO - New STOMP laptop strings
|
||||
//these strings match up with the defines in IMP Skill trait.cpp
|
||||
@@ -219,6 +192,7 @@ STR16 gzIMPMajorTraitsHelpTextsMartialArts[]=
|
||||
L"-%d%s APs needed to climb on/off roof and jump obstacles\n",
|
||||
L"+%d%s chance to kick doors\n",
|
||||
L"You gain special animations for hand to hand combat\n",
|
||||
L"-%d%s chance to be interrupted when moving\n", // TODO.Translate
|
||||
|
||||
};
|
||||
STR16 gzIMPMajorTraitsHelpTextsSquadleader[]=
|
||||
@@ -234,6 +208,7 @@ STR16 gzIMPMajorTraitsHelpTextsSquadleader[]=
|
||||
L"(Max simultaneous bonuses for one soldier is %d)\n",
|
||||
L"+%d%s fear resistence of %s\n",
|
||||
L"Drawback: %dx morale loss for %s's death for all other mercs\n",
|
||||
L"+%d%s chance to trigger collective interrupts\n",
|
||||
|
||||
};
|
||||
STR16 gzIMPMajorTraitsHelpTextsTechnician[]=
|
||||
@@ -322,6 +297,7 @@ STR16 gzIMPMinorTraitsHelpTextsStealthy[]=
|
||||
L"+%d%s chance to move quietly\n",
|
||||
L"+%d%s stealth (being 'invisible' if unnoticed)\n",
|
||||
L"Reduced cover penalty for movement by %d%s\n",
|
||||
L"-%d%s chance to be interrupted\n", // TODO.Translate
|
||||
|
||||
};
|
||||
STR16 gzIMPMinorTraitsHelpTextsAthletics[]=
|
||||
|
||||
Reference in New Issue
Block a user