mirror of
https://github.com/1dot13/source.git
synced 2026-08-12 14:10:23 +02:00
- UB Improvements / Cleanup (by Jazz)
o Deleted old / unused files and added / updated new files o Fixed problems with the icons of objects laid on the ground (wrong ja2set.dat) git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1741 4f8fa57e-7814-0410-bad4-adc449f26b7c
This commit is contained in:
Wanne
@@ -29,30 +29,30 @@ Attitude =
|
||||
|
||||
Quests =
|
||||
{
|
||||
-- Quests ID -- BinaryData\QUESTS25.EDT Record
|
||||
QUEST_DELIVER_LETTER = 0, -- Start quest 0, End quest 1
|
||||
QUEST_FOOD_ROUTE = 1, -- Start quest 2, End quest 3
|
||||
QUEST_KILL_TERRORISTS = 2, -- Start quest 4, End quest 5
|
||||
QUEST_KINGPIN_IDOL = 3, -- Start quest 6, End quest 7
|
||||
QUEST_KINGPIN_MONEY = 4, -- Start quest 8, End quest 9
|
||||
QUEST_RUNAWAY_JOEY = 5, -- Start quest 10, End quest 11
|
||||
QUEST_RESCUE_MARIA = 6, -- Start quest 12, End quest 13
|
||||
QUEST_CHITZENA_IDOL = 7, -- Start quest 14, End quest 15
|
||||
QUEST_HELD_IN_ALMA = 8, -- Start quest 16, End quest 17
|
||||
QUEST_INTERROGATION = 9, -- Start quest 18, End quest 19
|
||||
QUEST_ARMY_FARM = 10, -- Start quest 20, End quest 21
|
||||
QUEST_FIND_SCIENTIST = 11, -- Start quest 22, End quest 23
|
||||
QUEST_DELIVER_VIDEO_CAMERA = 12, -- Start quest 24, End quest 25
|
||||
QUEST_BLOODCATS = 13, -- Start quest 26, End quest 27
|
||||
QUEST_FIND_HERMIT = 14, -- Start quest 28, End quest 29
|
||||
QUEST_CREATURES = 15, -- Start quest 30, End quest 31
|
||||
QUEST_CHOPPER_PILOT = 16, -- Start quest 32, End quest 33
|
||||
QUEST_ESCORT_SKYRIDER = 17, -- Start quest 34, End quest 35
|
||||
QUEST_FREE_DYNAMO = 18, -- Start quest 36, End quest 37
|
||||
QUEST_ESCORT_TOURISTS = 19, -- Start quest 38, End quest 39
|
||||
QUEST_FREE_CHILDREN = 20, -- Start quest 40, End quest 41
|
||||
QUEST_LEATHER_SHOP_DREAM = 21, -- Start quest 42, End quest 43
|
||||
QUEST_ESCORT_SHANK = 22, -- Start quest 44, End quest 45
|
||||
-- Quests ID -- BinaryData\QUESTS.EDT Record
|
||||
QUEST_DELIVER_LETTER = 0, -- Start quest 0, End quest 1 - Deliver Letter
|
||||
QUEST_FOOD_ROUTE = 1, -- Start quest 2, End quest 3 - Food Route
|
||||
QUEST_KILL_TERRORISTS = 2, -- Start quest 4, End quest 5 - Terrorists
|
||||
QUEST_KINGPIN_IDOL = 3, -- Start quest 6, End quest 7 - Kingpin Chalice
|
||||
QUEST_KINGPIN_MONEY = 4, -- Start quest 8, End quest 9 - Kingpin Money
|
||||
QUEST_RUNAWAY_JOEY = 5, -- Start quest 10, End quest 11 - Runaway Joey
|
||||
QUEST_RESCUE_MARIA = 6, -- Start quest 12, End quest 13 - Rescue Maria
|
||||
QUEST_CHITZENA_IDOL = 7, -- Start quest 14, End quest 15 - Chitzena Chalice
|
||||
QUEST_HELD_IN_ALMA = 8, -- Start quest 16, End quest 17 - Held in Alma
|
||||
QUEST_INTERROGATION = 9, -- Start quest 18, End quest 19 - Interogation
|
||||
QUEST_ARMY_FARM = 10, -- Start quest 20, End quest 21 - Hillbilly Problem
|
||||
QUEST_FIND_SCIENTIST = 11, -- Start quest 22, End quest 23 - Find Scientist
|
||||
QUEST_DELIVER_VIDEO_CAMERA = 12, -- Start quest 24, End quest 25 - Deliver Video Camera
|
||||
QUEST_BLOODCATS = 13, -- Start quest 26, End quest 27 - Blood Cats
|
||||
QUEST_FIND_HERMIT = 14, -- Start quest 28, End quest 29 - Find Hermit
|
||||
QUEST_CREATURES = 15, -- Start quest 30, End quest 31 - Creatures
|
||||
QUEST_CHOPPER_PILOT = 16, -- Start quest 32, End quest 33 - Find Chopper Pilot
|
||||
QUEST_ESCORT_SKYRIDER = 17, -- Start quest 34, End quest 35 - Escort SkyRider
|
||||
QUEST_FREE_DYNAMO = 18, -- Start quest 36, End quest 37 - Free Dynamo
|
||||
QUEST_ESCORT_TOURISTS = 19, -- Start quest 38, End quest 39 - Escort Tourists
|
||||
QUEST_FREE_CHILDREN = 20, -- Start quest 40, End quest 41 - Doreen
|
||||
QUEST_LEATHER_SHOP_DREAM = 21, -- Start quest 42, End quest 43 - Leather Shop Dream
|
||||
QUEST_ESCORT_SHANK = 22, -- Start quest 44, End quest 45 - Escort Shank
|
||||
-- UB Quests
|
||||
QUEST_DESTROY_MISSLES = 23, -- Start quest 46, End quest 47
|
||||
QUEST_FIX_LAPTOP = 24, -- Start quest 48, End quest 49
|
||||
@@ -243,6 +243,28 @@ function HandleAtNewGridNo( ProfileId )
|
||||
TeamSoldier = FindSoldierTeam (ProfileId)
|
||||
if ( TeamSoldier == Team.OUR_TEAM ) then -- Team
|
||||
|
||||
-- Kingping expecting visit from player (Sector D5)
|
||||
-- The fact has to be TRUE. If FALSE then Kingpin attack the player.
|
||||
if ( CheckFact( 98 ) == false ) then
|
||||
if ( NPCInRoomRange( ProfileId, 30, 39 ) == true and gWorldSectorX == 5 and gWorldSectorY == SectorY.MAP_ROW_D and gWorldSectorZ == 0 )then
|
||||
|
||||
for iLoop = GetTacticalStatusFirstID(Team.CIV_TEAM),GetTacticalStatusLastID(Team.CIV_TEAM) do
|
||||
if ( CheckMercPtrsInSector (iLoop) == true and CheckMercPtrsInActive(iLoop) == true and CheckMercPtrsInCivilianGroup (iLoop) == 2 ) then
|
||||
for aimLoop=GetTacticalStatusFirstID(Team.OUR_TEAM),GetTacticalStatusLastID(Team.OUR_TEAM) do
|
||||
if ( CheckMercPtrsID1SeenID2(iLoop,aimLoop) == SEEN_CURRENTLY ) then
|
||||
MakeMercPtrsHostile( iLoop )
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
if ( CheckCombatMode == false ) then
|
||||
EnterTeamCombatMode(Team.CIV_TEAM)
|
||||
end
|
||||
|
||||
end
|
||||
end
|
||||
|
||||
if ( WhatKindOfMercAmI (ProfileId) == What.MERC_TYPE__EPC ) then -- what EPC
|
||||
|
||||
-- Skyrider
|
||||
@@ -250,10 +272,10 @@ function HandleAtNewGridNo( ProfileId )
|
||||
ActionStopMerc(Profil.SKYRIDER)
|
||||
SetFactTrue( Facts.FACT_SKYRIDER_CLOSE_TO_CHOPPER )
|
||||
TriggerNPCRecord( Profil.SKYRIDER, 15 )
|
||||
SetUpHelicopterForPlayer( 13, SectorY.MAP_ROW_B, Profil.SKYRIDER )
|
||||
SetUpHelicopterForPlayer( 13, SectorY.MAP_ROW_B, Profil.SKYRIDER, 163 ) -- 163 helicopter
|
||||
|
||||
-- Marie & John
|
||||
elseif ( ( CheckNPCSectorBool( Profil.MARY, 13, SectorY.MAP_ROW_B, 0 ) == true ) or ( CheckNPCSectorBool( Profil.JOHN, 13, SectorY.MAP_ROW_B, 0 ) == true
|
||||
-- Mary & John
|
||||
elseif ( ( CheckNPCSectorBool( Profil.MARY, 13, SectorY.MAP_ROW_B, 0 ) == true ) or ( CheckNPCSectorBool( Profil.JOHN, 13, SectorY.MAP_ROW_B, 0 ) == true ) ) then
|
||||
|
||||
-- Mary
|
||||
if ( ProfileId == Profil.MARY ) then
|
||||
@@ -279,7 +301,7 @@ function HandleAtNewGridNo( ProfileId )
|
||||
-- Drassen stuff for John & Mary
|
||||
elseif ( CheckQuest(Quests.QUEST_ESCORT_TOURISTS) == pQuest.QUESTINPROGRESS and ProfileIdsSectorX == 13 and ProfileIdsSectorY == SectorY.MAP_ROW_B and ProfileIdbSectorZ == 0 ) then
|
||||
|
||||
if ( CheckFact( FACT_JOHN_ALIVE) == true ) then
|
||||
if ( CheckFact( Facts.FACT_JOHN_ALIVE ) == true ) then
|
||||
HandleJohnArrival( nil )
|
||||
else
|
||||
HandleMaryArrival( nil )
|
||||
@@ -300,36 +322,4 @@ function HandleAtNewGridNo( ProfileId )
|
||||
end -- End what EPC
|
||||
end -- End team
|
||||
]]
|
||||
end
|
||||
|
||||
|
||||
function HandlePlayerTeamMemberDeath( ProfileId )
|
||||
local cnt
|
||||
local iLoop
|
||||
local pTeamSoldier
|
||||
|
||||
|
||||
-- JA2 Remove
|
||||
--[[
|
||||
|
||||
-- handle stuff for Carmen if Slay is killed
|
||||
|
||||
if ( ProfileId == Profil.SLAY ) then
|
||||
pTeamSoldier = FindSoldierByProfileID( Profil.CARMEN )
|
||||
|
||||
if ( CheckSoldierAttitude ( pTeamSoldier ) == Attitude.ATTACKSLAYONLY and not TileIsOutOfBounds(ClosestPC( pTeamSoldier, nil )) ) then
|
||||
-- Carmen now becomes friendly again
|
||||
TriggerNPCRecord( Profil.CARMEN, 29 )
|
||||
end
|
||||
|
||||
elseif ( ProfileId == Profil.ROBOT ) then
|
||||
|
||||
if ( CheckFact( Facts.FACT_FIRST_ROBOT_DESTROYED,0 ) == false ) then
|
||||
SetFactTrue( Facts.FACT_FIRST_ROBOT_DESTROYED )
|
||||
SetFactFalse( Facts.FACT_ROBOT_READY )
|
||||
else
|
||||
SetFactTrue( Facts.FACT_SECOND_ROBOT_DESTROYED )
|
||||
end
|
||||
end
|
||||
]]
|
||||
end
|
||||
Reference in New Issue
Block a user