Switched update procs to the new mod update procs. Added some initial…

… code for making sure source collars are in the blacklist, as they didn't seem to be blocked.
LaughingLeader-DOS2-Mods · Aug 31, 2018 · 0b32901 · 0b32901
1 parent 6a53248
commit 0b32901
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 15 deletions.
diff --git a/...pmentSets_5137eeed-ea15-4635-861f-c6c616503cd3/Story/RawFiles/Goals/LLEQSET_Blacklist.txt b/...pmentSets_5137eeed-ea15-4635-861f-c6c616503cd3/Story/RawFiles/Goals/LLEQSET_Blacklist.txt
@@ -16,9 +16,19 @@ LLEQSET_Blacklist_Add_Tag("EquipmentSets_Ignored");
 
 //REGION UPDATER
 PROC
-LLEQSET_System_UpdateDatabases()
+LeaderUpdater_ModUpdated("EquipmentSets", "LaughingLeader", _Version)
+AND
+_Version == "1.0.0.0"
 THEN
 LLEQSET_Blacklist_InitBlacklist();
+
+PROC
+LeaderUpdater_ModUpdated("EquipmentSets", "LaughingLeader", _Version)
+AND
+NOT DB_LLEQSET_Blacklist("Template", "RC_FTJ_Amulet_SourceCollar_8bf8b97c-556e-4e69-8fc7-39241783dcc1")
+THEN
+LLEQSET_Blacklist_Add_Template("RC_FTJ_Amulet_SourceCollar_8bf8b97c-556e-4e69-8fc7-39241783dcc1");
+LeaderLog_Log("DEBUG", "[LLEQSET:Blacklist] Updated from version [",_Version,"]. Added missing source collar template to blacklist.");
 //END_REGION
 
 //REGION ADDING

diff --git a/...ets_5137eeed-ea15-4635-861f-c6c616503cd3/Story/RawFiles/Goals/LLEQSET_SetManager_Menu.txt b/...ets_5137eeed-ea15-4635-861f-c6c616503cd3/Story/RawFiles/Goals/LLEQSET_SetManager_Menu.txt
@@ -17,7 +17,9 @@ DB_LLEQSET_SetManager_DefaultSetNames("Set4", "Set 4");
 DB_LLEQSET_SetManager_DefaultSetNames("Set5", "Set 5");
 
 PROC
-LLEQSET_System_UpdateDatabases()
+LeaderUpdater_ModUpdated("EquipmentSets", "LaughingLeader", _Version)
+AND
+_Version == "-1"
 THEN
 LLEQSET_Menu_InitializeSettings();
 //END_REGION

diff --git a/...eeed-ea15-4635-861f-c6c616503cd3/Story/RawFiles/Goals/LLEQSET_SetManager_NamingWizard.txt b/...eeed-ea15-4635-861f-c6c616503cd3/Story/RawFiles/Goals/LLEQSET_SetManager_NamingWizard.txt
@@ -23,7 +23,9 @@ LLEQSET_NamingInterface_AddWord("Thievery");
 
 //REGION UPDATER
 PROC
-LLEQSET_System_UpdateDatabases()
+LeaderUpdater_ModUpdated("EquipmentSets", "LaughingLeader", _Version)
+AND
+_Version == "-1"
 THEN
 LLEQSET_NamingInterface_InitSettings();
 LeaderLog_Log("DEBUG","[LLEQSET:NamingInterface] Databases updated.");

diff --git a/...ts_5137eeed-ea15-4635-861f-c6c616503cd3/Story/RawFiles/Goals/LLEQSET_SetManager__Main.txt b/...ts_5137eeed-ea15-4635-861f-c6c616503cd3/Story/RawFiles/Goals/LLEQSET_SetManager__Main.txt
@@ -50,7 +50,9 @@ LLEQSET_System_ClearExistingDatabase("DB_LLEQSET_SetManager_EquipRate", 1);
 DB_LLEQSET_SetManager_EquipRate(100);
 
 PROC
-LLEQSET_System_UpdateDatabases()
+LeaderUpdater_ModUpdated("EquipmentSets", "LaughingLeader", _Version)
+AND
+_Version == "-1"
 THEN
 LLEQSET_SetManager_InitializeSettings();
 //END_REGION

diff --git a/...entSets_5137eeed-ea15-4635-861f-c6c616503cd3/Story/RawFiles/Goals/LLEQSET_ZZZ_Updater.txt b/...entSets_5137eeed-ea15-4635-861f-c6c616503cd3/Story/RawFiles/Goals/LLEQSET_ZZZ_Updater.txt
@@ -2,7 +2,7 @@ Version 1
 SubGoalCombiner SGC_AND
 INITSECTION
 LLEQSET_Updater_InitSettings();
-LeaderUpdater_Register_Mod("EquipmentSets", "LaughingLeader", "1.0.0.0");
+LeaderUpdater_Register_Mod("EquipmentSets", "LaughingLeader", "1.0.0.5");
 LeaderUpdater_Register_ActiveGoal("EquipmentSets", "LaughingLeader", "LLEQSET_ZZZ_Updater");
 //DB_LLEQSET_Dependencies(_Mod, _Author, _GlobalFlag)
 KBSECTION
@@ -16,9 +16,9 @@ DB_LLEQSET_Dependencies("NamingWizard", "LaughingLeader", "LLEQSET_Global_Naming
 
 //REGION MOD_UPDATING
 PROC
-LLEQSET_System_UpdateDatabases()
+LeaderUpdater_ModUpdated("EquipmentSets", "LaughingLeader", _Version)
 THEN
-LeaderLog_Log("DEBUG","[LLEQSET][Updater] Databases updated.");
+LeaderLog_Log("DEBUG", "[LLEQSET:Updater] Updated from version [",_Version,"]");
 
 PROC
 LLEQSET_Updater_UnregisterMod()
@@ -30,10 +30,9 @@ LeaderUpdater_UnregisterMod("EquipmentSets", "LaughingLeader");
 IF
 GameStarted(_,_)
 AND
-LeaderUpdater_QRY_ModUpdateNeeded("EquipmentSets", "LaughingLeader", "1.0.0.0")
+LeaderUpdater_QRY_ModUpdateNeeded("EquipmentSets", "LaughingLeader", "1.0.0.5")
 THEN
-LeaderUpdater_Register_Mod("EquipmentSets", "LaughingLeader", "1.0.0.0");
-LLEQSET_System_UpdateDatabases();
+LeaderUpdater_Register_Mod("EquipmentSets", "LaughingLeader", "1.0.0.5");
 //END_REGION
 
 //REGION MOD_DETECTION
@@ -44,7 +43,7 @@ DB_LLEQSET_Dependencies(_Mod, _Author, _GlobalFlag)
 AND
 LeaderUpdater_QRY_ModIsActive(_Mod, _Author)
 THEN
-LeaderLog_Log("DEBUG","[LLEQSET][Updater] Mod ",_Mod," by ", _Author," is active.");
+LeaderLog_Log("DEBUG","[LLEQSET:Updater] Mod ",_Mod," by ", _Author," is active.");
 GlobalSetFlag(_GlobalFlag);
 
 PROC

diff --git a/...uipmentSets_5137eeed-ea15-4635-861f-c6c616503cd3/Story/RawFiles/Goals/LLEQSET__System.txt b/...uipmentSets_5137eeed-ea15-4635-861f-c6c616503cd3/Story/RawFiles/Goals/LLEQSET__System.txt
@@ -75,7 +75,9 @@ SysClear("DB_LLEQSET_Temp_TracedCharacterValue", 2);
 SysClear("DB_LLEQSET_Temp_ItemSlot", 3);
 
 PROC
-LLEQSET_System_UpdateDatabases()
+LeaderUpdater_ModUpdated("EquipmentSets", "LaughingLeader", _Version)
+AND
+_Version == "-1"
 THEN
 LLEQSET_System_InitializeSettings();
 //END_REGION

diff --git a/Mods/EquipmentSets_5137eeed-ea15-4635-861f-c6c616503cd3/meta.lsx b/Mods/EquipmentSets_5137eeed-ea15-4635-861f-c6c616503cd3/meta.lsx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <save>
-    <header version="2" time="1535502278" />
+    <header version="2" time="1535691104" />
     <version major="3" minor="6" revision="0" build="4" />
     <region id="Config">
         <node id="root">
@@ -12,7 +12,7 @@
                             <attribute id="MD5" value="" type="23" />
                             <attribute id="Name" value="LeaderLib" type="22" />
                             <attribute id="UUID" value="7e737d2f-31d2-4751-963f-be6ccc59cd0c" type="22" />
-                            <attribute id="Version" value="268435460" type="4" />
+                            <attribute id="Version" value="268435462" type="4" />
                         </node>
                     </children>
                 </node>
@@ -32,7 +32,7 @@
                     <attribute id="Tags" value="" type="30" />
                     <attribute id="Type" value="Add-on" type="22" />
                     <attribute id="UUID" value="5e772b3a-8c72-5250-22f9-5d8bbe751d74" type="22" />
-                    <attribute id="Version" value="268435460" type="4" />
+                    <attribute id="Version" value="268435461" type="4" />
                     <children>
                         <node id="PublishVersion">
                             <attribute id="Version" value="907812438" type="4" />