time to start tuning the game
This commit is contained in:
parent
3521491bcd
commit
36cb73a9b9
83
combat.c
83
combat.c
|
@ -112,7 +112,8 @@ void advanceEnemyBullets(
|
||||||
void attemptToFireEnemyBullets(
|
void attemptToFireEnemyBullets(
|
||||||
struct EnemyPosition enemyPosition[],
|
struct EnemyPosition enemyPosition[],
|
||||||
struct BulletPosition enemyBulletPosition[],
|
struct BulletPosition enemyBulletPosition[],
|
||||||
struct RabbitPosition *rabbitPosition
|
struct RabbitPosition *rabbitPosition,
|
||||||
|
int difficulty
|
||||||
) {
|
) {
|
||||||
int availableBullets[ENEMY_BULLET_LIMIT];
|
int availableBullets[ENEMY_BULLET_LIMIT];
|
||||||
|
|
||||||
|
@ -151,7 +152,7 @@ void attemptToFireEnemyBullets(
|
||||||
ENEMY_BULLET_VELOCITY
|
ENEMY_BULLET_VELOCITY
|
||||||
);
|
);
|
||||||
|
|
||||||
enemyPosition[i].enemyFireDelayStep = ENEMY_FIRE_MIN_DELAY + rand() % ENEMY_FIRE_VARIABLE_DELAY;
|
enemyPosition[i].enemyFireDelayStep = ENEMY_FIRE_MIN_DELAY - difficulty + rand() % ENEMY_FIRE_VARIABLE_DELAY;
|
||||||
|
|
||||||
if (maxAvailableBulletIndex < 0) break;
|
if (maxAvailableBulletIndex < 0) break;
|
||||||
}
|
}
|
||||||
|
@ -193,11 +194,13 @@ void populateTargetCollision(struct CompiledSpriteRender *sprite) {
|
||||||
|
|
||||||
// We are hardcoding a 2x2 grid on the screen as our collision partitioning
|
// We are hardcoding a 2x2 grid on the screen as our collision partitioning
|
||||||
// scheme.
|
// scheme.
|
||||||
|
int rabbitGrid[4];
|
||||||
int rabbitBulletGrid[4][RABBIT_BULLET_LIMIT];
|
int rabbitBulletGrid[4][RABBIT_BULLET_LIMIT];
|
||||||
int enemyGrid[4][ENEMY_MAX_COUNT];
|
int enemyGrid[4][ENEMY_MAX_COUNT];
|
||||||
int rabbitGrid[4];
|
int enemyBulletGrid[4][ENEMY_BULLET_LIMIT];
|
||||||
int rabbitBulletGridIndex[4], enemyGridIndex[4];
|
int rabbitBulletGridIndex[4],
|
||||||
|
enemyGridIndex[4],
|
||||||
|
enemyBulletGridIndex[4];
|
||||||
int gridPosition[4];
|
int gridPosition[4];
|
||||||
|
|
||||||
#define CALCULATE_GRID_POS(x,y) ((x / COLLISION_GRID_SIZE) + (y / COLLISION_GRID_SIZE) * 2)
|
#define CALCULATE_GRID_POS(x,y) ((x / COLLISION_GRID_SIZE) + (y / COLLISION_GRID_SIZE) * 2)
|
||||||
|
@ -219,6 +222,7 @@ void determineGridPositionsForSprite(struct CompiledSpriteRender *sprite) {
|
||||||
|
|
||||||
void buildCollisionGrids(
|
void buildCollisionGrids(
|
||||||
struct BulletPosition rabbitBulletPosition[],
|
struct BulletPosition rabbitBulletPosition[],
|
||||||
|
struct BulletPosition enemyBulletPosition[],
|
||||||
struct RabbitPosition *rabbitPosition,
|
struct RabbitPosition *rabbitPosition,
|
||||||
struct EnemyPosition enemyPosition[]
|
struct EnemyPosition enemyPosition[]
|
||||||
) {
|
) {
|
||||||
|
@ -226,6 +230,7 @@ void buildCollisionGrids(
|
||||||
|
|
||||||
for (grid = 0; grid < 4; ++grid) {
|
for (grid = 0; grid < 4; ++grid) {
|
||||||
rabbitBulletGridIndex[grid] = 0;
|
rabbitBulletGridIndex[grid] = 0;
|
||||||
|
enemyBulletGridIndex[grid] = 0;
|
||||||
enemyGridIndex[grid] = 0;
|
enemyGridIndex[grid] = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -252,6 +257,21 @@ void buildCollisionGrids(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for (i = 0; i < ENEMY_BULLET_LIMIT; ++i) {
|
||||||
|
if (!enemyBulletPosition[i].isActive) continue;
|
||||||
|
if (enemyBulletPosition[i].willBeInactive) continue;
|
||||||
|
|
||||||
|
enemyBullet.x = enemyBulletPosition[i].x;
|
||||||
|
enemyBullet.y = enemyBulletPosition[i].y;
|
||||||
|
determineGridPositionsForSprite(&enemyBullet);
|
||||||
|
|
||||||
|
for (grid = 0; grid < 4; ++grid) {
|
||||||
|
if (gridPosition[grid]) {
|
||||||
|
enemyBulletGrid[grid][enemyBulletGridIndex[grid]++] = i;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
for (i = 0; i < ENEMY_MAX_COUNT; ++i) {
|
for (i = 0; i < ENEMY_MAX_COUNT; ++i) {
|
||||||
if (!enemyPosition[i].isActive) continue;
|
if (!enemyPosition[i].isActive) continue;
|
||||||
if (enemyPosition[i].willBeInactive) continue;
|
if (enemyPosition[i].willBeInactive) continue;
|
||||||
|
@ -268,6 +288,41 @@ void buildCollisionGrids(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int handleEnemyBulletToRabbitCollisions(
|
||||||
|
struct BulletPosition enemyBulletPosition[],
|
||||||
|
struct RabbitPosition *rabbitPosition
|
||||||
|
) {
|
||||||
|
int bulletIdx, grid;
|
||||||
|
int resolvedBulletIdx;
|
||||||
|
|
||||||
|
int hitCount = 0;
|
||||||
|
|
||||||
|
rabbit.x = rabbitPosition->rabbitPosition[0];
|
||||||
|
rabbit.y = rabbitPosition->rabbitPosition[1];
|
||||||
|
populateTargetCollision(&rabbit);
|
||||||
|
|
||||||
|
for (grid = 0; grid < 4; ++grid) {
|
||||||
|
if (!rabbitGrid[grid]) continue;
|
||||||
|
|
||||||
|
for (bulletIdx = 0; bulletIdx < enemyBulletGridIndex[grid]; ++bulletIdx) {
|
||||||
|
resolvedBulletIdx = enemyBulletGrid[grid][bulletIdx];
|
||||||
|
|
||||||
|
enemyBullet.x = enemyBulletPosition[resolvedBulletIdx].x;
|
||||||
|
enemyBullet.y = enemyBulletPosition[resolvedBulletIdx].y;
|
||||||
|
populateSourceCollision(&enemyBullet);
|
||||||
|
|
||||||
|
if (isCollision()) {
|
||||||
|
enemyBulletPosition[resolvedBulletIdx].willBeInactive = 1;
|
||||||
|
hitCount++;
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return hitCount;
|
||||||
|
}
|
||||||
|
|
||||||
void handleRabbitBulletToEnemyCollisions(
|
void handleRabbitBulletToEnemyCollisions(
|
||||||
struct BulletPosition rabbitBulletPosition[],
|
struct BulletPosition rabbitBulletPosition[],
|
||||||
struct EnemyPosition enemyPosition[]
|
struct EnemyPosition enemyPosition[]
|
||||||
|
@ -281,9 +336,6 @@ void handleRabbitBulletToEnemyCollisions(
|
||||||
for (bulletIdx = 0; bulletIdx < rabbitBulletGridIndex[grid]; ++bulletIdx) {
|
for (bulletIdx = 0; bulletIdx < rabbitBulletGridIndex[grid]; ++bulletIdx) {
|
||||||
resolvedBulletIdx = rabbitBulletGrid[grid][bulletIdx];
|
resolvedBulletIdx = rabbitBulletGrid[grid][bulletIdx];
|
||||||
|
|
||||||
if (!rabbitBulletPosition[resolvedBulletIdx].isActive) continue;
|
|
||||||
if (rabbitBulletPosition[resolvedBulletIdx].willBeInactive) continue;
|
|
||||||
|
|
||||||
bullet.x = rabbitBulletPosition[resolvedBulletIdx].x;
|
bullet.x = rabbitBulletPosition[resolvedBulletIdx].x;
|
||||||
bullet.y = rabbitBulletPosition[resolvedBulletIdx].y;
|
bullet.y = rabbitBulletPosition[resolvedBulletIdx].y;
|
||||||
populateSourceCollision(&bullet);
|
populateSourceCollision(&bullet);
|
||||||
|
@ -291,9 +343,6 @@ void handleRabbitBulletToEnemyCollisions(
|
||||||
for (enemyIdx = 0; enemyIdx < enemyGridIndex[grid]; ++enemyIdx) {
|
for (enemyIdx = 0; enemyIdx < enemyGridIndex[grid]; ++enemyIdx) {
|
||||||
resolvedEnemyIdx = enemyGrid[grid][enemyIdx];
|
resolvedEnemyIdx = enemyGrid[grid][enemyIdx];
|
||||||
|
|
||||||
if (!enemyPosition[resolvedEnemyIdx].isActive) continue;
|
|
||||||
if (enemyPosition[resolvedEnemyIdx].willBeInactive) continue;
|
|
||||||
|
|
||||||
enemy.x = enemyPosition[resolvedEnemyIdx].enemyPosition[0];
|
enemy.x = enemyPosition[resolvedEnemyIdx].enemyPosition[0];
|
||||||
enemy.y = enemyPosition[resolvedEnemyIdx].enemyPosition[1];
|
enemy.y = enemyPosition[resolvedEnemyIdx].enemyPosition[1];
|
||||||
populateTargetCollision(&enemy);
|
populateTargetCollision(&enemy);
|
||||||
|
@ -309,11 +358,11 @@ void handleRabbitBulletToEnemyCollisions(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void handleRabbitToEnemyCollisions(
|
int handleRabbitToEnemyCollisions(
|
||||||
struct RabbitPosition *rabbitPosition,
|
struct RabbitPosition *rabbitPosition,
|
||||||
struct EnemyPosition enemyPosition[]
|
struct EnemyPosition enemyPosition[]
|
||||||
) {
|
) {
|
||||||
int enemyIdx, grid, resolvedEnemyIdx;
|
int enemyIdx, grid, resolvedEnemyIdx, hitCount = 0;
|
||||||
|
|
||||||
// to start: brute force items
|
// to start: brute force items
|
||||||
// possible performance improvements:
|
// possible performance improvements:
|
||||||
|
@ -329,17 +378,17 @@ void handleRabbitToEnemyCollisions(
|
||||||
for (enemyIdx = 0; enemyIdx < enemyGridIndex[grid]; ++enemyIdx) {
|
for (enemyIdx = 0; enemyIdx < enemyGridIndex[grid]; ++enemyIdx) {
|
||||||
resolvedEnemyIdx = enemyGrid[grid][enemyIdx];
|
resolvedEnemyIdx = enemyGrid[grid][enemyIdx];
|
||||||
|
|
||||||
if (!enemyPosition[resolvedEnemyIdx].isActive) continue;
|
|
||||||
if (enemyPosition[resolvedEnemyIdx].willBeInactive) continue;
|
|
||||||
|
|
||||||
enemy.x = enemyPosition[resolvedEnemyIdx].enemyPosition[0];
|
enemy.x = enemyPosition[resolvedEnemyIdx].enemyPosition[0];
|
||||||
enemy.y = enemyPosition[resolvedEnemyIdx].enemyPosition[1];
|
enemy.y = enemyPosition[resolvedEnemyIdx].enemyPosition[1];
|
||||||
populateTargetCollision(&enemy);
|
populateTargetCollision(&enemy);
|
||||||
|
|
||||||
if (isCollision()) {
|
if (isCollision()) {
|
||||||
enemyPosition[resolvedEnemyIdx].willBeInactive = 1;
|
enemyPosition[resolvedEnemyIdx].willBeInactive = 1;
|
||||||
}
|
hitCount++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return hitCount;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
11
combat.h
11
combat.h
|
@ -14,13 +14,19 @@ void handleRabbitBulletToEnemyCollisions(
|
||||||
struct EnemyPosition[]
|
struct EnemyPosition[]
|
||||||
);
|
);
|
||||||
|
|
||||||
void handleRabbitToEnemyCollisions(
|
int handleRabbitToEnemyCollisions(
|
||||||
struct RabbitPosition*,
|
struct RabbitPosition*,
|
||||||
struct EnemyPosition[]
|
struct EnemyPosition[]
|
||||||
);
|
);
|
||||||
|
|
||||||
|
int handleEnemyBulletToRabbitCollisions(
|
||||||
|
struct BulletPosition enemyBulletPosition[],
|
||||||
|
struct RabbitPosition *rabbitPosition
|
||||||
|
);
|
||||||
|
|
||||||
void buildCollisionGrids(
|
void buildCollisionGrids(
|
||||||
struct BulletPosition rabbitBulletPosition[],
|
struct BulletPosition rabbitBulletPosition[],
|
||||||
|
struct BulletPosition enemyBulletPosition[],
|
||||||
struct RabbitPosition *rabbitPosition,
|
struct RabbitPosition *rabbitPosition,
|
||||||
struct EnemyPosition enemyPosition[]
|
struct EnemyPosition enemyPosition[]
|
||||||
);
|
);
|
||||||
|
@ -28,7 +34,8 @@ void buildCollisionGrids(
|
||||||
void attemptToFireEnemyBullets(
|
void attemptToFireEnemyBullets(
|
||||||
struct EnemyPosition[],
|
struct EnemyPosition[],
|
||||||
struct BulletPosition enemyBulletPosition[],
|
struct BulletPosition enemyBulletPosition[],
|
||||||
struct RabbitPosition*
|
struct RabbitPosition*,
|
||||||
|
int difficulty
|
||||||
);
|
);
|
||||||
|
|
||||||
void advanceEnemyBullets(
|
void advanceEnemyBullets(
|
||||||
|
|
11
const.h
11
const.h
|
@ -15,6 +15,8 @@
|
||||||
#define RABBIT_BULLET_COOLDOWN (10)
|
#define RABBIT_BULLET_COOLDOWN (10)
|
||||||
#define RABBIT_BULLET_HEIGHT_START (8)
|
#define RABBIT_BULLET_HEIGHT_START (8)
|
||||||
|
|
||||||
|
#define RABBIT_HEALTH_MAX (100)
|
||||||
|
|
||||||
#define MOUSE_LIMIT_TOP (TILE_SIZE)
|
#define MOUSE_LIMIT_TOP (TILE_SIZE)
|
||||||
#define MOUSE_LIMIT_BOTTOM ((ARENA_HEIGHT_TILES - 1) * TILE_SIZE - 1)
|
#define MOUSE_LIMIT_BOTTOM ((ARENA_HEIGHT_TILES - 1) * TILE_SIZE - 1)
|
||||||
#define MOUSE_LIMIT_LEFT (TILE_SIZE)
|
#define MOUSE_LIMIT_LEFT (TILE_SIZE)
|
||||||
|
@ -30,9 +32,14 @@
|
||||||
#define ENEMY_MOVE_DELAY (3)
|
#define ENEMY_MOVE_DELAY (3)
|
||||||
#define ENEMY_BULLET_VELOCITY (RABBIT_BULLET_VELOCITY - 2)
|
#define ENEMY_BULLET_VELOCITY (RABBIT_BULLET_VELOCITY - 2)
|
||||||
|
|
||||||
#define ENEMY_FIRE_MIN_DELAY (30)
|
#define ENEMY_FIRE_MIN_DELAY (35)
|
||||||
#define ENEMY_FIRE_VARIABLE_DELAY (45)
|
#define ENEMY_FIRE_VARIABLE_DELAY (60)
|
||||||
|
|
||||||
|
#define ENEMY_BULLET_DAMAGE (4)
|
||||||
|
#define ENEMY_COLLISION_DAMAGE (8)
|
||||||
|
#define ENEMY_KILL_HEALTH_GAIN (1)
|
||||||
|
|
||||||
#define BASE_ENEMY_SPAWN_COOLDOWN (30)
|
#define BASE_ENEMY_SPAWN_COOLDOWN (30)
|
||||||
|
#define DIFFICULTY_SPAWN_COOLDOWN_REDUCTION (2)
|
||||||
#define MINIMUM_ENEMY_SPAWN_COOLDOWN (3)
|
#define MINIMUM_ENEMY_SPAWN_COOLDOWN (3)
|
||||||
#define VARIABLE_ENEMY_SPAWN_COOLDOWN (10)
|
#define VARIABLE_ENEMY_SPAWN_COOLDOWN (10)
|
||||||
|
|
|
@ -0,0 +1,152 @@
|
||||||
|
/**
|
||||||
|
* 8x8 monochrome bitmap fonts for rendering
|
||||||
|
* Author: Daniel Hepper <daniel@hepper.net>
|
||||||
|
*
|
||||||
|
* License: Public Domain
|
||||||
|
*
|
||||||
|
* Based on:
|
||||||
|
* // Summary: font8x8.h
|
||||||
|
* // 8x8 monochrome bitmap fonts for rendering
|
||||||
|
* //
|
||||||
|
* // Author:
|
||||||
|
* // Marcel Sondaar
|
||||||
|
* // International Business Machines (public domain VGA fonts)
|
||||||
|
* //
|
||||||
|
* // License:
|
||||||
|
* // Public Domain
|
||||||
|
*
|
||||||
|
* Fetched from: http://dimensionalrift.homelinux.net/combuster/mos3/?p=viewsource&file=/modules/gfx/font8_8.asm
|
||||||
|
**/
|
||||||
|
|
||||||
|
// Constant: font8x8_basic
|
||||||
|
// Contains an 8x8 font map for unicode points U+0000 - U+007F (basic latin)
|
||||||
|
char font8x8_basic[128][8] = {
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0000 (nul)
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0001
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0002
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0003
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0004
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0005
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0006
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0007
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0008
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0009
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+000A
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+000B
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+000C
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+000D
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+000E
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+000F
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0010
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0011
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0012
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0013
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0014
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0015
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0016
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0017
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0018
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0019
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+001A
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+001B
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+001C
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+001D
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+001E
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+001F
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0020 (space)
|
||||||
|
{ 0x18, 0x3C, 0x3C, 0x18, 0x18, 0x00, 0x18, 0x00}, // U+0021 (!)
|
||||||
|
{ 0x36, 0x36, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0022 (")
|
||||||
|
{ 0x36, 0x36, 0x7F, 0x36, 0x7F, 0x36, 0x36, 0x00}, // U+0023 (#)
|
||||||
|
{ 0x0C, 0x3E, 0x03, 0x1E, 0x30, 0x1F, 0x0C, 0x00}, // U+0024 ($)
|
||||||
|
{ 0x00, 0x63, 0x33, 0x18, 0x0C, 0x66, 0x63, 0x00}, // U+0025 (%)
|
||||||
|
{ 0x1C, 0x36, 0x1C, 0x6E, 0x3B, 0x33, 0x6E, 0x00}, // U+0026 (&)
|
||||||
|
{ 0x06, 0x06, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0027 (')
|
||||||
|
{ 0x18, 0x0C, 0x06, 0x06, 0x06, 0x0C, 0x18, 0x00}, // U+0028 (()
|
||||||
|
{ 0x06, 0x0C, 0x18, 0x18, 0x18, 0x0C, 0x06, 0x00}, // U+0029 ())
|
||||||
|
{ 0x00, 0x66, 0x3C, 0xFF, 0x3C, 0x66, 0x00, 0x00}, // U+002A (*)
|
||||||
|
{ 0x00, 0x0C, 0x0C, 0x3F, 0x0C, 0x0C, 0x00, 0x00}, // U+002B (+)
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x0C, 0x06}, // U+002C (,)
|
||||||
|
{ 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x00}, // U+002D (-)
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x0C, 0x00}, // U+002E (.)
|
||||||
|
{ 0x60, 0x30, 0x18, 0x0C, 0x06, 0x03, 0x01, 0x00}, // U+002F (/)
|
||||||
|
{ 0x3E, 0x63, 0x73, 0x7B, 0x6F, 0x67, 0x3E, 0x00}, // U+0030 (0)
|
||||||
|
{ 0x0C, 0x0E, 0x0C, 0x0C, 0x0C, 0x0C, 0x3F, 0x00}, // U+0031 (1)
|
||||||
|
{ 0x1E, 0x33, 0x30, 0x1C, 0x06, 0x33, 0x3F, 0x00}, // U+0032 (2)
|
||||||
|
{ 0x1E, 0x33, 0x30, 0x1C, 0x30, 0x33, 0x1E, 0x00}, // U+0033 (3)
|
||||||
|
{ 0x38, 0x3C, 0x36, 0x33, 0x7F, 0x30, 0x78, 0x00}, // U+0034 (4)
|
||||||
|
{ 0x3F, 0x03, 0x1F, 0x30, 0x30, 0x33, 0x1E, 0x00}, // U+0035 (5)
|
||||||
|
{ 0x1C, 0x06, 0x03, 0x1F, 0x33, 0x33, 0x1E, 0x00}, // U+0036 (6)
|
||||||
|
{ 0x3F, 0x33, 0x30, 0x18, 0x0C, 0x0C, 0x0C, 0x00}, // U+0037 (7)
|
||||||
|
{ 0x1E, 0x33, 0x33, 0x1E, 0x33, 0x33, 0x1E, 0x00}, // U+0038 (8)
|
||||||
|
{ 0x1E, 0x33, 0x33, 0x3E, 0x30, 0x18, 0x0E, 0x00}, // U+0039 (9)
|
||||||
|
{ 0x00, 0x0C, 0x0C, 0x00, 0x00, 0x0C, 0x0C, 0x00}, // U+003A (:)
|
||||||
|
{ 0x00, 0x0C, 0x0C, 0x00, 0x00, 0x0C, 0x0C, 0x06}, // U+003B (;)
|
||||||
|
{ 0x18, 0x0C, 0x06, 0x03, 0x06, 0x0C, 0x18, 0x00}, // U+003C (<)
|
||||||
|
{ 0x00, 0x00, 0x3F, 0x00, 0x00, 0x3F, 0x00, 0x00}, // U+003D (=)
|
||||||
|
{ 0x06, 0x0C, 0x18, 0x30, 0x18, 0x0C, 0x06, 0x00}, // U+003E (>)
|
||||||
|
{ 0x1E, 0x33, 0x30, 0x18, 0x0C, 0x00, 0x0C, 0x00}, // U+003F (?)
|
||||||
|
{ 0x3E, 0x63, 0x7B, 0x7B, 0x7B, 0x03, 0x1E, 0x00}, // U+0040 (@)
|
||||||
|
{ 0x0C, 0x1E, 0x33, 0x33, 0x3F, 0x33, 0x33, 0x00}, // U+0041 (A)
|
||||||
|
{ 0x3F, 0x66, 0x66, 0x3E, 0x66, 0x66, 0x3F, 0x00}, // U+0042 (B)
|
||||||
|
{ 0x3C, 0x66, 0x03, 0x03, 0x03, 0x66, 0x3C, 0x00}, // U+0043 (C)
|
||||||
|
{ 0x1F, 0x36, 0x66, 0x66, 0x66, 0x36, 0x1F, 0x00}, // U+0044 (D)
|
||||||
|
{ 0x7F, 0x46, 0x16, 0x1E, 0x16, 0x46, 0x7F, 0x00}, // U+0045 (E)
|
||||||
|
{ 0x7F, 0x46, 0x16, 0x1E, 0x16, 0x06, 0x0F, 0x00}, // U+0046 (F)
|
||||||
|
{ 0x3C, 0x66, 0x03, 0x03, 0x73, 0x66, 0x7C, 0x00}, // U+0047 (G)
|
||||||
|
{ 0x33, 0x33, 0x33, 0x3F, 0x33, 0x33, 0x33, 0x00}, // U+0048 (H)
|
||||||
|
{ 0x1E, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x1E, 0x00}, // U+0049 (I)
|
||||||
|
{ 0x78, 0x30, 0x30, 0x30, 0x33, 0x33, 0x1E, 0x00}, // U+004A (J)
|
||||||
|
{ 0x67, 0x66, 0x36, 0x1E, 0x36, 0x66, 0x67, 0x00}, // U+004B (K)
|
||||||
|
{ 0x0F, 0x06, 0x06, 0x06, 0x46, 0x66, 0x7F, 0x00}, // U+004C (L)
|
||||||
|
{ 0x63, 0x77, 0x7F, 0x7F, 0x6B, 0x63, 0x63, 0x00}, // U+004D (M)
|
||||||
|
{ 0x63, 0x67, 0x6F, 0x7B, 0x73, 0x63, 0x63, 0x00}, // U+004E (N)
|
||||||
|
{ 0x1C, 0x36, 0x63, 0x63, 0x63, 0x36, 0x1C, 0x00}, // U+004F (O)
|
||||||
|
{ 0x3F, 0x66, 0x66, 0x3E, 0x06, 0x06, 0x0F, 0x00}, // U+0050 (P)
|
||||||
|
{ 0x1E, 0x33, 0x33, 0x33, 0x3B, 0x1E, 0x38, 0x00}, // U+0051 (Q)
|
||||||
|
{ 0x3F, 0x66, 0x66, 0x3E, 0x36, 0x66, 0x67, 0x00}, // U+0052 (R)
|
||||||
|
{ 0x1E, 0x33, 0x07, 0x0E, 0x38, 0x33, 0x1E, 0x00}, // U+0053 (S)
|
||||||
|
{ 0x3F, 0x2D, 0x0C, 0x0C, 0x0C, 0x0C, 0x1E, 0x00}, // U+0054 (T)
|
||||||
|
{ 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x3F, 0x00}, // U+0055 (U)
|
||||||
|
{ 0x33, 0x33, 0x33, 0x33, 0x33, 0x1E, 0x0C, 0x00}, // U+0056 (V)
|
||||||
|
{ 0x63, 0x63, 0x63, 0x6B, 0x7F, 0x77, 0x63, 0x00}, // U+0057 (W)
|
||||||
|
{ 0x63, 0x63, 0x36, 0x1C, 0x1C, 0x36, 0x63, 0x00}, // U+0058 (X)
|
||||||
|
{ 0x33, 0x33, 0x33, 0x1E, 0x0C, 0x0C, 0x1E, 0x00}, // U+0059 (Y)
|
||||||
|
{ 0x7F, 0x63, 0x31, 0x18, 0x4C, 0x66, 0x7F, 0x00}, // U+005A (Z)
|
||||||
|
{ 0x1E, 0x06, 0x06, 0x06, 0x06, 0x06, 0x1E, 0x00}, // U+005B ([)
|
||||||
|
{ 0x03, 0x06, 0x0C, 0x18, 0x30, 0x60, 0x40, 0x00}, // U+005C (\)
|
||||||
|
{ 0x1E, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1E, 0x00}, // U+005D (])
|
||||||
|
{ 0x08, 0x1C, 0x36, 0x63, 0x00, 0x00, 0x00, 0x00}, // U+005E (^)
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF}, // U+005F (_)
|
||||||
|
{ 0x0C, 0x0C, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+0060 (`)
|
||||||
|
{ 0x00, 0x00, 0x1E, 0x30, 0x3E, 0x33, 0x6E, 0x00}, // U+0061 (a)
|
||||||
|
{ 0x07, 0x06, 0x06, 0x3E, 0x66, 0x66, 0x3B, 0x00}, // U+0062 (b)
|
||||||
|
{ 0x00, 0x00, 0x1E, 0x33, 0x03, 0x33, 0x1E, 0x00}, // U+0063 (c)
|
||||||
|
{ 0x38, 0x30, 0x30, 0x3e, 0x33, 0x33, 0x6E, 0x00}, // U+0064 (d)
|
||||||
|
{ 0x00, 0x00, 0x1E, 0x33, 0x3f, 0x03, 0x1E, 0x00}, // U+0065 (e)
|
||||||
|
{ 0x1C, 0x36, 0x06, 0x0f, 0x06, 0x06, 0x0F, 0x00}, // U+0066 (f)
|
||||||
|
{ 0x00, 0x00, 0x6E, 0x33, 0x33, 0x3E, 0x30, 0x1F}, // U+0067 (g)
|
||||||
|
{ 0x07, 0x06, 0x36, 0x6E, 0x66, 0x66, 0x67, 0x00}, // U+0068 (h)
|
||||||
|
{ 0x0C, 0x00, 0x0E, 0x0C, 0x0C, 0x0C, 0x1E, 0x00}, // U+0069 (i)
|
||||||
|
{ 0x30, 0x00, 0x30, 0x30, 0x30, 0x33, 0x33, 0x1E}, // U+006A (j)
|
||||||
|
{ 0x07, 0x06, 0x66, 0x36, 0x1E, 0x36, 0x67, 0x00}, // U+006B (k)
|
||||||
|
{ 0x0E, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x1E, 0x00}, // U+006C (l)
|
||||||
|
{ 0x00, 0x00, 0x33, 0x7F, 0x7F, 0x6B, 0x63, 0x00}, // U+006D (m)
|
||||||
|
{ 0x00, 0x00, 0x1F, 0x33, 0x33, 0x33, 0x33, 0x00}, // U+006E (n)
|
||||||
|
{ 0x00, 0x00, 0x1E, 0x33, 0x33, 0x33, 0x1E, 0x00}, // U+006F (o)
|
||||||
|
{ 0x00, 0x00, 0x3B, 0x66, 0x66, 0x3E, 0x06, 0x0F}, // U+0070 (p)
|
||||||
|
{ 0x00, 0x00, 0x6E, 0x33, 0x33, 0x3E, 0x30, 0x78}, // U+0071 (q)
|
||||||
|
{ 0x00, 0x00, 0x3B, 0x6E, 0x66, 0x06, 0x0F, 0x00}, // U+0072 (r)
|
||||||
|
{ 0x00, 0x00, 0x3E, 0x03, 0x1E, 0x30, 0x1F, 0x00}, // U+0073 (s)
|
||||||
|
{ 0x08, 0x0C, 0x3E, 0x0C, 0x0C, 0x2C, 0x18, 0x00}, // U+0074 (t)
|
||||||
|
{ 0x00, 0x00, 0x33, 0x33, 0x33, 0x33, 0x6E, 0x00}, // U+0075 (u)
|
||||||
|
{ 0x00, 0x00, 0x33, 0x33, 0x33, 0x1E, 0x0C, 0x00}, // U+0076 (v)
|
||||||
|
{ 0x00, 0x00, 0x63, 0x6B, 0x7F, 0x7F, 0x36, 0x00}, // U+0077 (w)
|
||||||
|
{ 0x00, 0x00, 0x63, 0x36, 0x1C, 0x36, 0x63, 0x00}, // U+0078 (x)
|
||||||
|
{ 0x00, 0x00, 0x33, 0x33, 0x33, 0x3E, 0x30, 0x1F}, // U+0079 (y)
|
||||||
|
{ 0x00, 0x00, 0x3F, 0x19, 0x0C, 0x26, 0x3F, 0x00}, // U+007A (z)
|
||||||
|
{ 0x38, 0x0C, 0x0C, 0x07, 0x0C, 0x0C, 0x38, 0x00}, // U+007B ({)
|
||||||
|
{ 0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x18, 0x00}, // U+007C (|)
|
||||||
|
{ 0x07, 0x0C, 0x0C, 0x38, 0x0C, 0x0C, 0x07, 0x00}, // U+007D (})
|
||||||
|
{ 0x6E, 0x3B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // U+007E (~)
|
||||||
|
{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} // U+007F
|
||||||
|
};
|
35
game.c
35
game.c
|
@ -17,6 +17,7 @@
|
||||||
#include "movement.h"
|
#include "movement.h"
|
||||||
#include "combat.h"
|
#include "combat.h"
|
||||||
|
|
||||||
|
|
||||||
// TODO: centralize these outside of game.c
|
// TODO: centralize these outside of game.c
|
||||||
struct CompiledSpriteRender rabbit, mouse, bullet, enemy, enemyBullet;
|
struct CompiledSpriteRender rabbit, mouse, bullet, enemy, enemyBullet;
|
||||||
struct SpriteBounds bounds;
|
struct SpriteBounds bounds;
|
||||||
|
@ -83,6 +84,7 @@ void setupEnemies() {
|
||||||
int spawnCooldown = 0;
|
int spawnCooldown = 0;
|
||||||
int difficulty = 0;
|
int difficulty = 0;
|
||||||
int kills = 0;
|
int kills = 0;
|
||||||
|
int health = RABBIT_HEALTH_MAX;
|
||||||
|
|
||||||
int difficultyBands[10] = { 10, 20, 30, 50, 80, 130, 210, 340, 550, 890 };
|
int difficultyBands[10] = { 10, 20, 30, 50, 80, 130, 210, 340, 550, 890 };
|
||||||
|
|
||||||
|
@ -93,6 +95,8 @@ void handleEnemyKills() {
|
||||||
if (enemyPosition[i].wasKilled) {
|
if (enemyPosition[i].wasKilled) {
|
||||||
enemyPosition[i].wasKilled = 0;
|
enemyPosition[i].wasKilled = 0;
|
||||||
kills++;
|
kills++;
|
||||||
|
health += ENEMY_KILL_HEALTH_GAIN;
|
||||||
|
if (health > RABBIT_HEALTH_MAX) health = RABBIT_HEALTH_MAX;
|
||||||
|
|
||||||
hadKill = 1;
|
hadKill = 1;
|
||||||
}
|
}
|
||||||
|
@ -139,7 +143,7 @@ void maybeSpawnEnemy() {
|
||||||
enemyPosition[availableEnemy].oldEnemyPosition[0] = spawnX;
|
enemyPosition[availableEnemy].oldEnemyPosition[0] = spawnX;
|
||||||
enemyPosition[availableEnemy].oldEnemyPosition[1] = spawnY;
|
enemyPosition[availableEnemy].oldEnemyPosition[1] = spawnY;
|
||||||
|
|
||||||
spawnCooldown = (BASE_ENEMY_SPAWN_COOLDOWN - difficulty) + MINIMUM_ENEMY_SPAWN_COOLDOWN + rand() % VARIABLE_ENEMY_SPAWN_COOLDOWN;
|
spawnCooldown = (BASE_ENEMY_SPAWN_COOLDOWN - (difficulty * DIFFICULTY_SPAWN_COOLDOWN_REDUCTION)) + MINIMUM_ENEMY_SPAWN_COOLDOWN + rand() % VARIABLE_ENEMY_SPAWN_COOLDOWN;
|
||||||
}
|
}
|
||||||
|
|
||||||
void setupEnemySprites() {
|
void setupEnemySprites() {
|
||||||
|
@ -365,6 +369,8 @@ void handleMovement() {
|
||||||
}
|
}
|
||||||
|
|
||||||
void handleCombat() {
|
void handleCombat() {
|
||||||
|
int didHitRabbit;
|
||||||
|
|
||||||
if (mouseStatus.leftButtonDown) {
|
if (mouseStatus.leftButtonDown) {
|
||||||
attemptToFireRabbitBullet(
|
attemptToFireRabbitBullet(
|
||||||
&rabbitPosition,
|
&rabbitPosition,
|
||||||
|
@ -376,7 +382,8 @@ void handleCombat() {
|
||||||
attemptToFireEnemyBullets(
|
attemptToFireEnemyBullets(
|
||||||
enemyPosition,
|
enemyPosition,
|
||||||
enemyBulletPosition,
|
enemyBulletPosition,
|
||||||
&rabbitPosition
|
&rabbitPosition,
|
||||||
|
difficulty
|
||||||
);
|
);
|
||||||
|
|
||||||
advanceRabbitBullets(
|
advanceRabbitBullets(
|
||||||
|
@ -390,15 +397,29 @@ void handleCombat() {
|
||||||
|
|
||||||
buildCollisionGrids(
|
buildCollisionGrids(
|
||||||
rabbitBulletPosition,
|
rabbitBulletPosition,
|
||||||
|
enemyBulletPosition,
|
||||||
&rabbitPosition,
|
&rabbitPosition,
|
||||||
enemyPosition
|
enemyPosition
|
||||||
);
|
);
|
||||||
|
|
||||||
handleRabbitToEnemyCollisions(
|
didHitRabbit = handleRabbitToEnemyCollisions(
|
||||||
&rabbitPosition,
|
&rabbitPosition,
|
||||||
enemyPosition
|
enemyPosition
|
||||||
);
|
);
|
||||||
|
|
||||||
|
if (didHitRabbit) {
|
||||||
|
health -= ENEMY_COLLISION_DAMAGE * didHitRabbit;
|
||||||
|
}
|
||||||
|
|
||||||
|
didHitRabbit = handleEnemyBulletToRabbitCollisions(
|
||||||
|
enemyBulletPosition,
|
||||||
|
&rabbitPosition
|
||||||
|
);
|
||||||
|
|
||||||
|
if (didHitRabbit) {
|
||||||
|
health -= ENEMY_BULLET_DAMAGE * didHitRabbit;
|
||||||
|
}
|
||||||
|
|
||||||
handleRabbitBulletToEnemyCollisions(
|
handleRabbitBulletToEnemyCollisions(
|
||||||
rabbitBulletPosition,
|
rabbitBulletPosition,
|
||||||
enemyPosition
|
enemyPosition
|
||||||
|
@ -433,6 +454,8 @@ int main(void) {
|
||||||
int keepRunning = 1;
|
int keepRunning = 1;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
char buffer[20];
|
||||||
|
|
||||||
if (setupGame()) return 1;
|
if (setupGame()) return 1;
|
||||||
|
|
||||||
drawBuffer = getDrawBuffer();
|
drawBuffer = getDrawBuffer();
|
||||||
|
@ -446,6 +469,12 @@ int main(void) {
|
||||||
handleMovement();
|
handleMovement();
|
||||||
handleRedraw();
|
handleRedraw();
|
||||||
handleCombat();
|
handleCombat();
|
||||||
|
handleEnemyKills();
|
||||||
|
|
||||||
|
sprintf(buffer, "Hit: %d", kills);
|
||||||
|
renderStringToDrawBuffer(buffer, 1, 0, 210, 20);
|
||||||
|
sprintf(buffer, "Health: %d ", health);
|
||||||
|
renderStringToDrawBuffer(buffer, 1, 0, 210, 30);
|
||||||
|
|
||||||
waitStartVbl();
|
waitStartVbl();
|
||||||
copyDrawBufferToDisplay();
|
copyDrawBufferToDisplay();
|
||||||
|
|
28
system/vga.c
28
system/vga.c
|
@ -6,6 +6,8 @@
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
|
||||||
|
#include "../font8x8_basic.h"
|
||||||
|
|
||||||
int activePage = 0;
|
int activePage = 0;
|
||||||
byte *drawBuffer;
|
byte *drawBuffer;
|
||||||
|
|
||||||
|
@ -123,3 +125,29 @@ void setVGAColors(struct VGAColor colors[], int totalColors) {
|
||||||
outp(0x3c9, colors[i].blue);
|
outp(0x3c9, colors[i].blue);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#define RENDER_STRING_FAILSAFE (80)
|
||||||
|
|
||||||
|
void renderStringToDrawBuffer(char* buffer, int color, int backgroundColor, int x, int y) {
|
||||||
|
char *bufferPos = buffer, currentCharacter, charRow;
|
||||||
|
int i, fontX, fontY, currentX = x;
|
||||||
|
|
||||||
|
for (i = 0; i < RENDER_STRING_FAILSAFE; ++i) {
|
||||||
|
currentCharacter = *(bufferPos++);
|
||||||
|
if (!currentCharacter) break;
|
||||||
|
|
||||||
|
for (fontY = 0; fontY < 8; ++fontY) {
|
||||||
|
charRow = font8x8_basic[currentCharacter][fontY];
|
||||||
|
|
||||||
|
for (fontX = 0; fontX < 8; ++fontX) {
|
||||||
|
if (charRow & (1 << fontX)) {
|
||||||
|
drawBuffer[(y + fontY) * VGA_DISPLAY_WIDTH + (i * 8 + x + fontX)] = color;
|
||||||
|
} else {
|
||||||
|
if (backgroundColor > -1) {
|
||||||
|
drawBuffer[(y + fontY) * VGA_DISPLAY_WIDTH + (i * 8 + x + fontX)] = backgroundColor;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -64,5 +64,6 @@ void freeDrawBuffer();
|
||||||
void copyDrawBufferToDisplay();
|
void copyDrawBufferToDisplay();
|
||||||
|
|
||||||
void setVGAColors(struct VGAColor[], int);
|
void setVGAColors(struct VGAColor[], int);
|
||||||
|
void renderStringToDrawBuffer(char *, int color, int backgroundColor, int x, int y);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue