Shuriken has the FEWER_SHURIKENS flag

Fabrizio-Caruso · Oct 15, 2023 · ce3e916 · ce3e916
1 parent 7306645
commit ce3e916
Show file tree

Hide file tree

Showing 6 changed files with 176 additions and 103 deletions.
diff --git a/src/games/shuriken/Makefile.shuriken b/src/games/shuriken/Makefile.shuriken
@@ -20,7 +20,7 @@ GLOBAL_OPTS = $(DEFAULT_ASCII)
 
 include ./$(PARENT_DIR)/$(GAME_NAME)/config/project_config.mk
 
-# include ./$(PARENT_DIR)/$(GAME_NAME)/config/game_config.mk
+include ./$(PARENT_DIR)/$(GAME_NAME)/config/game_config.mk
 
 
 include ./Makefile_common

diff --git a/src/games/shuriken/config/game_config.mk b/src/games/shuriken/config/game_config.mk
@@ -1,37 +1,31 @@
 #
 
-# COCO_COLOR_GFX_GAME_OPTS ?= -DMAX_ARROWS_ON_SCREEN=7 -DFASTER_WALL_REDRAW -DNUMBER_OF_MISSILES=3
+COCO_COLOR_GFX_GAME_OPTS ?= 
 
-CREATIVISION_GAME_OPTS ?= -DLESS_TEXT 
+CREATIVISION_GAME_OPTS ?=  
 
-GAMATE_GAME_OPTS ?= -DLESS_TEXT -DNO_BLINKING -DSIMPLE_STRATEGY -DNO_HINTS -DNO_CONTROL_INSTRUCTIONS
+GAMATE_GAME_OPTS ?=
 
-C128_Z80_80COL_GAME_OPTS ?= -DLESS_TEXT -DNO_BLINKING -DNO_HINTS -DBOMB_DRAW_SKIP=3 -DWALL_DRAW_SKIP=15
-
-# ZX81_NO_GFX_GAME_OPTS ?= -DMAX_ARROWS_ON_SCREEN=7 -DNUMBER_OF_MISSILES=4 -DMISSILE_DROP_LOOP_MASK=1 -DSMALL_WALL 
+C128_Z80_80COL_GAME_OPTS ?= 
 
-ZX81_GFX_GAME_OPTS ?= -DLESS_TEXT -DNO_BLINKING -DNO_HINTS -DBOMB_DRAW_SKIP=3 -DWALL_DRAW_SKIP=15
+ZX81_NO_GFX_GAME_OPTS ?=
 
-# APPLE2_GAME_OPTS ?= -DMAX_ARROWS_ON_SCREEN=7 -DNUMBER_OF_MISSILES=3
+ZX81_GFX_GAME_OPTS ?= 
 
-COMX_GAME_OPTS ?= -DNO_BLINKING -DBOMB_DRAW_SKIP=3 -DWALL_DRAW_SKIP=15 -DGHOSTS_NUMBER=7
+APPLE2_GAME_OPTS ?= 
 
-PECOM_GAME_OPTS ?= -DNO_BLINKING -DBOMB_DRAW_SKIP=3 -DWALL_DRAW_SKIP=15 -DGHOSTS_NUMBER=7
+COMX_GAME_OPTS ?= 
 
-TMC600_GAME_OPTS ?= -DNO_BLINKING -DBOMB_DRAW_SKIP=3 -DWALL_DRAW_SKIP=15 -DGHOSTS_NUMBER=7
+PECOM_GAME_OPTS ?= 
 
-MICRO_GAME_OPTS ?= -DNO_BLINKING -DGHOSTS_NUMBER=7
+TMC600_GAME_OPTS ?= 
 
-__VIC20_EXP_3K_GAME_OPTS ?= -DNO_BLINKING -DNO_HINTS -DLESS_TEXT -DGHOSTS_NUMBER=8
+MICRO_GAME_OPTS ?= 
 
-__VIC20_UNEXPANDED_GAME_OPTS ?= -DNO_EXTRA_TITLE 	\
-    -DROUND_ENEMIES \
-	-DSIMPLE_RANDOM_LEVEL \
-	-DNO_END_SCREEN \
-	-DNO_CONTROL_INSTRUCTIONS \
-	-DLESS_TEXT -DNO_BLINKING \
-	-DNO_STATS \
-	-DGHOSTS_NUMBER=8 \
-	-DNO_DEAD_GHOSTS
+CAMPUTERS_LYNX_GAME_OPTS ?= -DFEWER_SHURIKENS
 
-STDIO_GAME_OPTS ?= -DEVEN_LOOP_MOVE
+__VIC20_EXP_3K_GAME_OPTS ?= 
+
+__VIC20_UNEXPANDED_GAME_OPTS ?= 
+
+STDIO_GAME_OPTS ?= 
diff --git a/src/games/shuriken/level_cross.h b/src/games/shuriken/level_cross.h
@@ -138,23 +138,39 @@
 
 //
 
-#define LV_CROSS_SHURIKENS \
-    4,4,2, \
-    2,2,\
-    XSize-3,3, \
-    2,YSize-2, \
-    XSize-3,YSize-3, \
-    \
-    LV_CROSS_OFFSET-3,2, \
-    XSize-1-LV_CROSS_OFFSET+3,2, \
-    LV_CROSS_OFFSET-3,YSize-2, \
-    XSize-1-LV_CROSS_OFFSET+3,YSize-2, \
-    \
-    2, \
-    XSize-3
-
 
-#define LV_CROSS_SHURIKENS_SIZE LV_SHURIKENS_SIZE(4,4,2)
+#if !defined(FEWER_SHURIKENS)
+    #define LV_CROSS_SHURIKENS \
+        4,4,2, \
+        2,2,\
+        XSize-3,3, \
+        2,YSize-2, \
+        XSize-3,YSize-3, \
+        \
+        LV_CROSS_OFFSET-3,2, \
+        XSize-1-LV_CROSS_OFFSET+3,2, \
+        LV_CROSS_OFFSET-3,YSize-2, \
+        XSize-1-LV_CROSS_OFFSET+3,YSize-2, \
+        \
+        2, \
+        XSize-3
+    #define LV_CROSS_SHURIKENS_SIZE LV_SHURIKENS_SIZE(4,4,2)
+
+#else
+    #define LV_CROSS_SHURIKENS \
+        2,2,2, \
+        2,2,\
+        XSize-3,YSize-3, \
+        \
+        LV_CROSS_OFFSET-3,2, \
+        XSize-1-LV_CROSS_OFFSET+3,YSize-2, \
+        \
+        2, \
+        XSize-3
+    #define LV_CROSS_SHURIKENS_SIZE LV_SHURIKENS_SIZE(2,2,2)
+
+#endif    
+
 
 
 

diff --git a/src/games/shuriken/level_h_barriers.h b/src/games/shuriken/level_h_barriers.h
@@ -47,7 +47,7 @@
 
 //
 
-#if XSize>=20
+#if XSize>=20  && !defined(FEWER_SHURIKENS)
     #define LV_H_BARRIERS_SHURIKENS \
         3,8,0, \
         \
@@ -89,7 +89,7 @@
         \
         \
 
-#define LV_H_BARRIERS_SHURIKENS_SIZE LV_SHURIKENS_SIZE(3,6,0)
+    #define LV_H_BARRIERS_SHURIKENS_SIZE LV_SHURIKENS_SIZE(3,6,0)
 
 #endif
 

diff --git a/src/games/shuriken/level_horiz.h b/src/games/shuriken/level_horiz.h
@@ -44,25 +44,44 @@
 
 //
 
-#define LV_HORIZ_SHURIKENS \
-    12, 0, 0, \
-	\
-    2,4, \
-    2,7, \
-    2,10, \
-    2,YSize-9, \
-    2,YSize-6, \
-    2,YSize-3, \
-	\
-    XSize-3,3, \
-    XSize-3,6, \
-    XSize-3,9, \
-    XSize-3,YSize-10, \
-    XSize-3,YSize-7, \
-    XSize-3,YSize-4
+#if !defined(FEWER_SHURIKENS)
+    #define LV_HORIZ_SHURIKENS \
+        12, 0, 0, \
+        \
+        2,4, \
+        2,7, \
+        2,10, \
+        2,YSize-9, \
+        2,YSize-6, \
+        2,YSize-3, \
+        \
+        XSize-3,3, \
+        XSize-3,6, \
+        XSize-3,9, \
+        XSize-3,YSize-10, \
+        XSize-3,YSize-7, \
+        XSize-3,YSize-4
+
+    #define LV_HORIZ_SHURIKENS_SIZE LV_SHURIKENS_SIZE(12,0,0)
+
+#else
+    #define LV_HORIZ_SHURIKENS \
+        8, 0, 0, \
+        \
+        2,4, \
+        2,7, \
+        2,YSize-9, \
+        2,YSize-3, \
+        \
+        XSize-3,3, \
+        XSize-3,6, \
+        XSize-3,YSize-10, \
+        XSize-3,YSize-4 
+
+    #define LV_HORIZ_SHURIKENS_SIZE LV_SHURIKENS_SIZE(8,0,0)
 
+#endif
 
-#define LV_HORIZ_SHURIKENS_SIZE LV_SHURIKENS_SIZE(12,0,0)
 
 
 // 

diff --git a/src/games/shuriken/level_many.h b/src/games/shuriken/level_many.h
@@ -45,53 +45,97 @@
 
 
 #if XSize>=20 && YSize>=21
-    #define LV_MANY_SHURIKENS \
-        8, 4, 4, \
-        \
-        3,1+3, \
-        3,1+5, \
-        XSize-4,1+6, \
-        3,YSize-1-6, \
-        3,YSize-1-4, \
-        XSize-4,1+4, \
-        XSize-4,YSize-1-5, \
-        XSize-4,YSize-1-3, \
-        \
-        2,4, \
-        XSize-1-2,4, \
-        4,4, \
-        XSize-1-4,5, \
-        \
-        2, \
-        XSize-1-2, \
-        3, \
-        XSize-1-3
+    #if !defined(FEWER_SHURIKENS)
+        #define LV_MANY_SHURIKENS \
+            8, 4, 4, \
+            \
+            3,1+3, \
+            3,1+5, \
+            XSize-4,1+6, \
+            3,YSize-1-6, \
+            3,YSize-1-4, \
+            XSize-4,1+4, \
+            XSize-4,YSize-1-5, \
+            XSize-4,YSize-1-3, \
+            \
+            2,4, \
+            XSize-1-2,4, \
+            4,4, \
+            XSize-1-4,5, \
+            \
+            2, \
+            XSize-1-2, \
+            3, \
+            XSize-1-3
+
+        #define LV_MANY_SHURIKENS_SIZE LV_SHURIKENS_SIZE(8,4,4)
+    #else
+        #define LV_MANY_SHURIKENS \
+            4, 2, 4, \
+            \
+            3,1+3, \
+            3,YSize-1-6, \
+            XSize-4,1+4, \
+            XSize-4,YSize-1-3, \
+            \
+            2,4, \
+            XSize-1-2,4, \
+            \
+            2, \
+            XSize-1-2, \
+            3, \
+            XSize-1-3
+
+
+        #define LV_MANY_SHURIKENS_SIZE LV_SHURIKENS_SIZE(4,2,4)
+    #endif
 
 
-    #define LV_MANY_SHURIKENS_SIZE LV_SHURIKENS_SIZE(8,4,4)
 #elif YSize>=21
-    #define LV_MANY_SHURIKENS \
-        8, 2, 4, \
-        \
-        3,1+3, \
-        3,1+5, \
-        XSize-4,1+6, \
-        3,YSize-1-6, \
-        3,YSize-1-4, \
-        XSize-4,1+4, \
-        XSize-4,YSize-1-5, \
-        XSize-4,YSize-1-3, \
-        \
-        2,4, \
-        XSize-1-2,4, \
-        \
-        2, \
-        XSize-1-2, \
-        3, \
-        XSize-1-3
-
-
-    #define LV_MANY_SHURIKENS_SIZE LV_SHURIKENS_SIZE(8,2,4)
+    #if !defined(FEWER_SHURIKENS)
+        #define LV_MANY_SHURIKENS \
+            8, 2, 4, \
+            \
+            3,1+3, \
+            3,1+5, \
+            XSize-4,1+6, \
+            3,YSize-1-6, \
+            3,YSize-1-4, \
+            XSize-4,1+4, \
+            XSize-4,YSize-1-5, \
+            XSize-4,YSize-1-3, \
+            \
+            2,4, \
+            XSize-1-2,4, \
+            \
+            2, \
+            XSize-1-2, \
+            3, \
+            XSize-1-3
+
+
+        #define LV_MANY_SHURIKENS_SIZE LV_SHURIKENS_SIZE(8,2,4)
+    #else
+        #define LV_MANY_SHURIKENS \
+            4, 2, 4, \
+            \
+            3,1+3, \
+            3,YSize-1-6, \
+            XSize-4,1+4, \
+            XSize-4,YSize-1-3, \
+            \
+            2,4, \
+            XSize-1-2,4, \
+            \
+            2, \
+            XSize-1-2, \
+            3, \
+            XSize-1-3
+
+
+        #define LV_MANY_SHURIKENS_SIZE LV_SHURIKENS_SIZE(4,2,4)
+
+    #endif
 
 #elif YSize>=17
     #define LV_MANY_SHURIKENS \