mirror of
https://github.com/1dot13/source.git
synced 2026-08-05 14:00:23 +02:00
Wanne
e64d5a2fa6
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
106 lines
2.6 KiB
C
106 lines
2.6 KiB
C
#ifndef __CIV_QUOTES_H
|
|
#define __CIV_QUOTES_H
|
|
|
|
#include "Soldier Control.h"
|
|
|
|
#define CIV_TYPE_NA 0
|
|
#define CIV_TYPE_ADULT 1
|
|
#define CIV_TYPE_KID 2
|
|
#define CIV_TYPE_MARRIED_PC 3
|
|
#define CIV_TYPE_ENEMY 4
|
|
|
|
enum
|
|
{
|
|
CIV_QUOTE_ADULTS_BEGGING, //CIV00.EDT
|
|
CIV_QUOTE_KIDS_BEGGING,
|
|
CIV_QUOTE_ADULTS_RECENT_BUG_ATTACK,
|
|
CIV_QUOTE_KIDS_RECENT_BUG_ATTACK,
|
|
CIV_QUOTE_ADULTS_BUG_EXTERMINATED_X_TIME,
|
|
CIV_QUOTE_KIDS_BUG_EXTERMINATED_X_TIME,
|
|
CIV_QUOTE_ADULTS_EXTREMLY_LOW_LOYALTY,
|
|
CIV_QUOTE_KIDS_EXTREMLY_LOW_LOYALTY,
|
|
CIV_QUOTE_ADULTS_HIGH_LOYALTY,
|
|
CIV_QUOTE_KIDS_HIGH_LOYALTY,
|
|
|
|
CIV_QUOTE_ADULTS_ALL_PURPOSE, //CIV10.EDT
|
|
CIV_QUOTE_KIDS_ALL_PURPOSE,
|
|
CIV_QUOTE_ADULTS_LIBREATED_FIRST_TIME,
|
|
CIV_QUOTE_KIDS_LIBREATED_FIRST_TIME,
|
|
CIV_QUOTE_ADULTS_TOWN_TAKEN_BACK,
|
|
CIV_QUOTE_KIDS_TOWN_TAKEN_BACK,
|
|
CIV_QUOTE_HICKS_FRIENDLY,
|
|
CIV_QUOTE_HICKS_ENEMIES,
|
|
CIV_QUOTE_GOONS_FRIENDLY,
|
|
CIV_QUOTE_GOONS_ENEMIES,
|
|
|
|
CIV_QUOTE_ADULTS_REBELS, //CIV20.EDT
|
|
CIV_QUOTE_KIDS_REBELS,
|
|
CIV_QUOTE_GREEN_MILITIA,
|
|
CIV_QUOTE_MEDIUM_MILITIA,
|
|
CIV_QUOTE_ELITE_MILITIA,
|
|
CIV_QUOTE_SAN_MONA_BEGGERS,
|
|
CIV_QUOTE_ENEMY_HURT,
|
|
CIV_QUOTE_ENEMY_ADMIN,
|
|
CIV_QUOTE_ENEMY_THREAT,
|
|
CIV_QUOTE_ENEMY_ELITE,
|
|
|
|
CIV_QUOTE_ADULTS_COWER, //CIV30.EDT
|
|
CIV_QUOTE_KIDS_COWER,
|
|
CIV_QUOTE_PC_MARRIED,
|
|
CIV_QUOTE_KID_SLAVES,
|
|
CIV_QUOTE_KID_SLAVES_FREE,
|
|
CIV_QUOTE_MINERS_NOT_FOR_PLAYER,
|
|
CIV_QUOTE_MINERS_FOR_PLAYER,
|
|
CIV_QUOTE_ENEMY_OFFER_SURRENDER,
|
|
CIV_QUOTE_HICKS_SEE_US_AT_NIGHT,
|
|
CIV_QUOTE_DEIDRANNA_DEAD,
|
|
#ifdef JA2UB
|
|
//40
|
|
CIV_QUOTE__CIV_ENEMY_CAN_FIGHT,
|
|
CIV_QUOTE__CIV_ENEMY_GENERIC,
|
|
CIV_QUOTE__CIV_HURT,
|
|
CIV_QUOTE__CIV_NOT_ENEMY,
|
|
CIV_QUOTE_44,
|
|
CIV_QUOTE_45,
|
|
CIV_QUOTE_46,
|
|
CIV_QUOTE_47,
|
|
CIV_QUOTE_48,
|
|
CIV_QUOTE_49,
|
|
|
|
CIV_QUOTE_NEW = CIV_QUOTE_DEIDRANNA_DEAD + 990, // 500 reserved
|
|
#else
|
|
CIV_QUOTE_NEW = CIV_QUOTE_DEIDRANNA_DEAD + 1000, // 500 reserved
|
|
#endif
|
|
NUM_CIV_QUOTES
|
|
};
|
|
|
|
enum //enemy taunts - SANDRO
|
|
{
|
|
TAUNT_FIRE_GUN,
|
|
TAUNT_FIRE_LAUNCHER,
|
|
TAUNT_THROW,
|
|
TAUNT_CHARGE_KNIFE,
|
|
TAUNT_RUN_AWAY,
|
|
TAUNT_SEEK_NOISE,
|
|
TAUNT_ALERT,
|
|
TAUNT_GOT_HIT
|
|
};
|
|
|
|
void StartEnemyTaunt( SOLDIERTYPE *pCiv, INT8 iTauntType ); //enemy taunts - SANDRO
|
|
|
|
void InitCivQuoteSystem( );
|
|
|
|
void StartCivQuote( SOLDIERTYPE *pCiv );
|
|
|
|
INT8 GetCivType( SOLDIERTYPE *pCiv );
|
|
|
|
void HandleCivQuote( );
|
|
|
|
BOOLEAN SaveCivQuotesToSaveGameFile( HWFILE hFile );
|
|
BOOLEAN LoadCivQuotesFromLoadGameFile( HWFILE hFile );
|
|
|
|
BOOLEAN ShutDownQuoteBoxIfActive( );
|
|
|
|
void BeginCivQuote( SOLDIERTYPE *pCiv, UINT16 ubCivQuoteID, UINT16 ubEntryID, INT16 sX, INT16 sY );
|
|
|
|
#endif |