diff --git a/game/bin/built_from_cl.txt b/game/bin/built_from_cl.txt
index 80bd28a5a9..71cc60cb76 100644
--- a/game/bin/built_from_cl.txt
+++ b/game/bin/built_from_cl.txt
@@ -1 +1 @@
-5344626
+5345934
diff --git a/game/dota/pak01_dir.txt b/game/dota/pak01_dir.txt
index 125c54c475..f033faae2c 100644
--- a/game/dota/pak01_dir.txt
+++ b/game/dota/pak01_dir.txt
@@ -138879,7 +138879,7 @@ panorama/layout/hero_card.vxml_c CRC:0066d616f0 size:2851
panorama/layout/hero_filters.vxml_c CRC:003db8b9ea size:7619
panorama/layout/hero_grid.vxml_c CRC:00d2c3300e size:808
panorama/layout/hero_grid_new.vxml_c CRC:00a79128be size:8576
-panorama/layout/hero_inspect.vxml_c CRC:00529be85f size:3510
+panorama/layout/hero_inspect.vxml_c CRC:002c4d3222 size:3433
panorama/layout/hero_model_overlay.vxml_c CRC:0022e6d93e size:1848
panorama/layout/hero_plus_avg_stat_row.vxml_c CRC:00580ab6a0 size:1559
panorama/layout/hero_plus_pickwinban_row.vxml_c CRC:00f175abfb size:3074
@@ -138970,7 +138970,7 @@ panorama/layout/hud/dota_hud_portal_effect.vxml_c CRC:00cd4b67e0 size:907
panorama/layout/hud/dota_hud_portrait.vxml_c CRC:00f906bc30 size:924
panorama/layout/hud/dota_hud_portrait_killer.vxml_c CRC:006728fad9 size:642
panorama/layout/hud/dota_hud_predictions_button.vxml_c CRC:0050461a07 size:945
-panorama/layout/hud/dota_hud_pregame.vxml_c CRC:0087134546 size:36891
+panorama/layout/hud/dota_hud_pregame.vxml_c CRC:008ccfc3d2 size:36818
panorama/layout/hud/dota_hud_promo.vxml_c CRC:004894cf6a size:982
panorama/layout/hud/dota_hud_query_unit.vxml_c CRC:003a3b1e90 size:4417
panorama/layout/hud/dota_hud_query_unit_stats.vxml_c CRC:001fd83852 size:1369
@@ -139195,7 +139195,7 @@ panorama/layout/popups/popup_purchase_random_hero_relic.vxml_c CRC:00f0cd4512 si
panorama/layout/popups/popup_ranked_calibration.vxml_c CRC:0089f9ea21 size:1946
panorama/layout/popups/popup_ready_check.vxml_c CRC:008cd7869c size:1395
panorama/layout/popups/popup_replay_pending.vxml_c CRC:00b338736f size:1420
-panorama/layout/popups/popup_report_player.vxml_c CRC:00fd6e5935 size:7351
+panorama/layout/popups/popup_report_player.vxml_c CRC:002a0fdba0 size:6698
panorama/layout/popups/popup_save_custom_hero_set.vxml_c CRC:00e92dced1 size:1997
panorama/layout/popups/popup_seasonal_item_received.vxml_c CRC:001ea5e35a size:2005
panorama/layout/popups/popup_seasonal_ranked_leaderboards.vxml_c CRC:0081882107 size:3085
@@ -139975,7 +139975,7 @@ panorama/styles/hero_card.vcss_c CRC:0004d9f956 size:29140
panorama/styles/hero_filters.vcss_c CRC:0077e2192d size:14924
panorama/styles/hero_grid.vcss_c CRC:00455fa662 size:3169
panorama/styles/hero_grid_new.vcss_c CRC:002eee4f5e size:29290
-panorama/styles/hero_inspect.vcss_c CRC:00185d7075 size:12245
+panorama/styles/hero_inspect.vcss_c CRC:00f0592238 size:11997
panorama/styles/hero_model_overlay.vcss_c CRC:00417471b9 size:15036
panorama/styles/hero_relic_image.vcss_c CRC:0081be216f size:14177
panorama/styles/hero_relic_summary.vcss_c CRC:0083c5ef20 size:11723
@@ -140058,7 +140058,7 @@ panorama/styles/hud/dota_hud_portal_effect.vcss_c CRC:00347c0aa9 size:3853
panorama/styles/hud/dota_hud_portrait.vcss_c CRC:00a194462c size:4573
panorama/styles/hud/dota_hud_portrait_killer.vcss_c CRC:003afa043a size:446
panorama/styles/hud/dota_hud_predictions_button.vcss_c CRC:00964ee283 size:2743
-panorama/styles/hud/dota_hud_pregame.vcss_c CRC:006c494a7b size:109597
+panorama/styles/hud/dota_hud_pregame.vcss_c CRC:00ce2c776a size:109259
panorama/styles/hud/dota_hud_promo.vcss_c CRC:0047bf979b size:1193
panorama/styles/hud/dota_hud_query_unit.vcss_c CRC:0078c40c76 size:26793
panorama/styles/hud/dota_hud_query_unit_stats.vcss_c CRC:0044e0940c size:4965
@@ -183960,7 +183960,7 @@ particles/world_tower/tower_upgrade/ti7_radiant_tower_orb_sphere.vpcf_c CRC:00be
particles/world_tower/tower_upgrade/ti7_radiant_tower_orb_streaks.vpcf_c CRC:00b2b4489f size:1506
particles/world_tower/tower_upgrade/ti7_radiant_tower_orb_swirl.vpcf_c CRC:0032e1426a size:1631
particles/world_tower/tower_upgrade/ti7_radiant_tower_proj.vpcf_c CRC:000af6a61e size:2445
-patchnotes/patchnotes.vdpn_c CRC:0038cc005d size:276481
+patchnotes/patchnotes.vdpn_c CRC:0067cc1aba size:276481
recorder/out/npc_dota_hero_treant.png CRC:00d313efd7 size:37114
resource/bonusmappanel.res CRC:00fb368d07 size:1804
resource/bonusmapsdialog.res CRC:003fc2b682 size:8289
@@ -186892,7 +186892,7 @@ resource/localization/dota_bulgarian.txt CRC:00dbd5750f size:4517586
resource/localization/dota_czech.txt CRC:00d23a90f6 size:4395152
resource/localization/dota_danish.txt CRC:001dfc3b37 size:4117020
resource/localization/dota_dutch.txt CRC:00ae2d9711 size:3405942
-resource/localization/dota_english.txt CRC:003f3233f8 size:4537298
+resource/localization/dota_english.txt CRC:00f02cee43 size:4539344
resource/localization/dota_finnish.txt CRC:0016c88e99 size:3171544
resource/localization/dota_french.txt CRC:0035627158 size:4653576
resource/localization/dota_german.txt CRC:00421af507 size:4378572
@@ -189461,10 +189461,10 @@ scripts/tournaments/challenge_templates/allied_gold_multi_ranked.txt CRC:00a8583
scripts/tournaments/challenge_templates/ancient_apparition/aa_cold_feet_freezes.txt CRC:003fac4a5e size:1018
scripts/tournaments/challenge_templates/ancient_apparition/aa_iceblast_damage_ranked.txt CRC:008da86d72 size:953
scripts/tournaments/challenge_templates/ancient_apparition/aa_iceblast_kills.txt CRC:009b0d7b01 size:825
-scripts/tournaments/challenge_templates/ancient_apparition/aa_kills_on_ice_vortexed.txt CRC:008c95e26a size:994
+scripts/tournaments/challenge_templates/ancient_apparition/aa_kills_on_ice_vortexed.txt CRC:0048a4e358 size:980
scripts/tournaments/challenge_templates/ancient_apparition/aa_magic_damage_on_ice_vortexed_needs_fixing.txt CRC:00abe32770 size:1179
scripts/tournaments/challenge_templates/ancient_apparition/aa_team_damage_chilling_touch.txt CRC:0071a6eb60 size:881
-scripts/tournaments/challenge_templates/ancient_apparition/aa_triple_ice_blast.txt CRC:00b6640097 size:1268
+scripts/tournaments/challenge_templates/ancient_apparition/aa_triple_ice_blast.txt CRC:0011624e29 size:1334
scripts/tournaments/challenge_templates/antimage/antimage_double_mana_void_mana_burn_ranked.txt CRC:006ea6c6f6 size:2165
scripts/tournaments/challenge_templates/antimage/antimage_mana_break_mana_damage.txt CRC:00ed543691 size:860
scripts/tournaments/challenge_templates/antimage/antimage_quick_blink_kills.txt CRC:00ff0de643 size:884
@@ -190012,7 +190012,7 @@ scripts/tournaments/challenge_templates/rubick/rubick_deal_damage_with_stolen_sp
scripts/tournaments/challenge_templates/rubick/rubick_fade_bolt_multi_hero.txt CRC:008fdcbd88 size:1321
scripts/tournaments/challenge_templates/rubick/rubick_kill_after_telekinesis.txt CRC:005b7712dc size:1084
scripts/tournaments/challenge_templates/rubick/rubick_stuns_after_telekinesis.txt CRC:005ce37c3c size:912
-scripts/tournaments/challenge_templates/rubick/rubick_ultimates_stolen.txt CRC:003f14bb4e size:798
+scripts/tournaments/challenge_templates/rubick/rubick_ultimates_stolen.txt CRC:0045461688 size:827
scripts/tournaments/challenge_templates/sand_king/sand_king_blink_epicenter.txt CRC:004de56e59 size:918
scripts/tournaments/challenge_templates/sand_king/sand_king_blink_epicenter_damage_instances.txt CRC:008ff4944a size:992
scripts/tournaments/challenge_templates/sand_king/sand_king_creep_kills_with_caustic_finale.txt CRC:00dfbfc17b size:808
diff --git a/game/dota/pak01_dir/panorama/layout/hero_inspect.xml b/game/dota/pak01_dir/panorama/layout/hero_inspect.xml
index 489ca619b3..644515b052 100644
--- a/game/dota/pak01_dir/panorama/layout/hero_inspect.xml
+++ b/game/dota/pak01_dir/panorama/layout/hero_inspect.xml
@@ -4,7 +4,7 @@
-
+
-->
-
-
+
diff --git a/game/dota/pak01_dir/panorama/layout/hud/dota_hud_pregame.xml b/game/dota/pak01_dir/panorama/layout/hud/dota_hud_pregame.xml
index ca4b6131c4..74a312894a 100644
--- a/game/dota/pak01_dir/panorama/layout/hud/dota_hud_pregame.xml
+++ b/game/dota/pak01_dir/panorama/layout/hud/dota_hud_pregame.xml
@@ -291,7 +291,6 @@
-
diff --git a/game/dota/pak01_dir/panorama/layout/popups/popup_report_player.xml b/game/dota/pak01_dir/panorama/layout/popups/popup_report_player.xml
index f9913cc204..80f81c1f21 100644
--- a/game/dota/pak01_dir/panorama/layout/popups/popup_report_player.xml
+++ b/game/dota/pak01_dir/panorama/layout/popups/popup_report_player.xml
@@ -79,19 +79,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/game/dota/pak01_dir/panorama/styles/hero_inspect.css b/game/dota/pak01_dir/panorama/styles/hero_inspect.css
index ea8ced2214..361168d804 100644
--- a/game/dota/pak01_dir/panorama/styles/hero_inspect.css
+++ b/game/dota/pak01_dir/panorama/styles/hero_inspect.css
@@ -1,23 +1,15 @@
-@import url("file://{resources}styles/battle_pass/current_battle_pass.css");
-
DOTAHeroInspect
{
height: 625px;
+ width: 376px;
flow-children: none;
background-color: gradient( linear, 0% 100%, 0% 0%, from( #171A25dd ), to( #171A25dd ) );
- padding-top: 8px;
+ padding: 8px 16px 16px 16px;
border: 1px solid black;
}
-
-.ContextMenuHeroInspect DOTAHeroInspect
-{
- max-height: 345px;
- max-width: 400px;
-}
-
.EventGame DOTAHudPreGame.DarkMoon DOTAHeroInspect
{
background-color: gradient( linear, 0% 100%, 0% 0%, from( #14181E ), to( #271A25ed ) );
@@ -30,8 +22,6 @@ DOTAHeroInspect
#HeroInspectHeader
{
- padding-left: 16px;
- padding-right: 16px;
flow-children: right;
}
@@ -64,7 +54,7 @@ DOTAHeroInspect
#HeroInspectInfo
{
- padding-left: 16px;
+
flow-children: right;
height: 226px;
margin-top: 36px;
@@ -170,7 +160,6 @@ DOTAHeroInspect
#HeroRoles
{
- padding-right: 16px;
width: fill-parent-flow( 1.0 );
margin-left: 6px;
//wash-color: #547095;
@@ -178,8 +167,6 @@ DOTAHeroInspect
#HeroAbilities
{
- padding-left: 16px;
- padding-right: 16px;
margin-top: 268px;
flow-children: right;
height: 60px;
@@ -217,8 +204,6 @@ DOTAHeroInspect
opacity-mask: url("s2r://panorama/images/masks/softedge_vertical_vscroll_psd.vtex");
padding-right: 12px;
visibility: collapse;
- padding-left: 16px;
- padding-right: 16px;
}
.CavernCrawlActive #HeroHype
@@ -231,12 +216,6 @@ DOTAHeroInspect
visibility: visible;
}
-.SelfGameEventActive #HeroHype
-{
- visibility: collapse;
-}
-
-
#BioStatsNavigator
{
margin-top: 350px;
@@ -410,8 +389,3 @@ DOTAHeroInspect
{
flow-children: down;
}
-
-#FriendsAndFoes
-{
- margin-top: 340px;
-}
\ No newline at end of file
diff --git a/game/dota/pak01_dir/panorama/styles/hud/dota_hud_pregame.css b/game/dota/pak01_dir/panorama/styles/hud/dota_hud_pregame.css
index 018b950a0a..09d0f5fb7b 100644
--- a/game/dota/pak01_dir/panorama/styles/hud/dota_hud_pregame.css
+++ b/game/dota/pak01_dir/panorama/styles/hud/dota_hud_pregame.css
@@ -2373,29 +2373,6 @@ DOTAHudPreGame.Reconnect.PreGamePhase
width: 240px;
}
-.SelfGameEventVisible #StrategyTeamCompPanel
-{
- visibility: collapse;
-}
-
-#FriendsAndFoes
-{
- width: 280px;
- margin-left: 16px;
- height: 100%;
- visibility: collapse;
-}
-
-.AspectRatio4x3 #FriendsAndFoes
-{
- width: 240px;
-}
-
-.SelfGameEventVisible #FriendsAndFoes
-{
- visibility: visible;
-}
-
#StrategyMapContents
{
flow-children: right;
@@ -3579,11 +3556,10 @@ DOTAHudPreGame:not(.GameEventActive) #BattlePassNotActive
DOTAHeroPickingTeamComposition
{
width: 100%;
-
visibility: visible;
}
-.PlusSubscriber #PreGame:not(.StrategyVisible) DOTAHeroPickingTeamComposition
+#HeroPickTeamComposition
{
visibility: collapse;
}
diff --git a/game/dota/pak01_dir/resource/localization/dota_english.txt b/game/dota/pak01_dir/resource/localization/dota_english.txt
index 9f6488934b..2578fa8342 100644
--- a/game/dota/pak01_dir/resource/localization/dota_english.txt
+++ b/game/dota/pak01_dir/resource/localization/dota_english.txt
@@ -8311,6 +8311,7 @@ As each stone's cultural influence spread, it eventually came in conflict with t
"KillEaterEventType_Towers_Destroyed" "Towers Destroyed"
"KillEaterEventType_Bounty_TrackedKills" "Tracked Kills"
"KillEaterEventType_Bounty_TrackedInvisKills" "Tracked Invisible Kills"
+ "KillEaterEventType_Bounty_InvisJinadaHits" "Jinada Hits From Invisible"
"KillEaterEventType_Bounty_JinadaGoldStolen" "Jinada Gold Stolen"
"KillEaterEventType_Bounty_TrackGold" "Tracked Bonus Gold"
"KillEaterEventType_Tide_GoodRavages" "Quad Ravages"
@@ -18687,7 +18688,7 @@ Special Techies Taunt"
"DOTA_ChallengeDesc_EmberSpirit_ChainsDuringSleightOfFist" "Hit %s1 enemy heroes with Searing Chains while affected by Sleight of Fist."
"DOTA_ChallengeStatus_EmberSpirit_ChainsDuringSleightOfFist" "%s2I need to hit enemy Heroes more times with Searing Chains while in Sleight of Fist %s1 more times!"
- "DOTA_ChallengeDesc_Antimage_SpellsBlockedAghs" "Reflect %s1 spells with Spell Shield after buying Aghanim's Scepter."
+ "DOTA_ChallengeDesc_Antimage_SpellsBlockedCounterspell" "Reflect %s1 spells with Counterspell."
"DOTA_ChallengeStatus_Antimage_SpellsBlockedAghs" "%s2I need to reflect %s1 more spells with Spell Shield!"
"DOTA_ChallengeDesc_Antimage_ManaBreakManaDamage" "Deal %s1 mana burn to enemy heroes with Mana Break."
"DOTA_ChallengeStatus_Antimage_ManaBreakManaDamage" "%s2I need to deal %s1 more mana burn to enemy heroes with Mana Break!"
@@ -20561,6 +20562,19 @@ Special Techies Taunt"
"DOTA_HeroSelectorCategory_PrimaryAttribute_Agility" "Agility"
"DOTA_HeroSelectorCategory_PrimaryAttribute_Intelligence" "Intelligence"
+ "DOTA_DerivedStatsHelp_Tooltip_Damage" "Damage"
+ "DOTA_DerivedStatsHelp_Tooltip_Damage_Desc" "Amount of physical damage dealt with each attack."
+ "DOTA_DerivedStatsHelp_Tooltip_Armor" "Armor"
+ "DOTA_DerivedStatsHelp_Tooltip_Armor_Desc" "Armor reduces physical damage taken."
+ "DOTA_DerivedStatsHelp_Tooltip_Movespeed" "Movement Speed"
+ "DOTA_DerivedStatsHelp_Tooltip_Movespeed_Desc" "The speed at which the hero moves on the map."
+ "DOTA_DerivedStatsHelp_Tooltip_BaseAttackTime" "Base Attack Time"
+ "DOTA_DerivedStatsHelp_Tooltip_BaseAttackTime_Desc" "The amount of time it takes the hero to attack before attack speed is calculated."
+ "DOTA_DerivedStatsHelp_Tooltip_AttackSpeed" "Attack Speed"
+ "DOTA_DerivedStatsHelp_Tooltip_AttackSpeed_Desc" "The amount of attack speed the hero has."
+ "DOTA_DerivedStatsHelp_Tooltip_AttackRange" "Attack Range"
+ "DOTA_DerivedStatsHelp_Tooltip_AttackRange_Desc" "Distance from which the hero can attack."
+
"DOTA_HeroSelectorCategory_AttackRange_Melee" "Melee"
"DOTA_HeroSelectorCategory_AttackRange_Ranged" "Ranged"
diff --git a/game/dota/pak01_dir/scripts/tournaments/challenge_templates/ancient_apparition/aa_kills_on_ice_vortexed.txt b/game/dota/pak01_dir/scripts/tournaments/challenge_templates/ancient_apparition/aa_kills_on_ice_vortexed.txt
index bbff87f21b..6f1b5cd40b 100644
--- a/game/dota/pak01_dir/scripts/tournaments/challenge_templates/ancient_apparition/aa_kills_on_ice_vortexed.txt
+++ b/game/dota/pak01_dir/scripts/tournaments/challenge_templates/ancient_apparition/aa_kills_on_ice_vortexed.txt
@@ -13,11 +13,11 @@
"event" "death"
"target" "!1"
}
- "separator" "0.010000"
+ "separator" "0.51"
"vortex_removed"
{
"event" "modifier_remove"
- "modifier" "ancient_apparition_ice_vortex"
+ "modifier" "modifier_ice_vortex"
"caster" "!hero"
"target_team" "!enemyteam"
"target_must_be_hero" "1"
diff --git a/game/dota/pak01_dir/scripts/tournaments/challenge_templates/ancient_apparition/aa_triple_ice_blast.txt b/game/dota/pak01_dir/scripts/tournaments/challenge_templates/ancient_apparition/aa_triple_ice_blast.txt
index 8c24b17d77..fb3a521c57 100644
--- a/game/dota/pak01_dir/scripts/tournaments/challenge_templates/ancient_apparition/aa_triple_ice_blast.txt
+++ b/game/dota/pak01_dir/scripts/tournaments/challenge_templates/ancient_apparition/aa_triple_ice_blast.txt
@@ -2,6 +2,7 @@
{
"desc" "#DOTA_ChallengeDesc_AA_Triple_Ice_Blast"
+ "image" "images/spellicons/ancient_apparition_ice_blast.png"
"requiredhero" "ancient_apparition"
"events"
{
diff --git a/game/dota/pak01_dir/scripts/tournaments/challenge_templates/rubick/rubick_ultimates_stolen.txt b/game/dota/pak01_dir/scripts/tournaments/challenge_templates/rubick/rubick_ultimates_stolen.txt
index 6b9a49a4bb..339a45e4d4 100644
--- a/game/dota/pak01_dir/scripts/tournaments/challenge_templates/rubick/rubick_ultimates_stolen.txt
+++ b/game/dota/pak01_dir/scripts/tournaments/challenge_templates/rubick/rubick_ultimates_stolen.txt
@@ -26,6 +26,7 @@
}
}
}
+ "progress_stored_in" "1"
"post_tests"
{
"test_spellsteal_killeater"
diff --git a/game/dota/steam.inf b/game/dota/steam.inf
index 3053e78254..b9811cf753 100644
--- a/game/dota/steam.inf
+++ b/game/dota/steam.inf
@@ -1,10 +1,10 @@
-ClientVersion=3761
-ServerVersion=3761
+ClientVersion=3762
+ServerVersion=3762
ProductName=dota2_workshop
appID=570
ServerAppID=373310
CustomGameServerAppID=471280
ToolsAppID=316570
-SourceRevision=5344698
+SourceRevision=5346039
VersionDate=Sep 10 2019
-VersionTime=10:11:55
+VersionTime=16:51:31