mirror of
https://github.com/1dot13/source.git
synced 2026-09-16 14:47:17 +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
@@ -0,0 +1,225 @@
|
||||
#ifndef __ENCYCLOPEDIA_H
|
||||
#define __ENCYCLOPEDIA_H
|
||||
|
||||
#include "Cursors.h"
|
||||
#include "soldier profile type.h"
|
||||
#include "Quests.h"
|
||||
enum
|
||||
{
|
||||
ENCYCLOPEDIA_SLOGAN,
|
||||
ENCYCLOPEDIA_WARNING_1,
|
||||
ENCYCLOPEDIA_WARNING_2,
|
||||
ENCYCLOPEDIA_COPYRIGHT_1,
|
||||
ENCYCLOPEDIA_COPYRIGHT_2,
|
||||
ENCYCLOPEDIA_COPYRIGHT_3
|
||||
};
|
||||
|
||||
void GameInitEncyclopedia();
|
||||
BOOLEAN EnterEncyclopedia();
|
||||
void ExitEncyclopedia();
|
||||
void HandleEncyclopedia();
|
||||
void RenderEncyclopedia();
|
||||
|
||||
BOOLEAN RemoveEncyclopediaDefaults();
|
||||
BOOLEAN InitEncyclopediaDefaults();
|
||||
BOOLEAN DrawEncyclopediaDefaults();
|
||||
|
||||
BOOLEAN DisplayEncyclopediaSlogan();
|
||||
BOOLEAN DisplayEncyclopediaCopyright();
|
||||
|
||||
#define ENCYCLOPEDIA_DECRIPTION_SIZE 1120
|
||||
#define ENCYCLOPEDIA_NAME_SIZE 160
|
||||
#define NUM_SECTOR 4*255
|
||||
#define MAX_ENCYCLOPEDIA_CHARS 500
|
||||
|
||||
#define NUM_MAX_TEMP 10000
|
||||
|
||||
#define TEXT_NUM_ENC TEXT_NUM_ENCYCLOPEDIA_HELP_TEXT
|
||||
|
||||
enum
|
||||
{
|
||||
//Locations
|
||||
NONE_NONE = 0,
|
||||
LOCATION_CITIES,
|
||||
LOCATION_SAM,
|
||||
LOCATION_OTHER,
|
||||
LOCATION_MINES,
|
||||
LOCATION_MILITARY,
|
||||
LOCATION_LABORATORY,
|
||||
LOCATION_FACTORY,
|
||||
LOCATION_HOSPITAL,
|
||||
LOCATION_PRISON,
|
||||
LOCATION_AIRPORT,
|
||||
|
||||
TEXT_NUM_ENCYCLOPEDIA_HELP_TEXT
|
||||
};
|
||||
|
||||
//Profiles
|
||||
enum
|
||||
{
|
||||
|
||||
PROFIL = 0,
|
||||
PROFIL_AIM,
|
||||
PROFIL_MERC,
|
||||
PROFIL_RPC,
|
||||
PROFIL_NPC,
|
||||
PROFIL_VEHICLES,
|
||||
PROFIL_IMP,
|
||||
};
|
||||
|
||||
//SubGroup
|
||||
enum
|
||||
{
|
||||
PROFIL_NONE = 0,
|
||||
PROFIL_EPC = 1,
|
||||
// PROFIL_TERRORIS,
|
||||
// PROFIL_DEIDRANNA_SOLDIER,
|
||||
// PROFIL_HICK,
|
||||
// PROFIL_KINGPIN,
|
||||
// PROFIL_KINGPIN,
|
||||
};
|
||||
|
||||
|
||||
typedef struct
|
||||
{
|
||||
//Profiles/Locations
|
||||
UINT32 uiIndex;
|
||||
CHAR8 szFile[MAX_ENCYCLOPEDIA_CHARS];
|
||||
CHAR8 szFile2[MAX_ENCYCLOPEDIA_CHARS];
|
||||
CHAR8 szFile3[MAX_ENCYCLOPEDIA_CHARS];
|
||||
CHAR8 szFile4[MAX_ENCYCLOPEDIA_CHARS];
|
||||
|
||||
CHAR16 Name[ENCYCLOPEDIA_NAME_SIZE];
|
||||
|
||||
CHAR16 sDesc1[ENCYCLOPEDIA_DECRIPTION_SIZE];
|
||||
CHAR16 sDesc2[ENCYCLOPEDIA_DECRIPTION_SIZE];
|
||||
CHAR16 sDesc3[ENCYCLOPEDIA_DECRIPTION_SIZE];
|
||||
CHAR16 sDesc4[ENCYCLOPEDIA_DECRIPTION_SIZE];
|
||||
CHAR16 sDesc5[ENCYCLOPEDIA_DECRIPTION_SIZE];
|
||||
CHAR16 sDesc6[ENCYCLOPEDIA_DECRIPTION_SIZE];
|
||||
CHAR16 sDesc7[ENCYCLOPEDIA_DECRIPTION_SIZE];
|
||||
CHAR16 sDesc8[ENCYCLOPEDIA_DECRIPTION_SIZE];
|
||||
CHAR16 sDesc9[ENCYCLOPEDIA_DECRIPTION_SIZE];
|
||||
CHAR16 sDesc10[ENCYCLOPEDIA_DECRIPTION_SIZE];
|
||||
CHAR16 sDesc11[ENCYCLOPEDIA_DECRIPTION_SIZE];
|
||||
CHAR16 sDesc12[ENCYCLOPEDIA_DECRIPTION_SIZE];
|
||||
CHAR16 sDesc13[ENCYCLOPEDIA_DECRIPTION_SIZE];
|
||||
CHAR16 sDesc14[ENCYCLOPEDIA_DECRIPTION_SIZE];
|
||||
CHAR16 sDesc15[ENCYCLOPEDIA_DECRIPTION_SIZE];
|
||||
CHAR16 sDesc16[ENCYCLOPEDIA_DECRIPTION_SIZE];
|
||||
CHAR16 sDesc17[ENCYCLOPEDIA_DECRIPTION_SIZE];
|
||||
CHAR16 sDesc18[ENCYCLOPEDIA_DECRIPTION_SIZE];
|
||||
CHAR16 sDesc19[ENCYCLOPEDIA_DECRIPTION_SIZE];
|
||||
CHAR16 sDesc20[ENCYCLOPEDIA_DECRIPTION_SIZE];
|
||||
|
||||
BOOLEAN Hidden;
|
||||
|
||||
CHAR16 sImageDesc1[150];
|
||||
CHAR16 sImageDesc2[150];
|
||||
CHAR16 sImageDesc3[150];
|
||||
CHAR16 sImageDesc4[150];
|
||||
|
||||
|
||||
UINT32 sImagePositionX[4];
|
||||
UINT32 sImagePositionY[4];
|
||||
/*
|
||||
UINT32 sImagePosition1X;
|
||||
UINT32 sImagePosition1Y;
|
||||
UINT32 sImagePosition2X;
|
||||
UINT32 sImagePosition2Y;
|
||||
UINT32 sImagePosition3X;
|
||||
UINT32 sImagePosition3Y;
|
||||
UINT32 sImagePosition4X;
|
||||
UINT32 sImagePosition4Y;
|
||||
*/
|
||||
|
||||
UINT32 MaxPages;
|
||||
INT32 MaxImages;
|
||||
|
||||
//Only locations
|
||||
INT32 LocType;
|
||||
INT16 SectorX;
|
||||
INT16 SectorY;
|
||||
INT16 SectorZ;
|
||||
|
||||
//Only profiles
|
||||
INT32 IDProfile;
|
||||
INT32 subGroup1;
|
||||
INT32 subCivGroup;
|
||||
|
||||
INT32 InventoryClass;
|
||||
|
||||
BOOLEAN Filtr;
|
||||
|
||||
BOOLEAN enableDesc;
|
||||
|
||||
BOOLEAN bvisible;
|
||||
|
||||
CHAR16 sCode[150];
|
||||
|
||||
CHAR8 sSounds[MAX_ENCYCLOPEDIA_CHARS];
|
||||
|
||||
//Quests
|
||||
INT32 QuestID;
|
||||
INT32 pQuests;
|
||||
BOOLEAN SpecialQuestImage;
|
||||
CHAR8 BeforeImage[MAX_ENCYCLOPEDIA_CHARS];
|
||||
CHAR8 AfterImage[MAX_ENCYCLOPEDIA_CHARS];
|
||||
UINT32 ImagePositionQX[10];
|
||||
UINT32 ImagePositionQY[10];
|
||||
CHAR16 ImageDescBefore[150];
|
||||
CHAR16 ImageDescAfter[150];
|
||||
|
||||
INT32 NextMission;
|
||||
UINT32 MissionID;
|
||||
INT32 CheckMission;
|
||||
|
||||
//Inventory
|
||||
|
||||
} ENCYCLOPEDIA_LOCATION;
|
||||
|
||||
#define MAX_IMAGES 4
|
||||
#define MAX_PAGES 4
|
||||
|
||||
#define MISSIONNOSTARTED 0
|
||||
#define MISSIONSTART 1
|
||||
#define MISSIONEND 2
|
||||
|
||||
extern ENCYCLOPEDIA_LOCATION gEncyclopediaLocationData[ NUM_SECTOR ];
|
||||
extern ENCYCLOPEDIA_LOCATION gEncyclopediaProfilesData[ NUM_PROFILES ];
|
||||
extern ENCYCLOPEDIA_LOCATION gEncyclopediaDataTemp[ NUM_MAX_TEMP ];
|
||||
extern ENCYCLOPEDIA_LOCATION gEncyclopediaInventoryData[ MAXITEMS ];
|
||||
extern ENCYCLOPEDIA_LOCATION gEncyclopediaOldProfilesData[ NUM_PROFILES ];
|
||||
extern ENCYCLOPEDIA_LOCATION gEncyclopediaQuestsData[ MAX_QUESTS ];
|
||||
|
||||
extern ENCYCLOPEDIA_LOCATION gBriefingRoomData[ NUM_SECTOR ];
|
||||
extern ENCYCLOPEDIA_LOCATION gBriefingRoomSpecialMissionData[ NUM_SECTOR ];
|
||||
|
||||
|
||||
typedef struct
|
||||
{
|
||||
UINT32 uiIndex;
|
||||
BOOLEAN Hidden;
|
||||
BOOLEAN bvisible;
|
||||
} ENCYCLOPEDIA_PROF_SAVE;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
UINT32 uiIndex;
|
||||
BOOLEAN Hidden;
|
||||
INT32 CheckMission;
|
||||
} MISSION_SAVE;
|
||||
|
||||
//extern MISSION_SAVE saveMissionData[ NUM_SECTOR ];
|
||||
|
||||
extern BOOLEAN saveEncyclopediaLocationData[ NUM_SECTOR ];
|
||||
extern ENCYCLOPEDIA_PROF_SAVE saveEncyclopediaProfilesData[ NUM_PROFILES ];
|
||||
extern BOOLEAN saveEncyclopediaInventoryData[ MAXITEMS ];
|
||||
extern BOOLEAN saveEncyclopediaOldProfilesData[ NUM_PROFILES ];
|
||||
extern BOOLEAN saveEncyclopediaQuestsData[ MAX_QUESTS ];
|
||||
extern MISSION_SAVE saveBriefingRoomData[ NUM_SECTOR ];
|
||||
extern MISSION_SAVE saveBriefingRoomSpecialMissionData[ NUM_SECTOR ];
|
||||
|
||||
extern void InitEncyklopediaBool();
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user