Compare commits
No commits in common. "master" and "v1.1.3" have entirely different histories.
@ -1,33 +0,0 @@
|
||||
root = true
|
||||
|
||||
# Global
|
||||
[*]
|
||||
indent_style = unset
|
||||
indent_size = 4
|
||||
tab_width = 4
|
||||
end_of_line = lf
|
||||
charset = utf-8
|
||||
trim_trailing_whitespace = true
|
||||
insert_final_newline = unset
|
||||
|
||||
# Unreal Engine 3 / Source
|
||||
[*.uc]
|
||||
indent_style = tab
|
||||
|
||||
[*.{uci,upkg}]
|
||||
|
||||
# Unreal Engine 3 / i18n
|
||||
[*.{chn,cht,cze,dan,deu,dut,esl,esn,fra,frc,hun,int,ita,jpn,kor,pol,por,ptb,rus,tur,ukr}]
|
||||
charset = utf-16le
|
||||
|
||||
# Other
|
||||
[*.md]
|
||||
indent_style = space
|
||||
trim_trailing_whitespace = false
|
||||
|
||||
[*.yml]
|
||||
indent_style = space
|
||||
indent_size = 2
|
||||
|
||||
[*.{txt,cfg,conf}]
|
||||
indent_style = tab
|
||||
115
.github/workflows/mega-linter.yml
vendored
115
.github/workflows/mega-linter.yml
vendored
@ -1,115 +0,0 @@
|
||||
---
|
||||
name: MegaLinter
|
||||
|
||||
permissions: read-all
|
||||
|
||||
on:
|
||||
push:
|
||||
pull_request:
|
||||
branches:
|
||||
- master
|
||||
|
||||
env:
|
||||
APPLY_FIXES: none
|
||||
APPLY_FIXES_EVENT: pull_request
|
||||
APPLY_FIXES_MODE: commit
|
||||
FILTER_REGEX_EXCLUDE: (mega-linter.yml)
|
||||
DISABLE: SPELL
|
||||
DISABLE_ERRORS_LINTERS: COPYPASTE_JSCPD
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.ref }}-${{ github.workflow }}
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
megalinter:
|
||||
name: MegaLinter
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
issues: write
|
||||
pull-requests: write
|
||||
|
||||
steps:
|
||||
- name: Checkout Code
|
||||
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
|
||||
with:
|
||||
token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
|
||||
fetch-depth: 0
|
||||
|
||||
- name: MegaLinter
|
||||
uses: oxsecurity/megalinter@7e042c726c68415475b05a65a686c612120a1232
|
||||
id: ml
|
||||
env:
|
||||
VALIDATE_ALL_CODEBASE: true
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
- name: Archive production artifacts
|
||||
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392
|
||||
if: success() || failure()
|
||||
with:
|
||||
name: MegaLinter reports
|
||||
path: |
|
||||
megalinter-reports
|
||||
mega-linter.log
|
||||
|
||||
- name: Set APPLY_FIXES_IF var
|
||||
run: |
|
||||
printf 'APPLY_FIXES_IF=%s\n' "${{
|
||||
steps.ml.outputs.has_updated_sources == 1 &&
|
||||
(
|
||||
env.APPLY_FIXES_EVENT == 'all' ||
|
||||
env.APPLY_FIXES_EVENT == github.event_name
|
||||
) &&
|
||||
(
|
||||
github.event_name == 'push' ||
|
||||
github.event.pull_request.head.repo.full_name == github.repository
|
||||
)
|
||||
}}" >> "${GITHUB_ENV}"
|
||||
|
||||
- name: Set APPLY_FIXES_IF_* vars
|
||||
run: |
|
||||
printf 'APPLY_FIXES_IF_PR=%s\n' "${{
|
||||
env.APPLY_FIXES_IF == 'true' &&
|
||||
env.APPLY_FIXES_MODE == 'pull_request'
|
||||
}}" >> "${GITHUB_ENV}"
|
||||
printf 'APPLY_FIXES_IF_COMMIT=%s\n' "${{
|
||||
env.APPLY_FIXES_IF == 'true' &&
|
||||
env.APPLY_FIXES_MODE == 'commit' &&
|
||||
(!contains(fromJSON('["refs/heads/main", "refs/heads/master"]'), github.ref))
|
||||
}}" >> "${GITHUB_ENV}"
|
||||
|
||||
- name: Create Pull Request with applied fixes
|
||||
uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38
|
||||
id: cpr
|
||||
if: env.APPLY_FIXES_IF_PR == 'true'
|
||||
with:
|
||||
token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
|
||||
commit-message: "[MegaLinter] Apply linters automatic fixes"
|
||||
title: "[MegaLinter] Apply linters automatic fixes"
|
||||
labels: bot
|
||||
|
||||
- name: Create PR output
|
||||
if: env.APPLY_FIXES_IF_PR == 'true'
|
||||
run: |
|
||||
echo "PR Number - ${{ steps.cpr.outputs.pull-request-number }}"
|
||||
echo "PR URL - ${{ steps.cpr.outputs.pull-request-url }}"
|
||||
|
||||
- name: Prepare commit
|
||||
if: env.APPLY_FIXES_IF_COMMIT == 'true'
|
||||
run: sudo chown -Rc $UID .git/
|
||||
|
||||
- name: Commit and push applied linter fixes
|
||||
uses: stefanzweifel/git-auto-commit-action@8756aa072ef5b4a080af5dc8fef36c5d586e521d
|
||||
if: env.APPLY_FIXES_IF_COMMIT == 'true'
|
||||
with:
|
||||
branch: >-
|
||||
${{
|
||||
github.event.pull_request.head.ref ||
|
||||
github.head_ref ||
|
||||
github.ref
|
||||
}}
|
||||
commit_message: "[MegaLinter] Apply linters fixes"
|
||||
commit_user_name: "github-actions"
|
||||
commit_user_email: "github-actions[bot]@users.noreply.github.com"
|
||||
@ -183,13 +183,6 @@ public function bool PlayerIsKickProtected(PlayerReplicationInfo PRI)
|
||||
return (KickProtectedPlayers.Find('Uid', PRI.UniqueId.Uid) != INDEX_NONE);
|
||||
}
|
||||
|
||||
public function bool PlayerPerkLoaded(PlayerReplicationInfo PRI)
|
||||
{
|
||||
`Log_Trace();
|
||||
|
||||
return (KFPlayerReplicationInfo(PRI) != None && KFPlayerReplicationInfo(PRI).CurrentPerkClass != None);
|
||||
}
|
||||
|
||||
public function bool PlayerIsStartWaveKickProtected(KFPlayerController KFPC)
|
||||
{
|
||||
`Log_Trace();
|
||||
|
||||
@ -1 +1,60 @@
|
||||
class CVCMut extends Mut; // backward compatibility
|
||||
class CVCMut extends KFMutator;
|
||||
|
||||
var private CVC CVC;
|
||||
|
||||
public simulated function bool SafeDestroy()
|
||||
{
|
||||
return (bPendingDelete || bDeleteMe || Destroy());
|
||||
}
|
||||
|
||||
public event PreBeginPlay()
|
||||
{
|
||||
Super.PreBeginPlay();
|
||||
|
||||
if (WorldInfo.NetMode == NM_Client) return;
|
||||
|
||||
foreach WorldInfo.DynamicActors(class'CVC', CVC)
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
||||
if (CVC == None)
|
||||
{
|
||||
CVC = WorldInfo.Spawn(class'CVC');
|
||||
}
|
||||
|
||||
if (CVC == None)
|
||||
{
|
||||
`Log_Base("FATAL: Can't Spawn 'CVC'");
|
||||
SafeDestroy();
|
||||
}
|
||||
}
|
||||
|
||||
public function AddMutator(Mutator Mut)
|
||||
{
|
||||
if (Mut == Self) return;
|
||||
|
||||
if (Mut.Class == Class)
|
||||
Mut.Destroy();
|
||||
else
|
||||
Super.AddMutator(Mut);
|
||||
}
|
||||
|
||||
public function NotifyLogin(Controller C)
|
||||
{
|
||||
Super.NotifyLogin(C);
|
||||
|
||||
CVC.NotifyLogin(C);
|
||||
}
|
||||
|
||||
public function NotifyLogout(Controller C)
|
||||
{
|
||||
Super.NotifyLogout(C);
|
||||
|
||||
CVC.NotifyLogout(C);
|
||||
}
|
||||
|
||||
defaultproperties
|
||||
{
|
||||
|
||||
}
|
||||
@ -10,9 +10,6 @@ var private localized String PlayerIsStartWaveKickProtected;
|
||||
var const String PlayerCantStartKickVoteDefault;
|
||||
var private localized String PlayerCantStartKickVote;
|
||||
|
||||
var const String PlayerPerkIsNotLoadedDefault;
|
||||
var private localized String PlayerPerkIsNotLoaded;
|
||||
|
||||
var const String KickVoteNotEnoughPlayersDefault;
|
||||
var private localized String KickVoteNotEnoughPlayers;
|
||||
|
||||
@ -36,7 +33,6 @@ enum E_CVC_LocalMessageType
|
||||
CVC_PlayerIsKickProtected,
|
||||
CVC_PlayerIsStartWaveKickProtected,
|
||||
CVC_PlayerCantStartKickVote,
|
||||
CVC_PlayerPerkIsNotLoaded,
|
||||
|
||||
CVC_KickVoteNotEnoughPlayers,
|
||||
CVC_KickVoteStarted,
|
||||
@ -92,9 +88,6 @@ public static function String GetLocalizedString(
|
||||
case CVC_PlayerCantStartKickVote:
|
||||
return ReplWaves(default.PlayerCantStartKickVote != "" ? default.PlayerCantStartKickVote : default.PlayerCantStartKickVoteDefault, String1);
|
||||
|
||||
case CVC_PlayerPerkIsNotLoaded:
|
||||
return ReplKickee(default.PlayerPerkIsNotLoaded != "" ? default.PlayerPerkIsNotLoaded : default.PlayerPerkIsNotLoadedDefault, String1);
|
||||
|
||||
case CVC_KickVoteNotEnoughPlayers:
|
||||
return ReplWaves(default.KickVoteNotEnoughPlayers != "" ? default.KickVoteNotEnoughPlayers : default.KickVoteNotEnoughPlayersDefault, String1);
|
||||
|
||||
@ -143,7 +136,6 @@ defaultproperties
|
||||
PlayerIsKickProtectedDefault = "<kickee> is protected from kick"
|
||||
PlayerIsStartWaveKickProtectedDefault = "You can't kick <kickee> right now. He can be kicked when he plays at least <waves> wave(s)"
|
||||
PlayerCantStartKickVoteDefault = "You can't start kick vote now. You can start kick vote when you play at least <waves> wave(s)"
|
||||
PlayerPerkIsNotLoadedDefault = "You can't kick a player who hasn't loaded yet (<kickee>)"
|
||||
KickVoteNotEnoughPlayersDefault = "Not enough players to start vote (only players who have played at least <waves> wave(s) can vote)"
|
||||
KickVoteStartedDefault = "<kicker> has started a vote to kick <kickee>"
|
||||
KickVoteStartedForPlayerDefault = "<kicker> started voting to kick you"
|
||||
|
||||
@ -38,7 +38,6 @@ public reliable client function WriteToChat(String Message, optional String HexC
|
||||
|
||||
if (KFPC.MyGFxManager.PartyWidget != None && KFPC.MyGFxManager.PartyWidget.PartyChatWidget != None)
|
||||
{
|
||||
KFPC.MyGFxManager.PartyWidget.PartyChatWidget.SetVisible(true);
|
||||
KFPC.MyGFxManager.PartyWidget.PartyChatWidget.AddChatMessage(Message, HexColor);
|
||||
}
|
||||
|
||||
|
||||
@ -37,7 +37,6 @@ var private String KickeeName;
|
||||
var private String YesVotesPlayers, NoVotesPlayers;
|
||||
|
||||
var private bool AllowHudNotification;
|
||||
var private bool AllowSTPNotification; // SkipTrader and Pause
|
||||
|
||||
replication
|
||||
{
|
||||
@ -93,16 +92,6 @@ public function ServerStartVoteKick(PlayerReplicationInfo PRI_Kickee, PlayerRepl
|
||||
return;
|
||||
}
|
||||
|
||||
if (!CVC.PlayerPerkLoaded(PRI_Kickee))
|
||||
{
|
||||
CVC.WriteToChatLocalized(
|
||||
KFPC_Kicker,
|
||||
CVC_PlayerPerkIsNotLoaded,
|
||||
CfgKickVote.default.WarningColorHex,
|
||||
KickeeName);
|
||||
return;
|
||||
}
|
||||
|
||||
if (CVC.PlayerIsStartWaveKickProtected(KFPC_Kickee))
|
||||
{
|
||||
CVC.WriteToChatLocalized(
|
||||
@ -647,8 +636,6 @@ public function ServerStartVoteSkipTrader(PlayerReplicationInfo PRI)
|
||||
KFPRI.ShowSkipTraderVote(PRI, CurrentVoteTime, !(KFPRI == PRI) && PRI.GetTeamNum() != 255);
|
||||
}
|
||||
|
||||
AllowSTPNotification = KFPRIs.Length > 1;
|
||||
|
||||
KFGI.BroadcastLocalized(KFGI, class'KFLocalMessage', LMT_SkipTraderVoteStarted, CurrentSkipTraderVote.PlayerPRI);
|
||||
SetTimer(CurrentVoteTime, false, nameof(ConcludeVoteSkipTrader), Self);
|
||||
SetTimer(1, true, nameof(UpdateTimer), Self);
|
||||
@ -695,7 +682,7 @@ public reliable server function RecieveVoteSkipTrader(PlayerReplicationInfo PRI,
|
||||
|
||||
`Log_Trace();
|
||||
|
||||
MustNotify = (PlayersThatHaveVoted.Find(PRI) == INDEX_NONE && AllowSTPNotification);
|
||||
MustNotify = (PlayersThatHaveVoted.Find(PRI) == INDEX_NONE);
|
||||
|
||||
Super.RecieveVoteSkipTrader(PRI, bSkip);
|
||||
|
||||
@ -810,8 +797,6 @@ public function ServerStartVotePauseGame(PlayerReplicationInfo PRI)
|
||||
KFPRI.ShowPauseGameVote(PRI, CurrentVoteTime, !(KFPRI == PRI));
|
||||
}
|
||||
|
||||
AllowSTPNotification = KFPRIs.Length > 1;
|
||||
|
||||
KFGI.BroadcastLocalized(KFGI, class'KFLocalMessage', bIsEndlessPaused ? LMT_ResumeVoteStarted : LMT_PauseVoteStarted, CurrentPauseGameVote.PlayerPRI);
|
||||
SetTimer(CurrentVoteTime, false, nameof(ConcludeVotePauseGame), Self);
|
||||
SetTimer(1, true, nameof(UpdatePauseGameTimer), Self);
|
||||
@ -858,7 +843,7 @@ public reliable server function ReceiveVotePauseGame(PlayerReplicationInfo PRI,
|
||||
|
||||
`Log_Trace();
|
||||
|
||||
MustNotify = (PlayersThatHaveVoted.Find(PRI) == INDEX_NONE && AllowSTPNotification);
|
||||
MustNotify = (PlayersThatHaveVoted.Find(PRI) == INDEX_NONE);
|
||||
|
||||
Super.ReceiveVotePauseGame(PRI, bSkip);
|
||||
|
||||
@ -1123,5 +1108,4 @@ public function int GetNextMap()
|
||||
defaultproperties
|
||||
{
|
||||
AllowHudNotification = true;
|
||||
AllowSTPNotification = true;
|
||||
}
|
||||
|
||||
@ -1,60 +0,0 @@
|
||||
class Mut extends KFMutator;
|
||||
|
||||
var private CVC CVC;
|
||||
|
||||
public simulated function bool SafeDestroy()
|
||||
{
|
||||
return (bPendingDelete || bDeleteMe || Destroy());
|
||||
}
|
||||
|
||||
public event PreBeginPlay()
|
||||
{
|
||||
Super.PreBeginPlay();
|
||||
|
||||
if (WorldInfo.NetMode == NM_Client) return;
|
||||
|
||||
foreach WorldInfo.DynamicActors(class'CVC', CVC)
|
||||
{
|
||||
break;
|
||||
}
|
||||
|
||||
if (CVC == None)
|
||||
{
|
||||
CVC = WorldInfo.Spawn(class'CVC');
|
||||
}
|
||||
|
||||
if (CVC == None)
|
||||
{
|
||||
`Log_Base("FATAL: Can't Spawn 'CVC'");
|
||||
SafeDestroy();
|
||||
}
|
||||
}
|
||||
|
||||
public function AddMutator(Mutator M)
|
||||
{
|
||||
if (M == Self) return;
|
||||
|
||||
if (M.Class == Class)
|
||||
Mut(M).SafeDestroy();
|
||||
else
|
||||
Super.AddMutator(M);
|
||||
}
|
||||
|
||||
public function NotifyLogin(Controller C)
|
||||
{
|
||||
Super.NotifyLogin(C);
|
||||
|
||||
CVC.NotifyLogin(C);
|
||||
}
|
||||
|
||||
public function NotifyLogout(Controller C)
|
||||
{
|
||||
Super.NotifyLogout(C);
|
||||
|
||||
CVC.NotifyLogout(C);
|
||||
}
|
||||
|
||||
defaultproperties
|
||||
{
|
||||
GroupNames.Add("VoteCollector")
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -16,10 +16,7 @@ New vote collector with improvements and features.
|
||||
[i](it would be logical to separate these features into several mutators, but this is a bad idea for technical reasons)[/i]
|
||||
|
||||
[h1]Whitelisted?[/h1]
|
||||
[b]No.[/b] But I really hope that it will be whitelisted.
|
||||
|
||||
[b]⚠️ I submitted whitelist request here:[/b]
|
||||
https://forums.tripwireinteractive.com/index.php?threads/whitelisting-mods-and-mutators.120340/post-2353667
|
||||
No. This mod is not whitelisted and will de-rank your server. Any XP gained will not be saved.
|
||||
|
||||
[h1]Usage (server)[/h1]
|
||||
[b]Note:[/b] [i]If you don't understand what is written here, read the article [url=https://wiki.killingfloor2.com/index.php?title=Dedicated_Server_(Killing_Floor_2)][u]Dedicated Server (KF2 wiki)[/u][/url] before following these instructions.[/i]
|
||||
@ -31,7 +28,7 @@ https://forums.tripwireinteractive.com/index.php?threads/whitelisting-mods-and-m
|
||||
[*]Add the following string to the [b][OnlineSubsystemSteamworks.KFWorkshopSteamworks][/b] section (create one if it doesn't exist):
|
||||
[b]ServerSubscribedWorkshopItems=2847465899[/b]
|
||||
[*]Start the server and wait until the mutator is downloading;
|
||||
[*]Add mutator to server start parameters: [b]?Mutator=CVC.Mut[/b] and restart the server.
|
||||
[*]Add mutator to server start parameters: [b]?Mutator=CVC.CVCMut[/b] and restart the server.
|
||||
[/olist]
|
||||
|
||||
[h1]Setup (KFCVC.ini)[/h1]
|
||||
@ -131,8 +128,5 @@ Version=0
|
||||
|
||||
Then start the server and check the file again - config content should be generated.
|
||||
|
||||
[h1]Translators:[/h1]
|
||||
[url=https://steamcommunity.com/profiles/76561199126205919]cheungfatzong[/url] - Traditional [CHT] and Simplified [CHN] Chinese.
|
||||
|
||||
[h1]Sources[/h1]
|
||||
[url=https://github.com/GenZmeY/KF2-ControlledVoteCollector]https://github.com/GenZmeY/KF2-ControlledVoteCollector[/url] [b](GNU GPLv3)[/b]
|
||||
17
README.md
17
README.md
@ -1,16 +1,15 @@
|
||||
# Controlled Vote Collector
|
||||
|
||||
[](https://steamcommunity.com/sharedfiles/filedetails/?id=2847465899)
|
||||
[](https://steamcommunity.com/sharedfiles/filedetails/?id=2848836389)
|
||||
[](https://steamcommunity.com/sharedfiles/filedetails/?id=2847465899)
|
||||
[](https://github.com/GenZmeY/KF2-ControlledVoteCollector/actions/workflows/mega-linter.yml)
|
||||
[](https://steamcommunity.com/sharedfiles/filedetails/?id=2847465899)
|
||||
[](https://github.com/GenZmeY/KF2-ControlledVoteCollector/tags)
|
||||
[](LICENSE)
|
||||
|
||||
## Description
|
||||
# Description
|
||||
New vote collector with improvements and features.
|
||||
|
||||
## Features
|
||||
# Features
|
||||
- map statistics;
|
||||
- default/next map setting;
|
||||
- anonymous or public voting;
|
||||
@ -18,10 +17,10 @@ New vote collector with improvements and features.
|
||||
- kick voting setup;
|
||||
- early kick protection.
|
||||
|
||||
## Usage & Setup
|
||||
# Usage & Setup
|
||||
[See steam workshop page](https://steamcommunity.com/sharedfiles/filedetails/?id=2847465899)
|
||||
|
||||
## Build
|
||||
# Build
|
||||
**Note:** If you want to build/test/brew/publish a mutator without git-bash and/or scripts, follow [these instructions](https://tripwireinteractive.atlassian.net/wiki/spaces/KF2SW/pages/26247172/KF2+Code+Modding+How-to) instead of what is described here.
|
||||
1. Install [Killing Floor 2](https://store.steampowered.com/app/232090/Killing_Floor_2/), Killing Floor 2 - SDK and [git for windows](https://git-scm.com/download/win);
|
||||
2. open git-bash and go to any folder where you want to store sources:
|
||||
@ -35,9 +34,9 @@ New vote collector with improvements and features.
|
||||
5. The compiled files will be here:
|
||||
`C:\Users\<USERNAME>\Documents\My Games\KillingFloor2\KFGame\Unpublished\BrewedPC\Script\`
|
||||
|
||||
## Bug reports
|
||||
# Bug reports
|
||||
If you find a bug, go to the [issue page](https://github.com/GenZmeY/KF2-ControlledVoteCollector/issues) and check if there is a description of your bug. If not, create a new issue.
|
||||
Describe what the bug looks like and how reproduce it.
|
||||
|
||||
## License
|
||||
[](LICENSE)
|
||||
# License
|
||||
[GNU GPLv3](LICENSE)
|
||||
|
||||
2
tools
2
tools
@ -1 +1 @@
|
||||
Subproject commit fb458ac61f7e6c6426b8dff366dd5e7499e0d95f
|
||||
Subproject commit 88b35bd7ebb7e30448579f1564220398f990541c
|
||||
Loading…
Reference in New Issue
Block a user