From eddbf6726d96fce92e381a2f5f0040079ce479be Mon Sep 17 00:00:00 2001
From: BuckFromRdrama <98723184+BuckFromRdrama@users.noreply.github.com>
Date: Tue, 1 Feb 2022 17:59:57 -0500
Subject: [PATCH 1/2] Shop discount QoL (#195)

---
 files/routes/awards.py    | 1 +
 files/templates/shop.html | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/files/routes/awards.py b/files/routes/awards.py
index 81e5501b0..66ecf6a41 100644
--- a/files/routes/awards.py
+++ b/files/routes/awards.py
@@ -76,6 +76,7 @@ def shop(v):
 		if v.has_badge(badge): discount -= discounts[badge]
 
 	for val in AWARDS.values():
+		val["baseprice"] = int(val["price"])
 		val["price"] = int(val["price"]*discount)
 
 	sales = g.db.query(func.sum(User.coins_spent)).scalar()
diff --git a/files/templates/shop.html b/files/templates/shop.html
index 322c8a39f..a4aaa36fb 100644
--- a/files/templates/shop.html
+++ b/files/templates/shop.html
@@ -60,7 +60,12 @@
 			<tr data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="{{a['description']}}">
 				<td><i class="{{a['icon']}} {{a['color']}}" style="font-size: 30px"></i></td>
 				<td style="font-weight: bold">{{a['title']}}</td>
+				{% if a['baseprice'] != a['price'] %}
+				<td style="font-weight: bold"><strike>{{a['baseprice']}}</strike> <em class="{{a['color']}}">{{a['price']}}</em></td>
+				{% endif %}
+				{% if a['baseprice'] == a['price'] %}
 				<td style="font-weight: bold">{{a['price']}}</td>
+				{% endif %}
 				<td style="font-weight: bold">{{a['owned']}}</td>
 				{% set kind = a['kind'] %}
 				<td style="font-weight: bold">

From 3bb949d2a4050072b17a8cb3cd06085cf664d8e5 Mon Sep 17 00:00:00 2001
From: beese_buck <16601315+geese-suck@users.noreply.github.com>
Date: Tue, 1 Feb 2022 18:00:25 -0500
Subject: [PATCH 2/2] Update readme.md (#196)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

👏unix👏is👏case👏sensitive👏
---
 readme.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/readme.md b/readme.md
index d1bee2a82..5f57885cf 100644
--- a/readme.md
+++ b/readme.md
@@ -17,11 +17,11 @@ Installing Drama locally is the fastest way to get the software up and running a
 ```
 git clone https://github.com/Aevann1/Drama/
 
-cd drama
+cd Drama
 
 docker-compose up
 ```
 
 3- That's it! Visit `localhost` in your browser.
 
-4- Optional: to change the domain from "localhost" to something else and configure the site settings, as well as integrate it with the external services the website uses, please edit the variables in the docker-compose.yml file and then restart the docker container from inside the docker app.
\ No newline at end of file
+4- Optional: to change the domain from "localhost" to something else and configure the site settings, as well as integrate it with the external services the website uses, please edit the variables in the docker-compose.yml file and then restart the docker container from inside the docker app.