Merge pull request #18 from Gitjas/master

update to v11
Gibberlings3 · Apr 13, 2023 · 5d7fb1b · 5d7fb1b
2 parents fff5599 + ee12cf5
commit 5d7fb1b
Show file tree

Hide file tree

Showing 94 changed files with 5,102 additions and 1,017 deletions.
diff --git a/.github/workflows/InfinityAutoPackager.yaml b/.github/workflows/InfinityAutoPackager.yaml
@@ -4,8 +4,11 @@
 on:
   release:
     types: [published]
+  workflow_dispatch:
+
 jobs:
   InfinityAutoPackager:
+    if: github.ref_type == 'tag'
     runs-on: ubuntu-latest
     steps:
 
@@ -25,8 +28,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Upload iemod package to latest release
-        uses: svenstaro/upload-release-action@v1-release
-        if: github.ref != 'refs/heads/master'
+        uses: svenstaro/[email protected]
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ steps.CreateIEModZipPackage.outputs.PackageBaseName }}.iemod
@@ -35,11 +37,10 @@ jobs:
           overwrite: true
 
       - name: Upload zip package to latest release
-        uses: svenstaro/upload-release-action@v1-release
-        if: github.ref != 'refs/heads/master'
+        uses: svenstaro/[email protected]
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ steps.CreateIEModZipPackage.outputs.PackageBaseName }}.zip
           asset_name: ${{ steps.CreateIEModZipPackage.outputs.PackageBaseName }}.zip
           tag: ${{ github.ref }}
-          overwrite: true
+          overwrite: true
diff --git a/imoen_forever/baf/imoen_imoen2_2.baf b/imoen_forever/baf/imoen_imoen2_2.baf
@@ -2,26 +2,26 @@
 IF
 	InParty(Myself)
 	Global("C#IM_ImoenStays","GLOBAL",1)
-	Global("C#IM_DialogueTimerSet","GLOBAL",0)
+	Global("C#IM_DialogueTimerSet","LOCALS",0)
 THEN  
 	RESPONSE #100
 		RealSetGlobalTimer("C#IM_DialogueTimer","GLOBAL",800)
 		RealSetGlobalTimer("C#IM_IrenicusTimer","GLOBAL",14400) // three hours
 		SetGlobal("C#IM_DialogueSoA","GLOBAL",1)
-		SetGlobal("C#IM_DialogueTimerSet","GLOBAL",1)
+		SetGlobal("C#IM_DialogueTimerSet","LOCALS",1)
 END
 
 /* set dialogue timer after joining in Spellhold */
 IF
 	InParty(Myself)
 	GlobalGT("Chapter","GLOBAL",3) 
 	!Global("C#IM_ImoenStays","GLOBAL",1)
-	GlobalLT("C#IM_DialogueTimerSet","GLOBAL",2)
+	GlobalLT("C#IM_DialogueTimerSet","LOCALS",2)
 THEN  
 	RESPONSE #100
 		RealSetGlobalTimer("C#IM_DialogueTimer","GLOBAL",700)
 		SetGlobal("C#IM_DialogueSoA","GLOBAL",51)
-		SetGlobal("C#IM_DialogueTimerSet","GLOBAL",2)
+		SetGlobal("C#IM_DialogueTimerSet","LOCALS",2)
 END
 
 

diff --git a/imoen_forever/imoen_forever.ini b/imoen_forever/imoen_forever.ini
@@ -31,6 +31,6 @@ LabelType = GloballyUnique
 
 Type = Tweak_early
 
-Before = ACBre, atweaks, c#anotherfinehell, c#endlessbg1, cdtweaks, EET_end, NPC, Quest, transitions
+Before = atweaks, cdtweaks, EET_end
 
-After = bg2fixpack, EET
+After = c#anotherfinehell, c#sodboabri, c#sodtweaks, bg2fixpack, EET