Fix Bottlepass locking Captains Mode Selection (#2343)

* Fix Selection on Captains Mode, Add Sohei Arcana to picking screen

* Semistandard changes

Author: carlosrpg

content/maps/prefabs/heroes/DBZSohei.vmap

@@ -83,6 +83,8 @@ var hilariousLoadingPhrases = [
 
 SetupTopBar();
 
+$('#MainContent').SetHasClass(currentMap, true);
+
 CustomNetTables.SubscribeNetTableListener('hero_selection', onPlayerStatChange);
 CustomNetTables.SubscribeNetTableListener('bottlepass', UpdateBottleList);
 
@@ -597,6 +599,8 @@ function ReloadCMStatus (data) {
     // the "select your hero at the end" thing
     if (obj.side === teamID && obj.type === 'Pick' && obj.hero !== 'empty') {
       ReturnChatWindow();
+      $('#MainContent').SetHasClass('CMHeroChoices', true);
+
       var newbutton = $.CreatePanel('RadioButton', FindDotaHudElement('CMHeroPreview'), '');
       newbutton.group = 'CMHeroChoises';
       newbutton.AddClass('CMHeroPreviewItem');
@@ -704,6 +708,7 @@ function PreviewHero (name) {
 }
 
 function UpdateBottlePassArcana (heroName) {
+  var playerID = Game.GetLocalPlayerID();
   $('#ArcanaSelection').RemoveAndDeleteChildren();
 
   if (heroName !== 'npc_dota_hero_sohei' && heroName !== 'npc_dota_hero_electrician') {
@@ -712,11 +717,17 @@ function UpdateBottlePassArcana (heroName) {
   }
   $('#ArcanaPanel').SetHasClass('HasArcana', true);
 
+  var selectedArcanas = CustomNetTables.GetTableValue('bottlepass', 'selected_arcanas');
+  var selectedArcana = 'DefaultSet';
+
+  if (selectedArcanas !== undefined && selectedArcanas[playerID.toString()] !== undefined) {
+    selectedArcana = selectedArcanas[playerID.toString()][heroName];
+  }
+
   $.Schedule(0.2, function () {
     $.Msg('UpdateBottlePassArcana(' + heroName + ')');
     var arcanas = null;
 
-    var playerID = Game.GetLocalPlayerID();
     var specialArcanas = CustomNetTables.GetTableValue('bottlepass', 'special_arcanas');
     for (var arcanaIndex in specialArcanas) {
       if (specialArcanas[arcanaIndex].PlayerId === playerID) {
@@ -727,9 +738,9 @@ function UpdateBottlePassArcana (heroName) {
     if (heroName === 'npc_dota_hero_sohei') {
       radio = $.CreatePanel('RadioButton', $('#ArcanaSelection'), 'DefaultSoheiSet');
       radio.BLoadLayoutSnippet('ArcanaRadio');
-      radio.checked = true;
       radio.hero = heroName;
       radio.setName = 'DefaultSet';
+      radio.checked = selectedArcana === radio.setName;
 
       // Disabled
       // radio = $.CreatePanel('RadioButton', $('#ArcanaSelection'), 'PepsiSoheiSet');
@@ -743,21 +754,23 @@ function UpdateBottlePassArcana (heroName) {
           radio.BLoadLayoutSnippet('ArcanaRadio');
           radio.hero = heroName;
           radio.setName = 'DBZSohei';
+          radio.checked = selectedArcana === radio.setName;
         }
       }
     } else if (heroName === 'npc_dota_hero_electrician') {
       radio = $.CreatePanel('RadioButton', $('#ArcanaSelection'), 'DefaultElectricianSet');
       radio.BLoadLayoutSnippet('ArcanaRadio');
-      radio.checked = true;
       radio.hero = heroName;
       radio.setName = 'DefaultSet';
+      radio.checked = selectedArcana === radio.setName;
 
       // Disabled
 
       // radio = $.CreatePanel('RadioButton', $('#ArcanaSelection'), 'RockElectricianSet');
       // radio.BLoadLayoutSnippet('ArcanaRadio');
       // radio.hero = heroName;
       // radio.setName = 'RockElectrician';
+      // radio.checked = selectedArcana === radio.setName;
     }
     SelectArcana();
   });
@@ -768,6 +781,19 @@ function SelectArcana () {
   if (arcanasList.GetChildCount() > 0) {
     var selectedArcana = $('#ArcanaSelection').Children()[0].GetSelectedButton();
 
+    var id = 'Scene' + ~~(Math.random() * 100);
+    var preview = FindDotaHudElement('HeroPreview');
+    preview.RemoveAndDeleteChildren();
+    if (selectedArcana.setName !== 'DefaultSet') {
+      preview.BCreateChildren('<DOTAScenePanel particleonly="false" id="' + id + '" style="opacity-mask: url(\'s2r://panorama/images/masks/softedge_box_png.vtex\');" map="prefabs\\heroes\\' + selectedArcana.setName + '"  renderdeferred="false"  camera="camera1" rotateonhover="true" yawmin="-10" yawmax="10" pitchmin="-10" pitchmax="10"/>');
+    } else {
+      if (selectedArcana.hero === 'npc_dota_hero_sohei') {
+        preview.BCreateChildren('<DOTAScenePanel particleonly="false" id="' + id + '" style="opacity-mask: url(\'s2r://panorama/images/masks/softedge_box_png.vtex\');" map="prefabs\\heroes\\sohei" renderdeferred="false"  camera="camera1" rotateonhover="true" yawmin="-10" yawmax="10" pitchmin="-10" pitchmax="10"/>');
+      } else if (selectedArcana.hero === 'npc_dota_hero_electrician') {
+        preview.BCreateChildren('<DOTAScenePanel particleonly="false" id="' + id + '" style="opacity-mask: url(\'s2r://panorama/images/masks/softedge_box_png.vtex\');" map="prefabs\\heroes\\electrician" renderdeferred="false"  camera="camera1" rotateonhover="true" yawmin="-10" yawmax="10" pitchmin="-10" pitchmax="10"/>');
+      }
+    }
+
     var data = {
       Hero: selectedArcana.hero,
       Arcana: selectedArcana.setName,
@@ -780,37 +806,43 @@ function SelectArcana () {
 }
 
 function UpdateBottleList () {
+  var playerID = Game.GetLocalPlayerID();
+  var specialBottles = CustomNetTables.GetTableValue('bottlepass', 'special_bottles');
+  var bottles = specialBottles[playerID.toString()].Bottles;
+
+  if ($('#BottleSelection').GetChildCount() === Object.keys(bottles).length + 1) {
+    // ignore repaint if radio is already filled
+    return;
+  }
+
   $('#BottleSelection').RemoveAndDeleteChildren();
-  SelectBottle();
   // Wait the parent be updated
   $.Schedule(0.2, function () {
-    var playerID = Game.GetLocalPlayerID();
-    var specialBottles = CustomNetTables.GetTableValue('bottlepass', 'special_bottles');
-    var bottles = null;
-    for (var bottleIndex in specialBottles) {
-      if (specialBottles[bottleIndex].PlayerId === playerID) {
-        bottles = specialBottles[bottleIndex].Bottles;
-      }
+    var selectedBottle;
+
+    var selectedBottles = CustomNetTables.GetTableValue('bottlepass', 'selected_bottles');
+    if (selectedBottles !== undefined && selectedBottles[playerID.toString()] !== undefined) {
+      selectedBottle = selectedBottles[playerID.toString()];
     }
-    // Default Bottle
-    // var radio = $.CreatePanel('RadioButton', $('#BottleSelection'), 'Bottle0');
-    // radio.BLoadLayoutSnippet('BottleRadio');
-    // radio.checked = true;
-    // radio.bottleId = 0;
+
+    CreateBottleRadioElement(0, selectedBottle === 0);
     var bottleCount = Object.keys(bottles).length;
     Object.keys(bottles).forEach(function (bottleId, i) {
       var id = bottles[bottleId];
-      var radio = $.CreatePanel('RadioButton', $('#BottleSelection'), 'Bottle' + id);
-      radio.BLoadLayoutSnippet('BottleRadio');
-      radio.bottleId = id;
-
-      if (i === bottleCount - 1) {
-        radio.checked = true;
-      }
+      CreateBottleRadioElement(bottles[bottleId], selectedBottle === undefined ? i === bottleCount - 1 : id === selectedBottle);
     });
+
+    SelectBottle();
   });
 }
 
+function CreateBottleRadioElement (id, isChecked) {
+  var radio = $.CreatePanel('RadioButton', $('#BottleSelection'), 'Bottle' + id);
+  radio.BLoadLayoutSnippet('BottleRadio');
+  radio.bottleId = id;
+  radio.checked = isChecked;
+}
+
 function SelectBottle () {
   var bottleId = 0;
   var btn = $('#Bottle0');

content/panorama/scripts/custom_game/hero_selection.js

@@ -505,7 +505,7 @@ RadioButton.Disabled:selected {
 }
 
 #HeroSelector {
-  width: 35%;
+  width: 37%;
   height: fill-parent-flow(1.0);
   flow-children: right;
   horizontal-align: center;
@@ -549,7 +549,8 @@ RadioButton.Disabled:selected {
 }
 
 DOTAScenePanel {
-  width: 100%;
+  horizontal-align: middle;
+  width: 80%;
   height: 100%;
 }
 
@@ -605,15 +606,18 @@ DOTAScenePanel {
 }
 
 #AbilityPreview {
-  width: fill-parent-flow(1.0);
+  horizontal-align: center;
   vertical-align: bottom;
   flow-children: right;
+  overflow: scroll squish;
 }
 
 #AbilityPreview DOTAAbilityImage {
-  width: fill-parent-flow(1.0);
   tooltip-position: top;
-  margin: 0px 3px;
+  max-width: 67px;
+  margin: 0px 5px;
+  border: 2px solid grey;
+  border-radius: 8px;
 }
 
 #HeroPickContainer {
@@ -898,7 +902,7 @@ DOTAScenePanel {
   margin-top: 10%;
   transition-delay: 7s;
 }
-.CaptainsMode .BottlePassSelection{
+.captains_mode .BottlePassSelection{
   margin-top: -45px;
 }
 
@@ -910,6 +914,10 @@ DOTAScenePanel {
   visibility: collapse;
 }
 
+.captains_mode #AbilityPreview{
+  height: 80px;
+}
+
 .BottlePassSelection
 {
   height: 600px;

content/panorama/styles/custom_game/hero_selection.css

@@ -206,12 +206,14 @@ end
 function HeroSelection:OnBottleSelected (selectedBottle)
   if HeroSelection.SelectedBottle == nil then HeroSelection.SelectedBottle = {} end
   HeroSelection.SelectedBottle[selectedBottle.PlayerId] = selectedBottle.BottleId
+  CustomNetTables:SetTableValue( 'bottlepass', 'selected_bottles', HeroSelection.SelectedBottle )
 end
 
 function HeroSelection:OnArcanaSelected (selectedArcana)
   if HeroSelection.SelectedArcana == nil then HeroSelection.SelectedArcana = {} end
   if HeroSelection.SelectedArcana[selectedArcana.PlayerId] == nil then HeroSelection.SelectedArcana[selectedArcana.PlayerId] = {} end
   HeroSelection.SelectedArcana[selectedArcana.PlayerId][selectedArcana.Hero] = selectedArcana.Arcana
+  CustomNetTables:SetTableValue( 'bottlepass', 'selected_arcanas', HeroSelection.SelectedArcana )
 end
 
 function HeroSelection:GetSelectedBottleForPlayer(playerId)