From 3846d4266dfea46381828b4f0e999c9ed041eb32 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Mon, 10 Jul 2017 00:39:38 -0400 Subject: [PATCH] tfv: more progress --- gr-sim/backgrounds.h | 60 ++++++---- gr-sim/gr-sim.c | 2 +- gr-sim/gr-sim.h | 16 +++ gr-sim/tfv.c | 269 +++++++++++++++++++++++++++++++++++-------- gr-sim/tfv_sprites.h | 19 +++ tfv/belair.png | Bin 0 -> 709 bytes tfv/landing.png | Bin 355 -> 558 bytes tfv/map.png | Bin 0 -> 649 bytes tfv/sprites.png | Bin 412 -> 693 bytes tfv/tfv.game_data | 43 +++++-- 10 files changed, 332 insertions(+), 77 deletions(-) create mode 100644 tfv/belair.png create mode 100644 tfv/map.png diff --git a/gr-sim/backgrounds.h b/gr-sim/backgrounds.h index 9b09979e..d55114f7 100644 --- a/gr-sim/backgrounds.h +++ b/gr-sim/backgrounds.h @@ -26,23 +26,43 @@ static unsigned char title_rle[]= static unsigned char worldmap_rle[]= { 0x28,0x28, -0x55,0x66,0x03,0xF6,0x17,0x66,0x02,0xF6,0x02,0xFF,0x01,0xF6, -0x07,0x66,0x03,0xFF,0x01,0x5F,0x02,0xFF,0x01,0xF6,0x13,0x66,0x01,0xF6,0x07,0xFF, -0x07,0x66,0x01,0x65,0x04,0x5F,0x01,0x6F,0x13,0x66,0x01,0x65,0x01,0x55,0x01,0x5F,0x02,0xFF,0x02,0x65, -0x1C,0x66,0x01,0xF6,0x01,0xFF,0x01,0x56, -0x24,0x66,0x01,0x8F,0x02,0xFF,0x01,0x85,0x04,0x66,0x05,0xD6, -0x11,0x66,0x01,0xD6,0x06,0xE6,0x02,0x46,0x01,0x96,0x02,0x88,0x01,0x48,0x01,0x58,0x01,0x88,0x01,0x86,0x02,0x66,0x05,0xD9, -0x05,0x66,0x07,0x46,0x04,0x44,0x01,0xD4,0x01,0xED,0x05,0xEE,0x02,0x44,0x01,0x84,0x01,0x98,0x03,0x88,0x01,0x48,0x01,0x88,0x01,0xA8,0x01,0x84,0x01,0x44,0x01,0x49,0x03,0xF9,0x01,0x49,0x04,0x46, -0x0B,0x44,0x01,0xD4,0x01,0xED,0x04,0xEE,0x01,0x4E,0x02,0x44,0x01,0x84,0x01,0x89,0x02,0x88,0x01,0x89,0x04,0x88,0x01,0x85,0x01,0x88,0x01,0x44,0x01,0x4F,0x01,0x40,0x01,0x4F,0x01,0x88, -0x0E,0x44,0x01,0xDD,0x01,0xED,0x05,0xEE,0x01,0x88,0x01,0x44,0x01,0x84,0x01,0x89,0x01,0x98,0x01,0x88,0x01,0x98,0x01,0x88,0x01,0x84,0x03,0x88,0x01,0x85,0x01,0x88,0x01,0xA8,0x02,0x44,0x01,0x94,0x01,0x88,0x01,0x58,0x01,0x84, -0x0B,0x44,0x01,0xDD,0x08,0xEE,0x01,0x88,0x02,0x84,0x04,0xE8,0x01,0x48,0x08,0x88,0x01,0x98,0x03,0x88, -0x0A,0x44,0x01,0xDD,0x11,0xEE,0x01,0xE4,0x04,0x44,0x02,0x48,0x01,0x89,0x03,0x88,0x01,0x85,0x01,0x88, -0x09,0x44,0x01,0xDD,0x12,0xEE,0x07,0x44,0x02,0x48,0x01,0x88,0x01,0x85,0x02,0x48, -0x09,0x44,0x01,0xDD,0x0C,0xEE,0x02,0xDE,0x02,0x4D,0x0C,0x44,0x02,0xC4, -0x0A,0x44,0x02,0x4E,0x08,0xEE,0x01,0xDE,0x02,0x4D,0x0C,0x44,0x01,0xC4,0x02,0xCC,0x01,0xC4,0x01,0xCC, -0x21,0x44,0x01,0xC4,0x02,0xCC,0x01,0xC4,0x03,0xCC, -0x1F,0x44,0x01,0xC4,0x01,0xCC,0x01,0xC4,0x01,0xCC,0x01,0x4C,0x02,0xCC,0x01,0x4C,0x01,0xCC, -0x1E,0x44,0x02,0xCC,0x01,0x4C,0x04,0xCC,0x01,0xC4,0x02,0xCC, -0x1D,0x44,0x01,0xCC,0x01,0x4C,0x02,0xCC,0x01,0xC4,0x01,0x4C,0x01,0xCC,0x01,0xC4,0x02,0xCC,0x01,0xC4, -0xff,0xff, -}; +0x23,0x66,0x01,0x46,0x01,0x06, +0x05,0x66,0x01,0x56,0x0E,0x66,0x01,0xE6,0x04,0x66,0x01,0x77,0x01,0xFF,0x01,0xF6,0x08,0x66,0x01,0x46,0x03,0x44, +0x04,0x66,0x01,0x56,0x01,0x55,0x01,0x56,0x01,0xE6,0x0B,0x66,0x01,0x6E,0x01,0x66,0x01,0x6E,0x02,0x66,0x01,0x67,0x04,0x6F,0x07,0x66,0x01,0x4F,0x01,0x47,0x01,0x4F,0x01,0x44,0x03,0x66, +0x01,0x6E,0x06,0x66,0x06,0xA6,0x02,0x56,0x04,0xA6,0x01,0x56,0x01,0xA6,0x01,0x56,0x03,0xA6,0x01,0x56,0x02,0xA6,0x01,0x56,0x02,0xA6,0x01,0x56,0x02,0x66,0x01,0x64,0x03,0x44,0x01,0x46, +0x08,0x66,0x01,0xAA,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55,0x03,0x66,0x01,0xE6,0x03,0xE4,0x01,0xE6, +0x07,0x66,0x01,0xAA,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55, +0x0F,0x66,0x01,0xAA,0x05,0x56,0x01,0x55,0x05,0x56,0x01,0x55,0x05,0x56,0x01,0x55,0x05,0x56,0x01,0x55, +0x0A,0x66,0x01,0xE6,0x04,0x66,0x01,0xAA,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55, +0x09,0x66,0x01,0x6E,0x01,0x66,0x01,0x6E,0x03,0x66,0x01,0xAA,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55, +0x0C,0x66,0x01,0xE6,0x02,0x66,0x01,0xAA,0x05,0x56,0x01,0x55,0x05,0x56,0x01,0x55,0x05,0x56,0x01,0x55,0x05,0x56,0x01,0x55, +0x0B,0x66,0x01,0x6E,0x01,0x66,0x01,0x6E,0x01,0x66,0x01,0xAA,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55, +0x0F,0x66,0x01,0xAA,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55,0x02,0x66,0x01,0x55,0x01,0x56,0x02,0x66,0x01,0x55, +0x08,0x66,0x01,0xAA,0x05,0x56,0x01,0x55,0x05,0x56,0x01,0x55,0x05,0x56,0x01,0x55,0x05,0x56,0x01,0x55,0x02,0x66,0x01,0x55,0x01,0x66,0x01,0x65,0x01,0x56,0x01,0x55, +0x08,0x66,0x01,0xAA,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55,0x02,0x66,0x01,0x65,0x03,0x66,0x01,0x65, +0x02,0x66,0x01,0x6E,0x01,0xE6,0x01,0x6E,0x03,0x66,0x01,0xAA,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55,0x05,0x66,0x01,0x55,0x03,0x66,0x01,0x16,0x01,0x91,0x01,0x16, +0x04,0x66,0x01,0xEE,0x04,0x66,0x01,0xAA,0x05,0x56,0x01,0x55,0x05,0x56,0x01,0x55,0x05,0x56,0x01,0x55,0x05,0x56,0x01,0x55,0x03,0x66,0x01,0x69,0x01,0x99,0x01,0x69, +0x03,0x66,0x01,0x05,0x01,0x55,0x01,0x66,0x01,0x55,0x01,0x65,0x1C,0x66,0x01,0x86,0x01,0x96,0x01,0x99,0x01,0x96,0x01,0x86, +0x02,0x66,0x04,0x65,0x1F,0x66,0x01,0x99, +0x1B,0x66,0x01,0xE6,0x01,0x6E,0x01,0xE6,0x09,0x66,0x01,0x69, +0x2B,0x66, +0xff,0xff,}; + +static unsigned char landing_rle[]= +{ 0x28,0x28, +0x03,0x66,0x01,0x56, +0x27,0x66,0x01,0x55,0x01,0xF5, +0x26,0x66,0x01,0x55,0x01,0xFF,0x01,0xF5, +0x25,0x66,0x01,0x55,0x02,0xFF,0x01,0xF5, +0x24,0x66,0x01,0x55,0x03,0xFF,0x01,0xF5,0x20,0x66, +0x01,0x46,0x01,0x24,0x01,0x44,0x01,0x55,0x0F,0xF5,0x04,0x22, +0x12,0x44,0x01,0x62,0x01,0x22,0x01,0x55,0x01,0xFF,0x03,0x11,0x01,0x44,0x03,0x22,0x01,0x44,0x03,0x22,0x03,0xFF,0x05,0x22, +0x11,0x44,0x01,0x22,0x01,0x26,0x01,0x55,0x02,0xFF,0x01,0x11,0x03,0x44,0x01,0x22,0x03,0x44,0x01,0x22,0x04,0xFF,0x06,0x22, +0x10,0x44,0x02,0x26,0x01,0x55,0x02,0xFF,0x01,0xF1,0x03,0xF4,0x01,0xF2,0x03,0xF4,0x01,0xF2,0x01,0xFF,0x02,0x8F,0x01,0xFF,0x07,0x22, +0x0F,0x44,0x01,0x62,0x01,0x26,0x01,0x55,0x0A,0x5F,0x02,0xFF,0x02,0x88,0x01,0xFF,0x08,0x22, +0x0E,0x44,0x01,0x22,0x01,0x42,0x01,0x55,0x09,0xFF,0x01,0x55,0x02,0xFF,0x02,0x88,0x0A,0xFF, +0x0F,0x44,0x03,0x45,0x01,0x85,0x09,0x45,0x02,0x85,0x04,0x45,0x01,0x85,0x05,0x45, +0x11,0x44,0x01,0x48,0x09,0x44,0x04,0x85,0x04,0x44,0x01,0x48, +0x1E,0x44,0x06,0x85, +0x104,0x44, +0xff,0xff,}; diff --git a/gr-sim/gr-sim.c b/gr-sim/gr-sim.c index 8555782d..ea8c6756 100644 --- a/gr-sim/gr-sim.c +++ b/gr-sim/gr-sim.c @@ -467,7 +467,7 @@ int basic_hlin(int x1, int x2, int at) { int i; - for(i=x1;i FIGHT/LIMIT 21 +KILLER CRAB | DEATER 128/255 128 | ZAP 22 + | | REST 23 + | | RUN AWAY 24 + +Sound effects? + +List hits + +****** ** **** **** ** ** ****** **** ****** ****** ****** +** ** **** ** ** ** ** ** ** ** ** ** ** ** +** ** ** **** **** ****** **** ****** ** ****** ****** +** ** ** ** ** ** ** ** ** ** ** ** ** +****** ****** ****** **** ** **** ****** ** ****** ** + +*/ + +static int hp=50,max_hp=100; +static int enemy_hp=20; +static int limit=2; + +static void print_byte(unsigned char value) { + char temp[4]; + sprintf(temp,"%3d",value); + temp[3]=0; + basic_print(temp); +} + + +static int do_battle(void) { + + int i,ch; + + int enemy_x=2; + int tfv_x=34; + + home(); + gr(); + + basic_htab(1); + basic_vtab(22); + basic_normal(); + basic_print("KILLER CRAB"); + + basic_htab(27); + basic_vtab(21); + basic_print("HP"); + + basic_htab(34); + basic_vtab(21); + basic_print("LIMIT"); + + basic_htab(15); + basic_vtab(22); + basic_print("DEATER"); + + basic_htab(24); + basic_vtab(22); + print_byte(hp); + basic_print("/"); + print_byte(max_hp); + + basic_htab(34); + basic_vtab(22); + basic_inverse(); + for(i=0;i8) yy-=2; odd=!odd; } - if ((ch=='m') || (ch==APPLE_DOWN)) { + if ((ch=='s') || (ch==APPLE_DOWN)) { if (yy<27) yy+=2; odd=!odd; } - if ((ch=='j') || (ch==APPLE_LEFT)) { + if ((ch=='a') || (ch==APPLE_LEFT)) { if (direction>0) { direction=-1; odd=0; @@ -417,7 +615,7 @@ static int world_map(void) { if (xx<0) xx=0; } } - if ((ch=='k') || (ch==APPLE_RIGHT)) { + if ((ch=='d') || (ch==APPLE_RIGHT)) { if (direction<0) { direction=1; odd=0; @@ -429,6 +627,19 @@ static int world_map(void) { } } + if (ch=='h') print_help(); + if (ch=='b') do_battle(); + if (ch=='i') print_info(); + if (ch=='m') { + show_map(); + refresh=1; + } + + if (refresh) { + grsim_unrle(landing_rle,0x800); + refresh=0; + } + gr_copy(0x800,0x400); if (direction==-1) { @@ -447,38 +658,6 @@ static int world_map(void) { return 0; } -/* Do Battle */ - -/* Battle. -Forest? Grassland? Artic? Ocean? - - - - - | ----------------------------------------| - | HP LIMIT | -> FIGHT/LIMIT -GRUMPO | DEATER 128/255 128 | ZAP - | | REST - | | RUN AWAY - -Sound effects? - -List hits - -****** ** **** **** ** ** ****** **** ****** ****** ****** -** ** **** ** ** ** ** ** ** ** ** ** ** ** -** ** ** **** **** ****** **** ****** ** ****** ****** -** ** ** ** ** ** ** ** ** ** ** ** ** -****** ****** ****** **** ** **** ****** ** ****** ** - -*/ - -static int do_battle(void) { - - return 0; -} - int main(int argc, char **argv) { @@ -502,8 +681,8 @@ int main(int argc, char **argv) { /* World Map */ world_map(); - /* Do Battle */ - do_battle(); + /* Game Over, Man */ + game_over(); return 0; } diff --git a/gr-sim/tfv_sprites.h b/gr-sim/tfv_sprites.h index 5cd2c4f7..3f9b08e2 100644 --- a/gr-sim/tfv_sprites.h +++ b/gr-sim/tfv_sprites.h @@ -38,6 +38,13 @@ static unsigned char tfv_walk_left[]={ 0x00,0x82,0x00,0x82, }; +static unsigned char tfv_led_sword[]={ + 0x5,0x3, + 0x10,0x00,0x10,0x00,0x00, + 0x10,0x01,0x10,0x10,0x10, + 0x00,0x00,0x11,0x01,0x10, +}; + #if 0 static unsigned char test_sprite[]={ 0x8,0x4, @@ -69,3 +76,15 @@ static unsigned char ship_left[]={ 0x15,0x00,0x07,0x77,0x00, }; + +/* Enemies */ +static unsigned char killer_crab[]={ + 0x9,0x6, + 0x99,0x00,0x99,0x00,0x00,0x00,0x99,0x00,0x99, + 0x06,0x60,0x06,0x00,0x00,0x00,0x06,0x60,0x06, + 0x00,0x06,0x40,0x49,0x44,0x49,0x40,0x06,0x00, + 0x06,0x04,0x44,0x44,0x44,0x44,0x44,0x04,0x06, + 0x00,0x60,0x04,0x64,0x04,0x64,0x04,0x60,0x00, + 0x44,0x00,0x40,0x04,0x00,0x04,0x40,0x00,0x44, +}; + diff --git a/tfv/belair.png b/tfv/belair.png new file mode 100644 index 0000000000000000000000000000000000000000..055279f2c6ebfee34a7ad90c9bcd20d6eec5d3fb GIT binary patch literal 709 zcmV;$0y_PPP)Pi#Rq2Ro`L3W7_cxCnJ{aTI(2C1Sz7eE^@J9ScHAOML*rT^tO! z2(}1{fDWY&?JZ5(o16R5t={-|Jd# z7mGzDFA>D=wMZVQ}GbeB;^^HW^mFOXvD8MgCM$cFJ0tby5ku*i{;7-4gk*VR{%h3 zu>HN05i8+f!{~UB2FW|kNusOgM!+e_Kot%o;Jmj>uImch*IG=E5^o|-DI;}#v)WC5 z9yrY<980{;({ds`(HY10p%*rmulg3Qc|u@F2@db~vkw3`Uw8`t--zeMR>H39`byZl zTaN^;Q$Fc0)*lu_0R{(5w(Gl2DCl5m(n>w}Acjq5-s7v7--28QMs*wkm#^H0I*^rZ zWZ<#@sTp|V@R2xeij^=gII_$k%O2D`Ewib;*5Eqdh9E#*#}RO3TeLeiQIzV&Nq1i= zK$hbOIC5N-0|^ioNM3Mcj#}!qefz7H?VHPr1Kd3Fg*(e}!Q-k$1Eh=Ns1A(kxU^(o z>;R)WE@}p9(@X{>+CpdIe&r5iIgT}b`L815Upnl+ky-g{PIe$I^@5`+dH=6f zCt3!QjI(Au>w=;>Fl`x^6gXxE8pjECVFQk_mJaMUU*%Zf1}_=LK6wt#GXQxV7?1%d rDf3;}05kv%Km*Xo05kv%z}eIvw3%+Du=D_I00000NkvXXu0mjfWd10t literal 0 HcmV?d00001 diff --git a/tfv/landing.png b/tfv/landing.png index c72386fc5f1734921a7dde967243b5ac6b864547..470534920e5a1db5ea22f82454120136282f2d8b 100644 GIT binary patch delta 515 zcmV+e0{s2s0Tk?_UNJg2b8xf<#3Gg2b8xf<#3Gg2b8xg2c2eHg^hdBKIp> z>%_w6!_xNI`Mg^MI*+5mi4ke-8~9>ogvm&Dx=j84dEgd4VE-=Dk3$NtJ$M>QO`Nyj z+BT8Jc)%9p0k&1y8b~WjCejX@jWCf&`Eb)eDIwN_+irvjeOvQY4tL>>=yE4)mq5|LPP`^`c05v3 z^y74~7d=B=>*!09jgp0`Oiji9zsQkDQmmf2_LYQ=fo6?57qjCc6RXa7zI0M7? zt7;uOPNKF5{}=UO0SttJFc1bpFc1d9Ko|(YKp1G6{s56orpY3S9T)%r002ovPDHLk FV1g=G>UjVF delta 339 zcmV-Z0j&P61mgmb8Gi!+003UTjWYlM05ecbR7C&)0OKBDU{1aNMEwAxV4R$s6wm$8 z!~bA%1OI9~ot>TkpwJZcJkZ^Za{ti(|Nj600G*G9fB*mh32;bRa{vGf6951U69E94 zoEQKA00(qQO+^Rc2M81kJ1>Z>I{*Lx!%0LzR7l6|)5{KoAb$)6P=)~M&j0`0p(0uy z(*ib`4R=EfcybXmK{+N3-m8OJ(R z6B9vP_B8Bg60{b<&zba$ucomCWio;xD1+AKLqQIcU&|Z?C6a7e4ScT67|4@F!(Jd} z8l)F{1mwv3luUbB1b=Orf^8Q5lx1+_Uv49SDFE#PY{<4}Mq(8=CMI5hgbN6P6!*rB9zo9_1R`F*#HAY(6E|Wp z5Ley+mM)A5J{R?Y)c4xgKZtGTThVq($&Z=&IdG@V+@+6sg($uT}I^`9?xU_uH}yZxnFc1kC*j&RgjT;;K_DPDK4lv@%W(MA2i+% zk_hB@XibmPeV~uI!90>g3<#i?R83PSRMA8LBPy~BCtXn|F5|C$Kv)-EbbRb3Tr~$X z2O_Cwpz2IYk^pprB5>rw|HFl4rA#jD0${;pOTJImaz4>}>j}00000NkvXXu0mjfUEUIy literal 0 HcmV?d00001 diff --git a/tfv/sprites.png b/tfv/sprites.png index 5f53313b572ae7211def8ee498ecee570c7f1188..e9c66fb16541650b9d640e43e547ceac66d60c15 100644 GIT binary patch delta 561 zcmV-10?z%M1GNQ^ERiWN1eiU;zmZ@%e+mIQHYb38Bme*b`$mAZ_Gfv)G|yexFV#~e_~ zaJuU`Ia{DoC7^!|tNaX=+K?7F3`c+!OHO6D?DD-ZLktjIcxHqQy(|!3vd0`UfAm5i zz%Wz-;~hljxhk2VQUG{=_?VJgGHLI?9-ao4mV5*VHG3#!jPyNcNAbiRw?1Ej)fg8; zPec(3UC3Kx6#l6is1qvW?9WUBg)nBGd7d#s=uFb7*hwHE=NZ752#6*F-Kd*Y1kN*k zQ@e&S0LOv&9ZZGh?lH*R_e0y9e>q4V2=I6S&|D{mHLZ_<*h>Ms9MCuYK)mQYkX8}^ zU6XyhcV6rm*x9{~fP8xxNX0-vbko4D1a!(&n@v<-s0^_4>me%a%}x}23RwNGCz8O* zM?_>f73KkJpFE+}odceDFx`F1NA)SS!0JBbOopXCrSEAR2IiMs#2xEXfBKgyk#&6v z0V}GmrcbHfzuG=!Ykb~G%J`K%^zyI!nU*33`W|%=2deO0pK=0N?o>6Q&PPn<7-oI_nDQM_zl%I;(|5&MgXm z^$n)v6KPJ!Oq9N#du<_qGVRQ8hugx@ku5@6xkK-@vdqMdrZ@5h00000fSzKW+0avV zCLH#ZUE$`Dw|dH&a=E9hD(5}r!40;1%2j-3c(4Dm*O_U)^q>}&+1VltN1pYR4dJ+_ fpppOpz??5^Ef4R@BKJ`M0000 YES! + --> SORRY, NEED TO DO ENGINEERING HOMEWORK + PETE YOUR JOURNEY MAY TAKE YOU TO DARKEST BEL AIR PLOT! @@ -35,6 +42,9 @@ TALBOT HALL DINING HALL OSCAR + BEWARE THE KILLER CRABS + THEY WANT TO MEET YOU + THEY WANT TO EAT YOU NICOLE CINDY ELAINE @@ -49,6 +59,7 @@ METRO STATION WOULD YOU LIKE TO BUY A SMARTPASS SORRY ALL TRAINS CANCELLED: SMARTTRIP TINY CAPABARA + GRONK GIANT GUINEA PIG SQUEAK LARGE BIRD @@ -79,6 +90,9 @@ JC JENNI MR. APPLEBY KATHY + LOW D-HIGH LESS HIGH D-LOW + DRAW A LINE AND DOWN BELOW + DENOMINATOR SQUARED MUST GO LIZBETH BLUME VINCE CON PATILLAS @@ -90,12 +104,14 @@ JC FRAU HOMEROOM TRAPANI + WEAVE! MAN THAT PARTY WAS SOMETHING ELSE WARWICK MARIOKART PARTY AT MY HOUSE WARGO - SWOON - AMAZING SWIMMER MUSCLES + WARWICK! AMAZING SWIMMER MUSCLES + *SWOON* + MEAN LADY MATH OFFICE (ACADEMIC TEAM) @@ -105,8 +121,13 @@ JC ON ANY GIVEN DAY BRIGHID RACHAEL YRBK + AP BIO LAB PARTNERS + MUST STICK TOGETHER MREE I'M NOT EVIL + NO ESTA AQUI MAIN OFFICE AGENT N + ACTING PRINCIPAL ROBOKNEE + SINCE WE HAVE NO ELECTRICITY WE HAVE NO LIGHTS