YourWishes/Dawn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added sign

Browse Source
This commit is contained in:
Dominic Masters
2024-10-06 22:23:26 -05:00
parent b5d7b7e229
commit bf3912bb7f
15 changed files with 180 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
assets/testmap.json
View File

@ -22,6 +22,17 @@
"type": 1,
"x": 0,
"y": 0
},
{
"type": 2,
"x": 3,
"y": 3
},
{
"type": 3,
"x": 6,
"y": 6,
"text": "This is a sign."
}
]
}

13
src/dawn/asset/assetmap.c
View File

@ -96,6 +96,19 @@ void assetMapLoad(
entityInit(ent, type, map);
entityPositionSet(ent, x, y);
switch(type) {
case ENTITY_TYPE_SIGN:
assetjson_t *val = assetJsonGetObjectValue(jEnt, "text");
if(val != NULL) {
assertTrue(
val->type == ASSET_JSON_DATA_TYPE_STRING,
"assetMapLoad: Sign text is not a string!"
);
signTextSet(&ent->sign, val->string);
}
break;
}
// TODO: Parse any extra data.
}
}

8
src/dawn/display/symbol.c
View File

@ -12,6 +12,11 @@
char_t symbolGetCharByEntity(const entity_t *ent) {
assertNotNull(ent, "Entity cannot be NULL.");
if(ent->type == ENTITY_TYPE_SIGN) {
return '+';
}
switch(ent->direction) {
case ENTITY_DIRECTION_EAST: return '>';
case ENTITY_DIRECTION_WEST: return '<';
@ -49,6 +54,9 @@ uint8_t symbolGetColorByEntity(const entity_t *ent) {
case ENTITY_TYPE_NPC:
return COLOR_YELLOW;
case ENTITY_TYPE_SIGN:
return COLOR_YELLOW;
default:
assertUnreachable("Invalid entity type.");

8
src/dawn/game/game.c
View File

@ -9,7 +9,6 @@
#include "game/time.h"
#include "input.h"
#include "display/display.h"
#include "rpg/world/maps/testmap.h"
#include "ui/textbox.h"
#include "asset/asset.h"
#include "asset/assetmap.h"
@ -27,12 +26,10 @@ void gameInit() {
textboxInit();
assetMapLoad("testmap.json", &MAP);
// testMapInit(&MAP);
gameSetMap(&MAP);
}
uint8_t gameUpdate(const float_t delta) {
gameupdateresult_t gameUpdate(const float_t delta) {
timeUpdate(delta);
inputUpdate();
@ -50,9 +47,6 @@ uint8_t gameUpdate(const float_t delta) {
case GAME_STATE_PAUSED:
if(inputWasPressed(INPUT_BIND_PAUSE)) GAME.state = GAME_STATE_OVERWORLD;
break;
default:
assertUnreachable("Invalid game state.");
}
// Perform render.

18
src/dawn/game/game.h
View File

@ -8,16 +8,20 @@
#pragma once
#include "rpg/world/map.h"
#define GAME_UPDATE_RESULT_CONTINUE 0
#define GAME_UPDATE_RESULT_EXIT 1
typedef enum {
GAME_UPDATE_RESULT_CONTINUE = 0,
GAME_UPDATE_RESULT_EXIT = 1
} gameupdateresult_t;
#define GAME_STATE_INITIAL 0
#define GAME_STATE_OVERWORLD 1
#define GAME_STATE_PAUSED 2
typedef enum {
GAME_STATE_INITIAL = 0,
GAME_STATE_OVERWORLD = 1,
GAME_STATE_PAUSED = 2
} gamestate_t;
typedef struct {
map_t *currentMap;
uint8_t state;
gamestate_t state;
bool_t shouldExit;
} game_t;
@ -34,7 +38,7 @@ void gameInit();
* @param delta Time since last update.
* @return Game update result, 0 for continue, 1 for exit, else for failure.
*/
uint8_t gameUpdate(const float_t delta);
gameupdateresult_t gameUpdate(const float_t delta);
/**
* Sets the current map, does not take ownership.

2
src/dawn/rpg/entity/CMakeLists.txt
View File

@ -11,4 +11,6 @@ target_sources(${DAWN_TARGET_NAME}
entity.c
entitydirection.c
player.c
sign.c
interact.c
)

14
src/dawn/rpg/entity/entity.c
View File

@ -32,12 +32,6 @@ void entityInit(
case ENTITY_TYPE_PLAYER:
playerInit(entity);
break;
case ENTITY_TYPE_NPC:
break;
default:
assertUnreachable("Unknown entity type.");
}
}
@ -54,12 +48,6 @@ void entityUpdate(entity_t *entity) {
case ENTITY_TYPE_PLAYER:
playerUpdate(entity);
break;
case ENTITY_TYPE_NPC:
break;
default:
assertUnreachable("Unknown entity type.");
}
break;
@ -78,7 +66,7 @@ void entityUpdate(entity_t *entity) {
}
}
void entityWalk(entity_t *entity, const uint8_t dir) {
void entityWalk(entity_t *entity, const entitydirection_t dir) {
assertNotNull(entity, "Entity cannot be NULL.");
uint16_t newX = entity->x, newY = entity->y;

26
src/dawn/rpg/entity/entity.h
View File

@ -7,18 +7,23 @@
#pragma once
#include "player.h"
#include "sign.h"
#include "entitydirection.h"
typedef struct _map_t map_t;
typedef enum {
ENTITY_TYPE_NULL = 0,
ENTITY_TYPE_PLAYER = 1,
ENTITY_TYPE_NPC = 2
ENTITY_TYPE_NPC = 2,
ENTITY_TYPE_SIGN = 3
} entitytype_t;
#define ENTITY_STATE_IDLE 0
#define ENTITY_STATE_WALKING 1
#define ENTITY_STATE_TALKING 2
typedef struct _map_t map_t;
typedef enum {
ENTITY_STATE_IDLE = 0,
ENTITY_STATE_WALKING = 1,
ENTITY_STATE_TALKING = 2
} entitystate_t;
typedef struct {
float_t time;
@ -30,17 +35,18 @@ typedef struct _entity_t {
uint16_t x;
uint16_t y;
uint8_t layer;
uint8_t direction;
uint8_t state;
entitydirection_t direction;
entitystate_t state;
// State
union {
entitywalkstate_t walk;
};
// Type
// Type data
union {
player_t player;
sign_t sign;
};
} entity_t;
@ -69,7 +75,7 @@ void entityUpdate(entity_t *entity);
* @param entity Entity to move.
* @param dir Direction to move.
*/
void entityWalk(entity_t *entity, const uint8_t dir);
void entityWalk(entity_t *entity, const entitydirection_t dir);
/**
* Sets the position of an entity. Performs an immediate move.

44
src/dawn/rpg/entity/interact.c Normal file
View File

@ -0,0 +1,44 @@
/**
* Copyright (c) 2024 Dominic Masters
*
* This software is released under the MIT License.
* https://opensource.org/licenses/MIT
*/
#include "interact.h"
#include "assert/assert.h"
void entityInteractEntity(
entity_t *source,
entity_t *target
) {
assertNotNull(source, "entityInteractEntity: Source is NULL!");
assertNotNull(target, "entityInteractEntity: Target is NULL!");
switch(target->type) {
case ENTITY_TYPE_SIGN:
source->state = ENTITY_STATE_TALKING;
target->state = ENTITY_STATE_TALKING;
textboxSetText(NULL, target->sign.text);
return;
default:
return;
}
}
void entityInteractTile(
entity_t *source,
tile_t tile
) {
assertNotNull(source, "entityInteractTile: Source is NULL!");
switch(tile) {
case TILE_ID_WATER:
textboxSetText(NULL, "You cannot swim.");
source->state = ENTITY_STATE_TALKING;
return;
default:
break;
}
}

32
src/dawn/rpg/entity/interact.h Normal file
View File

@ -0,0 +1,32 @@
/**
* Copyright (c) 2024 Dominic Masters
*
* This software is released under the MIT License.
* https://opensource.org/licenses/MIT
*/
#pragma once
#include "entity.h"
#include "rpg/world/tile.h"
/**
* Interacts with an entity.
*
* @param source Entity that is interacting.
* @param target Entity that is being interacted with.
*/
void entityInteractEntity(
entity_t *source,
entity_t *target
);
/**
* Interacts with a tile.
*
* @param source Entity that is interacting.
* @param tile Tile that is being interacted with.
*/
void entityInteractTile(
entity_t *source,
tile_t tile
);

25
src/dawn/rpg/entity/player.c
View File

@ -13,6 +13,7 @@
#include "assert/assert.h"
#include "ui/textbox.h"
#include "game/game.h"
#include "interact.h"
void playerInit(entity_t *entity) {
assertTrue(entity->type == ENTITY_TYPE_PLAYER, "Entity is not a player.");
@ -37,27 +38,9 @@ void playerUpdate(entity_t *entity) {
entityDirectionOffsetAdd(entity->direction, &x, &y);
entity_t *target = mapEntityGetByPosition(entity->map, x, y);
if(target) {
// Interact with the target
target->direction = entityDirectionLookAt(
target->x, target->y,
entity->x, entity->y
);
if(target) return entityInteractEntity(entity, target);
target->state = ENTITY_STATE_TALKING;
entity->state = ENTITY_STATE_TALKING;
textboxSetText("NPC", "Hello Player.\nHow are you today?");
return;
}
tile_t tile = mapTileGetByPosition(entity->map, x, y, 0);
switch(tile) {
case TILE_ID_WATER:
textboxSetText(NULL, "You cannot swim.");
entity->state = ENTITY_STATE_TALKING;
return;
default:
break;
}
tile_t tile = mapTileGetByPosition(entity->map, x, y, entity->layer);
entityInteractTile(entity, tile);
}
}

15
src/dawn/rpg/entity/sign.c Normal file
View File

@ -0,0 +1,15 @@
/**
* Copyright (c) 2024 Dominic Masters
*
* This software is released under the MIT License.
* https://opensource.org/licenses/MIT
*/
#include "sign.h"
#include "assert/assert.h"
void signTextSet(sign_t *sign, const char_t *text) {
assertNotNull(sign, "signTextSet: Sign is NULL!");
assertNotNull(text, "signTextSet: Text is NULL!");
strncpy(sign->text, text, TEXTBOX_TEXT_MAX);
}

21
src/dawn/rpg/entity/sign.h Normal file
View File

@ -0,0 +1,21 @@
/**
* Copyright (c) 2024 Dominic Masters
*
* This software is released under the MIT License.
* https://opensource.org/licenses/MIT
*/
#pragma once
#include "ui/textbox.h"
typedef struct {
char_t text[TEXTBOX_TEXT_MAX + 1];
} sign_t;
/**
* Sets the text of a sign.
*
* @param sign Sign to set text for.
* @param text Text to set.
*/
void signTextSet(sign_t *sign, const char_t *text);

53
src/dawn/rpg/world/maps/testmap.h
View File

@ -1,53 +0,0 @@
/**
* Copyright (c) 2024 Dominic Masters
*
* This software is released under the MIT License.
* https://opensource.org/licenses/MIT
*/
#pragma once
#include "rpg/world/map.h"
#include "assert/assert.h"
#define TEST_MAP_WIDTH MAP_WIDTH_MAX
#define TEST_MAP_HEIGHT MAP_HEIGHT_MAX
#define TEST_MAP_LAYERS 1
void testMapInit(map_t *map) {
mapInit(map, TEST_MAP_WIDTH, TEST_MAP_HEIGHT, TEST_MAP_LAYERS);
entity_t *player = mapEntityAdd(map);
entityInit(player, ENTITY_TYPE_PLAYER, map);
entityPositionSet(player, 5, 5);
entity_t *npc = mapEntityAdd(map);
entityInit(npc, ENTITY_TYPE_NPC, map);
entityPositionSet(npc, 10, 10);
trigger_t *trigger = mapTriggerAdd(map);
triggerInit(trigger, TRIGGER_TYPE_NULL, 15, 15, 1, 1);
tile_t tiles[TEST_MAP_WIDTH * TEST_MAP_HEIGHT];
for(uint32_t i = 0; i < TEST_MAP_WIDTH * TEST_MAP_HEIGHT; i++) {
tiles[i] = TILE_ID_GRASS;
}
tiles[10] = TILE_ID_WATER;
tiles[11] = TILE_ID_WATER;
tiles[12] = TILE_ID_WATER;
tiles[13] = TILE_ID_WATER;
tiles[14] = TILE_ID_WATER;
tiles[26] = TILE_ID_WATER;
tiles[27] = TILE_ID_WATER;
tiles[28] = TILE_ID_WATER;
tiles[29] = TILE_ID_WATER;
tiles[41] = TILE_ID_WATER;
tiles[42] = TILE_ID_WATER;
tiles[43] = TILE_ID_WATER;
tiles[44] = TILE_ID_WATER;
tiles[45] = TILE_ID_WATER;
mapTilesSet(map, tiles, 0);
}

2
tools/assetstool/assetstool.py
View File

@ -26,7 +26,7 @@ if not os.path.exists(os.path.dirname(args.output)):
# Does the archive already exist?
filesInArchive = []
if os.path.exists(args.output):
if os.path.exists(args.output) and False:
# Yes, open it
archive = tarfile.open(args.output, 'r:')