Merge pull request #3 from Gitjas/master

update to v2.10
SpellholdStudios · Dec 3, 2019 · 0d5218a · 0d5218a
2 parents 4895dab + ecd5f3f
commit 0d5218a
Show file tree

Hide file tree

Showing 9 changed files with 226 additions and 37 deletions.
diff --git a/edwin/baf/baldur_edwin_romance.baf b/edwin/baf/baldur_edwin_romance.baf
@@ -1,6 +1,9 @@
 IF
   Global("EdwinRomanceActive","GLOBAL",1)
   Global("EdwinRomanceOut","GLOBAL",0)
+  OR(2) //not if Edwin is Vampire
+    Global("EdwinVampire","GLOBAL",0)
+    GlobalGT("EdwinVampire","GLOBAL",5)
   !InPartyAllowDead("Edwin")
   !Dead("Edwin")
 THEN

diff --git a/edwin/baf/edwin.baf b/edwin/baf/edwin.baf
@@ -2,10 +2,11 @@ IF
   InParty(Myself)
   !See([ENEMY])
   CombatCounter(0)
+  Global("EdwinIgnoreRomances","GLOBAL",0)
   Global("EdwinRomanceActive","GLOBAL",2)
   OR(2)
-  Global("AnomenRomanceActive","GLOBAL",1)
-  Global("AnomenRomanceActive","GLOBAL",2)
+    Global("AnomenRomanceActive","GLOBAL",1)
+    Global("AnomenRomanceActive","GLOBAL",2)
 THEN
   RESPONSE #100
     SetGlobal("AnomenRomanceActive","GLOBAL",3)
@@ -15,6 +16,7 @@ IF
     InParty(Myself)
     CombatCounter(0)
     !See([ENEMY])
+    Global("EdwinIgnoreRomances","GLOBAL",0)
     Global("EdwinRomanceActive","GLOBAL",2)
     Global("RasaadRomanceActive","GLOBAL",1)
     Global("ED_DeactivateRomRasaad","LOCALS",0)
@@ -28,6 +30,7 @@ IF
     InParty(Myself)
     CombatCounter(0)
     !See([ENEMY])
+    Global("EdwinIgnoreRomances","GLOBAL",0)
     Global("EdwinRomanceActive","GLOBAL",2)
     Global("DornRomanceActive","GLOBAL",1)
     Global("ED_DeactivateRomDorn","LOCALS",0)
@@ -41,6 +44,7 @@ IF
     InParty(Myself)
     CombatCounter(0)
     !See([ENEMY])
+    Global("EdwinIgnoreRomances","GLOBAL",0)
     Global("EdwinRomanceActive","GLOBAL",2)
     Global("HexxatRomanceActive","GLOBAL",1)
     Global("ED_DeactivateRomHexxat","LOCALS",0)
@@ -57,6 +61,7 @@ IF
     InParty("Rasaad")
     CombatCounter(0)
     !See([ENEMY])
+    Global("EdwinIgnoreRomances","GLOBAL",0)
     Global("RasaadRomanceActive","GLOBAL",2)
     OR(2)
 	Global("EdwinRomanceActive","GLOBAL",1)
@@ -71,6 +76,7 @@ IF
     InParty("Dorn")
     CombatCounter(0)
     !See([ENEMY])
+    Global("EdwinIgnoreRomances","GLOBAL",0)
     Global("DornRomanceActive","GLOBAL",2)
     OR(2)
 	Global("EdwinRomanceActive","GLOBAL",1)
@@ -85,6 +91,7 @@ IF
     InParty("Hexxat")
     CombatCounter(0)
     !See([ENEMY])
+    Global("EdwinIgnoreRomances","GLOBAL",0)
     Global("HexxatRomanceActive","GLOBAL",2)
     OR(2)
 	Global("EdwinRomanceActive","GLOBAL",1)
@@ -100,27 +107,30 @@ IF
   InParty(Myself)
   !See([ENEMY])
   CombatCounter(0)
+  Global("EdwinIgnoreRomances","GLOBAL",0)
   OR(2)
-  Global("EdwinRomanceActive","GLOBAL",1)
-  Global("EdwinRomanceActive","GLOBAL",2)
+    Global("EdwinRomanceActive","GLOBAL",1)
+    Global("EdwinRomanceActive","GLOBAL",2)
   %ACTIVE_MOD_NPC_ROMANCE%
 THEN
   RESPONSE #100
     SetGlobal("EdwinRomanceActive","GLOBAL",3)
 END
 
+/*
 IF
   InParty(Myself)
   !See([ENEMY])
   CombatCounter(0)
   Global("EdwinRomanceActive","GLOBAL",2)
   OR(2)
-  Global("TsujathaRomanceActive","GLOBAL",1)
-  Global("TsujathaRomanceActive","GLOBAL",2)
+    Global("TsujathaRomanceActive","GLOBAL",1)
+    Global("TsujathaRomanceActive","GLOBAL",2)
 THEN
   RESPONSE #100
     SetGlobal("TsujathaRomanceActive","GLOBAL",3)
 END
+*/
 
 IF
   Global("EdwinMatch","GLOBAL",0)
@@ -266,7 +276,7 @@ IF
   !Global("Chapter","GLOBAL",%bg2_chapter_5%)
   !Global("Chapter","GLOBAL",%bg2_chapter_7%)
   !See([ENEMY])
-  !Range([NEUTRAL],10)
+//  !Range([NEUTRAL],10)
   OR(9)
   Global("EdwinLoveTalk","LOCALS",1)
   Global("EdwinLoveTalk","LOCALS",3)
@@ -414,14 +424,15 @@ THEN
     IncrementGlobal("EdwinLoveTalkCheck","GLOBAL",1)
 END
 
+/* 
 IF
   InParty(Myself)
   !See([ENEMY])
   CombatCounter(0)
   Global("EdwinMatch","GLOBAL",1)
   OR(4)
   Global("EdwinLoveTalk","LOCALS",10)
-  Global("EdwinLoveTalk","LOCALS",26)
+  Global("EdwinLoveTalk","LOCALS",32)
   Global("EdwinLoveTalk","LOCALS",36)
   Global("EdwinLoveTalk","LOCALS",22)
 THEN
@@ -430,6 +441,7 @@ THEN
     IncrementGlobal("EdwinLoveTalkCheck","GLOBAL",1)
     RealSetGlobalTimer("EdwinRomance","GLOBAL",1)
 END
+*/
 
 IF
   InParty(Myself)
@@ -515,7 +527,7 @@ IF
   CombatCounter(0)
   RealGlobalTimerExpired("EdwinRomance","GLOBAL")
   Global("EdwinMatch","GLOBAL",1)
-  OR(16)
+  OR(17)
   Global("EdwinLoveTalk","LOCALS",2)
   Global("EdwinLoveTalk","LOCALS",4)
   Global("EdwinLoveTalk","LOCALS",6)

diff --git a/edwin/baf/edwind.baf b/edwin/baf/edwind.baf
@@ -14,19 +14,19 @@ IF
   Global("EddieCantGetDrunk","GLOBAL",3)
 THEN
   RESPONSE #100
-    SetInterrupt(FALSE)
-    GiveItemCreate("EDPOTN",Myself,0,0,0)
-    MoveViewObject("Edwin",INSTANT)
-    Wait(2)
+//    SetInterrupt(FALSE)
+//    GiveItemCreate("EDPOTN",Myself,0,0,0)
+//    MoveViewObject("Edwin",INSTANT)
+//    Wait(2)
     SetGlobal("EdwinDrunk","GLOBAL",1)
-    UseItem("EDPOTN",Myself)
-    Wait(2)
+//    UseItem("EDPOTN",Myself)
+//    Wait(2)
     IncrementGlobal("EdwinLoveTalk","LOCALS",1)
     IncrementGlobal("EdwinLoveTalkCheck","GLOBAL",1)
     RealSetGlobalTimer("EdwinRomance","GLOBAL",2800)
     PlaySong(999990)
     SetInterrupt(TRUE)
-    Interact(Player1)
+    Interact(Myself)
 END
 
 IF
@@ -44,12 +44,12 @@ IF
 THEN
   RESPONSE #100
     SetGlobal("EdwinKiss","GLOBAL",2)
-    MoveViewObject("Edwin",INSTANT)
+//    MoveViewObject("Edwin",INSTANT)
     IncrementGlobal("EdwinLoveTalk","LOCALS",1)
     IncrementGlobal("EdwinLoveTalkCheck","GLOBAL",1)
     RealSetGlobalTimer("EdwinRomance","GLOBAL",2800)
     PlaySong(999990)
-    Interact(Player1)
+    Interact(Myself)
 END
 
 IF
@@ -64,12 +64,12 @@ IF
   Global("EdwinLoveTalk","LOCALS",35)
 THEN
   RESPONSE #100
-    MoveViewObject("Edwin",INSTANT)
+//    MoveViewObject("Edwin",INSTANT)
     IncrementGlobal("EdwinLoveTalk","LOCALS",1)   
     IncrementGlobal("EdwinLoveTalkCheck","GLOBAL",1)
     RealSetGlobalTimer("EdwinRomance","GLOBAL",2800)
     PlaySong(999990)
-    Interact(Player1)
+    Interact(Myself)
 END
 
 IF
@@ -89,11 +89,11 @@ IF
   !Global("Chapter","GLOBAL",%bg2_chapter_7%)
 THEN
   RESPONSE #100
-    MoveViewObject("Edwin",INSTANT)
+//    MoveViewObject("Edwin",INSTANT)
     IncrementGlobal("EdwinLoveTalk","LOCALS",1)
     IncrementGlobal("EdwinLoveTalkCheck","GLOBAL",1)
     RealSetGlobalTimer("EdwinRomance","GLOBAL",2800)
     PlaySong(999991)
-    Interact(Player1)
+    Interact(Myself)
 END