Merge pull request #1 from GenZmeY/MegaLinter

add MegaLinter

.editorconfig

@@ -0,0 +1,32 @@
+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]
+trim_trailing_whitespace = false
+
+[*.yml]
+indent_style = space
+indent_size = 2
+
+[*.{txt,cfg,conf}]
+indent_style = tab

.github/workflows/mega-linter.yml

@@ -0,0 +1,72 @@
+---
+name: MegaLinter
+
+permissions: read-all
+
+on:
+  push:
+  pull_request:
+    branches: [master]
+
+env:
+  APPLY_FIXES: none
+  APPLY_FIXES_EVENT: pull_request
+  APPLY_FIXES_MODE: commit
+  DISABLE: SPELL
+
+concurrency:
+  group: ${{ github.ref }}-${{ github.workflow }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    name: MegaLinter
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
+
+      - name: MegaLinter
+        id: ml
+        uses: oxsecurity/megalinter@v6
+        env:
+          VALIDATE_ALL_CODEBASE: true
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Archive production artifacts
+        if: ${{ success() }} || ${{ failure() }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: MegaLinter reports
+          path: |
+            megalinter-reports
+            mega-linter.log
+
+      - name: Create Pull Request with applied fixes
+        id: cpr
+        if: steps.ml.outputs.has_updated_sources == 1 && (env.APPLY_FIXES_EVENT == 'all' || env.APPLY_FIXES_EVENT == github.event_name) && env.APPLY_FIXES_MODE == 'pull_request' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository)
+        uses: peter-evans/create-pull-request@v5
+        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: steps.ml.outputs.has_updated_sources == 1 && (env.APPLY_FIXES_EVENT == 'all' || env.APPLY_FIXES_EVENT == github.event_name) && env.APPLY_FIXES_MODE == 'pull_request' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository)
+        run: |
+          echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
+          echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"
+
+      - name: Prepare commit
+        if: steps.ml.outputs.has_updated_sources == 1 && (env.APPLY_FIXES_EVENT == 'all' || env.APPLY_FIXES_EVENT == github.event_name) && env.APPLY_FIXES_MODE == 'commit' && github.ref != 'refs/heads/main' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository)
+        run: sudo chown -Rc $UID .git/
+      - name: Commit and push applied linter fixes
+        if: steps.ml.outputs.has_updated_sources == 1 && (env.APPLY_FIXES_EVENT == 'all' || env.APPLY_FIXES_EVENT == github.event_name) && env.APPLY_FIXES_MODE == 'commit' && github.ref != 'refs/heads/main' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository)
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          branch: ${{ github.event.pull_request.head.ref || github.head_ref || github.ref }}
+          commit_message: "[MegaLinter] Apply linters fixes"
+          commit_user_name: megalinter-bot
+          commit_user_email: nicolas.vuillamy@ox.security

DPL/Classes/DPL.uc

@@ -19,58 +19,58 @@ var private config E_LogLevel LogLevel;
 public simulated function bool SafeDestroy()
 {
 	`Log_Trace();
-	
+
 	return (bPendingDelete || bDeleteMe || Destroy());
 }
 
 public event PreBeginPlay()
 {
 	`Log_Trace();
-	
+
 	if (WorldInfo.NetMode == NM_Client)
 	{
 		`Log_Fatal("NetMode:" @ WorldInfo.NetMode);
 		SafeDestroy();
 		return;
 	}
-	
+
 	Super.PreBeginPlay();
-	
+
 	Init();
 }
 
 private function Init()
 {
 	`Log_Trace();
-	
+
 	if (Version == `NO_CONFIG)
 	{
 		LogLevel = LL_Info;
 		SaveConfig();
 	}
-	
+
 	CfgLifespan.static.InitConfig(Version, LatestVersion, LogLevel);
-	
+
 	switch (Version)
 	{
 		case `NO_CONFIG:
 			`Log_Info("Config created");
-			
+
 		case MaxInt:
 			`Log_Info("Config updated to version" @ LatestVersion);
 			break;
-			
+
 		case LatestVersion:
 			`Log_Info("Config is up-to-date");
 			break;
-			
+
 		default:
 			`Log_Warn("The config version is higher than the current version (are you using an old mutator?)");
 			`Log_Warn("Config version is" @ Version @ "but current version is" @ LatestVersion);
 			`Log_Warn("The config version will be changed to" @ LatestVersion);
 			break;
 	}
-	
+
 	if (LatestVersion != Version)
 	{
 		Version = LatestVersion;
@@ -84,16 +84,16 @@ private function Init()
 		SaveConfig();
 	}
 	`Log_Base("LogLevel:" @ LogLevel);
-	
+
 	CfgLifespan.static.Load(LogLevel);
-	
+
 	`Log_Info("Initialized");
 }
 
 public function ModifyLifespan(Actor A)
 {
 	`Log_Trace();
-	
+
 	switch (PickupType(A))
 	{
 		case PT_Dosh:
@@ -107,7 +107,7 @@ public function ModifyLifespan(Actor A)
 				`Log_Debug("Skip modify dosh lifespan");
 			}
 			break;
-			
+
 		case PT_Weapon:
 			if (CfgLifespan.default.Weap > 0)
 			{
@@ -119,7 +119,7 @@ public function ModifyLifespan(Actor A)
 				`Log_Debug("Skip modify weapon lifespan");
 			}
 			break;
-		
+
 		case PT_Carryable:
 		case PT_NotPickup:
 		default:
@@ -130,7 +130,7 @@ public function ModifyLifespan(Actor A)
 private function E_PickupType PickupType(Actor A)
 {
 	`Log_Trace();
-	
+
 	if (KFDroppedPickup_Cash(A) != None)
 	{
 		return PT_Dosh;
@@ -143,7 +143,7 @@ private function E_PickupType PickupType(Actor A)
 	{
 		return PT_Weapon;
 	}
-	
+
 	return PT_NotPickup;
 }
 

DPL/Classes/DPL.upkg

@@ -1,4 +1,4 @@
-[Flags]
+[Flags]
-AllowDownload=False
+AllowDownload=False
-ClientOptional=False
+ClientOptional=False
-ServerSideOnly=True
+ServerSideOnly=True

DPL/Classes/DPLMut.uc

@@ -1,59 +1,59 @@
-class DPLMut extends KFMutator;
+class DPLMut extends KFMutator;
-
+
-var private DPL DPL;
+var private DPL DPL;
-
+
-public simulated function bool SafeDestroy()
+public simulated function bool SafeDestroy()
-{
+{
-	return (bPendingDelete || bDeleteMe || Destroy());
+	return (bPendingDelete || bDeleteMe || Destroy());
-}
+}
-
+
-public event PreBeginPlay()
+public event PreBeginPlay()
-{
+{
-	Super.PreBeginPlay();
+	Super.PreBeginPlay();
-	
+
-	if (WorldInfo.NetMode == NM_Client) return;
+	if (WorldInfo.NetMode == NM_Client) return;
-	
+
-	foreach WorldInfo.DynamicActors(class'DPL', DPL)
+	foreach WorldInfo.DynamicActors(class'DPL', DPL)
-	{
+	{
-		break;
+		break;
-	}
+	}
-	
+
-	if (DPL == None)
+	if (DPL == None)
-	{
+	{
-		DPL = WorldInfo.Spawn(class'DPL');
+		DPL = WorldInfo.Spawn(class'DPL');
-	}
+	}
-	
+
-	if (DPL == None)
+	if (DPL == None)
-	{
+	{
-		`Log_Base("FATAL: Can't Spawn 'DPL'");
+		`Log_Base("FATAL: Can't Spawn 'DPL'");
-		SafeDestroy();
+		SafeDestroy();
-	}
+	}
-}
+}
-
+
-public function AddMutator(Mutator Mut)
+public function AddMutator(Mutator Mut)
-{
+{
-	if (Mut == Self) return;
+	if (Mut == Self) return;
-	
+
-	if (Mut.Class == Class)
+	if (Mut.Class == Class)
-		Mut.Destroy();
+		Mut.Destroy();
-	else
+	else
-		Super.AddMutator(Mut);
+		Super.AddMutator(Mut);
-}
+}
-
+
-public function bool CheckRelevance(Actor A)
+public function bool CheckRelevance(Actor A)
-{
+{
-	local bool Relevance;
+	local bool Relevance;
-
+
-	Relevance = Super.CheckRelevance(A);
+	Relevance = Super.CheckRelevance(A);
-	if (Relevance)
+	if (Relevance)
-	{
+	{
-		DPL.ModifyLifespan(A);
+		DPL.ModifyLifespan(A);
-	}
+	}
-
+
-	return Relevance;
+	return Relevance;
-}
+}
-
+
-defaultproperties
+defaultproperties
-{
+{
-	
+
-}
+}

DPL/Classes/Lifespan.uc

@@ -1,42 +1,42 @@
-class Lifespan extends Object
+class Lifespan extends Object
-	config(DPL)
+	config(DPL)
-	abstract;
+	abstract;
-
+
-var public config int Weap;
+var public config int Weap;
-var public config int Dosh;
+var public config int Dosh;
-
+
-public static function InitConfig(int Version, int LatestVersion, E_LogLevel LogLevel)
+public static function InitConfig(int Version, int LatestVersion, E_LogLevel LogLevel)
-{
+{
-	`Log_TraceStatic();
+	`Log_TraceStatic();
-	
+
-	switch (Version)
+	switch (Version)
-	{
+	{
-		case `NO_CONFIG:
+		case `NO_CONFIG:
-			ApplyDefault(LogLevel);
+			ApplyDefault(LogLevel);
-			
+
-		default: break;
+		default: break;
-	}
+	}
-	
+
-	if (LatestVersion != Version)
+	if (LatestVersion != Version)
-	{
+	{
-		StaticSaveConfig();
+		StaticSaveConfig();
-	}
+	}
-}
+}
-
+
-public static function Load(E_LogLevel LogLevel)
+public static function Load(E_LogLevel LogLevel)
-{
+{
-	`Log_TraceStatic();
+	`Log_TraceStatic();
-}
+}
-
+
-protected static function ApplyDefault(E_LogLevel LogLevel)
+protected static function ApplyDefault(E_LogLevel LogLevel)
-{
+{
-	`Log_TraceStatic();
+	`Log_TraceStatic();
-	
+
-	default.Weap = int(class'KFDroppedPickup'.default.Lifespan);
+	default.Weap = int(class'KFDroppedPickup'.default.Lifespan);
-	default.Dosh = int(class'KFDroppedPickup_Cash'.default.Lifespan);
+	default.Dosh = int(class'KFDroppedPickup_Cash'.default.Lifespan);
-}
+}
-
+
-defaultproperties
+defaultproperties
-{
+{
-
+
-}
+}

DPL/Classes/_Logger.uc

@@ -1,20 +1,20 @@
-class _Logger extends Object
+class _Logger extends Object
-	abstract;
+	abstract;
-
+
-enum E_LogLevel
+enum E_LogLevel
-{
+{
-	LL_WrongLevel,
+	LL_WrongLevel,
-	LL_None,
+	LL_None,
-	LL_Fatal,
+	LL_Fatal,
-	LL_Error,
+	LL_Error,
-	LL_Warning,
+	LL_Warning,
-	LL_Info,
+	LL_Info,
-	LL_Debug,
+	LL_Debug,
-	LL_Trace,
+	LL_Trace,
-	LL_All
+	LL_All
-};
+};
-
+
-defaultproperties
+defaultproperties
-{
+{
-	
+
-}
+}

DPL/Constants.uci

@@ -1,2 +1,2 @@
-// Constants
+// Constants
-`define NO_CONFIG 0
+`define NO_CONFIG 0

DPL/Globals.uci

@@ -1,3 +1,3 @@
-// Imports
+// Imports
-`include(Logger.uci)
+`include(Logger.uci)
-`include(Constants.uci)
+`include(Constants.uci)

DPL/Logger.uci

@@ -1,15 +1,15 @@
-// Logger
+// Logger
-`define Log_Tag 'DPL'
+`define Log_Tag 'DPL'
-
+
-`define LocationStatic        "`{ClassName}::" $ GetFuncName()
+`define LocationStatic        "`{ClassName}::" $ GetFuncName()
-
+
-`define Log_Base(msg, cond)  `log(`msg `if(`cond), `cond`{endif},            `Log_Tag)
+`define Log_Base(msg, cond)  `log(`msg `if(`cond), `cond`{endif},            `Log_Tag)
-
+
-`define Log_Fatal(msg)       `log("FATAL:" @ `msg, (LogLevel >= LL_Fatal),   `Log_Tag)
+`define Log_Fatal(msg)       `log("FATAL:" @ `msg, (LogLevel >= LL_Fatal),   `Log_Tag)
-`define Log_Error(msg)       `log("ERROR:" @ `msg, (LogLevel >= LL_Error),   `Log_Tag)
+`define Log_Error(msg)       `log("ERROR:" @ `msg, (LogLevel >= LL_Error),   `Log_Tag)
-`define Log_Warn(msg)        `log("WARN:"  @ `msg, (LogLevel >= LL_Warning), `Log_Tag)
+`define Log_Warn(msg)        `log("WARN:"  @ `msg, (LogLevel >= LL_Warning), `Log_Tag)
-`define Log_Info(msg)        `log("INFO:"  @ `msg, (LogLevel >= LL_Info),    `Log_Tag)
+`define Log_Info(msg)        `log("INFO:"  @ `msg, (LogLevel >= LL_Info),    `Log_Tag)
-`define Log_Debug(msg)       `log("DEBUG:" @ `msg, (LogLevel >= LL_Debug),   `Log_Tag)
+`define Log_Debug(msg)       `log("DEBUG:" @ `msg, (LogLevel >= LL_Debug),   `Log_Tag)
-
+
-`define Log_Trace(msg)       `log("TRACE:" @ `Location       `if(`msg) @ `msg`{endif}, (LogLevel >= LL_Trace), `Log_Tag)
+`define Log_Trace(msg)       `log("TRACE:" @ `Location       `if(`msg) @ `msg`{endif}, (LogLevel >= LL_Trace), `Log_Tag)
-`define Log_TraceStatic(msg) `log("TRACE:" @ `LocationStatic `if(`msg) @ `msg`{endif}, (LogLevel >= LL_Trace), `Log_Tag)
+`define Log_TraceStatic(msg) `log("TRACE:" @ `LocationStatic `if(`msg) @ `msg`{endif}, (LogLevel >= LL_Trace), `Log_Tag)

PublicationContent/description.txt

@@ -12,7 +12,7 @@ https://forums.tripwireinteractive.com/index.php?threads/whitelisting-mods-and-m
 [h1]Usage (single player)[/h1]
 [olist]
 [*]Subscribe to this mutator;
-[*]Start KF2; 
+[*]Start KF2;
 [*]Open console (~) and input:
 [b]open KF-BioticsLab?Mutator=DPL.DPLMut[/b]
 (replace the map and add the parameters you need)

README.md

@@ -3,17 +3,17 @@
 [![Steam Workshop](https://img.shields.io/static/v1?message=workshop&logo=steam&labelColor=gray&color=blue&logoColor=white&label=steam%20)](https://steamcommunity.com/sharedfiles/filedetails/?id=2864944858)
 [![Steam Downloads](https://img.shields.io/steam/downloads/2864944858)](https://steamcommunity.com/sharedfiles/filedetails/?id=2864944858)
 [![Steam Favorites](https://img.shields.io/steam/favorites/2864944858)](https://steamcommunity.com/sharedfiles/filedetails/?id=2864944858)
-[![Steam Update Date](https://img.shields.io/steam/update-date/2864944858)](https://steamcommunity.com/sharedfiles/filedetails/?id=2864944858)
+[![MegaLinter](https://github.com/GenZmeY/KF2-DroppedPickupLifespan/actions/workflows/mega-linter.yml/badge.svg?branch=master)](https://github.com/GenZmeY/KF2-DroppedPickupLifespan/actions/workflows/mega-linter.yml)
 [![GitHub tag (latest by date)](https://img.shields.io/github/v/tag/GenZmeY/KF2-CustomTraderInventory)](https://github.com/GenZmeY/KF2-CustomTraderInventory/tags)
 [![GitHub](https://img.shields.io/github/license/GenZmeY/KF2-CustomTraderInventory)](LICENSE)
 
-# Description
+## Description
 Small server-side mutator that changes the lifespan of dropped weapons and dosh.  
 
-# Usage & Setup
+## Usage & Setup
 [See steam workshop page](https://steamcommunity.com/sharedfiles/filedetails/?id=2864944858)
 
-# 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:  
@@ -27,5 +27,5 @@ Small server-side mutator that changes the lifespan of dropped weapons and dosh.
 5. The compiled files will be here:  
 `C:\Users\<USERNAME>\Documents\My Games\KillingFloor2\KFGame\Unpublished\BrewedPC\Script\`
 
-# License
+## License
-[GNU GPLv3](LICENSE)  
+[![license](https://www.gnu.org/graphics/gplv3-with-text-136x68.png)](LICENSE)

builder.cfg

@@ -7,7 +7,7 @@ StripSource="True"
 
 # Mutators to be compiled
 # Specify them with a space as a separator,
-# Mutators will be compiled in the specified order 
+# Mutators will be compiled in the specified order
 PackageBuildOrder="DPL"
 
 
@@ -16,7 +16,7 @@ PackageBuildOrder="DPL"
 # Packages you want to brew using @peelz's patched KFEditor.
 # Useful for cases where regular brew doesn't put *.upk inside the package.
 # Specify them with a space as a separator,
-# The order doesn't matter 
+# The order doesn't matter
 PackagePeelzBrew=""
 
 
@@ -24,7 +24,7 @@ PackagePeelzBrew=""
 
 # Mutators that will be uploaded to the workshop
 # Specify them with a space as a separator,
-# The order doesn't matter 
+# The order doesn't matter
 PackageUpload="DPL"
 
 

tools

@@ -1 +1 @@
-Subproject commit 0e821f3dbbc6b3528f2028b0060d3b6f7f1c4b93
+Subproject commit fb458ac61f7e6c6426b8dff366dd5e7499e0d95f