mirror of
https://github.com/1dot13/source.git
synced 2026-07-22 13:40:22 +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
86 lines
2.5 KiB
C
86 lines
2.5 KiB
C
#ifndef _SHOPKEEPER_QUOTES_H_
|
|
#define _SHOPKEEPER_QUOTES_H_
|
|
|
|
|
|
// COMMON shop keeper quote enums
|
|
enum
|
|
{
|
|
// Quotes 0-9 are generic NPC quotes common to everyone and controlled by the normal NPC Dialogue system.
|
|
//10
|
|
SK_QUOTES_DEALER_OFFERED_MONEY_AS_A_GIFT = 10,
|
|
SK_QUOTES_PLAYER_FIRST_ENTERS_SKI,
|
|
SK_QUOTES_RANDOM_QUOTE_WHILE_PLAYER_DECIDING_1,
|
|
SK_QUOTES_RANDOM_QUOTE_WHILE_PLAYER_DECIDING_2,
|
|
SK_QUOTES_RANDOM_QUOTE_WHILE_ITEMS_CHOSEN_TO_TRADE,
|
|
//15
|
|
SK_QUOTES_RANDOM_QUOTE_WHILE_ITEMS_CHOSEN_TO_SELL_OR_REPAIR,
|
|
SK_QUOTES_PLAYER_REQUESTED_EVALUATION,
|
|
SK_QUOTES_DURING_EVALUATION_STUFF_REJECTED,
|
|
SK_QUOTES_EVALUATION_RESULT_VALUE_OF_ZERO,
|
|
SK_QUOTES_EVALUATION_RESULT_SOME_REALLY_DAMAGED_ITEMS,
|
|
//20
|
|
SK_QUOTES_EVALUATION_RESULT_NORMAL,
|
|
SK_QUOTES_EVAULATION_PLAYER_DOESNT_HAVE_ENOUGH_VALUE,
|
|
SK_QUOTES_PLAYER_HAS_EXACTLY_ENOUGH_MONEY_FOR_TRANSACTION,
|
|
SK_QUOTES_PLAYER_HAS_TOO_MUCH_MONEY_FOR_TRANSACTION,
|
|
SK_QUOTES_PRESSES_DONE_HAS_AT_LEAST_1_TRANSACTION,
|
|
//25
|
|
SK_QUOTES_PRESSED_DONE_HASNT_MADE_TRANSACTION,
|
|
SK_QUOTES_PRESSED_DONE_STILL_HAS_STUFF_IN_OFFER_AREA,
|
|
SK_QUOTES_CANT_AFFORD_TO_BUY_OR_TOO_MUCH_TO_REPAIR,
|
|
|
|
#ifdef JA2UB
|
|
SK_QUOTES_BETTY_IS_ENEMY,
|
|
SK_QUOTES_NPC_HEALED_BY_PC,
|
|
|
|
//30 JA25 UB
|
|
SK_QUOTES_DEFAULT_WHEN_FIGHTING_NEARBY,
|
|
SK_QUOTES_FOLLOWS_QUOTE_1_POSITIVE,
|
|
SK_QUOTES_FOLLOWS_QUOTE_1_NEGATIVE,
|
|
SK_QUOTES_NPC_WANTS_TO_CLOSE_UP_SHOP,
|
|
SK_QUOTES_WHEN_PLAYER_BUYS_PORNO,
|
|
|
|
//35
|
|
SK_QUOTES_INTRO_TO_TEX,
|
|
SK_QUOTES_INTRO_TO_TEX_FOLLOW_UP_1,
|
|
SK_QUOTES_INTRO_TO_TEX_FOLLOW_UP_2,
|
|
SK_QUOTES_RANDOM_QUOTE_WHILE_PLAYER_DECIDING_3,
|
|
SK_QUOTES_RANDOM_QUOTE_WHILE_PLAYER_DECIDING_4,
|
|
|
|
//40
|
|
SK_QUOTES_NPC_SPECIFIC_40,
|
|
SK_QUOTES_NPC_SPECIFIC_41,
|
|
SK_QUOTES_NPC_SPECIFIC_42,
|
|
SK_QUOTES_NPC_SPECIFIC_43,
|
|
SK_QUOTES_NPC_SPECIFIC_44,
|
|
|
|
SK_QUOTES_NPC_SPECIFIC_45,
|
|
SK_QUOTES_NPC_SPECIFIC_46,
|
|
SK_QUOTES_NPC_SPECIFIC_47,
|
|
SK_QUOTES_NPC_SPECIFIC_48,
|
|
SK_QUOTES_NPC_SPECIFIC_49,
|
|
|
|
SK_QUOTES_NPC_SPECIFIC_50,
|
|
SK_QUOTES_NPC_SPECIFIC_51,
|
|
SK_QUOTES_NPC_SPECIFIC_52,
|
|
SK_QUOTES_NPC_SPECIFIC_53,
|
|
SK_QUOTES_NPC_SPECIFIC_54,
|
|
#endif
|
|
NUM_COMMON_SK_QUOTES,
|
|
|
|
// Quotes 28+ are NPC Specific, and are not under direct control of the SKI system. The get used by .COD files
|
|
};
|
|
|
|
|
|
// Common quotes needed by SKI
|
|
#define SK_QUOTES_NOT_INTERESTED_IN_THIS_ITEM 4
|
|
|
|
// NPC SPECIFIC shopkeeper_quotes
|
|
|
|
#define FREDO_QUOTE_CAN_RESET_IMPRINTING 31
|
|
|
|
#define FREDO_PERKO_SORRY_REPAIR_DELAYED 29
|
|
|
|
#define ARNIE_QUOTE_NOT_REPAIRED_YET 33
|
|
|
|
#endif |