*fixes to some bugs (gandalf cutscene & troop ugrade cost)

tldmod · Aug 14, 2018 · 5cc1178 · 5cc1178
1 parent 86b830c
commit 5cc1178
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/ModuleSystem/module_simple_triggers.py b/ModuleSystem/module_simple_triggers.py
@@ -2221,6 +2221,7 @@
           (try_begin), #first evil faction falls - evil player
             (neg|faction_slot_eq, "$players_kingdom", slot_faction_side, faction_side_good),
             (neg|faction_slot_eq, ":cur_kingdom", slot_faction_side, faction_side_good),
+            (neq, "$tld_war_began", 2),
             (assign, "$g_tld_convo_subject", ":cur_kingdom"),
             (store_and, ":already_done", "$g_tld_conversations_done", tld_conv_bit_gandalf_enemy_down),
             (eq, ":already_done", 0),

diff --git a/_wb/languages/en/ui.csv b/_wb/languages/en/ui.csv
@@ -315,7 +315,7 @@ ui_joining_cost_weekly_wage|Joining cost: %d, Weekly wage: %d
 ui_weekly_wage|Weekly wage: %d denars
 ui_price|Price: %d
 ui_number_ready_to_upgrade|%d ready to be upgraded.
-ui_upgrade_to_value| Upgrade to %s (%dd)
+ui_upgrade_to_value| Upgrade to %s 
 ui_notification_no_slot_for_upgrade|No slot for upgrading to %s!
 ui_shield_broken|Shield broken.
 ui_shield_cracked|Shield cracked.

diff --git a/_wb/simple_triggers.txt b/_wb/simple_triggers.txt
diff --git a/_wb/variable_uses.txt b/_wb/variable_uses.txt
@@ -9,7 +9,7 @@
 6
 5
 1
-44
+45
 9
 2
 2

diff --git a/simple_triggers.txt b/simple_triggers.txt
diff --git a/variable_uses.txt b/variable_uses.txt
@@ -9,7 +9,7 @@
 6
 5
 1
-42
+43
 9
 2
 2