1dot13/gamedir
1
0
Fork 0
mirror of https://github.com/1dot13/gamedir.git synced 2026-07-22 13:40:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

****************************************************************************************

Browse Source 
** Merged (English) GameDir files from Development trunk, for the Spring 2011 Release **
****************************************************************************************
o Development Trunk (Revision: 4444):  https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1288 4f8fa57e-7814-0410-bad4-adc449f26b7c
This commit is contained in:
Wanne
2011-05-26 10:54:58 +00:00
parent 432bd657bf
commit 7e5ba8bd71
59 changed files with 71197 additions and 12666 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Data/Scripts/GameInit.lua
+5 -4
View File
@@ -78,11 +78,12 @@ http://www.legion.zone.zg.pl/doku.php/modowanie/ja/art_ja_m_22_lua
iMessageLength - record from email.edt
ubSender - uiIndex from SenderNameList.xml
- AddEmail (iMessageOffset, iMessageLength, ubSender, iCurrentIMPPosition)
- AddEmail (iMessageOffset, iMessageLength, ubSender, iCurrentIMPPosition, iCurrentShipmentDestinationID)
iMessageOffset - record from email.edt
iMessageLength - record from email.edt
ubSender - uiIndex from SenderNameList.xml
iCurrentIMPPosition - -1
iCurrentIMPPosition - Default = -1, or the profile ID of the IMP
iCurrentShipmentDestinationID - Default = -1, or the Bobby Ray shipment destination ID
**************
@@ -501,10 +502,10 @@ function InitNewGame()
AddPreReadEmail(RIS_REPORT,RIS_REPORT_LENGTH,Sender.RIS_EMAIL)
AddPreReadEmail(OLD_ENRICO_3,OLD_ENRICO_3_LENGTH,Sender.MAIL_ENRICO )
AddEmail (IMP_EMAIL_INTRO, IMP_EMAIL_INTRO_LENGTH, Sender.CHAR_PROFILE_SITE, -1)
AddEmail (IMP_EMAIL_INTRO, IMP_EMAIL_INTRO_LENGTH, Sender.CHAR_PROFILE_SITE, -1, -1)
if( iniMERC_WEBSITE_IMMEDIATELY_AVAILABLE == true ) then
AddEmail (MERC_INTRO, MERC_INTRO_LENGTH, Sender.SPECK_FROM_MERC, -1)
AddEmail (MERC_INTRO, MERC_INTRO_LENGTH, Sender.SPECK_FROM_MERC, -1, -1)
end
end
Data/Scripts/Overhead.lua
+1 -1
View File
@@ -238,7 +238,7 @@ function HandleAtNewGridNo( ProfileId )
ActionStopMerc(Profil.SKYRIDER)
SetFactTrue( Facts.FACT_SKYRIDER_CLOSE_TO_CHOPPER )
TriggerNPCRecord( Profil.SKYRIDER, 15 )
SetUpHelicopterForPlayer( 13, SectorY.MAP_ROW_B )
SetUpHelicopterForPlayer( 13, SectorY.MAP_ROW_B, Profil.SKYRIDER )
elseif ( ProfileIdsSectorX == 13 and ProfileIdsSectorY == SectorY.MAP_ROW_B and ProfileIdbSectorZ == 0 ) then
Data/Scripts/StrategicEventHandler.lua
+9 -9
View File
@@ -294,13 +294,13 @@ Facts =
Flags2 =
{
PROFILE_MISC_FLAG2_DONT_ADD_TO_SECTOR = 0,
PROFILE_MISC_FLAG2_LEFT_COUNTRY = 1,
PROFILE_MISC_FLAG2_BANDAGED_TODAY = 2,
PROFILE_MISC_FLAG2_SAID_FIRSTSEEN_QUOTE = 3,
PROFILE_MISC_FLAG2_NEEDS_TO_SAY_HOSTILE_QUOTE = 4,
PROFILE_MISC_FLAG2_MARRIED_TO_HICKS = 5,
PROFILE_MISC_FLAG2_ASKED_BY_HICKS = 6,
PROFILE_MISC_FLAG2_DONT_ADD_TO_SECTOR = 1,
PROFILE_MISC_FLAG2_LEFT_COUNTRY = 2,
PROFILE_MISC_FLAG2_BANDAGED_TODAY = 4,
PROFILE_MISC_FLAG2_SAID_FIRSTSEEN_QUOTE = 8,
PROFILE_MISC_FLAG2_NEEDS_TO_SAY_HOSTILE_QUOTE = 16,
PROFILE_MISC_FLAG2_MARRIED_TO_HICKS = 32,
PROFILE_MISC_FLAG2_ASKED_BY_HICKS = 64,
}
SectorY =
@@ -569,7 +569,7 @@ function HandleEarlyMorningEvents()
SetMoneyInSoldierProfile( Profil.DARREN, 15000 )
-- Set Carmen to be placed on the map in case he moved and is waiting off screen
if CheckMiscFlags2(Profil.CARMEN,Flags2.PROFILE_MISC_FLAG2_DONT_ADD_TO_SECTOR) == true then
if CheckMiscFlags2(Profil.CARMEN,Flags2.PROFILE_MISC_FLAG2_DONT_ADD_TO_SECTOR) == 1 then
SetMiscFlags2(Profil.CARMEN, Flags2.PROFILE_MISC_FLAG2_DONT_ADD_TO_SECTOR)
@@ -591,7 +591,7 @@ function HandleEarlyMorningEvents()
SetMoneyInSoldierProfile( Profil.CARMEN, uiAmount )
SetNPCData2(Profil.CARMEN,0)
for i = 249, 254 do
for i = 248, 254 do
RemoveObjectFromSoldierProfile( Profil.CARMEN, i )
end
end