From e7de185669129bba51f4e126a8f6611d0b08aa5c Mon Sep 17 00:00:00 2001 From: Flugente Date: Sat, 9 Jun 2018 19:13:33 +0000 Subject: [PATCH] In order to prevent conflicts, Facts set by stock NPC conversations are now noted in the facts-enum git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8570 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Strategic/Quests.h | 127 +++++++++++++++++++++++++++++++-------------- 1 file changed, 87 insertions(+), 40 deletions(-) diff --git a/Strategic/Quests.h b/Strategic/Quests.h index 1068a411..fc0d1d73 100644 --- a/Strategic/Quests.h +++ b/Strategic/Quests.h @@ -230,14 +230,24 @@ enum Facts FACT_LETTER_DELIVERED, // 13 FACT_FOOD_ROUTE_EXISTS, // 14 FACT_DIMITRI_DEAD, // 15 + FACT_CONVO_FATIMA_1, + FACT_CONVO_CARLOS_1, + FACT_CONVO_FATIMA_2, + FACT_CONVO_FATIMA_3, + FACT_CONVO_DIMITRI = 20, + FACT_CONVO_CARLOS_2, + FACT_CONVO_MIGUEL_1, FACT_MIGUEL_READ_LETTER = 23, + FACT_CONVO_IRA, // rebels do not trust player FACT_REBELS_HATE_PLAYER = 25, - + FACT_CONVO_FATIMA_4, + FACT_CONVO_MIGUEL_2, + FACT_CONVO_MIGUEL_IRA, FACT_PACOS_KILLED = 29, - + FACT_CONVO_PACOS, FACT_CURRENT_SECTOR_IS_SAFE = 31, FACT_BOBBYRAY_SHIPMENT_IN_TRANSIT, // 32 FACT_NEW_BOBBYRAY_SHIPMENT_WAITING, // 33 @@ -245,19 +255,19 @@ enum Facts FACT_LARGE_SIZED_OLD_SHIPMENT_WAITING,// 35 FACT_PLAYER_FOUND_ITEMS_MISSING,// 36 FACT_PABLO_PUNISHED_BY_PLAYER,// 37 - + FACT_CONVO_PABLO_1, FACT_PABLO_RETURNED_GOODS = 39, FACT_MIGUEL_AND_ALL_REBELS_CAN_BE_RECRUITED,// 40 FACT_PABLOS_BRIBED = 41, FACT_ESCORTING_SKYRIDER,// 42 FACT_SKYRIDER_CLOSE_TO_CHOPPER,// 43 - + FACT_CONVO_SKYRIDER_1, FACT_SKYRIDER_USED_IN_MAPSCREEN = 45, FACT_NPC_OWED_MONEY,// 46 FACT_NPC_WOUNDED,// 47 FACT_NPC_WOUNDED_BY_PLAYER,// 48 - + FACT_CONVO_FATHER_1, FACT_IRA_NOT_PRESENT = 50, FACT_IRA_TALKING,// 51 FACT_FOOD_QUEST_OVER,// 52 @@ -272,11 +282,12 @@ enum Facts FACT_MEDIUM_SIZED_SHIPMENT_WAITING,// 61 FACT_LARGE_SIZED_SHIPMENT_WAITING,// 62 FACT_DOREEN_HAD_CHANGE_OF_HEART,// 63 - + FACT_CONVO_GORDON, FACT_IRA_UNHIRED_AND_ALIVE = 65, - + FACT_CONVO_DYNAMO_1, + FACT_CONVO_DYNAMO_2, FACT_NPC_BLEEDING = 68, - + FACT_CONVO_SHANK_1, FACT_NPC_BLEEDING_BUT_OKAY = 70, FACT_PLAYER_HAS_HEAD_AND_CARMEN_IN_SAN_MONA,// 71 FACT_PLAYER_HAS_HEAD_AND_CARMEN_IN_CAMBRIA,// 72 @@ -287,11 +298,11 @@ enum Facts FACT_MULTIPLE_WOUNDED_MERCS_NEARBY,// 77 FACT_BRENDA_IN_STORE_AND_ALIVE,// 78 FACT_BRENDA_DEAD,// 79 - + FACT_CONVO_BRENDA_1, FACT_NPC_IS_ENEMY = 81, FACT_PC_STRONG_AND_LESS_THAN_3_MALES_PRESENT,// 82 FACT_PC_STRONG_AND_3_PLUS_MALES_PRESENT,// 83 - + FACT_CONVO_HANS, FACT_HANS_AT_SPOT = 85, FACT_TONY_NOT_AVAILABLE,// 86 FACT_FEMALE_SPEAKING_TO_NPC,// 87 @@ -305,7 +316,7 @@ enum Facts FACT_PLAYER_PASSED_GOON,// 95 FACT_MULTIPLE_MERCS_CLOSE ,// 96, FACT_SOME_MERCS_CLOSE,// 97 - + FACT_CONVO_KINGPIN_1, FACT_DARREN_EXPECTING_MONEY = 99, FACT_PC_NEAR,// 100 FACT_CARMEN_IN_C5,// 101 @@ -313,7 +324,7 @@ enum Facts FACT_KINGPIN_KNOWS_MONEY_GONE,// 103 FACT_PLAYER_REPAID_KINGPIN,// 104 FACT_FRANK_HAS_BEEN_BRIBED,// 105 - + FACT_CONVO_DARREN, FACT_PAST_CLUB_CLOSING_AND_PLAYER_WARNED = 107, FACT_JOEY_ESCORTED,// 108 FACT_JOEY_IN_C5,// 109 @@ -321,16 +332,16 @@ enum Facts FACT_JOEY_DEAD,// 111 FACT_MERC_NEAR_MARTHA,// 112 FACT_SPIKE_AT_DOOR,// 113 - + FACT_CONVO_ANGEL_1, FACT_ANGEL_SOLD_VEST = 115, FACT_MARIA_ESCORTED,// 116 FACT_MARIA_ESCORTED_AT_LEATHER_SHOP,// 117 FACT_PLAYER_WANTS_TO_BUY_LEATHER_VEST,// 118 FACT_MARIA_ESCAPE_NOTICED,// 119 FACT_ANGEL_LEFT_DEED,// 120 - + FACT_CONVO_ANGEL_2, FACT_NPC_BANDAGED_TODAY = 122, - + FACT_CONVO_DOREEN_1, FACT_PABLO_WONT_STEAL = 124, FACT_AGENTS_PREVENTED_SHIPMENT,// 125 @@ -342,35 +353,45 @@ enum Facts // anv: it was 130 in Waldo script FACT_HELICOPTER_LOST = 130, - + FACT_CONVO_WALDO, + FACT_CONVO_FATHER_2, + FACT_CONVO_FATHER_3, + FACT_CONVO_FATHER_4, FACT_LOYALTY_OKAY = 135, FACT_LOYALTY_LOW,// 136 FACT_LOYALTY_HIGH,// 137 FACT_PLAYER_DOING_POORLY,// 138 - + FACT_CONVO_CARMEN_1, FACT_CURRENT_SECTOR_G9 = 140, FACT_CURRENT_SECTOR_C5,// 141 FACT_CURRENT_SECTOR_C13,// 142 FACT_CARMEN_HAS_TEN_THOUSAND,// 143 FACT_SLAY_HIRED_AND_WORKED_FOR_48_HOURS,// 144 - + FACT_CONVO_CARMEN_2, FACT_SLAY_IN_SECTOR = 146, - + FACT_CONVO_CARMEN_3, FACT_VINCE_EXPLAINED_HAS_TO_CHARGE = 148, FACT_VINCE_EXPECTING_MONEY,// 149 FACT_PLAYER_STOLE_MEDICAL_SUPPLIES,// 150 FACT_PLAYER_STOLE_MEDICAL_SUPPLIES_AGAIN,// 151 FACT_VINCE_RECRUITABLE,// 152 + FACT_CONVO_VINCE = 154, FACT_SLAY_OFFERED_DEAL = 155, FACT_ALL_TERRORISTS_KILLED = 156, FACT_ELGIN_ALIVE,// 157 - + FACT_CONVO_MARIA_1, + FACT_CONVO_SKYRIDER_2, + FACT_CONVO_JOEY_1, + FACT_CONVO_JOHN_1, + FACT_CONVO_MARY, + FACT_CONVO_WALTER, FACT_SHANK_IN_SQUAD_BUT_NOT_SPEAKING = 164, - + FACT_CONVO_MADDOG_1, + FACT_CONVO_JAKE, FACT_SHANK_NOT_IN_SECTOR = 167, FACT_BLOODCAT_QUEST_STARTED_TWO_DAYS_AGO,// 168 - + FACT_CONVO_ARMAND, FACT_QUEEN_DEAD = 170, FACT_SPEAKER_AIM_OR_AIM_NEARBY = 171, @@ -394,24 +415,26 @@ enum Facts FACT_MARY_DEAD,// 193 FACT_MINERS_PLACED,// 194 FACT_KROTT_GOT_ANSWER_NO,// 195 + FACT_CONVO_MADLAB_1, FACT_MADLAB_EXPECTING_FIREARM = 197, FACT_MADLAB_EXPECTING_VIDEO_CAMERA,// 198 FACT_ITEM_POOR_CONDITION,// 199 - + FACT_CONVO_MADLAB_2, + FACT_CONVO_MADLAB_3, FACT_ROBOT_READY = 202, FACT_FIRST_ROBOT_DESTROYED,// 203 FACT_MADLAB_HAS_GOOD_CAMERA,// 204 FACT_ROBOT_READY_SECOND_TIME,// 205 FACT_SECOND_ROBOT_DESTROYED,// 206 - + FACT_CONVO_FRED_MATT, FACT_DYNAMO_IN_J9 = 208, FACT_DYNAMO_ALIVE,// 209 FACT_ANOTHER_FIGHT_POSSIBLE,// 210 FACT_RECEIVING_INCOME_FROM_DCAC,// 211 FACT_PLAYER_BEEN_TO_K4,// 212 - + FACT_CONVO_BREWSTER_1, FACT_WARDEN_DEAD = 214, - + FACT_CONVO_ERNEST, FACT_FIRST_BARTENDER = 216, FACT_SECOND_BARTENDER,// 217 FACT_THIRD_BARTENDER,// 218 @@ -419,8 +442,9 @@ enum Facts FACT_MANNY_IS_BARTENDER,// 220 FACT_NOTHING_REPAIRED_YET,// 221, + FACT_CONVO_DAVE_1 = 223, FACT_OK_USE_HUMMER = 224, - + FACT_CONVO_DAVE_2, FACT_DAVE_HAS_GAS = 226, FACT_VEHICLE_PRESENT,// 227 FACT_FIRST_BATTLE_WON,// 228 @@ -433,9 +457,10 @@ enum Facts FACT_FATHER_DRUNK_AND_SCIFI_OPTION_ON,// 235 FACT_MICKY_DRUNK,// 236 FACT_PLAYER_FORCED_WAY_INTO_BROTHEL,// 237 - + FACT_CONVO_RAT_1, FACT_PLAYER_PAID_FOR_TWO_IN_BROTHEL = 239, - + FACT_CONVO_GABBY_1, + FACT_CONVO_RAT_GABBY, FACT_PLAYER_OWNS_2_TOWNS_INCLUDING_OMERTA = 242, FACT_PLAYER_OWNS_3_TOWNS_INCLUDING_OMERTA,// 243 FACT_PLAYER_OWNS_4_TOWNS_INCLUDING_OMERTA,// 244 @@ -473,7 +498,7 @@ enum Facts FACT_KINGPIN_CAN_SEND_ASSASSINS,// 276 FACT_ESTONI_REFUELLING_POSSIBLE,// 277 FACT_MUSEUM_ALARM_WENT_OFF,// 278 - + FACT_CONVO_KYLE, FACT_MADDOG_IS_SPEAKER = 280, FACT_VAN_HAUSSEN_EXPLAINED_BOXING_RULES = 281, @@ -481,9 +506,12 @@ enum Facts FACT_ANGEL_MENTIONED_DEED = 282, FACT_IGGY_AVAILABLE_TO_ARMY,// 283 FACT_PC_HAS_CONRADS_RECRUIT_OPINION,// 284 + FACT_CONVO_ANGEL_3, + FACT_CONVO_ANGEL_4, + FACT_CONVO_ANGEL_5, FACT_NPC_HOSTILE_OR_PISSED_OFF = 289, - + FACT_CONVO_KINGPIN_2, FACT_TONY_IN_BUILDING = 291, FACT_SHANK_SPEAKING = 292, FACT_PABLO_ALIVE,// 293 @@ -491,19 +519,31 @@ enum Facts FACT_WALDO_ALIVE,// 295 FACT_PERKO_ALIVE,// 296 FACT_TONY_ALIVE,// 297 - + FACT_CONVO_TONY, FACT_VINCE_ALIVE = 299, FACT_JENNY_ALIVE,// 300 - + FACT_CONVO_SHANK_DYNAMO_BREWSTER, + FACT_CONVO_ARNOLD, FACT_ARNOLD_ALIVE = 303, FACT_ROCKET_RIFLE_EXISTS,// 304, FACT_24_HOURS_SINCE_JOEY_RESCUED,// 305 FACT_24_HOURS_SINCE_DOCTOR_TALKED_TO, // 306 FACT_OK_USE_ICECREAM, // 307 FACT_KINGPIN_DEAD,// 308 + FACT_CONVO_KINGPIN_3, + FACT_CONVO_DOREEN_2, + FACT_CONVO_DOREEN_JOE, + FACT_CONVO_JOE_2, + FACT_CONVO_JOE_3 = 314, + FACT_CONVO_JOE_4, + FACT_CONVO_JOE_5, + FACT_CONVO_JOE_6, FACT_KIDS_ARE_FREE = 318, FACT_PLAYER_IN_SAME_ROOM,// 319 + FACT_CONVO_BRENDA_2, + FACT_CONVO_BRENDA_3, + FACT_CONVO_MARIA_2, FACT_PLAYER_IN_CONTROLLED_DRASSEN_MINE = 324, FACT_PLAYER_SPOKE_TO_CAMBRIA_MINER,// 325 @@ -514,19 +554,27 @@ enum Facts FACT_PLAYER_IN_CONTROLLED_ALMA_MINE,// 330 FACT_PLAYER_SPOKE_TO_GRUMM_MINER,// 331 FACT_PLAYER_IN_CONTROLLED_GRUMM_MINE,// 332 - + FACT_CONVO_GENERAL_MADLAB, FACT_LARRY_CHANGED = 334, FACT_PLAYER_KNOWS_ABOUT_BLOODCAT_LAIR,// 335 FACT_HOSPITAL_FREEBIE_DECISION_MADE,// 336 FACT_ENOUGH_LOYALTY_TO_TRAIN_MILITIA,// 337 FACT_WALKER_AT_BAR,// 338 - + FACT_CONVO_DAVE_3, FACT_JOEY_ALIVE = 340, FACT_UNPROPOSITIONED_FEMALE_SPEAKING_TO_NPC,// 341 FACT_84_AND_85_TRUE,// 342 + FACT_CONVO_DAVE_4, + + FACT_CONVO_JOHN_2 = 345, + FACT_CONVO_SKYRIDER_3, + FACT_CONVO_JOEY_2, + FACT_CONVO_IGGY, FACT_KINGPIN_WILL_LEARN_OF_MONEY_GONE = 350, - + FACT_CONVO_MADDOG_2, + FACT_CONVO_MADLAB_4, + FACT_CONVO_MADLAB_5, FACT_SKYRIDER_IN_B15 = 354, FACT_SKYRIDER_IN_C16,// 355 FACT_SKYRIDER_IN_E14,// 356 @@ -534,11 +582,11 @@ enum Facts FACT_SKYRIDER_HINT_GIVEN,// 358 FACT_KINGPIN_IS_ENEMY,// 359 FACT_BRENDA_PATIENCE_TIMER_EXPIRED,// 360 - + FACT_CONVO_MATT, FACT_DYNAMO_NOT_SPEAKER = 362, FACT_PABLO_BRIBED = 365, - + FACT_CONVO_PABLO_2, FACT_CONRAD_SHOULD_GO = 367, FACT_PLAYER_KILLED_BOXERS = 368, @@ -613,8 +661,7 @@ enum Facts FACT_PLAYER_KNOWS_ABOUT_FAN_STOPPING,// 424 #endif - // when talking to Manuel, we use this flag - FACT_MANUEL_DIALOGUE_STATE_1_REACHED = 430, + FACT_CONVO_MANUEL = 430, } ; //** END FACTS *************************