mirror of
https://github.com/DrBeef/Raze.git
synced 2025-03-01 15:00:53 +00:00
- Duke: fixed Jibs animation and scale.
This commit is contained in:
parent
a6a4e628df
commit
f43dc9d925
5 changed files with 22 additions and 3 deletions
source/games/duke/src
wadsrc/static/zscript/games/duke/actors
|
@ -250,7 +250,7 @@ void initactorflags_r()
|
||||||
TILE_EGG = EGG;
|
TILE_EGG = EGG;
|
||||||
|
|
||||||
gs.firstdebris = SCRAP6;
|
gs.firstdebris = SCRAP6;
|
||||||
gs.gutsscale = 0.25;
|
gs.gutsscale = 0.125;
|
||||||
}
|
}
|
||||||
|
|
||||||
END_DUKE_NS
|
END_DUKE_NS
|
||||||
|
|
|
@ -3187,7 +3187,7 @@ void loadcons()
|
||||||
gs.shrinkerblastradius = 650;
|
gs.shrinkerblastradius = 650;
|
||||||
gs.gravity = 0.6875;
|
gs.gravity = 0.6875;
|
||||||
gs.tripbombblastradius = 3880;
|
gs.tripbombblastradius = 3880;
|
||||||
gs.gutsscale = 0.125;
|
gs.gutsscale = 0.5;
|
||||||
gs.playerheight = 40;
|
gs.playerheight = 40;
|
||||||
gs.displayflags = DUKE3D_NO_WIDESCREEN_PINNING;
|
gs.displayflags = DUKE3D_NO_WIDESCREEN_PINNING;
|
||||||
|
|
||||||
|
|
|
@ -480,6 +480,13 @@ x(JIBS5, 2265)
|
||||||
x(BURNING, 2270)
|
x(BURNING, 2270)
|
||||||
x(FIRE, 2271)
|
x(FIRE, 2271)
|
||||||
x(JIBS6, 2286)
|
x(JIBS6, 2286)
|
||||||
|
x(JIBS6A, 2287)
|
||||||
|
x(JIBS6B, 2288)
|
||||||
|
x(JIBS6C, 2289)
|
||||||
|
x(JIBS6D, 2290)
|
||||||
|
x(JIBS6E, 2291)
|
||||||
|
x(JIBS6F, 2292)
|
||||||
|
x(JIBS6G, 2293)
|
||||||
x(BLOODSPLAT1, 2296)
|
x(BLOODSPLAT1, 2296)
|
||||||
x(BLOODSPLAT3, 2297)
|
x(BLOODSPLAT3, 2297)
|
||||||
x(BLOODSPLAT2, 2298)
|
x(BLOODSPLAT2, 2298)
|
||||||
|
|
|
@ -477,6 +477,13 @@ x(BURNING, 1494)
|
||||||
x(FIRE, 1495)
|
x(FIRE, 1495)
|
||||||
x(USERWEAPON, 1510)
|
x(USERWEAPON, 1510)
|
||||||
x(JIBS6, 1515)
|
x(JIBS6, 1515)
|
||||||
|
x(JIBS6A, 1516)
|
||||||
|
x(JIBS6B, 1517)
|
||||||
|
x(JIBS6C, 1518)
|
||||||
|
x(JIBS6D, 1519)
|
||||||
|
x(JIBS6E, 1520)
|
||||||
|
x(JIBS6F, 1521)
|
||||||
|
x(JIBS6G, 1522)
|
||||||
x(BLOODSPLAT1, 1525)
|
x(BLOODSPLAT1, 1525)
|
||||||
x(BLOODSPLAT3, 1526)
|
x(BLOODSPLAT3, 1526)
|
||||||
x(BLOODSPLAT2, 1527)
|
x(BLOODSPLAT2, 1527)
|
||||||
|
|
|
@ -50,7 +50,7 @@ class DukeJibs1 : DukeActor
|
||||||
default
|
default
|
||||||
{
|
{
|
||||||
statnum STAT_MISC;
|
statnum STAT_MISC;
|
||||||
spriteset "JIBS1", "JIBS6";
|
spriteset "JIBS1", "JIBS6", "JIBS6A", "JIBS6B", "JIBS6C", "JIBS6D", "JIBS6E", "JIBS6F", "JIBS6G";
|
||||||
}
|
}
|
||||||
|
|
||||||
override void Tick()
|
override void Tick()
|
||||||
|
@ -184,6 +184,10 @@ class DukeJibs1 : DukeActor
|
||||||
if (Raze.isRRRA() && tspr.pal == 19)
|
if (Raze.isRRRA() && tspr.pal == 19)
|
||||||
tspr.shade = -127;
|
tspr.shade = -127;
|
||||||
|
|
||||||
|
if (spritesetindex == 1)
|
||||||
|
{
|
||||||
|
tspr.SetSpritePic(self, 1 + self.temp_data[0]);
|
||||||
|
}
|
||||||
if (tspr.pal == 6) tspr.shade = -120;
|
if (tspr.pal == 6) tspr.shade = -120;
|
||||||
|
|
||||||
if (self.sector.shadedsector == 1)
|
if (self.sector.shadedsector == 1)
|
||||||
|
@ -256,6 +260,7 @@ class DukeJibs6 : DukeJibs1
|
||||||
override void Initialize()
|
override void Initialize()
|
||||||
{
|
{
|
||||||
if (Raze.isRR()) self.scale *= 0.5; // only RR needs this.
|
if (Raze.isRR()) self.scale *= 0.5; // only RR needs this.
|
||||||
|
self.setSpriteSetImage(1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue