From 3cd7f63de831f1e28776aeb0a1c10c52899d549f Mon Sep 17 00:00:00 2001 From: Aleksey Veresov Date: Mon, 1 Mar 2021 14:35:11 +0300 Subject: o_O --- data/map/0 | 32 ++++++++++++++++---------------- data/map/1 | 32 ++++++++++++++++---------------- data/map/@ | 32 ++++++++++++++++---------------- src/map.c | 40 +++++++++++++++++++++++++++++++++++++--- 4 files changed, 85 insertions(+), 51 deletions(-) diff --git a/data/map/0 b/data/map/0 index 5d16e33..906c8f5 100644 --- a/data/map/0 +++ b/data/map/0 @@ -1,21 +1,21 @@ 0 .1.. -#0#4#4#4#4#4#4#4#4#4#4#4#4#4#4#4#4#4#4#1 -#7. . . . . . . . . . . . . . . . . . #5 -#7. . . . . . . . $1. . ^3. . . . . . #5 -#7. . ^1. . . . . . . . . . . . . . . #5 -#7. . . . . . . . . . . . . . . . . . #5 -#7. . . . . . . . . . . . . . . $ . . #5 -#7. . . . . . . . . . . . . . . . . . #a -#7. . . $1. . . . . . . . . . . . . . .0 -#7. . . . . . . . . . . . . . . . . . .0 -#7. . . . . . . . . . . . . . . . . . #8 -#7. . . . . . . . . . . . . . . . . . #5 -#7. . $ . . . . . . . . . . . . . . . #5 -#7. . . . . . . . . ^2. . . ^1. . . . #5 -#7. . . . ^ . . . . . . . . . . . . . #5 -#7. . . . . . . . . . . . . . . . . . #5 -#2#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#3 +r0r4r4r4r4r4r4r4r4r4r4r4r4r4r4r4r4r4r4r1 +r7. . . . . . . . . . . . . . . . . . r5 +r7. . . . . . . . $1. . ^3. . . . . . r5 +r7. . ^1. . . . . . . . . . . . . . . r5 +r7. . . . . . . . . . . . . . . . . . r5 +r7. . . . . . . . . . . . . . . $ . . r5 +r7. . . . . . . . . . . . . . . . . . ra +r7. . . $1. . . . . . . . . . . . . . .0 +r7. . . . . . . . . . . . . . . . . . .0 +r7. . . . . . . . . . . . . . . . . . r8 +r7. . . . . . . . . . . . . . . . . . r5 +r7. . $ . . . . . . . . . . . . . . . r5 +r7. . . . . . . . . ^2. . . ^1. . . . r5 +r7. . . . ^ . . . . . . . . . . . . . r5 +r7. . . . . . . . . . . . . . . . . . r5 +r2r6r6r6r6r6r6r6r6r6r6r6r6r6r6r6r6r6r6r3 +000+000 +000+000 +000+000 diff --git a/data/map/1 b/data/map/1 index 0963d94..cf2beee 100644 --- a/data/map/1 +++ b/data/map/1 @@ -1,21 +1,21 @@ 5 .230 -.3.3.3#0#4#4#4#4#4#4#4#4#4#4#4#4#1.3.3.3 -.3.7.3#7^3^1^0. . . . . . . ^2^1#5.3.7.3 -.3.3.3#7. . . . . . . . . . . ^0#5.3.3.3 -#0#4#4#b. . . . . $ . . . . . . #a#4#4#1 -#7^0^3. . . . . . . . . . . . . . . ^2#5 -#7. . . . . #8#6#6#6#6#6#6#9. . . . ^0#5 -#b. . . = #8#3.3.3.3.3.3.3#2#9. . . . #a -.6. . . = #5.3.3.3.3.3.3.3.3#7. . . . .6 -.6. . . = #5.3.3.3.3.3.3.3.3#7. . . . .6 -#9. . . = #a#1.3.3.3.3.3.3#0#b. . . . #8 -#7^1. . . . #a#4#4#4#4#4#4#b. . $1. . #5 -#7^2. . . . . . . . . . . . . . . . ^2#5 -#2#6#6#9. . $ . . . . . . . . . #8#6#6#3 -.3.3.3#7^1. . . . . . . . . . ^2#5.3.3.3 -.3.7.3#7^0^3^0. . . . . . . . ^2#5.3.7.3 -.3.3.3#2#6#6#6#6#9.6.6#8#6#6#6#6#3.3.3.3 +.3.3.3r0r4r4r4r4r4r4r4r4r4r4r4r4r1.3.3.3 +.3.7.3r7^3^1^0. . . . . . . ^2^1r5.3.7.3 +.3.3.3r7. . . . . . . . . . . ^0r5.3.3.3 +r0r4r4rb. . . . . $ . . . . . . rar4r4r1 +r7^0^3. . . . . . . . . . . . . . . ^2r5 +r7. . . . . r8r6r6r6r6r6r6r9. . . . ^0r5 +rb. . . = r8r3.3.3.3.3.3.3r2r9. . . . ra +.6. . . = r5.3.3.3.3.3.3.3.3r7. . . . .6 +.6. . . = r5.3.3.3.3.3.3.3.3r7. . . . .6 +r9. . . = rar1.3.3.3.3.3.3r0rb. . . . r8 +r7^1. . . . rar4r4r4r4r4r4rb. . $1. . r5 +r7^2. . . . . . . . . . . . . . . . ^2r5 +r2r6r6r9. . $ . . . . . . . . . r8r6r6r3 +.3.3.3r7^1. . . . . . . . . . ^2r5.3.3.3 +.3.7.3r7^0^3^0. . . . . . . . ^2r5.3.7.3 +.3.3.3r2r6r6r6r6r9.6.6r8r6r6r6r6r3.3.3.3 +094-097 +000+000= USSR ZHIVI +000+000= FOREVER! diff --git a/data/map/@ b/data/map/@ index 2a22f05..cb2b645 100644 --- a/data/map/@ +++ b/data/map/@ @@ -1,21 +1,21 @@ 5 .... -#f#f#f#f#f#f#f#f#f#f#f#f#f#f#f#f#f#f#f#f -#f#f#f#f#f#f#f#f#f#f#f#f#f#f#f#f#f#f#f#f -#f#f#0#4#4#4#4#4#4#4#4#4#4#4#4#4#1#f#f#f -#f#f#7.6. . . . . . . . . . . .6#5#f#f#f -#f#f#7.6= . . . . . . . . . . .6#5#f#f#f -#f#f#7.6. . . = . . . . . . . .6#5#f#f#f -#f#f#7.6. . * . . &6. . * . . .6#5#f#f#f -#f#f#7.6. . . . . . . . . . . .6#5#f#f#f -#f#f#7.6. . . . . M . . . . . .6#5#f#f#f -#f#f#7.6. . . . . . . . . . . .6#5#f#f#f -#f#f#7.6. . . . . . . . . . . .6#5#f#f#f -#f#f#7.6. . . . . @ . . . . . .6#5#f#f#f -#f#f#7.6. . . . . . . . . . . .6#5#f#f#f -#f#f#2#6#6#6#6#6#6#6#6#6#6#6#6#6#3#f#f#f -#f#f#f#f#f#f#f#f#f#f#f#f#f#f#f#f#f#f#f#f -#f#f#f#f#f#f#f#f#f#f#f#f#f#f#f#f#f#f#f#f +rfrfrfrfrfrfrfrfrfrfrfrfrfrfrfrfrfrfrfrf +rfrfrfrfrfrfrfrfrfrfrfrfrfrfrfrfrfrfrfrf +rfrfr0r4r4r4r4r4r4r4r4r4r4r4r4r4r1rfrfrf +rfrfr7.6. . . . . . . . . . . .6r5rfrfrf +rfrfr7.6= . . . . . . . . . . .6r5rfrfrf +rfrfr7.6. . . = . . . . . . . .6r5rfrfrf +rfrfr7.6. . * . . ;6. . * . . .6r5rfrfrf +rfrfr7.6. . . . . . . . . . . .6r5rfrfrf +rfrfr7.6. . . . . g . . . . . .6r5rfrfrf +rfrfr7.6. . . . . . . . . . . .6r5rfrfrf +rfrfr7.6. . . . . . . . . . . .6r5rfrfrf +rfrfr7.6. . . . . @ . . . . . .6r5rfrfrf +rfrfr7.6. . . . . . . . . . . .6r5rfrfrf +rfrfr2r6r6r6r6r6r6r6r6r6r6r6r6r6r3rfrfrf +rfrfrfrfrfrfrfrfrfrfrfrfrfrfrfrfrfrfrfrf +rfrfrfrfrfrfrfrfrfrfrfrfrfrfrfrfrfrfrfrf +000+000=IT'S DANGEROUS TO GO ALONE! +000+000=TAKE THIS. +000+000 diff --git a/src/map.c b/src/map.c index d0575fb..9dd4759 100644 --- a/src/map.c +++ b/src/map.c @@ -90,7 +90,41 @@ static void loadroom(tt_room *r, FILE *f) ttplayer.tobein_gulag = 0; ttplayer.until_gulag = 5300; r->floor[i][j] = newtile(0, default_floor_id); - } else if (type == '#') { + } else if (type == 'y') { + r->walls[i][j] = malloc(sizeof(tt_body)); + tt_body *b = r->walls[i][j]; + b->x = j * 32; + b->y = i * 32; + b->xrem = 0; + b->yrem = 0; + b->xvel = 0; + b->yvel = 0; + b->rem = 0; + b->txrrow = 2; + b->txrcol = id; + b->anim = 1; + b->rate = 1; + b->collision_act = do_nothing; + b->msg = 0; + b->msglen = 0; + } else if (type == 'b') { + r->walls[i][j] = malloc(sizeof(tt_body)); + tt_body *b = r->walls[i][j]; + b->x = j * 32; + b->y = i * 32; + b->xrem = 0; + b->yrem = 0; + b->xvel = 0; + b->yvel = 0; + b->rem = 0; + b->txrrow = 3; + b->txrcol = id; + b->anim = 1; + b->rate = 1; + b->collision_act = do_nothing; + b->msg = 0; + b->msglen = 0; + } else if (type == 'r') { r->walls[i][j] = malloc(sizeof(tt_body)); tt_body *b = r->walls[i][j]; b->x = j * 32; @@ -107,7 +141,7 @@ static void loadroom(tt_room *r, FILE *f) b->collision_act = do_nothing; b->msg = 0; b->msglen = 0; - } else if (type == 'M') { + } else if (type == 'g') { r->floor[i][j] = newtile(0, default_floor_id); r->bodies_count++; r->bodies = realloc(r->bodies, @@ -145,7 +179,7 @@ static void loadroom(tt_room *r, FILE *f) b->collision_act = do_nothing; b->msg = 0; b->msglen = 0; - } else if (type == '&') { + } else if (type == ';') { r->floor[i][j] = newtile(0, default_floor_id); r->walls[i][j] = malloc(sizeof(tt_body)); tt_body *b = r->walls[i][j]; -- cgit v1.2.3