diff --git a/Readme.md b/Readme.md index e164605..33e474c 100644 --- a/Readme.md +++ b/Readme.md @@ -3,8 +3,7 @@ The Unreal 1 counterpart to Doom Tournament. Adds Unreal 1 weapons and items (including dummied out stuff and others). -This mod requires GZDoom g4.3pre-125-g021e548db or later, and runs on top of -Doom Tournament (currently the devel branch is required). +This mod requires GZDoom 4.2.3 or later, and runs on top of Doom Tournament. ## Currently Implemented @@ -74,12 +73,12 @@ Doom Tournament (currently the devel branch is required). ## In progress - - Final polishing + - N/A, this is the 1.0 release. ## Planned - Shifted to a 1.1 update: - - Impaler "slice" animation for melee alt + - Impaler "slice" animation for melee alt. - Alternate flamethrower secondary that behaves more like the Unreal Bible describes (unlit blobs at a rate of 4 per second that catch on fire with explosions/lava/etc). @@ -88,13 +87,4 @@ Doom Tournament (currently the devel branch is required). - Actual Bonesaw? - Implement ASMD behavior described in the Unreal novels (highly destructive green beam that bounces off mirrors and water). - - - RTNP add-on - - Monster pack (someday) - - Map pack (maybe? who knows) - -## Known bugs - - - The Quadshot will visibly load 4 shells even when there's less available, - this is a limitation of the animation and I'll have to make alternate ones - for it eventually. + - Redo Quadshot animations (including partial reloads). diff --git a/brightmaps/JAllMap1_a00.png b/brightmaps/JAllMap1_a00.png deleted file mode 100644 index 6ca149b..0000000 Binary files a/brightmaps/JAllMap1_a00.png and /dev/null differ diff --git a/brightmaps/JAllMap1_a01.png b/brightmaps/JAllMap1_a01.png deleted file mode 100644 index bc36315..0000000 Binary files a/brightmaps/JAllMap1_a01.png and /dev/null differ diff --git a/brightmaps/JAllMap1_a02.png b/brightmaps/JAllMap1_a02.png deleted file mode 100644 index 3b2eb8b..0000000 Binary files a/brightmaps/JAllMap1_a02.png and /dev/null differ diff --git a/brightmaps/JAllMap1_a03.png b/brightmaps/JAllMap1_a03.png deleted file mode 100644 index 633823d..0000000 Binary files a/brightmaps/JAllMap1_a03.png and /dev/null differ diff --git a/brightmaps/JFlashl1.png b/brightmaps/JFlashl1.png deleted file mode 100644 index f1491ab..0000000 Binary files a/brightmaps/JFlashl1.png and /dev/null differ diff --git a/brightmaps/JTranslator1.png b/brightmaps/JTranslator1.png new file mode 100644 index 0000000..2a6e744 Binary files /dev/null and b/brightmaps/JTranslator1.png differ diff --git a/gldefs.txt b/gldefs.txt index e69a236..fdb3d28 100644 --- a/gldefs.txt +++ b/gldefs.txt @@ -440,16 +440,9 @@ Object StarterImpalerBolt Frame "PBLT" { light "IBOLTLIGHT" } } -PointLight UCOMPLIGHT -{ - Color 0.3 1.0 0.2 - Size 12 - Offset 0 8 0 - Attenuate 1 -} Object UAllMap { - Frame "PMAP" { light "UCOMPLIGHT" } + Frame "TRNS" { light "UTCOMPLIGHT" } } // Shaders / Brightmaps @@ -538,8 +531,11 @@ Brightmap Texture "models/JEightB1.png" } HardwareShader Texture "models/JFlashl1.png" { - Shader "shaders/glsl/AmbientGlow_Brightmapped.fp" - Texture "brighttex" "brightmaps/JFlashl1.png" + Shader "shaders/glsl/AmbientGlow.fp" +} +HardwareShader Texture "models/JBigFlash1.png" +{ + Shader "shaders/glsl/AmbientGlow.fp" } HardwareShader Texture "models/JImpale1_.png" { @@ -858,38 +854,12 @@ HardwareShader Texture "models/FlametFX.png" { Shader "shaders/glsl/FlametFX.fp" } -HardwareShader Texture "models/shield.png" -{ - Shader "shaders/glsl/AmbientGlow.fp" -} -HardwareShader Texture "models/JAllMap1_a00.png" +HardwareShader Texture "models/JTranslator1.png" { Shader "shaders/glsl/AmbientGlow_Brightmapped.fp" - Texture "brighttex" "brightmaps/JAllMap1_a00.png" -} -HardwareShader Texture "models/JAllMap1_a01.png" -{ - Shader "shaders/glsl/AmbientGlow_Brightmapped.fp" - Texture "brighttex" "brightmaps/JAllMap1_a01.png" -} -HardwareShader Texture "models/JAllMap1_a02.png" -{ - Shader "shaders/glsl/AmbientGlow_Brightmapped.fp" - Texture "brighttex" "brightmaps/JAllMap1_a02.png" -} -HardwareShader Texture "models/JAllMap1_a03.png" -{ - Shader "shaders/glsl/AmbientGlow_Brightmapped.fp" - Texture "brighttex" "brightmaps/JAllMap1_a03.png" -} -HardwareShader Texture "models/JAllMap2.png" -{ - Shader "shaders/glsl/AmbientGlow.fp" -} -HardwareShader Texture "models/JAllMap3.png" -{ - Shader "shaders/glsl/AmbientGlow.fp" + Texture "brighttex" "brightmaps/JTranslator1.png" } + // PP shaders HardwareShader PostProcess scene { diff --git a/graphics/crosshairs/XHAIRB10.png b/graphics/crosshairs/XHAIRB10.png new file mode 100644 index 0000000..94501de Binary files /dev/null and b/graphics/crosshairs/XHAIRB10.png differ diff --git a/graphics/crosshairs/XHAIRB11.png b/graphics/crosshairs/XHAIRB11.png new file mode 100644 index 0000000..8b516f6 Binary files /dev/null and b/graphics/crosshairs/XHAIRB11.png differ diff --git a/graphics/crosshairs/XHAIRB12.png b/graphics/crosshairs/XHAIRB12.png new file mode 100644 index 0000000..ff42a70 Binary files /dev/null and b/graphics/crosshairs/XHAIRB12.png differ diff --git a/graphics/crosshairs/XHAIRB8.png b/graphics/crosshairs/XHAIRB8.png new file mode 100644 index 0000000..61b6129 Binary files /dev/null and b/graphics/crosshairs/XHAIRB8.png differ diff --git a/graphics/crosshairs/XHAIRB9.png b/graphics/crosshairs/XHAIRB9.png new file mode 100644 index 0000000..54ee6af Binary files /dev/null and b/graphics/crosshairs/XHAIRB9.png differ diff --git a/language.txt b/language.txt index 14f20f3..f2d84fb 100644 --- a/language.txt +++ b/language.txt @@ -213,7 +213,6 @@ M_MSNOFLOOR = "Cannot deploy Sentry at this height."; M_MSNOFLAT = "Cannot deploy Sentry on such a steep slope."; M_NSTOOFAR = "Cannot recall Sentry from this distance."; M_FFNOROOM = "No room to activate Force Field."; -M_ISELECT = "%s selected."; S_MINHUD = "Health %d Score %d Ammo %d"; S_MINHUD2 = "Health %d Score %d Ammo %d/%d"; /* Menus */ @@ -463,7 +462,6 @@ M_MSNOFLOOR = "No se puede colocar la Torreta a esta altura."; M_MSNOFLAT = "No se puede colocar la Torreta en una cuesta tan inclinada."; M_NSTOOFAR = "No se puede retirar la Torreta desde esta distancia."; M_FFNOROOM = "No hay espacio para activar el Campo de Fuerza."; -M_ISELECT = "Seleccionado %s."; S_MINHUD = "Salud %d Puntuación %d Munición %d"; S_MINHUD2 = "Salud %d Puntuación %d Munición %d/%d"; /* Menus */ diff --git a/modeldef.asmd b/modeldef.asmd index 33ec3aa..c6ccc47 100644 --- a/modeldef.asmd +++ b/modeldef.asmd @@ -69,22 +69,6 @@ Model "ASMDBall" FrameIndex TAZB A 0 0 } -/*Model "ASMDExpl" -{ - Path "models" - Model 0 "TazerExpl_d.3d" - Skin 0 "AsmdBeam.png" - Scale 0.8 0.8 0.96 - DONTCULLBACKFACES - - FrameIndex TAZB A 0 0 - FrameIndex TAZB B 0 1 - FrameIndex TAZB C 0 2 - FrameIndex TAZB D 0 3 - FrameIndex TAZB E 0 4 - FrameIndex TAZB F 0 5 -}*/ - Model "ASMDBeamRing" { Path "models" diff --git a/modeldef.umisc b/modeldef.umisc index 3e4a9a6..7c98c54 100644 --- a/modeldef.umisc +++ b/modeldef.umisc @@ -809,11 +809,11 @@ Model "UAllMap" AngleOffset 90 SurfaceSkin 0 0 "JAllMap1_a00.png" - FrameIndex MDET A 0 0 + FrameIndex TRNS A 0 0 SurfaceSkin 0 0 "JAllMap1_a01.png" - FrameIndex MDET B 0 0 + FrameIndex TRNS B 0 0 SurfaceSkin 0 0 "JAllMap1_a02.png" - FrameIndex MDET C 0 0 + FrameIndex TRNS C 0 0 SurfaceSkin 0 0 "JAllMap1_a03.png" - FrameIndex MDET D 0 0 + FrameIndex TRNS D 0 0 } diff --git a/models/BigFlash_a.3d b/models/BigFlash_a.3d new file mode 100644 index 0000000..41f3c72 Binary files /dev/null and b/models/BigFlash_a.3d differ diff --git a/models/BigFlash_d.3d b/models/BigFlash_d.3d new file mode 100644 index 0000000..abb3c4a Binary files /dev/null and b/models/BigFlash_d.3d differ diff --git a/models/CheapComp_a.3d b/models/CheapComp_a.3d deleted file mode 100644 index d8ecb79..0000000 Binary files a/models/CheapComp_a.3d and /dev/null differ diff --git a/models/CheapComp_d.3d b/models/CheapComp_d.3d deleted file mode 100644 index 346b8cc..0000000 Binary files a/models/CheapComp_d.3d and /dev/null differ diff --git a/models/JAllMap1_a00.png b/models/JAllMap1_a00.png deleted file mode 100644 index c96c445..0000000 Binary files a/models/JAllMap1_a00.png and /dev/null differ diff --git a/models/JAllMap1_a01.png b/models/JAllMap1_a01.png deleted file mode 100644 index 251643e..0000000 Binary files a/models/JAllMap1_a01.png and /dev/null differ diff --git a/models/JAllMap1_a02.png b/models/JAllMap1_a02.png deleted file mode 100644 index acfd19e..0000000 Binary files a/models/JAllMap1_a02.png and /dev/null differ diff --git a/models/JAllMap1_a03.png b/models/JAllMap1_a03.png deleted file mode 100644 index 8276767..0000000 Binary files a/models/JAllMap1_a03.png and /dev/null differ diff --git a/models/JAllMap2.png b/models/JAllMap2.png deleted file mode 100644 index fb1c329..0000000 Binary files a/models/JAllMap2.png and /dev/null differ diff --git a/models/JAllMap3.png b/models/JAllMap3.png deleted file mode 100644 index dc4674b..0000000 Binary files a/models/JAllMap3.png and /dev/null differ diff --git a/models/JBigFlash1.png b/models/JBigFlash1.png new file mode 100644 index 0000000..cebfde3 Binary files /dev/null and b/models/JBigFlash1.png differ diff --git a/models/JTranslator1.png b/models/JTranslator1.png new file mode 100644 index 0000000..5b00838 Binary files /dev/null and b/models/JTranslator1.png differ diff --git a/models/Ringex_a.3d b/models/Ringex_a.3d deleted file mode 100644 index 946f4ca..0000000 Binary files a/models/Ringex_a.3d and /dev/null differ diff --git a/models/Ringex_d.3d b/models/Ringex_d.3d deleted file mode 100644 index e2c6f41..0000000 Binary files a/models/Ringex_d.3d and /dev/null differ diff --git a/models/TazerExpl_a.3d b/models/TazerExpl_a.3d deleted file mode 100644 index 0bfdff3..0000000 Binary files a/models/TazerExpl_a.3d and /dev/null differ diff --git a/models/TazerExpl_d.3d b/models/TazerExpl_d.3d deleted file mode 100644 index 0a9da03..0000000 Binary files a/models/TazerExpl_d.3d and /dev/null differ diff --git a/models/TranslatorMesh_a.3d b/models/TranslatorMesh_a.3d new file mode 100644 index 0000000..1e2dddc Binary files /dev/null and b/models/TranslatorMesh_a.3d differ diff --git a/models/TranslatorMesh_d.3d b/models/TranslatorMesh_d.3d new file mode 100644 index 0000000..b3385b7 Binary files /dev/null and b/models/TranslatorMesh_d.3d differ diff --git a/models/shield.png b/models/shield.png deleted file mode 100644 index 94f62ec..0000000 Binary files a/models/shield.png and /dev/null differ diff --git a/models/ubonus_a.3d b/models/ubonus_a.3d deleted file mode 100644 index 3330487..0000000 Binary files a/models/ubonus_a.3d and /dev/null differ diff --git a/models/ubonus_d.3d b/models/ubonus_d.3d deleted file mode 100644 index 57d5df5..0000000 Binary files a/models/ubonus_d.3d and /dev/null differ diff --git a/sndinfo.txt b/sndinfo.txt index fe1cf86..117c168 100644 --- a/sndinfo.txt +++ b/sndinfo.txt @@ -218,6 +218,7 @@ voice/activate voicesnd univis/toggle invisibl +lite/pickup fshlite1 lite/off fshlite2 scuba/stop scubada1 diff --git a/sounds/FSHLITE1.ogg b/sounds/FSHLITE1.ogg new file mode 100644 index 0000000..0a88291 Binary files /dev/null and b/sounds/FSHLITE1.ogg differ diff --git a/sprites/flak/FEXPA0.png b/sprites/flak/FEXPA0.png deleted file mode 100644 index 5ccfcc1..0000000 Binary files a/sprites/flak/FEXPA0.png and /dev/null differ diff --git a/sprites/flak/FEXPB0.png b/sprites/flak/FEXPB0.png deleted file mode 100644 index ec63a0d..0000000 Binary files a/sprites/flak/FEXPB0.png and /dev/null differ diff --git a/sprites/flak/FEXPC0.png b/sprites/flak/FEXPC0.png deleted file mode 100644 index 28d2e0e..0000000 Binary files a/sprites/flak/FEXPC0.png and /dev/null differ diff --git a/sprites/flak/FEXPD0.png b/sprites/flak/FEXPD0.png deleted file mode 100644 index 1de21d1..0000000 Binary files a/sprites/flak/FEXPD0.png and /dev/null differ diff --git a/sprites/flak/FEXPE0.png b/sprites/flak/FEXPE0.png deleted file mode 100644 index 8f372f9..0000000 Binary files a/sprites/flak/FEXPE0.png and /dev/null differ diff --git a/sprites/flak/FEXPF0.png b/sprites/flak/FEXPF0.png deleted file mode 100644 index 6f65056..0000000 Binary files a/sprites/flak/FEXPF0.png and /dev/null differ diff --git a/sprites/flak/FEXPG0.png b/sprites/flak/FEXPG0.png deleted file mode 100644 index 69c3ac8..0000000 Binary files a/sprites/flak/FEXPG0.png and /dev/null differ diff --git a/sprites/flak/FEXPH0.png b/sprites/flak/FEXPH0.png deleted file mode 100644 index b6d9481..0000000 Binary files a/sprites/flak/FEXPH0.png and /dev/null differ diff --git a/sprites/flak/FEXPI0.png b/sprites/flak/FEXPI0.png deleted file mode 100644 index a97bcfb..0000000 Binary files a/sprites/flak/FEXPI0.png and /dev/null differ diff --git a/sprites/flak/FEXPJ0.png b/sprites/flak/FEXPJ0.png deleted file mode 100644 index d89924c..0000000 Binary files a/sprites/flak/FEXPJ0.png and /dev/null differ diff --git a/textures.asmd b/textures.asmd index 99c4de2..0b6a272 100644 --- a/textures.asmd +++ b/textures.asmd @@ -1,2 +1 @@ Sprite "TAZBA0",1,1{} -Sprite "RNGXA0",1,1{} \ No newline at end of file diff --git a/xhairs.txt b/xhairs.txt new file mode 100644 index 0000000..e7312bd --- /dev/null +++ b/xhairs.txt @@ -0,0 +1,5 @@ +8 "Unreal Crosshair 1" +9 "Unreal Crosshair 2" +10 "Unreal Crosshair 3" +11 "Unreal Crosshair 4" +12 "Unreal Crosshair 5" diff --git a/zscript.txt b/zscript.txt index 695c62e..f2fd195 100644 --- a/zscript.txt +++ b/zscript.txt @@ -1,4 +1,4 @@ -version "4.3" +version "4.2.2" #include "zscript/unrealcommon.zsc" #include "zscript/dispersionpistol.zsc" diff --git a/zscript/gatling.zsc b/zscript/gatling.zsc index 71de0bf..81a464c 100644 --- a/zscript/gatling.zsc +++ b/zscript/gatling.zsc @@ -169,7 +169,7 @@ Class SMiniGun : UnrealWeapon if ( weap.Ammo1.Amount <= 0 ) return; if ( !bAlt && !weap.DepleteAmmo(weap.bAltFire,true,1) ) return; invoker.FireEffect(); - UTMainHandler.DoFlash(self,Color(32,0,0,255),1); + UTMainHandler.DoFlash(self,Color(32,255,255,0),1); A_QuakeEx(2,2,2,bAlt?5:3,0,1,"",QF_RELATIVE|QF_SCALEDOWN,rollintensity:0.12); A_PlaySound(bAlt?"smini/altfire":"smini/fire",CHAN_WEAPON); A_AlertMonsters(); diff --git a/zscript/razorjack.zsc b/zscript/razorjack.zsc index 73062eb..71b25ae 100644 --- a/zscript/razorjack.zsc +++ b/zscript/razorjack.zsc @@ -164,6 +164,8 @@ Class RazorBlade : Actor } Goto Spawn; Death: + TNT1 A 0 A_RazorHit(); + XDeath: TNT1 A 1 A_StopSound(CHAN_VOICE); Stop; } diff --git a/zscript/uarmoritems.zsc b/zscript/uarmoritems.zsc index 138bbae..652c862 100644 --- a/zscript/uarmoritems.zsc +++ b/zscript/uarmoritems.zsc @@ -1,31 +1,8 @@ Class UnrealArmor : UTArmor { - int priority; - - Property AbsorptionPriority : priority; - Default { -INVENTORY.ALWAYSPICKUP; - UnrealArmor.AbsorptionPriority 0; - } - - override void AttachToOwner( Actor other ) - { - Super.AttachToOwner(other); - // find last armor that's better than us - Inventory found = null; - for ( Inventory i=other.Inv; i; i=i.Inv ) - { - if ( !(i is 'UnrealArmor') || (i == self) || (UnrealArmor(i).priority < priority) ) continue; - found = i; - } - if ( !found ) return; - // place ourselves right after it - Inventory saved = found.Inv; - found.Inv = self; - other.Inv = Inv; - Inv = saved; } } @@ -38,7 +15,7 @@ Class UArmor : UnrealArmor Inventory.MaxAmount 100; Inventory.InterHubAmount 100; UTArmor.ArmorAbsorption 90; - UnrealArmor.AbsorptionPriority 7; + UTArmor.AbsorptionPriority 7; Inventory.PickupMessage "$I_UARMOR"; Inventory.PickupSound "misc/u1armor"; Inventory.Icon "I_Armor"; @@ -60,7 +37,7 @@ Class AsbestosSuit : UnrealArmor Inventory.MaxAmount 50; Inventory.InterHubAmount 50; UTArmor.ArmorAbsorption 50; - UnrealArmor.AbsorptionPriority 6; + UTArmor.AbsorptionPriority 6; Inventory.PickupMessage "$I_ASBSUIT"; Inventory.PickupSound "misc/suit"; Inventory.Icon "I_Suit"; @@ -97,7 +74,7 @@ Class ToxinSuit : UnrealArmor Inventory.MaxAmount 50; Inventory.InterHubAmount 50; UTArmor.ArmorAbsorption 50; - UnrealArmor.AbsorptionPriority 6; + UTArmor.AbsorptionPriority 6; Inventory.PickupMessage "$I_TOXSUIT"; Inventory.PickupSound "misc/suit"; Inventory.Icon "I_TSuit"; @@ -134,7 +111,7 @@ Class KevlarSuit : UnrealArmor Inventory.MaxAmount 100; Inventory.InterHubAmount 100; UTArmor.ArmorAbsorption 80; - UnrealArmor.AbsorptionPriority 6; + UTArmor.AbsorptionPriority 6; Inventory.PickupMessage "$I_KEVSUIT"; Inventory.PickupSound "misc/suit"; Inventory.Icon "I_Kevlar"; @@ -184,7 +161,7 @@ Class ShieldBelt : UnrealArmor Inventory.MaxAmount 100; Inventory.InterHubAmount 100; UTArmor.ArmorAbsorption 100; - UnrealArmor.AbsorptionPriority 10; + UTArmor.AbsorptionPriority 10; Inventory.PickupMessage "$I_SHIELDBELT"; Inventory.PickupSound "belt/pickup"; Inventory.RespawnTics 2100; @@ -256,7 +233,7 @@ Class PowerShield : UnrealArmor Inventory.MaxAmount 200; Inventory.InterHubAmount 200; UTArmor.ArmorAbsorption 100; - UnrealArmor.AbsorptionPriority 11; // wow dude + UTArmor.AbsorptionPriority 11; // wow dude Inventory.PickupMessage "$I_POWERSHIELD"; Inventory.PickupSound "sbelt/pickup"; Inventory.RespawnTics 3500; @@ -327,7 +304,7 @@ Class UArmorBonus : UArmor Inventory.MaxAmount 200; Inventory.InterHubAmount 200; UTArmor.ArmorAbsorption 25; - UnrealArmor.AbsorptionPriority 1; + UTArmor.AbsorptionPriority 1; Inventory.PickupMessage "$I_ARMORBONUS"; Inventory.PickupSound "misc/u1armor"; Inventory.Icon "I_Bonus"; diff --git a/zscript/upowerups.zsc b/zscript/upowerups.zsc index 146ebe4..b80b1a2 100644 --- a/zscript/upowerups.zsc +++ b/zscript/upowerups.zsc @@ -347,7 +347,7 @@ Class UAllMap : MapRevealer States { Spawn: - MDET ABCDCB 6; + TRNS ABCDCB 6; Loop; } } diff --git a/zscript/utranslocator.zsc b/zscript/utranslocator.zsc index 1a1105e..0d72608 100644 --- a/zscript/utranslocator.zsc +++ b/zscript/utranslocator.zsc @@ -202,6 +202,15 @@ Class UTranslocator : UnrealWeapon invoker.FireEffect(); // squeeze down new z if ceiling is in the way if ( (newpos.z+height > moduleceilingz) ) newpos.z = max(modulefloorz,moduleceilingz-height); + // temporarily disable telefragging for all allies + bool oldnotele[MAXPLAYERS]; + for ( int i=0; i