Añadido sistema de colisión por grilla + datos de bloques de prioridades + lista de musicas con numero

alicesim1 · alicesim1 · commit 2492ce1ca7ce · 2021-04-11T21:22:16.000+02:00
diff --git a/inc/global.h b/inc/global.h
@@ -2,12 +2,15 @@
 #define _GLOBAL_H
 //------------------------------------------------------------------------------------------
 #include "../res/basicos.h"//fuente, pinguno jug,
+#include "../res/musica.h"
 //-----------------------------------------------
 u16 BUTTONS[9];
 
-char char_salida[16];
+char char_salida[8];
 void VDP_drawInt(s32,u8,u8,u8);
 
+void play_music(u8);
+
 u8 randU8(u8,u8);
 
 u16 paleta64[64]; //copia Paletas 0,1,2,3 ,para fades completos
@@ -17,9 +20,9 @@ void ZoneMap();
 
 
 typedef struct {
-  const u8 const ancho;
-  const u8 const alto;
+  const u8 const musica;
   const u8 const *casillas;
+  const u8 const top_blxpri;
   const u16 const *blockpri;
 } t_zona;
 
diff --git a/res/musica.h b/res/musica.h
@@ -0,0 +1,7 @@
+#ifndef _RES_MUSICA_H_
+#define _RES_MUSICA_H_
+
+extern const u8 M_titulo[27392];
+extern const u8 M_zone1[25344];
+
+#endif // _RES_MUSICA_H_
diff --git a/res/musica.res b/res/musica.res
@@ -0,0 +1,2 @@
+XGM M_titulo "Titulo/20 - Zombie World.vgm"
+XGM M_zone1 "Zona1/18 - Riddle, Darkness World.vgm"
diff --git a/res/titulo.h b/res/titulo.h
@@ -1,7 +1,6 @@
 #ifndef _RES_TITULO_H_
 #define _RES_TITULO_H_
 
-extern const u8 M_titulo[27392];
 extern const Image titulo;
 extern const Image titush;
 extern const Image fondogr;
diff --git a/res/titulo.res b/res/titulo.res
@@ -1,4 +1,3 @@
-XGM M_titulo "Titulo/20 - Zombie World.vgm"
 IMAGE titulo "Titulo/titulo.png" BEST
 IMAGE titush "Titulo/titulo-shader.png" BEST
 IMAGE fondogr "Titulo/fondo.png" BEST
diff --git a/res/zona1.h b/res/zona1.h
@@ -1,7 +1,6 @@
 #ifndef _RES_ZONA1_H_
 #define _RES_ZONA1_H_
 
-extern const u8 M_zone1[25344];
 extern const TileSet z1h1_t;
 extern const TileSet z1h1b_t;
 extern const MapDefinition z1h1;
diff --git a/res/zona1.res b/res/zona1.res
@@ -2,6 +2,4 @@ TILESET z1h1_t "Zona1/h1.png" BEST
 MAP z1h1 "Zona1/h1.png" z1h1_t BEST
 
 TILESET z1h1b_t "Zona1/h1b.png" BEST
-MAP z1h1b "Zona1/h1b.png" z1h1b_t BEST
-
-XGM M_zone1 "Zona1/18 - Riddle, Darkness World.vgm"
+MAP z1h1b "Zona1/h1b.png" z1h1b_t BEST
diff --git a/src/logos-titulo.c b/src/logos-titulo.c
@@ -4,7 +4,7 @@
 *      @Author: Alicia Sanchez Martos "AliceSim1"
 ***********************************************************************************/
 #include "../inc/global.h"
-#define Version "26/3"
+#define Version "11/4"
 
 //res ficheros
 #include "../res/logos.h"
diff --git a/src/main.c b/src/main.c
@@ -22,7 +22,12 @@ void main(){
 }
 
 
-
+void play_music(u8 indice){
+	switch(indice){
+		case 1:XGM_startPlay(M_titulo);break;
+		case 2:XGM_startPlay(M_zone1);
+	}
+}
 
 //https://github.com/diegomtassis/yamd-library/blob/master/src/fwk/commons.c#L40
 u8 randU8(u8 lower, u8 higher) {
diff --git a/src/zona1dat.c b/src/zona1dat.c
@@ -10,29 +10,30 @@ const u8 const casillas_0[] = {
 	9,1,1,0,0,0,0,0,//16-23
 	1,1,1,1,1,1,1,1,//24-31
 	9,1,1,1,1,1,1,0,//32-39
-	9,1,1,1,1,1,1,0 //40-47
-//--0,1,2,3,4,5,6,7
+	9,1,1,1,1,1,1,0,//40-47
+	0,0,0,0,0,0,0,0 //48-55
+//--0,1,2,3,4,5,6,7 = 8
 };
 
 const u16 const blxpri_0[] = {
 	159,143,//0,1 puerta
 	319,159,//2,3 bloque
 	351,175,//4,5
 	393,191,//6,7
-	415,207 //8,9
+	415,207 //8,9 (top_blxpri=9)
 };
 
 const t_zona zona1dat[TOP_ZONAS] = {
   {
-    8, //ancho
-    6, //alto
+    2, //musica
     casillas_0,  //casillas
+	9, //top_blxpri
 	blxpri_0 //blockpri
   },
   {
-    8,//ancho
-    8,//alto
+    0,//ancho
     0,//casillas /* 0 = null*/
+	0,
 	0
   }
 };
diff --git a/src/zone-jugpri.c b/src/zone-jugpri.c
@@ -16,22 +16,20 @@ Map* bga; //PLANO A (Capa superior Prioridad Alta)
 //-----------------------------------------------------------
 
 bool move_scroll;
-u16 posX,posY;
+s16 posX,posY;
 u16 TopXMap,TopYMap;
 u16 posXt,posYt;
 
 static void loadzona();
 static void pintarAB();
 
 const u8 STARTXT=128;
-const u8 STARTYT=0;
+const s8 STARTYT=-32;
 
 
 //---------------------------------------------------------
 // DATA
 //---------------------------------------------------------
-u16 paleta32[32];
-
 u8 jugcontrol=3;//0=diagonales, 1=UP=UP+>>, 2=UP=UP+<<, 3=0+1
 
 //------------------------------------------------------------------------------------------
@@ -40,6 +38,7 @@ bool SPR_ACT;
 Sprite* penguinsp; //atributo tipo Sprite
 const u8 VELPING=2;
 s16 PX,PY;
+u8 PX32,PY32;//BLOQUES *32
 bool pflag;
 u8 pdirc,pdir,pdircm;
 u8 panim;
@@ -50,14 +49,7 @@ static void jug2diso();
 static void jugpenguin();
 
 //------------------------------------------------------------------------------------------
-#define top_blxpri 5
-struct t_blxpri {
-	u16 x, y;
-};
-struct t_blxpri blxpri[top_blxpri];
-
-//------------------------------------------------------------------------------------------
-#define top_object2D 5
+#define top_object2D 3
 struct t_object2D {
 	Sprite* sprt;
 	u16 x, y;
@@ -80,7 +72,9 @@ void ZoneMap(){
 	VDP_setTextPlane(WINDOW);//Textos "normales SGDK" se pintan en Window es temporal
 	
 	
-	PX=32*1;PY=32*2;
+	PX=32*1;PY=32*3;
+	//PX=PY=32;
+	
 	JUGmueve=FALSE;
 	panim=3;
 	
@@ -104,14 +98,10 @@ void ZoneMap(){
 	//pdirc=pdircm=3;//down+<<
 	
 	switch(pdircm){
-		case 1:{SPR_setAnim(penguinsp,1);pflag=FALSE;}
-		break;
-		case 2:{SPR_setAnim(penguinsp,0);pflag=TRUE;}
-		break;
-		case 3:{SPR_setAnim(penguinsp,1);pflag=TRUE;}
-		break;
+		case 1:{SPR_setAnim(penguinsp,1);pflag=FALSE;}break;
+		case 2:{SPR_setAnim(penguinsp,0);pflag=TRUE;}break;
+		case 3:{SPR_setAnim(penguinsp,1);pflag=TRUE;}break;
 		case 4:{SPR_setAnim(penguinsp,0);pflag=FALSE;}
-		
 	}
 	
 	SPR_setHFlip(penguinsp,pflag);
@@ -126,13 +116,11 @@ void ZoneMap(){
 	
 	SPR_ACT=FALSE;
 	
-	XGM_startPlay(M_zone1);
+	play_music(zona1dat[0].musica);
 	
 	PAL_fadeInAll(paleta64,20,TRUE);
 	
-	VDP_drawInt(zona1dat[0].ancho,0,0,26);
-	VDP_drawInt(zona1dat[0].casillas[1],0,2,26);
-	VDP_drawInt(zona1dat[0].blockpri[0],0,0,27);
+	//SYS_showFrameLoad(TRUE);
 	
 	
 	bool gat=TRUE;
@@ -151,7 +139,7 @@ void ZoneMap(){
 			
 			if(BUTTONS[8]){ gat=TRUE;
 				jugcontrol++;if(jugcontrol==4)jugcontrol=0;
-				VDP_drawInt(jugcontrol,0,0,26);
+				VDP_drawInt(jugcontrol,0,39,26);
 			}
 		
 		}else if(!BUTTONS[0]) gat=FALSE;
@@ -172,13 +160,14 @@ static void object2D_maker(SpriteDefinition sprited, u8 num_obj , u8 pal , u16 X
 	object2D[num_obj].y=(STARTYT+(X+Y)/2)+112;
 	
 	bool tempbol=TRUE;
-	for(u8 i=0;i<top_blxpri;i++){
-		if(object2D[num_obj].x+48>blxpri[i].x && object2D[num_obj].x-48<blxpri[i].x
-		&& object2D[num_obj].y+48>blxpri[i].y && object2D[num_obj].y <= blxpri[i].y){
-			tempbol=FALSE; break;
+	if(zona1dat[0].top_blxpri>0){
+		for(u8 i=0;i<zona1dat[0].top_blxpri;i+=2){
+			if(object2D[num_obj].x+48>zona1dat[0].blockpri[i] && object2D[num_obj].x-48<zona1dat[0].blockpri[i]
+			&& object2D[num_obj].y+48>zona1dat[0].blockpri[i+1] && object2D[num_obj].y<=zona1dat[0].blockpri[i+1]){
+				tempbol=FALSE; break;
+			}
 		}
 	}
-	
 	object2D[num_obj].x-=12;object2D[num_obj].y-=26;
 	
 	object2D[num_obj].sprt=SPR_addSprite(&sprited, object2D[num_obj].x-posX, object2D[num_obj].y-posY, TILE_ATTR(pal,tempbol,v,h));
@@ -189,7 +178,6 @@ static void object2D_maker(SpriteDefinition sprited, u8 num_obj , u8 pal , u16 X
 }
 
 static void pintarAB(){
-	//VDP_drawInt(PX,3,20,26);VDP_drawInt(PY,3,20,27);
 	
 	//VDP_drawInt(posX,3,5,26);VDP_drawInt(posY,3,5,27);
 	MAP_scrollTo(bgb,posX,posY);MAP_scrollTo(bga,posX,posY);
@@ -204,17 +192,18 @@ static void pintarAB(){
 	///////////////////////////////////////////////////
 	
 	
-	
 	SPR_setDepth(penguinsp,-posY);
 	//VDP_drawInt(-posY,3,0,27);
 	
 	posXt=posX+160;posYt=posY+112;//centro de la pantalla
 	//VDP_drawInt(posXt,3,10,26);VDP_drawInt(posYt,3,10,27);
 	
 	jugpri=TRUE;
-	for(i=0;i<top_blxpri;i++){
-		if(posXt+48>blxpri[i].x && posXt-48<blxpri[i].x && posYt+48>blxpri[i].y && posYt<=blxpri[i].y){
-			jugpri=FALSE; break;
+	if(zona1dat[0].top_blxpri>0){
+		for(i=0;i<zona1dat[0].top_blxpri;i+=2){
+			if(posXt+48>zona1dat[0].blockpri[i] && posXt-48<zona1dat[0].blockpri[i] && posYt+48>zona1dat[0].blockpri[i+1] && posYt<=zona1dat[0].blockpri[i+1]){
+				jugpri=FALSE; break;
+			}
 		}
 	}
 	
@@ -241,16 +230,10 @@ static void loadzona(){
 	bga=MAP_create(zona1b[0],BG_A,TILE_ATTR_FULL(0,1,0,0,ind));//PLANO B SIEMPRE PRIORIDAD ALTA!
 	ind+=zona1b[0]->tileset->numTile;
 	
-	blxpri[0].x=159;blxpri[0].y=143;//pared 
-	blxpri[1].x=319;blxpri[1].y=159;//bloque
-	blxpri[2].x=351;blxpri[2].y=175;//
-	blxpri[3].x=393;blxpri[3].y=191;//
-	blxpri[4].x=415;blxpri[4].y=207;//
-	
 	
 	//-------------------------------------------
 	for(u8 i=1;i<4;i++){
-		object2D_maker(penguin,i-1,randU8(0,3),32*(i+1),32*(i+1),0,randU8(0,1));
+		object2D_maker(penguin,i-1,i,32*(i+2),32*(i+2),0,randU8(0,1));
 	}
 	//--------------------------------------------
 	
@@ -303,12 +286,13 @@ static void jugpenguin(){
 		}break;
 	}
 	
-	
+	s16 PXC,PYC;
 	if(pdir>0){	
 		if(PX%32==0 && PY%32==0){
 			if(!JUGmueve){ JUGmueve=TRUE; //SI TENEMOS UNA CORDENADA MULTIPLE 32
 				pdircm=pdir;
 			}
+			PXC=PX;PYC=PY;//copiamos antiguas coordenadas x32
 		}
 	}
 	
@@ -340,13 +324,42 @@ static void jugpenguin(){
 		}
 		//---------------------------------------------------------------------
 		
+		PX32=(PX+16)/32;PY32=(PY+16)/32;//division 32
+		
+		VDP_drawInt(PX32,0,10,26);VDP_drawInt(PY32,0,12,26);
+		VDP_drawInt(zona1dat[0].casillas[PX32+(PY32*8)],0,0,27);
+		
 		switch(pdircm){
-			case 1:PY-=VELPING;break;
-			case 2:PY+=VELPING;break;
-			case 3:PX-=VELPING;break;
-			case 4:PX+=VELPING;
+		case 1:
+			if(PY>0){ PY-=VELPING;
+				if(PY>15){ PY32--;
+					VDP_drawInt(zona1dat[0].casillas[PX32+(PY32*8)],0,2,27);
+					if(zona1dat[0].casillas[PX32+(PY32*8)]!=1 && PY-(PY32*32)<32) PY=PYC;
+				}
+			}
+		break;
+		case 2:
+			PY+=VELPING;PY32++;
+			VDP_drawInt(zona1dat[0].casillas[PX32+(PY32*8)],0,2,27);
+			if(zona1dat[0].casillas[PX32+(PY32*8)]!=1 && (PY32*32)-PY<32) PY=PYC;
+		break;
+		case 3:
+			if(PX>0){ PX-=VELPING;
+				if(PX>15){ PX32--;
+					VDP_drawInt(zona1dat[0].casillas[PX32+(PY32*8)],0,2,27);
+					if(zona1dat[0].casillas[PX32+(PY32*8)]!=1 && PX-(PX32*32)<32) PX=PXC;
+				}
+			}
+		break;
+		case 4:
+			PX+=VELPING;PX32++;
+			VDP_drawInt(zona1dat[0].casillas[PX32+(PY32*8)],0,2,27);
+			if(zona1dat[0].casillas[PX32+(PY32*8)]!=1 && (PX32*32)-PX<32) PX=PXC;
 		}
 		
+		VDP_drawInt(PX32,0,10,26);VDP_drawInt(PY32,0,12,26);
+		VDP_drawInt(PX+16,3,20,26);VDP_drawInt(PY+16,3,20,27);
+		
 		jug2diso();
 		
 		// Si tenemos una posicion valida (multiplo de 32), podemos dejar de movernos

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+XGM M_titulo "Titulo/20 - Zombie World.vgm"`
	`2`	`+XGM M_zone1 "Zona1/18 - Riddle, Darkness World.vgm"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-XGM M_titulo "Titulo/20 - Zombie World.vgm"`
`2`	`1`	`IMAGE titulo "Titulo/titulo.png" BEST`
`3`	`2`	`IMAGE titush "Titulo/titulo-shader.png" BEST`
`4`	`3`	`IMAGE fondogr "Titulo/fondo.png" BEST`