Added 73 entries from playthrough Okumura's Palace, Momentos, and part of Niijima's Palace

- Added generalizaiton of SCSS colors and possibility of dark theme
- New unconfirmed markers for both original and royal questions

README.md

@@ -4,7 +4,7 @@ A tool to help with negotiations in Persona 5 and Persona 5 Royal.
 
 Direct link to a user-friendly version: http://joyce-chen.github.io/persona5-negotiation/
 
-If you want to contribute any changes, please use the [open issue for P5 Royal](https://github.com/joyce-chen/persona5-negotiation/issues/16), the [open issue for P5](https://github.com/joyce-chen/persona5-negotiation/issues/17), or [the form](https://forms.gle/JtH9YUekRKVEkYgc6). Thank you!
+If you want to contribute any changes or confirm some results, please use the [open issue for P5 Royal](https://github.com/joyce-chen/persona5-negotiation/issues/16), the [open issue for P5](https://github.com/joyce-chen/persona5-negotiation/issues/17), or [the form](https://forms.gle/JtH9YUekRKVEkYgc6). Thank you!
 
 Submitted questions are up-to-date as of **July 22nd**.
 

assets/css/style.scss

@@ -2,6 +2,48 @@
 ---
 
 @import "{{ site.theme }}";
+
+html {
+  --bg-color: #fff;
+  --p5-red: #dc3545;
+  --headings: #222;
+  --text: #727272;
+  --table-heading: #444;
+  --table-head-bg: rgba(0,0,0,0.05);
+  --table-text: #727272;
+  --table-border: #e5e5e5;
+  --form-bg: #fff;
+  --filter-head-bg: #f7f7f7;
+  --filter-bg: #fff;
+  --filter-btn: #f1f1f1;
+  --filter-btn-hover: #ddd;
+  --filter-btn-active: #666;
+}
+
+html[data-theme='dark']  {
+  --bg-color: #1d1d1d;
+  --p5-red: #dc3545;
+  --headings: #dedede;
+  --text: #e6e6e6;
+  --table-heading: #dedede;
+  --table-head-bg: #2a2a2a;
+  --table-text: #e6e6e6;
+  --table-border: #dedede;
+  --table-bg: #1d1d1d;
+  --form-bg: #1d1d1d;
+  --filter-head: #2e2e2e;
+  --filter-body: #1d1d1d;
+  --filter-btn: #f1f1f1;
+  --filter-btn-hover: #ddd;
+  --filter-btn-active: #666;
+}
+
+body {
+  background-color: var(--bg-color);
+}
+h1, h2, h3, h4, h5, h6 {
+  color: var(--headings);
+}
 footer {
   width: 100%;
   position: static !important;
@@ -20,39 +62,52 @@ nav {
   position: static !important;
 }
 
+// FORM
+#searchBar {
+  background-color: var(--form-bg);
+}
 .form-control:focus {
   outline: 0 !important;
   border-color: initial;
   box-shadow: none;
 }
 
+// ALL QUESTIONS
 #questions {
   margin-top: 1rem;
 }
 
+// LINKS
 a {
-  color: #dc3545;
+  color: var(--p5-red);
+  font-weight: normal;
 }
 a:hover {
-  color: #dc3545;
+  color: var(--p5-red);
+  font-weight: normal;
 }
 a:active {
-  color: #dc3545;
+  color: var(--p5-red);
+  font-weight: normal;
 }
 a:visited {
-  color: #dc3545;
+  color: var(--p5-red);
+  font-weight: normal;
 }
 
-
+// TABLES
 table {
   width: auto;
-  border: 1px solid #e5e5e5;
+  background-color: var(--table-bg);
+  border: 1px solid var(--table-border);
+  color: var(--table-text);
 
   th {
     font-weight: bold;
     text-align: center;
-    background-color: rgba(0, 0, 0, .05);
+    color: var(--table-heading);
-    border-color: #fff;
+    background-color: var(--table-head-bg);
+    border-color: var(--table-border);
   }
 
   .subheader {
@@ -69,6 +124,11 @@ table {
     text-align: center;
   }
 
+  .unconfirmed {
+    background-color:rgba(144, 36, 48, 0.75);
+    color: white;
+  }
+
   .text {
     display: block;
   }
@@ -78,21 +138,18 @@ table {
   }
 }
 
-
+// SWITCH
-
 .switch {
   position: relative;
   display: inline-block;
   width: 60px;
   height: 34px;
 }
-
 .switch input {
   opacity: 0;
   width: 0;
   height: 0;
 }
-
 .slider {
   position: absolute;
   cursor: pointer;
@@ -104,7 +161,6 @@ table {
   -webkit-transition: .4s;
   transition: .4s;
 }
-
 .slider:before {
   position: absolute;
   content: "";
@@ -116,60 +172,50 @@ table {
   -webkit-transition: .4s;
   transition: .4s;
 }
-
 input:checked + .slider {
-  background-color: #dc3545;
+  background-color: var(--p5-red);
 }
-
 input:focus + .slider {
-  box-shadow: 0 0 1px #dc3545;
+  box-shadow: 0 0 1px var(--p5-red);
 }
-
 input:checked + .slider:before {
   -webkit-transform: translateX(26px);
   -ms-transform: translateX(26px);
   transform: translateX(26px);
 }
-
 .slider.round {
   border-radius: 34px;
 }
-
 .slider.round:before {
   border-radius: 50%;
 }
 
-
+// FILTER
-
+.card {
-
+  background-color: var(--filter-head);
-
+}
-
+#shadowFilters {
-
+  background-color: var(--filter-body);
-
+}
-
 .filter-btn {
   border: none;
   outline: none;
-  background-color: #f1f1f1;
+  background-color: var(--filter-btn);
   cursor: pointer;
   font-size: small;
   margin: .2rem .2rem;
 }
-
 .filter-btn:hover {
-  background-color: #ddd;
+  background-color: var(--filter-btn-hover);
 }
-
 .filter-btn:focus {
   outline: none;
   box-shadow: none;
 }
-
 .filter-btn.active {
-  background-color: #666;
+  background-color: var(--filter-btn-active);
   color: white;
 }
-
 .hidden {
   display: none;
 }

info.md

@@ -5,7 +5,7 @@ There are distinct negotiation differences between the original and Royal versio
 
 Please note that at this time, the guide is a work-in-progress, so it is missing reactions and could have mistakes.
 
-If you want to help, contribute, or report mistakes, please use the <a href="https://github.com/joyce-chen/persona5-negotiation/issues/16">open issue on Github for P5 Royal</a>, the <a href="https://github.com/joyce-chen/persona5-negotiation/issues/17">open issue for P5</a>, or the <a href="https://forms.gle/JtH9YUekRKVEkYgc6">Google Form</a>. 
+If you want to help, contribute, report mistakes, or confirm some results, please use the <a href="https://github.com/joyce-chen/persona5-negotiation/issues/16">open issue on Github for P5 Royal</a>, the <a href="https://github.com/joyce-chen/persona5-negotiation/issues/17">open issue for P5</a>, or the <a href="https://forms.gle/JtH9YUekRKVEkYgc6">Google Form</a>. 
 
 Submitted questions are up-to-date as of **July 22nd**.
 
@@ -13,11 +13,18 @@ Thank you to GooberSD/Chompobar for giving me permission to use <a href="https:/
 
 ---
 
-##### Addressing Feedback
+##### How to Use
 
-6/16: Thank you for the kind words!
+Each of the negotiation question pages has a search bar that can filter by question or answer. 
 
-6/5: Who is the Persona with the Shadow name "General of Hell" from the original game? Is it Nebiros?
+Next to the search bar is a switch to change the "GOOD", "OK", and "BAD" reactions to symbols for people who find emojis more useful.
+
+Underneath, there is a filter questions by Shadows collapsable card with Shadow tags. Currently it is a work-in-progress feature. It displays the confirmed questions asked by the specified Shadow. 
+
+**Negotiation Table Legend:**
+- White Background: Either sent in or are from my playthrough, so are more likely to be correct.
+- <span style="background-color: rgba(144, 36, 48, 0.75); color: white;">Red Background</span>: Unconfirmed.
+- Have a dash (-): Lacking data.
 
 ---
 
@@ -46,7 +53,9 @@ During negotiations, a Shadow will ask you two questions. For each, you're given
 
 - **OK:** Marked by light blue sweat marks 💦. When you answer the second question with the OK option, you will most likely end the negotiation with an item as a reward. The Persona will then flee after giving the item. However, there is a very small chance, that the Shadow will join you with an OK answer.
 
-- **Bad:** Marked by red angry vein marks 💢. It is okay to get a bad answer for the first question. However, if you get a bad answer for the second question you will fail the negotiation and the monster will either run away or you’ll have to fight it again. Once you have a party member hit around level 3 - 4 as a confidant, your characters will be able to potentially step in and save a negotiation should things go south. This ability will usually give you a second chance at negotiating with the Shadow. The chart below lists all the Rank Bonuses that help with negotiations.
+- **Bad:** Marked by red angry vein marks 💢. It is okay to get a bad answer for the first question. However, if you get a bad answer for the second question you will fail the negotiation and the monster will either run away or you’ll have to fight it again. Once you have a party member hit around level 3 - 4 as a confidant, your characters will be able to potentially step in and save a negotiation should things go south. This ability will usually give you a second chance at negotiating with the Shadow. 
+
+The chart below lists all the Rank Bonuses that help with negotiations.
 
 | Arcana    | Rank | Bonus           | Description                                                                 |
 |-----------|------|-----------------|-----------------------------------------------------------------------------|
@@ -62,7 +71,7 @@ During negotiations, a Shadow will ask you two questions. For each, you're given
 | Sun       | 2    | Diplomacy       | Occasionally ask for more money or items during negotiations.               |
 | Sun       | 3    | Fundraising     | Allows you to ask for large amounts of money during negotiation.            |
 | Sun       | 8    | Mind Control    | Occasionally lets you skip negotiation when attempting to obtain a Persona. |
-| ???       | 6    | Fitness Talk    | If negotiation with any kind of Shadow fails, you can try again.            |
+| Faith     | 6    | Fitness Talk    | If negotiation with any kind of Shadow fails, you can try again.            |
 
 ##### Resource
 For more information, check out the <a href="https://atlus.com/persona5/manual/ps4/?pid=43">official Persona 5 web manual on Atlas' website</a>.