Permalink
Browse files

Edits adding some vars and cleanup

Edits adding some of the c-aranintimate, rollback for c-nighttalk, etc.
  • Loading branch information...
1 parent 1d012bb commit c6a297ac4852b554ae315aadd52a7eb574fb9440 cmorganbg committed Oct 29, 2011
Showing with 395 additions and 441 deletions.
  1. +13 −13 aranw/baf/c-aran.baf
  2. +18 −3 aranw/baf/c-nighttalk.baf
  3. +357 −406 aranw/dialog/c-arandialog.d
  4. +7 −7 aranw/dialog/c-arantobdialog.d
  5. +0 −12 aranw/dialog/temp.txt
View
@@ -1,3 +1,16 @@
+/* tracking intimacy levels */
+/* look for incrementing relationship to kissing */
+IF
+ InParty(Myself)
+ !StateCheck(Myself,CD_STATE_NOTVALID)
+ Global("c-aranintimate","GLOBAL",1) // we kissed...
+ Global("c-aransex","GLOBAL",0) // not registered...
+ Gender(Player1,FEMALE)
+ !HasItemEquiped("belt05",Player1)
+THEN
+ RESPONSE #100
+ SetGlobal("c-aransex","GLOBAL",1) // we kissed.
+END
/* look for incrementing relationship to kissing + touching */
IF
InParty(Myself)
@@ -824,19 +837,6 @@ THEN
RESPONSE #100
SetGlobal("c-arnRECernd","LOCALS",9)
END
-/* tracking intimacy levels */
-/* look for incrementing relationship to kissing */
-IF
- InParty(Myself)
- !StateCheck(Myself,CD_STATE_NOTVALID)
- Global("c-aranintimate","GLOBAL",1) // we kissed...
- Global("c-aransex","GLOBAL",0) // not registered...
- Gender(Player1,FEMALE)
- !HasItemEquiped("belt05",Player1)
-THEN
- RESPONSE #100
- SetGlobal("c-aransex","GLOBAL",1) // we kissed.
-END
/* BCS Blocks for Scroll Creation */
/* c-arSCRL15 Aran PID: Create Scroll of Protection from Petrification */
IF
View
@@ -3,11 +3,10 @@
IF
Global("c-arannightvisit","GLOBAL",1)
InParty("c-aran")
+ !Global("B!GavRingPlaced","GLOBAL",1)
!Global("c-aranspar","GLOBAL",1)
!Global("c-aranspar","GLOBAL",4)
!Global("c-arandreamstar","LOCALS",1)
- !RealGlobalTimerNotExpired("c-arandreamtalk","GLOBAL")
- !RealGlobalTimerExpired("RE_DreamTimer","GLOBAL")
!StateCheck(Myself,CD_STATE_NOTVALID)
!StateCheck("c-aran",CD_STATE_NOTVALID)
THEN
@@ -16,4 +15,20 @@ THEN
PlaySong(0)
PlaySound("c-arnltl")
ActionOverride(Player1,StartDialog("player1",Player1))
-END
+END
+
+/* Night Talk: something else fired and blocked it */
+IF
+ Global("c-arannightvisit","GLOBAL",2)
+ InParty("c-aran")
+ !Global("B!GavRingPlaced","GLOBAL",1)
+ !Global("c-aranspar","GLOBAL",1)
+ !Global("c-aranspar","GLOBAL",4)
+ !Global("c-arandreamstar","LOCALS",1)
+ !StateCheck(Myself,CD_STATE_NOTVALID)
+ !StateCheck("c-aran",CD_STATE_NOTVALID)
+THEN
+ RESPONSE #100
+ SetGlobal("c-arannightvisit","GLOBAL",1)
+ Continue()
+END
Oops, something went wrong.

0 comments on commit c6a297a

Please sign in to comment.