Raiza.dev/Minicraft3DS
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rework Tilesheet

Browse source 
No more autocoloring!
(atleast for Maptiles)
This commit is contained in:
Andre Schweiger 2016-02-05 18:13:39 +01:00
parent 6f0ea3ef65
commit 0ef9e89705
14 changed files with 679 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

35
source/Entity.h
View file

@ -19,6 +19,10 @@
#define ENTITY_KNIGHT 13
#define ENTITY_GLOWWORM 14
#define ENTITY_DRAGON 15
#define ENTITY_DRAGONPROJECTILE 16
#define ENTITY_MAGIC_PILLAR 17
typedef struct Entity Entity;
typedef struct {
@ -109,6 +113,15 @@ typedef struct {
s8 spriteAdjust;
} AirWizard;
typedef struct {
Entity* parent;
s16 age;
float xa;
float ya;
float xx;
float yy;
} Spark;
typedef struct {
Entity* parent;
s16 age;
@ -117,14 +130,28 @@ typedef struct {
s8 ya;
} Arrow;
typedef struct {
s8 xa;
s8 ya;
s16 health;
s8 randWalkTime;
s8 walkDist;
s8 dir;
int attackDelay;
int attackTime;
int attackType;
int animTimer;
} Dragon;
typedef struct {
Entity* parent;
u8 type;
s16 age;
float xa;
float ya;
float xx;
float yy;
} Spark;
} DragonFire;
typedef struct {
s8 xa;
@ -171,6 +198,8 @@ struct Entity {
Spark spark;
Arrow arrow;
Glowworm glowworm;
Dragon dragon;
DragonFire dragonFire;
TextParticleEntity textParticle;
SmashParticleEntity smashParticle;
};
@ -178,7 +207,6 @@ struct Entity {
typedef struct {
Entity entities[6][1000];
Entity wizardSparks[120];
s16 lastSlot[6];
Inventory invs[301];//1 for the player, 300 for chests.
s16 nextInv;
@ -199,6 +227,9 @@ Entity newKnightEntity(int lvl, int x, int y, int level);
Entity newSlimeEntity(int lvl, int x, int y, int level);
Entity newAirWizardEntity(int x, int y, int level);
Entity newSparkEntity(Entity* parent, float xa, float ya);
Entity newDragonEntity(int x, int y, int level);
Entity newDragonFireEntity(Entity* parent, u8 type, int x, int y, float xa, float ya);
Entity newMagicPillarEntity(int x, int y, int level);
Entity newTextParticleEntity(char * str, u32 color, int xa, int ya, int level);
Entity newSmashParticleEntity(int xa, int ya, int level);
Entity newArrowEntity(Entity* parent, int itemID, s8 xa, s8 ya, int level);