From 6ede52dd321bc467ca32f1291c080abfb19071d5 Mon Sep 17 00:00:00 2001 From: Meruna Date: Thu, 15 Jan 2026 05:13:56 +0900 Subject: [PATCH] a --- .../challenges/baka/raid_cybergrind.cfg | 70 +++++++++---------- .../zombie_riot/npc/baka/npc_cybergrind_gm.sp | 17 ++--- 2 files changed, 44 insertions(+), 43 deletions(-) diff --git a/addons/sourcemod/configs/zombie_riot/challenges/baka/raid_cybergrind.cfg b/addons/sourcemod/configs/zombie_riot/challenges/baka/raid_cybergrind.cfg index f8dd5f05e2..6300dc8352 100644 --- a/addons/sourcemod/configs/zombie_riot/challenges/baka/raid_cybergrind.cfg +++ b/addons/sourcemod/configs/zombie_riot/challenges/baka/raid_cybergrind.cfg @@ -63,7 +63,7 @@ { "count" "0" "health" "9000000" - "data" "start_difficulty10;3;4;9;9" + "data" "wgoto_10;wgoto_9;wgoto_9;wgoto_3;wgoto_4" "plugin" "npc_cybergrind_gm" } } @@ -592,7 +592,7 @@ { "count" "0" "health" "9000000" - "data" "start_difficulty10;3;4;9;9" + "data" "wgoto_10;wgoto_9;wgoto_9;wgoto_3;wgoto_4" "plugin" "npc_cybergrind_gm" } } @@ -606,7 +606,7 @@ { "count" "0" "health" "9000000" - "data" "start_difficulty10;3;4;9;9" + "data" "wgoto_10;wgoto_9;wgoto_9;wgoto_3;wgoto_4" "plugin" "npc_cybergrind_gm" } } @@ -620,7 +620,7 @@ { "count" "0" "health" "9000000" - "data" "start_difficulty10;3;4;9;9" + "data" "wgoto_10;wgoto_9;wgoto_9;wgoto_3;wgoto_4" "plugin" "npc_cybergrind_gm" } } @@ -634,7 +634,7 @@ { "count" "0" "health" "9000000" - "data" "start_difficulty10;3;4;9;9" + "data" "wgoto_10;wgoto_9;wgoto_9;wgoto_3;wgoto_4" "plugin" "npc_cybergrind_gm" } } @@ -954,7 +954,7 @@ { "count" "0" "health" "9000000" - "data" "start_difficulty20;3;4;19;19" + "data" "wgoto_20;wgoto_19;wgoto_19;wgoto_3;wgoto_4" "plugin" "npc_cybergrind_gm" } } @@ -968,7 +968,7 @@ { "count" "0" "health" "9000000" - "data" "start_difficulty20;3;4;19;19" + "data" "wgoto_20;wgoto_19;wgoto_19;wgoto_3;wgoto_4" "plugin" "npc_cybergrind_gm" } } @@ -982,7 +982,7 @@ { "count" "0" "health" "9000000" - "data" "start_difficulty20;3;4;19;19" + "data" "wgoto_20;wgoto_19;wgoto_19;wgoto_3;wgoto_4" "plugin" "npc_cybergrind_gm" } } @@ -996,7 +996,7 @@ { "count" "0" "health" "9000000" - "data" "start_difficulty20;3;4;19;19" + "data" "wgoto_20;wgoto_19;wgoto_19;wgoto_3;wgoto_4" "plugin" "npc_cybergrind_gm" } } @@ -1010,7 +1010,7 @@ { "count" "0" "health" "9000000" - "data" "start_difficulty20;3;4;19;19" + "data" "wgoto_20;wgoto_19;wgoto_19;wgoto_3;wgoto_4" "plugin" "npc_cybergrind_gm" } } @@ -1024,7 +1024,7 @@ { "count" "0" "health" "9000000" - "data" "start_difficulty20;3;4;19;19" + "data" "wgoto_20;wgoto_19;wgoto_19;wgoto_3;wgoto_4" "plugin" "npc_cybergrind_gm" } } @@ -1038,7 +1038,7 @@ { "count" "0" "health" "9000000" - "data" "start_difficulty20;3;4;19;19" + "data" "wgoto_20;wgoto_19;wgoto_19;wgoto_3;wgoto_4" "plugin" "npc_cybergrind_gm" } } @@ -1052,7 +1052,7 @@ { "count" "0" "health" "9000000" - "data" "start_difficulty20;3;4;19;19" + "data" "wgoto_20;wgoto_19;wgoto_19;wgoto_3;wgoto_4" "plugin" "npc_cybergrind_gm" } } @@ -1458,7 +1458,7 @@ { "count" "0" "health" "9000000" - "data" "start_difficulty30;3;4;29;29" + "data" "wgoto_30;wgoto_29;wgoto_29;wgoto_3;wgoto_4" "plugin" "npc_cybergrind_gm" } } @@ -1472,7 +1472,7 @@ { "count" "0" "health" "9000000" - "data" "start_difficulty30;3;4;29;29" + "data" "wgoto_30;wgoto_29;wgoto_29;wgoto_3;wgoto_4" "plugin" "npc_cybergrind_gm" } } @@ -1486,7 +1486,7 @@ { "count" "0" "health" "9000000" - "data" "start_difficulty30;3;4;29;29" + "data" "wgoto_30;wgoto_29;wgoto_29;wgoto_3;wgoto_4" "plugin" "npc_cybergrind_gm" } } @@ -1500,7 +1500,7 @@ { "count" "0" "health" "9000000" - "data" "start_difficulty30;3;4;29;29" + "data" "wgoto_30;wgoto_29;wgoto_29;wgoto_3;wgoto_4" "plugin" "npc_cybergrind_gm" } } @@ -1514,7 +1514,7 @@ { "count" "0" "health" "9000000" - "data" "start_difficulty30;3;4;29;29" + "data" "wgoto_30;wgoto_29;wgoto_29;wgoto_3;wgoto_4" "plugin" "npc_cybergrind_gm" } } @@ -1528,7 +1528,7 @@ { "count" "0" "health" "9000000" - "data" "start_difficulty30;3;4;29;29" + "data" "wgoto_30;wgoto_29;wgoto_29;wgoto_3;wgoto_4" "plugin" "npc_cybergrind_gm" } } @@ -1542,7 +1542,7 @@ { "count" "0" "health" "9000000" - "data" "start_difficulty30;3;4;29;29" + "data" "wgoto_30;wgoto_29;wgoto_29;wgoto_3;wgoto_4" "plugin" "npc_cybergrind_gm" } } @@ -1556,7 +1556,7 @@ { "count" "0" "health" "9000000" - "data" "start_difficulty30;3;4;29;29" + "data" "wgoto_30;wgoto_29;wgoto_29;wgoto_3;wgoto_4" "plugin" "npc_cybergrind_gm" } } @@ -1825,7 +1825,7 @@ "waiting_time_give" "10.0" "is_immune_to_nuke" "1" "is_health_scaling" "1" - "data" "sc35" + "data" "sc30" "plugin" "npc_harrison" } "0.0" @@ -1837,7 +1837,7 @@ "waiting_time_give" "10.0" "is_immune_to_nuke" "1" "is_health_scaling" "1" - "data" "sc40" + "data" "sc30" "plugin" "npc_chimera" } "0.0" @@ -1861,7 +1861,7 @@ "waiting_time_give" "10.0" "is_immune_to_nuke" "1" "is_health_scaling" "1" - "data" "sc35;force30" + "data" "sc30;force30" "plugin" "npc_ruina_twirl" } "0.0" @@ -1873,7 +1873,7 @@ "waiting_time_give" "10.0" "is_immune_to_nuke" "1" "is_health_scaling" "1" - "data" "sc40;thirdbossrush" + "data" "sc30;thirdbossrush" "plugin" "npc_void_unspeakable" } "0.0" @@ -1918,7 +1918,7 @@ { "count" "0" "health" "9000000" - "data" "start_difficulty40;3;4;39;39" + "data" "wgoto_40;wgoto_39;wgoto_39;wgoto_3;wgoto_4" "plugin" "npc_cybergrind_gm" } } @@ -1932,7 +1932,7 @@ { "count" "0" "health" "9000000" - "data" "start_difficulty40;3;4;39;39" + "data" "wgoto_40;wgoto_39;wgoto_39;wgoto_3;wgoto_4" "plugin" "npc_cybergrind_gm" } } @@ -1946,7 +1946,7 @@ { "count" "0" "health" "9000000" - "data" "start_difficulty40;3;4;39;39" + "data" "wgoto_40;wgoto_39;wgoto_39;wgoto_3;wgoto_4" "plugin" "npc_cybergrind_gm" } } @@ -1960,7 +1960,7 @@ { "count" "0" "health" "9000000" - "data" "start_difficulty40;3;4;39;39" + "data" "wgoto_40;wgoto_39;wgoto_39;wgoto_3;wgoto_4" "plugin" "npc_cybergrind_gm" } } @@ -1974,7 +1974,7 @@ { "count" "0" "health" "9000000" - "data" "start_difficulty40;3;4;39;39" + "data" "wgoto_40;wgoto_39;wgoto_39;wgoto_3;wgoto_4" "plugin" "npc_cybergrind_gm" } } @@ -1988,7 +1988,7 @@ { "count" "0" "health" "9000000" - "data" "start_difficulty40;3;4;39;39" + "data" "wgoto_40;wgoto_39;wgoto_39;wgoto_3;wgoto_4" "plugin" "npc_cybergrind_gm" } } @@ -2002,7 +2002,7 @@ { "count" "0" "health" "9000000" - "data" "start_difficulty40;3;4;39;39" + "data" "wgoto_40;wgoto_39;wgoto_39;wgoto_3;wgoto_4" "plugin" "npc_cybergrind_gm" } } @@ -2016,7 +2016,7 @@ { "count" "0" "health" "9000000" - "data" "start_difficulty40;3;4;39;39" + "data" "wgoto_40;wgoto_39;wgoto_39;wgoto_3;wgoto_4" "plugin" "npc_cybergrind_gm" } } @@ -2557,7 +2557,7 @@ "count" "0" "health" "9000000" "is_boss" "3" - "data" "start_difficulty40;3;4;40;42" + "data" "wgoto_40;wgoto_40;wgoto_42;wgoto_3;wgoto_4" "plugin" "npc_cybergrind_gm" } } @@ -2780,7 +2780,7 @@ "count" "0" "health" "9000000" "is_boss" "3" - "data" "start_difficulty40;3;4;40;42" + "data" "wgoto_40;wgoto_40;wgoto_42;wgoto_3;wgoto_4" "plugin" "npc_cybergrind_gm" } } diff --git a/addons/sourcemod/scripting/zombie_riot/npc/baka/npc_cybergrind_gm.sp b/addons/sourcemod/scripting/zombie_riot/npc/baka/npc_cybergrind_gm.sp index ee387b9d2c..3b1a3adaf7 100644 --- a/addons/sourcemod/scripting/zombie_riot/npc/baka/npc_cybergrind_gm.sp +++ b/addons/sourcemod/scripting/zombie_riot/npc/baka/npc_cybergrind_gm.sp @@ -135,7 +135,7 @@ methodmap CyberGrindGM < CClotBody SmiteNpcToDeath(npc.index); return npc; } - else if(!StrContains(data, "start_difficulty")) + else if(!StrContains(data, "wgoto_")) { func_NPCDeath[npc.index] = INVALID_FUNCTION; func_NPCOnTakeDamage[npc.index] = INVALID_FUNCTION; @@ -148,12 +148,12 @@ methodmap CyberGrindGM < CClotBody } int DifficultyGotoWave[5]; - static char countext[5][8]; + static char countext[5][256]; int count = ExplodeString(data, ";", countext, sizeof(countext), sizeof(countext[])); for(int i = 0; i < count; i++) { if(i>=count)break; - ReplaceString(countext[i], sizeof(countext[]), "start_difficulty", ""); + ReplaceString(countext[i], sizeof(countext[]), "wgoto_", ""); DifficultyGotoWave[i] = StringToInt(countext[i])-1; if(DifficultyGotoWave[i]<0)DifficultyGotoWave[i]=0; } @@ -161,11 +161,12 @@ methodmap CyberGrindGM < CClotBody int iNextSetWave; switch(CyberGrind_InternalDifficulty) { - case 1:iNextSetWave=DifficultyGotoWave[0]; - case 5:iNextSetWave=DifficultyGotoWave[2]; - case 4:iNextSetWave=DifficultyGotoWave[4]; - case 6:iNextSetWave=DifficultyGotoWave[3]; - default:iNextSetWave=DifficultyGotoWave[1]; + case 1:iNextSetWave=DifficultyGotoWave[0]; //CyberGrind_Normal + case 2, 3:iNextSetWave=DifficultyGotoWave[1]; //CyberGrind_Hard, CyberGrind_Expert + case 4:iNextSetWave=DifficultyGotoWave[2]; //CyberGrind_EX_Hard + case 5:iNextSetWave=DifficultyGotoWave[3]; //CyberGrind_Fast + case 6:iNextSetWave=DifficultyGotoWave[4]; //CyberGrind_EX_Fast + default:iNextSetWave=DifficultyGotoWave[0]; //CyberGrind_Normal } Waves_ClearWaves(); CurrentRound = iNextSetWave;