mirror of
https://github.com/1dot13/source.git
synced 2026-07-29 13:52:17 +02:00
- Added new additional dialogue events for commenting upon other merc's skill/kills, comment during bandaging
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23604&goto=356522&#msg_356522 git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2458 4f8fa57e-7814-0410-bad4-adc449f26b7c
This commit is contained in:
Flugente
@@ -219,11 +219,21 @@ Profil =
|
||||
CALVIN = 157,
|
||||
CARL = 158,
|
||||
LAURA = 175,
|
||||
GRACE = 176,
|
||||
RUDOLF = 177,
|
||||
SKITZ = 179,
|
||||
BUNS_CHAOTIC = 215,
|
||||
|
||||
LEON = 222,
|
||||
GARY = 223,
|
||||
SPARKY = 224,
|
||||
HURL = 227,
|
||||
MOUSE = 245,
|
||||
HECTOR = 246,
|
||||
REV = 247,
|
||||
STELLA = 248,
|
||||
MOSES = 250,
|
||||
TURTLE = 253,
|
||||
}
|
||||
|
||||
What =
|
||||
@@ -857,7 +867,7 @@ function HandleInteractiveActionResult(sSectorX, sSectorY, bSectorZ, sGridNo, bL
|
||||
SetScreenMsg(FontColour.FONT_MCOLOR_DKWHITE, "Weapon test results are stored on this server.")
|
||||
SetScreenMsg(FontColour.FONT_MCOLOR_DKWHITE, "In later stages of the project, the weapon was tested on live inmates.")
|
||||
SetScreenMsg(FontColour.FONT_MCOLOR_DKWHITE, "The tests were filmed... the cruel demonstrations are gruesome.")
|
||||
SetScreenMsg(FontColour.FONT_MCOLOR_LTGREEN, "If these videos were to be published, this might cause serious headache for the companies invovled.")
|
||||
SetScreenMsg(FontColour.FONT_MCOLOR_LTGREEN, "If these videos were to be published, this might cause serious headache for the companies involved.")
|
||||
|
||||
SetModderLUAFact(sLuaactionid, ActionState.STATE_GAVEREWARD_OK)
|
||||
elseif ( GetModderLUAFact(sLuaactionid) == ActionState.STATE_GAVEREWARD_OK ) then
|
||||
@@ -938,7 +948,7 @@ function HandleInteractiveActionResult(sSectorX, sSectorY, bSectorZ, sGridNo, bL
|
||||
SetScreenMsg(FontColour.FONT_MCOLOR_DKWHITE, "Then there's the centrall hallway.")
|
||||
SetScreenMsg(FontColour.FONT_MCOLOR_LTGREEN, "It seems there is some sort of gas trap installed in the hallway.")
|
||||
SetScreenMsg(FontColour.FONT_MCOLOR_DKWHITE, "On the left and right of it are two huge manufacturing halls.")
|
||||
SetScreenMsg(FontColour.FONT_MCOLOR_DKWHITE, "The main hallway is then flanked by the security offices. They seem to be heaily staffed.")
|
||||
SetScreenMsg(FontColour.FONT_MCOLOR_DKWHITE, "The main hallway is then flanked by the security offices. They seem to be heavily staffed.")
|
||||
SetScreenMsg(FontColour.FONT_MCOLOR_DKWHITE, "Behind another security door are the main labs, but you have no camera access.")
|
||||
|
||||
SetModderLUAFact(sLuaactionid, ActionState.STATE_GAVEREWARD_OK)
|
||||
@@ -983,7 +993,7 @@ function HandleInteractiveActionResult(sSectorX, sSectorY, bSectorZ, sGridNo, bL
|
||||
if ( GetModderLUAFact(sLuaactionid) == ActionState.STATE_OK ) then
|
||||
SetScreenMsg(FontColour.FONT_MCOLOR_DKWHITE, "There is a list of all exhibits on the computer.")
|
||||
SetScreenMsg(FontColour.FONT_MCOLOR_DKWHITE, "Most of it are old sculptures and bronze works.")
|
||||
SetScreenMsg(FontColour.FONT_MCOLOR_LTGREEN, "But the most prized item is definetely the Chalice of Chance .")
|
||||
SetScreenMsg(FontColour.FONT_MCOLOR_LTGREEN, "But the most prized item is definetely the Chalice of Chance.")
|
||||
|
||||
SetModderLUAFact(sLuaactionid, ActionState.STATE_GAVEREWARD_OK)
|
||||
elseif ( GetModderLUAFact(sLuaactionid) == ActionState.STATE_GAVEREWARD_OK ) then
|
||||
@@ -1028,7 +1038,7 @@ function HandleInteractiveActionResult(sSectorX, sSectorY, bSectorZ, sGridNo, bL
|
||||
end
|
||||
|
||||
-- we can hack the SAM, decreasing its radius, or undo a previous hack
|
||||
-- for simplicity, we will always hack a SAM if enemies are nearby - we are either infiltrating or figting the enemy in those cases
|
||||
-- for simplicity, we will always hack a SAM if enemies are nearby - we are either infiltrating or fighting the enemy in those cases
|
||||
-- otherwise, we obviously control the SAM, so try to unhack it
|
||||
if ( NumNonPlayerTeamInSector(sSectorX, sSectorY, Teams.ENEMY_TEAM) > 0 ) then
|
||||
if ( ourhack >= samhackstatus ) then
|
||||
@@ -1346,8 +1356,8 @@ function HandleInteractiveActionResult(sSectorX, sSectorY, bSectorZ, sGridNo, bL
|
||||
--
|
||||
elseif ( sLuaactionid == ModSpecificActions.COMPUTER_MEDUNAPALACE_CONSOLE_1 ) then
|
||||
if ( GetModderLUAFact(sLuaactionid) == ActionState.STATE_OK ) then
|
||||
SetScreenMsg(FontColour.FONT_MCOLOR_DKWHITE, "There is a plan on the bunkers security measures here.")
|
||||
SetScreenMsg(FontColour.FONT_MCOLOR_DKWHITE, "The bunker two entries - one from the palace, one from an underground escape tunnel.")
|
||||
SetScreenMsg(FontColour.FONT_MCOLOR_DKWHITE, "There is a plan on the bunkers' security measures here.")
|
||||
SetScreenMsg(FontColour.FONT_MCOLOR_DKWHITE, "The bunker has two entries - one from the palace, one from an underground escape tunnel.")
|
||||
SetScreenMsg(FontColour.FONT_MCOLOR_DKWHITE, "A huge part of the bunker is off-limits to all but the queen's personal staff.")
|
||||
SetScreenMsg(FontColour.FONT_MCOLOR_LTGREEN, "There seems to be an active minefield in the hallway.")
|
||||
SetScreenMsg(FontColour.FONT_MCOLOR_DKWHITE, "The controls should be around here somewhere.")
|
||||
@@ -2812,10 +2822,10 @@ Skill =
|
||||
DialogueActionEvent =
|
||||
{
|
||||
ADE_DISCOVER_ROOM = 0, -- merc is the 1st one to explore this room, aData1 indicates the room in this event
|
||||
ADE_DIALOGUE_REACTION = 1, -- someone else used a line, and we might answer to that, aData1 indicates the profile number in this event, aData2 indicates the specific voice line we react to
|
||||
ADE_OMERTA_ENTRY = 2, -- similar to an IMP, we can comment upon the initial Omerta landing
|
||||
ADE_DIALOGUE_REACTION = 1, -- someone else used a line, and we might answer to that, aData1 indicates the profile number in this event, aData2 indicates the specific voice line we react to, aData3 indicates whether this person has been recruited (1) or not(0)
|
||||
ADE_MERC_ARRIVES = 2, -- a mercenary arrives in Arulco. aData1 is the profile of the arriving merc, aData2 is 1 if the player hasn't made contact with the rebels yet
|
||||
ADE_SECTOR_COMMENTARY = 3, -- similar to the rebel's quotes, this is called upon visiting a sector for the first time (if no rebel does their quote first)
|
||||
ADE_MERCHANT_CHAT = 4, -- we greet a merchant (used with non-profile merchants, in order to be a bit more lively)
|
||||
ADE_MERCHANT_CHAT = 4, -- we greet a merchant (used with non-profile merchants, in order to be a bit more lively), aData1 is the id of the merchant
|
||||
ADE_DIALOGUE_NPC_FRIENDLY = 5, -- in a conversation, we can say something when clicking on a button
|
||||
ADE_DIALOGUE_NPC_DIRECT = 6,
|
||||
ADE_DIALOGUE_NPC_THREATEN = 7,
|
||||
@@ -2823,11 +2833,16 @@ DialogueActionEvent =
|
||||
ADE_DIALOGUE_NPC_REPEAT = 9,
|
||||
ADE_DIALOGUE_RPC_RECRUIT_SUCCESS = 10, -- we've successfully recruited an RPC, and might comment on that
|
||||
ADE_SEX = 11, -- does exactly what you think it does
|
||||
ADE_WEATHERCHANGE = 12, -- the weather has changed in the current sector, and we can warn the player about that, aData1 is of Weather
|
||||
ADE_WEATHERCHANGE = 12, -- the weather has changed in the current sector, and we can warn the player about that, aData1 is type of Weather
|
||||
ADE_SKILL_RESULT = 13, -- we used a skill, and comment on the result, aData1 is of Skill, aData2 indicates whether it was a success (1) or failure (0)
|
||||
ADE_GRENADEWARNING = 14, -- a delayed enemy grenade was dropped nearby, and we can shout a warning, aData1 is the itemnumber of the grenade
|
||||
ADE_CONSUMEITEM = 15, -- we applied an item to us, aData1 is the item index
|
||||
ADE_CONSUMEITEM = 15, -- we consumed an item, aData1 is the item index
|
||||
ADE_NPC_DEATH = 16, -- someone died, aData1 is the profile of the dead NPC, aData2 the profile of the killer, aData3 the bodytype of the dead
|
||||
ADE_WITNESS_GOOD = 17, -- similar to comment upon buddy doing good. aData1 is the profile of person, aData2 is 0 if we saw a kill, 1 if they passed a skill check (and we're less than 15 tiles away)
|
||||
ADE_BANDAGE_PERFORM_BEGIN = 18, -- we bandage someone, aData1 is the profile of person
|
||||
ADE_BANDAGE_PERFORM_END = 19, -- we finished bandaging someone, aData1 is the profile of person
|
||||
ADE_BANDAGE_RECEIVE_BEGIN = 20, -- someone bandages us, aData1 is the profile of person
|
||||
ADE_BANDAGE_RECEIVE_END = 21, -- someone finished bandaging us, aData1 is the profile of person
|
||||
}
|
||||
|
||||
-- functions used here:
|
||||
@@ -2856,6 +2871,7 @@ function HandleAdditionalDialogue(sSectorX, sSectorY, bSectorZ, ubProfile, iFace
|
||||
-- this happens when we are in the same sector, awake and concious
|
||||
-- aData1 indicates the profile number in this event
|
||||
-- aData2 indicates the specific voice line we react to
|
||||
-- aData3 indicates whether this person has been recruited (1) or not(0)
|
||||
if ( usEventNr == DialogueActionEvent.ADE_DIALOGUE_REACTION ) then
|
||||
|
||||
if ( aData1 == Profil.FRED ) then
|
||||
@@ -2867,7 +2883,7 @@ function HandleAdditionalDialogue(sSectorX, sSectorY, bSectorZ, ubProfile, iFace
|
||||
|
||||
if ( aData2 == 0 ) then SetAdditionalDialogue(ubProfile, iFaceIndex, "Speech//Additional//Buns_chaotic//elliot.mp3", "Death doesn't seem to have kept him from talking.")
|
||||
end
|
||||
|
||||
|
||||
end
|
||||
|
||||
elseif ( usEventNr == DialogueActionEvent.ADE_SECTOR_COMMENTARY ) then
|
||||
|
||||
@@ -778,10 +778,10 @@ Skill =
|
||||
DialogueActionEvent =
|
||||
{
|
||||
ADE_DISCOVER_ROOM = 0, -- merc is the 1st one to explore this room, aData1 indicates the room in this event
|
||||
ADE_DIALOGUE_REACTION = 1, -- someone else used a line, and we might answer to that, aData1 indicates the profile number in this event, aData2 indicates the specific voice line we react to
|
||||
ADE_OMERTA_ENTRY = 2, -- similar to an IMP, we can comment upon the initial Omerta landing
|
||||
ADE_DIALOGUE_REACTION = 1, -- someone else used a line, and we might answer to that, aData1 indicates the profile number in this event, aData2 indicates the specific voice line we react to, aData3 indicates whether this person has been recruited (1) or not(0)
|
||||
ADE_MERC_ARRIVES = 2, -- a mercenary arrives in Arulco. aData1 is the profile of the arriving merc, aData2 is 1 if the player hasn't made contact with the rebels yet
|
||||
ADE_SECTOR_COMMENTARY = 3, -- similar to the rebel's quotes, this is called upon visiting a sector for the first time (if no rebel does their quote first)
|
||||
ADE_MERCHANT_CHAT = 4, -- we greet a merchant (used with non-profile merchants, in order to be a bit more lively)
|
||||
ADE_MERCHANT_CHAT = 4, -- we greet a merchant (used with non-profile merchants, in order to be a bit more lively), aData1 is the id of the merchant
|
||||
ADE_DIALOGUE_NPC_FRIENDLY = 5, -- in a conversation, we can say something when clicking on a button
|
||||
ADE_DIALOGUE_NPC_DIRECT = 6,
|
||||
ADE_DIALOGUE_NPC_THREATEN = 7,
|
||||
@@ -789,11 +789,16 @@ DialogueActionEvent =
|
||||
ADE_DIALOGUE_NPC_REPEAT = 9,
|
||||
ADE_DIALOGUE_RPC_RECRUIT_SUCCESS = 10, -- we've successfully recruited an RPC, and might comment on that
|
||||
ADE_SEX = 11, -- does exactly what you think it does
|
||||
ADE_WEATHERCHANGE = 12, -- the weather has changed in the current sector, and we can warn the player about that, aData1 is of Weather
|
||||
ADE_WEATHERCHANGE = 12, -- the weather has changed in the current sector, and we can warn the player about that, aData1 is type of Weather
|
||||
ADE_SKILL_RESULT = 13, -- we used a skill, and comment on the result, aData1 is of Skill, aData2 indicates whether it was a success (1) or failure (0)
|
||||
ADE_GRENADEWARNING = 14, -- a delayed enemy grenade was dropped nearby, and we can shout a warning, aData1 is the itemnumber of the grenade
|
||||
ADE_CONSUMEITEM = 15, -- we applied an item to us, aData1 is the item index
|
||||
ADE_CONSUMEITEM = 15, -- we consumed an item, aData1 is the item index
|
||||
ADE_NPC_DEATH = 16, -- someone died, aData1 is the profile of the dead NPC, aData2 the profile of the killer, aData3 the bodytype of the dead
|
||||
ADE_WITNESS_GOOD = 17, -- similar to comment upon buddy doing good. aData1 is the profile of person, aData2 is 0 if we saw a kill, 1 if they passed a skill check (and we're less than 15 tiles away)
|
||||
ADE_BANDAGE_PERFORM_BEGIN = 18, -- we bandage someone, aData1 is the profile of person
|
||||
ADE_BANDAGE_PERFORM_END = 19, -- we finished bandaging someone, aData1 is the profile of person
|
||||
ADE_BANDAGE_RECEIVE_BEGIN = 20, -- someone bandages us, aData1 is the profile of person
|
||||
ADE_BANDAGE_RECEIVE_END = 21, -- someone finished bandaging us, aData1 is the profile of person
|
||||
}
|
||||
|
||||
-- functions used here:
|
||||
|
||||
Reference in New Issue
Block a user