diff --git a/edwin/baf/edwin.baf b/edwin/baf/edwin.baf index b642cff..15197cd 100644 --- a/edwin/baf/edwin.baf +++ b/edwin/baf/edwin.baf @@ -525,7 +525,6 @@ IF InParty(Myself) !See([ENEMY]) CombatCounter(0) - RealGlobalTimerExpired("EdwinRomance","GLOBAL") Global("EdwinMatch","GLOBAL",1) OR(17) Global("EdwinLoveTalk","LOCALS",2) diff --git a/edwin/dlg/asccomp.d b/edwin/dlg/asccomp.d deleted file mode 100644 index cf6f8f0..0000000 --- a/edwin/dlg/asccomp.d +++ /dev/null @@ -1 +0,0 @@ -ADD_TRANS_TRIGGER BALTH2 %fl#balth2state% ~!Global("EdwinRomanceActive","GLOBAL",2)~ DO 20 diff --git a/edwin/dlg/er_bodhi.d b/edwin/dlg/er_bodhi.d index 8f93654..1cfecdc 100644 --- a/edwin/dlg/er_bodhi.d +++ b/edwin/dlg/er_bodhi.d @@ -120,13 +120,14 @@ END IF ~~ EDWIN_REST1B SAY @32 ++ @33 - DO ~SetGlobal("EdwinRomance","GLOBAL",3) JoinParty()~ SOLVED_JOURNAL @34 EXIT + DO ~SetGlobal("EdwinRomance","GLOBAL",3) EraseJournalEntry(@17) JoinParty()~ SOLVED_JOURNAL @34 EXIT ++ @35 + EDWIN_REST1C END IF ~~ EDWIN_REST1C SAY @36 - IF ~~ DO ~SetGlobal("EdwinRomanceActive","GLOBAL",3) SetGlobal("KickedOut","LOCALS",1) EscapeAreaMove("AR0406",689,1127,0)~ SOLVED_JOURNAL @34 EXIT + IF ~~ DO ~EraseJournalEntry(@17) +SetGlobal("EdwinRomanceActive","GLOBAL",3) SetGlobal("KickedOut","LOCALS",1) EscapeAreaMove("AR0406",689,1127,0)~ SOLVED_JOURNAL @34 EXIT END IF ~~ EDWIN_REST2 @@ -145,12 +146,13 @@ END IF ~~ EDWIN_REST3 SAY @42 - IF ~~ DO ~JoinParty()~ SOLVED_JOURNAL @34 EXIT + IF ~~ DO ~EraseJournalEntry(@17) JoinParty()~ SOLVED_JOURNAL @34 EXIT END IF ~~ EDWIN_NOROOM SAY @43 - IF ~~ DO ~SetGlobal("KickedOut","LOCALS",1) EscapeAreaMove("AR0406",689,1127,0)~ SOLVED_JOURNAL @34 EXIT + IF ~~ DO ~EraseJournalEntry(@17) +SetGlobal("KickedOut","LOCALS",1) EscapeAreaMove("AR0406",689,1127,0)~ SOLVED_JOURNAL @34 EXIT END END diff --git a/edwin/dlg/erdekaras.d b/edwin/dlg/erdekaras.d index 2991739..eddeec9 100644 --- a/edwin/dlg/erdekaras.d +++ b/edwin/dlg/erdekaras.d @@ -89,7 +89,7 @@ IF ~~ THEN BEGIN EDDIE_LOVE2 SetGlobalTimer("MeetingWithDekaras","GLOBAL",ONE_DAY) SetGlobal("DekkieLetter","GLOBAL",3) EscapeArea()~ - UNSOLVED_JOURNAL @32 + UNSOLVED_JOURNAL @10000 EXIT END @@ -106,8 +106,11 @@ END IF ~~ THEN BEGIN EDDIE_LEAVE SAY @36 IF ~~ THEN DO ~ + EraseJournalEntry(@10000) + EraseJournalEntry(@10002) + EraseJournalEntry(@10004) EscapeArea()~ - SOLVED_JOURNAL @37 + SOLVED_JOURNAL @10001 EXIT END @@ -211,7 +214,7 @@ END IF ~~ THEN BEGIN DEKKIE15 SAY @76 - IF ~~ THEN DO ~SetGlobalTimer("LichQuest","GLOBAL",ONE_DAY) SetGlobal("EdwinLichQuest","GLOBAL",1) EscapeArea()~ UNSOLVED_JOURNAL @77 + IF ~~ THEN DO ~SetGlobalTimer("LichQuest","GLOBAL",ONE_DAY) SetGlobal("EdwinLichQuest","GLOBAL",1) EscapeArea()~ UNSOLVED_JOURNAL @10004 EXIT END //END OF THE SECOND DIALOG @@ -277,8 +280,12 @@ END IF ~~ DEKKIE21 SAY @94 - IF ~~ THEN DO ~SetGlobal("DekkieBye","GLOBAL",1)~ - SOLVED_JOURNAL @95 + IF ~~ THEN DO ~ + EraseJournalEntry(@10000) + EraseJournalEntry(@10002) + EraseJournalEntry(@10004) + SetGlobal("DekkieBye","GLOBAL",1)~ + SOLVED_JOURNAL @10005 EXIT END diff --git a/edwin/dlg/eredwin_dekkie.d b/edwin/dlg/eredwin_dekkie.d index a7f2fee..71ea026 100644 --- a/edwin/dlg/eredwin_dekkie.d +++ b/edwin/dlg/eredwin_dekkie.d @@ -24,11 +24,14 @@ END IF ~~ THEN BEGIN E163 SAY @6 IF ~~ THEN DO ~ + EraseJournalEntry(@10000) + EraseJournalEntry(@10002) + EraseJournalEntry(@10004) SetGlobal("EdwinRomanceActive","GLOBAL",3) GivePartyAllEquipment() LeaveParty() EscapeArea()~ - SOLVED_JOURNAL @7 + SOLVED_JOURNAL @10003 EXIT END @@ -41,11 +44,14 @@ END IF WEIGHT #17 ~GlobalTimerExpired("MeetingWithDekaras","GLOBAL") Global("DekkieLetter","GLOBAL",1) Global("DekarasComplain","GLOBAL",1)~ THEN BEGIN E165 SAY @9 IF ~~ THEN DO ~ + EraseJournalEntry(@10000) + EraseJournalEntry(@10002) + EraseJournalEntry(@10004) SetGlobal("EdwinRomanceActive","GLOBAL",3) GivePartyAllEquipment() LeaveParty() EscapeArea()~ - SOLVED_JOURNAL @7 + SOLVED_JOURNAL @10003 EXIT END diff --git a/edwin/dlg/erlovetalk2.d b/edwin/dlg/erlovetalk2.d index e341abd..63e0223 100644 --- a/edwin/dlg/erlovetalk2.d +++ b/edwin/dlg/erlovetalk2.d @@ -1062,16 +1062,19 @@ END IF ~~ THEN BEGIN E159 SAY @468 IF ~~ THEN DO ~SetGlobalTimer("MeetingWithDekaras","GLOBAL",TWO_DAYS) SetGlobal("DekkieLetter","GLOBAL",1)~ - UNSOLVED_JOURNAL @469 EXIT + UNSOLVED_JOURNAL @10002 EXIT END IF ~~ THEN BEGIN E160 SAY @470 IF ~~ THEN DO ~ + EraseJournalEntry(@10000) + EraseJournalEntry(@10002) + EraseJournalEntry(@10004) GivePartyAllEquipment() SetGlobal("EdwinRomanceActive","GLOBAL",3) LeaveParty() - EscapeArea()~ SOLVED_JOURNAL @471 EXIT + EscapeArea()~ SOLVED_JOURNAL @10003 EXIT END //Edwin LT 22 diff --git a/edwin/dlg/flirts.d b/edwin/dlg/flirts.d index acb296a..bb6deeb 100644 --- a/edwin/dlg/flirts.d +++ b/edwin/dlg/flirts.d @@ -186,17 +186,17 @@ APPEND EDWINJ IF ~IsGabber(Player1) OR(2) Global("EdwinRomanceActive","GLOBAL",1) Global("EdwinRomanceActive","GLOBAL",2) Gender("Edwin", MALE)~ Base SAY ~~ - + ~Global("EdwinRomanceActive","GLOBAL",2) Global("PlayerLooksLikeDrow","GLOBAL",1) Global("ERDrow", "LOCALS", 0)~ + @46 DO ~SetGlobal("ERDrow", "LOCALS", 1) ActionOverride(Player1, SetDialog("ERPlayer"))~ + Drow1 + + ~Global("EdwinRomanceActive","GLOBAL",2) Global("PlayerLooksLikeDrow","GLOBAL",1) Global("ERDrow", "LOCALS", 0)~ + @46 DO ~SetGlobal("ERDrow", "LOCALS", 1)~ + Drow1 + ~Global("EdwinRomanceActive","GLOBAL",2) Global("ERDrow", "LOCALS", 1) OR(2) AreaCheck("AR2202") AreaCheck("AR2203")~ + @47 DO ~ActionOverride(Player1, SetGlobal("ERDrow", "LOCALS", 1)) ActionOverride(Player1, StartDialog("ERPlayer", Player1))~ EXIT + ~Global("EdwinRomanceActive","GLOBAL",2) GlobalGT("DrowTalk","GLOBAL",4) !Global("ERSlay", "LOCALS", 1)~ + @48 DO ~SetGlobal("ERSlay", "LOCALS", 1)~ + Slayer1 + ~Global("EdwinRomanceActive","GLOBAL",2) GlobalGT("EdwinVampire","GLOBAL",4) !Global("ERVamp", "LOCALS", 1)~ + @49 DO ~SetGlobal("ERVamp", "LOCALS", 1)~ + Vamp1 - + ~!Global("EdwinRomanceActive","GLOBAL",3) !Global("EdwinRomanceActive","GLOBAL",0) !Global("ERConj", "LOCALS", 1)~ + @50 DO ~SetGlobal("ERConj", "LOCALS", 1) ActionOverride(Player1, SetDialog("ERPlayer"))~ + Conj1 + + ~!Global("EdwinRomanceActive","GLOBAL",3) !Global("EdwinRomanceActive","GLOBAL",0) !Global("ERConj", "LOCALS", 1)~ + @50 DO ~SetGlobal("ERConj", "LOCALS", 1)~ + Conj1 + ~!Global("EdwinRomanceActive","GLOBAL",3) !Global("EdwinromanceActive","GLOBAL",0) !Global("ERCook", "GLOBAL", 1) AreaType(CITY)~ + @51 + Cook1 - + ~!Global("EdwinRomanceActive","GLOBAL",3) !Global("EdwinRomanceActive","GLOBAL",0) !Global("ERCowl", "LOCALS", 1)~ + @52 DO ~SetGlobal("ErCowl", "LOCALS", 1) ActionOverride(Player1, SetDialog("ERPlayer"))~ + Cowl1 - + ~!Global("EdwinRomanceActive","GLOBAL",3) !Global("EdwinRomanceActive","GLOBAL",0) !Global("ERFirk", "LOCALS", 1) Dead("Firkra02")~ + @53 DO ~SetGlobal("ERFirk", "LOCALS", 1) ActionOverride(Player1, SetDialog("ERPlayer"))~ + Firk1 + + ~!Global("EdwinRomanceActive","GLOBAL",3) !Global("EdwinRomanceActive","GLOBAL",0) !Global("ERCowl", "LOCALS", 1)~ + @52 DO ~SetGlobal("ErCowl", "LOCALS", 1)~ + Cowl1 + + ~!Global("EdwinRomanceActive","GLOBAL",3) !Global("EdwinRomanceActive","GLOBAL",0) !Global("ERFirk", "LOCALS", 1) Dead("Firkra02")~ + @53 DO ~SetGlobal("ERFirk", "LOCALS", 1)~ + Firk1 + ~!Global("EdwinRomanceActive","GLOBAL",3) !Global("EdwinRomanceActive","GLOBAL",0) !Global("ERMaev", "LOCALS", 1) Dead("Maevar")~ + @54 + Maev1 + ~!Global("EdwinRomanceActive","GLOBAL",3) !Global("EdwinRomanceActive","GLOBAL",0) !Global("ERNose", "LOCALS", 1)~ + @55 DO ~SetGlobal("ERNose", "LOCALS", 1) ActionOverride(Player1, SetGlobal("ERNose", "LOCALS", 1)) ActionOverride(Player1, StartDialog("ERPlayer", Player1))~ EXIT - + ~!Global("EdwinRomanceActive","GLOBAL",3) !Global("EdwinRomanceActive","GLOBAL",0) !Global("ERHome", "LOCALS", 1)~ + @56 DO ~ActionOverride(Player1, SetGlobal("ERHome", "LOCALS", 1)) ActionOverride(Player1, StartDialogue("ERPlayer", Player1))~ EXIT + + ~!Global("EdwinRomanceActive","GLOBAL",3) !Global("EdwinRomanceActive","GLOBAL",0) !Global("ERHome", "LOCALS", 1)~ + @56 DO ~SetGlobal("ERHome", "LOCALS", 1) ActionOverride(Player1, SetGlobal("ERHome", "LOCALS", 1)) ActionOverride(Player1, StartDialogue("ERPlayer", Player1))~ EXIT + ~Global("EdwinRomanceActive","GLOBAL",2) OR(9) AreaCheck("AR0313") AreaCheck("AR0406") AreaCheck("AR0509") AreaCheck("AR0513") AreaCheck("AR0709") AreaCheck("AR0704") AreaCheck("AR1602") AreaCheck("AR2010") AreaCheck("AR2202")~ + @57 DO ~ActionOverride(Player1, SetDialog("ERPlayer"))~ + Feet1 + ~Global("EdwinRomanceActive","GLOBAL",2)~ + @58 DO ~ActionOverride(Player1, SetGlobal("ERBHug", "LOCALS", 1)) ActionOverride(Player1, StartDialog("ERPlayer", Player1))~ EXIT + ~Global("EdwinRomanceActive","GLOBAL",2) !LOS("Aerie", 30) !LOS("Anomen", 30) !LOS("Haerdalis", 30) !LOS("Imoen", 30) !LOS("Imoen2", 30) !LOS("Jaheira", 30) !LOS("Jan", 30) !LOS("Korgan", 30) !LOS("Mazzy", 30) !LOS("Minsc", 30) !LOS("Nalia", 30) !LOS("Valygar", 30) !LOS("Viconia", 30) !LOS("Yoshimo", 30)~ + @59 DO ~ActionOverride(Player1, SetGlobal("ERshug", "LOCALS", 1)) ActionOverride(Player1, StartDialog("ERPlayer", Player1))~ EXIT @@ -420,7 +420,7 @@ IF ~~ Cowl3 SAY @139 = @140 - IF ~~ DO ~ActionOverride(Player1,SetDialogue(""))~ EXIT + IF ~~ EXIT END IF ~~ Firk1 @@ -928,7 +928,7 @@ IF ~~ THEN ERPlayer Drow2a @323 == EDWINJ @324 -END IF ~~ DO ~ActionOverride(Player1, SetDialogue(""))~ EXIT +END IF ~~ EXIT CHAIN IF ~~ THEN ERPlayer Drow2b diff --git a/edwin/dlg/tflirts.d b/edwin/dlg/tflirts.d index 7b5f2fc..e41f2a7 100644 --- a/edwin/dlg/tflirts.d +++ b/edwin/dlg/tflirts.d @@ -186,14 +186,14 @@ APPEND EDWIN25J IF ~IsGabber(Player1) Global("EdwinRomanceActive","GLOBAL",2) Gender("Edwin", MALE)~ Base SAY ~~ - + ~OR(2) Global("HelmRitualDone","GLOBAL",1) Global("DemogorgonIsDead","GLOBAL",1) !Global("ERDemo", "LOCALS", 1)~ + @45 DO ~SetGlobal("ERDemo", "LOCALS", 1) ActionOverride(Player1, StartDialog("Erplay25", Player1))~ EXIT + + ~OR(2) Global("HelmRitualDone","GLOBAL",1) Global("DemogorgonIsDead","GLOBAL",1) !Global("ERDemo", "LOCALS", 1)~ + @45 DO ~SetGlobal("ERDemo", "LOCALS", 1) ActionOverride(Player1, SetGlobal("ERDemo", "LOCALS", 1)) ActionOverride(Player1, StartDialog("Erplay25", Player1))~ EXIT + ~Global("EdwinRomanceActive","GLOBAL",2) GlobalGT("EdwinVampire","GLOBAL",4) !Global("ERVamp", "LOCALS", 1)~ + @46 DO ~SetGlobal("ERVamp", "LOCALS", 1)~ + Vamp1 - + ~!Global("EdwinRomanceActive","GLOBAL",3) !Global("EdwinRomanceActive","GLOBAL",0) !Global("ERConj", "LOCALS", 1)~ + @47 DO ~SetGlobal("ERConj", "LOCALS", 1) ActionOverride(Player1, SetDialog("Erplay25"))~ + Conj1 + + ~!Global("EdwinRomanceActive","GLOBAL",3) !Global("EdwinRomanceActive","GLOBAL",0) !Global("ERConj", "LOCALS", 1)~ + @47 DO ~SetGlobal("ERConj", "LOCALS", 1)~ + Conj1 + ~!Global("EdwinRomanceActive","GLOBAL",3) !Global("EdwinromanceActive","GLOBAL",0) !Global("ERCook", "GLOBAL", 1) AreaType(CITY)~ + @48 + Cook1 - + ~!Global("EdwinRomanceActive","GLOBAL",3) !Global("EdwinRomanceActive","GLOBAL",0) !Global("ERCowl", "LOCALS", 1)~ + @49 DO ~SetGlobal("ErCowl", "LOCALS", 1) ActionOverride(Player1, SetDialog("Erplay25"))~ + Cowl1 + + ~!Global("EdwinRomanceActive","GLOBAL",3) !Global("EdwinRomanceActive","GLOBAL",0) !Global("ERCowl", "LOCALS", 1)~ + @49 DO ~SetGlobal("ErCowl", "LOCALS", 1)~ + Cowl1 + ~!Global("EdwinRomanceActive","GLOBAL",3) !Global("EdwinRomanceActive","GLOBAL",0) !Global("ERMaev", "LOCALS", 1) Dead("Maevar")~ + @50 + Maev1 + ~!Global("EdwinRomanceActive","GLOBAL",3) !Global("EdwinRomanceActive","GLOBAL",0) !Global("ERNose", "LOCALS", 1)~ + @51 DO ~SetGlobal("ERNose", "LOCALS", 1) ActionOverride(Player1, SetGlobal("ERNose", "LOCALS", 1)) ActionOverride(Player1, StartDialog("Erplay25", Player1))~ EXIT - + ~!Global("EdwinRomanceActive","GLOBAL",3) !Global("EdwinRomanceActive","GLOBAL",0) !Global("ERHome", "LOCALS", 1)~ + @52 DO ~ActionOverride(Player1, SetGlobal("ERHome", "LOCALS", 1)) ActionOverride(Player1, StartDialogue("Erplay25", Player1))~ EXIT + + ~!Global("EdwinRomanceActive","GLOBAL",3) !Global("EdwinRomanceActive","GLOBAL",0) !Global("ERHome", "LOCALS", 1)~ + @52 DO ~SetGlobal("ERHome", "LOCALS", 1) ActionOverride(Player1, SetGlobal("ERHome", "LOCALS", 1)) ActionOverride(Player1, StartDialogue("Erplay25", Player1))~ EXIT + ~Global("EdwinRomanceActive","GLOBAL",2) OR(9) AreaCheck("AR0313") AreaCheck("AR0406") AreaCheck("AR0509") AreaCheck("AR0513") AreaCheck("AR0709") AreaCheck("AR0704") AreaCheck("AR1602") AreaCheck("AR2010") AreaCheck("AR2202")~ + @53 DO ~ActionOverride(Player1, SetDialog("Erplay25"))~ + Feet1 + ~Global("EdwinRomanceActive","GLOBAL",2)~ + @54 DO ~ActionOverride(Player1, SetGlobal("ERBHug", "LOCALS", 1)) ActionOverride(Player1, StartDialog("Erplay25", Player1))~ EXIT + ~Global("EdwinRomanceActive","GLOBAL",2) !LOS("Aerie", 30) !LOS("Anomen", 30) !LOS("Haerdalis", 30) !LOS("Imoen", 30) !LOS("Imoen2", 30) !LOS("Jaheira", 30) !LOS("Jan", 30) !LOS("Korgan", 30) !LOS("Mazzy", 30) !LOS("Minsc", 30) !LOS("Nalia", 30) !LOS("Valygar", 30) !LOS("Viconia", 30) !LOS("Yoshimo", 30)~ + @55 DO ~ActionOverride(Player1, SetGlobal("ERshug", "LOCALS", 1)) ActionOverride(Player1, StartDialog("Erplay25", Player1))~ EXIT @@ -254,7 +254,7 @@ END IF ~~ EHand2 SAY @75 - IF ~~ DO ~ActionOverride(Player1, SetDialogue("")) ActionOverride(Player1, SetGlobal("Hand", "LOCALS", 0))~ EXIT + IF ~~ DO ~ActionOverride(Player1, SetDialogue("")) ActionOverride(Player1, SetGlobal("ERHand", "LOCALS", 0))~ EXIT END IF ~~ EWink2 @@ -390,7 +390,7 @@ IF ~~ Cowl3 SAY @124 = @125 - IF ~~ DO ~ActionOverride(Player1,SetDialogue(""))~ EXIT + IF ~~ EXIT END IF ~~ Feet1 diff --git a/edwin/edwinromance-readme.html b/edwin/edwinromance-readme.html index 4c0ab2f..90c81d6 100644 --- a/edwin/edwinromance-readme.html +++ b/edwin/edwinromance-readme.html @@ -316,7 +316,7 @@

Edwin Romance

Mod WebsiteMod Forum • - Version: 2.1.0 + Version: 2.11


Credits

Version history

+
Version 2.11:
+ +
Version 2.0.10: