mirror of
https://github.com/1dot13/source.git
synced 2026-09-02 14:36:06 +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
+39
-2
@@ -9,7 +9,8 @@
|
||||
#define QUESTINPROGRESS 1
|
||||
#define QUESTDONE 2
|
||||
|
||||
#define MAX_QUESTS 30
|
||||
#define MAX_QUESTS 255
|
||||
#define MAX_OLD_QUESTS 30
|
||||
#define MAX_FACTS 65536
|
||||
#define NUM_FACTS 500 //If you increase this number, add entries to the fact text list in QuestText.c
|
||||
|
||||
@@ -67,7 +68,15 @@ enum Quests
|
||||
QUEST_FREE_CHILDREN, // 20
|
||||
QUEST_LEATHER_SHOP_DREAM,
|
||||
|
||||
#ifdef JA2UB
|
||||
QUEST_DESTROY_MISSLES = 23,
|
||||
QUEST_FIX_LAPTOP,
|
||||
QUEST_GET_RID_BLOODCATS_AT_BETTYS,
|
||||
QUEST_FIND_ANTIQUE_MUSKET_FOR_RAUL,
|
||||
#else
|
||||
QUEST_KILL_DEIDRANNA = 25
|
||||
|
||||
#endif
|
||||
} ;
|
||||
/*
|
||||
// The first quest is mandatory. Player must find Miguel and deliver letter to him. The tough
|
||||
@@ -518,6 +527,34 @@ enum Facts
|
||||
FACT_PLAYER_KILLED_BOXERS = 368,
|
||||
// HEADROCK HAM 4: Seen Mobile Militia screen after having at least one mobile unit?
|
||||
FACT_MOBILE_RESTRICTIONS_VIEWED = 369,
|
||||
#ifdef JA2UB
|
||||
//Ja25 UB
|
||||
FACT_IMPORTED_SAVE_AND_MARY_WAS_DEAD = 400,
|
||||
FACT_JOHN_KULBA_OFFERED_TO_BE_RECRUITED,// 401,
|
||||
FACT_TEX_IS_IN_GAME_AND_ALIVE_IN_STORE,// 402,
|
||||
FACT_PLAYER_PAID_BETTY_MORE_THEN_X_FOR_ITEM = 403,
|
||||
FACT_PLAYER_BOUGHT_A_TEX_VIDEO_FROM_BETTY,// 404,
|
||||
FACT_RAULS_INVENTORY_CHANGED_SINCE_LAST_VISIT,// 405
|
||||
FACT_PLAYER_THREATENED_RAUL_COUPLE_TIMES,// 406
|
||||
FACT_PLAYER_BOUGHT_SOMETHING_FROM_RAUL,// 407
|
||||
// FACT_SKYRIDER_IN_C16,// 408
|
||||
// FACT_SKYRIDER_IN_C16,// 409
|
||||
// FACT_SKYRIDER_IN_C16,// 410
|
||||
// FACT_SKYRIDER_IN_C16,// 411
|
||||
FACT_PLAYER_BOUGHT_BARRET_FROM_RAUL = 412,
|
||||
FACT_MERC_SAY_QUOTE_WHEN_TALK_MENU_CLOSES,// 413
|
||||
FACT_PLAYER_IMPORTED_SAVE_MIGUEL_DEAD,// 414
|
||||
FACT_PLAYER_IMPORTED_SAVE_FATIMA_OR_PACOS_DEAD,// 415
|
||||
FACT_PLAYER_IMPORTED_SAVE_CARLOS_DEAD,// 416
|
||||
FACT_PLAYER_IMPORTED_SAVE_IRA_DEAD,// 417
|
||||
FACT_PLAYER_IMPORTED_SAVE_DIMITRI_DEAD,// 418
|
||||
FACT_PLAYER_IMPORTED_SAVE,// 419
|
||||
FACT_PLAYER_KILLED_ALL_BETTYS_BLOODCATS,// 420
|
||||
FACT_BIGGENS_IS_ON_TEAM,// 421
|
||||
FACT_FAN_STOPPPED,// 422
|
||||
FACT_BIGGENS_ON_TEAM_AND_FAN_STOPPED,// 423
|
||||
FACT_PLAYER_KNOWS_ABOUT_FAN_STOPPING,// 424
|
||||
#endif
|
||||
} ;
|
||||
//** END FACTS *************************
|
||||
|
||||
@@ -562,7 +599,7 @@ extern void CheckForQuests( UINT32 uiDay );
|
||||
|
||||
void InitQuestEngine();
|
||||
|
||||
BOOLEAN LoadQuestInfoFromSavedGameFile( HWFILE hFile );
|
||||
BOOLEAN LoadQuestInfoFromSavedGameFile( HWFILE hFile, UINT8 MaxQuest );
|
||||
BOOLEAN SaveQuestInfoToSavedGameFile( HWFILE hFile );
|
||||
|
||||
// added by SANDRO
|
||||
|
||||
Reference in New Issue
Block a user