Merge pull request #38 from Deaod/master

InstaGib+ 9

.github/workflows/build.yml

@@ -0,0 +1,68 @@
+# This is a basic workflow to help you get started with Actions
+
+name: CI
+
+# Controls when the workflow will run
+on:
+  # Triggers the workflow on push or pull request events but only for the master branch
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: windows-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      - name: Download 469b Patch
+        uses: robinraju/release-downloader@v1.2
+        with:
+          repository: "OldUnreal/UnrealTournamentPatches"
+          tag: "v469b"
+          fileName: "OldUnreal-UTPatch469b-Windows.zip"
+
+      - name: Extract Patch
+        uses: DuckSoft/extract-7z-action@v1.0
+        with:
+          pathSource: "OldUnreal-UTPatch469b-Windows.zip"
+          pathTarget: .
+
+      - name: Checkout IG+
+        uses: actions/checkout@v2
+        with:
+          path: InstaGibPlus9/
+
+      - name: Extract Necessary Resources
+        uses: DuckSoft/extract-7z-action@v1.0
+        with:
+          pathSource: InstaGibPlus9/Build/BuildEnv.zip
+          pathTarget: .
+
+      # Runs a single command using the runners shell
+      - name: Build IG+
+        run: InstaGibPlus9/build.bat silent noint
+
+      - name: Save UCC.log
+        if: failure()
+        uses: actions/upload-artifact@v2
+        with:
+          name: ucc-output
+          path: System/UCC.log
+
+      - name: Save IG+ Package
+        if: success()
+        uses: actions/upload-artifact@v2
+        with:
+          name: InstaGibPlus9
+          path: |
+            InstaGibPlus9/System/
+            InstaGibPlus9/LICENSE
+            InstaGibPlus9/README.md

Classes/ClientSettings.uc

@@ -74,12 +74,20 @@ var config bool   bAllowWeaponShake;
 var config bool   bAutoReady;
 var config bool   bShowDeathReport;
 var config bool   bSmoothFOVChanges;
+var config bool   bEnableLocationOffsetFix;
 var config bool   bEnableKillFeed;
 var config float  KillFeedX;
 var config float  KillFeedY;
 var config float  KillFeedSpeed;
 var config float  KillFeedScale;
 
+enum EFraggerScopeChoice {
+	FSC_None,
+	FSC_Moveable,
+	FSC_Static
+};
+var config EFraggerScopeChoice FraggerScopeChoice;
+
 enum EHitMarkerSource {
 	HMSRC_Server,
 	HMSRC_Client
@@ -126,22 +134,10 @@ simulated function AppendLayer(CrosshairLayer L) {
 	}
 }
 
-simulated function CheckConfig() {
+simulated function CreateCrosshairLayers() {
 	local int i;
-	local string PackageName;
 	local CrosshairLayer L;
 
-	PackageName = class'StringUtils'.static.GetPackage();
-
-	for (i = 0; i < arraycount(sHitSound); i++) {
-		if (Left(sHitSound[i], 12) ~= "InstaGibPlus") {
-			sHitSound[i] = PackageName$Mid(sHitSound[i], InStr(sHitSound[i], "."));
-		}
-		if (sHitSound[i] == "" && sHitSound[i] != default.sHitSound[i]) {
-			sHitSound[i] = default.sHitSound[i];
-		}
-	}
-
 	for (i = 0; i < arraycount(CrosshairLayers); i++) {
 		if (CrosshairLayers[i].bUse) {
 			L = new(none) class'CrosshairLayer';
@@ -157,6 +153,24 @@ simulated function CheckConfig() {
 			AppendLayer(L);
 		}
 	}
+}
+
+simulated function CheckConfig() {
+	local int i;
+	local string PackageName;
+
+	PackageName = class'StringUtils'.static.GetPackage();
+
+	for (i = 0; i < arraycount(sHitSound); i++) {
+		if (Left(sHitSound[i], 12) ~= "InstaGibPlus") {
+			sHitSound[i] = PackageName$Mid(sHitSound[i], InStr(sHitSound[i], "."));
+		}
+		if (sHitSound[i] == "" && sHitSound[i] != default.sHitSound[i]) {
+			sHitSound[i] = default.sHitSound[i];
+		}
+	}
+
+	CreateCrosshairLayers();
 
 	if (FPSCounterSmoothingStrength <= 0)
 		FPSCounterSmoothingStrength = 1;
@@ -193,11 +207,11 @@ simulated function string DumpHitSounds() {
 	return Result;
 }
 
-simulated function string DumpColor(out Color C) {
+static function string DumpColor(out Color C) {
 	return "(R="$C.R$",G="$C.G$",B="$C.B$",A="$C.A$")";
 }
 
-simulated function string DumpCrosshairLayer(out CrosshairLayerDescr L) {
+static function string DumpCrosshairLayer(out CrosshairLayerDescr L) {
 	return "(Texture="$L.Texture$",OffsetX="$L.OffsetX$",OffsetY="$L.OffsetY$",ScaleX="$L.ScaleX$",ScaleY="$L.ScaleY$",Color="$DumpColor(L.Color)$",Style="$L.Style$",bSmooth="$L.bSmooth$",bUse="$L.bUse$")";
 }
 
@@ -213,30 +227,79 @@ simulated function string DumpCrosshairLayers() {
 	return Result;
 }
 
-simulated function EHitSoundSource IntToHitSoundSource(int A) {
+simulated function CrosshairLayerDescr GetCrosshairLayer(int i) {
+	return CrosshairLayers[i];
+}
+
+simulated function SetCrosshairLayerTexture(int i, coerce string T) {
+	CrosshairLayers[i].Texture = T;
+}
+
+simulated function SetCrosshairLayerOffsetX(int i, int O) {
+	CrosshairLayers[i].OffsetX = O;
+}
+
+simulated function SetCrosshairLayerOffsetY(int i, int O) {
+	CrosshairLayers[i].OffsetY = O;
+}
+
+simulated function SetCrosshairLayerScaleX(int i, float S) {
+	CrosshairLayers[i].ScaleX = S;
+}
+
+simulated function SetCrosshairLayerScaleY(int i, float S) {
+	CrosshairLayers[i].ScaleY = S;
+}
+
+simulated function SetCrosshairLayerColor(int i, color C) {
+	CrosshairLayers[i].Color = C;
+}
+
+simulated function SetCrosshairLayerStyle(int i, int S) {
+	CrosshairLayers[i].Style = S;
+}
+
+simulated function SetCrosshairLayerSmooth(int i, bool S) {
+	CrosshairLayers[i].bSmooth = S;
+}
+
+simulated function SetCrosshairLayerUse(int i, bool U) {
+	CrosshairLayers[i].bUse = U;
+}
+
+static function EHitSoundSource IntToHitSoundSource(int A) {
 	switch(A) {
 		case 0: return HSSRC_Server;
 		case 1: return HSSRC_Client;
 	}
 	return HSSRC_Server;
 }
 
-simulated function EHitMarkerSource IntToHitMarkerSource(int A) {
+static function EHitMarkerSource IntToHitMarkerSource(int A) {
 	switch(A) {
 		case 0: return HMSRC_Server;
 		case 1: return HMSRC_Client;
 	}
 	return HMSRC_Server;
 }
 
-simulated function EHitMarkerColorMode IntToHitMarkerColorMode(int A) {
+static function EHitMarkerColorMode IntToHitMarkerColorMode(int A) {
 	switch(A) {
 		case 0: return HMCM_FriendOrFoe;
 		case 1: return HMCM_TeamColor;
 	}
 	return HMCM_FriendOrFoe;
 }
 
+simulated function CycleFraggerScope() {
+	switch(FraggerScopeChoice) {
+		case FSC_None:     FraggerScopeChoice = FSC_Moveable; break;
+		case FSC_Moveable: FraggerScopeChoice = FSC_Static; break;
+		case FSC_Static:   FraggerScopeChoice = FSC_None; break;
+	}
+	SaveConfig();
+}
+
 simulated function string DumpSettings() {
 	return "IG+ Client Settings:"$Chr(10)$
 		GetSetting("bForceModels")$
@@ -297,11 +360,13 @@ simulated function string DumpSettings() {
 		GetSetting("bAutoReady")$
 		GetSetting("bShowDeathReport")$
 		GetSetting("bSmoothFOVChanges")$
+		GetSetting("bEnableLocationOffsetFix")$
 		GetSetting("bEnableKillFeed")$
 		GetSetting("KillFeedX")$
 		GetSetting("KillFeedY")$
 		GetSetting("KillFeedSpeed")$
 		GetSetting("KillFeedScale")$
+		GetSetting("FraggerScopeChoice")$
 		GetSetting("bEnableHitMarker")$
 		GetSetting("bEnableTeamHitMarker")$
 		GetSetting("HitMarkerColorMode")$
@@ -343,10 +408,10 @@ defaultproperties
 	SelectedTeamHitSound=2
 	HitSoundVolume=4
 	HitSoundTeamVolume=4
-	sHitSound(0)="InstaGibPlus8.HitSound"
+	sHitSound(0)="InstaGibPlus9.HitSound"
 	sHitSound(1)="UnrealShare.StingerFire"
-	sHitSound(2)="InstaGibPlus8.HitSoundFriendly"
-	sHitSound(3)="InstaGibPlus8.HitSound1"
+	sHitSound(2)="InstaGibPlus9.HitSoundFriendly"
+	sHitSound(3)="InstaGibPlus9.HitSound1"
 	cShockBeam=1
 	bHideOwnBeam=False
 	BeamScale=0.45
@@ -377,11 +442,13 @@ defaultproperties
 	bAutoReady=True
 	bShowDeathReport=False
 	bSmoothFOVChanges=False
+	bEnableLocationOffsetFix=True
 	bEnableKillFeed=True
 	KillFeedX=0.0
 	KillFeedY=0.5
 	KillFeedSpeed=1.0
 	KillFeedScale=1.0
+	FraggerScopeChoice=FSC_Moveable
 	bEnableHitMarker=False
 	bEnableTeamHitMarker=False
 	HitMarkerColorMode=HMCM_FriendOrFoe

Classes/IGPlus_BtnDown.uc

@@ -0,0 +1,10 @@
+class IGPlus_BtnDown extends UWindowSBDownButton;
+
+function LMouseDown(float X, float Y)
+{
+	Super(UWindowButton).LMouseDown(X, Y);
+}
+
+function Tick(float Delta)
+{
+}

Classes/IGPlus_BtnLeft.uc

@@ -0,0 +1,10 @@
+class IGPlus_BtnLeft extends UWindowSBLeftButton;
+
+function LMouseDown(float X, float Y)
+{
+	Super(UWindowButton).LMouseDown(X, Y);
+}
+
+function Tick(float Delta)
+{
+}

Classes/IGPlus_BtnRight.uc

@@ -0,0 +1,10 @@
+class IGPlus_BtnRight extends UWindowSBRightButton;
+
+function LMouseDown(float X, float Y)
+{
+	Super(UWindowButton).LMouseDown(X, Y);
+}
+
+function Tick(float Delta)
+{
+}

Classes/IGPlus_BtnUp.uc

@@ -0,0 +1,10 @@
+class IGPlus_BtnUp extends UWindowSBUpButton;
+
+function LMouseDown(float X, float Y)
+{
+	Super(UWindowButton).LMouseDown(X, Y);
+}
+
+function Tick(float Delta)
+{
+}

Classes/IGPlus_Button.uc

@@ -0,0 +1,45 @@
+class IGPlus_Button extends UWindowSmallButton;
+
+var UWindowDialogControl NextSettingControl;
+
+function MouseLeave() {
+	super(UWindowDialogControl).MouseLeave();
+
+	if(ToolTipString != "")
+		ToolTip("");
+}
+
+simulated function MouseEnter() {
+	local int CutPos;
+	local int CutPos2;
+
+	super(UWindowDialogControl).MouseEnter();
+
+	if(ToolTipString != "") {
+		CutPos = InStr(ToolTipString, "\\n");
+
+		CutPos2 = InStr(ToolTipString, Chr(13));
+		if ((CutPos == -1 && CutPos2 >= 0) || (CutPos >= 0 && CutPos2 >= 0 && CutPos2 < CutPos))
+			CutPos = CutPos2;
+
+		CutPos2 = InStr(ToolTipString, Chr(10));
+		if ((CutPos == -1 && CutPos2 >= 0) || (CutPos >= 0 && CutPos2 >= 0 && CutPos2 < CutPos))
+			CutPos = CutPos2;
+
+		if (CutPos >= 0)
+			ToolTip(Left(ToolTipString, CutPos));
+		else
+			ToolTip(ToolTipString);
+	}
+
+	if (!bDisabled && (OverSound != None))
+		GetPlayerOwner().PlaySound( OverSound, SLOT_Interface );
+}
+
+function RClick(float X, float Y)
+{
+	local UWindowMessageBox W;
+	if (HelpText == "") return;
+	W = MessageBox(Text, HelpText, MB_OK, MR_OK);
+	W.bLeaveOnscreen = true;
+}

Classes/IGPlus_CollisionDummy.uc

@@ -0,0 +1,8 @@
+class IGPlus_CollisionDummy extends Actor;
+
+var IGPlus_CollisionDummy NextCollDummy;
+
+defaultproperties {
+	DrawType=DT_None
+	RemoteRole=ROLE_None
+}

Classes/IGPlus_ComboBox.uc

@@ -61,4 +61,10 @@ function RClick(float X, float Y)
 	if (HelpText == "") return;
 	W = MessageBox(Text, HelpText, MB_OK, MR_OK);
 	W.bLeaveOnscreen = true;
-}
+}
+
+defaultproperties {
+	EditBoxMinWidth=0
+	EditBoxMaxWidth=65535
+	EditBoxWidthFraction=0.5
+}