From 51adb19ba126c3539b09d7bb83603014682b55da Mon Sep 17 00:00:00 2001 From: Shadow15510 Date: Sat, 29 May 2021 23:10:09 +0200 Subject: [PATCH] Real-time clock for DNA points --- Plague.g1a | Bin 46500 -> 46532 bytes src/core.c | 7 +++++++ src/display_engine.c | 3 --- src/main.c | 2 +- src/mutation_engine.c | 7 ------- 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/Plague.g1a b/Plague.g1a index 88654ad10b8b1c944d8304268b4fbdb775e2b4ff..d5aba1d664aedd6375547b977fb045ea71fb6a5e 100644 GIT binary patch delta 4034 zcmZ`*4NTnS8Gqm74(`fF?Y`g2CJF~At_V59^Yiw+pgI(E}0boTAHmc<_X_CVs% zf>TRH2VY-vI5FqCF2)yQXC`Kf-c?amWocQmWF1YcT32Ly?ei*&J827h?Njl6bY9w@ zE!i#nYA7qa%5rrYz5lcdyJEB6rPxiyjqxz+YH30s9SLxW4INuzJxg? z1~5<1JfydMRPmT%bsO;6J``c?56)ILHZ~sJvG$cOq&1_rIvK5Vi*vCbSTUYlp9uE? zlL-=@xX-e%@R8M%Qt3k4wU2_osA@ID+fA^S64-Rd|8o;UcoFIRHGKP!PH8Wt?bm<_ zU?!4&(VMU{{w{41O1N!xGm7hAlmOrH13(*W7DQ<6#SMLo*3L6}HyJ?x66ht+LD0(* z=wC@z2F-i<{aACg97mVSk-rL_EJrgCJAx9d*2*sdLl*dyoJ41o2_slTz!_0zJ!z8L zB!wD(YZDXJd&R8vgsD|-CPpQrqJDka%9ql){tdqM2BQoe#+(98hoTWMqwitl!sN@F z@f|mz>*cQen~ePnMM3v$6uXl@}HNp2R4*9(!3(Cn0SJsn> zl}1J>HmRDpx185+R| zia>sf0tb`mFb(`UGXaK1|#g;8-$7~xG&^QH5GCDQKs121`8Vz}c5^$z*!!e|NL7AX+ zIs>xrSP-|i*sVxoVjq&d_%VN2E;~}>92d5NQa&yk3YvJcm@N1WcZs^fizZlUXQyJ^ zdP2wDqP6I{sh-iZ5FGc3vf^z}?0;30KMc|>Y6Y_NkZ<>*Z z7;WoPhIagw8wwfioKk$Qdvvl}`k?45*=8*?nqxx1jO55VmrV(k+~)i{aii>Q(=Bao zzYK}yM|PSPFk{RXU!#xQF)T9L(5VD=ZR38_dTuy9rvgxFmP!~3D;X64#kbzY=wKau z%`+OttrByKu{D^{V-ED^7}YXHd(BAa1U5SAGG_Mj<;zzX9T{QN1lh?P$Oq*W@p;@- z{KxUmcm5H7AgoL>6YXXI{$$qM<#V*nP6DH=^GQ zObT1MJw6!b41hBt+~xUl0rqv_ZVM`%<+pi?8c-w{xqe!S!%5fPZ>+1NB{&zPdz=fW zE3W?^$+3Mk1{vz02<~$lR99kQ-`BeR$>P?2C(jYdl^^k9FiteJqoYh`57-|3&nx|AjRL+#!zDG?~U2 z)l_3?9U@e7Ci+);wffs?)3`iAhiyO{5-gu1D2CcTG5GT*c%RTez8C-Q$7^_>GKhcP zf2Qse)3_E7w5ID0aGOGh&T~sYqeJf1Lnxsqn{*jD+Ua(;2;LmhqvCm5a4Rfp7CFz+fVbKo<7LyHE}LkasaNWb|AA-N7@dIdL_N>}^aB9^)#PDn9wCBDADVC2umHnU?m#pYj+J%b#Hz@^cLE{s2}lQw_?`!?6QN&ZayrwL zml9k_NBQKcen4?Gy=_>zTa}sCQr*g@pi_6aPvo@uEj|Pq7$|3Ed0@gpM^BG6jXbxI zn;}`2Y9o&u5iv%AkSZ=chh)r!gQ}{f%*H;lBDS|NqZ9|GA>K*?8$N4B6UqM;E+JGB0?E;_U$1S~3Z zFC5m1VPA&duu8gCGxer}$`B(hN$rp~2Xsw@33_js?*LWzcvz;sTNrr@@h#^PY1(Ya zyB&2bgGivK!H)qVEt0w3Fhgcl+NG%9P7}L*cY)L5uDe)BMw6?p+d$Gy}d2QSxQD5f8GEB`=ac zE$`%A2}7j7MmTjoIZdpMU(J(TBnyB7^hpKjAOfud$!81mq^@)#7a3Fb z5vXht$5LPNw}VPuE%%yZIL*l4tr%ar;*@W}p)qAN z;N_d^ao78R-vMK|3|v4J`g4q$9ROs_6W|>Ox|RCjQ``Wxz?hg;+Wjvu_4S~-#UC}` zV0xx7^0`bUkDivbb9bYsU{gE4%%ms7$pt^sq)w#KNt_u?)xd6GJBuP^On5G3_VgRX I;>h6t0Kn+L-2eap delta 3993 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 diff --git a/src/core.c b/src/core.c index d0496e3..7338ccb 100644 --- a/src/core.c +++ b/src/core.c @@ -43,6 +43,13 @@ void next_frame(struct game *current_game) } } current_game->time += ENGINE_TICK; + if (current_game->time > 10000) + { + current_game->dna += 1; + current_game->time = 0; + + // Epidemic propagation simulation to add here + } } diff --git a/src/display_engine.c b/src/display_engine.c index 0e36e00..b36070b 100644 --- a/src/display_engine.c +++ b/src/display_engine.c @@ -39,9 +39,6 @@ void display_foreground(const int background, const struct game *current_game) break; case 3: - - dprint(1, 35, C_BLACK, "C:%d S:%d L:%d", current_game->contagion, current_game->severity, current_game->lethality); - dprint(102, 37, C_BLACK, "%d", current_game->dna); length = 67 * current_game->contagion / 26; diff --git a/src/main.c b/src/main.c index 2396119..6e4699b 100644 --- a/src/main.c +++ b/src/main.c @@ -44,7 +44,7 @@ int main(void) .severity = 0, .lethality = 0, - .dna = 100, + .dna = 0, .mutations_count = {0, 0, 0}, .mutations_selected = {0, 0, 0}, diff --git a/src/mutation_engine.c b/src/mutation_engine.c index c33297a..c534c93 100644 --- a/src/mutation_engine.c +++ b/src/mutation_engine.c @@ -145,13 +145,6 @@ void update_disease(struct game *current_game) struct mutation *ability = get_mutation_data(2, current_game->mutations_selected[1]); struct mutation *transmission = get_mutation_data(3, current_game->mutations_selected[2]); - dclear(C_WHITE); - dprint(0, 0, C_BLACK, "SY C:%d S:%d L:%d", symptom->contagion, symptom->severity, symptom->lethality); - dprint(0, 8, C_BLACK, "AB C:%d S:%d L:%d", ability->contagion, ability->severity, ability->lethality); - dprint(0, 16, C_BLACK, "TR C:%d S:%d L:%d", transmission->contagion, transmission->severity, transmission->lethality); - dupdate(); - getkey(); - current_game->contagion = symptom->contagion + ability->contagion + transmission->contagion; current_game->severity = symptom->severity + ability->severity + transmission->severity; current_game->lethality = symptom->lethality + ability->lethality + transmission->lethality;