From 98369fc5260f9bc7969f9ec8f0c5a044836178f6 Mon Sep 17 00:00:00 2001 From: MegaMech Date: Sat, 18 Dec 2021 04:03:34 -0700 Subject: [PATCH] Fix maths (#104) * Fix maths * Update README.md * Update Jenkinsfile --- Jenkinsfile | 12 ++++++------ README.md | 3 ++- progress.py | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 566ba13f1..e51902909 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,10 +1,10 @@ -def totalProgBadge = addEmbeddableBadgeConfiguration(id: "totalProgress", subject: "Total Progress") -def gameCodeProgBadge = addEmbeddableBadgeConfiguration(id: "codeProgress", subject: "Game Code Progress") -def audioProgBadge = addEmbeddableBadgeConfiguration(id: "audioProgress", subject: "Audio Code Progress") +def totalProgBadge = addEmbeddableBadgeConfiguration(id: "totalProgress", subject: "Total Progress", color: "7d0000") +def gameCodeProgBadge = addEmbeddableBadgeConfiguration(id: "codeProgress", subject: "Game Code Progress", color: "7d0000") +def audioProgBadge = addEmbeddableBadgeConfiguration(id: "audioProgress", subject: "Audio Code Progress", color: "7d0000") -def bytesToDecompile = addEmbeddableBadgeConfiguration(id: "bytesLeft", subject: "Remaining Decompilable Bytes") -def m2cFuncs = addEmbeddableBadgeConfiguration(id: "m2c", subject: "Remaining Functions") -def nonmatchingFuncs = addEmbeddableBadgeConfiguration(id: "nonmatching", subject: "Non-matching Functions") +def bytesToDecompile = addEmbeddableBadgeConfiguration(id: "bytesLeft", subject: "Remaining Decompilable Bytes", color: "7d0000") +def m2cFuncs = addEmbeddableBadgeConfiguration(id: "m2c", subject: "Remaining Functions", color: "7d0000") +def nonmatchingFuncs = addEmbeddableBadgeConfiguration(id: "nonmatching", subject: "Non-matching Functions", color: "7d0000") pipeline { agent any diff --git a/README.md b/README.md index 94c3b986a..563a61746 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,8 @@ [![Build Status](https://ci.valandil.ca/buildStatus/icon?job=mk64%2Fmaster&config=bytesLeft)](https://ci.valandil.ca/job/mk64/job/master/) [![Build Status](https://ci.valandil.ca/buildStatus/icon?job=mk64%2Fmaster&config=m2c)](https://ci.valandil.ca/job/mk64/job/master/) -[![Build Status](https://ci.valandil.ca/buildStatus/icon?job=mk64%2Fmaster&config=nonmatching)](https://ci.valandil.ca/job/mk64/job/master/) +[![Build Status](https://ci.valandil.ca/buildStatus/icon?job=mk64%2Fmaster&config=nonmatching)](https://ci.valandil.ca/job/mk64/job/master/) + C Files left: ~23 out of 35 # Mario Kart 64 diff --git a/progress.py b/progress.py index 11df12143..cdc88a6a7 100644 --- a/progress.py +++ b/progress.py @@ -280,7 +280,7 @@ if args.format == 'shield-json': "color": 'yellow', })) elif args.format == 'totalBadge': - print(str(round(((mk64Code_size - text_size) * mk64Code_size) * 100, 2))+"%") + print(str(round(((mk64Code_size - text_size) / mk64Code_size) * 100, 2))+"%") elif args.format == 'gameBadge': print(str(round(srcPct, 2))+"%") elif args.format == 'audioBadge':