Merge pull request #18 from shrimpza/606

shrimpza · web-flow · commit e0a8cc97fc04 · 2022-01-29T12:56:55.000+08:00
Monster Hunt 606
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog 
 
+## 605 to 606:
+ - Fix incorrect view offsets for U1 weapons making them seem invisible
+
 ## 604 to 605:
  - Remove automatically assigning monsters to team
  - Show monster names better, "KrallElite" becomes "Krall Elite" 
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Monster Hunt
+<p align="center"><img src="./resources/Help/MonsterHunt/header.png" /></p>
 
 Monster Hunt is a team based modification for Unreal Tournament comprising three 
 new game types, Monster Hunt, Monster Arena, and Monster Defence.
diff --git a/buildscript/buildconfig.sh b/buildscript/buildconfig.sh
@@ -7,8 +7,8 @@ SCRIPTS_DIR=$(dirname $(realpath $0))
 
 export name="Monster Hunt"
 export package=MonsterHunt
-export build=605
-export version=605
+export build=606
+export version=606
 export packagefull=$package
 export packagedist=$package$version
 export debug=1
diff --git a/resources/Help/MonsterHunt/ReadMe.html b/resources/Help/MonsterHunt/ReadMe.html
@@ -42,7 +42,7 @@
 
 <body>
 <header>
-	<img src="header.jpg" alt="Header image"/>
+	<img src="header.png" alt="Header image"/>
 </header>
 
 <nav>
@@ -287,6 +287,11 @@ <h2 id="credits">Credits</h2>
 <section>
 	<h2 id="history">Release History</h2>
 
+	<h3>Release 12 (606)</h3>
+	<ul>
+		<li>Fix incorrect view offsets for U1 weapons making them seem invisible
+	</ul>
+
 	<h3>Release 11 (605)</h3>
 	<ul>
 		<li>Remove automatically assigning monsters to team
diff --git a/resources/Help/MonsterHunt/header.jpg b/resources/Help/MonsterHunt/header.jpg
diff --git a/resources/Help/MonsterHunt/header.png b/resources/Help/MonsterHunt/header.png
diff --git a/src/Classes/MonsterHunt.uc b/src/Classes/MonsterHunt.uc
@@ -165,8 +165,8 @@ function String FancyName(Pawn Other, optional Bool upperArticle) {
 }
 
 function String UppercaseFirst(String S) {
-	local String trimmed, c;
-	local int i, start;
+	local String trimmed;
+	local int i;
 
 	for (i = 0; i < Len(S); i++) {
 		if (Mid(S, i, 1) != " ") {
diff --git a/src/Classes/OLASMD.uc b/src/Classes/OLASMD.uc
@@ -400,7 +400,7 @@ defaultproperties {
 	bInstantHit=True
 	bAltWarnTarget=True
 	bSplashDamage=True
-	FireOffset=(X=12.000000, Y=-6.000000, Z=-7.000000)
+	FireOffset=(X=12.000000,Y=-6.000000,Z=-7.000000)
 	AltProjectileClass=Class'{{package}}.OLTazerProj'
 	MyDamageType=jolted
 	AIRating=0.600000
@@ -414,7 +414,7 @@ defaultproperties {
 	InventoryGroup=4
 	PickupMessage="You got the ASMD"
 	ItemName="ASMD"
-	PlayerViewOffset=(X=3.500000, Y=-1.800000, Z=-2.000000)
+	PlayerViewOffset=(X=3.500000,Y=-1.800000,Z=-2.000000)
 	PlayerViewMesh=LodMesh'UnrealShare.ASMDM'
 	PickupViewMesh=LodMesh'UnrealShare.ASMDPick'
 	ThirdPersonMesh=LodMesh'UnrealShare.ASMD3'
diff --git a/src/Classes/OLDPistol.uc b/src/Classes/OLDPistol.uc
@@ -438,7 +438,7 @@ defaultproperties {
 	PickupAmmoCount=50
 	bAltWarnTarget=True
 	bSpecialIcon=False
-	FireOffset=(X=12.000000, Y=-8.000000, Z=-15.000000)
+	FireOffset=(X=12.000000,Y=-8.000000,Z=-15.000000)
 	ProjectileClass=Class'{{package}}.OSDispersionAmmo'
 	AltProjectileClass=Class'{{package}}.OSDispersionAmmo'
 	shakemag=200.000000
@@ -453,7 +453,7 @@ defaultproperties {
 	DeathMessage="%o was killed by %k's %w.  What a loser!"
 	PickupMessage="You got the Dispersion Pistol"
 	ItemName="Dispersion Pistol"
-	PlayerViewOffset=(X=3.800000, Y=-2.000000, Z=-2.000000)
+	PlayerViewOffset=(X=3.800000,Y=-2.000000,Z=-2.000000)
 	PlayerViewMesh=LodMesh'UnrealShare.DPistol'
 	PickupViewMesh=LodMesh'UnrealShare.DPistolPick'
 	ThirdPersonMesh=LodMesh'UnrealShare.DPistol3rd'
diff --git a/src/Classes/OLEightball.uc b/src/Classes/OLEightball.uc
@@ -724,7 +724,7 @@ defaultproperties {
 	InventoryGroup=5
 	PickupMessage="You got the Eightball gun"
 	ItemName="Eightball"
-	PlayerViewOffset=(X=1.900000, Z=-1.890000)
+	PlayerViewOffset=(X=1.900000,Z=-1.890000)
 	PlayerViewMesh=LodMesh'UnrealShare.EightB'
 	BobDamping=0.985000
 	PickupViewMesh=LodMesh'UnrealShare.EightPick'
diff --git a/src/Classes/OLFlakCannon.uc b/src/Classes/OLFlakCannon.uc
@@ -325,7 +325,7 @@ defaultproperties {
 	bWarnTarget=True
 	bAltWarnTarget=True
 	bSplashDamage=True
-	FireOffset=(X=10.000000, Y=-12.000000, Z=-15.000000)
+	FireOffset=(X=10.000000,Y=-12.000000,Z=-15.000000)
 	ProjectileClass=Class'{{package}}.OSMasterChunk'
 	AltProjectileClass=Class'{{package}}.OSFlakShell'
 	shakemag=350.000000
@@ -343,7 +343,7 @@ defaultproperties {
 	InventoryGroup=6
 	PickupMessage="You got the Flak Cannon"
 	ItemName="Flak Cannon"
-	PlayerViewOffset=(X=2.100000, Y=-1.500000, Z=-1.250000)
+	PlayerViewOffset=(X=2.100000,Y=-1.500000,Z=-1.250000)
 	PlayerViewMesh=LodMesh'UnrealI.flak'
 	PlayerViewScale=1.200000
 	PickupViewMesh=LodMesh'UnrealI.FlakPick'
diff --git a/src/Classes/OLGESBioRifle.uc b/src/Classes/OLGESBioRifle.uc
@@ -233,11 +233,11 @@ simulated function DripSound() {
 defaultproperties {
 	WeaponDescription="Classification: Toxic Tarydium waste Rifle"
 	InstFlash=-0.150000
-	InstFog=(X=139.000000, Y=218.000000, Z=72.000000)
+	InstFog=(X=139.000000,Y=218.000000,Z=72.000000)
 	AmmoName=Class'UnrealI.Sludge'
 	PickupAmmoCount=25
 	bAltWarnTarget=True
-	FireOffset=(X=12.000000, Y=-9.000000, Z=-16.000000)
+	FireOffset=(X=12.000000,Y=-9.000000,Z=-16.000000)
 	ProjectileClass=Class'{{package}}.OSBioGel'
 	AltProjectileClass=Class'{{package}}.OSBigBiogel'
 	AIRating=0.600000
@@ -255,7 +255,7 @@ defaultproperties {
 	InventoryGroup=8
 	PickupMessage="You got the GES BioRifle"
 	ItemName="GES Bio Rifle"
-	PlayerViewOffset=(X=2.000000, Y=-0.700000, Z=-1.150000)
+	PlayerViewOffset=(X=2.000000,Y=-0.700000,Z=-1.150000)
 	PlayerViewMesh=LodMesh'UnrealI.BRifle'
 	PickupViewMesh=LodMesh'UnrealI.BRiflePick'
 	ThirdPersonMesh=LodMesh'UnrealI.BRifle3'
diff --git a/src/Classes/OLMinigun.uc b/src/Classes/OLMinigun.uc
@@ -351,7 +351,7 @@ defaultproperties {
 	PickupAmmoCount=50
 	bInstantHit=True
 	bAltInstantHit=True
-	FireOffset=(Y=-5.000000, Z=-4.000000)
+	FireOffset=(Y=-5.000000,Z=-4.000000)
 	shakemag=135.000000
 	shakevert=8.000000
 	AIRating=0.600000
@@ -366,7 +366,7 @@ defaultproperties {
 	InventoryGroup=10
 	PickupMessage="You got the Minigun"
 	ItemName="Minigun"
-	PlayerViewOffset=(X=5.600000, Y=-1.500000, Z=-1.800000)
+	PlayerViewOffset=(X=5.600000,Y=-1.500000,Z=-1.800000)
 	PlayerViewMesh=LodMesh'UnrealI.minigunM'
 	PickupViewMesh=LodMesh'UnrealI.minipick'
 	ThirdPersonMesh=LodMesh'UnrealI.SMini3'
diff --git a/src/Classes/OLRazorjack.uc b/src/Classes/OLRazorjack.uc
@@ -183,7 +183,7 @@ defaultproperties {
 	WeaponDescription="Classification: Skaarj Blade Launcher"
 	AmmoName=Class'UnrealI.RazorAmmo'
 	PickupAmmoCount=15
-	FireOffset=(X=16.000000, Z=-15.000000)
+	FireOffset=(X=16.000000,Z=-15.000000)
 	ProjectileClass=Class'{{package}}.OSRazorBlade'
 	AltProjectileClass=Class'{{package}}.OSRazorBladeAlt'
 	shakemag=120.000000
@@ -196,7 +196,7 @@ defaultproperties {
 	InventoryGroup=7
 	PickupMessage="You got the RazorJack"
 	ItemName="Razorjack"
-	PlayerViewOffset=(X=2.000000, Z=-0.900000)
+	PlayerViewOffset=(X=2.000000,Z=-0.900000)
 	PlayerViewMesh=LodMesh'UnrealI.Razor'
 	BobDamping=0.970000
 	PickupViewMesh=LodMesh'UnrealI.RazPick'
diff --git a/src/Classes/OLRifle.uc b/src/Classes/OLRifle.uc
@@ -312,7 +312,7 @@ defaultproperties {
 	PickupAmmoCount=8
 	bInstantHit=True
 	bAltInstantHit=True
-	FireOffset=(Y=-5.000000, Z=-2.000000)
+	FireOffset=(Y=-5.000000,Z=-2.000000)
 	MyDamageType=shot
 	AltDamageType=Decapitated
 	shakemag=400.000000
@@ -328,7 +328,7 @@ defaultproperties {
 	InventoryGroup=9
 	PickupMessage="You got the Rifle"
 	ItemName="Sniper Rifle"
-	PlayerViewOffset=(X=3.200000, Y=-1.200000, Z=-1.700000)
+	PlayerViewOffset=(X=3.200000,Y=-1.200000,Z=-1.700000)
 	PlayerViewMesh=LodMesh'UnrealI.RifleM'
 	PickupViewMesh=LodMesh'UnrealI.RiPick'
 	ThirdPersonMesh=LodMesh'UnrealI.Rifle3rd'
diff --git a/src/Classes/OLStinger.uc b/src/Classes/OLStinger.uc
@@ -182,7 +182,7 @@ defaultproperties {
 	PickupAmmoCount=40
 	bAltWarnTarget=True
 	bSpecialIcon=False
-	FireOffset=(X=12.000000, Y=-10.000000, Z=-15.000000)
+	FireOffset=(X=12.000000,Y=-10.000000,Z=-15.000000)
 	ProjectileClass=Class'{{package}}.OSStingerProjectile'
 	AltProjectileClass=Class'{{package}}.OSStingerProjectile'
 	shakemag=120.000000
@@ -197,7 +197,7 @@ defaultproperties {
 	InventoryGroup=3
 	PickupMessage="You picked up the Stinger"
 	ItemName="Stinger"
-	PlayerViewOffset=(X=4.200000, Y=-3.000000, Z=-4.000000)
+	PlayerViewOffset=(X=4.200000,Y=-3.000000,Z=-4.000000)
 	PlayerViewMesh=LodMesh'UnrealShare.StingerM'
 	PlayerViewScale=1.700000
 	PickupViewMesh=LodMesh'UnrealShare.StingerPickup'
diff --git a/src/Classes/OLautomag.uc b/src/Classes/OLautomag.uc
@@ -992,13 +992,13 @@ defaultproperties {
 	wepcanreload=True
 	WeaponDescription="Classification: Automatic Magnum"
 	InstFlash=-0.200000
-	InstFog=(X=325.000000, Y=225.000000, Z=95.000000)
+	InstFog=(X=325.000000,Y=225.000000,Z=95.000000)
 	AmmoName=Class'UnrealShare.ShellBox'
 	PickupAmmoCount=20
 	bInstantHit=True
 	bAltInstantHit=True
 	FiringSpeed=1.500000
-	FireOffset=(Y=-10.000000, Z=-4.000000)
+	FireOffset=(Y=-10.000000,Z=-4.000000)
 	MyDamageType=shot
 	shakemag=200.000000
 	shakevert=4.000000
@@ -1012,12 +1012,12 @@ defaultproperties {
 	Misc1Sound=Sound'UnrealShare.flak.Click'
 	Misc2Sound=Sound'UnrealShare.AutoMag.Reload'
 	DeathMessage="%o got gatted by %k's %w."
-	NameColor=(R=200, G=200)
+	NameColor=(R=200,G=200)
 	AutoSwitchPriority=2
 	InventoryGroup=2
 	PickupMessage="You got the AutoMag"
 	ItemName="Automag"
-	PlayerViewOffset=(X=4.800000, Y=-1.700000, Z=-2.700000)
+	PlayerViewOffset=(X=4.800000,Y=-1.700000,Z=-2.700000)
 	PlayerViewMesh=LodMesh'UnrealShare.AutoMagL'
 	PickupViewMesh=LodMesh'UnrealShare.AutoMagPickup'
 	ThirdPersonMesh=LodMesh'UnrealShare.auto3rd'

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Monster Hunt`
	`1`	`+<p align="center"><img src="./resources/Help/MonsterHunt/header.png" /></p>`
`2`	`2`
`3`	`3`	`Monster Hunt is a team based modification for Unreal Tournament comprising three`
`4`	`4`	`new game types, Monster Hunt, Monster Arena, and Monster Defence.`
Original file line number	Diff line number	Diff line change
`@@ -165,8 +165,8 @@ function String FancyName(Pawn Other, optional Bool upperArticle) {`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`function String UppercaseFirst(String S) {`
`168`		`- local String trimmed, c;`
`169`		`- local int i, start;`
	`168`	`+ local String trimmed;`
	`169`	`+ local int i;`
`170`	`170`
`171`	`171`	`for (i = 0; i < Len(S); i++) {`
`172`	`172`	`if (Mid(S, i, 1) != " ") {`