Skip to content

Commit 79e36d2

Browse files
jekyllgrimjekyllgrim
committed
fixed unlimited ammo, added revenant trail
1 parent 976b511 commit 79e36d2

File tree

10 files changed

+69
-22
lines changed

10 files changed

+69
-22
lines changed

‎GAMEINFO.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
STARTUPTITLE="Beautiful Doom dev build 20190515 � 2008 Jekyll Grim Payne"
1+
STARTUPTITLE="Beautiful Doom dev build 20190520 � 2008 Jekyll Grim Payne"
22
STARTUPCOLORS="0000FF","000000"

‎Z_BDoom/BD_monster.zc

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,8 +265,8 @@ states
265265
}
266266

267267
/*This is spawned by a burning monster and receives a "fire" translation from it,
268-
while the monster receives "scorched" translation. The interaction of sprites
269-
create an effect of smooth transition.
268+
while the monster receives "scorched" translation. As this fades out, it creates
269+
an effect of smooth transition from burning to scorched.
270270
*/
271271
Class TranslatedBurningBody : Actor
272272
{
@@ -289,6 +289,10 @@ override void Tick() {
289289
super.Tick();
290290
if (level.isFrozen())
291291
return;
292+
if (waterlevel > 1) {
293+
destroy();
294+
return;
295+
}
292296
if (fadetime < fadestart)
293297
fadetime++;
294298
else
@@ -337,6 +341,10 @@ override void Tick () {
337341
super.Tick();
338342
if (level.isFrozen())
339343
return;
344+
if (waterlevel > 1) {
345+
destroy();
346+
return;
347+
}
340348
if (!master || !bdoom_flames) {
341349
self.destroy();
342350
return;

‎Z_BDoom/m_Bruiser.zc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ Class BD_BaronBall : BaronBall //replaces BaronBall
192192
{
193193
int broll;
194194
Default {
195+
+BLOODLESSIMPACT
195196
+ROLLSPRITE
196197
damagetype "GreenFire";
197198
decal "BaronScorch";

‎Z_BDoom/m_Mancubus.zc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ states
115115
Class BD_FatShot : FatShot //replaces FatShot
116116
{
117117
Default {
118+
+BLOODLESSIMPACT
118119
Damagetype "Fire";
119120
decal "BigScorch";
120121
renderstyle "Add";

‎Z_BDoom/m_Revenant.zc

Lines changed: 40 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,24 +136,39 @@ void BD_Tracer()
136136
if (level.maptime & 3) return;
137137

138138
//This version won't forcefully spawn stupid BulletPuffs, only modded smoke
139-
Actor smoke = Spawn ("BD_RevenantTracerSmoke", Vec3Offset(-Vel.X, -Vel.Y, 0.), ALLOW_REPLACE);
139+
/*Actor smoke = Spawn ("BD_RevenantTracerSmoke", Vec3Offset(-Vel.X, -Vel.Y, 0.), ALLOW_REPLACE);
140140

141141
if (smoke != null)
142142
{
143143
smoke.Vel.Z = 1.;
144144
smoke.tics -= random[Tracer](0, 3);
145145
if (smoke.tics < 1)
146146
smoke.tics = 1;
147-
}
147+
}*/
148148
A_Tracer2(16.875);
149149
}
150+
override void Tick () {
151+
Vector3 oldPos = self.pos;
152+
Super.Tick();
153+
if (!bdoom_debris || level.isFrozen() || !tracer)
154+
return;
155+
Vector3 path = level.vec3Diff( self.pos, oldPos );
156+
double distance = path.length() / 3; //this determines how far apart the particles are
157+
Vector3 direction = path / distance;
158+
int steps = int( distance );
159+
160+
for( int i = 0; i < steps; i++ ) {
161+
Spawn("TracerTrail", oldPos );
162+
oldPos = level.vec3Offset( oldPos, direction );
163+
}
164+
}
150165
states
151166
{
152167
Spawn:
153168
TNT1 A 0 NoDelay {
154169
A_PlaySound("revenant/tracerfly",4,1.0,true,5);
155-
if (bdoom_debris)
156-
A_spawnItemEx("BD_RevenantTracerFlare",flags:SXF_SETMASTER|SXF_ORIGINATOR);
170+
//if (bdoom_debris)
171+
//A_spawnItemEx("BD_RevenantTracerFlare",flags:SXF_SETMASTER|SXF_ORIGINATOR);
157172
}
158173
SKEB AB 2 BD_Tracer();
159174
goto spawn+1;
@@ -169,6 +184,27 @@ states
169184
}
170185
}
171186

187+
Class TracerTrail : Actor
188+
{
189+
Default {
190+
+NOINTERACTION
191+
+NOBLOCKMAP
192+
renderstyle "Add";
193+
alpha 0.8;
194+
scale 0.04;
195+
}
196+
states
197+
{
198+
Spawn:
199+
LENR A 1 {
200+
A_FadeOut(0.04);
201+
scale*=0.99;
202+
}
203+
loop;
204+
}
205+
}
206+
207+
172208
Class BD_RevenantTracerFlare : BD_ProjFlare
173209
{
174210
Default {

‎Z_BDoom/m_doomimp.zc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ states
172172
Class BD_DoomImpBall : DoomImpBall //replaces DoomImpBall
173173
{
174174
Default {
175+
+BLOODLESSIMPACT
175176
Damagetype "Fire";
176177
scale 0.5;
177178
decal "Scorch";

‎Z_BDoom/w_chaingun.zc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ states
200200
If(Bdoom_tracers)
201201
A_FireBullets (5.6, 0, 1, 5, "EnBulletPuff",FBF_USEAMMO|FBF_NORANDOMPUFFZ,0,"BulletTracer",0,0) ;
202202
else
203-
A_FireBullets (5.6, 0, 1, 5, "EnBulletPuff",FBF_NORANDOMPUFFZ);
203+
A_FireBullets (5.6, 0, 1, 5, "EnBulletPuff",FBF_USEAMMO|FBF_NORANDOMPUFFZ);
204204
}
205205
MGGG B 1;
206206
TNT1 A 0 {
@@ -219,7 +219,7 @@ states
219219
If(Bdoom_tracers)
220220
A_FireBullets (5.6, 0, 1, 5, "EnBulletPuff",FBF_USEAMMO|FBF_NORANDOMPUFFZ,0,"BulletTracer",0,0) ;
221221
else
222-
A_FireBullets (5.6, 0, 1, 5, "EnBulletPuff",FBF_NORANDOMPUFFZ);
222+
A_FireBullets (5.6, 0, 1, 5, "EnBulletPuff",FBF_USEAMMO|FBF_NORANDOMPUFFZ);
223223
}
224224
MGGG B 1;
225225
TNT1 A 0 {
@@ -275,7 +275,7 @@ states
275275
If(Bdoom_tracers)
276276
A_FireBullets(8,3, -1, 5, "EnBulletPuff",FBF_USEAMMO|FBF_NORANDOMPUFFZ,0,"BulletTracer",0,0) ;
277277
else
278-
A_FireBullets(8,3, -1, 5, "EnBulletPuff",FBF_NORANDOMPUFFZ);
278+
A_FireBullets(8,3, -1, 5, "EnBulletPuff",FBF_USEAMMO|FBF_NORANDOMPUFFZ);
279279
}
280280
MGGG C 1 {
281281
if(bdoom_debris)
@@ -289,7 +289,7 @@ states
289289
If(Bdoom_tracers)
290290
A_FireBullets(8,3, -1, 5, "EnBulletPuff",FBF_USEAMMO|FBF_NORANDOMPUFFZ,0,"BulletTracer",0,0) ;
291291
else
292-
A_FireBullets(8,3, -1, 5, "EnBulletPuff",FBF_NORANDOMPUFFZ);
292+
A_FireBullets(8,3, -1, 5, "EnBulletPuff",FBF_USEAMMO|FBF_NORANDOMPUFFZ);
293293
}
294294
MGGG C 1 {
295295
if( bdoom_debris)
@@ -306,7 +306,7 @@ states
306306
If(Bdoom_tracers)
307307
A_FireBullets(8,3, -1, 5, "EnBulletPuff",FBF_USEAMMO|FBF_NORANDOMPUFFZ,0,"BulletTracer",0,0) ;
308308
else
309-
A_FireBullets(8,3, -1, 5, "EnBulletPuff",FBF_NORANDOMPUFFZ);
309+
A_FireBullets(8,3, -1, 5, "EnBulletPuff",FBF_USEAMMO|FBF_NORANDOMPUFFZ);
310310
}
311311
MGGG C 1 {
312312
if (Bdoom_debris == 1)

‎Z_BDoom/w_pistol.zc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ states
109109
If(Bdoom_tracers)
110110
A_FireBullets (5.6, 0, 1, 5, "EnBulletPuff",FBF_USEAMMO|FBF_NORANDOMPUFFZ,0,"BulletTracer",0,0);
111111
else
112-
A_FireBullets (5.6, 0, 1, 5, "EnBulletPuff",FBF_NORANDOMPUFFZ);
112+
A_FireBullets (5.6, 0, 1, 5, "EnBulletPuff",FBF_USEAMMO|FBF_NORANDOMPUFFZ);
113113
return ResolveState(null);
114114
}
115115
PI0G ABCD 1;
@@ -202,7 +202,7 @@ states
202202
If(GetCVAR("Bdoom_tracers")==1)
203203
A_FireBullets (5.6, 0, 1, 5, "EnBulletPuff",FBF_USEAMMO|FBF_NORANDOMPUFFZ,0,"BulletTracer",0,0);
204204
else
205-
A_FireBullets (5.6, 0, 1, 5, "EnBulletPuff",FBF_NORANDOMPUFFZ);
205+
A_FireBullets (5.6, 0, 1, 5, "EnBulletPuff",FBF_USEAMMO|FBF_NORANDOMPUFFZ);
206206
}
207207
PIBN ABCD 1;
208208
TNT1 A 0 { If( Bdoom_debris==1)
@@ -226,7 +226,7 @@ states
226226
If(GetCVAR("Bdoom_tracers")==1)
227227
A_FireBullets (5, 1.5, -1, 5, "EnBulletPuff",FBF_USEAMMO|FBF_NORANDOMPUFFZ,0,"BulletTracer",0,7.5);
228228
else
229-
A_FireBullets (5, 1.5, -1, 5, "EnBulletPuff",FBF_NORANDOMPUFFZ);
229+
A_FireBullets (5, 1.5, -1, 5, "EnBulletPuff",FBF_USEAMMO|FBF_NORANDOMPUFFZ);
230230
}
231231
PIDF BC 1;
232232
PIDF D 2;
@@ -260,7 +260,7 @@ states
260260
If(GetCVAR("Bdoom_tracers")==1)
261261
A_FireBullets (5, 1.5, -1, 5, "EnBulletPuff",FBF_USEAMMO|FBF_NORANDOMPUFFZ,0,"BulletTracer",0,-7.5);
262262
else
263-
A_FireBullets (5, 1.5, -1, 5, "EnBulletPuff",FBF_NORANDOMPUFFZ);
263+
A_FireBullets (5, 1.5, -1, 5, "EnBulletPuff",FBF_USEAMMO|FBF_NORANDOMPUFFZ);
264264
}
265265
PIDF FG 1;
266266
PIDF H 2;
@@ -275,7 +275,7 @@ states
275275
If(GetCVAR("Bdoom_tracers")==1)
276276
A_FireBullets (5, 1.5, -1, 5, "EnBulletPuff",FBF_USEAMMO|FBF_NORANDOMPUFFZ,0,"BulletTracer",0,7.5);
277277
else
278-
A_FireBullets (5, 1.5, -1, 5, "EnBulletPuff",FBF_NORANDOMPUFFZ);
278+
A_FireBullets (5, 1.5, -1, 5, "EnBulletPuff",FBF_USEAMMO|FBF_NORANDOMPUFFZ);
279279
}
280280
PIDF JK 1;
281281
PIDF L 2;

‎Z_BDoom/w_shotgun.zc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ States
120120
If(bdoom_tracers)
121121
A_FireBullets (5.6, 0, 7, 5, "EnBulletPuff",FBF_USEAMMO|FBF_NORANDOMPUFFZ,0,"BulletTracer",0,0);
122122
else
123-
A_FireBullets (5.6, 0, 7, 5, "EnBulletPuff",FBF_NORANDOMPUFFZ);
123+
A_FireBullets (5.6, 0, 7, 5, "EnBulletPuff",FBF_USEAMMO|FBF_NORANDOMPUFFZ);
124124
}
125125
SHOG BDFHIJKL 1;
126126
SHOG M 2 {

‎Z_BDoom/w_ssg.zc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ states
128128
if (bdoom_tracers == 1)
129129
A_FireBullets(11.2, 7.1, 20, 5, "EnSSGPuff",FBF_USEAMMO|FBF_NORANDOMPUFFZ,0,"BulletTracer",0,0);
130130
else
131-
A_FireBullets(11.2, 7.1, 20, 5, "EnSSGPuff",FBF_NORANDOMPUFFZ);
131+
A_FireBullets(11.2, 7.1, 20, 5, "EnSSGPuff",FBF_USEAMMO|FBF_NORANDOMPUFFZ);
132132
}
133133
SH2F A 2;
134134
SH2F B 2;
@@ -217,7 +217,7 @@ states
217217
if (bdoom_tracers == 1)
218218
A_FireBullets(11.2, 7.1, 20, 5, "EnSSGPuff",FBF_USEAMMO|FBF_NORANDOMPUFFZ,0,"BulletTracer",0,0);
219219
else
220-
A_FireBullets(11.2, 7.1, 20, 5, "EnSSGPuff",FBF_NORANDOMPUFFZ);
220+
A_FireBullets(11.2, 7.1, 20, 5, "EnSSGPuff",FBF_USEAMMO|FBF_NORANDOMPUFFZ);
221221
}
222222

223223
SH2F X 1 A_Playsound("weapons/ssg/fire", 6);
@@ -241,7 +241,7 @@ states
241241
if (bdoom_tracers == 1)
242242
A_FireBullets(10,6.5,10,5, "EnSSGPuff",FBF_USEAMMO|FBF_NORANDOMPUFFZ,0,"BulletTracer",0,1);
243243
else
244-
A_FireBullets(10,6.5,10,5,"EnSSGPuff",FBF_NORANDOMPUFFZ);
244+
A_FireBullets(10,6.5,10,5,"EnSSGPuff",FBF_USEAMMO|FBF_NORANDOMPUFFZ);
245245
}
246246
TNT1 A 0 {
247247
If(bdoom_debris)
@@ -258,7 +258,7 @@ states
258258
if (bdoom_tracers == 1)
259259
A_FireBullets(10,6.5,10,5, "EnSSGPuff",FBF_USEAMMO|FBF_NORANDOMPUFFZ,0,"BulletTracer",0,1);
260260
else
261-
A_FireBullets(10,6.5,10,5,"EnSSGPuff",FBF_NORANDOMPUFFZ);
261+
A_FireBullets(10,6.5,10,5,"EnSSGPuff",FBF_USEAMMO|FBF_NORANDOMPUFFZ);
262262
}
263263
TNT1 A 0 {
264264
If(bdoom_debris) {

0 commit comments

Comments
 (0)