Hub.
This commit is contained in:
parent
d35ff2c728
commit
0efcdb8d5b
|
@ -2,7 +2,7 @@ VERSION = 0.1
|
||||||
REVISION = $(shell git rev-list HEAD 2>/dev/null | wc -l)
|
REVISION = $(shell git rev-list HEAD 2>/dev/null | wc -l)
|
||||||
LOCALE_MO = $(patsubst %.po,%.mo,$(wildcard locale/*.po))
|
LOCALE_MO = $(patsubst %.po,%.mo,$(wildcard locale/*.po))
|
||||||
|
|
||||||
SEARCHPATH += src src/combat src/game src/system src/util src/widgets src/world
|
SEARCHPATH += src src/combat src/game src/hub src/system src/util src/widgets src/world
|
||||||
vpath %.c $(SEARCHPATH)
|
vpath %.c $(SEARCHPATH)
|
||||||
vpath %.h $(SEARCHPATH)
|
vpath %.h $(SEARCHPATH)
|
||||||
|
|
||||||
|
@ -12,7 +12,7 @@ OBJS += camera.o combat.o
|
||||||
OBJS += draw.o
|
OBJS += draw.o
|
||||||
OBJS += effects.o entities.o explosions.o
|
OBJS += effects.o entities.o explosions.o
|
||||||
OBJS += game.o
|
OBJS += game.o
|
||||||
OBJS += hud.o
|
OBJS += hub.o hud.o
|
||||||
OBJS += init.o input.o io.o items.o
|
OBJS += init.o input.o io.o items.o
|
||||||
OBJS += lookup.o
|
OBJS += lookup.o
|
||||||
OBJS += main.o map.o maths.o
|
OBJS += main.o map.o maths.o
|
||||||
|
|
|
@ -75,6 +75,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
#define MAP_TILE_MAX 256
|
#define MAP_TILE_MAX 256
|
||||||
|
|
||||||
#define JUMP_POWER 1
|
#define JUMP_POWER 1
|
||||||
|
#define MAX_KEY_TYPES 12
|
||||||
|
|
||||||
#define ET_ENEMY 0
|
#define ET_ENEMY 0
|
||||||
#define ET_KEY 1
|
#define ET_KEY 1
|
||||||
|
@ -136,8 +137,10 @@ enum
|
||||||
|
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
|
MS_INCOMPLETE,
|
||||||
MS_PARTIAL,
|
MS_PARTIAL,
|
||||||
MS_MISSING_HEART_CELL
|
MS_MISSING_HEART_CELL,
|
||||||
|
MS_COMPLETE
|
||||||
};
|
};
|
||||||
|
|
||||||
enum
|
enum
|
||||||
|
|
|
@ -20,6 +20,59 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
#include "game.h"
|
#include "game.h"
|
||||||
|
|
||||||
|
/*
|
||||||
|
public Map<String, MissionStatus> missionStatuses;
|
||||||
|
|
||||||
|
public List<String> mias;
|
||||||
|
public List<String> targets;
|
||||||
|
public Map<String, AtomicInteger> keys;
|
||||||
|
*/
|
||||||
|
|
||||||
|
void initGame(void)
|
||||||
|
{
|
||||||
|
memset(&game, 0, sizeof(Game));
|
||||||
|
|
||||||
|
game.cells = 5;
|
||||||
|
game.hearts = 10;
|
||||||
|
|
||||||
|
game.timePlayed = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
public void updateTimePlayedString()
|
||||||
|
{
|
||||||
|
final int hours = (int) TimeUnit.MILLISECONDS.toHours(timePlayed);
|
||||||
|
final int minutes = (int) TimeUnit.MILLISECONDS.toMinutes(timePlayed) % 60;
|
||||||
|
|
||||||
|
timePlayedString = String.format("%dh %02dm", hours, minutes);
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getShotPercentage(int i)
|
||||||
|
{
|
||||||
|
return BMath.getPercentage(statShotsHit[i], statShotsFired[i]);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void addKey(String key)
|
||||||
|
{
|
||||||
|
AtomicInteger i = keys.get(key);
|
||||||
|
if (i == null)
|
||||||
|
{
|
||||||
|
i = new AtomicInteger();
|
||||||
|
keys.put(key, i);
|
||||||
|
}
|
||||||
|
i.incrementAndGet();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void removeKey(String key)
|
||||||
|
{
|
||||||
|
AtomicInteger i = keys.get(key);
|
||||||
|
if (i != null && i.decrementAndGet() == 0)
|
||||||
|
{
|
||||||
|
keys.remove(key);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
void destroyGame(void)
|
void destroyGame(void)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,3 +19,5 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "../common.h"
|
#include "../common.h"
|
||||||
|
|
||||||
|
extern Game game;
|
||||||
|
|
|
@ -0,0 +1,256 @@
|
||||||
|
/*
|
||||||
|
Copyright (C) 2018 Parallel Realities
|
||||||
|
|
||||||
|
This program is free software; you can redistribute it and/or
|
||||||
|
modify it under the terms of the GNU General Public License
|
||||||
|
as published by the Free Software Foundation; either version 2
|
||||||
|
of the License, or (at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||||
|
|
||||||
|
See the GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program; if not, write to the Free Software
|
||||||
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "hub.h"
|
||||||
|
|
||||||
|
static void unlockAllLevels(void);
|
||||||
|
static void unlockMission(char *id);
|
||||||
|
static int getMissionStatus(char *id);
|
||||||
|
static void loadMissions(void);
|
||||||
|
static void unlockNeighbouringMission(HubMission *sourceMission);
|
||||||
|
static int missionComparator(const void *a, const void *b);
|
||||||
|
|
||||||
|
static HubMission hubMissionHead;
|
||||||
|
static HubMission *hubMissionTail;
|
||||||
|
|
||||||
|
void initHub(void)
|
||||||
|
{
|
||||||
|
int unlockedMissions;
|
||||||
|
HubMission *prevMission, *mission;
|
||||||
|
Tuple *t;
|
||||||
|
|
||||||
|
memset(&hubMissionHead, 0, sizeof(HubMission));
|
||||||
|
|
||||||
|
hubMissionTail = &hubMissionHead;
|
||||||
|
|
||||||
|
loadMissions();
|
||||||
|
|
||||||
|
if (dev.cheatLevels)
|
||||||
|
{
|
||||||
|
unlockAllLevels();
|
||||||
|
}
|
||||||
|
|
||||||
|
unlockedMissions = 0;
|
||||||
|
|
||||||
|
for (t = game.missionStatusHead.next ; t != NULL ; t = t->next)
|
||||||
|
{
|
||||||
|
if (t->value.i != MS_INCOMPLETE)
|
||||||
|
{
|
||||||
|
unlockedMissions++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
prevMission = &hubMissionHead;
|
||||||
|
|
||||||
|
for (mission = hubMissionHead.next ; mission != NULL ; mission = mission->next)
|
||||||
|
{
|
||||||
|
if (mission->unlockCount > unlockedMissions && !dev.cheatLevels)
|
||||||
|
{
|
||||||
|
if (mission == hubMissionTail)
|
||||||
|
{
|
||||||
|
hubMissionTail = prevMission;
|
||||||
|
}
|
||||||
|
|
||||||
|
prevMission->next = mission->next;
|
||||||
|
free(mission);
|
||||||
|
mission = prevMission;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
mission->status = getMissionStatus(mission->id);
|
||||||
|
|
||||||
|
if (mission->unlockCount == 0 && mission->status == -1)
|
||||||
|
{
|
||||||
|
mission->status = MS_INCOMPLETE;
|
||||||
|
unlockMission(mission->id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
prevMission = mission;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (mission = hubMissionHead.next ; mission != NULL ; mission = mission->next)
|
||||||
|
{
|
||||||
|
if (mission->status == MS_COMPLETE || mission->status == MS_MISSING_HEART_CELL || mission->status == MS_PARTIAL)
|
||||||
|
{
|
||||||
|
unlockNeighbouringMission(mission);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (mission->status == MS_MISSING_HEART_CELL)
|
||||||
|
{
|
||||||
|
STRNCPY(mission->description, "All objectives for this misson have been completed. However, there is a Cell or a Heart left to find. See if you can locate it.", MAX_DESCRIPTION_LENGTH);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
prevMission = &hubMissionHead;
|
||||||
|
|
||||||
|
for (mission = hubMissionHead.next ; mission != NULL ; mission = mission->next)
|
||||||
|
{
|
||||||
|
if (mission->status == -1 || mission->status == MS_COMPLETE)
|
||||||
|
{
|
||||||
|
if (mission == hubMissionTail)
|
||||||
|
{
|
||||||
|
hubMissionTail = prevMission;
|
||||||
|
}
|
||||||
|
|
||||||
|
prevMission->next = mission->next;
|
||||||
|
free(mission);
|
||||||
|
mission = prevMission;
|
||||||
|
}
|
||||||
|
|
||||||
|
prevMission = mission;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static int getMissionStatus(char *id)
|
||||||
|
{
|
||||||
|
Tuple *t;
|
||||||
|
|
||||||
|
for (t = game.missionStatusHead.next ; t != NULL ; t = t->next)
|
||||||
|
{
|
||||||
|
if (strcmp(t->key, id) == 0)
|
||||||
|
{
|
||||||
|
return t->value.i;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void unlockMission(char *id)
|
||||||
|
{
|
||||||
|
Tuple *t;
|
||||||
|
|
||||||
|
for (t = game.missionStatusHead.next ; t != NULL ; t = t->next)
|
||||||
|
{
|
||||||
|
if (strcmp(t->key, id) == 0)
|
||||||
|
{
|
||||||
|
if (t->value.i == -1)
|
||||||
|
{
|
||||||
|
t->value.i = MS_INCOMPLETE;
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
t = malloc(sizeof(Tuple));
|
||||||
|
memset(t, 0, sizeof(Tuple));
|
||||||
|
game.missionStatusTail->next = t;
|
||||||
|
game.missionStatusTail = t;
|
||||||
|
|
||||||
|
STRNCPY(t->key, id, MAX_NAME_LENGTH);
|
||||||
|
t->value.i = MS_INCOMPLETE;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void unlockAllLevels(void)
|
||||||
|
{
|
||||||
|
HubMission *mission;
|
||||||
|
|
||||||
|
for (mission = hubMissionHead.next ; mission != NULL ; mission = mission->next)
|
||||||
|
{
|
||||||
|
if (mission->status == -1 || mission->status == MS_INCOMPLETE)
|
||||||
|
{
|
||||||
|
mission->status = MS_INCOMPLETE;
|
||||||
|
unlockMission(mission->id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void loadMissions(void)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
static void unlockNeighbouringMission(HubMission *sourceMission)
|
||||||
|
{
|
||||||
|
HubMission *mission, *missions[32];
|
||||||
|
int i;
|
||||||
|
|
||||||
|
i = 0;
|
||||||
|
memset(missions, 0, sizeof(HubMission*) * 32);
|
||||||
|
|
||||||
|
for (mission = hubMissionHead.next ; mission != NULL ; mission = mission->next)
|
||||||
|
{
|
||||||
|
mission->distance = 99999;
|
||||||
|
|
||||||
|
if (mission->status == MS_COMPLETE || mission->status == MS_MISSING_HEART_CELL || mission->status == MS_PARTIAL)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
mission->distance = getDistance(mission->x, mission->y, sourceMission->x, sourceMission->y);
|
||||||
|
|
||||||
|
missions[i++] = mission;
|
||||||
|
}
|
||||||
|
|
||||||
|
qsort(missions, i, sizeof(HubMission*), missionComparator);
|
||||||
|
|
||||||
|
mission = missions[0];
|
||||||
|
|
||||||
|
if (mission != NULL)
|
||||||
|
{
|
||||||
|
if (mission->status == -1 || mission->status == MS_INCOMPLETE)
|
||||||
|
{
|
||||||
|
mission->status = MS_INCOMPLETE;
|
||||||
|
unlockMission(mission->id);
|
||||||
|
}
|
||||||
|
|
||||||
|
mission = missions[1];
|
||||||
|
|
||||||
|
if (mission != NULL)
|
||||||
|
{
|
||||||
|
if (mission->status == -1 || mission->status == MS_INCOMPLETE)
|
||||||
|
{
|
||||||
|
mission->status = MS_INCOMPLETE;
|
||||||
|
unlockMission(mission->id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
HubMission *getMissionAt(float x, float y)
|
||||||
|
{
|
||||||
|
HubMission *rtn;
|
||||||
|
HubMission *mission;
|
||||||
|
float distance, dist;
|
||||||
|
|
||||||
|
rtn = NULL;
|
||||||
|
distance = 32;
|
||||||
|
|
||||||
|
for (mission = hubMissionHead.next ; mission != NULL ; mission = mission->next)
|
||||||
|
{
|
||||||
|
dist = getDistance(x, y, mission->x, mission->y);
|
||||||
|
|
||||||
|
if (dist < distance)
|
||||||
|
{
|
||||||
|
rtn = mission;
|
||||||
|
distance = dist;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return rtn;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int missionComparator(const void *a, const void *b)
|
||||||
|
{
|
||||||
|
HubMission *m1 = *((HubMission**)a);
|
||||||
|
HubMission *m2 = *((HubMission**)b);
|
||||||
|
|
||||||
|
return m2->distance - m1->distance;
|
||||||
|
}
|
|
@ -0,0 +1,27 @@
|
||||||
|
/*
|
||||||
|
Copyright (C) 2018 Parallel Realities
|
||||||
|
|
||||||
|
This program is free software; you can redistribute it and/or
|
||||||
|
modify it under the terms of the GNU General Public License
|
||||||
|
as published by the Free Software Foundation; either version 2
|
||||||
|
of the License, or (at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||||
|
|
||||||
|
See the GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program; if not, write to the Free Software
|
||||||
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "../common.h"
|
||||||
|
|
||||||
|
extern int getDistance(int x1, int y1, int x2, int y2);
|
||||||
|
|
||||||
|
extern Dev dev;
|
||||||
|
extern Game game;
|
||||||
|
extern World world;
|
|
@ -27,17 +27,21 @@ typedef struct Trigger Trigger;
|
||||||
typedef struct Marker Marker;
|
typedef struct Marker Marker;
|
||||||
typedef struct Particle Particle;
|
typedef struct Particle Particle;
|
||||||
typedef struct Sprite Sprite;
|
typedef struct Sprite Sprite;
|
||||||
|
typedef struct Tuple Tuple;
|
||||||
|
typedef struct HubMission HubMission;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
int debug;
|
int debug;
|
||||||
int takeScreenshots;
|
int takeScreenshots;
|
||||||
char *screenshotFolder;
|
char *screenshotFolder;
|
||||||
int noAIWeapons;
|
|
||||||
int showFPS;
|
int showFPS;
|
||||||
int playerImmortal;
|
int cheatHealth;
|
||||||
int playerUnlimitedMissiles;
|
int cheatPower;
|
||||||
int noEntityActions;
|
int cheatOxygen;
|
||||||
int allImmortal;
|
int cheatKeys;
|
||||||
|
int cheatLevels;
|
||||||
|
int cheatReload;
|
||||||
|
int cheatBlind;
|
||||||
int fps;
|
int fps;
|
||||||
} Dev;
|
} Dev;
|
||||||
|
|
||||||
|
@ -131,6 +135,28 @@ struct Trigger {
|
||||||
Trigger *next;
|
Trigger *next;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct HubMission {
|
||||||
|
char id[MAX_NAME_LENGTH];
|
||||||
|
char name[MAX_NAME_LENGTH];
|
||||||
|
char description[MAX_DESCRIPTION_LENGTH];
|
||||||
|
float x;
|
||||||
|
float y;
|
||||||
|
int status;
|
||||||
|
int unlockCount;
|
||||||
|
float distance;
|
||||||
|
HubMission *next;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct Tuple {
|
||||||
|
char key[MAX_NAME_LENGTH];
|
||||||
|
union {
|
||||||
|
char s[MAX_NAME_LENGTH];
|
||||||
|
int i;
|
||||||
|
float f;
|
||||||
|
} value;
|
||||||
|
Tuple *next;
|
||||||
|
};
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
SDL_Rect bounds;
|
SDL_Rect bounds;
|
||||||
float shakeAmount;
|
float shakeAmount;
|
||||||
|
@ -172,7 +198,33 @@ typedef struct {
|
||||||
} App;
|
} App;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
|
int sound;
|
||||||
|
int music;
|
||||||
|
} Config;
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
int cells;
|
||||||
|
int hearts;
|
||||||
|
int keysFound;
|
||||||
|
int totalMIAs;
|
||||||
|
int totalTargets;
|
||||||
|
int totalCells;
|
||||||
|
int totalHearts;
|
||||||
|
int totalKeys;
|
||||||
|
int deaths;
|
||||||
|
int statShotsFired[WPN_ANY];
|
||||||
|
int statShotsHit[WPN_ANY];
|
||||||
|
int enemiesKilled;
|
||||||
|
int missionsPlayed;
|
||||||
long timePlayed;
|
long timePlayed;
|
||||||
|
char worldId[MAX_NAME_LENGTH];
|
||||||
|
int isResumingMission;
|
||||||
|
int isComplete;
|
||||||
|
char **mias;
|
||||||
|
char **targets;
|
||||||
|
int keys[MAX_KEY_TYPES][MAX_NAME_LENGTH];
|
||||||
|
Tuple missionStatusHead, *missionStatusTail;
|
||||||
|
Config config;
|
||||||
} Game;
|
} Game;
|
||||||
|
|
||||||
struct Marker {
|
struct Marker {
|
||||||
|
|
Loading…
Reference in New Issue