Skip to content

Commit

Permalink
weekly update
Browse files Browse the repository at this point in the history 
Multiple repairs from current thread on forums
  • Loading branch information
@cmorganbg
cmorganbg committed Mar 8, 2019
1 parent 015c0b9 commit 21de7c0
Show file tree
Hide file tree
Showing 11 changed files with 352 additions and 248 deletions.
36 changes: 33 additions & 3 deletions aranw/aranw.tp2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,17 @@ VERSION @30001
README ~aranw/docs/readme-aranw-%LANGUAGE%.html~ ~aranw/docs/readme-aranw.html~

ALWAYS
ACTION_IF ((FILE_EXISTS ~dlc/sod-dlc.zip~) OR (FILE_EXISTS ~sod-dlc.zip~)) THEN BEGIN FAIL @30139 END /* Modmerge check */
INCLUDE ~aranw/lib/regexp.tph~ /* extra regexp vars */
INCLUDE ~aranw/lib/ids_patching.tph~ /* checks for expected .ids resources */
INCLUDE ~aranw/lib/aranw_macros.tph~ /* define all in-project macros */
ACTION_IF ((FILE_EXISTS ~dlc/sod-dlc.zip~) OR (FILE_EXISTS ~sod-dlc.zip~)) THEN BEGIN FAIL @30139 END /* Modmerge check */

ACTION_IF GAME_IS ~eet~ BEGIN
INCLUDE ~EET/other/EET_functions.tph~
END
ACTION_IF GAME_IS ~soa tob bgt~ BEGIN
INCLUDE ~aranw/lib/tob2soa.tph~ /* checks for expected .ids resources */
END

ACTION_IF NOT VARIABLE_IS_SET bg2_chapter THEN BEGIN /* check to make this happen only once per install */
ACTION_IF GAME_IS ~eet~ BEGIN /* [BG2EE | EET] Chapter numbering adjusted */
OUTER_SET bg2_chapter = 12
Expand All @@ -35,7 +38,6 @@ ALWAYS
OUTER_SET EVAL ~%name_source%~ = bg2_chapter
END
END

ACTION_IF GAME_IS ~bg2ee eet~ BEGIN
/* HANDLE_CHARSETS */
/* BG2:EE tra conversion courtesy of weidu and iconv */
Expand Down Expand Up @@ -203,6 +205,34 @@ PRINT @30031 /* ~Installing SoA dialog...~ */
COMPILE EVALUATE_BUFFER ~aranw/dialog/c-arandialog.d~
USING ~aranw/tra/%LANGUAGE%/%tra_version%.tra~

/* ToB EET FateSpirit and Continuous NPC juggling Stolen from CamDawg in Angelo and Tyris */
ACTION_IF GAME_IS ~eet~ THEN BEGIN
PRINT @30011 /* ~Installing EET Continuous NPC materials...~ */
OUTER_SPRINT aranw_eetcont @30011
APPEND ~c-arandebugger01.log~ ~%aranw_eetcont%~
LAF EET_NPC_TRANSITION INT_VAR type = 2 STR_VAR dv = c-aran_cdtemp override_SoA = c-aran override_ToB = c-arn25 dialog_ToB = C-ARN25A traFile = "aranw/tra/%LANGUAGE%/C-ARANW.TRA" string = ~@11317~ stringPosDV = anomen END // Aran Romanced
LAF EET_NPC_TRANSITION INT_VAR type = 2 STR_VAR dv = c-aran override_SoA = c-aran override_ToB = c-arn25 dialog_ToB = C-ARN25A traFile = "aranw/tra/%LANGUAGE%/C-ARANW.TRA" string = ~@11315~ stringPosDV = anomen END // Aran Non-Romanced
COPY_EXISTING ~fatesp.dlg~ ~override~ // add additional triggers/actions for angelo-as-romance
DECOMPILE_AND_PATCH BEGIN
REPLACE_TEXTUALLY ~Dead("c-aran_cdtemp")~ ~Dead("c-aran") Gender(Player1,FEMALE)~
REPLACE_TEXTUALLY ~SetGlobal("c-aran_cdtempSummoned","GLOBAL",1)~ ~SetGlobal("c-aranSummoned","GLOBAL",1) SetGlobal("c-aranrom","GLOBAL",2)~
REPLACE_TEXTUALLY ~c-aran_cdtemp~ ~c-aran~ // any other cleanup
END
BUT_ONLY
COPY_EXISTING ~ar4000.bcs~ ~override~ // cleanup/disable cruft
~ar4500.bcs~ ~override~
DECOMPILE_AND_PATCH BEGIN
REPLACE_TEXTUALLY ~[ %TAB%]Global("c-aran_cdtempSummoned","GLOBAL",[01])~ ~False()~
REPLACE_TEXTUALLY ~c-aran_cdtemp~ ~c-aran~ // any other cleanup
END
BUT_ONLY
END ELSE BEGIN
PRINT @30012 /* ~Installing ToB Fate Spirit Summoning...~ */
OUTER_SPRINT aranw_fate @30012
APPEND ~c-arandebugger01.log~ ~%aranw_fate%~
COMPILE EVALUATE_BUFFER ~aranw/dialog/c-aranfatespirit.d~
USING ~aranw/tra/%LANGUAGE%/%tra_version%.tra~
END
/* ToB dialog file */
ACTION_IF GAME_IS ~tob bgt bg2ee eet~ THEN BEGIN
PRINT @30032 /* ~Installing ToB dialog...~ */
Expand Down
25 changes: 5 additions & 20 deletions aranw/baf/c-arand.baf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,47 +129,32 @@ END
/* c-arand.bcs */
/* Stare At The Stars : Dream Script, Before Underdark, Outdoor/Forest at rest*/
IF
Global("c-arandreamstar","LOCALS",0)
Global("c-arandreamstar","GLOBAL",0)
InParty(Myself)
!RealGlobalTimerNotExpired("c-arandreamtalk","GLOBAL")
// !RealGlobalTimerExpired("RE_DreamTimer","GLOBAL")
!RealGlobalTimerNotExpired("c-arandreamtalk","GLOBAL")
Gender(Player1,FEMALE)
GlobalLT("Chapter","GLOBAL",%bg2_chapter_5%)
CombatCounter(0)
!StateCheck(Myself,CD_STATE_NOTVALID)
!StateCheck(Player1,CD_STATE_NOTVALID)
TimeOfDay(NIGHT)
!AreaType(DUNGEON)
OR(27)
OR(12)
AreaCheck("AR0085")
AreaCheck("AR1100")
AreaCheck("AR1101")
AreaCheck("AR1102")
AreaCheck("AR1104")
AreaCheck("AR1105")
AreaCheck("AR1106")
AreaCheck("AR1107")
AreaCheck("AR1200")
AreaCheck("AR1204")
AreaCheck("AR1300")
AreaCheck("AR1304")
AreaCheck("AR1400")
AreaCheck("AR1404")
AreaCheck("AR1700")
AreaCheck("AR1800")
AreaCheck("AR1900")
AreaCheck("AR1901")
AreaCheck("AR1902")
AreaCheck("AR1904")
AreaCheck("AR1905")
AreaCheck("AR2500")
AreaCheck("AR2600")
AreaCheck("AR2602")
AreaCheck("AR2603")
AreaCheck("AR2700")
AreaCheck("AR2800")
THEN
RESPONSE #100
SetGlobal("c-arandreamstar","LOCALS",1)
SetGlobal("c-arandreamstar","GLOBAL",1)
RealSetGlobalTimer("c-arandreamtalk","GLOBAL",300)
RealSetGlobalTimer("RE_DreamTimer","GLOBAL",300)
PlaySong(0)
Expand Down
8 changes: 6 additions & 2 deletions aranw/baf/c-arn25d.baf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,12 @@ IF
Global("c-arangoaded","GLOBAL",0)
Global("c-arangoaded","GLOBAL",6)
!Global("c-arannightvisit","GLOBAL",1)
TimeofDay(NIGHT)
AreaType(OUTDOOR)
TimeOfDay(NIGHT)
!AreaType(DUNGEON)
OR(3)
AreaType(OUTDOOR)
AreaType(WEATHER)
AreaType(FOREST)
InParty(Myself)
!StateCheck(Player1,CD_STATE_NOTVALID)
!StateCheck(Myself,CD_STATE_NOTVALID)
Expand Down
4 changes: 2 additions & 2 deletions aranw/baf/c-goaded.baf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ IF
!Global("c-aranspar","GLOBAL",4)
!Global("c-aranspar","GLOBAL",7)
!Global("c-aranspar","GLOBAL",10)
!Global("c-arandreamstar","LOCALS",1)
!Global("c-arandreamstar","GLOBAL",1)
InParty("c-aran")
!StateCheck("c-aran",CD_STATE_NOTVALID)
THEN RESPONSE #100
Expand All @@ -24,7 +24,7 @@ IF
!Global("c-aranspar","GLOBAL",4)
!Global("c-aranspar","GLOBAL",7)
!Global("c-aranspar","GLOBAL",10)
!Global("c-arandreamstar","LOCALS",1)
!Global("c-arandreamstar","GLOBAL",1)
InParty("c-aran")
!StateCheck("c-aran",CD_STATE_NOTVALID)
THEN RESPONSE #100
Expand Down
Loading

0 comments on commit 21de7c0

Please sign in to comment.