less confusing installation messages for ua compatibility patches

BGforgeNet · Feb 3, 2023 · 70261b7 · 70261b7
1 parent e72b8cc
commit 70261b7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/ua/compatibility/ua.tpa b/ua/compatibility/ua.tpa
@@ -1,6 +1,8 @@
+/** @tra setup.tra */
+
 // AoP +1
 ACTION_IF NOT MOD_IS_INSTALLED ~ua.tp2~ (ID_OF_LABEL ~ua.tp2~ ~g_ua_allow+1~) BEGIN
-  PRINT @9
+  PRINT @41
   ACTION_IF GAME_INCLUDES ~bg1~ BEGIN
     OUTER_SET $item_source_compat(~amul14~ ~nadine.cre~) = 1 // Nadine - steal
     OUTER_SET $item_source_compat(~amul14~ ~nadin.dlg~) = 1 // Nadine - dialog, pass to Euric
@@ -9,11 +11,11 @@ ACTION_IF NOT MOD_IS_INSTALLED ~ua.tp2~ (ID_OF_LABEL ~ua.tp2~ ~g_ua_allow+1~) BE
     // AoP+1
     OUTER_SET $item_source_compat(~amul14~ ~ar1201.are~) = 1 // near lake and mists in Firkraag's dungeon
   END
-END
+END ELSE BEGIN PRINT @42 END
 
 // CoP+2 and RoP+2
 ACTION_IF NOT MOD_IS_INSTALLED ~ua.tp2~ (ID_OF_LABEL ~ua.tp2~ ~g_ua_allow+2~) BEGIN
-  PRINT @9
+  PRINT @43
   ACTION_IF GAME_INCLUDES ~bg1~ BEGIN
     OUTER_SET $item_source_compat(~clck02~ ~%Candlekeep_Catacombs_L1%.are~) = 1 // a crypt
     OUTER_SET $item_source_compat(~ring07~ ~ramazi.cre~) = 1 // Ramazith
@@ -23,16 +25,16 @@ ACTION_IF NOT MOD_IS_INSTALLED ~ua.tp2~ (ID_OF_LABEL ~ua.tp2~ ~g_ua_allow+2~) BE
     OUTER_SET $item_source_compat(~ring07~ ~aran02.cre~) = 1 // Aran Linvail (side with Bodhi)
     OUTER_SET $item_source_compat(~ring07~ ~aran.dlg~) = 1 // Aran Linvail (side with thieves)
   END
-END
+END ELSE BEGIN PRINT @44 END
 
 // boots of speed
 ACTION_IF NOT MOD_IS_INSTALLED ~ua.tp2~ (ID_OF_LABEL ~ua.tp2~ ~g_ua_allow_speed~) BEGIN
-  PRINT @11
+  PRINT @45
   OUTER_SET $item_present(~boot01~) = "-1"
   ACTION_IF GAME_INCLUDES ~bg1~ BEGIN
     OUTER_SET $item_source_compat(~boot01~ ~drasus.cre~) = 1 // Drasus (Cloakwood mines assassin)
   END
   ACTION_IF GAME_INCLUDES ~bg2~ BEGIN
     OUTER_SET $item_source_compat(~boot01~ ~tokcre01.dlg~) = 1 // Token machine in Spellhold
   END
-END
+END ELSE BEGIN PRINT @46 END
diff --git a/ua/tra/english/setup.tra b/ua/tra/english/setup.tra
@@ -6,9 +6,6 @@
 @6 = ~Expanded~
 @7 = ~Processing areas:~
 @8 = ~Compatibility with mods that move or remove items:~
-@9 = ~Non-unique Amulet of Protection +1~
-@10 = ~Non-unique Ring of Protection +2 and Cloak of Protection +2~
-@11 = ~Non-unique Boots of Speed~
 @12 = ~Rogue Rebalancing: Additional equipment for Thieves and Bards~
 @13 = ~Sword Coast Stratagems: Move or modify some overpowered magic items~
 @14 = ~Tortured Souls~
@@ -35,6 +32,13 @@
 @35 = ~BGEE~
 @36 = ~BG1NPC~
 
+@41 = ~Unique Amulet of Protection +1~
+@42 = ~Non-unique Amulet of Protection +1~
+@43 = ~Unique Ring of Protection +2 and Cloak of Protection +2~
+@44 = ~Non-unique Ring of Protection +2 and Cloak of Protection +2~
+@45 = ~Unique Boots of Speed~
+@46 = ~Non-unique Boots of Speed~
+
 @100 = ~Remove bonus merchants~
 @101 = ~Less magical items~
 @200 = ~Requires BG2~