diff --git a/data/bar_boss b/data/bar_boss index a8f4adb..10d0ea0 100644 --- a/data/bar_boss +++ b/data/bar_boss @@ -12,16 +12,16 @@ \o\ ,' ,' `. `. /o/ \o`---' ,' `. `---'o/ `.____,' `.____,' - kkkkkk - kkkkkkkkkk - kk kkhhhkkhhhkk kk - khkkk kkhhehhhhehhkk kkkhk - khkkk kkkkhhhkkhhhkkkk kkkhk - kkk kk kkkkkhkkkkhkkkkk kk kkk - kkk khkkkkkkkhhhhkkkkkkkhk kkk - kkk kkkkkkkkkkkkkkkkkkkk kkk -kk kkkkkkkkkkkkkkkkkkkkk kkkkk kk - kkk kkkkkk kkkkk kkkkk kkkkkk kkk - khk kkkkkk kkkkkk khk - khkkkkkkkkk kkkkkkkkkhk - kkkkkkkk kkkkkkkk + ffffff + ffffffffff + ff ffhhhffhhhff ff + fhfff ffhhphhhhphhff fffhf + fhfff ffffhhhffhhhffff fffhf + fff ff fffffhffffhfffff ff fff + fff fhfffffffhhhhfffffffhf fff + fff ffffffffffffffffffff fff +ff fffffffffffffffffffff fffff ff + fff ffffff fffff fffff ffffff fff + fhf ffffff ffffff fhf + fhfffffffff fffffffffhf + ffffffff ffffffff diff --git a/data/bar_fighter b/data/bar_fighter index 6568586..17db84e 100644 --- a/data/bar_fighter +++ b/data/bar_fighter @@ -2,13 +2,13 @@ ,---. \O o/ ^^^^^ -kkkkk -keeek -kkkkk +fffff +fpppf +fffff 5 3 2 1 ,---. \o O/ ^^^^^ -kkkkk -keeek -kkkkk +fffff +fpppf +fffff diff --git a/data/baz_fighter b/data/baz_fighter index 66ee216..627fca6 100644 --- a/data/baz_fighter +++ b/data/baz_fighter @@ -3,26 +3,26 @@ /oo\ //'`\\ cc - ceec + cppc cccccc 6 3 2 1 __ /oo\ /(~~)\ cc - ceec + cppc cccccc 6 3 2 1 __ /oo\ ((^^)) cc - ceec + cppc cccccc 4 3 1 1 __ /oo\ \\// cc -ceec +cppc cccc diff --git a/data/explosion_medium b/data/explosion_medium index 722876b..dd6aad2 100644 --- a/data/explosion_medium +++ b/data/explosion_medium @@ -1,60 +1,60 @@ 1 1 0 0 + -d +o 1 1 0 0 o -d +o 3 2 1 1 _ )_( - d -ddd + o +ooo 3 3 1 1 ._, )_( ' ` -ddd -ddd -ddd +ooo +ooo +ooo 3 3 1 1 .v, > < '^` -ddd -ddd -ddd +ooo +ooo +ooo 5 3 2 1 _\~/_ > < ~/_\~ -fffff -fffff -fffff +mmmmm +mmmmm +mmmmm 5 3 2 1 _\~/_ > < ~/_\~ -ddddd -ddddd -ddddd +ooooo +ooooo +ooooo 5 3 2 1 _\ /_ ~/ \~ -fffff -fffff -fffff +mmmmm +mmmmm +mmmmm 5 3 2 1 _\ /_ ~/ \~ -ddddd -ddddd -ddddd +ooooo +ooooo +ooooo 5 3 2 1 . ' , ' . ` -eeeee -eeeee -eeeee +ppppp +ppppp +ppppp diff --git a/data/explosion_small b/data/explosion_small index 6829ebe..de34b32 100644 --- a/data/explosion_small +++ b/data/explosion_small @@ -1,32 +1,32 @@ 1 1 0 0 + -d +o 1 1 0 0 o -d +o 3 2 1 1 _ )_( - d -ddd + o +ooo 3 3 1 1 ._, )_( ' ` -ddd -ddd -ddd +ooo +ooo +ooo 3 3 1 1 .v, > < '^` -ddd -ddd -ddd +ooo +ooo +ooo 3 3 1 1 . , ' ` -ddd -ddd -ddd +ooo +ooo +ooo diff --git a/data/foo_fighter b/data/foo_fighter index 4833d0f..b750536 100644 --- a/data/foo_fighter +++ b/data/foo_fighter @@ -2,28 +2,28 @@ . , \oXo/ `V' -d d - deded - ddd +o o + opopo + ooo 9 3 4 1 . , `-oXo-' `V' -d d - ddededd - ddd +o o + oopopoo + ooo 9 2 4 0 `--oXo--' `V' -dddededdd - ddd +ooopopooo + ooo 9 2 4 0 ,-oXo-. ' `V' ` - ddededd -d ddd d + oopopoo +o ooo o 7 2 3 0 ,oXo. / `V' \ - deded -d ddd d + opopo +o ooo o diff --git a/data/item_gem b/data/item_gem index 72c81a1..2ae69cc 100644 --- a/data/item_gem +++ b/data/item_gem @@ -3,12 +3,12 @@ /g\ \_/ c -cec +cpc ccc 3 2 1 1 _ /g\ \_/ - e -eee -eee + p +ppp +ppp diff --git a/data/item_heart b/data/item_heart index 5a7cdcd..7146609 100644 --- a/data/item_heart +++ b/data/item_heart @@ -2,13 +2,13 @@ _ _ ( '^) `v' - h h -hhheh - hhh + e e +eeepe + eee 5 3 2 1 _ _ ( '^) `v' - e e -eeeee - eee + p p +ppppp + ppp diff --git a/data/ship_green b/data/ship_green index 2fc0096..e8de828 100644 --- a/data/ship_green +++ b/data/ship_green @@ -3,5 +3,5 @@ (()) I<__>I cc - cddc + cooc cccccc diff --git a/data/weapon_bomb b/data/weapon_bomb index 6c63417..2af5d14 100644 --- a/data/weapon_bomb +++ b/data/weapon_bomb @@ -2,85 +2,85 @@ /`-. `-._\ ` -jjjj -jjjee - e +dddd +dddpp + p 5 3 3 1 _, ,-' / \,-' - ee -jjjje -jjjj + pp +ddddp +dddd 6 2 5 1 ____ |____> - jjjj -jjjjje + dddd +dddddp 4 4 2 1 _, / | / / `' - ee - jje -jjj -jj + pp + ddp +ddd +dd 4 4 1 1 ._ | \ \ \ `' -ee -ejj - jjj - jj +pp +pdd + ddd + dd 3 3 1 0 ,^. | | |_| -eee -jjj -jjj +ppp +ddd +ddd 4 3 2 2 ,. \ \ \_| -jj -jjj - jee +dd +ddd + dpp 4 3 1 2 ,. / / |_/ - jj - jjj -eej + dd + ddd +ppd 3 4 1 3 _ | | | | `v' - j -jjj -jjj -eee + d +ddd +ddd +ppp 5 3 1 1 ,-'\ /_,-' ' - jjjj -eejjj -e + dddd +ppddd +p 5 3 1 1 ._ \ `-. `-./ -ee -ejjjj - jjjj +pp +pdddd + dddd 6 2 0 1 ____ <____| - jjjj -ejjjjj + dddd +pddddd diff --git a/data/weapon_fragbomb b/data/weapon_fragbomb index 522af73..433f256 100644 --- a/data/weapon_fragbomb +++ b/data/weapon_fragbomb @@ -2,49 +2,49 @@ ,--. ( ', ) `--' - jjjj -eejjee - eeee + dddd +ppddpp + pppp 6 3 2 1 ,--. ( ', ) `--' - eeee -jjeejj - jjjj + pppp +ddppdd + dddd 4 4 1 -2 O o : o . : . - j j -h j - h h - h + d d +i d + i i + i 4 4 1 -2 O o : . : . - j - j h -h h - h + d + d i +i i + i 4 4 1 -2 o O o : . . - j j - j - h h - h + d d + d + i i + i 4 4 1 -2 o O : o : . -j j - h j - h - h +d d + i d + i + i diff --git a/src/starfield.c b/src/starfield.c index 5c5b787..60f408b 100644 --- a/src/starfield.c +++ b/src/starfield.c @@ -38,7 +38,7 @@ starfield * create_starfield(game *g) s[i].x = ee_rand(0, g->w - 1); s[i].y = ee_rand(0, g->h - 1); s[i].z = ee_rand(1, 3); - s[i].c = ee_rand(6, 7); + s[i].c = ee_rand(0, 1) ? EE_LIGHTGRAY : EE_DARKGRAY; s[i].ch = ee_rand(0, 1) ? '.' : '\''; } @@ -70,7 +70,7 @@ void update_starfield(game *g, starfield *s) s[i].x = ee_rand(0, g->w - 1); s[i].y = 0; s[i].z = ee_rand(1, 2); - s[i].c = ee_rand(6, 7); + s[i].c = ee_rand(0, 1) ? EE_LIGHTGRAY : EE_DARKGRAY; s[i].ch = ee_rand(0, 1) ? '.' : '\''; } else if(s[i].y < g->h-1) diff --git a/test/demo.c b/test/demo.c index f06955b..7e81161 100644 --- a/test/demo.c +++ b/test/demo.c @@ -292,7 +292,7 @@ static void demo_color(void) ee_clear(); for(i = 0; i < 16; i++) { - sprintf(buf, "color %i (%s)\n", i, ee_color_names[i]); + sprintf(buf, "'%c': %i (%s)", 'a' + i, i, ee_color_names[i]); ee_set_color(EE_WHITE); ee_putstr(4, i + 3, buf); ee_set_color(i);