diff --git a/README.md b/README.md index 90f760c..f90e4b8 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Ideal Wages Calculator 💸 -[![GitHub page sorkflow status](https://img.shields.io/github/actions/workflow/status/ad2ien/ideal-wages-calculator/deploy-gh-page.yml?label=github%20page&logo=github)](https://ad2ien.github.io/ideal-wages-calculator/) +[![GitHub page workflow status](https://img.shields.io/github/actions/workflow/status/ad2ien/ideal-wages-calculator/deploy-gh-page.yml?label=github%20page&logo=github)](https://ad2ien.github.io/ideal-wages-calculator/) [![Rust](https://img.shields.io/badge/Rust-1.26.0-black.svg?logo=rust&logoColor=white)](https://www.rust-lang.org/) [![Gitmoji](https://img.shields.io/badge/gitmoji-%20😜%20😍-FFDD67.svg)](https://gitmoji.dev) [![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT) diff --git a/criterias.json b/criterias.json index 04c7b83..46cdb9f 100644 --- a/criterias.json +++ b/criterias.json @@ -1,14 +1,4 @@ [ - { - "id": "🤮", - "label": "How much I hate what I'm doing?", - "description": { - "general": "", - "min": "Everything at work is gross, nothing works and you hate every single thing you're doing", - "max": "You save the world, while doing something satisfying... and you think the world is worth saving" - }, - "coefficient": 1.0 - }, { "id": "🤕", "label": "How much I destroy my body at work?", @@ -69,6 +59,16 @@ }, "coefficient": 1.0 }, + { + "id": "🤮", + "label": "How much I hate what I'm doing?", + "description": { + "general": "Then for a same job, the wage would differ depending on the worker...", + "min": "Everything at work is gross, nothing works and you hate every single thing you're doing", + "max": "You save the world, while doing something satisfying... and you think the world is worth saving" + }, + "coefficient": 1.0 + }, { "id": "🧑‍🏫", "label": "How much social credit I lose?", diff --git a/data.json b/data.json index fa7247a..498307b 100644 --- a/data.json +++ b/data.json @@ -2,10 +2,6 @@ { "job": "IT developer", "params": [ - { - "id": "🤮", - "value": 10 - }, { "id": "🤕", "value": 10 @@ -30,6 +26,10 @@ "id": "🏋", "value": 50 }, + { + "id": "🤮", + "value": 10 + }, { "id": "🧑‍🏫", "value": 15 @@ -39,10 +39,6 @@ { "job": "Factory worker", "params": [ - { - "id": "🤮", - "value": 80 - }, { "id": "🤕", "value": 80 @@ -67,6 +63,10 @@ "id": "🏋", "value": 10 }, + { + "id": "🤮", + "value": 80 + }, { "id": "🧑‍🏫", "value": 25 @@ -76,10 +76,6 @@ { "job": "Farmer", "params": [ - { - "id": "🤮", - "value": 15 - }, { "id": "🤕", "value": 80 @@ -104,6 +100,10 @@ "id": "🏋", "value": 65 }, + { + "id": "🤮", + "value": 15 + }, { "id": "🧑‍🏫", "value": 20 @@ -113,10 +113,6 @@ { "job": "Doctor", "params": [ - { - "id": "🤮", - "value": 15 - }, { "id": "🤕", "value": 20 @@ -140,8 +136,11 @@ { "id": "🏋", "value": 75 - } - , + }, + { + "id": "🤮", + "value": 15 + }, { "id": "🧑‍🏫", "value": 0