diff --git a/assets/japro/effects/atst/shot.efx b/assets/japro/effects/atst/shot.efx new file mode 100644 index 0000000000..ba9c645f7a --- /dev/null +++ b/assets/japro/effects/atst/shot.efx @@ -0,0 +1,84 @@ +repeatDelay 300 + +Line +{ + flags useAlpha + + origin 100 0 0 + + origin2 -100 0 0 + + rgb + { + start 1 0.8 0.8 + } + + size + { + start 8 + } + + shaders + [ + gfx/effects/bryar_blob + ] +} + +Line +{ + origin 120 0 0 + + origin2 -120 0 0 + + rgb + { + start 0.898 0.698 0 1 0.698 0.2 + } + + size + { + start 15 + } + + shaders + [ + gfx/effects/whiteGlow + ] +} + +Particle +{ + spawnFlags rgbComponentInterpolation + + count 2 + + rgb + { + start 1 0.4392 0 + } + + size + { + start 7.3 + } + + shaders + [ + gfx/effects/whiteGlow + ] +} + +Light +{ + rgb + { + start 0.898 0.698 0 1 0.698 0.2 + } + + size + { + start 120 + end 12 + flags linear + } +} diff --git a/assets/japro/effects/atst/shot_red.efx b/assets/japro/effects/atst/shot_red.efx new file mode 100644 index 0000000000..846d19daed --- /dev/null +++ b/assets/japro/effects/atst/shot_red.efx @@ -0,0 +1,57 @@ +repeatDelay 50 + +Line +{ + flags useAlpha + + origin 100 0 0 + + origin2 -100 0 0 + + size + { + start 8 + } + + shaders + [ + gfx/effects/blaster_blob + ] +} + +Line +{ + origin 120 0 0 + + origin2 -120 0 0 + + rgb + { + start 1 0.3686 0.1843 + } + + size + { + start 15 + } + + shaders + [ + gfx/effects/whiteGlow + ] +} + +Light +{ + rgb + { + start 0.902 0.4 0.102 1 0.102 0.102 + } + + size + { + start 120 + end 12 + flags linear + } +} diff --git a/assets/japro/effects/atst/side_alt_explosion.efx b/assets/japro/effects/atst/side_alt_explosion.efx new file mode 100644 index 0000000000..9301565dc4 --- /dev/null +++ b/assets/japro/effects/atst/side_alt_explosion.efx @@ -0,0 +1,241 @@ +repeatDelay 300 + +Particle +{ + name OrangeGlow + + flags setShaderTime + + count 9 + + life 1300 + + delay 0 200 + + origin 4 -40 -40 30 40 40 + + rotation 0 360 + + rotationDelta -2 2 + + velocity 5 -10 -10 10 10 10 + + size + { + start 12 20 + end 60 75 + parm 5 25 + flags linear clamp + } + + shaders + [ + gfx/exp/slower_rocket_explosion + gfx/exp/rocket_explosion + gfx/exp/explosion1 + ] +} + +Particle +{ + name OrangeGlow2 + + life 700 2000 + + delay 0 150 + + origin 0 -20 -20 5 20 20 + + rotation -180 180 + + rotationDelta -1 1 + + velocity 5 -5 -5 10 5 5 + + rgb + { + start 1 0.9725 0.6235 1 0.8353 0.4902 + end 0.502 0 0 0.9451 0.4078 0.01176 + flags linear + } + + alpha + { + end 0 + parm 70 85 + flags linear nonlinear + } + + size + { + start 10 20 + end 55 70 + flags linear + } + + shaders + [ + gfx/misc/steam + gfx/misc/steam2 + ] +} + +Particle +{ + name LingeringSmoke + + spawnFlags rgbComponentInterpolation + + count 4 + + life 1500 2500 + + delay 300 + + origin 0 -25 -25 20 25 25 + + rotation 0 360 + + rotationDelta -10 10 + + velocity 0 -20 -20 10 20 20 + + acceleration -4 -8 -8 4 8 8 + + gravity 3 25 + + rgb + { + start 0.9882 0.9098 0.7882 1 1 0.8078 + } + + alpha + { + end 0 + parm 50 70 + flags nonlinear + } + + size + { + start 5 10 + end 35 55 + flags linear + } + + shaders + [ + gfx/misc/steam + ] +} + +Light +{ + name Flash + + life 950 + + alpha + { + end 0 + flags random linear + } + + size + { + start 350 + end 100 + flags linear + } +} + +Particle +{ + name Dust + + flags useAlpha + + spawnFlags evenDistribution + + count 3 + + life 900 1400 + + delay 250 500 + + origin 5 -25 -25 15 25 25 + + rotation -180 180 + + rotationDelta -3 3 + + velocity 20 -20 -20 40 20 20 + + acceleration -5 -5 -5 5 5 5 + + gravity -50 -30 + + rgb + { + start 1 1 0.4353 0.9451 0.4078 0.01176 + } + + alpha + { + end 0 + parm 50 70 + flags linear nonlinear + } + + size + { + start 1 6 + end 30 50 + flags linear + } + + shaders + [ + gfx/misc/dotfill_a + ] +} + +CameraShake +{ + name Shake + + life 500 800 + + intensity 1 2 + + radius 300 400 +} + +Sound +{ + name Boom + + count 2 + + sounds + [ + sound/weapons/rocket/hit_wall.wav + ] +} + +Decal +{ + count 2 3 + + rotation 0 360 + + size + { + start 40 50 + } + + shaders + [ + gfx/damage/burnmark4 + ] +} diff --git a/assets/japro/effects/atst/side_alt_explosion2.efx b/assets/japro/effects/atst/side_alt_explosion2.efx new file mode 100644 index 0000000000..9301565dc4 --- /dev/null +++ b/assets/japro/effects/atst/side_alt_explosion2.efx @@ -0,0 +1,241 @@ +repeatDelay 300 + +Particle +{ + name OrangeGlow + + flags setShaderTime + + count 9 + + life 1300 + + delay 0 200 + + origin 4 -40 -40 30 40 40 + + rotation 0 360 + + rotationDelta -2 2 + + velocity 5 -10 -10 10 10 10 + + size + { + start 12 20 + end 60 75 + parm 5 25 + flags linear clamp + } + + shaders + [ + gfx/exp/slower_rocket_explosion + gfx/exp/rocket_explosion + gfx/exp/explosion1 + ] +} + +Particle +{ + name OrangeGlow2 + + life 700 2000 + + delay 0 150 + + origin 0 -20 -20 5 20 20 + + rotation -180 180 + + rotationDelta -1 1 + + velocity 5 -5 -5 10 5 5 + + rgb + { + start 1 0.9725 0.6235 1 0.8353 0.4902 + end 0.502 0 0 0.9451 0.4078 0.01176 + flags linear + } + + alpha + { + end 0 + parm 70 85 + flags linear nonlinear + } + + size + { + start 10 20 + end 55 70 + flags linear + } + + shaders + [ + gfx/misc/steam + gfx/misc/steam2 + ] +} + +Particle +{ + name LingeringSmoke + + spawnFlags rgbComponentInterpolation + + count 4 + + life 1500 2500 + + delay 300 + + origin 0 -25 -25 20 25 25 + + rotation 0 360 + + rotationDelta -10 10 + + velocity 0 -20 -20 10 20 20 + + acceleration -4 -8 -8 4 8 8 + + gravity 3 25 + + rgb + { + start 0.9882 0.9098 0.7882 1 1 0.8078 + } + + alpha + { + end 0 + parm 50 70 + flags nonlinear + } + + size + { + start 5 10 + end 35 55 + flags linear + } + + shaders + [ + gfx/misc/steam + ] +} + +Light +{ + name Flash + + life 950 + + alpha + { + end 0 + flags random linear + } + + size + { + start 350 + end 100 + flags linear + } +} + +Particle +{ + name Dust + + flags useAlpha + + spawnFlags evenDistribution + + count 3 + + life 900 1400 + + delay 250 500 + + origin 5 -25 -25 15 25 25 + + rotation -180 180 + + rotationDelta -3 3 + + velocity 20 -20 -20 40 20 20 + + acceleration -5 -5 -5 5 5 5 + + gravity -50 -30 + + rgb + { + start 1 1 0.4353 0.9451 0.4078 0.01176 + } + + alpha + { + end 0 + parm 50 70 + flags linear nonlinear + } + + size + { + start 1 6 + end 30 50 + flags linear + } + + shaders + [ + gfx/misc/dotfill_a + ] +} + +CameraShake +{ + name Shake + + life 500 800 + + intensity 1 2 + + radius 300 400 +} + +Sound +{ + name Boom + + count 2 + + sounds + [ + sound/weapons/rocket/hit_wall.wav + ] +} + +Decal +{ + count 2 3 + + rotation 0 360 + + size + { + start 40 50 + } + + shaders + [ + gfx/damage/burnmark4 + ] +} diff --git a/assets/japro/effects/atst/wall_impact.efx b/assets/japro/effects/atst/wall_impact.efx new file mode 100644 index 0000000000..0e5797d8e0 --- /dev/null +++ b/assets/japro/effects/atst/wall_impact.efx @@ -0,0 +1,139 @@ +repeatDelay 300 + +Line +{ + count 4 8 + + life 100 200 + + origin2 16 -20 -20 24 20 20 + + alpha + { + start 0.25 1 + end 0 + flags linear + } + + size + { + start 0.8 1.2 + } + + shaders + [ + gfx/misc/spark + gfx/misc/spark2 + ] +} + +Tail +{ + flags usePhysics + + count 6 10 + + life 700 1100 + + bounce 0.25 0.5 + + velocity 120 -110 -110 280 110 110 + + gravity -450 -650 + + size + { + start 0.5 0.9 + } + + length + { + start 8 14 + end 0.1 1 + flags linear + } + + shaders + [ + gfx/misc/spark + ] +} + +Particle +{ + count 4 6 + + life 900 1000 + + velocity 8 -12 -12 16 12 12 + + gravity 12 24 + + alpha + { + start 0.2 0.4 + end 0 + flags linear + } + + size + { + start 8 24 + end 16 32 + flags linear + } + + shaders + [ + gfx/misc/steam + ] +} + +FxRunner +{ + count 1 2 + + delay 0 100 +} + +Decal +{ + cullrange 750 + + size + { + start 8 12 + } + + shaders + [ + gfx/damage/burnmark4 + ] +} + +Sound +{ + cullrange 750 + + sounds + [ + sound/weapons/emplaced/hit_wall.wav + ] +} + +Light +{ + life 350 + + rgb + { + start 1 0.102 0.102 0.898 0.698 0 + } + + size + { + start 120 + end 12 + flags linear + } +} diff --git a/assets/japro/effects/blaster/shot.efx b/assets/japro/effects/blaster/shot.efx new file mode 100644 index 0000000000..f74442ecf6 --- /dev/null +++ b/assets/japro/effects/blaster/shot.efx @@ -0,0 +1,89 @@ +repeatDelay 300 + +Line +{ + flags useAlpha + + origin 8 0 0 + + origin2 -80 0 0 + + alpha + { + start 0.6 0.7 + } + + size + { + start 1.4 1.6 + } + + shaders + [ + gfx/effects/blaster_blob + ] +} + +Line +{ + origin 16 0 0 + + origin2 -90 0 0 + + rgb + { + start 0.7 0 0 0.8 0.2 0.2 + } + + alpha + { + start 0.8 1 + } + + size + { + start 4 5 + } + + shaders + [ + gfx/effects/whiteGlow + ] +} + +Particle +{ + origin -5 0 0 + + rgb + { + start 0.7 0 0 0.9 0.15 0.15 + } + + size + { + start 1.6 1.8 + } + + shaders + [ + gfx/effects/whiteGlow + ] +} + +Light +{ + life 30 + + rgb + { + start 1 0.102 0.102 + } + + size + { + start 85 + end 8 + flags linear + } +} diff --git a/assets/japro/effects/blaster/wall_impact.efx b/assets/japro/effects/blaster/wall_impact.efx new file mode 100644 index 0000000000..c3e9ce1d57 --- /dev/null +++ b/assets/japro/effects/blaster/wall_impact.efx @@ -0,0 +1,53 @@ +repeatDelay 785 + +FxRunner +{ + cullrange 1000 + + playfx + [ + blaster/sparks + ] +} + +Decal +{ + cullrange 1200 + + size + { + start 5.5 7 + } + + shaders + [ + gfx/damage/burnmark4 + ] +} + +Sound +{ + cullrange 750 + + sounds + [ + sound/weapons/blaster/hit_wall.wav + ] +} + +Light +{ + life 250 + + rgb + { + start 1 0.102 0.102 + } + + size + { + start 85 + end 8 + flags linear + } +} diff --git a/assets/japro/effects/bowcaster/explosion.efx b/assets/japro/effects/bowcaster/explosion.efx new file mode 100644 index 0000000000..5b6970cc1b --- /dev/null +++ b/assets/japro/effects/bowcaster/explosion.efx @@ -0,0 +1,126 @@ +repeatDelay 300 + +Decal +{ + rotation -180 180 + + size + { + start 13 16 + } + + shaders + [ + gfx/damage/burnmark4 + ] +} + +OrientedParticle +{ + flags setShaderTime + + life 350 + + rotation -45 + + size + { + start 4 14 + end 16 30 + flags linear + } + + shaders + [ + gfx/exp/wookie + ] +} + +OrientedParticle +{ + flags setShaderTime + + count 0 1 + + life 350 + + rotation 135 + + size + { + start 4 14 + end 16 30 + flags linear + } + + shaders + [ + gfx/exp/wookie + ] +} + +OrientedParticle +{ + life 350 + + rgb + { + start 0.2 0.5 0 + } + + alpha + { + end 0 + flags linear + } + + size + { + start 16 + } + + shaders + [ + gfx/effects/whiteGlow + ] +} + +CameraShake +{ + name Shake + + flags usePhysics + + life 500 800 + + bounce 0.2 0.5 + + radius 50 +} + +Sound +{ + name Boom + + sounds + [ + sound/weapons/bowcaster/hit_wall.wav + ] +} + +Light +{ + life 200 + + rgb + { + start 0.2 1 0.2 + } + + size + { + start 85 + end 8 + flags linear + } +} diff --git a/assets/japro/effects/bowcaster/shot.efx b/assets/japro/effects/bowcaster/shot.efx new file mode 100644 index 0000000000..50e780d2f2 --- /dev/null +++ b/assets/japro/effects/bowcaster/shot.efx @@ -0,0 +1,129 @@ +repeatDelay 300 + +Line +{ + flags useAlpha + + life 10 + + origin 8 0 0 + + origin2 -80 0 0 + + alpha + { + start 0.6 0.7 + } + + size + { + start 1.4 1.6 + } + + shaders + [ + gfx/effects/greenShot + ] +} + +Line +{ + life 10 + + origin 16 0 0 + + origin2 -90 0 0 + + rgb + { + start 0 0.7 0 0.2 0.8 0.2 + } + + alpha + { + start 0.8 1 + } + + size + { + start 4 5 + } + + shaders + [ + gfx/effects/whiteGlow + ] +} + +Particle +{ + life 10 + + origin -5 0 0 + + rgb + { + start 0 0.7 0 0.2 0.8 0.2 + } + + alpha + { + start 0.25 0.35 + } + + size + { + start 12 13 + } + + shaders + [ + gfx/effects/whiteGlow + ] +} + +Cylinder +{ + flags useAlpha + + life 10 + + origin -5 0 0 + + size + { + start 0 + } + + size2 + { + start 7.5 8 + } + + length + { + start 2 3 + } + + shaders + [ + gfx/effects/jet3 + ] +} + +Light +{ + life 20 + + rgb + { + start 0 1 0 + } + + size + { + start 85 + end 8 + flags linear + } +} diff --git a/assets/japro/effects/bryar/npcshot.efx b/assets/japro/effects/bryar/npcshot.efx new file mode 100644 index 0000000000..564d3d8e26 --- /dev/null +++ b/assets/japro/effects/bryar/npcshot.efx @@ -0,0 +1,66 @@ +repeatDelay 300 + +Line +{ + name Core + + flags useAlpha + + origin 8 0 0 + + origin2 -40 0 0 + + alpha + { + start 0.6 0.7 + } + + shaders + [ + gfx/effects/bryar_blob + ] +} + +Line +{ + name Glow + + origin 16 0 0 + + origin2 -50 0 0 + + rgb + { + start 0.8 0.6 0 0.9 0.7 0.2 + } + + alpha + { + start 0.8 1 + } + + size + { + start 2 2.5 + } + + shaders + [ + gfx/effects/whiteGlow + ] +} + +Light +{ + rgb + { + start 1 0.702 0.2 + } + + size + { + start 85 + end 8 + flags linear + } +} diff --git a/assets/japro/effects/bryar/shot.efx b/assets/japro/effects/bryar/shot.efx new file mode 100644 index 0000000000..49f0a3bef9 --- /dev/null +++ b/assets/japro/effects/bryar/shot.efx @@ -0,0 +1,94 @@ +repeatDelay 300 + +Line +{ + name Core + + flags useAlpha + + life 10 + + origin 8 0 0 + + origin2 -80 0 0 + + alpha + { + start 0.6 0.7 + } + + shaders + [ + gfx/effects/bryar_blob + ] +} + +Line +{ + name Glow + + life 10 + + origin 16 0 0 + + origin2 -90 0 0 + + rgb + { + start 0.8 0.6 0 0.9 0.7 0.2 + } + + alpha + { + start 0.8 1 + } + + size + { + start 2 2.5 + } + + shaders + [ + gfx/effects/whiteGlow + ] +} + +Particle +{ + name Filler + + life 10 + + origin -8 0 0 + + rgb + { + start 0.8 0.6 0 0.9 0.7 0.2 + } + + size + { + start 1.6 1.8 + } + + shaders + [ + gfx/effects/whiteGlow + ] +} + +Light +{ + rgb + { + start 1 0.698 0.2 + } + + size + { + start 85 + end 8 + flags linear + } +} diff --git a/assets/japro/effects/bryar/wall_impact.efx b/assets/japro/effects/bryar/wall_impact.efx new file mode 100644 index 0000000000..26f7474b33 --- /dev/null +++ b/assets/japro/effects/bryar/wall_impact.efx @@ -0,0 +1,48 @@ +repeatDelay 300 + +FxRunner +{ + cullrange 1200 +} + +Decal +{ + cullrange 1200 + + size + { + start 5.5 7 + } + + shaders + [ + gfx/damage/burnmark4 + ] +} + +Sound +{ + cullrange 1200 + + sounds + [ + sound/weapons/bryar/hit_wall.wav + ] +} + +Light +{ + life 200 + + rgb + { + start 1 0.698 0.2 + } + + size + { + start 85 + end 8 + flags linear + } +} diff --git a/assets/japro/effects/bryar/wall_impact2.efx b/assets/japro/effects/bryar/wall_impact2.efx new file mode 100644 index 0000000000..d1fd0bfcdb --- /dev/null +++ b/assets/japro/effects/bryar/wall_impact2.efx @@ -0,0 +1,191 @@ +repeatDelay 300 + +Line +{ + count 6 8 + + life 150 200 + + origin2 12 -10 -10 18 10 10 + + alpha + { + start 0.45 1 + end 0 + flags linear + } + + size + { + start 0.25 0.5 + } + + shaders + [ + gfx/misc/spark + gfx/misc/spark2 + ] +} + +Tail +{ + count 10 + + life 700 1100 + + intensity 0.25 0.4 + + velocity 120 -120 -120 250 120 120 + + gravity -450 -550 + + size + { + start 0.3 0.45 + } + + length + { + start 4 10 + end 0.1 1 + flags linear + } + + shaders + [ + gfx/misc/spark + ] +} + +Particle +{ + count 8 + + life 600 900 + + intensity 0.25 0.4 + + velocity 100 -115 -115 200 115 115 + + gravity -450 -550 + + size + { + start 0.4 0.5 + end 0 + flags linear + } + + shaders + [ + gfx/misc/spark + ] +} + +Particle +{ + flags useAlpha + + spawnFlags rgbComponentInterpolation + + count 8 10 + + life 1000 1800 + + rotation -180 180 + + rotationDelta -6 6 + + velocity 10 -10 -10 20 10 10 + + gravity 2 20 + + rgb + { + start 0 0 0 0.8 0.8 0.8 + } + + alpha + { + end 0.1 + flags linear + } + + size + { + start 4 6 + end 12 20 + flags linear + } + + shaders + [ + gfx/effects/alpha_smoke + ] +} + +OrientedParticle +{ + life 450 + + rgb + { + start 1 0.9 0 + end 1 0 0 + flags linear + } + + alpha + { + end 0 + flags linear + } + + size + { + start 4 + } + + shaders + [ + gfx/effects/whiteflare + ] +} + +Decal +{ + size + { + start 6.5 8.5 + } + + shaders + [ + gfx/damage/burnmark4 + ] +} + +Sound +{ + sounds + [ + sound/weapons/bryar/hit_wall.wav + ] +} + +Light +{ + life 200 + + rgb + { + start 1 0.698 0.2 + } + + size + { + start 85 + end 8 + flags linear + } +} diff --git a/assets/japro/effects/bryar/wall_impact3.efx b/assets/japro/effects/bryar/wall_impact3.efx new file mode 100644 index 0000000000..581aec6e5c --- /dev/null +++ b/assets/japro/effects/bryar/wall_impact3.efx @@ -0,0 +1,191 @@ +repeatDelay 300 + +Line +{ + count 8 10 + + life 150 200 + + origin2 12 -10 -10 18 10 10 + + alpha + { + start 0.45 1 + end 0 + flags linear + } + + size + { + start 0.25 0.5 + } + + shaders + [ + gfx/misc/spark + gfx/misc/spark2 + ] +} + +Tail +{ + count 16 + + life 700 1100 + + intensity 0.25 0.4 + + velocity 180 -150 -150 300 150 150 + + gravity -550 -650 + + size + { + start 0.3 0.45 + } + + length + { + start 4 10 + end 0.1 1 + flags linear + } + + shaders + [ + gfx/misc/spark + ] +} + +Particle +{ + count 8 + + life 600 900 + + intensity 0.25 0.4 + + velocity 175 -155 -155 300 155 155 + + gravity -650 -750 + + size + { + start 0.4 0.65 + end 0 + flags linear + } + + shaders + [ + gfx/misc/spark + ] +} + +Particle +{ + flags useAlpha + + spawnFlags rgbComponentInterpolation + + count 11 13 + + life 1200 2100 + + rotation -180 180 + + rotationDelta -4 4 + + velocity 10 -10 -10 20 10 10 + + gravity 2 20 + + rgb + { + start 0 0 0 1 1 1 + } + + alpha + { + end 0.1 + flags linear + } + + size + { + start 6 7 + end 14 24 + flags linear + } + + shaders + [ + gfx/effects/alpha_smoke + ] +} + +OrientedParticle +{ + life 750 + + rgb + { + start 1 0.8 0 + end 1 0 0 + flags linear + } + + alpha + { + end 0 + flags linear + } + + size + { + start 6 + } + + shaders + [ + gfx/effects/whiteflare + ] +} + +Decal +{ + size + { + start 7.5 9.5 + } + + shaders + [ + gfx/damage/burnmark4 + ] +} + +Sound +{ + sounds + [ + sound/weapons/bryar/hit_wall.wav + ] +} + +Light +{ + life 200 + + rgb + { + start 1 0.698 0.2 + } + + size + { + start 85 + end 8 + flags linear + } +} diff --git a/assets/japro/effects/concussion/explosion.efx b/assets/japro/effects/concussion/explosion.efx new file mode 100644 index 0000000000..2e8a433aa1 --- /dev/null +++ b/assets/japro/effects/concussion/explosion.efx @@ -0,0 +1,301 @@ +repeatDelay 157 + +Particle +{ + name BaseFlare + + count 1 2 + + life 900 1000 + + rotation 0 360 + + rgb + { + start 0 0 1 0.749 0.7922 1 + end 0 0 0.6275 + flags linear + } + + alpha + { + end 0 + parm 3 + flags linear + } + + size + { + start 100 70 + end 4 6 + parm 1 + flags linear + } + + shaders + [ + gfx/effects/whiteFlare + ] +} + +Particle +{ + name Shell + + life 350 + + delay 50 + + rgb + { + start 0 0 1 + end 0.749 0.7922 1 + flags linear + } + + alpha + { + start 0.9 + end 0 + flags linear + } + + size + { + start 80 90 + flags linear + } + + shaders + [ + gfx/effects/gcircle + ] +} + +Tail +{ + name comet_tail + + count 44 36 + + life 300 350 + + delay 100 + + velocity 350 350 350 -350 -350 -350 + + acceleration 10 10 10 10 10 5 + + rgb + { + start 0 0 1 0.749 0.7922 1 + end 0 0 0.6275 + flags linear + } + + alpha + { + end 0 + flags linear + } + + size + { + start 25 + end 5 + flags linear + } + + length + { + start 30 + end 35 40 + flags linear + } + + shaders + [ + gfx/misc/flaretailup + ] +} + +OrientedParticle +{ + name Ring + + life 500 + + rgb + { + start 0.4588 0.1686 1 + end 0 0 0.6275 + flags linear + } + + alpha + { + start 0.6 + end 0 + flags linear + } + + size + { + end 160 180 + parm 1 + flags linear + } + + shaders + [ + gfx/effects/mring1 + ] +} + +Particle +{ + name SecondaryFlare + + count 3 + + life 400 500 + + delay 125 + + origin -13 0 0 + + rotation 0 360 + + velocity 150 150 150 -150 -150 -150 + + rgb + { + start 0 0 1 0.749 0.7922 1 + end 0 0 0.6275 + flags linear + } + + alpha + { + start 0 + parm 2 + flags wave + } + + size + { + start 50 40 + end 1 2 + parm 1 + flags linear + } + + shaders + [ + gfx/effects/whiteFlare + ] +} + +Particle +{ + name OuterShell + + life 300 + + rgb + { + start 0.4745 0.6588 1 + flags linear + } + + alpha + { + end 0 + flags linear + } + + size + { + end 175 150 + flags linear + } + + shaders + [ + gfx/effects/gcircle + ] +} + +Sound +{ + sounds + [ + sound/weapons/concussion/explosion.wav + ] +} + +Particle +{ + count 3 2 + + life 500 + + delay 300 + + rotation 0 45 + + rotationDelta 20 -20 + + velocity 30 30 30 -30 -30 -30 + + rgb + { + start 0.6863 0.1686 1 0 0.3804 1 + end 0 0 0.6275 1 1 1 + flags linear + } + + alpha + { + end 0 + flags linear + } + + size + { + start 12 10 + end 55 50 + flags linear + } + + shaders + [ + gfx/effects/snowpuff2 + ] +} + +CameraShake +{ + life 500 800 + + intensity 3 12 + + radius 300 400 +} + +Light +{ + life 600 + + rgb + { + start 0 0.3804 1 0.9216 0.3569 1 + } + + size + { + start 300 + end 100 + flags linear + } +} diff --git a/assets/japro/effects/concussion/shot.efx b/assets/japro/effects/concussion/shot.efx new file mode 100644 index 0000000000..bcba0af6f9 --- /dev/null +++ b/assets/japro/effects/concussion/shot.efx @@ -0,0 +1,94 @@ +repeatDelay 300 + +Line +{ + flags useAlpha + + origin 8 0 0 + + origin2 -80 0 0 + + alpha + { + start 0.6 0.7 + } + + size + { + start 1.4 1.6 + } + + shaders + [ + gfx/misc/flaretailup + ] +} + +Line +{ + origin 16 0 0 + + origin2 -90 0 0 + + rgb + { + start 0.1882 0 0.749 0.6863 0.1686 1 + } + + alpha + { + start 0.8 1 + } + + size + { + start 4 5 + } + + shaders + [ + gfx/effects/whiteGlow + ] +} + +Particle +{ + origin -5 0 0 + + rgb + { + start 1 1 1 0.4588 0.1686 1 + } + + alpha + { + start 0.1 0.2 + } + + size + { + start 12 13 + } + + shaders + [ + gfx/misc/fxflare + ] +} + +Light +{ + life 100 + + rgb + { + start 0 0.3804 1 0.9216 0.3569 1 + } + + size + { + start 170 + end 10 + flags linear + } +} diff --git a/assets/japro/effects/demp2/altdetonate.efx b/assets/japro/effects/demp2/altdetonate.efx new file mode 100644 index 0000000000..57ba16685a --- /dev/null +++ b/assets/japro/effects/demp2/altdetonate.efx @@ -0,0 +1,145 @@ +repeatDelay 300 + +Electricity +{ + flags useModel useBBox usePhysics + + count 2 3 + + life 200 300 + + delay 0 250 + + bounce 2 4 + + origin -2 -20 -20 -2 20 20 + + origin2 60 -130 -130 180 130 130 + + size + { + start 3 5 + end 0.2 + parm 70 + flags nonlinear + } + + shaders + [ + gfx/misc/blueLine + ] +} + +Electricity +{ + name Copy of Unnamed Electricity 0 + + flags useModel useBBox usePhysics + + count 8 + + life 200 300 + + delay 250 850 + + bounce 2 5 + + origin -2 -15 -15 -2 15 15 + + origin2 60 -120 -120 180 120 120 + + size + { + start 3 5 + end 0.2 + parm 70 + flags nonlinear + } + + shaders + [ + gfx/misc/blueLine + ] +} + +Electricity +{ + name Copy of Copy of Unnamed Electri + + flags useModel useBBox usePhysics + + count 2 4 + + life 300 600 + + delay 800 2000 + + bounce 2 5 + + origin -2 -15 -15 -2 15 15 + + origin2 40 -120 -120 180 120 120 + + size + { + start 3 5 + end 0.2 + parm 70 + flags nonlinear + } + + shaders + [ + gfx/misc/blueLine + ] +} + +Decal +{ + count 2 + + rotation 0 360 + + size + { + start 10 30 + } + + shaders + [ + gfx/damage/burnmark1 + gfx/damage/burnmark4 + ] +} + +Electricity +{ + name Copy of Unnamed Electricity 0 + + flags useModel useBBox usePhysics + + count 2 + + life 200 300 + + delay 0 100 + + bounce 2 4 + + origin -2 -20 -20 -2 20 20 + + origin2 60 -130 -130 180 130 130 + + size + { + start 9 12 + end 0.2 + parm 70 + flags nonlinear + } + + shaders + [ + gfx/misc/blueLine + ] +} diff --git a/assets/japro/effects/demp2/muzzle_flash.efx b/assets/japro/effects/demp2/muzzle_flash.efx new file mode 100644 index 0000000000..a408474cce --- /dev/null +++ b/assets/japro/effects/demp2/muzzle_flash.efx @@ -0,0 +1,81 @@ +repeatDelay 300 + +Line +{ + life 10 + + origin2 24 0 0 30 0 0 + + alpha + { + start 0.5 0.6 + end 0.35 + flags linear + } + + size + { + start 4.75 6.25 + end 4 + flags linear + } + + shaders + [ + gfx/effects/bryarSideFlash + ] +} + +Particle +{ + origin 8 0 0 + + rotation 0 360 + + alpha + { + start 0.65 0.8 + end 0.5 + flags linear + } + + size + { + start 10 12 + } + + shaders + [ + gfx/misc/lightningFlash + ] +} + +Light +{ + rgb + { + start 0.6745 0.5922 1 + } + + size + { + start 100 150 + } +} + +Sound +{ + sounds + [ + sound/weapons/demp2/fire.wav + ] +} + +CameraShake +{ + life 70 + + intensity 0.4 0.5 + + radius 60 +} diff --git a/assets/japro/effects/demp2/projectile.efx b/assets/japro/effects/demp2/projectile.efx new file mode 100644 index 0000000000..49c4824af4 --- /dev/null +++ b/assets/japro/effects/demp2/projectile.efx @@ -0,0 +1,55 @@ +repeatDelay 300 + +Particle +{ + life 10 + + rotation 0 180 + + size + { + start 14 20 + } + + shaders + [ + gfx/misc/lightningFlash + ] +} + +Particle +{ + life 10 + + rotation 0 45 + + rgb + { + start 0.15 0 0.4 + } + + size + { + start 40 50 + } + + shaders + [ + gfx/effects/whiteflare + ] +} + +Light +{ + rgb + { + start 0.6745 0.5922 1 + } + + size + { + start 80 + end 8 + flags linear + } +} diff --git a/assets/japro/effects/demp2/wall_impact.efx b/assets/japro/effects/demp2/wall_impact.efx new file mode 100644 index 0000000000..428d0981aa --- /dev/null +++ b/assets/japro/effects/demp2/wall_impact.efx @@ -0,0 +1,149 @@ +repeatDelay 300 + +OrientedParticle +{ + flags setShaderTime + + count 3 + + life 350 + + rotation 0 360 + + rotationDelta -8 8 + + size + { + start 16 24 + end 36 48 + flags linear + } + + shaders + [ + gfx/exp/demp2 + ] +} + +OrientedParticle +{ + flags setShaderTime + + count 0 + + life 350 + + rotation 90 + + size + { + start 24 + } + + shaders + [ + gfx/exp/demp2 + ] +} + +OrientedParticle +{ + flags setShaderTime + + count 0 + + life 250 + + delay 0 50 + + origin 0 -10 -10 0 10 10 + + rotation 90 + + size + { + start 8 + end 10 16 + flags linear + } + + shaders + [ + gfx/exp/demp2 + ] +} + +Particle +{ + count 0 + + life 300 + + rotation 0 360 + + rotationDelta -20 20 + + rgb + { + start 0.6 0.6 1 + } + + alpha + { + end 0 + parm 40 + flags nonlinear + } + + size + { + start 6 8 + end 15 20 + flags random linear + } + + shaders + [ + gfx/misc/lightningFlash + ] +} + +Decal +{ + count 2 + + size + { + start 14.5 19 + } + + shaders + [ + gfx/damage/burnmark4 + ] +} + +Sound +{ + sounds + [ + sound/weapons/demp2/hitwall.wav + ] +} + +Light +{ + life 90 + + rgb + { + start 0.6745 0.5922 1 + } + + size + { + start 80 + end 8 + flags linear + } +} diff --git a/assets/japro/effects/emplaced/shot.efx b/assets/japro/effects/emplaced/shot.efx new file mode 100644 index 0000000000..8ed5b98719 --- /dev/null +++ b/assets/japro/effects/emplaced/shot.efx @@ -0,0 +1,75 @@ +repeatDelay 300 + +Line +{ + flags useAlpha + + origin 225 0 0 + + origin2 -225 0 0 + + size + { + start 4 + } + + shaders + [ + gfx/effects/bryar_blob + ] +} + +Line +{ + origin 225 0 0 + + origin2 -225 0 0 + + rgb + { + start 0.8 0.7 0 1 0.7 0.2 + } + + size + { + start 6 + } + + shaders + [ + gfx/effects/whiteGlow + ] +} + +Particle +{ + rgb + { + start 0.8 0.7 0 1 0.7 0.2 + } + + size + { + start 1 1.8 + } + + shaders + [ + gfx/effects/whiteGlow + ] +} + +Light +{ + rgb + { + start 0.898 0.698 0 1 0.702 0.2 + } + + size + { + start 90 + end 5 + flags linear + } +} diff --git a/assets/japro/effects/emplaced/shotnpc.efx b/assets/japro/effects/emplaced/shotnpc.efx new file mode 100644 index 0000000000..b3a409c9fc --- /dev/null +++ b/assets/japro/effects/emplaced/shotnpc.efx @@ -0,0 +1,75 @@ +repeatDelay 300 + +Line +{ + flags useAlpha + + origin 100 0 0 + + origin2 -100 0 0 + + size + { + start 3 + } + + shaders + [ + gfx/effects/bryar_blob + ] +} + +Line +{ + origin 100 0 0 + + origin2 -100 0 0 + + rgb + { + start 0.8 0.7 0 1 0.7 0.2 + } + + size + { + start 5 + } + + shaders + [ + gfx/effects/whiteGlow + ] +} + +Particle +{ + rgb + { + start 0.8 0.7 0 1 0.7 0.2 + } + + size + { + start 4 4.8 + } + + shaders + [ + gfx/effects/whiteGlow + ] +} + +Light +{ + rgb + { + start 0.898 0.698 0 1 0.702 0.2 + } + + size + { + start 90 + end 5 + flags linear + } +} diff --git a/assets/japro/effects/emplaced/wall_impact.efx b/assets/japro/effects/emplaced/wall_impact.efx new file mode 100644 index 0000000000..67e821feb5 --- /dev/null +++ b/assets/japro/effects/emplaced/wall_impact.efx @@ -0,0 +1,137 @@ +repeatDelay 300 + +Line +{ + count 4 8 + + life 100 200 + + origin2 16 -20 -20 24 20 20 + + alpha + { + start 0.25 1 + end 0 + flags linear + } + + size + { + start 0.8 1.2 + } + + shaders + [ + gfx/misc/spark + gfx/misc/spark2 + ] +} + +Tail +{ + flags usePhysics + + count 6 10 + + life 700 1100 + + cullrange 900 + + bounce 0.25 0.5 + + velocity 120 -110 -110 280 110 110 + + gravity -450 -650 + + size + { + start 0.5 0.9 + } + + length + { + start 8 14 + end 0.1 1 + flags linear + } + + shaders + [ + gfx/misc/spark + ] +} + +Particle +{ + count 4 6 + + life 900 1000 + + velocity 8 -12 -12 16 12 12 + + gravity 12 24 + + alpha + { + start 0.2 0.4 + end 0 + flags linear + } + + size + { + start 8 24 + end 16 32 + flags linear + } + + shaders + [ + gfx/misc/steam + ] +} + +FxRunner +{ + count 1 2 + + delay 0 100 +} + +Decal +{ + size + { + start 8 12 + } + + shaders + [ + gfx/damage/burnmark4 + ] +} + +Sound +{ + sounds + [ + sound/weapons/emplaced/hit_wall.wav + ] +} + +Light +{ + life 300 + + rgb + { + start 0.898 0.698 0 1 0.702 0.2 + } + + size + { + start 90 + end 5 + flags linear + } +} diff --git a/assets/japro/effects/eweb/shot.efx b/assets/japro/effects/eweb/shot.efx new file mode 100644 index 0000000000..8ed5b98719 --- /dev/null +++ b/assets/japro/effects/eweb/shot.efx @@ -0,0 +1,75 @@ +repeatDelay 300 + +Line +{ + flags useAlpha + + origin 225 0 0 + + origin2 -225 0 0 + + size + { + start 4 + } + + shaders + [ + gfx/effects/bryar_blob + ] +} + +Line +{ + origin 225 0 0 + + origin2 -225 0 0 + + rgb + { + start 0.8 0.7 0 1 0.7 0.2 + } + + size + { + start 6 + } + + shaders + [ + gfx/effects/whiteGlow + ] +} + +Particle +{ + rgb + { + start 0.8 0.7 0 1 0.7 0.2 + } + + size + { + start 1 1.8 + } + + shaders + [ + gfx/effects/whiteGlow + ] +} + +Light +{ + rgb + { + start 0.898 0.698 0 1 0.702 0.2 + } + + size + { + start 90 + end 5 + flags linear + } +} diff --git a/assets/japro/effects/eweb/shotnpc.efx b/assets/japro/effects/eweb/shotnpc.efx new file mode 100644 index 0000000000..d0f6e06501 --- /dev/null +++ b/assets/japro/effects/eweb/shotnpc.efx @@ -0,0 +1,75 @@ +repeatDelay 300 + +Line +{ + flags useAlpha + + origin 100 0 0 + + origin2 -100 0 0 + + size + { + start 3 + } + + shaders + [ + gfx/effects/bryar_blob + ] +} + +Line +{ + origin 100 0 0 + + origin2 -100 0 0 + + rgb + { + start 0.8 0.7 0 1 0.7 0.2 + } + + size + { + start 5 + } + + shaders + [ + gfx/effects/whiteGlow + ] +} + +Particle +{ + rgb + { + start 0.8 0.7 0 1 0.7 0.2 + } + + size + { + start 4 4.8 + } + + shaders + [ + gfx/effects/whiteGlow + ] +} + +Light +{ + rgb + { + start 0.898 0.698 0 1 0.698 0.2 + } + + size + { + start 90 + end 5 + flags linear + } +} diff --git a/assets/japro/effects/eweb/wall_impact.efx b/assets/japro/effects/eweb/wall_impact.efx new file mode 100644 index 0000000000..88f945ce8a --- /dev/null +++ b/assets/japro/effects/eweb/wall_impact.efx @@ -0,0 +1,137 @@ +repeatDelay 300 + +Line +{ + count 4 8 + + life 100 200 + + origin2 16 -20 -20 24 20 20 + + alpha + { + start 0.25 1 + end 0 + flags linear + } + + size + { + start 0.8 1.2 + } + + shaders + [ + gfx/misc/spark + gfx/misc/spark2 + ] +} + +Tail +{ + flags usePhysics + + count 6 10 + + life 700 1100 + + cullrange 900 + + bounce 0.25 0.5 + + velocity 120 -110 -110 280 110 110 + + gravity -450 -650 + + size + { + start 0.5 0.9 + } + + length + { + start 8 14 + end 0.1 1 + flags linear + } + + shaders + [ + gfx/misc/spark + ] +} + +Particle +{ + count 4 6 + + life 900 1000 + + velocity 8 -12 -12 16 12 12 + + gravity 12 24 + + alpha + { + start 0.2 0.4 + end 0 + flags linear + } + + size + { + start 8 24 + end 16 32 + flags linear + } + + shaders + [ + gfx/misc/steam + ] +} + +FxRunner +{ + count 1 2 + + delay 0 100 +} + +Decal +{ + size + { + start 8 12 + } + + shaders + [ + gfx/damage/burnmark4 + ] +} + +Sound +{ + sounds + [ + sound/weapons/eweb/eweb_hitsurface.mp3 + ] +} + +Light +{ + life 300 + + rgb + { + start 0.898 0.698 0 1 0.702 0.2 + } + + size + { + start 90 + end 5 + flags linear + } +} diff --git a/assets/japro/effects/flechette/alt_shot.efx b/assets/japro/effects/flechette/alt_shot.efx new file mode 100644 index 0000000000..6ea6cd3fcd --- /dev/null +++ b/assets/japro/effects/flechette/alt_shot.efx @@ -0,0 +1,72 @@ +repeatDelay 300 + +Particle +{ + life 200 + + cullrange 800 + + velocity 10 0 0 60 0 0 + + acceleration 0 -300 -300 0 300 300 + + alpha + { + start 0.2 0.3 + end 0 + flags linear + } + + size + { + start 3 4 + end 6 8 + flags linear + } + + shaders + [ + gfx/misc/steam + ] +} + +Particle +{ + spawnFlags rgbComponentInterpolation + + count 1 2 + + rgb + { + start 0.9961 0.4275 0.08627 1 0.8 0.302 + end 0.4 0.102 0 + flags linear + } + + size + { + start 4 10 + } + + shaders + [ + gfx/effects/whiteGlow + ] +} + +Light +{ + life 35 + + rgb + { + start 1 0.702 0.2 + } + + size + { + start 40 + end 5 + flags linear + } +} diff --git a/assets/japro/effects/flechette/shot.efx b/assets/japro/effects/flechette/shot.efx new file mode 100644 index 0000000000..db0042c6ea --- /dev/null +++ b/assets/japro/effects/flechette/shot.efx @@ -0,0 +1,45 @@ +repeatDelay 300 + +Particle +{ + count 1 2 + + life 15 + + velocity 40 0 0 140 0 0 + + rgb + { + start 0.9 0.3 0.1 1 0.8 0.3 + end 0.4 0.1 0 + flags linear + } + + size + { + start 2 6 + } + + shaders + [ + gfx/effects/whiteGlow + gfx/effects/flare1 + ] +} + +Light +{ + life 35 + + rgb + { + start 1 0.698 0.2 1 0.702 0.2 + } + + size + { + start 20 + end 4 + flags linear + } +} diff --git a/assets/japro/effects/force/lightning.efx b/assets/japro/effects/force/lightning.efx new file mode 100644 index 0000000000..492c798e05 --- /dev/null +++ b/assets/japro/effects/force/lightning.efx @@ -0,0 +1,57 @@ +repeatDelay 300 + +Electricity +{ + flags useModel useBBox usePhysics + + spawnFlags org2fromTrace + + life 75 + + bounce 0.8 2 + + size + { + start 3 7 + flags linear + } + + shaders + [ + gfx/misc/blueLine + ] +} + +Particle +{ + life 30 + + rotation 0 360 + + size + { + start 14 26 + flags random + } + + shaders + [ + gfx/misc/lightningFlash + ] +} + +Light +{ + life 40 + + rgb + { + start 0.6745 0.5922 1 + } + + size + { + start 80 + flags linear + } +} diff --git a/assets/japro/effects/force/lightningwide.efx b/assets/japro/effects/force/lightningwide.efx new file mode 100644 index 0000000000..65091c8fd9 --- /dev/null +++ b/assets/japro/effects/force/lightningwide.efx @@ -0,0 +1,59 @@ +repeatDelay 300 + +Electricity +{ + flags useModel useBBox usePhysics + + count 2 4 + + life 50 60 + + bounce 0.8 2 + + origin2 500 -384 -2 524 384 2 + + size + { + start 3 7 + flags linear + } + + shaders + [ + gfx/misc/blueLine + ] +} + +Particle +{ + life 30 + + rotation 0 360 + + size + { + start 14 26 + flags random + } + + shaders + [ + gfx/misc/lightningFlash + ] +} + +Light +{ + life 40 + + rgb + { + start 0.6745 0.5922 1 + } + + size + { + start 80 + flags linear + } +} diff --git a/assets/japro/effects/misc/mp/drain.efx b/assets/japro/effects/misc/mp/drain.efx new file mode 100644 index 0000000000..0788f45de5 --- /dev/null +++ b/assets/japro/effects/misc/mp/drain.efx @@ -0,0 +1,69 @@ +repeatDelay 300 + +Electricity +{ + flags useModel useBBox usePhysics + + spawnFlags org2fromTrace + + life 75 + + bounce 0.8 2 + + rgb + { + start 1 0 0 + end 1 0 0 + } + + size + { + start 3 7 + flags linear + } + + shaders + [ + gfx/misc/blueLine + ] +} + +Particle +{ + life 30 + + rotation 0 360 + + rgb + { + start 1 0 0 + end 0.502 0 0 + } + + size + { + start 14 26 + flags random + } + + shaders + [ + gfx/misc/lightningFlash + ] +} + +Light +{ + life 40 + + rgb + { + start 1 0 0 1 0.102 0.102 + } + + size + { + start 80 + flags linear + } +} diff --git a/assets/japro/effects/misc/mp/drainwide_new.efx b/assets/japro/effects/misc/mp/drainwide_new.efx new file mode 100644 index 0000000000..4de0d392fd --- /dev/null +++ b/assets/japro/effects/misc/mp/drainwide_new.efx @@ -0,0 +1,121 @@ +repeatDelay 300 + +Electricity +{ + flags useModel useBBox usePhysics + + spawnFlags rgbComponentInterpolation + + count 3 4 + + life 50 60 + + bounce 0.8 2 + + origin2 500 -384 -2 524 384 2 + + rgb + { + end 1 0 0 + } + + alpha + { + end 0 1 + flags linear + } + + size + { + start 3 7 + flags linear + } + + shaders + [ + gfx/misc/rline + ] +} + +Particle +{ + flags useAlpha + + spawnFlags rgbComponentInterpolation + + life 30 + + rotation 0 360 + + rgb + { + start 1 0 0 1 1 1 + end 1 0 0 + } + + size + { + start 14 26 + flags random + } + + shaders + [ + gfx/misc/lightningFlash + ] +} + +Electricity +{ + name Copy of Unnamed Electricity 0 + + flags useModel useBBox usePhysics useAlpha + + spawnFlags rgbComponentInterpolation + + count 2 3 + + life 50 60 + + bounce 0.8 2 + + origin2 500 -384 -2 524 384 2 + + rgb + { + start 1 0 0 1 1 1 + end 1 0 0 + } + + alpha + { + start 0 1 + } + + size + { + start 13 17 + flags linear + } + + shaders + [ + gfx/misc/rline + ] +} + +Light +{ + life 40 + + rgb + { + start 1 0.102 0.102 1 0 0 + } + + size + { + start 80 + flags linear + } +} diff --git a/assets/japro/effects/noghri_stick/flesh_impact.efx b/assets/japro/effects/noghri_stick/flesh_impact.efx new file mode 100644 index 0000000000..d07b7679c2 --- /dev/null +++ b/assets/japro/effects/noghri_stick/flesh_impact.efx @@ -0,0 +1,118 @@ +repeatDelay 300 + +Particle +{ + life 200 250 + + rgb + { + start 0 1 0.251 + } + + alpha + { + end 0 + flags linear + } + + size + { + end 10 + flags linear + } + + shaders + [ + gfx/effects/gcircle + ] +} + +Particle +{ + life 150 + + delay 100 + + rgb + { + start 1 1 0 1 0.7255 0 + } + + alpha + { + end 0 + flags linear + } + + size + { + start 15 + flags linear + } + + shaders + [ + gfx/misc/fxflare + ] +} + +Particle +{ + name Copy of Unnamed Particle 1 + + count 10 15 + + life 300 + + delay 0 50 + + velocity 100 100 100 -100 -100 -100 + + rgb + { + start 0 0.6078 0.1529 1 0.7255 0 + } + + alpha + { + end 0 + flags linear + } + + size + { + start 5 + end 0 + flags linear + } + + shaders + [ + gfx/misc/fxflare + ] +} + +Sound +{ + sounds + [ + sound/weapons/noghri/impact.mp3 + ] +} + +Light +{ + life 150 + + rgb + { + start 0 0.8353 0 0 0.6078 0.1529 + } + + size + { + start 70 + end 5 + flags linear + } +} diff --git a/assets/japro/effects/noghri_stick/shot.efx b/assets/japro/effects/noghri_stick/shot.efx new file mode 100644 index 0000000000..37c274d26e --- /dev/null +++ b/assets/japro/effects/noghri_stick/shot.efx @@ -0,0 +1,99 @@ +repeatDelay 300 + +Line +{ + flags useAlpha + + origin 8 0 0 + + origin2 -80 0 0 + + rgb + { + start 1 1 0 + } + + alpha + { + start 0.6 0.7 + } + + size + { + start 1.4 1.6 + } + + shaders + [ + gfx/misc/flaretailup + ] +} + +Line +{ + spawnFlags rgbComponentInterpolation + + origin 16 0 0 + + origin2 -90 0 0 + + rgb + { + start 0 1 0.251 0 0.6078 0.1529 + } + + alpha + { + start 0.8 1 + } + + size + { + start 4 5 + } + + shaders + [ + gfx/effects/whiteGlow + ] +} + +Particle +{ + origin -5 0 0 + + rgb + { + start 0.702 1 0 1 1 0 + } + + alpha + { + start 0.4 0.6 + } + + size + { + start 14 16 + } + + shaders + [ + gfx/misc/fxflare + ] +} + +Light +{ + rgb + { + start 0.2 1 0.2 0 0.6078 0.1529 + } + + size + { + start 70 + end 5 + flags linear + } +} diff --git a/assets/japro/effects/repeater/alt_projectile.efx b/assets/japro/effects/repeater/alt_projectile.efx new file mode 100644 index 0000000000..f3cbdcc4e3 --- /dev/null +++ b/assets/japro/effects/repeater/alt_projectile.efx @@ -0,0 +1,75 @@ +repeatDelay 300 + +Particle +{ + rotation -90 90 + + rgb + { + start 0.3 0.3 1 + } + + size + { + start 26 30 + } + + shaders + [ + gfx/effects/whiteFlare + ] +} + +Particle +{ + rotation -90 90 + + rgb + { + start 0.15 0.15 0.5 + } + + size + { + start 32 36 + } + + shaders + [ + gfx/effects/flare1 + ] +} + +Particle +{ + name Copy of Unnamed Particle 1 + + count 2 3 + + rotation -20 20 + + size + { + start 8 18 + } + + shaders + [ + gfx/effects/shock_ball + ] +} + +Light +{ + rgb + { + start 0.8471 0.5843 1 0.9922 0.6588 1 + } + + size + { + start 170 + end 25 + flags linear + } +} diff --git a/assets/japro/effects/repeater/concussion.efx b/assets/japro/effects/repeater/concussion.efx new file mode 100644 index 0000000000..a52eca77aa --- /dev/null +++ b/assets/japro/effects/repeater/concussion.efx @@ -0,0 +1,285 @@ +repeatDelay 300 + +Cylinder +{ + spawnFlags evenDistribution rgbComponentInterpolation + + count 2 + + life 800 + + delay 0 700 + + size + { + start 60 + end 140 + parm 50 + flags linear nonlinear + } + + size2 + { + start 2 + end 140 + parm 90 + flags linear nonlinear + } + + length + { + start 20 + end 0.1 + parm 90 + flags linear nonlinear + } + + shaders + [ + gfx/effects/shock_ripple + ] +} + +Cylinder +{ + spawnFlags rgbComponentInterpolation + + life 800 + + cullrange 550 + + size + { + start 3 + end 100 + parm 50 + flags linear nonlinear + } + + size2 + { + start 24 + end 100 + parm 50 + flags linear nonlinear + } + + shaders + [ + gfx/effects/shock_ripple + ] +} + +Cylinder +{ + life 450 + + cullrange 550 + + size + { + end 160 + parm 90 + flags linear nonlinear + } + + size2 + { + start 50 + end 160 + flags linear + } + + length + { + start 12 + end 0.1 + parm 90 + flags linear nonlinear + } + + shaders + [ + gfx/effects/shock_ripple + ] +} + +Particle +{ + spawnFlags orgOnSphere rgbComponentInterpolation + + count 10 + + life 700 1200 + + delay 0 100 + + origin 0 -4 -4 25 4 4 + + rotation 0 360 + + rotationDelta -20 20 + + velocity 10 0 0 60 0 0 + + acceleration 5 -20 -20 10 20 20 + + alpha + { + end 0 + parm 30 + } + + size + { + start 30 40 + end 0.1 + parm 70 + flags linear nonlinear + } + + shaders + [ + gfx/effects/shock_ball + ] +} + +Particle +{ + spawnFlags rgbComponentInterpolation + + count 10 + + life 400 900 + + cullrange 400 + + rotation 0 360 + + velocity 100 -200 -200 150 200 200 + + gravity -100 -200 + + rgb + { + start 0.5 0.5 1 0.8 0.8 1 + } + + size + { + start 2 6 + end 0.1 + parm 50 + flags linear nonlinear + } + + shaders + [ + gfx/misc/steam2 + gfx/misc/steam3 + ] +} + +Decal +{ + count 1 2 + + rotation 0 360 + + size + { + start 40 60 + } + + shaders + [ + gfx/damage/burnmark4 + ] +} + +Light +{ + name Flash + + life 550 + + rgb + { + start 0.8471 0.5843 1 0.9922 0.6588 1 + } + + alpha + { + end 0 + flags random linear + } + + size + { + start 200 + end 32 + flags linear + } +} + +CameraShake +{ + name Shake + + flags usePhysics + + life 500 800 + + bounce 2 4 + + radius 300 400 +} + +Sound +{ + cullrange 550 + + sounds + [ + sound/weapons/repeater/alt_explode.wav + ] +} + +OrientedParticle +{ + spawnFlags rgbComponentInterpolation + + life 500 + + cullrange 1000 + + origin 1 0 0 + + rotation 0 360 + + rotationDelta -5 5 + + rgb + { + start 0.3 0.3 1 0.5 0.5 1 + } + + alpha + { + end 0 + parm 40 60 + flags nonlinear + } + + size + { + start 2 + end 60 75 + flags linear + } + + shaders + [ + gfx/misc/steam3 + ] +} diff --git a/assets/japro/effects/repeater/muzzle_flash.efx b/assets/japro/effects/repeater/muzzle_flash.efx new file mode 100644 index 0000000000..202e1ba466 --- /dev/null +++ b/assets/japro/effects/repeater/muzzle_flash.efx @@ -0,0 +1,83 @@ +repeatDelay 300 + +Line +{ + life 10 + + origin2 24 0 0 30 0 0 + + alpha + { + start 0.5 0.6 + end 0.35 + flags linear + } + + size + { + start 6.75 8.5 + end 5 + flags linear + } + + shaders + [ + gfx/effects/bryarSideFlash + ] +} + +Particle +{ + life 30 + + origin 5 0 0 + + rotation 0 360 + + alpha + { + start 0.8 1 + end 0.6 + flags linear + } + + size + { + start 8 10.5 + end 7 + flags linear + } + + shaders + [ + gfx/effects/bryarFrontFlash + ] +} + +Light +{ + rgb + { + start 0.8471 0.5843 1 0.9922 0.6588 1 + } + + size + { + start 100 150 + } +} + +Sound +{ + sounds + [ + sound/weapons/repeater/fire.wav + ] +} + +CameraShake +{ + intensity 0.3 0.4 + + radius 60 +} diff --git a/assets/japro/effects/repeater/projectile.efx b/assets/japro/effects/repeater/projectile.efx new file mode 100644 index 0000000000..97e9993b1b --- /dev/null +++ b/assets/japro/effects/repeater/projectile.efx @@ -0,0 +1,74 @@ +repeatDelay 300 + +Particle +{ + alpha + { + start 0.8 1 + } + + size + { + start 1.2 2 + } + + shaders + [ + gfx/misc/spark + ] +} + +Particle +{ + alpha + { + start 0.1 0.2 + } + + size + { + start 5 7 + } + + shaders + [ + gfx/misc/spark + ] +} + +Particle +{ + count 1 2 + + rotation 0 360 + + alpha + { + start 0.1 0.2 + } + + size + { + start 7 12 + } + + shaders + [ + gfx/effects/flare1 + ] +} + +Light +{ + rgb + { + start 1 0.702 0.2 + } + + size + { + start 70 + end 8 + flags linear + } +} diff --git a/assets/japro/effects/repeater/wall_impact.efx b/assets/japro/effects/repeater/wall_impact.efx new file mode 100644 index 0000000000..d05e54f3ff --- /dev/null +++ b/assets/japro/effects/repeater/wall_impact.efx @@ -0,0 +1,121 @@ +repeatDelay 300 + +OrientedParticle +{ + life 300 400 + + cullrange 2000 + + alpha + { + start 0.8 1 + end 0 + flags random linear + } + + size + { + start 1.2 2 + end 8 + flags linear + } + + shaders + [ + gfx/misc/spark + ] +} + +OrientedParticle +{ + life 300 400 + + cullrange 1000 + + alpha + { + start 0.2 0.3 + end 0 + flags random linear + } + + size + { + start 5 7 + end 21 + flags linear + } + + shaders + [ + gfx/misc/spark + ] +} + +OrientedParticle +{ + count 1 2 + + life 300 400 + + cullrange 1200 + + rotation 0 360 + + alpha + { + start 0.1 0.2 + end 0.1 + flags linear + } + + size + { + start 7 12 + } + + shaders + [ + gfx/effects/flare1 + ] +} + +Decal +{ + size + { + start 2.5 5 + } + + shaders + [ + gfx/damage/burnmark4 + ] +} + +Sound +{ + cullrange 700 + + sounds + [ + sound/weapons/repeater/hit_wall.wav + ] +} + +Light +{ + life 190 + + rgb + { + start 1 0.702 0.2 + } + + size + { + start 70 + end 6 + flags linear + } +} diff --git a/assets/japro/effects/thermal/shockwave.efx b/assets/japro/effects/thermal/shockwave.efx new file mode 100644 index 0000000000..3f974462a5 --- /dev/null +++ b/assets/japro/effects/thermal/shockwave.efx @@ -0,0 +1,80 @@ +repeatDelay 300 + +Cylinder +{ + life 400 + + origin 5 0 0 + + alpha + { + end 0 + flags linear + } + + size + { + end 110 + parm 40 + flags linear nonlinear + } + + size2 + { + start 8 + end 125 + parm 40 + flags linear nonlinear + } + + length + { + start 7 + end 14 + flags linear nonlinear + } + + shaders + [ + gfx/misc/shockwave + ] +} + +Cylinder +{ + life 700 + + origin 5 0 0 + + alpha + { + end 0 + flags linear + } + + size + { + end 120 + parm 80 + flags linear nonlinear + } + + size2 + { + start 20 + end 140 + parm 80 + flags linear nonlinear + } + + length + { + start 5 + flags linear nonlinear + } + + shaders + [ + gfx/misc/shockwave + ] +} diff --git a/assets/japro/fonts/anewhope.tga b/assets/japro/fonts/anewhope.tga new file mode 100644 index 0000000000..0535ee9944 Binary files /dev/null and b/assets/japro/fonts/anewhope.tga differ diff --git a/assets/japro/fonts/arialnb.tga b/assets/japro/fonts/arialnb.tga new file mode 100644 index 0000000000..5848df21d8 Binary files /dev/null and b/assets/japro/fonts/arialnb.tga differ diff --git a/assets/japro/fonts/ergoec.tga b/assets/japro/fonts/ergoec.tga new file mode 100644 index 0000000000..a57c8ae337 Binary files /dev/null and b/assets/japro/fonts/ergoec.tga differ diff --git a/assets/japro/fonts/ocr_a.tga b/assets/japro/fonts/ocr_a.tga new file mode 100644 index 0000000000..953693b923 Binary files /dev/null and b/assets/japro/fonts/ocr_a.tga differ diff --git a/assets/japro/gfx/2d/charsgrid_med.tga b/assets/japro/gfx/2d/charsgrid_med.tga index 5d176b35cf..8684d2d0b8 100644 Binary files a/assets/japro/gfx/2d/charsgrid_med.tga and b/assets/japro/gfx/2d/charsgrid_med.tga differ diff --git a/assets/japro/gfx/2d/crop_charge.tga b/assets/japro/gfx/2d/crop_charge.tga new file mode 100644 index 0000000000..bebab98cf3 Binary files /dev/null and b/assets/japro/gfx/2d/crop_charge.tga differ diff --git a/assets/japro/gfx/2d/cropcircle.tga b/assets/japro/gfx/2d/cropcircle.tga new file mode 100644 index 0000000000..bea669f6bc Binary files /dev/null and b/assets/japro/gfx/2d/cropcircle.tga differ diff --git a/assets/japro/gfx/2d/cropcircle2.tga b/assets/japro/gfx/2d/cropcircle2.tga new file mode 100644 index 0000000000..27a527a4c5 Binary files /dev/null and b/assets/japro/gfx/2d/cropcircle2.tga differ diff --git a/assets/japro/gfx/2d/crosshaira.tga b/assets/japro/gfx/2d/crosshaira.tga index 62f984b641..5db8b708ef 100644 Binary files a/assets/japro/gfx/2d/crosshaira.tga and b/assets/japro/gfx/2d/crosshaira.tga differ diff --git a/assets/japro/gfx/2d/crosshairb.tga b/assets/japro/gfx/2d/crosshairb.tga new file mode 100644 index 0000000000..922ae206dd Binary files /dev/null and b/assets/japro/gfx/2d/crosshairb.tga differ diff --git a/assets/japro/gfx/2d/crosshairc.tga b/assets/japro/gfx/2d/crosshairc.tga new file mode 100644 index 0000000000..943e2dd1d5 Binary files /dev/null and b/assets/japro/gfx/2d/crosshairc.tga differ diff --git a/assets/japro/gfx/2d/crosshaird.tga b/assets/japro/gfx/2d/crosshaird.tga new file mode 100644 index 0000000000..bd32817966 Binary files /dev/null and b/assets/japro/gfx/2d/crosshaird.tga differ diff --git a/assets/japro/gfx/2d/crosshaire.tga b/assets/japro/gfx/2d/crosshaire.tga new file mode 100644 index 0000000000..4fdd8bc865 Binary files /dev/null and b/assets/japro/gfx/2d/crosshaire.tga differ diff --git a/assets/japro/gfx/2d/crosshairf.tga b/assets/japro/gfx/2d/crosshairf.tga new file mode 100644 index 0000000000..5f75ef02c5 Binary files /dev/null and b/assets/japro/gfx/2d/crosshairf.tga differ diff --git a/assets/japro/gfx/2d/crosshairg.tga b/assets/japro/gfx/2d/crosshairg.tga new file mode 100644 index 0000000000..b787939c23 Binary files /dev/null and b/assets/japro/gfx/2d/crosshairg.tga differ diff --git a/assets/japro/gfx/2d/crosshairh.tga b/assets/japro/gfx/2d/crosshairh.tga new file mode 100644 index 0000000000..8175f4b8f4 Binary files /dev/null and b/assets/japro/gfx/2d/crosshairh.tga differ diff --git a/assets/japro/gfx/2d/crosshairi.tga b/assets/japro/gfx/2d/crosshairi.tga new file mode 100644 index 0000000000..9b377b502d Binary files /dev/null and b/assets/japro/gfx/2d/crosshairi.tga differ diff --git a/assets/japro/gfx/2d/crosshairj.tga b/assets/japro/gfx/2d/crosshairj.tga index dc8dadf859..965eded763 100644 Binary files a/assets/japro/gfx/2d/crosshairj.tga and b/assets/japro/gfx/2d/crosshairj.tga differ diff --git a/assets/japro/gfx/2d/lag.jpg b/assets/japro/gfx/2d/lag.jpg new file mode 100644 index 0000000000..e98c9aecdd Binary files /dev/null and b/assets/japro/gfx/2d/lag.jpg differ diff --git a/assets/japro/gfx/hud/energy_cell.tga b/assets/japro/gfx/hud/energy_cell.tga new file mode 100644 index 0000000000..93bcb08ad7 Binary files /dev/null and b/assets/japro/gfx/hud/energy_cell.tga differ diff --git a/assets/japro/gfx/hud/i_icon_bacta.tga b/assets/japro/gfx/hud/i_icon_bacta.tga new file mode 100644 index 0000000000..e07b2c1a92 Binary files /dev/null and b/assets/japro/gfx/hud/i_icon_bacta.tga differ diff --git a/assets/japro/gfx/hud/i_icon_battery.tga b/assets/japro/gfx/hud/i_icon_battery.tga new file mode 100644 index 0000000000..93bcb08ad7 Binary files /dev/null and b/assets/japro/gfx/hud/i_icon_battery.tga differ diff --git a/assets/japro/gfx/hud/i_icon_big_bacta.tga b/assets/japro/gfx/hud/i_icon_big_bacta.tga index 245b668a5a..b9a5175da2 100644 Binary files a/assets/japro/gfx/hud/i_icon_big_bacta.tga and b/assets/japro/gfx/hud/i_icon_big_bacta.tga differ diff --git a/assets/japro/gfx/hud/i_icon_eweb.tga b/assets/japro/gfx/hud/i_icon_eweb.tga new file mode 100644 index 0000000000..86936a1eae Binary files /dev/null and b/assets/japro/gfx/hud/i_icon_eweb.tga differ diff --git a/assets/japro/gfx/hud/i_icon_goggles.tga b/assets/japro/gfx/hud/i_icon_goggles.tga new file mode 100644 index 0000000000..71043ab3ac Binary files /dev/null and b/assets/japro/gfx/hud/i_icon_goggles.tga differ diff --git a/assets/japro/gfx/hud/i_icon_jetpack.tga b/assets/japro/gfx/hud/i_icon_jetpack.tga new file mode 100644 index 0000000000..3445ae9026 Binary files /dev/null and b/assets/japro/gfx/hud/i_icon_jetpack.tga differ diff --git a/assets/japro/gfx/hud/i_icon_medkit.tga b/assets/japro/gfx/hud/i_icon_medkit.tga new file mode 100644 index 0000000000..6880caef85 Binary files /dev/null and b/assets/japro/gfx/hud/i_icon_medkit.tga differ diff --git a/assets/japro/gfx/hud/i_icon_psd.tga b/assets/japro/gfx/hud/i_icon_psd.tga new file mode 100644 index 0000000000..af0dee4125 Binary files /dev/null and b/assets/japro/gfx/hud/i_icon_psd.tga differ diff --git a/assets/japro/gfx/hud/i_icon_security_key.tga b/assets/japro/gfx/hud/i_icon_security_key.tga new file mode 100644 index 0000000000..d41190096f Binary files /dev/null and b/assets/japro/gfx/hud/i_icon_security_key.tga differ diff --git a/assets/japro/gfx/hud/i_icon_seeker.tga b/assets/japro/gfx/hud/i_icon_seeker.tga new file mode 100644 index 0000000000..68c35f2813 Binary files /dev/null and b/assets/japro/gfx/hud/i_icon_seeker.tga differ diff --git a/assets/japro/gfx/hud/i_icon_sentrygun.tga b/assets/japro/gfx/hud/i_icon_sentrygun.tga new file mode 100644 index 0000000000..6dc6debd7b Binary files /dev/null and b/assets/japro/gfx/hud/i_icon_sentrygun.tga differ diff --git a/assets/japro/gfx/hud/i_icon_shieldwall.tga b/assets/japro/gfx/hud/i_icon_shieldwall.tga new file mode 100644 index 0000000000..b677055de4 Binary files /dev/null and b/assets/japro/gfx/hud/i_icon_shieldwall.tga differ diff --git a/assets/japro/gfx/hud/metallic_bolts.tga b/assets/japro/gfx/hud/metallic_bolts.tga new file mode 100644 index 0000000000..35d322de21 Binary files /dev/null and b/assets/japro/gfx/hud/metallic_bolts.tga differ diff --git a/assets/japro/gfx/hud/mpi_dklight.jpg b/assets/japro/gfx/hud/mpi_dklight.jpg new file mode 100644 index 0000000000..40729419d2 Binary files /dev/null and b/assets/japro/gfx/hud/mpi_dklight.jpg differ diff --git a/assets/japro/gfx/hud/mpi_fboon.jpg b/assets/japro/gfx/hud/mpi_fboon.jpg new file mode 100644 index 0000000000..a1c00c1814 Binary files /dev/null and b/assets/japro/gfx/hud/mpi_fboon.jpg differ diff --git a/assets/japro/gfx/hud/mpi_fboonglo1.jpg b/assets/japro/gfx/hud/mpi_fboonglo1.jpg new file mode 100644 index 0000000000..7a911539a6 Binary files /dev/null and b/assets/japro/gfx/hud/mpi_fboonglo1.jpg differ diff --git a/assets/japro/gfx/hud/mpi_jlight.jpg b/assets/japro/gfx/hud/mpi_jlight.jpg new file mode 100644 index 0000000000..4591f74e77 Binary files /dev/null and b/assets/japro/gfx/hud/mpi_jlight.jpg differ diff --git a/assets/japro/gfx/hud/power_cell.tga b/assets/japro/gfx/hud/power_cell.tga new file mode 100644 index 0000000000..90577ead14 Binary files /dev/null and b/assets/japro/gfx/hud/power_cell.tga differ diff --git a/assets/japro/gfx/hud/psd_medium.tga b/assets/japro/gfx/hud/psd_medium.tga new file mode 100644 index 0000000000..34c617df20 Binary files /dev/null and b/assets/japro/gfx/hud/psd_medium.tga differ diff --git a/assets/japro/gfx/hud/psd_small.tga b/assets/japro/gfx/hud/psd_small.tga new file mode 100644 index 0000000000..61a147541b Binary files /dev/null and b/assets/japro/gfx/hud/psd_small.tga differ diff --git a/assets/japro/gfx/hud/rockets.tga b/assets/japro/gfx/hud/rockets.tga new file mode 100644 index 0000000000..01c0bddc99 Binary files /dev/null and b/assets/japro/gfx/hud/rockets.tga differ diff --git a/assets/japro/gfx/hud/w_icon_atst.tga b/assets/japro/gfx/hud/w_icon_atst.tga new file mode 100644 index 0000000000..8f79d1a496 Binary files /dev/null and b/assets/japro/gfx/hud/w_icon_atst.tga differ diff --git a/assets/japro/gfx/hud/w_icon_atstside.tga b/assets/japro/gfx/hud/w_icon_atstside.tga new file mode 100644 index 0000000000..01de4b5e9f Binary files /dev/null and b/assets/japro/gfx/hud/w_icon_atstside.tga differ diff --git a/assets/japro/gfx/hud/w_icon_blaster.tga b/assets/japro/gfx/hud/w_icon_blaster.tga new file mode 100644 index 0000000000..7d300bf048 Binary files /dev/null and b/assets/japro/gfx/hud/w_icon_blaster.tga differ diff --git a/assets/japro/gfx/hud/w_icon_blaster_na.tga b/assets/japro/gfx/hud/w_icon_blaster_na.tga new file mode 100644 index 0000000000..a6676e855d Binary files /dev/null and b/assets/japro/gfx/hud/w_icon_blaster_na.tga differ diff --git a/assets/japro/gfx/hud/w_icon_blaster_pistol.tga b/assets/japro/gfx/hud/w_icon_blaster_pistol.tga new file mode 100644 index 0000000000..8f9b7fe2c8 Binary files /dev/null and b/assets/japro/gfx/hud/w_icon_blaster_pistol.tga differ diff --git a/assets/japro/gfx/hud/w_icon_blaster_pistol_na.tga b/assets/japro/gfx/hud/w_icon_blaster_pistol_na.tga new file mode 100644 index 0000000000..c2d62f3274 Binary files /dev/null and b/assets/japro/gfx/hud/w_icon_blaster_pistol_na.tga differ diff --git a/assets/japro/gfx/hud/w_icon_bowcaster.tga b/assets/japro/gfx/hud/w_icon_bowcaster.tga new file mode 100644 index 0000000000..6409b1c7d3 Binary files /dev/null and b/assets/japro/gfx/hud/w_icon_bowcaster.tga differ diff --git a/assets/japro/gfx/hud/w_icon_bowcaster_na.tga b/assets/japro/gfx/hud/w_icon_bowcaster_na.tga new file mode 100644 index 0000000000..783902c699 Binary files /dev/null and b/assets/japro/gfx/hud/w_icon_bowcaster_na.tga differ diff --git a/assets/japro/gfx/hud/w_icon_briar.tga b/assets/japro/gfx/hud/w_icon_briar.tga new file mode 100644 index 0000000000..3f3e0c8aba Binary files /dev/null and b/assets/japro/gfx/hud/w_icon_briar.tga differ diff --git a/assets/japro/gfx/hud/w_icon_briar_na.tga b/assets/japro/gfx/hud/w_icon_briar_na.tga new file mode 100644 index 0000000000..a23e8cc6d7 Binary files /dev/null and b/assets/japro/gfx/hud/w_icon_briar_na.tga differ diff --git a/assets/japro/gfx/hud/w_icon_c_rifle.tga b/assets/japro/gfx/hud/w_icon_c_rifle.tga new file mode 100644 index 0000000000..1bb3929df2 Binary files /dev/null and b/assets/japro/gfx/hud/w_icon_c_rifle.tga differ diff --git a/assets/japro/gfx/hud/w_icon_c_rifle_na.tga b/assets/japro/gfx/hud/w_icon_c_rifle_na.tga new file mode 100644 index 0000000000..29eded82a7 Binary files /dev/null and b/assets/japro/gfx/hud/w_icon_c_rifle_na.tga differ diff --git a/assets/japro/gfx/hud/w_icon_demp2.tga b/assets/japro/gfx/hud/w_icon_demp2.tga new file mode 100644 index 0000000000..039a692f08 Binary files /dev/null and b/assets/japro/gfx/hud/w_icon_demp2.tga differ diff --git a/assets/japro/gfx/hud/w_icon_demp2_na.tga b/assets/japro/gfx/hud/w_icon_demp2_na.tga new file mode 100644 index 0000000000..6f1745c7eb Binary files /dev/null and b/assets/japro/gfx/hud/w_icon_demp2_na.tga differ diff --git a/assets/japro/gfx/hud/w_icon_detpack.tga b/assets/japro/gfx/hud/w_icon_detpack.tga new file mode 100644 index 0000000000..70b5096e5b Binary files /dev/null and b/assets/japro/gfx/hud/w_icon_detpack.tga differ diff --git a/assets/japro/gfx/hud/w_icon_detpack_na.tga b/assets/japro/gfx/hud/w_icon_detpack_na.tga new file mode 100644 index 0000000000..f3a02aa341 Binary files /dev/null and b/assets/japro/gfx/hud/w_icon_detpack_na.tga differ diff --git a/assets/japro/gfx/hud/w_icon_disruptor.tga b/assets/japro/gfx/hud/w_icon_disruptor.tga new file mode 100644 index 0000000000..0d570243e3 Binary files /dev/null and b/assets/japro/gfx/hud/w_icon_disruptor.tga differ diff --git a/assets/japro/gfx/hud/w_icon_disruptor_na.tga b/assets/japro/gfx/hud/w_icon_disruptor_na.tga new file mode 100644 index 0000000000..4ca978fdeb Binary files /dev/null and b/assets/japro/gfx/hud/w_icon_disruptor_na.tga differ diff --git a/assets/japro/gfx/hud/w_icon_duallightsaber.tga b/assets/japro/gfx/hud/w_icon_duallightsaber.tga new file mode 100644 index 0000000000..aad749bb00 Binary files /dev/null and b/assets/japro/gfx/hud/w_icon_duallightsaber.tga differ diff --git a/assets/japro/gfx/hud/w_icon_duallightsaber_na.tga b/assets/japro/gfx/hud/w_icon_duallightsaber_na.tga new file mode 100644 index 0000000000..de8251701f Binary files /dev/null and b/assets/japro/gfx/hud/w_icon_duallightsaber_na.tga differ diff --git a/assets/japro/gfx/hud/w_icon_flechette.tga b/assets/japro/gfx/hud/w_icon_flechette.tga new file mode 100644 index 0000000000..058b2941d0 Binary files /dev/null and b/assets/japro/gfx/hud/w_icon_flechette.tga differ diff --git a/assets/japro/gfx/hud/w_icon_flechette_na.tga b/assets/japro/gfx/hud/w_icon_flechette_na.tga new file mode 100644 index 0000000000..97171d6bfb Binary files /dev/null and b/assets/japro/gfx/hud/w_icon_flechette_na.tga differ diff --git a/assets/japro/gfx/hud/w_icon_lightsaber.tga b/assets/japro/gfx/hud/w_icon_lightsaber.tga new file mode 100644 index 0000000000..04f49bfd5c Binary files /dev/null and b/assets/japro/gfx/hud/w_icon_lightsaber.tga differ diff --git a/assets/japro/gfx/hud/w_icon_lightsaber_na.tga b/assets/japro/gfx/hud/w_icon_lightsaber_na.tga new file mode 100644 index 0000000000..fa3b9071fa Binary files /dev/null and b/assets/japro/gfx/hud/w_icon_lightsaber_na.tga differ diff --git a/assets/japro/gfx/hud/w_icon_merrsonn.tga b/assets/japro/gfx/hud/w_icon_merrsonn.tga new file mode 100644 index 0000000000..103e01f231 Binary files /dev/null and b/assets/japro/gfx/hud/w_icon_merrsonn.tga differ diff --git a/assets/japro/gfx/hud/w_icon_merrsonn_na.tga b/assets/japro/gfx/hud/w_icon_merrsonn_na.tga new file mode 100644 index 0000000000..82a6aee5f9 Binary files /dev/null and b/assets/japro/gfx/hud/w_icon_merrsonn_na.tga differ diff --git a/assets/japro/gfx/hud/w_icon_repeater.tga b/assets/japro/gfx/hud/w_icon_repeater.tga new file mode 100644 index 0000000000..f354128130 Binary files /dev/null and b/assets/japro/gfx/hud/w_icon_repeater.tga differ diff --git a/assets/japro/gfx/hud/w_icon_repeater_na.tga b/assets/japro/gfx/hud/w_icon_repeater_na.tga new file mode 100644 index 0000000000..12be1b6667 Binary files /dev/null and b/assets/japro/gfx/hud/w_icon_repeater_na.tga differ diff --git a/assets/japro/gfx/hud/w_icon_saberstaff.tga b/assets/japro/gfx/hud/w_icon_saberstaff.tga new file mode 100644 index 0000000000..6ade8d9ca6 Binary files /dev/null and b/assets/japro/gfx/hud/w_icon_saberstaff.tga differ diff --git a/assets/japro/gfx/hud/w_icon_saberstaff_na.tga b/assets/japro/gfx/hud/w_icon_saberstaff_na.tga new file mode 100644 index 0000000000..d8675086b6 Binary files /dev/null and b/assets/japro/gfx/hud/w_icon_saberstaff_na.tga differ diff --git a/assets/japro/gfx/hud/w_icon_stunbaton.tga b/assets/japro/gfx/hud/w_icon_stunbaton.tga new file mode 100644 index 0000000000..634d98331d Binary files /dev/null and b/assets/japro/gfx/hud/w_icon_stunbaton.tga differ diff --git a/assets/japro/gfx/hud/w_icon_stunbaton_na.tga b/assets/japro/gfx/hud/w_icon_stunbaton_na.tga new file mode 100644 index 0000000000..734fc16dad Binary files /dev/null and b/assets/japro/gfx/hud/w_icon_stunbaton_na.tga differ diff --git a/assets/japro/gfx/hud/w_icon_thermal.tga b/assets/japro/gfx/hud/w_icon_thermal.tga new file mode 100644 index 0000000000..ec89f35100 Binary files /dev/null and b/assets/japro/gfx/hud/w_icon_thermal.tga differ diff --git a/assets/japro/gfx/hud/w_icon_thermal_na.tga b/assets/japro/gfx/hud/w_icon_thermal_na.tga new file mode 100644 index 0000000000..2e037d1d41 Binary files /dev/null and b/assets/japro/gfx/hud/w_icon_thermal_na.tga differ diff --git a/assets/japro/gfx/hud/w_icon_tripmine.tga b/assets/japro/gfx/hud/w_icon_tripmine.tga new file mode 100644 index 0000000000..28b1eea7df Binary files /dev/null and b/assets/japro/gfx/hud/w_icon_tripmine.tga differ diff --git a/assets/japro/gfx/hud/w_icon_tripmine_na.tga b/assets/japro/gfx/hud/w_icon_tripmine_na.tga new file mode 100644 index 0000000000..bd1c545449 Binary files /dev/null and b/assets/japro/gfx/hud/w_icon_tripmine_na.tga differ diff --git a/assets/japro/gfx/menus/configforce.jpg b/assets/japro/gfx/menus/configforce.jpg new file mode 100644 index 0000000000..3c7b8371c5 Binary files /dev/null and b/assets/japro/gfx/menus/configforce.jpg differ diff --git a/assets/japro/gfx/menus/forcecircle1.jpg b/assets/japro/gfx/menus/forcecircle1.jpg new file mode 100644 index 0000000000..0ce8d80bd5 Binary files /dev/null and b/assets/japro/gfx/menus/forcecircle1.jpg differ diff --git a/assets/japro/gfx/menus/forcecircle2.jpg b/assets/japro/gfx/menus/forcecircle2.jpg new file mode 100644 index 0000000000..4276a1522c Binary files /dev/null and b/assets/japro/gfx/menus/forcecircle2.jpg differ diff --git a/assets/japro/gfx/menus/forcecircle3.jpg b/assets/japro/gfx/menus/forcecircle3.jpg new file mode 100644 index 0000000000..0e8103e879 Binary files /dev/null and b/assets/japro/gfx/menus/forcecircle3.jpg differ diff --git a/assets/japro/gfx/menus/forcecircle4.jpg b/assets/japro/gfx/menus/forcecircle4.jpg new file mode 100644 index 0000000000..bd5029181a Binary files /dev/null and b/assets/japro/gfx/menus/forcecircle4.jpg differ diff --git a/assets/japro/gfx/menus/forcecircle5.jpg b/assets/japro/gfx/menus/forcecircle5.jpg new file mode 100644 index 0000000000..849638859b Binary files /dev/null and b/assets/japro/gfx/menus/forcecircle5.jpg differ diff --git a/assets/japro/gfx/menus/forcecircle6.jpg b/assets/japro/gfx/menus/forcecircle6.jpg new file mode 100644 index 0000000000..2623637020 Binary files /dev/null and b/assets/japro/gfx/menus/forcecircle6.jpg differ diff --git a/assets/japro/gfx/menus/forcecircle7.jpg b/assets/japro/gfx/menus/forcecircle7.jpg new file mode 100644 index 0000000000..3473c9de5f Binary files /dev/null and b/assets/japro/gfx/menus/forcecircle7.jpg differ diff --git a/assets/japro/gfx/menus/forcecircle8.jpg b/assets/japro/gfx/menus/forcecircle8.jpg new file mode 100644 index 0000000000..2dca5fa9ae Binary files /dev/null and b/assets/japro/gfx/menus/forcecircle8.jpg differ diff --git a/assets/japro/gfx/menus/forcestar0.jpg b/assets/japro/gfx/menus/forcestar0.jpg new file mode 100644 index 0000000000..d8d44aa7b6 Binary files /dev/null and b/assets/japro/gfx/menus/forcestar0.jpg differ diff --git a/assets/japro/gfx/menus/forcestar1.jpg b/assets/japro/gfx/menus/forcestar1.jpg new file mode 100644 index 0000000000..1801d875e4 Binary files /dev/null and b/assets/japro/gfx/menus/forcestar1.jpg differ diff --git a/assets/japro/gfx/menus/forcestar2.jpg b/assets/japro/gfx/menus/forcestar2.jpg new file mode 100644 index 0000000000..cc83ef8dc5 Binary files /dev/null and b/assets/japro/gfx/menus/forcestar2.jpg differ diff --git a/assets/japro/gfx/menus/forcestar3.jpg b/assets/japro/gfx/menus/forcestar3.jpg new file mode 100644 index 0000000000..0ae6862e53 Binary files /dev/null and b/assets/japro/gfx/menus/forcestar3.jpg differ diff --git a/assets/japro/gfx/menus/forcestar4.jpg b/assets/japro/gfx/menus/forcestar4.jpg new file mode 100644 index 0000000000..57a8f2c621 Binary files /dev/null and b/assets/japro/gfx/menus/forcestar4.jpg differ diff --git a/assets/japro/gfx/menus/forcestar5.jpg b/assets/japro/gfx/menus/forcestar5.jpg new file mode 100644 index 0000000000..615d3780ea Binary files /dev/null and b/assets/japro/gfx/menus/forcestar5.jpg differ diff --git a/assets/japro/gfx/menus/forcestar6.jpg b/assets/japro/gfx/menus/forcestar6.jpg new file mode 100644 index 0000000000..adc33a1208 Binary files /dev/null and b/assets/japro/gfx/menus/forcestar6.jpg differ diff --git a/assets/japro/gfx/menus/forcestar7.jpg b/assets/japro/gfx/menus/forcestar7.jpg new file mode 100644 index 0000000000..fde96adadc Binary files /dev/null and b/assets/japro/gfx/menus/forcestar7.jpg differ diff --git a/assets/japro/gfx/menus/forcestar8.jpg b/assets/japro/gfx/menus/forcestar8.jpg new file mode 100644 index 0000000000..c304a11f7d Binary files /dev/null and b/assets/japro/gfx/menus/forcestar8.jpg differ diff --git a/assets/japro/gfx/menus/greyscale.jpg b/assets/japro/gfx/menus/greyscale.jpg new file mode 100644 index 0000000000..fa1d2bac6e Binary files /dev/null and b/assets/japro/gfx/menus/greyscale.jpg differ diff --git a/assets/japro/gfx/menus/mission_loc_but_off.tga b/assets/japro/gfx/menus/mission_loc_but_off.tga new file mode 100644 index 0000000000..9ec5d32157 Binary files /dev/null and b/assets/japro/gfx/menus/mission_loc_but_off.tga differ diff --git a/assets/japro/gfx/menus/mission_loc_but_on.tga b/assets/japro/gfx/menus/mission_loc_but_on.tga new file mode 100644 index 0000000000..64993884cd Binary files /dev/null and b/assets/japro/gfx/menus/mission_loc_but_on.tga differ diff --git a/assets/japro/gfx/menus/radar/radar.png b/assets/japro/gfx/menus/radar/radar.png new file mode 100644 index 0000000000..42de029c44 Binary files /dev/null and b/assets/japro/gfx/menus/radar/radar.png differ diff --git a/assets/japro/gfx/menus/radar/radar_glow.png b/assets/japro/gfx/menus/radar/radar_glow.png new file mode 100644 index 0000000000..936a99a9b9 Binary files /dev/null and b/assets/japro/gfx/menus/radar/radar_glow.png differ diff --git a/assets/japro/gfx/menus/saberonly.jpg b/assets/japro/gfx/menus/saberonly.jpg new file mode 100644 index 0000000000..2b729018de Binary files /dev/null and b/assets/japro/gfx/menus/saberonly.jpg differ diff --git a/assets/japro/gfx/mp/ammo_metallic_bolts.tga b/assets/japro/gfx/mp/ammo_metallic_bolts.tga new file mode 100644 index 0000000000..35d322de21 Binary files /dev/null and b/assets/japro/gfx/mp/ammo_metallic_bolts.tga differ diff --git a/assets/japro/gfx/mp/ammo_power_cell.tga b/assets/japro/gfx/mp/ammo_power_cell.tga new file mode 100644 index 0000000000..90577ead14 Binary files /dev/null and b/assets/japro/gfx/mp/ammo_power_cell.tga differ diff --git a/assets/japro/gfx/mp/ammo_rockets.tga b/assets/japro/gfx/mp/ammo_rockets.tga new file mode 100644 index 0000000000..01c0bddc99 Binary files /dev/null and b/assets/japro/gfx/mp/ammo_rockets.tga differ diff --git a/assets/japro/gfx/mp/energy_cell.tga b/assets/japro/gfx/mp/energy_cell.tga new file mode 100644 index 0000000000..93bcb08ad7 Binary files /dev/null and b/assets/japro/gfx/mp/energy_cell.tga differ diff --git a/assets/japro/gfx/mp/f_icon_dk_drain.tga b/assets/japro/gfx/mp/f_icon_dk_drain.tga new file mode 100644 index 0000000000..00e4971c33 Binary files /dev/null and b/assets/japro/gfx/mp/f_icon_dk_drain.tga differ diff --git a/assets/japro/gfx/mp/f_icon_dk_forceother.tga b/assets/japro/gfx/mp/f_icon_dk_forceother.tga new file mode 100644 index 0000000000..946a33375e Binary files /dev/null and b/assets/japro/gfx/mp/f_icon_dk_forceother.tga differ diff --git a/assets/japro/gfx/mp/f_icon_dk_grip.tga b/assets/japro/gfx/mp/f_icon_dk_grip.tga new file mode 100644 index 0000000000..f01484fab6 Binary files /dev/null and b/assets/japro/gfx/mp/f_icon_dk_grip.tga differ diff --git a/assets/japro/gfx/mp/f_icon_dk_l1.tga b/assets/japro/gfx/mp/f_icon_dk_l1.tga new file mode 100644 index 0000000000..b7cbb8e8e2 Binary files /dev/null and b/assets/japro/gfx/mp/f_icon_dk_l1.tga differ diff --git a/assets/japro/gfx/mp/f_icon_dk_rage.tga b/assets/japro/gfx/mp/f_icon_dk_rage.tga new file mode 100644 index 0000000000..69d16c6ed7 Binary files /dev/null and b/assets/japro/gfx/mp/f_icon_dk_rage.tga differ diff --git a/assets/japro/gfx/mp/f_icon_levitation.tga b/assets/japro/gfx/mp/f_icon_levitation.tga new file mode 100644 index 0000000000..4ea3c899bf Binary files /dev/null and b/assets/japro/gfx/mp/f_icon_levitation.tga differ diff --git a/assets/japro/gfx/mp/f_icon_lt_absorb.tga b/assets/japro/gfx/mp/f_icon_lt_absorb.tga new file mode 100644 index 0000000000..cbe2309dca Binary files /dev/null and b/assets/japro/gfx/mp/f_icon_lt_absorb.tga differ diff --git a/assets/japro/gfx/mp/f_icon_lt_heal.tga b/assets/japro/gfx/mp/f_icon_lt_heal.tga new file mode 100644 index 0000000000..238ab452ba Binary files /dev/null and b/assets/japro/gfx/mp/f_icon_lt_heal.tga differ diff --git a/assets/japro/gfx/mp/f_icon_lt_healother.tga b/assets/japro/gfx/mp/f_icon_lt_healother.tga new file mode 100644 index 0000000000..d965ffc8db Binary files /dev/null and b/assets/japro/gfx/mp/f_icon_lt_healother.tga differ diff --git a/assets/japro/gfx/mp/f_icon_lt_protect.tga b/assets/japro/gfx/mp/f_icon_lt_protect.tga new file mode 100644 index 0000000000..cce153a1b3 Binary files /dev/null and b/assets/japro/gfx/mp/f_icon_lt_protect.tga differ diff --git a/assets/japro/gfx/mp/f_icon_lt_telepathy.tga b/assets/japro/gfx/mp/f_icon_lt_telepathy.tga new file mode 100644 index 0000000000..17ed57710b Binary files /dev/null and b/assets/japro/gfx/mp/f_icon_lt_telepathy.tga differ diff --git a/assets/japro/gfx/mp/f_icon_pull.tga b/assets/japro/gfx/mp/f_icon_pull.tga new file mode 100644 index 0000000000..43dade28ff Binary files /dev/null and b/assets/japro/gfx/mp/f_icon_pull.tga differ diff --git a/assets/japro/gfx/mp/f_icon_push.tga b/assets/japro/gfx/mp/f_icon_push.tga new file mode 100644 index 0000000000..c4d10f006c Binary files /dev/null and b/assets/japro/gfx/mp/f_icon_push.tga differ diff --git a/assets/japro/gfx/mp/f_icon_ragerec.tga b/assets/japro/gfx/mp/f_icon_ragerec.tga new file mode 100644 index 0000000000..f7b8c6e68b Binary files /dev/null and b/assets/japro/gfx/mp/f_icon_ragerec.tga differ diff --git a/assets/japro/gfx/mp/f_icon_saber_attack.tga b/assets/japro/gfx/mp/f_icon_saber_attack.tga new file mode 100644 index 0000000000..12856a4c50 Binary files /dev/null and b/assets/japro/gfx/mp/f_icon_saber_attack.tga differ diff --git a/assets/japro/gfx/mp/f_icon_saber_defend.tga b/assets/japro/gfx/mp/f_icon_saber_defend.tga new file mode 100644 index 0000000000..0b7c5a97a5 Binary files /dev/null and b/assets/japro/gfx/mp/f_icon_saber_defend.tga differ diff --git a/assets/japro/gfx/mp/f_icon_saber_throw.tga b/assets/japro/gfx/mp/f_icon_saber_throw.tga new file mode 100644 index 0000000000..dfb2cc7c17 Binary files /dev/null and b/assets/japro/gfx/mp/f_icon_saber_throw.tga differ diff --git a/assets/japro/gfx/mp/f_icon_sight.tga b/assets/japro/gfx/mp/f_icon_sight.tga new file mode 100644 index 0000000000..ea1f517461 Binary files /dev/null and b/assets/japro/gfx/mp/f_icon_sight.tga differ diff --git a/assets/japro/gfx/mp/f_icon_speed.tga b/assets/japro/gfx/mp/f_icon_speed.tga new file mode 100644 index 0000000000..3b3f3a953a Binary files /dev/null and b/assets/japro/gfx/mp/f_icon_speed.tga differ diff --git a/assets/japro/gfx/mp/large_shield.tga b/assets/japro/gfx/mp/large_shield.tga new file mode 100644 index 0000000000..f501b966f9 Binary files /dev/null and b/assets/japro/gfx/mp/large_shield.tga differ diff --git a/assets/japro/gfx/mp/siegeicons/hoth/walldoor.jpg b/assets/japro/gfx/mp/siegeicons/hoth/walldoor.jpg new file mode 100644 index 0000000000..bdb38eebd9 Binary files /dev/null and b/assets/japro/gfx/mp/siegeicons/hoth/walldoor.jpg differ diff --git a/assets/japro/gfx/mp/siegeicons/hoth/walldoor_o.tga b/assets/japro/gfx/mp/siegeicons/hoth/walldoor_o.tga new file mode 100644 index 0000000000..9bd50dc929 Binary files /dev/null and b/assets/japro/gfx/mp/siegeicons/hoth/walldoor_o.tga differ diff --git a/assets/japro/gfx/mp/siegeicons/hoth/walldoor_x.tga b/assets/japro/gfx/mp/siegeicons/hoth/walldoor_x.tga new file mode 100644 index 0000000000..9c19dc875a Binary files /dev/null and b/assets/japro/gfx/mp/siegeicons/hoth/walldoor_x.tga differ diff --git a/assets/japro/gfx/mp/small_shield.tga b/assets/japro/gfx/mp/small_shield.tga new file mode 100644 index 0000000000..b73dd2ff98 Binary files /dev/null and b/assets/japro/gfx/mp/small_shield.tga differ diff --git a/assets/japro/gfx/mplevels/siege1_hoth.jpg b/assets/japro/gfx/mplevels/siege1_hoth.jpg new file mode 100644 index 0000000000..19be8733df Binary files /dev/null and b/assets/japro/gfx/mplevels/siege1_hoth.jpg differ diff --git a/assets/japro/models/weapons2/detpack/det_pack.md3 b/assets/japro/models/weapons2/detpack/det_pack.md3 new file mode 100644 index 0000000000..878b256630 Binary files /dev/null and b/assets/japro/models/weapons2/detpack/det_pack.md3 differ diff --git a/assets/japro/models/weapons2/detpack/det_pack.qc b/assets/japro/models/weapons2/detpack/det_pack.qc new file mode 100644 index 0000000000..3f9179aa28 --- /dev/null +++ b/assets/japro/models/weapons2/detpack/det_pack.qc @@ -0,0 +1,27 @@ +// Quake III Arena MD3 control file, generated by MilkShape 3D +// +$model "models/weapons2/detpack/det_pack.md3" +// reference frame +//$frames -1 -1 +// frame 1-30 +$frames 1 30 +$flags 0 +$numskins 0 + +// you can have one or no parent tag + +// tags + +// meshes (surfaces) +$mesh "w_hand" +$skin "models/weapons2/detpack/hand.tga" +$flags 0 + +$mesh "w_detpack" +$skin "models/weapons2/detpack/pack.tga" +$flags 0 + +$mesh "w_lights" +$skin "models/weapons2/detpack/lights.tga" +$flags 0 + diff --git a/assets/japro/models/weapons2/detpack/det_pack2.md3 b/assets/japro/models/weapons2/detpack/det_pack2.md3 new file mode 100644 index 0000000000..f3aea92e89 Binary files /dev/null and b/assets/japro/models/weapons2/detpack/det_pack2.md3 differ diff --git a/assets/japro/models/weapons2/detpack/hand.jpg b/assets/japro/models/weapons2/detpack/hand.jpg new file mode 100644 index 0000000000..9d85a4b098 Binary files /dev/null and b/assets/japro/models/weapons2/detpack/hand.jpg differ diff --git a/assets/japro/models/weapons2/detpack/lights.jpg b/assets/japro/models/weapons2/detpack/lights.jpg new file mode 100644 index 0000000000..de2dea171c Binary files /dev/null and b/assets/japro/models/weapons2/detpack/lights.jpg differ diff --git a/assets/japro/models/weapons2/detpack/pack.jpg b/assets/japro/models/weapons2/detpack/pack.jpg new file mode 100644 index 0000000000..41eb88708c Binary files /dev/null and b/assets/japro/models/weapons2/detpack/pack.jpg differ diff --git a/assets/japro/models/weapons2/heavy_repeater/heavy_repeater_barrel.md3 b/assets/japro/models/weapons2/heavy_repeater/heavy_repeater_barrel.md3 new file mode 100644 index 0000000000..f6f234ab61 Binary files /dev/null and b/assets/japro/models/weapons2/heavy_repeater/heavy_repeater_barrel.md3 differ diff --git a/assets/japro/models/weapons2/laser_trap/laser_trap.md3 b/assets/japro/models/weapons2/laser_trap/laser_trap.md3 new file mode 100644 index 0000000000..9ebd204a60 Binary files /dev/null and b/assets/japro/models/weapons2/laser_trap/laser_trap.md3 differ diff --git a/assets/japro/models/weapons2/merr_sonn/merr_sonn.md3 b/assets/japro/models/weapons2/merr_sonn/merr_sonn.md3 new file mode 100644 index 0000000000..74cd530b64 Binary files /dev/null and b/assets/japro/models/weapons2/merr_sonn/merr_sonn.md3 differ diff --git a/assets/japro/models/weapons2/thermal/thermal.md3 b/assets/japro/models/weapons2/thermal/thermal.md3 new file mode 100644 index 0000000000..220be384ea Binary files /dev/null and b/assets/japro/models/weapons2/thermal/thermal.md3 differ