Fix/clock beasthelmet kingmakers crown magicresist herobuffs

.vscode/settings.json

@@ -45,5 +45,14 @@
     "editor.defaultFormatter": "sumneko.lua"
   },
   "githubPullRequests.ignoredPullRequestBranches": ["develop"],
-  "editor.wordWrap": "on"
+  "editor.wordWrap": "on",
+  "[vdf]": {
+    "editor.defaultFormatter": "pfwobcke.vscode-vdf"
+  },
+  "[xml]": {
+    "editor.defaultFormatter": "redhat.vscode-xml"
+  },
+  "[valve-kv]": {
+    "editor.defaultFormatter": "Sarrus.sourcepawn-vscode"
+  }
 }

content/panorama/images/items/item_beast_helmet.xml

@@ -0,0 +1,5 @@
+<root>
+  <Panel class="AddonLoadingRoot">
+    <Image id="gamemode" class="SeqImg" src="file://{images}/items/beast_helmet.png" />
+  </Panel>
+</root>

content/panorama/images/items/item_hand_of_prosperity.xml

@@ -0,0 +1,5 @@
+<root>
+  <Panel class="AddonLoadingRoot">
+    <Image id="gamemode" class="SeqImg" src="file://{images}/items/hand_of_prosperity.png" />
+  </Panel>
+</root>

content/panorama/images/items/item_kingmakers_crown.xml

@@ -0,0 +1,5 @@
+<root>
+  <Panel class="AddonLoadingRoot">
+    <Image id="gamemode" class="SeqImg" src="file://{images}/items/kingmakers_crown.png" />
+  </Panel>
+</root>

content/panorama/images/items/item_recipe_beast_helmet.xml

@@ -0,0 +1,5 @@
+<root>
+  <Panel class="AddonLoadingRoot">
+    <Image id="gamemode" class="SeqImg" src="file://{images}/items/item_recipe_beast_helmet.png" />
+  </Panel>
+</root>

content/panorama/images/items/item_recipe_hand_of_prosperity.xml

@@ -0,0 +1,5 @@
+<root>
+  <Panel class="AddonLoadingRoot">
+    <Image id="gamemode" class="SeqImg" src="file://{images}/items/item_recipe_hand_of_prosperity.png" />
+  </Panel>
+</root>

content/panorama/images/items/item_recipe_kingmakers_crown.xml

@@ -0,0 +1,5 @@
+<root>
+  <Panel class="AddonLoadingRoot">
+    <Image id="gamemode" class="SeqImg" src="file://{images}/items/item_recipe_kingmakers_crown.png" />
+  </Panel>
+</root>

content/panorama/layout/custom_game/custom_loading_screen.xml

@@ -36,7 +36,9 @@
 							<Label text="10" id="10"/>
 							<Label text="11" id="11"/>
 							<Label text="12" id="12"/>
+							<Label text="14" id="14"/>
 							<Label text="15" id="15"/>
+							<Label text="17" id="17"/>
 							<Label text="20" id="20"/>
 							<Label text="#bot_gold_xp_multiplier_40" id="40"/>
 						</DropDown>
@@ -164,6 +166,11 @@
 						<Label id="MidOnlyModeTitle" class="GameOptionsLabel" text="#mid_only_mode" />
 						<ToggleButton checked="false" class="GameOptionsToggle" id="mid_only_mode" onactivate="SendGameOptionsToServer()"/>
 					</Panel>
+					<!-- 加速模式 -->
+					<Panel id="TurboModePanel" class="GameOptionsSubPanel">
+						<Label id="TurboModeTitle" class="GameOptionsLabel" text="#turbo_mode" />
+						<ToggleButton checked="false" class="GameOptionsToggle" id="turbo_mode" onactivate="SendGameOptionsToServer()"/>
+					</Panel>
 				</Panel>
 			</Panel>
 			<!-- 游戏选项显示 START-->

content/panorama/layout/custom_game/team_select/team_select.js

@@ -290,9 +290,11 @@ function SetDifficultyByMapName() {
   }
 
   if (mapDisplayName !== 'hard') {
-    for (let i = 6; i <= 7; i++) {
+    for (let i = 6; i <= 10; i++) {
       const button = $('#DifficultyN' + i);
-      disableDifficultyButton(button, '#map_hard_warning');
+      if (button) {
+        disableDifficultyButton(button, '#map_hard_warning');
+      }
     }
   }
 
@@ -337,7 +339,7 @@ function OnChooseDifficulty(difficulty) {
     $.Msg(`Map ${mapDisplayName} cannot choose difficulty ${difficulty}`);
     return;
   }
-  if (mapDisplayName === 'hard' && difficulty !== 6 && difficulty !== 7) {
+  if (mapDisplayName === 'hard' && (difficulty < 6 || difficulty > 10)) {
     $.Msg(`Map ${mapDisplayName} cannot choose difficulty ${difficulty}`);
     return;
   }
@@ -346,7 +348,7 @@ function OnChooseDifficulty(difficulty) {
     return;
   }
   // remove all selected class
-  for (let i = 0; i <= 7; i++) {
+  for (let i = 0; i <= 10; i++) {
     const button = $('#DifficultyN' + i);
     if (button) {
       button.RemoveClass('selected');
@@ -375,7 +377,7 @@ function OnGameDifficultyChoiceChange(_table, key, value) {
     Game.SetRemainingSetupTime(10);
   }
 
-  for (let i = 0; i <= 7; i++) {
+  for (let i = 0; i <= 10; i++) {
     const button = $('#DifficultyN' + i);
     if (!button) continue;
     button.enabled = false;

content/panorama/layout/custom_game/team_select/team_select.xml

@@ -11,30 +11,37 @@
 	</scripts>
 	<Panel hittest="false" class="TeamSelect">
 		<Panel hittest="false" id="TeamSelectContainer" selectionpos="auto">
-			<!--Empty space to let the loading screen and chat be visible-->
+			<!--Empty
+			space to let the loading screen and chat be visible-->
 			<Panel hittest="false" id="TeamsSelectEmptySpace" />
 
-			<!--Game Info and Unassigned players, right hand panel-->
+			<!--Game
+			Info and Unassigned players, right hand panel-->
 			<Panel id="GameAndPlayersRoot">
 
 				<Panel id="GameInfoPanel">
 
-					<!--Game mode and map-->
+					<!--Game
+					mode and map-->
 					<Panel id="CustomGameModeName">
 						<Label id="GameModeNameLabel" text="#addon_game_name" />
 					</Panel>
 					<Panel id="MapInfo">
 						<Label id="MapInfoLabel" text="#LoadingScreenMapInfo" />
 					</Panel>
 
-					<!--Countdown timer-->
+					<!--Countdown
+					timer-->
 					<Panel id="StartGameCountdownTimer">
-						<Image id="TimerBg" src="s2r://panorama/images/status_icons/timer_background.psd" />
-						<Image id="TimerRing" src="s2r://panorama/images/status_icons/timer_ring.psd" />
+						<Image id="TimerBg"
+							src="s2r://panorama/images/status_icons/timer_background.psd" />
+						<Image id="TimerRing"
+							src="s2r://panorama/images/status_icons/timer_ring.psd" />
 						<Label id="TeamSelectTimer" text="#custom_game_team_select_timer" />
-						<Panel id="TimerLabelBox" >
+						<Panel id="TimerLabelBox">
 							<Label id="TimerLabelVote" text="#custom_game_vote" />
-							<Label id="TimerLabelAutoStart" text="#custom_game_team_select_auto_start" />
+							<Label id="TimerLabelAutoStart"
+								text="#custom_game_team_select_auto_start" />
 							<Label id="TimerLabelGameStart" text="#custom_game_team_select_starting" />
 						</Panel>
 					</Panel>
@@ -45,59 +52,88 @@
 				<Panel id="DifficultyContainer" class="flowDown">
 					<Label class="selectTitle" text="#game_difficulty_choice" />
 					<Panel id="DifficultyList" class="flowDown">
+
 						<Panel id="DifficultyDota" class="flowRight">
-							<Button id="DifficultyN1" class="difficultyChoice" onactivate="OnChooseDifficulty(1)">
+							<Button id="DifficultyN1" class="difficultyChoice"
+								onactivate="OnChooseDifficulty(1)">
 								<Label class="difficultyText" text="#game_difficulty_n1" />
 							</Button>
-							<Button id="DifficultyN2" class="difficultyChoice" onactivate="OnChooseDifficulty(2)">
+							<Button id="DifficultyN2" class="difficultyChoice"
+								onactivate="OnChooseDifficulty(2)">
 								<Label class="difficultyText" text="#game_difficulty_n2" />
 							</Button>
-							<Button id="DifficultyN3" class="difficultyChoice" onactivate="OnChooseDifficulty(3)">
+							<Button id="DifficultyN3" class="difficultyChoice"
+								onactivate="OnChooseDifficulty(3)">
 								<Label class="difficultyText" text="#game_difficulty_n3" />
 							</Button>
-							<Button id="DifficultyN4" class="difficultyChoice" onactivate="OnChooseDifficulty(4)">
+							<Button id="DifficultyN4" class="difficultyChoice"
+								onactivate="OnChooseDifficulty(4)">
 								<Label class="difficultyText" text="#game_difficulty_n4" />
 							</Button>
-							<Button id="DifficultyN5" class="difficultyChoice" onactivate="OnChooseDifficulty(5)">
+							<Button id="DifficultyN5" class="difficultyChoice"
+								onactivate="OnChooseDifficulty(5)">
 								<Label class="difficultyText" text="#game_difficulty_n5" />
 							</Button>
 						</Panel>
+
 						<Panel id="DifficultyHard" class="flowRight">
-							<Button id="DifficultyN6" class="difficultyChoice fullWidth" onactivate="OnChooseDifficulty(6)">
+							<Button id="DifficultyN6" class="difficultyChoice"
+								onactivate="OnChooseDifficulty(6)">
 								<Label class="difficultyText" text="#game_difficulty_n6" />
 							</Button>
-							<Button id="DifficultyN7" class="difficultyChoice fullWidth" onactivate="OnChooseDifficulty(7)">
+							<Button id="DifficultyN7" class="difficultyChoice"
+								onactivate="OnChooseDifficulty(7)">
 								<Label class="difficultyText" text="#game_difficulty_n7" />
 							</Button>
+							<Button id="DifficultyN8" class="difficultyChoice"
+								onactivate="OnChooseDifficulty(8)">
+								<Label class="difficultyText" text="#game_difficulty_n8" />
+							</Button>
+							<Button id="DifficultyN9" class="difficultyChoice"
+								onactivate="OnChooseDifficulty(9)">
+								<Label class="difficultyText" text="#game_difficulty_n9" />
+							</Button>
+							<Button id="DifficultyN10" class="difficultyChoice"
+								onactivate="OnChooseDifficulty(10)">
+								<Label class="difficultyText" text="#game_difficulty_n10" />
+							</Button>
 						</Panel>
+
 						<Panel id="DifficultyCustom" class="flowRight">
-							<Button id="DifficultyN0" class="difficultyChoice longer" onactivate="OnChooseDifficulty(0)">
-								<Label class="difficultyText" text="#game_difficulty_n0"/>
+							<Button id="DifficultyN0" class="difficultyChoice longer"
+								onactivate="OnChooseDifficulty(0)">
+								<Label class="difficultyText" text="#game_difficulty_n0" />
 							</Button>
 						</Panel>
 					</Panel>
 				</Panel>
 
-				<!--Teams List, left hand panel-->
+				<!--Teams
+				List, left hand panel-->
 				<Panel id="TeamsContainer">
 					<Panel id="TeamsListRoot" />
 				</Panel>
 
-				<!--API Loading Status-->
+				<!--API
+				Loading Status-->
 				<Panel id="GameLoadingStatus" class="DisplayOptionsSubPanel">
-					<Label id="GameLoadingStatusText" class="DisplayOptionsLableTitle" text="#loading_status_1" style="color:#FD841F;" />
+					<Label id="GameLoadingStatusText" class="DisplayOptionsLableTitle"
+						text="#loading_status_1" style="color:#FD841F;" />
 				</Panel>
 
-				<!--Start and lock button-->
-				<Button id="LockAndStartButton" class="PlayButton" onactivate="OnLockAndStartPressed()">
+				<!--Start
+				and lock button-->
+				<Button id="LockAndStartButton" class="PlayButton"
+					onactivate="OnLockAndStartPressed()">
 					<Label text="#custom_game_team_select_lock_start" />
 				</Button>
-				<Button id="CancelAndUnlockButton" class="PlayButton" onactivate="OnCancelAndUnlockPressed()">
+				<Button id="CancelAndUnlockButton" class="PlayButton"
+					onactivate="OnCancelAndUnlockPressed()">
 					<Label text="#custom_game_team_select_cancel_unlock" />
 				</Button>
 
 				<!-- playerPanel background -->
-				<Panel id="UnassignedPlayersContainer"/>
+				<Panel id="UnassignedPlayersContainer" />
 
 			</Panel>
 		</Panel>

content/panorama/scripts/custom_game/game_mode.js

@@ -70,6 +70,7 @@ function InitCustomSetting() {
   $('#force_random_hero').checked = false; // 默认不强制随机
   $('#enable_player_attribute').checked = true;
   $('#mid_only_mode').checked = false;
+  $('#turbo_mode').checked = false;
   $('#player_gold_xp_multiplier_dropdown').SetSelected('1.5');
   $('#bot_gold_xp_multiplier_dropdown').SetSelected('10');
   $('#radiant_player_number_dropdown').SetSelected('1');
@@ -111,6 +112,7 @@ function LockOption() {
   $('#force_random_hero').enabled = false;
   $('#enable_player_attribute').enabled = false;
   $('#mid_only_mode').enabled = false;
+  $('#turbo_mode').enabled = false;
 }
 
 function UnLockOptionAll() {
@@ -129,6 +131,7 @@ function UnLockOptionAll() {
   $('#force_random_hero').enabled = true;
   $('#enable_player_attribute').enabled = true;
   $('#mid_only_mode').enabled = true;
+  $('#turbo_mode').enabled = true;
 }
 
 // N1-N6 通用设置
@@ -143,6 +146,7 @@ function InitDifficultyCommonSetting() {
   $('#force_random_hero').checked = false;
   $('#enable_player_attribute').checked = true;
   $('#mid_only_mode').checked = false;
+  $('#turbo_mode').checked = false;
 }
 
 function InitN1Setting() {
@@ -208,6 +212,35 @@ function InitN7Setting() {
   $('#starting_gold_player_dropdown').SetSelected('3000');
   $('#starting_gold_bot_dropdown').SetSelected('5000');
 }
+function InitN8Setting() {
+  $('#player_gold_xp_multiplier_dropdown').SetSelected('1.5');
+  $('#bot_gold_xp_multiplier_dropdown').SetSelected('14');
+
+  $('#tower_power_dropdown').SetSelected('400');
+
+  $('#starting_gold_player_dropdown').SetSelected('3000');
+  $('#starting_gold_bot_dropdown').SetSelected('5000');
+}
+
+function InitN9Setting() {
+  $('#player_gold_xp_multiplier_dropdown').SetSelected('1.5');
+  $('#bot_gold_xp_multiplier_dropdown').SetSelected('17');
+
+  $('#tower_power_dropdown').SetSelected('400');
+
+  $('#starting_gold_player_dropdown').SetSelected('3000');
+  $('#starting_gold_bot_dropdown').SetSelected('7000');
+}
+
+function InitN10Setting() {
+  $('#player_gold_xp_multiplier_dropdown').SetSelected('1.5');
+  $('#bot_gold_xp_multiplier_dropdown').SetSelected('20');
+
+  $('#tower_power_dropdown').SetSelected('400');
+
+  $('#starting_gold_player_dropdown').SetSelected('3000');
+  $('#starting_gold_bot_dropdown').SetSelected('7000');
+}
 // -------- send to server --------
 function StateChange() {
   if (Game.GameStateIs(DOTA_GameState.DOTA_GAMERULES_STATE_CUSTOM_GAME_SETUP)) {
@@ -255,6 +288,7 @@ function SendGameOptionsToServer() {
   const forceRandomHero = $('#force_random_hero').checked;
   const enablePlayerAttribute = $('#enable_player_attribute').checked;
   const midOnlyMode = $('#mid_only_mode').checked;
+  const turboMode = $('#turbo_mode').checked;
 
   GameEvents.SendCustomGameEventToServer('game_options_change', {
     multiplier_radiant: Number(playerGoldXpMultiplier),
@@ -270,6 +304,7 @@ function SendGameOptionsToServer() {
     force_random_hero: forceRandomHero,
     enable_player_attribute: enablePlayerAttribute,
     mid_only_mode: midOnlyMode,
+    turbo_mode: turboMode,
   });
 }
 
@@ -315,6 +350,12 @@ function OnDifficultyDropDownChanged(difficulty) {
       InitN6Setting();
     } else if (optionId === 7) {
       InitN7Setting();
+    } else if (optionId === 8) {
+      InitN8Setting();
+    } else if (optionId === 9) {
+      InitN9Setting();
+    } else if (optionId === 10) {
+      InitN10Setting();
     }
     LockOption();
   }

content/panorama/styles/custom_game/custom_loading_screen.css

@@ -80,7 +80,7 @@
 }
 
 #QQDiscordContainer {
-  width: 500px;
+  width: 300px;
   vertical-align: bottom;
   margin-bottom: 60px;
 }
@@ -94,8 +94,8 @@
 
 #QQQRCodeImage,
 #DiscordQRCodeImage {
-  width: 200px;
-  height: 260px;
+  width: 120px;
+  height: 156px;
 }
 
 #LinkButtonContainer {