Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unit Display: When an invisible enemy unit recruits another invisible unit, don't scroll to their location #3559

Merged
merged 1 commit into from Sep 24, 2018

Conversation

jostephd
Copy link
Member

@jostephd jostephd commented Sep 16, 2018

Scrolling to them would leak their location to the player.

edit: To test this:

diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg
index 805f25cc67..4c9fb338bc 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg
@@ -6,7 +6,8 @@
     victory_when_enemies_defeated=no
     map_data="{campaigns/Heir_To_The_Throne/maps/01_The_Elves_Besieged.map}"
     {TURNS 16 14 12}
-    {DEFAULT_SCHEDULE}
+    {SECOND_WATCH}
+    {DAWN}
 
     {SCENARIO_MUSIC "battle.ogg"}
     {EXTRA_SCENARIO_MUSIC "casualties_of_war.ogg"}
@@ -160,13 +161,14 @@
 #enddef
 
     [side]
-        type=Orcish Warlord
+        {QUANTITY type Nightgaunt Nightgaunt Lich}
         id=Urug-Telfar
         name= _ "Urug-Telfar"
         side=2
+        x,y=31,3
         canrecruit=yes
         profile=portraits/orcs/grunt-2.png
-        recruit=Orcish Warrior,Goblin Knight,Goblin Pillager,Orcish Crossbowman,Orcish Assassin,Troll
+        {QUANTITY recruit Shadow Skeleton Shadow}
         gold=400
         [ai]
             recruitment_pattern=scout,fighter,mixed fighter,archer
@@ -187,6 +189,7 @@
         id=Knafa-Tan
         name= _ "Knafa-Tan"
         side=3
+        x,y=9,4
         canrecruit=yes
         recruit=Orcish Warrior,Wolf Rider,Orcish Crossbowman,Orcish Assassin,Troll
         {EBESIEGED_RECRUITMENT}
@@ -208,6 +211,7 @@
         id=Maga-Knafa
         name= _ "Maga-Knafa"
         side=4
+        x,y=9,5
         canrecruit=yes
         recruit=Orcish Warrior,Wolf Rider,Orcish Crossbowman,Troll Warrior,Orcish Slayer
         {EBESIEGED_RECRUITMENT}

…n't scroll to it.

When the enemy leader and the unit it recruits are both invisible,
scrolling to them would leak their location to the player.
@sevu sevu added this to the 1.14.6 milestone Sep 20, 2018
@jyrkive jyrkive merged commit 83ba09a into wesnoth:1.14 Sep 24, 2018
@jyrkive
Copy link
Member

jyrkive commented Sep 24, 2018

Thanks for the pull request. :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants