Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Repairs from forums today

no time for more info; check worklogs
  • Loading branch information...
commit 02c7b205e688941bc654d6495ac90989cb3fe7b4 1 parent f3711a5
cmorganbg authored
View
14 aranw/baf/c-aran.baf
@@ -3531,9 +3531,9 @@ END
/* Drunk Talks (incorporates Flirts if gender and romance variables set) */
/* Using GLOBAL here so it can influence friendtalks */
IF
- GlobalLT("c-arandrunk","GLOBAL",6) // shuts down sequence when finished
+ GlobalLT("c-arandrunk","GLOBAL",4) // shuts down sequence when finished
InParty(Myself)
- CheckStatGT(Myself,50,INTOXICATION) // Whoot - the room is moving about too much
+ CheckStatGT(Myself,40,INTOXICATION) // Whoot - the room is moving about too much
OR(13)
AreaCheck("AR0313") // Sea's Bounty
AreaCheck("AR0406") // Copper Coronet
@@ -3548,10 +3548,10 @@ IF
AreaCheck("AR0021") // Crooked Crane 1st Floor
AreaCheck("AR1602") // Brynnlaw's Inn
AreaCheck("C-AR01") // The Broken Sword (Aran's initial inn )
- OR(3)
+ OR(2)
Global("c-arandrunk","GLOBAL",0)
Global("c-arandrunk","GLOBAL",2)
- Global("c-arandrunk","GLOBAL",4)
+ // Global("c-arandrunk","GLOBAL",4)
InMyArea(Player1)
!StateCheck(Player1,CD_STATE_NOTVALID)
CombatCounter(0)
@@ -3562,7 +3562,7 @@ THEN
END
IF
- GlobalLT("c-arandrunk","GLOBAL",6) // shuts down sequence when finished
+ GlobalLT("c-arandrunk","GLOBAL",4) // shuts down sequence when finished
!GlobalTimerNotExpired("c-aransmalltalk","GLOBAL") // Timer (game-time) has never been set or has expired
InParty(Myself)
!StateCheck(Myself,CD_STATE_NOTVALID)
@@ -3584,10 +3584,10 @@ IF
AreaCheck("C-AR01") // The Broken Sword (Aran's initial inn )
CombatCounter(0) // Not in combat
!See([ENEMY]) // Can't see any enemies
- OR(3)
+ OR(2)
Global("c-arandrunk","GLOBAL",1)
Global("c-arandrunk","GLOBAL",3)
- Global("c-arandrunk","GLOBAL",5)
+ // Global("c-arandrunk","GLOBAL",5)
THEN
RESPONSE #100
PlaySong(0)
View
77 aranw/baf/c-arand.baf
@@ -7,48 +7,46 @@
/* c-arand.bcs */
-/* Stone Walls, Stone Hearts, Stone Heads : Dream Script, De'Arnise Keep (Stronghold) Script */
+
+/* c-arand.bcs */
+/* Sparring, females */
IF
- Global("c-arandreamstone","GLOBAL",0)
+ Global("c-aranspar","GLOBAL",1)
InParty(Myself)
!RealGlobalTimerNotExpired("c-arandreamtalk","GLOBAL")
!RealGlobalTimerExpired("RE_DreamTimer","GLOBAL")
- !GlobalTimerNotExpired("c-aransmalltalk","GLOBAL")
- CombatCounter(0)
!StateCheck(Myself,CD_STATE_NOTVALID)
!StateCheck(Player1,CD_STATE_NOTVALID)
- OR(3)
- AreaCheck("AR1305")
- AreaCheck("AR1306")
- AreaCheck("AR1307")
+ OR(2)
+ AreaType(OUTDOOR)
+ AreaType(FOREST)
+ !AreaType(DUNGEON)
THEN
RESPONSE #100
- SetGlobal("c-arandreamstone","GLOBAL",1)
+ SetGlobal("c-aranspar","GLOBAL",2)
SetGlobalTimer("c-aransmalltalk","GLOBAL",300)
RealSetGlobalTimer("c-arandreamtalk","GLOBAL",300)
PlaySong(0)
- PlaySound("c-arnfti")
+ PlaySound("c-arnltl")
StartDialogNoSet(Player1)
END
/* c-arand.bcs */
-/* Stare At The Stars : Dream Script, Before Underdark, Outdoor/Forest at rest*/
+/* Sparring, males */
IF
- Global("c-arandreamstar","LOCALS",0)
+ Global("c-aranspar","GLOBAL",4)
InParty(Myself)
!RealGlobalTimerNotExpired("c-arandreamtalk","GLOBAL")
!RealGlobalTimerExpired("RE_DreamTimer","GLOBAL")
- GlobalLT("Chapter","GLOBAL",5)
- CombatCounter(0)
!StateCheck(Myself,CD_STATE_NOTVALID)
!StateCheck(Player1,CD_STATE_NOTVALID)
+ !AreaType(DUNGEON)
OR(2)
AreaType(OUTDOOR)
AreaType(FOREST)
- !AreaType(DUNGEON)
THEN
RESPONSE #100
- SetGlobal("c-arandreamstar","GLOBAL",1)
+ SetGlobal("c-aranspar","GLOBAL",5)
SetGlobalTimer("c-aransmalltalk","GLOBAL",300)
RealSetGlobalTimer("c-arandreamtalk","GLOBAL",300)
PlaySong(0)
@@ -56,45 +54,49 @@ THEN
StartDialogNoSet(Player1)
END
-/* c-arand.bcs */
-/* Sparring, females */
+/* Stone Walls, Stone Hearts, Stone Heads : Dream Script, De'Arnise Keep (Stronghold) Script */
IF
- Global("c-aranspar","GLOBAL",1)
+ Global("c-arandreamstone","GLOBAL",0)
InParty(Myself)
!RealGlobalTimerNotExpired("c-arandreamtalk","GLOBAL")
!RealGlobalTimerExpired("RE_DreamTimer","GLOBAL")
+ !GlobalTimerNotExpired("c-aransmalltalk","GLOBAL")
+ CombatCounter(0)
!StateCheck(Myself,CD_STATE_NOTVALID)
!StateCheck(Player1,CD_STATE_NOTVALID)
- OR(2)
- AreaType(OUTDOOR)
- AreaType(FOREST)
- !AreaType(DUNGEON)
+ OR(3)
+ AreaCheck("AR1305")
+ AreaCheck("AR1306")
+ AreaCheck("AR1307")
THEN
RESPONSE #100
- SetGlobal("c-aranspar","GLOBAL",2)
+ SetGlobal("c-arandreamstone","GLOBAL",1)
SetGlobalTimer("c-aransmalltalk","GLOBAL",300)
RealSetGlobalTimer("c-arandreamtalk","GLOBAL",300)
PlaySong(0)
- PlaySound("c-arnltl")
+ PlaySound("c-arnfti")
StartDialogNoSet(Player1)
END
/* c-arand.bcs */
-/* Sparring, males */
+/* Stare At The Stars : Dream Script, Before Underdark, Outdoor/Forest at rest*/
IF
- Global("c-aranspar","GLOBAL",4)
+ Global("c-arandreamstar","LOCALS",0)
InParty(Myself)
!RealGlobalTimerNotExpired("c-arandreamtalk","GLOBAL")
!RealGlobalTimerExpired("RE_DreamTimer","GLOBAL")
+ Gender(Player1,FEMALE)
+ GlobalLT("Chapter","GLOBAL",5)
+ CombatCounter(0)
!StateCheck(Myself,CD_STATE_NOTVALID)
!StateCheck(Player1,CD_STATE_NOTVALID)
+ !AreaType(DUNGEON)
OR(2)
AreaType(OUTDOOR)
AreaType(FOREST)
- !AreaType(DUNGEON)
THEN
RESPONSE #100
- SetGlobal("c-aranspar","GLOBAL",5)
+ SetGlobal("c-arandreamstar","GLOBAL",1)
SetGlobalTimer("c-aransmalltalk","GLOBAL",300)
RealSetGlobalTimer("c-arandreamtalk","GLOBAL",300)
PlaySong(0)
@@ -102,20 +104,3 @@ THEN
StartDialogNoSet(Player1)
END
-/* Night Talk: Amorous */
-IF
- Global("c-arannightvisit","GLOBAL",1)
- InParty(Myself)
- !RealGlobalTimerNotExpired("c-arandreamtalk","GLOBAL")
- !RealGlobalTimerExpired("RE_DreamTimer","GLOBAL")
- !StateCheck(Myself,CD_STATE_NOTVALID)
- !StateCheck(Player1,CD_STATE_NOTVALID)
-THEN
- RESPONSE #100
- SetGlobal("c-arannightvisit","GLOBAL",2)
- SetGlobalTimer("c-aransmalltalk","GLOBAL",300)
- RealSetGlobalTimer("c-arandreamtalk","GLOBAL",300)
- PlaySong(0)
- PlaySound("c-arnltl")
- StartDialogNoSet(Player1)
-END
View
12 aranw/baf/c-goaded.baf
@@ -1,11 +1,14 @@
IF
!RealGlobalTimerNotExpired("RE_DreamTimer","GLOBAL")
Global("c-arangoaded","GLOBAL",1)
+ !Global("c-aranspar","GLOBAL",1)
+ !Global("c-aranspar","GLOBAL",4)
+ !Global("c-arandreamstar","LOCALS",1)
InParty("c-aran")
!StateCheck("c-aran",CD_STATE_NOTVALID)
THEN RESPONSE #100
SetGlobal("c-arangoaded","GLOBAL",2)
- ActionOverride(Player1,StartDialog("c-aran",Player1))
+ ActionOverride(Player1,StartDialog("player1",Player1))
END
@@ -13,7 +16,12 @@ IF
!RealGlobalTimerNotExpired("RE_DreamTimer","GLOBAL")
GlobalTimerExpired("c-arangoadedtime","GLOBAL")
Global("c-arangoaded","GLOBAL",4)
+ !Global("c-aranspar","GLOBAL",1)
+ !Global("c-aranspar","GLOBAL",4)
+ !Global("c-arandreamstar","LOCALS",1)
+ InParty("c-aran")
+ !StateCheck("c-aran",CD_STATE_NOTVALID)
THEN RESPONSE #100
SetGlobal("c-arangoaded","GLOBAL",5)
- ActionOverride(Player1,StartDialog("c-aran",Player1))
+ ActionOverride(Player1,StartDialog("player1",Player1))
END
View
19 aranw/baf/c-nighttalk.baf
@@ -0,0 +1,19 @@
+
+/* Night Talk: Amorous */
+IF
+ Global("c-arannightvisit","GLOBAL",1)
+ InParty("c-aran")
+ !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
+ RESPONSE #100
+ SetGlobal("c-arannightvisit","GLOBAL",2)
+ PlaySong(0)
+ PlaySound("c-arnltl")
+ ActionOverride(Player1,StartDialog("player1",Player1))
+END
View
1,010 aranw/dialog/c-arandialog.d
546 additions, 464 deletions not shown
View
4 aranw/setup-aranw.tp2
@@ -1659,7 +1659,7 @@ Please type 1, 2, 3, 4, or 5 and press enter.~
ACTION_READLN aran_armor_choice
END // of O_F
LAUNCH_ACTION_MACRO ~aran_report_status~
- COPY ~aranw/cre/c-arnmge.cre~ ~override/c-aran7.cre~ // copy the base .cre into the game, and
+ COPY ~aranw/cre/c-arnclr.cre~ ~override/c-aran7.cre~ // copy the base .cre into the game, and
PATCH_IF (SOURCE_SIZE > 0x2d3) THEN BEGIN // if the .cre is valid, then
LAUNCH_PATCH_MACRO ~aran_cre_setup~ // patch in player choices using this pre-defined code
END ELSE BEGIN
@@ -2900,6 +2900,8 @@ EXTEND_BOTTOM ~bodhiamb.bcs~ ~aranw\baf\c-aranvampire.baf~ // bodhi disappears w
EXTEND_BOTTOM ~cleanse.bcs~ ~aranw\baf\c-aranvampirecleanse.baf~ // restoring aran
+EXTEND_TOP ~player1d.bcs~ ~aranw\baf\c-nighttalk.baf~ /* adds "goaded" dialog initiation for dreamscripts */
+
EXTEND_TOP ~player1d.bcs~ ~aranw\baf\c-goaded.baf~ /* adds "goaded" dialog initiation for dreamscripts */
COMPILE ~aranw/baf/c-abvp.baf~ // vampire script
Please sign in to comment.
Something went wrong with that request. Please try again.