Skip to content

Instantly share code, notes, and snippets.

@i30817

i30817/clanquests.diff

Created December 26, 2022 05:36
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save i30817/5c14d015850fed17ce2fd5cd87c46449 to your computer and use it in GitHub Desktop.
Save i30817/5c14d015850fed17ce2fd5cd87c46449 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
clanquests.diff
Index: CQM/dlg/downtown la/damsel.dlg
===================================================================
--- CQM.orig/dlg/downtown la/damsel.dlg
+++ CQM/dlg/downtown la/damsel.dlg
@@ -1297,11 +1297,11 @@
{ 1297 }{ (Starting Condition) }{ }{ 751 }{ G.Player_Anarch == 1 and G.Story_State == 115 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 1298 }{ (Starting Condition) }{ }{ 711 }{ G.Prince_Truce == 1 and G.Player_Anarch == 0 and G.Griffith_Open == 0 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 1299 }{ (Starting Condition) }{ }{ 1031 }{ pc.GetQuestState("Bmagic") == 1 or pc.GetQuestState("Bmagic") == 6 }{ }{ }{ }{ }{ }{ }{ }{ }
-{ 1300 }{ (Starting Condition) }{ }{ 900 }{ G.Player_Anarch == 1 and G.Regent_Pissed < 3 and IsClan(pc,"Brujah") and G.Lost_Damsel_Quest < 1 and pc.GetQuestState("Bmagic") < 1 }{ }{ }{ }{ }{ }{ }{ }{ }
+{ 1300 }{ (Starting Condition) }{ }{ 900 }{ G.Player_Anarch == 1 and G.Regent_Pissed < 3 and G.Lost_Damsel_Quest < 1 and pc.GetQuestState("Bmagic") < 1 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 1301 }{ (Starting Condition) }{ }{ 601 }{ G.Player_Anarch == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 1302 }{ (Starting Condition) }{ }{ 551 }{ G.Damsel_Hate == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 1303 }{ (Starting Condition) }{ }{ 541 }{ G.Damsel_Like < -5 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 1304 }{ (Starting Condition) }{ }{ 881 }{ G.Damsel_Like < -2 and G.Damsel_Like >= -5 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 1305 }{ (Starting Condition) }{ }{ 831 }{ G.Damsel_Like >= 3 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 1306 }{ (Starting Condition) }{ }{ 861 }{ G.Damsel_Know == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
-{ 1307 }{ (Starting Condition) }{ }{ 1 }{ npc.times_talked == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
\ No newline at end of file
+{ 1307 }{ (Starting Condition) }{ }{ 1 }{ npc.times_talked == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
Index: CQM/dlg/hollywood/isaac.dlg
===================================================================
--- CQM.orig/dlg/hollywood/isaac.dlg
+++ CQM/dlg/hollywood/isaac.dlg
@@ -1128,7 +1128,7 @@
{ 1128 }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }
{ 1129 }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }
{ 1130 }{ (Starting Condition) }{ }{ 1080 }{ G.Player_Sabbat==1 }{ }{ }{ }{ }{ }{ }{ }{ }
-{ 1131 }{ (Starting Condition) }{ }{ 1002 }{ IsClan(pc,"Toreador") and G.Story_State >= 40 and pc.GetQuestState("favors") < 1 }{ }{ }{ }{ }{ }{ }{ }{ }
+{ 1131 }{ (Starting Condition) }{ }{ 1002 }{ G.Story_State >= 40 and pc.GetQuestState("favors") < 1 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 1132 }{ (Starting Condition) }{ }{ 721 }{ G.Story_State >= 40 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 1133 }{ (Starting Condition) }{ }{ 971 }{ G.Isaac_Taxi == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 1134 }{ (Starting Condition) }{ }{ 721 }{ G.Isaac_Quest == 2 }{ }{ }{ }{ }{ }{ }{ }{ }
@@ -1138,4 +1138,4 @@
{ 1138 }{ (Starting Condition) }{ }{ 391 }{ G.Isaac_Movie == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 1139 }{ (Starting Condition) }{ }{ 271 }{ G.Isaac_Item == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 1140 }{ (Starting Condition) }{ }{ 261 }{ G.Isaac_Tribute == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
-{ 1141 }{ (Starting Condition) }{ }{ 1 }{ npc.times_talked == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
\ No newline at end of file
+{ 1141 }{ (Starting Condition) }{ }{ 1 }{ npc.times_talked == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
Index: CQM/dlg/main characters/beckett.dlg
===================================================================
--- CQM.orig/dlg/main characters/beckett.dlg
+++ CQM/dlg/main characters/beckett.dlg
@@ -329,7 +329,7 @@
{ 329 }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }
{ 330 }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }
{ 331 }{ Oh, don't let me interrupt your progress - if indeed you've made some. My reason for being here's probably being bid on as we speak. Someone is certainly going to be surprised when they find out they've just paid a kingly sum for a desiccated old corpse. }{ Oh, don't let me interrupt your progress - if indeed you've made some. My reason for being here's probably being bid on as we speak. Someone is certainly going to be surprised when they find out they've just paid a kingly sum for a desiccated old corpse. }{ # }{ npc.SetDisposition("Joy", 1) }{ G.Story_State = 30 }{ }{ }{ }{ }{ }{ }{ }
-{ 332 }{ (AUTO-LINK) }{ (AUTO-LINK) }{ 1097 }{ IsClan(pc,"Gangrel") }{ }{ }{ }{ }{ }{ }{ }{ }
+{ 332 }{ (AUTO-LINK) }{ (AUTO-LINK) }{ 1097 }{ }{ }{ }{ }{ }{ }{ }{ }{ }
{ 333 }{ I have a job to do, that's all. Goodbye, Beckett. }{ I have a job to do, that's all. Goodbye, Beckett. }{ 0 }{ }{ G.Beckett_Goodbye = 1 }{ }{ }{ }{ }{ }{ }{ I will rediscover the old box. Here I go. }
{ 334 }{ Blah, blah. Yeah, yeah. I don't care. I'm leaving. }{ Blah, blah. Yeah, yeah. I don't care. I'm leaving. }{ 0 }{ }{ G.Beckett_Goodbye = 1 }{ }{ }{ }{ }{ }{ }{ Blah, blah, blah.... I am gone. }
{ 335 }{ We've got to stop meeting like this Beckett. It's suspicious. Goodbye. }{ We've got to stop meeting like this Beckett. It's suspicious. Goodbye. }{ 0 }{ }{ G.Beckett_Goodbye = 1 }{ }{ }{ }{ }{ }{ }{ Stop being my shadow! That is all. }
@@ -339,7 +339,7 @@
{ 339 }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }
{ 340 }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }
{ 341 }{ Life's a splendid thing to indulge in... pity we're dead. Well, my work here's stolen away into the night, think I'll do the same. }{ Life's a splendid thing to indulge in... pity we're dead. Well, my work here's stolen away into the night, think I'll do the same. }{ # }{ npc.SetDisposition("Joy", 1) }{ G.Story_State = 30 }{ }{ }{ }{ }{ }{ }{ }
-{ 342 }{ (AUTO-LINK) }{ (AUTO-LINK) }{ 1097 }{ IsClan(pc,"Gangrel") }{ }{ }{ }{ }{ }{ }{ }{ So long, whoever you are. }
+{ 342 }{ (AUTO-LINK) }{ (AUTO-LINK) }{ 1097 }{ }{ }{ }{ }{ }{ }{ }{ }{ So long, whoever you are. }
{ 343 }{ Goodbye, Beckett }{ Goodbye, Beckett. }{ 0 }{ }{ G.Beckett_Goodbye = 1 }{ }{ }{ }{ }{ }{ }{ If you find the box, please put it in the night deposit slot of the tower. Thanks. }
{ 344 }{ If you find the sarcophagus, call the prince. Goodnight. }{ If you find the sarcophagus, call the prince. Goodnight. }{ 0 }{ }{ G.Beckett_Goodbye = 1 }{ }{ }{ }{ }{ }{ }{ }
{ 345 }{ You do that. }{ You do that. }{ 0 }{ }{ G.Beckett_Goodbye = 1 }{ }{ }{ }{ }{ }{ }{ I am gone too. }
@@ -349,7 +349,7 @@
{ 349 }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }
{ 350 }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }
{ 351 }{ My sentiments exactly, but there's time to rectify that. Well, my work here's stolen away into the night, think I'll do the same. }{ My sentiments exactly, but there's time to rectify that. Well, my work here's stolen away into the night, think I'll do the same. }{ # }{ npc.SetDisposition("Joy", 1) }{ G.Story_State = 30 }{ }{ }{ }{ }{ }{ }{ }
-{ 352 }{ (AUTO-LINK) }{ (AUTO-LINK) }{ 1097 }{ IsClan(pc,"Gangrel") }{ }{ }{ }{ }{ }{ }{ }{ }
+{ 352 }{ (AUTO-LINK) }{ (AUTO-LINK) }{ 1097 }{ }{ }{ }{ }{ }{ }{ }{ }{ }
{ 353 }{ Goodbye, Beckett. }{ Goodbye, Beckett. }{ 0 }{ }{ G.Beckett_Goodbye = 1 }{ }{ }{ }{ }{ }{ }{ So long, whoever you are. }
{ 354 }{ If you find the sarcophagus, call the prince. Goodnight. }{ If you find the sarcophagus, call the prince. Goodnight. }{ 0 }{ }{ G.Beckett_Goodbye = 1 }{ }{ }{ }{ }{ }{ }{ If you find the box, please put it in the night deposit slot of the tower. Thanks. }
{ 355 }{ You do that. }{ You do that. }{ 0 }{ }{ G.Beckett_Goodbye = 1 }{ }{ }{ }{ }{ }{ }{ I am gone too. }
@@ -359,7 +359,7 @@
{ 359 }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }
{ 360 }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }
{ 361 }{ Remember, the truth won't be told in time - it will be told by us. Well, my work here's stolen away into the night, think I'll do the same. }{ Remember, the truth won't be told in time - it will be told by us. Well, my work here's stolen away into the night, think I'll do the same. }{ # }{ npc.SetDisposition("Joy", 1) }{ G.Story_State = 30 }{ }{ }{ }{ }{ }{ }{ }
-{ 362 }{ (AUTO-LINK) }{ (AUTO-LINK) }{ 1097 }{ IsClan(pc,"Gangrel") }{ }{ }{ }{ }{ }{ }{ }{ }
+{ 362 }{ (AUTO-LINK) }{ (AUTO-LINK) }{ 1097 }{ }{ }{ }{ }{ }{ }{ }{ }{ }
{ 363 }{ Goodbye, Beckett. }{ Goodbye, Beckett. }{ 0 }{ }{ G.Beckett_Goodbye = 1 }{ }{ }{ }{ }{ }{ }{ So long, whoever you are. }
{ 364 }{ If you find the sarcophagus, call the prince. Goodnight. }{ If you find the sarcophagus, call the prince. Goodnight. }{ 0 }{ }{ G.Beckett_Goodbye = 1 }{ }{ }{ }{ }{ }{ }{ If you find the box, please put it in the night deposit slot of the tower. Thanks. }
{ 365 }{ You do that. }{ You do that. }{ 0 }{ }{ G.Beckett_Goodbye = 1 }{ }{ }{ }{ }{ }{ }{ I am gone too. }
@@ -879,9 +879,9 @@
{ 879 }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }
{ 880 }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }
{ 881 }{ Remember, Dr. Johansen is an innocent - he has no idea we actually exist. Try not to put the idea in his head. }{ Remember, Dr. Johansen is an innocent - he has no idea we actually exist. Try not to put the idea in his head. }{ # }{ npc.SetDisposition("Neutral", 1) }{ }{ }{ }{ }{ }{ }{ }{ }
-{ 882 }{ Okay. }{ Okay. }{ 0 }{ not IsClan(pc, "Gangrel") or pc.GetQuestState("fresearch") < 1 }{ }{ }{ }{ }{ }{ }{ }{ WHAT IDEA? }
-{ 883 }{ Okay. }{ Okay. }{ 1169 }{ IsClan(pc, "Gangrel") and pc.GetQuestState("fresearch") > 1 and (pc.GetQuestState("fresearch") < 4 or pc.GetQuestState("fresearch") > 7) }{ }{ }{ }{ }{ }{ }{ }{ }
-{ 884 }{ Okay. }{ Okay. }{ 0 }{ IsClan(pc, "Gangrel") and (pc.GetQuestState("fresearch") > 3 and pc.GetQuestState("fresearch") < 8) }{ }{ }{ }{ }{ }{ }{ }{ }
+{ 882 }{ Okay. }{ Okay. }{ 0 }{ pc.GetQuestState("fresearch") < 1 }{ }{ }{ }{ }{ }{ }{ }{ WHAT IDEA? }
+{ 883 }{ Okay. }{ Okay. }{ 1169 }{ pc.GetQuestState("fresearch") > 1 and (pc.GetQuestState("fresearch") < 4 or pc.GetQuestState("fresearch") > 7) }{ }{ }{ }{ }{ }{ }{ }{ }
+{ 884 }{ Okay. }{ Okay. }{ 0 }{ pc.GetQuestState("fresearch") > 3 and pc.GetQuestState("fresearch") < 8 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 885 }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }
{ 886 }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }
{ 887 }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }{ }
Index: CQM/dlg/main characters/regent.dlg
===================================================================
--- CQM.orig/dlg/main characters/regent.dlg
+++ CQM/dlg/main characters/regent.dlg
@@ -1517,10 +1517,10 @@
{ 1517 }{ (Starting Condition) }{ }{ 1241 }{ G.Story_State >= 100 and G.Regent_Ending == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 1518 }{ (Starting Condition) }{ }{ 851 }{ G.Story_State >= 100 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 1519 }{ (Starting Condition) }{ }{ 1359 }{ pc.GetQuestState("madness") == 6 }{ }{ }{ }{ }{ }{ }{ }{ }
-{ 1520 }{ (Starting Condition) }{ }{ 1288 }{ G.Regent_Family == 3 and pc.GetQuestState("madness") < 1 and not G.rejected_max == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
+{ 1520 }{ (Starting Condition) }{ }{ 1288 }{ pc.GetQuestState("madness") < 1 and ((G.Regent_Gargoyle == 1 and G.Regent_Solvedplague == 1) or (G.Regent_Family == 3 and not G.rejected_max == 1)) }{ }{ }{ }{ }{ }{ }{ }{ }
{ 1521 }{ (Starting Condition) }{ }{ 1270 }{ pc.GetQuestState("Bmagic") > 0 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 1522 }{ (Starting Condition) }{ }{ 791 }{ G.Regent_Pissed == 3 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 1523 }{ (Starting Condition) }{ }{ 771 }{ G.Regent_Pissed > 0 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 1524 }{ (Starting Condition) }{ }{ 31 }{ G.Regent_Introduced == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 1525 }{ (Starting Condition) }{ }{ 11 }{ G.Regent_Invitation == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
-{ 1526 }{ (Starting Condition) }{ }{ 1 }{ G.Regent_Invitation == 0 }{ }{ }{ }{ }{ }{ }{ }{ }
\ No newline at end of file
+{ 1526 }{ (Starting Condition) }{ }{ 1 }{ G.Regent_Invitation == 0 }{ }{ }{ }{ }{ }{ }{ }{ }
Index: CQM/dlg/santa monica/bertram.dlg
===================================================================
--- CQM.orig/dlg/santa monica/bertram.dlg
+++ CQM/dlg/santa monica/bertram.dlg
@@ -1215,7 +1215,7 @@
{ 1215 }{... }{... }{ # }{ }{ }{ }{ }{ }{ }{ }{ }{ }
{ 1216 }{ (Starting Condition) }{ }{ 1190 }{ G.Sabbat_Confront==1 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 1217 }{ (Starting Condition) }{ }{ 1050 }{ pc.GetQuestState("sins") > 0 and pc.GetQuestState("sins") < 7 }{ }{ }{ }{ }{ }{ }{ }{ }
-{ 1218 }{ (Starting Condition) }{ }{ 969 }{ G.Story_State > 39 and IsClan(pc, "Nosferatu") and not G.tung_reject == 1 and pc.GetQuestState("sins") < 1 }{ }{ }{ }{ }{ }{ }{ }{ }
+{ 1218 }{ (Starting Condition) }{ }{ 969 }{ G.Story_State > 39 and not G.tung_reject == 1 and pc.GetQuestState("sins") < 1 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 1219 }{ (Starting Condition) }{ }{ 101 }{ G.Bertram_RAM == 2 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 1220 }{ (Starting Condition) }{ }{ 571 }{ G.Bertram_RAM == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 1221 }{ (Starting Condition) }{ }{ 531 }{ G.CD_Quest == 1 and G.Patch_Plus == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
@@ -1223,4 +1223,4 @@
{ 1223 }{ (Starting Condition) }{ }{ 101 }{ G.Bertram_Goodjob == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 1224 }{ (Starting Condition) }{ }{ 631 }{ (G.Story_State >= 5 and G.Story_State < 25) and G.Bertram_Goodjob == 0 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 1225 }{ (Starting Condition) }{ }{ 461 }{ G.Bertram_Go == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
-{ 1226 }{ (Starting Condition) }{ }{ 101 }{ npc.times_talked > 1 }{ }{ }{ }{ }{ }{ }{ }{ }
\ No newline at end of file
+{ 1226 }{ (Starting Condition) }{ }{ 101 }{ npc.times_talked > 1 }{ }{ }{ }{ }{ }{ }{ }{ }
Index: CQM/dlg/santa monica/jeanette.dlg
===================================================================
--- CQM.orig/dlg/santa monica/jeanette.dlg
+++ CQM/dlg/santa monica/jeanette.dlg
@@ -1072,8 +1072,8 @@
{ 1072 }{ (Starting Condition) }{ }{ 1049 }{ G.Player_Sabbat==1 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 1073 }{ (Starting Condition) }{ }{ 944 }{ pc.GetQuestState("conspire") > 0 and not pc.GetQuestState("conspire") == 7 and not pc.GetQuestState("conspire") == 8 and not G.malkavian_success == 1 and not G.malkavian_fail == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 1074 }{ (Starting Condition) }{ }{ 884 }{ pc.GetQuestState("conspire") == 7 or pc.GetQuestState("conspire") == 8 }{ }{ }{ }{ }{ }{ }{ }{ }
-{ 1075 }{ (Starting Condition) }{ }{ 938 }{ G.Story_State > 44 and IsClan(pc,"Malkavian") and G.Tourette_Told_Plan == 1 and not pc.GetQuestState("conspire") == 8 and not G.malkavian_success == 1 and not G.malkavian_fail == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
-{ 1076 }{ (Starting Condition) }{ }{ 817 }{ G.Story_State > 44 and IsClan(pc,"Malkavian") and not pc.GetQuestState("conspire") == 8 and not G.malkavian_success == 1 and not G.malkavian_fail == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
+{ 1075 }{ (Starting Condition) }{ }{ 938 }{ G.Story_State > 44 and G.Tourette_Told_Plan == 1 and not pc.GetQuestState("conspire") == 8 and not G.malkavian_success == 1 and not G.malkavian_fail == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
+{ 1076 }{ (Starting Condition) }{ }{ 817 }{ G.Story_State > 44 and not pc.GetQuestState("conspire") == 8 and not G.malkavian_success == 1 and not G.malkavian_fail == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 1077 }{ (Starting Condition) }{ }{ 481 }{ G.Jeanette_Baron == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 1078 }{ (Starting Condition) }{ }{ 461 }{ G.Therese_Dead == 1 and G.Jeanette_Side < 4 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 1079 }{ (Starting Condition) }{ }{ 471 }{ G.Therese_Dead == 1 and G.Jeanette_Side >= 4 }{ }{ }{ }{ }{ }{ }{ }{ }
Index: CQM/dlg/santa monica/therese.dlg
===================================================================
--- CQM.orig/dlg/santa monica/therese.dlg
+++ CQM/dlg/santa monica/therese.dlg
@@ -913,8 +913,8 @@
{ 913 }{ (Starting Condition) }{ }{ 836 }{ pc.GetQuestState("madness") == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 914 }{ (Starting Condition) }{ }{ 820 }{ pc.GetQuestState("conspire") > 0 and not pc.GetQuestState("conspire") == 7 and not pc.GetQuestState("conspire") == 8 and not G.malkavian_success == 1 and not G.malkavian_fail == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 915 }{ (Starting Condition) }{ }{ 761 }{ pc.GetQuestState("conspire") == 7 or pc.GetQuestState("conspire") == 8 }{ }{ }{ }{ }{ }{ }{ }{ }
-{ 916 }{ (Starting Condition) }{ }{ 814 }{ G.Story_State > 44 and IsClan(pc,"Malkavian") and G.Tourette_Told_Plan == 1 and not pc.GetQuestState("conspire") == 8 and not G.malkavian_success == 1 and not G.malkavian_fail == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
-{ 917 }{ (Starting Condition) }{ }{ 682 }{ G.Story_State > 44 and IsClan(pc,"Malkavian") and not pc.GetQuestState("conspire") == 8 and not G.malkavian_success == 1 and not G.malkavian_fail == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
+{ 916 }{ (Starting Condition) }{ }{ 814 }{ G.Story_State > 44 and G.Tourette_Told_Plan == 1 and not pc.GetQuestState("conspire") == 8 and not G.malkavian_success == 1 and not G.malkavian_fail == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
+{ 917 }{ (Starting Condition) }{ }{ 682 }{ G.Story_State > 44 and not pc.GetQuestState("conspire") == 8 and not G.malkavian_success == 1 and not G.malkavian_fail == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 918 }{ (Starting Condition) }{ }{ 431 }{ G.Jeanette_Dead == 1 and G.Therese_Side < 3 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 919 }{ (Starting Condition) }{ }{ 441 }{ G.Jeanette_Dead == 1 and G.Therese_Side >= 3 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 920 }{ (Starting Condition) }{ }{ 421 }{ G.Therese_Quest == 3 }{ }{ }{ }{ }{ }{ }{ }{ }
@@ -922,4 +922,4 @@
{ 922 }{ (Starting Condition) }{ }{ 251 }{ G.Jeanette_Refuse == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 923 }{ (Starting Condition) }{ }{ 251 }{ G.Jeanette_Quest == 2 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 924 }{ (Starting Condition) }{ }{ 241 }{ G.Therese_Quest == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
-{ 925 }{ (Starting Condition) }{ }{ 1 }{ npc.times_talked == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
\ No newline at end of file
+{ 925 }{ (Starting Condition) }{ }{ 1 }{ npc.times_talked == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
Index: CQM/dlg/santa monica/tourette.dlg
===================================================================
--- CQM.orig/dlg/santa monica/tourette.dlg
+++ CQM/dlg/santa monica/tourette.dlg
@@ -1261,12 +1261,12 @@
{ 1261 }{ (Starting Condition) }{ }{ 1129 }{ pc.GetQuestState("madness") == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 1262 }{ (Starting Condition) }{ }{ 1123 }{ pc.GetQuestState("conspire") > 0 and not pc.GetQuestState("conspire") == 7 and not pc.GetQuestState("conspire") == 8 and not G.malkavian_success == 1 and not G.malkavian_fail == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 1263 }{ (Starting Condition) }{ }{ 1047 }{ pc.GetQuestState("conspire") == 7 or pc.GetQuestState("conspire") == 8 }{ }{ }{ }{ }{ }{ }{ }{ }
-{ 1264 }{ (Starting Condition) }{ }{ 1111 }{ G.Story_State > 44 and IsClan(pc,"Malkavian") and G.Tourette_Told_Plan == 1 and not pc.GetQuestState("conspire") == 8 and not G.malkavian_success == 1 and not G.malkavian_fail == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
-{ 1265 }{ (Starting Condition) }{ }{ 942 }{ G.Story_State > 44 and IsClan(pc,"Malkavian") and not pc.GetQuestState("conspire") == 8 and not G.malkavian_success == 1 and not G.malkavian_fail == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
+{ 1264 }{ (Starting Condition) }{ }{ 1111 }{ G.Story_State > 44 and G.Tourette_Told_Plan == 1 and not pc.GetQuestState("conspire") == 8 and not G.malkavian_success == 1 and not G.malkavian_fail == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
+{ 1265 }{ (Starting Condition) }{ }{ 942 }{ G.Story_State > 44 and not pc.GetQuestState("conspire") == 8 and not G.malkavian_success == 1 and not G.malkavian_fail == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 1266 }{ (Starting Condition) }{ }{ 721 }{ G.Tourette_Change == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 1267 }{ (Starting Condition) }{ }{ 911 }{ G.Therese_Dead == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 1268 }{ (Starting Condition) }{ }{ 901 }{ G.Jeanette_Dead == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 1269 }{ (Starting Condition) }{ }{ 791 }{ G.Tourette_Wins == 1 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 1270 }{ (Starting Condition) }{ }{ 891 }{ G.Jeanette_Refuse >=1 }{ }{ }{ }{ }{ }{ }{ }{ }
{ 1271 }{ (Starting Condition) }{ }{ 1 }{ G.Therese_Seduce >= 4 }{ }{ }{ }{ }{ }{ }{ }{ }
-{ 1272 }{ (Starting Condition) }{ }{ 11 }{ G.Therese_Seduce < 4 }{ }{ }{ }{ }{ }{ }{ }{ }
\ No newline at end of file
+{ 1272 }{ (Starting Condition) }{ }{ 11 }{ G.Therese_Seduce < 4 }{ }{ }{ }{ }{ }{ }{ }{ }
Index: CQM/python/vamputil.py
===================================================================
--- CQM.orig/python/vamputil.py
+++ CQM/python/vamputil.py
@@ -2543,7 +2543,7 @@ def checkMasquerade():
if(level >= 2 and level < 5):
#changed by dan_upright 07/12/04
G = __main__.G
- if (G.In_Hollywood != 1 or G.Courier_QuickBuck != 1):
+ if (G.In_Hollywood != 1 or G.Courier_QuickBuck != 1 or G.Dream_World != 1):
i = 2
while(i <= level):
if(huntersDead[i - 2] == 0):
@@ -3817,7 +3817,7 @@ def testEmail(name):
return __main__.G.Velvet_Email == 1 and __main__.G.Story_State >= 70 and __main__.G.Player_Sabbat==0
if(name == "ventrueCQMStart"):
- return __main__.G.Story_State>=25 and __main__.FindPlayer().clan==8 and __main__.G.Player_Sabbat==0
+ return __main__.G.Story_State>=25 and __main__.G.Player_Sabbat==0
if(name == "ventrueCQMSuccess"):
return __main__.G.ventrue_quest_success == 1 and not __main__.G.hitman_dead == 1 and __main__.G.Player_Sabbat==0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment