-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #22 from NSHoffman/dev
release/2023-05-01/1.2.1
- Loading branch information
Showing
62 changed files
with
504 additions
and
325 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,6 @@ | ||
| class N7_Bloat extends KFChar.ZombieBloat_STANDARD; | ||
|
|
||
| static simulated function PreCacheMaterials(LevelInfo myLevel) | ||
| { | ||
| myLevel.AddPrecacheMaterial(Combiner'KF_Specimens_Trip_N7.bloat_cmb'); | ||
| myLevel.AddPrecacheMaterial(Combiner'KF_Specimens_Trip_N7.bloat_env_cmb'); | ||
| myLevel.AddPrecacheMaterial(Texture'KF_Specimens_Trip_N7.bloat_diffuse'); | ||
| } | ||
|
|
||
| defaultProperties | ||
| { | ||
| MenuName="N7 Bloat" | ||
| DetachedArmClass=class'N7_SeveredArmBloat' | ||
| DetachedLegClass=class'N7_SeveredLegBloat' | ||
| DetachedHeadClass=class'N7_SeveredHeadBloat' | ||
| Skins(0)=Combiner'KF_Specimens_Trip_N7.bloat_cmb' | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| class N7_Bloat_SAVAGE extends N7_Bloat; | ||
|
|
||
| static simulated function PreCacheMaterials(LevelInfo myLevel) | ||
| { | ||
| myLevel.AddPrecacheMaterial(Combiner'KF_Specimens_Trip_N7.bloat_cmb'); | ||
| myLevel.AddPrecacheMaterial(Combiner'KF_Specimens_Trip_N7.bloat_env_cmb'); | ||
| myLevel.AddPrecacheMaterial(Texture'KF_Specimens_Trip_N7.bloat_diffuse'); | ||
| } | ||
|
|
||
| defaultProperties | ||
| { | ||
| DetachedArmClass=class'N7_SeveredArmBloat' | ||
| DetachedLegClass=class'N7_SeveredLegBloat' | ||
| DetachedHeadClass=class'N7_SeveredHeadBloat' | ||
| Skins(0)=Combiner'KF_Specimens_Trip_N7.bloat_cmb' | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| class N7_Boss_SAVAGE extends N7_Boss; | ||
|
|
||
| /** | ||
| * The whole purpose of overriding the method below | ||
| * is to provide different material sources | ||
| */ | ||
|
|
||
| simulated function CloakBoss() | ||
| { | ||
| local Controller C; | ||
| local int index; | ||
|
|
||
| if (bZapped) | ||
| { | ||
| return; | ||
| } | ||
|
|
||
| if (bSpotted) | ||
| { | ||
| Visibility = 120; | ||
|
|
||
| if (Level.NetMode == NM_DedicatedServer) | ||
| { | ||
| return; | ||
| } | ||
|
|
||
| Skins[0] = Finalblend'KFX.StalkerGlow'; | ||
| Skins[1] = Finalblend'KFX.StalkerGlow'; | ||
| bUnlit = True; | ||
| return; | ||
| } | ||
|
|
||
| Visibility = 1; | ||
| bCloaked = True; | ||
| if (Level.NetMode != NM_Client) | ||
| { | ||
| for (C = Level.ControllerList; C != None; C = C.NextController) | ||
| { | ||
| if (C.bIsPlayer && C.Enemy == self) | ||
| { | ||
| C.Enemy = None; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if (Level.NetMode == NM_DedicatedServer) | ||
| { | ||
| return; | ||
| } | ||
|
|
||
| Skins[0] = Shader'KF_Specimens_Trip_N7.patriarch_invisible_gun'; | ||
| Skins[1] = Shader'KF_Specimens_Trip_N7.patriarch_invisible'; | ||
|
|
||
| if (PlayerShadow != None) | ||
| { | ||
| PlayerShadow.bShadowActive = False; | ||
| } | ||
| Projectors.Remove(0, Projectors.Length); | ||
| bAcceptsProjectors = False; | ||
|
|
||
| if (FRand() < 0.10) | ||
| { | ||
| index = Rand(Level.Game.NumPlayers); | ||
|
|
||
| for (C = Level.ControllerList; C != None; C = C.NextController) | ||
| { | ||
| if (PlayerController(C) != None) | ||
| { | ||
| if (index == 0) | ||
| { | ||
| PlayerController(C).Speech('AUTO', 8, ""); | ||
| break; | ||
| } | ||
| index--; | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| defaultProperties | ||
| { | ||
| DetachedArmClass=class'N7_SeveredArmPatriarch' | ||
| DetachedLegClass=class'N7_SeveredLegPatriarch' | ||
| DetachedHeadClass=class'N7_SeveredHeadPatriarch' | ||
| DetachedSpecialArmClass=class'N7_SeveredRocketArmPatriarch' | ||
| Skins(0)=Combiner'KF_Specimens_Trip_N7.gatling_cmb' | ||
| Skins(1)=Combiner'KF_Specimens_Trip_N7.patriarch_cmb' | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,8 @@ | ||
| class N7_Clot extends KFChar.ZombieClot_STANDARD; | ||
|
|
||
| static simulated function PreCacheMaterials(LevelInfo myLevel) | ||
| { | ||
| myLevel.AddPrecacheMaterial(Combiner'KF_Specimens_Trip_N7.clot_cmb'); | ||
| myLevel.AddPrecacheMaterial(Combiner'KF_Specimens_Trip_N7.clot_env_cmb'); | ||
| myLevel.AddPrecacheMaterial(Texture'KF_Specimens_Trip_N7.clot_diffuse'); | ||
| myLevel.AddPrecacheMaterial(Texture'KF_Specimens_Trip_N7.clot_spec'); | ||
| } | ||
|
|
||
| defaultProperties | ||
| { | ||
| MenuName="N7 Clot" | ||
| GroundSpeed=115.000000 | ||
| WaterSpeed=115.000000 | ||
| DetachedArmClass=class'N7_SeveredArmClot' | ||
| DetachedLegClass=class'N7_SeveredLegClot' | ||
| DetachedHeadClass=class'N7_SeveredHeadClot' | ||
| Skins(0)=Combiner'KF_Specimens_Trip_N7.clot_cmb' | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| class N7_Clot_SAVAGE extends N7_Clot; | ||
|
|
||
| static simulated function PreCacheMaterials(LevelInfo myLevel) | ||
| { | ||
| myLevel.AddPrecacheMaterial(Combiner'KF_Specimens_Trip_N7.clot_cmb'); | ||
| myLevel.AddPrecacheMaterial(Combiner'KF_Specimens_Trip_N7.clot_env_cmb'); | ||
| myLevel.AddPrecacheMaterial(Texture'KF_Specimens_Trip_N7.clot_diffuse'); | ||
| myLevel.AddPrecacheMaterial(Texture'KF_Specimens_Trip_N7.clot_spec'); | ||
| } | ||
|
|
||
| defaultProperties | ||
| { | ||
| DetachedArmClass=class'N7_SeveredArmClot' | ||
| DetachedLegClass=class'N7_SeveredLegClot' | ||
| DetachedHeadClass=class'N7_SeveredHeadClot' | ||
| Skins(0)=Combiner'KF_Specimens_Trip_N7.clot_cmb' | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| class N7_Crawler_SAVAGE extends N7_Crawler; | ||
|
|
||
| static simulated function PreCacheMaterials(LevelInfo myLevel) | ||
| { | ||
| myLevel.AddPrecacheMaterial(Combiner'KF_Specimens_Trip_N7.crawler_cmb'); | ||
| myLevel.AddPrecacheMaterial(Combiner'KF_Specimens_Trip_N7.crawler_env_cmb'); | ||
| myLevel.AddPrecacheMaterial(Texture'KF_Specimens_Trip_N7.crawler_diff'); | ||
| } | ||
|
|
||
| defaultProperties | ||
| { | ||
| ControllerClass=class'N7_CrawlerController' | ||
| DetachedArmClass=class'N7_SeveredArmCrawler' | ||
| DetachedLegClass=class'N7_SeveredLegCrawler' | ||
| DetachedHeadClass=class'N7_SeveredHeadCrawler' | ||
| Skins(0)=Combiner'KF_Specimens_Trip_N7.crawler_cmb' | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -37,5 +37,5 @@ simulated function Destroyed() { | |
| } | ||
| } | ||
|
|
||
| defaultproperties | ||
| defaultProperties | ||
| {} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| class N7_Fleshpound_SAVAGE extends N7_Fleshpound; | ||
|
|
||
| static simulated function PreCacheMaterials(LevelInfo myLevel) | ||
| { | ||
| myLevel.AddPrecacheMaterial(Combiner'KF_Specimens_Trip_N7.fleshpound_cmb'); | ||
| myLevel.AddPrecacheMaterial(Combiner'KF_Specimens_Trip_N7.fleshpound_env_cmb'); | ||
| myLevel.AddPrecacheMaterial(Texture'KF_Specimens_Trip_N7.fleshpound_diff'); | ||
| } | ||
|
|
||
| defaultProperties | ||
| { | ||
| DetachedArmClass=class'N7_SeveredArmPound' | ||
| DetachedLegClass=class'N7_SeveredLegPound' | ||
| DetachedHeadClass=class'N7_SeveredHeadPound' | ||
| Skins(0)=Combiner'KF_Specimens_Trip_N7.fleshpound_cmb' | ||
| } |
Oops, something went wrong.