Cube  Diff

Annotate Patch Side-by-side Diff

Differences From Artifact [9d16bae907]:

To Artifact [3ac13a2932]:

︙
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
















50
51
52
53
54
55
56

27
28
29
30
31
32
33
















34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56








-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+








	short gun, speed, health, freq, lag, rate, pain, loyalty, mscale,
	    bscale;
	short painsound, diesound;
	OFConstantString *name, *mdlname;
}

monstertypes[NUMMONSTERTYPES] = {
    {GUN_FIREBALL, 15, 100, 3, 0, 100, 800, 1, 10, 10, S_PAINO, S_DIE1,
        @"an ogre", @"monster/ogro"},
    {GUN_CG, 18, 70, 2, 70, 10, 400, 2, 8, 9, S_PAINR, S_DEATHR, @"a rhino",
        @"monster/rhino"},
    {GUN_SG, 14, 120, 1, 100, 300, 400, 4, 14, 14, S_PAINE, S_DEATHE,
        @"ratamahatta", @"monster/rat"},
    {GUN_RIFLE, 15, 200, 1, 80, 300, 300, 4, 18, 18, S_PAINS, S_DEATHS,
        @"a slith", @"monster/slith"},
    {GUN_RL, 13, 500, 1, 0, 100, 200, 6, 24, 24, S_PAINB, S_DEATHB, @"bauul",
        @"monster/bauul"},
    {GUN_BITE, 22, 50, 3, 0, 100, 400, 1, 12, 15, S_PAINP, S_PIGGR2,
        @"a hellpig", @"monster/hellpig"},
    {GUN_ICEBALL, 12, 250, 1, 0, 10, 400, 6, 18, 18, S_PAINH, S_DEATHH,
        @"a knight", @"monster/knight"},
    {GUN_SLIMEBALL, 15, 100, 1, 0, 200, 400, 2, 13, 10, S_PAIND, S_DEATHD,
        @"a goblin", @"monster/goblin"},
	{ GUN_FIREBALL, 15, 100, 3, 0, 100, 800, 1, 10, 10, S_PAINO, S_DIE1,
	    @"an ogre", @"monster/ogro" },
	{ GUN_CG, 18, 70, 2, 70, 10, 400, 2, 8, 9, S_PAINR, S_DEATHR,
	    @"a rhino", @"monster/rhino" },
	{ GUN_SG, 14, 120, 1, 100, 300, 400, 4, 14, 14, S_PAINE, S_DEATHE,
	    @"ratamahatta", @"monster/rat" },
	{ GUN_RIFLE, 15, 200, 1, 80, 300, 300, 4, 18, 18, S_PAINS, S_DEATHS,
	    @"a slith", @"monster/slith" },
	{ GUN_RL, 13, 500, 1, 0, 100, 200, 6, 24, 24, S_PAINB, S_DEATHB,
	    @"bauul", @"monster/bauul" },
	{ GUN_BITE, 22, 50, 3, 0, 100, 400, 1, 12, 15, S_PAINP, S_PIGGR2,
	    @"a hellpig", @"monster/hellpig" },
	{ GUN_ICEBALL, 12, 250, 1, 0, 10, 400, 6, 18, 18, S_PAINH, S_DEATHH,
	    @"a knight", @"monster/knight" },
	{ GUN_SLIMEBALL, 15, 100, 1, 0, 200, 400, 2, 13, 10, S_PAIND, S_DEATHD,
	    @"a goblin", @"monster/goblin" },
};

dynent *
basicmonster(int type, int yaw, int state, int trigger, int move)
{
	if (type >= NUMMONSTERTYPES) {
		conoutf(@"warning: unknown monster in spawn: %d", type);
︙
86
87
88
89
90
91
92
93

94
95
96
97


98
99
100
101
102
103
104

86
87
88
89
90
91
92

93
94
95
96

97
98
99
100
101
102
103
104
105








-
+



-
+
+








	return m;
}

void
spawnmonster() // spawn a random monster according to freq distribution in DMSP
{
	int n = rnd(TOTMFREQ), type;
	for (int i = 0;; i++)
	for (int i = 0;; i++) {
		if ((n -= monstertypes[i].freq) < 0) {
			type = i;
			break;
		};
		}
	}
	basicmonster(type, rnd(360), M_SEARCH, 1000, 1);
}

void
monsterclear() // called after map start of when toggling edit mode to
               // reset/spawn all monsters to initial state
{
︙
118
119
120
121
122
123
124
125

126
127
128
129
130
131
132

119
120
121
122
123
124
125

126
127
128
129
130
131
132
133








-
+








			    ents[i].attr2, ents[i].attr1, M_SLEEP, 100, 0);
			m->o.x = ents[i].x;
			m->o.y = ents[i].y;
			m->o.z = ents[i].z;
			entinmap(m);
			monstertotal++;
		}
	};
	}
}

bool
los(float lx, float ly, float lz, float bx, float by, float bz,
    OFVector3D &v) // height-correct line of sight for monster shooting/seeing
{
	if (OUTBORD((int)lx, (int)ly) || OUTBORD((int)bx, (int)by))
︙
154
155
156
157
158
159
160
161

162
163
164
165
166
167
168

155
156
157
158
159
160
161

162
163
164
165
166
167
168
169








-
+








			break;
		v.x = x;
		v.y = y;
		v.z = rz;
		x += dx / (float)steps;
		y += dy / (float)steps;
		i++;
	};
	}
	return i >= steps;
}

bool
enemylos(dynent *m, OFVector3D &v)
{
	v = m->o;
︙
199
200
201
202
203
204
205
206

207
208
209
210
211
212
213
214
215
216
217

218
219
220
221
222

223

224
225
226
227

228

229

230
231


232
233
234


235
236
237
238
239


240
241
242
243
244
245
246

200
201
202
203
204
205
206

207
208
209
210
211
212
213
214
215
216
217

218
219
220
221
222

223

224
225



226

227
228
229


230
231



232
233


234


235
236
237
238
239
240
241
242
243








-
+










-
+




-
+
-
+

-
-
-
+
-
+

+
-
-
+
+
-
-
-
+
+
-
-

-
-
+
+








void
monsteraction(
    dynent *m) // main AI thinking routine, called every frame for every monster
{
	if (m->enemy->state == CS_DEAD) {
		m->enemy = player1;
		m->anger = 0;
	};
	}
	normalise(m, m->targetyaw);
	if (m->targetyaw > m->yaw) // slowly turn monster towards his target
	{
		m->yaw += curtime * 0.5f;
		if (m->targetyaw < m->yaw)
			m->yaw = m->targetyaw;
	} else {
		m->yaw -= curtime * 0.5f;
		if (m->targetyaw > m->yaw)
			m->yaw = m->targetyaw;
	};
	}

	vdist(disttoenemy, vectoenemy, m->o, m->enemy->o);
	m->pitch = atan2(m->enemy->o.z - m->o.z, disttoenemy) * 180 / PI;

	if (m->blocked) // special case: if we run into scenery
	// special case: if we run into scenery
	{
	if (m->blocked) {
		m->blocked = false;
		if (!rnd(20000 /
		        monstertypes[m->mtype]
		            .speed)) // try to jump over obstackle (rare)
		// try to jump over obstackle (rare)
		{
		if (!rnd(20000 / monstertypes[m->mtype].speed))
			m->jumpnext = true;
		// search for a way around (common)
		} else if (m->trigger < lastmillis &&
		    (m->monsterstate != M_HOME ||
		else if (m->trigger < lastmillis &&
		    (m->monsterstate != M_HOME || !rnd(5))) {
		        !rnd(5))) // search for a way around (common)
		{
			m->targetyaw +=
			// patented "random walk" AI pathfinding (tm) ;)
			m->targetyaw += 180 + rnd(180);
			    180 + rnd(180); // patented "random walk" AI
			                    // pathfinding (tm) ;)
			transition(m, M_SEARCH, 1, 400, 1000);
		};
	};
		}
	}

	float enemyyaw =
	    -(float)atan2(m->enemy->o.x - m->o.x, m->enemy->o.y - m->o.y) / PI *
	        180 +
	    180;

	switch (m->monsterstate) {
︙
262
263
264
265
266
267
268
269

270
271

272
273
274
275
276
277
278
279
280

281
282
283
284
285
286
287

259
260
261
262
263
264
265

266
267

268
269
270
271
272
273
274
275
276

277
278
279
280
281
282
283
284








-
+

-
+








-
+








		if (disttoenemy < 8 // the better the angle to the player, the
		                    // further the monster can see/hear
		    || (disttoenemy < 16 && angle < 135) ||
		    (disttoenemy < 32 && angle < 90) ||
		    (disttoenemy < 64 && angle < 45) || angle < 10) {
			transition(m, M_HOME, 1, 500, 200);
			playsound(S_GRUNT1 + rnd(2), &m->o);
		};
		}
		break;
	};
	}

	case M_AIMING: // this state is the delay between wanting to shoot and
	               // actually firing
		if (m->trigger < lastmillis) {
			m->lastaction = 0;
			m->attacking = true;
			shoot(m, m->attacktarget);
			transition(m, M_ATTACKING, 0, 600, 0);
		};
		}
		break;

	case M_HOME: // monster has visual contact, heads straight for player
	             // and may want to shoot at any time
		m->targetyaw = enemyyaw;
		if (m->trigger < lastmillis) {
			OFVector3D target;
︙
301
302
303
304
305
306
307
308
309
310



311
312

313
314
315
316
317
318
319

320

321
322

323
324
325



326
327
328
329
330
331





332
333
334
335
336



337
338
339
340
341
342
343
344
345
346
347

348
349
350
351
352
353
354
355
356

298
299
300
301
302
303
304



305
306
307
308

309
310
311
312
313
314
315
316
317

318


319



320
321
322
323
324
325



326
327
328
329
330

331
332


333
334
335

336
337
338
339
340
341
342
343
344

345
346

347
348
349
350
351
352
353








-
-
-
+
+
+

-
+







+
-
+
-
-
+
-
-
-
+
+
+



-
-
-
+
+
+
+
+
-


-
-
+
+
+
-









-
+

-








					m->attacktarget = target;
					transition(m, M_AIMING, 0,
					    monstertypes[m->mtype].lag, 10);
				} else // track player some more
				{
					transition(m, M_HOME, 1,
					    monstertypes[m->mtype].rate, 0);
				};
			};
		};
				}
			}
		}
		break;
	};
	}

	moveplayer(m, 1, false); // use physics to move monster
}

void
monsterpain(dynent *m, int damage, dynent *d)
{
	// a monster hit us
	if (d->monsterstate) // a monster hit us
	if (d->monsterstate) {
	{
		if (m != d) // guard for RL guys shooting themselves :)
		// guard for RL guys shooting themselves :)
		{
			m->anger++; // don't attack straight away, first get
			            // angry
		if (m != d) {
			// don't attack straight away, first get angry
			m->anger++;
			int anger =
			    m->mtype == d->mtype ? m->anger / 2 : m->anger;
			if (anger >= monstertypes[m->mtype].loyalty)
				m->enemy = d; // monster infight if very angry
		};
	} else // player hit us
				// monster infight if very angry
				m->enemy = d;
		}
	} else {
		// player hit us
	{
		m->anger = 0;
		m->enemy = d;
	};
	transition(m, M_PAIN, 0, monstertypes[m->mtype].pain,
	}
	// in this state monster won't attack
	transition(m, M_PAIN, 0, monstertypes[m->mtype].pain, 200);
	    200); // in this state monster won't attack
	if ((m->health -= damage) <= 0) {
		m->state = CS_DEAD;
		m->lastaction = lastmillis;
		numkilled++;
		player1->frags = numkilled;
		playsound(monstertypes[m->mtype].diesound, &m->o);
		int remain = monstertotal - numkilled;
		if (remain > 0 && remain <= 5)
			conoutf(@"only %d monster(s) remaining", remain);
	} else {
	} else
		playsound(monstertypes[m->mtype].painsound, &m->o);
	}
}

void
endsp(bool allkilled)
{
	conoutf(allkilled ? @"you have cleared the map!"
	                  : @"you reached the exit!");
︙
364
365
366
367
368
369
370
371

372
373
374
375
376
377
378
379
380
381
382
383
384
385
386

387

388
389
390




391
392
393


394
395
396
397
398
399







400
401
402
403
404
405
406

361
362
363
364
365
366
367

368
369
370
371
372
373
374
375
376
377
378
379
380
381
382

383
384
385



386
387
388
389



390
391






392
393
394
395
396
397
398
399
400
401
402
403
404
405








-
+














-
+

+
-
-
-
+
+
+
+
-
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+








monsterthink()
{
	if (m_dmsp && spawnremain && lastmillis > nextmonster) {
		if (spawnremain-- == monstertotal)
			conoutf(@"The invasion has begun!");
		nextmonster = lastmillis + 1000;
		spawnmonster();
	};
	}

	if (monstertotal && !spawnremain && numkilled == monstertotal)
		endsp(true);

	loopv(ents) // equivalent of player entity touch, but only teleports are
	            // used
	{
		entity &e = ents[i];
		if (e.type != TELEPORT)
			continue;
		if (OUTBORD(e.x, e.y))
			continue;
		OFVector3D v =
		    OFMakeVector3D(e.x, e.y, (float)S(e.x, e.y)->floor);
		loopv(monsters) if (monsters[i]->state == CS_DEAD)
		loopv(monsters)
		{
			if (monsters[i]->state == CS_DEAD) {
			if (lastmillis - monsters[i]->lastaction < 2000) {
				monsters[i]->move = 0;
				moveplayer(monsters[i], 1, false);
				if (lastmillis - monsters[i]->lastaction <
				    2000) {
					monsters[i]->move = 0;
					moveplayer(monsters[i], 1, false);
			};
		}
		else
				}
			} else {
		{
			v.z += monsters[i]->eyeheight;
			vdist(dist, t, monsters[i]->o, v);
			v.z -= monsters[i]->eyeheight;
			if (dist < 4)
				teleport((int)(&e - &ents[0]), monsters[i]);
				v.z += monsters[i]->eyeheight;
				vdist(dist, t, monsters[i]->o, v);
				v.z -= monsters[i]->eyeheight;
				if (dist < 4)
					teleport(
					    (int)(&e - &ents[0]), monsters[i]);
			}
		}
	}

	loopv(monsters) if (monsters[i]->state == CS_ALIVE)
	    monsteraction(monsters[i]);
}
︙
Fossil 2.25 [8f798279d5] 2024-11-06 12:59:09
This page was generated in about 0.015s