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
173 lines
2.5 KiB
C
173 lines
2.5 KiB
C
#ifndef WORLD_TILESET_NUMS_H
|
|
#define WORLD_TILESET_NUMS_H
|
|
|
|
// Snap: NUM_TILESETS no longer limits the number of tilesets.
|
|
// See gubNumSets in WorldDat.cpp
|
|
|
|
#ifdef JA2UBMAPS
|
|
enum
|
|
{
|
|
TLS_GENERIC_1,
|
|
TLS_CAVES_1,
|
|
TLS_DESERT_1,
|
|
TLS_LUSH_1,
|
|
TLS_TROPICAL_1,
|
|
TLS_MOUNTAIN_1,
|
|
TLS_COASTAL_1, //7
|
|
TLS_SWAMP_1,
|
|
TLS_FARM_1,
|
|
TLS_OMERTA_1,
|
|
|
|
TLS_GENERIC_2,
|
|
TLS_FARM_2,
|
|
TLS_PRISON,
|
|
TLS_HOSPITAL,
|
|
TLS_TEMP_,
|
|
TLS_BURNT_TREES,
|
|
TLS_LAWLESS_1,
|
|
TLS_AIRSTRIP,
|
|
TLS_LAWLESS_2,
|
|
TLS_DEAD_AIRSTRIP,
|
|
|
|
TEMP_1,
|
|
TEMP_2,
|
|
TEMP_3,
|
|
TEMP_4,
|
|
TEMP_5,
|
|
TEMP_6,
|
|
TEMP_7,
|
|
TEMP_8,
|
|
TEMP_9,
|
|
TEMP_10,
|
|
|
|
TEMP_11,
|
|
TEMP_12,
|
|
TEMP_13,
|
|
TEMP_14,
|
|
TEMP_15,
|
|
TEMP_16,
|
|
TEMP_17,
|
|
TEMP_18,
|
|
TEMP_19,
|
|
TEMP_20,
|
|
|
|
TEMP_21,
|
|
TEMP_22,
|
|
TEMP_23,
|
|
TEMP_24,
|
|
TEMP_25,
|
|
TEMP_26,
|
|
TEMP_27,
|
|
TEMP_28,
|
|
TEMP_29,
|
|
TEMP_30,
|
|
|
|
DEFAULT_JA25_TILESET,
|
|
TEMP_32,
|
|
TEMP_33,
|
|
TEMP_34,
|
|
TEMP_35,
|
|
TEMP_36,
|
|
TEMP_37,
|
|
TEMP_38,
|
|
TEMP_39,
|
|
TEMP_40,
|
|
|
|
TEMP_41,
|
|
TEMP_42,
|
|
TEMP_43,
|
|
TEMP_44,
|
|
TEMP_45,
|
|
TEMP_46,
|
|
TEMP_47,
|
|
TEMP_48,
|
|
TEMP_49,
|
|
TEMP_50,
|
|
|
|
NUM_TILESETS
|
|
};
|
|
#else
|
|
enum
|
|
{
|
|
TLS_GENERIC_1, // 0, JA2 default
|
|
TLS_CAVES_1,
|
|
TLS_DESERT_1,
|
|
TLS_LUSH_1,
|
|
TLS_TROPICAL_1,
|
|
TLS_MOUNTAINS_1,
|
|
TLS_COASTAL_1,
|
|
TLS_SWAMP_1,
|
|
TLS_FARM_1,
|
|
TLS_OMERTA,
|
|
|
|
TLS_GENERIC_2, // 10
|
|
TLS_FARM_2,
|
|
TLS_PRISON,
|
|
TLS_HOSPITAL,
|
|
TLS_DEMO_BASEMENT,
|
|
TLS_BURNT_TREES,
|
|
TLS_LAWLESS_1,
|
|
TLS_AIRSTRIP,
|
|
TLS_LAWLESS_2,
|
|
TLS_DEAD_AIRSTRIP,
|
|
|
|
TLS_BASEMENT, // 20
|
|
TLS_LAWLESS_3,
|
|
TLS_PRISON_DUNGEON,
|
|
TLS_ACTIVE_DRASSEN,
|
|
TLS_SAM_SITES,
|
|
TLS_LUSH_2,
|
|
TLS_MILITARY_BASE,
|
|
TLS_MILITARY_JAIL,
|
|
TLS_MILITARY_WAREHOUSE,
|
|
TLS_MILITARY_TOWN,
|
|
|
|
TLS_OLD_SCHOOL, // 30
|
|
TLS_CAMBRIA_STRIP,
|
|
TLS_CAMBRIA_HOMES,
|
|
TLS_PALACE,
|
|
TLS_TROPICAL_SAM,
|
|
TLS_GRUMM_1,
|
|
TLS_GRUMM_2,
|
|
TLS_BALIME,
|
|
TLS_BALIME_MUSEUM,
|
|
TLS_DESERT_SAM,
|
|
|
|
TLS_ORTA, // 40
|
|
TLS_ORTA_WEAPONS,
|
|
TLS_SWAMP_BARETREES,
|
|
TLS_ESTONI,
|
|
TLS_QUEENS_PRISON,
|
|
TLS_QUEENS_TROPICAL,
|
|
TLS_MEDUNA_INNER_TOWN,
|
|
TLS_QUEENS_SAM,
|
|
TLS_QUEENS_AIRPORT,
|
|
TLS_DEMO_TILESET,
|
|
|
|
TLS_HEAVY_SNOW, // 50, JA2.5 default
|
|
TLS_MIXED_SNOW,
|
|
TLS_GRASS_SNOW,
|
|
TLS_FALL_TOWN,
|
|
TLS_MINING_TOWN,
|
|
TLS_POWER_PLANT,
|
|
TLS_SEWERS,
|
|
TLS_UNDERGROUND_COMPLEX,
|
|
TLS_UPPER_COMPLEX,
|
|
TLS_LOWEST_LEVEL_COMPLEX,
|
|
|
|
TILESET_60, // 60
|
|
TILESET_61,
|
|
TILESET_62,
|
|
TILESET_63,
|
|
TILESET_64,
|
|
TILESET_65,
|
|
TILESET_66,
|
|
TILESET_67,
|
|
TILESET_68,
|
|
TILESET_69,
|
|
|
|
NUM_TILESETS // 70
|
|
};
|
|
#endif
|
|
|
|
#endif |