mirror of
https://github.com/1dot13/source.git
synced 2026-08-26 14:30:26 +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:
Wanne
+43
-2
@@ -3,6 +3,12 @@
|
||||
|
||||
#include "Types.h"
|
||||
|
||||
#ifdef JA2UB
|
||||
#define GAME_INI_FILE "Ja2_UB.ini"
|
||||
#else
|
||||
#define GAME_INI_FILE "Ja2.ini"
|
||||
#endif
|
||||
|
||||
|
||||
//If you add any options, MAKE sure you add the corresponding string to the Options Screen string array.
|
||||
// look up : zOptionsScreenHelpText , zOptionsToggleText
|
||||
@@ -125,9 +131,17 @@ typedef struct
|
||||
|
||||
BOOLEAN fHideHelpInAllScreens; // Controls Help "do not show help again" checkbox
|
||||
|
||||
#ifdef JA2UB
|
||||
//JA25UB
|
||||
BOOLEAN fPlayerFinishedTheGame;
|
||||
#endif
|
||||
|
||||
UINT8 ubSizeOfDisplayCover; // The number of grids the player designates thru "Delete + '=' or '-'"
|
||||
UINT8 ubSizeOfLOS; // The number of grids the player designates thru "End + '=' or '-'"
|
||||
|
||||
// The number of grids the player designates thru "End + '=' or '-'"
|
||||
#ifdef JA2UB
|
||||
UINT8 ubFiller[17];
|
||||
#endif
|
||||
} GAME_SETTINGS;
|
||||
|
||||
// CHRISL: New Enums to track inventory system
|
||||
@@ -192,6 +206,7 @@ typedef struct
|
||||
UINT8 ubBobbyRay;
|
||||
UINT8 ubInventorySystem;
|
||||
UINT8 ubAttachmentSystem;
|
||||
UINT8 ubSquadSize;
|
||||
// SANDRO - added variables
|
||||
UINT8 ubMaxIMPCharacters;
|
||||
BOOLEAN fNewTraitSystem;
|
||||
@@ -199,7 +214,8 @@ typedef struct
|
||||
BOOLEAN fEnemiesDropAllItems;
|
||||
UINT8 ubProgressSpeedOfItemsChoices;
|
||||
BOOLEAN fEnableAllWeaponCaches;
|
||||
//UINT8 ubFiller[];
|
||||
|
||||
UINT8 ubFiller[500]; // WANNE: Decrease this filler by 1, for each new UINT8 variable!
|
||||
|
||||
} GAME_OPTIONS;
|
||||
|
||||
@@ -302,7 +318,16 @@ typedef struct
|
||||
BOOLEAN fCamoRemoving;
|
||||
BOOLEAN fEnhancedCloseCombatSystem;
|
||||
|
||||
BOOLEAN fImprovedInterruptSystem;
|
||||
UINT8 ubBasicPercentRegisterValueIIS;
|
||||
UINT8 ubPercentRegisterValuePerLevelIIS;
|
||||
UINT8 ubBasicReactionTimeLengthIIS;
|
||||
BOOLEAN fAllowCollectiveInterrupts;
|
||||
BOOLEAN fAllowInstantInterruptsOnSight;
|
||||
|
||||
UINT16 usAwardSpecialExpForQuests;
|
||||
|
||||
BOOLEAN fAllowWalkingWithWeaponRaised;
|
||||
////////////////////////////////////
|
||||
|
||||
// Kaiden: Vehicle Inventory change - Added for INI Option
|
||||
@@ -997,6 +1022,10 @@ typedef struct
|
||||
|
||||
BOOLEAN fShowCamouflageFaces;
|
||||
|
||||
BOOLEAN fHideEnemyHealthText;
|
||||
|
||||
UINT8 ubEnemyHitCount;
|
||||
|
||||
FLOAT gMercLevelUpSalaryIncreasePercentage;
|
||||
|
||||
UINT8 ubChanceTonyAvailable; // silversurfer/SANDRO
|
||||
@@ -1005,6 +1034,11 @@ typedef struct
|
||||
|
||||
INT32 iInitialMercArrivalLocation;
|
||||
|
||||
BOOLEAN gBriefingRoom;
|
||||
BOOLEAN gEncyclopedia;
|
||||
|
||||
|
||||
|
||||
} GAME_EXTERNAL_OPTIONS;
|
||||
|
||||
typedef struct
|
||||
@@ -1012,6 +1046,10 @@ typedef struct
|
||||
UINT8 ubMaxNumberOfTraits;
|
||||
UINT8 ubNumberOfMajorTraitsAllowed;
|
||||
|
||||
BOOLEAN fAllowDrQTraitsException;
|
||||
|
||||
BOOLEAN fAllowAttributePrereq;
|
||||
|
||||
// GENERIC SETTINGS
|
||||
INT8 bCtHModifierAssaultRifles;
|
||||
INT8 bCtHModifierSniperRifles;
|
||||
@@ -1120,6 +1158,7 @@ typedef struct
|
||||
UINT8 ubMAAPsChangeStanceReduction;
|
||||
UINT8 ubMAApsTurnAroundReduction;
|
||||
UINT8 ubMAAPsClimbOrJumpReduction;
|
||||
UINT8 ubMAReducedAPsRegisteredWhenMoving;
|
||||
UINT8 ubMAChanceToCkickDoors;
|
||||
BOOLEAN fPermitExtraAnimationsOnlyToMA;
|
||||
|
||||
@@ -1130,6 +1169,7 @@ typedef struct
|
||||
UINT8 ubSLBonusAPsPercent;
|
||||
UINT8 ubSLEffectiveLevelInRadius;
|
||||
UINT8 ubSLEffectiveLevelAsStandby;
|
||||
UINT8 ubSLCollectiveInterruptsBonus;
|
||||
UINT8 ubSLOverallSuppresionBonusPercent;
|
||||
UINT8 ubSLMoraleGainBonus;
|
||||
UINT8 ubSLMoraleLossReduction;
|
||||
@@ -1208,6 +1248,7 @@ typedef struct
|
||||
UINT8 ubSTStealthModeSpeedBonus;
|
||||
UINT8 ubSTBonusToMoveQuietly;
|
||||
UINT8 ubSTStealthBonus;
|
||||
UINT8 ubSTReducedAPsRegistered;
|
||||
UINT8 ubSTStealthPenaltyForMovingReduction;
|
||||
|
||||
// ATHLETICS
|
||||
|
||||
Reference in New Issue
Block a user