Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Adding Gyllioc as a party member. (He's a party guy!)

  • Loading branch information...
commit bf069643f403fe21267b1976aad65d2686bd7d38 1 parent 2bc238c
@superjer authored
View
1  game/mod_constants.h
@@ -33,6 +33,7 @@ enum DIR8 { NODIR=0, E, NE, N, NW, W, SW, S, SE };
//character types for PERSON_t
enum CHARACTERS { CHR_AZMA,
+ CHR_GYLLIOC,
CHR_SLUG };
#endif
View
30 game/obj_mother.c
@@ -52,12 +52,15 @@ void obj_mother_adv( int objid, Uint32 a, Uint32 b, OBJ_t *oa, OBJ_t *ob )
int ghostslot = slot0;
MKOBJ( az, PERSON, 1, OBJF_POS|OBJF_VEL|OBJF_HULL|OBJF_VIS|OBJF_PLAT|OBJF_CLIP|OBJF_BNDB|OBJF_BNDX|OBJF_BNDZ );
int azslot = slot0;
+ MKOBJ( gy, PERSON, 1, OBJF_POS|OBJF_VEL|OBJF_HULL|OBJF_VIS|OBJF_PLAT|OBJF_CLIP|OBJF_BNDB|OBJF_BNDX|OBJF_BNDZ );
+ int gyslot = slot0;
MKOBJ( en, PERSON, 1, OBJF_POS|OBJF_VEL|OBJF_HULL|OBJF_VIS|OBJF_PLAT|OBJF_CLIP|OBJF_BNDB|OBJF_BNDX|OBJF_BNDZ );
SJC_Write( "%d: New client %i created ghost is obj#%d player is obj#%d", hotfr, i, ghostslot, azslot );
mo->ghost = ghostslot;
mo->party[0] = azslot;
+ mo->party[1] = gyslot;
gh->pos = (V){ 0, 0, 0};
gh->vel = (V){ 0, 0, 0};
@@ -101,6 +104,33 @@ void obj_mother_adv( int objid, Uint32 a, Uint32 b, OBJ_t *oa, OBJ_t *ob )
az->max_to = 100;
az->max_xp = 100;
+ gy->pos = (V){150,0,150};
+ gy->vel = (V){0,0,0};
+ gy->hull[0] = (V){-5,-34,-5};
+ gy->hull[1] = (V){ 5, 0, 5};
+ gy->model = 0;
+ gy->tilex = 3;
+ gy->tilez = 5;
+ gy->dir = S;
+ gy->walkcounter = 0;
+ gy->character = CHR_GYLLIOC;
+ gy->hp = 99;
+ gy->mp = 67;
+ gy->st = 50;
+ gy->ap = 38;
+ gy->pn = 1;
+ gy->ml = 1;
+ gy->to = 80;
+ gy->xp = 3;
+ gy->max_hp = 100;
+ gy->max_mp = 100;
+ gy->max_st = 100;
+ gy->max_ap = 100;
+ gy->max_pn = 100;
+ gy->max_ml = 100;
+ gy->max_to = 100;
+ gy->max_xp = 100;
+
en->pos = (V){150,0,150};
en->vel = (V){0,0,0};
en->hull[0] = (V){-5,-34,-5};
View
7 game/obj_person.c
@@ -15,6 +15,7 @@
#define SPRITECOUNT 10
static void get_azma_sprites( SPRITE_T **sprs, PERSON_t *pe);
+static void get_gyllioc_sprites(SPRITE_T **sprs, PERSON_t *pe);
static void get_slug_sprites( SPRITE_T **sprs, PERSON_t *pe);
@@ -28,6 +29,7 @@ void obj_person_draw( int objid, Uint32 vidfr, OBJ_t *o, CONTEXT_t *co )
switch( pe->character ) {
case CHR_AZMA: get_azma_sprites( sprs,pe); break;
+ case CHR_GYLLIOC: get_gyllioc_sprites(sprs,pe); break;
case CHR_SLUG: get_slug_sprites( sprs,pe); break;
}
@@ -249,6 +251,11 @@ static void get_azma_sprites(SPRITE_T **sprs, PERSON_t *pe)
}
}
+static void get_gyllioc_sprites(SPRITE_T **sprs, PERSON_t *pe)
+{
+ sprs[0] = &SM(gyllioc_idle_s);
+}
+
static void get_slug_sprites(SPRITE_T **sprs, PERSON_t *pe)
{
sprs[0] = &SM(slug_r);
View
8 game/spr_enum.h
@@ -73,6 +73,14 @@ X(azma_w_walk1_e),\
X(azma_w_walk2_w),\
X(azma_w_walk2_e),\
X(shadow),\
+X(gyllioc_idle_s),\
+X(gyllioc_idle_se),\
+X(gyllioc_idle_sw),\
+X(gyllioc_idle_nw),\
+X(gyllioc_idle_ne),\
+X(gyllioc_idle_n),\
+X(gyllioc_idle_w),\
+X(gyllioc_idle_e),\
X(wheat1),\
X(wheat2),\
X(wheattrampled1),\
View
15 game/textures/gyllioc.png.txt
@@ -0,0 +1,15 @@
+.default size 23 51 anchor mid bot
+
+.grid cols 5 anchor mid bot
+ gyllioc_idle_s
+ gyllioc_idle_se
+ .also
+ gyllioc_idle_sw flipx
+ gyllioc_idle_nw
+ .also
+ gyllioc_idle_ne flipx
+ gyllioc_idle_n
+ gyllioc_idle_w
+ .also
+ gyllioc_idle_e flipx
+.end
Please sign in to comment.
Something went wrong with that request. Please try again.