Merge branch 'main' of https://github.com/potato-tf/MGE-VScript

potato-tf · Feb 4, 2025 · 0855ecc · 0855ecc
2 parents 1b5c6da + 25f256a
commit 0855ecc
Show file tree

Hide file tree

Showing 12 changed files with 953 additions and 443 deletions.
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -47,8 +47,9 @@ jobs:
           {
             rsync -a \
             --exclude='mge/vpi/vpi_interfaces.py' \
-            --exclude='mge/vpi/vpi_watch.bat' \
+            --exclude='mge/vpi/vpi_config.py' \
             --exclude='mge/vpi/vpi.nut' \
+            --exclude='mge/vpi/vpi_watch.bat' \
             --exclude='mge/cfg/config.nut' \
             --exclude='requirements.txt' \
             --exclude='mge_windows_setup.bat' \

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -47,8 +47,9 @@ jobs:
           {
             rsync -a \
             --exclude='mge/vpi/vpi_interfaces.py' \
-            --exclude='mge/vpi/vpi_watch.bat' \
+            --exclude='mge/vpi/vpi_config.py' \
             --exclude='mge/vpi/vpi.nut' \
+            --exclude='mge/vpi/vpi_watch.bat' \
             --exclude='mge/cfg/config.nut' \
             --exclude='requirements.txt' \
             --exclude='mge_windows_setup.bat' \

diff --git a/mapspawn.nut b/mapspawn.nut
@@ -15,8 +15,12 @@ else
 	Include("itemdef_constants")
 	Include("cfg/config")
 	Include("cfg/localization")
-	Include("vpi/vpi")
+
+	if (CONST.ELO_TRACKING_MODE > 1 || CONST.ENABLE_LEADERBOARD || CONST.UPDATE_SERVER_DATA || CONST.GAMEMODE_AUTOUPDATE_REPO)
+		Include("vpi/vpi")
+
 	Include("functions")
 	Include("events")
 	Include("mge")
+
 }
diff --git a/mge/cfg/localization.nut b/mge/cfg/localization.nut
@@ -60,7 +60,7 @@ const MGE_COLOR_BACKGROUND = "ad4800"
 		InLine                     = "Waiting in line: Queue Length:\x07"+MGE_COLOR_MAIN+"%s."
 		GainedPoints               = "You gained \x07"+MGE_COLOR_MAIN+"%s points."
 		LostPoints                 = "You lost \x07"+MGE_COLOR_MAIN+"%s points."
-		MyRank                     = "Your rating is \x07"+MGE_COLOR_MAIN+"%s\x07FFFFFF. Wins: \x07"+MGE_COLOR_MAIN+"%s\x07FFFFFF, Losses: \x07"+MGE_COLOR_MAIN+"%s\x07FFFFFF"
+		MyRank                     = "Your rating is \x07"+MGE_COLOR_MAIN+" %s \x07FFFFFF. Wins: \x07"+MGE_COLOR_MAIN+" %s \x07FFFFFF, Losses: \x07"+MGE_COLOR_MAIN+" %s \x07FFFFFF"
 		MyRankNoRating             = "You have \x07"+MGE_COLOR_MAIN+"%s\x07FFFFFFwins and \x07"+MGE_COLOR_MAIN+"%s\x07FFFFFFlosses."
 		ClassIsNotAllowed          = "\x07"+MGE_COLOR_BACKGROUND+"This class (%s) is not allowed!"
 		LowRating                  = "Your rating \x07"+MGE_COLOR_MAIN+"%s\x07FFFFFFis too low, minimum is \x07"+MGE_COLOR_MAIN+"%s\x07FFFFFF"
@@ -108,6 +108,9 @@ const MGE_COLOR_BACKGROUND = "ad4800"
 		AnnouncerEnabled            = "\x07"+MGE_COLOR_BACKGROUND+"Announcer enabled."
 		AnnouncerDisabled           = "\x07"+MGE_COLOR_BACKGROUND+"Announcer disabled."
 
+		HUDDisabled 			   = "\x07"+MGE_COLOR_BACKGROUND+"HUD disabled."
+		HUDEnabled	 			   = "\x07"+MGE_COLOR_BACKGROUND+"HUD enabled."
+
 		InvalidRuleset             = "\x07"+MGE_COLOR_BACKGROUND+"Invalid ruleset: %s"
 		RulesetCannotSet 		   = "\x07" + MGE_COLOR_BACKGROUND + "You cannot set custom rulesets for this arena at this time."
 		RulesetVote                = "\x07" + MGE_COLOR_BACKGROUND + "You voted to enable %s for this arena, waiting for other players to vote..."
@@ -277,7 +280,7 @@ const MGE_COLOR_BACKGROUND = "ad4800"
 		ClassIsNotAllowed         = "\x07"+MGE_COLOR_BACKGROUND+"Diese Klasse ist nicht erlaubt!"
 		LowRating                 = "Deine Wertung \x07"+MGE_COLOR_MAIN+"%s\x07FFFFFF ist zu gering, Minimum ist \x07"+MGE_COLOR_MAIN+"%s"
 		HighRating                = "Deine Wertung \x07"+MGE_COLOR_MAIN+"%s\x07FFFFFF ist zu hoch, Maximum ist \x07"+MGE_COLOR_MAIN+"%s"
-		XdefeatsY                 = "\x07"+MGE_COLOR_SUBJECT+"%s\x07FFFFFF (Punkte:%s) besiegt \x07"+MGE_COLOR_SUBJECT+"%s\x07FFFFFF (Punkte:%s) in einem Duell bis \x07"+MGE_COLOR_MAIN+"%s\x7FFFFFF auf \x07"+MGE_COLOR_MAIN+"%s"
+		XdefeatsY                 = "\x07"+MGE_COLOR_SUBJECT+"%s\x07FFFFFF (Punkte:%s) besiegt \x07"+MGE_COLOR_SUBJECT+"%s\x07FFFFFF (Punkte:%s) in einem Duell bis \x07"+MGE_COLOR_MAIN+"%s\x07FFFFFF auf \x07"+MGE_COLOR_MAIN+"%s"
 		XdefeatsYearly            = "\x07"+MGE_COLOR_SUBJECT+"%s\x07FFFFFF (Punkte:%s) besiegt \x07"+MGE_COLOR_SUBJECT+"%s\x07FFFFFF (Punkte:%s) in einem Duell auf \x07"+MGE_COLOR_MAIN+"%s"
 		SpecRemove                = "\x07"+MGE_COLOR_BACKGROUND+"Wechseln zu Spec im Kampf nicht möglich, entfernt aus Warteschlange."
 		ClassChangePoint          = "\x07"+MGE_COLOR_BACKGROUND+"Du hast deine Klasse während des Kampfes gewechselt, dein Gegner erhält einen Punkt."
@@ -287,7 +290,7 @@ const MGE_COLOR_BACKGROUND = "ad4800"
 		Welcome3                  = "\x07"+MGE_COLOR_BACKGROUND+"Plugin von\x07FFFFFF: \x07"+MGE_COLOR_SUBJECT+"Lange\x07FFFFFF und \x07"+MGE_COLOR_SUBJECT+"Cprice\x07FFFFFF, basierend auf \x07"+MGE_COLOR_SUBJECT+"kAmmomod"
 		Top5Title                 = "Top 5 Spieler"
 		top5error                 = "[VScript MGE] Noch nicht genügend Spieler in der Datenbank."
-		bballdunk                 = "\x07"+MGE_COLOR_SUBJECT+"Du hast \x07"+MGE_COLOR_SUBJECT+"%s\x7FFFFFF gedunkt!"
+		bballdunk                 = "\x07"+MGE_COLOR_SUBJECT+"Du hast \x07"+MGE_COLOR_SUBJECT+"%s\x07FFFFFF gedunkt!"
 		Cmd_MGECmds               = "[VScript MGE] Help: Befehl-Infos"
 		Cmd_SeeConsole            = "[VScript MGE] Siehe Konsole für Ausgabe."
 		Cmd_MGEMod                = "[VScript MGE] mgemod\t - Menü"
@@ -340,8 +343,8 @@ const MGE_COLOR_BACKGROUND = "ad4800"
 		ClassIsNotAllowed       =			"\x07"+MGE_COLOR_BACKGROUND+"Denne klasse (%s) er ikke tilladt!"
 		LowRating               =			"\x07"+MGE_COLOR_MAIN+"%s\x07FFFFFF er for lavt, minimum er \x07"+MGE_COLOR_MAIN+"%s\x07FFFFFF"
 		HighRating              =			"\x07"+MGE_COLOR_MAIN+"%s\x07FFFFFF er for højt, maksimum er \x07"+MGE_COLOR_MAIN+"%s\x07FFFFFF"
-		XdefeatsY               =			"\x07"+MGE_COLOR_SUBJECT+"%s (Score:%s)\x07FFFFFF vinder \x07"+MGE_COLOR_SUBJECT+"%s (Score:%s)\x07FFFFFF i en duel på \x07"+MGE_COLOR_MAIN+"%s\x7FFFFFFn \x07"+MGE_COLOR_MAIN+"%s\x7"
-		XdefeatsYearly          =			"\x07"+MGE_COLOR_SUBJECT+"%s (Score:%s)\x07FFFFFF vinder \x07"+MGE_COLOR_SUBJECT+"%s (Score:%s)\x07FFFFFF i en duel på \x07"+MGE_COLOR_MAIN+"%s\x7"
+		XdefeatsY               =			"\x07"+MGE_COLOR_SUBJECT+"%s (Score:%s)\x07FFFFFF vinder \x07"+MGE_COLOR_SUBJECT+"%s (Score:%s)\x07FFFFFF i en duel på \x07"+MGE_COLOR_MAIN+"%s\x07FFFFFFn \x07"+MGE_COLOR_MAIN+"%s\x07"
+		XdefeatsYearly          =			"\x07"+MGE_COLOR_SUBJECT+"%s (Score:%s)\x07FFFFFF vinder \x07"+MGE_COLOR_SUBJECT+"%s (Score:%s)\x07FFFFFF i en duel på \x07"+MGE_COLOR_MAIN+"%s\x07"
 		SpecRemove              =			"\x07"+MGE_COLOR_BACKGROUND+"Kan ikke komme tilbage til spilleren under en kamp, fjernes fra køen."
 		ClassChangePoint        =			"\x07"+MGE_COLOR_BACKGROUND+"Du har ændret klasse under en kamp, din modstander får 1 point."
 		ClassChangePointOpponent=			"\x07"+MGE_COLOR_BACKGROUND+"Din modstander har ændret klasse under en kamp, du får 1 point."
@@ -350,7 +353,7 @@ const MGE_COLOR_BACKGROUND = "ad4800"
 		Welcome3                =			"\x07"+MGE_COLOR_BACKGROUND+"Original plugin by: \x07"+MGE_COLOR_SUBJECT+"Lange & Cprice\x07, based on \x07"+MGE_COLOR_SUBJECT+"kAmmomod"
 		Top5Title               =			"Top 5 Spillere"
 		top5error               =			"[VScript MGE] Ikke nok spillere i databasen."
-		bballdunk               =			"\x07"+MGE_COLOR_SUBJECT+"Du har \x07"+MGE_COLOR_SUBJECT+"%s\x7FFFFFF gedunkt!"
+		bballdunk               =			"\x07"+MGE_COLOR_SUBJECT+"Du har \x07"+MGE_COLOR_SUBJECT+"%s\x07FFFFFF gedunkt!"
 		Cmd_MGECmds             =			"[VScript MGE] Help: Command Information"
 		Cmd_SeeConsole          =			"[VScript MGE] Bekijk de console voor output."
 		Cmd_MGEMod              =			"[VScript MGE] mgemod\t - Menu"
@@ -1359,7 +1362,7 @@ const MGE_COLOR_BACKGROUND = "ad4800"
 		ClassIsNotAllowed        = "\x07"+MGE_COLOR_BACKGROUND+"Esta classe (%s) não é permitida!"
 		LowRating                = "Sua classificação \x07"+MGE_COLOR_MAIN+"%s\x07FFFFFF é muito baixa, o mínimo é \x07"+MGE_COLOR_MAIN+"%s\x07FFFFFF"
 		HighRating               = "Sua classificação \x07"+MGE_COLOR_MAIN+"%s\x07FFFFFF é muito alta, o máximo é \x07"+MGE_COLOR_MAIN+"%s\x07FFFFFF"
-		XdefeatsY                = "\x07"+MGE_COLOR_SUBJECT+"%s (Score:%s)\x07FFFFFF derrota \x07"+MGE_COLOR_SUBJECT+"%s (Score:%s)\x07FFFFFF no duelo para \x07"+MGE_COLOR_MAIN+"%s\x07FFFFFF em \x07"+MGE_COLOR_MAIN+"%s\x7"
+		XdefeatsY                = "\x07"+MGE_COLOR_SUBJECT+"%s (Score:%s)\x07FFFFFF derrota \x07"+MGE_COLOR_SUBJECT+"%s (Score:%s)\x07FFFFFF no duelo para \x07"+MGE_COLOR_MAIN+"%s\x07FFFFFF em \x07"+MGE_COLOR_MAIN+"%s\x07"
 		XdefeatsYearly           = "\x07"+MGE_COLOR_SUBJECT+"%s (Score:%s)\x07FFFFFF derrota \x07"+MGE_COLOR_SUBJECT+"%s (Score:%s)\x07FFFFFF no duelo em \x07"+MGE_COLOR_MAIN+"%s\x07"
 		SpecRemove               = "\x07"+MGE_COLOR_BACKGROUND+"Não pode entrar no time espectador enquanto está em um duelo, removendo da fila."
 		ClassChangePoint         = "\x07"+MGE_COLOR_BACKGROUND+"Você mudou de classe durante um duelo, dando um ponto para o seu oponente."
@@ -1612,8 +1615,8 @@ const MGE_COLOR_BACKGROUND = "ad4800"
 		ClassIsNotAllowed   = "\x07"+MGE_COLOR_BACKGROUND+"不允許使用該職業。"
 		LowRating           = "您的排名 \x07"+MGE_COLOR_MAIN+"%s\x07FFFFFF 太低，最低為 \x07"+MGE_COLOR_MAIN+"%s\x07FFFFFF"
 		HighRating          = "您的排名 \x07"+MGE_COLOR_MAIN+"%s\x07FFFFFF 太高，最高為 \x07"+MGE_COLOR_MAIN+"%s\x07FFFFFF"
-		XdefeatsY           = "\x07"+MGE_COLOR_SUBJECT+"%s\x07FFFFFF (Score:%s) 打敗了 \x07"+MGE_COLOR_SUBJECT+"%s\x7FFFFFF (Score:%s) 在決鬥中 \x07"+MGE_COLOR_MAIN+"%s\x7FFFFFF（競技場：\x07"+MGE_COLOR_MAIN+"%s\x7FFFFFF）"
-		XdefeatsYearly      = "\x07"+MGE_COLOR_SUBJECT+"%s\x7FFFFFF (Score:%s) 打敗了 \x07"+MGE_COLOR_SUBJECT+"%s\x7FFFFFF（得分：%s）（競技場：\x07"+MGE_COLOR_MAIN+"%s\x7FFFFFF）"
+		XdefeatsY           = "\x07"+MGE_COLOR_SUBJECT+"%s\x07FFFFFF (Score:%s) 打敗了 \x07"+MGE_COLOR_SUBJECT+"%s\x07FFFFFF (Score:%s) 在決鬥中 \x07"+MGE_COLOR_MAIN+"%s\x07FFFFFF（競技場：\x07"+MGE_COLOR_MAIN+"%s\x07FFFFFF）"
+		XdefeatsYearly      = "\x07"+MGE_COLOR_SUBJECT+"%s\x07FFFFFF (Score:%s) 打敗了 \x07"+MGE_COLOR_SUBJECT+"%s\x07FFFFFF（得分：%s）（競技場：\x07"+MGE_COLOR_MAIN+"%s\x07FFFFFF）"
 		SpecRemove          = "\x07"+MGE_COLOR_BACKGROUND+"對決時不能進入旁觀者。您已被移出隊列。"
 		ClassChangePoint    = "\x07"+MGE_COLOR_BACKGROUND+"您在對決中更換了職業，因此罰您一分。"
 		ClassChangePointOpponent = "\x07"+MGE_COLOR_BACKGROUND+"您的對手在對決中更換了職業，因此罰他一分。"
@@ -1622,7 +1625,7 @@ const MGE_COLOR_BACKGROUND = "ad4800"
 		Welcome3            = "\x07"+MGE_COLOR_BACKGROUND+"插件作者：\x07"+MGE_COLOR_SUBJECT+"Lange、Cprice\x07，漢化：\x07"+MGE_COLOR_SUBJECT+"888"
 		Top5Title           = "最頂尖的五名玩家"
 		top5error           = "[VScript MGE] 資料庫中尚無足夠的玩家資料。"
-		bballdunk           = "\x07"+MGE_COLOR_SUBJECT+"您\x07FFFFFF 在 \x07"+MGE_COLOR_SUBJECT+"%s\x7FFFFFF 成功扣籃！"
+		bballdunk           = "\x07"+MGE_COLOR_SUBJECT+"您\x07FFFFFF 在 \x07"+MGE_COLOR_SUBJECT+"%s\x07FFFFFF 成功扣籃！"
 		Cmd_MGECmds         = "[VScript MGE] 幫助：指令簡介"
 		Cmd_SeeConsole      = "[VScript MGE] 請查看控制台輸出。"
 		Cmd_MGEMod          = "[VScript MGE] mgemod\t - 主菜單"
@@ -1675,8 +1678,8 @@ const MGE_COLOR_BACKGROUND = "ad4800"
 		ClassIsNotAllowed =        "\x07"+MGE_COLOR_BACKGROUND+"不允许使用该职业。"
 		LowRating =                "您的排名 \x07"+MGE_COLOR_MAIN+"%s\x07FFFFFF 太低，最低为 \x07"+MGE_COLOR_MAIN+"%s\x07FFFFFF"
 		HighRating =               "您的排名 \x07"+MGE_COLOR_MAIN+"%s\x07FFFFFF 太高，最高为 \x07"+MGE_COLOR_MAIN+"%s\x07FFFFFF"
-		XdefeatsY =                "\x07"+MGE_COLOR_SUBJECT+"%s\x07FFFFFF (得分：%s) 在决斗中打败了 \x07"+MGE_COLOR_SUBJECT+"%s\x7FFFFFF (得分：%s)  \x07"+MGE_COLOR_MAIN+"%s\x7FFFFFF（竞技场：\x07"+MGE_COLOR_MAIN+"%s\x7FFFFFF）"
-		XdefeatsYearly =           "\x07"+MGE_COLOR_SUBJECT+"%s\x7FFFFFF (得分：%s) 打败了 \x07"+MGE_COLOR_SUBJECT+"%s\x7FFFFFF（得分：%s）（竞技场：\x07"+MGE_COLOR_MAIN+"%s\x7FFFFFF）"
+		XdefeatsY =                "\x07"+MGE_COLOR_SUBJECT+"%s\x07FFFFFF (得分：%s) 在决斗中打败了 \x07"+MGE_COLOR_SUBJECT+"%s\x07FFFFFF (得分：%s)  \x07"+MGE_COLOR_MAIN+"%s\x07FFFFFF（竞技场：\x07"+MGE_COLOR_MAIN+"%s\x07FFFFFF）"
+		XdefeatsYearly =           "\x07"+MGE_COLOR_SUBJECT+"%s\x07FFFFFF (得分：%s) 打败了 \x07"+MGE_COLOR_SUBJECT+"%s\x07FFFFFF（得分：%s）（竞技场：\x07"+MGE_COLOR_MAIN+"%s\x07FFFFFF）"
 		SpecRemove =               "\x07"+MGE_COLOR_BACKGROUND+"对决时不能进入观察员。您已被移出队列。"
 		ClassChangePoint =         "\x07"+MGE_COLOR_BACKGROUND+"您在对决中更换了职业，因此罚您一分。"
 		ClassChangePointOpponent = "\x07"+MGE_COLOR_BACKGROUND+"您的对手在对决中更换了职业，因此罚他一分。"
@@ -1685,7 +1688,7 @@ const MGE_COLOR_BACKGROUND = "ad4800"
 		Welcome3 =                 "\x07"+MGE_COLOR_BACKGROUND+"插件作者：\x07"+MGE_COLOR_SUBJECT+"Lange、Cprice\x07，汉化：\x07"+MGE_COLOR_SUBJECT+"888"
 		Top5Title =                "排名前五的玩家"
 		top5error =                "[VScript MGE] 数据库里没有足够的玩家数据。"
-		bballdunk =                "\x07"+MGE_COLOR_SUBJECT+"您\x07FFFFFF 在 \x07"+MGE_COLOR_SUBJECT+"%s\x7FFFFFF 中成功扣篮！"
+		bballdunk =                "\x07"+MGE_COLOR_SUBJECT+"您\x07FFFFFF 在 \x07"+MGE_COLOR_SUBJECT+"%s\x07FFFFFF 中成功扣篮！"
 		Cmd_MGECmds =              "[VScript MGE] 帮助：命令简介"
 		Cmd_SeeConsole =           "[VScript MGE] 请查看控制台输出。"
 		Cmd_MGEMod =               "[VScript MGE] mgemod\t - 主菜单"

diff --git a/mge/cfg/mgemod_spawns.nut b/mge/cfg/mgemod_spawns.nut
@@ -11376,6 +11376,7 @@
             "2": "12497.528320 -8441.913086 82.03131 0.000000 -90.000000 0.000000",
             "3": "12518.769531 -11542.935547 82.031311 0.000000 90.000000 0.000000",
             "4": "12696.524414 -11541.412109 82.031311 0.000000 90.000000 0.000000",
+            "koth_cap" : "2498.714844 -10000.066406 179.182190",
             "fraglimit": "2",
             "cdtime": "3", //time before round starts (when players cant shoot)
             "classes": "soldier medic",