From bd2a89e6290d70a26d5d3eefa3ad84556fe43d34 Mon Sep 17 00:00:00 2001 From: Joyce Chen Date: Sat, 6 Jun 2020 06:29:01 -0400 Subject: [PATCH] Added 41 entries from form (6/5 17:43) --- .gitignore | 4 +- README.md | 5 +- index.md | 48 +++++----- info.md | 6 +- royal.md | 223 ++++++++++++++++++++++++++++++----------------- shadows.md | 2 +- shadows_royal.md | 2 +- 7 files changed, 180 insertions(+), 110 deletions(-) diff --git a/.gitignore b/.gitignore index 3d3bedd..d9c20a9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ +.vscode/ _site/ data/ -data/tableConverter.py -data/input.html +p5env/ quick_start.cmd diff --git a/README.md b/README.md index 4afcede..56d6bc7 100644 --- a/README.md +++ b/README.md @@ -6,13 +6,12 @@ Direct link to a user-friendly version: http://joyce-chen.github.io/persona5-neg 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! -Submitted questions are up-to-date as of **May 31st**. +Submitted questions are up-to-date as of **June 5th**. --- -May 31st, 2020 Update: -- Shadow filters have mostly been filled out for the original game. +June 6th, 2020 Update: - TODO: Organizing the filters to show all the questions for pools of Shadows. - TODO: Making and merging PRs from other users that forked this repo. diff --git a/index.md b/index.md index 9b6509b..8fa3c71 100644 --- a/index.md +++ b/index.md @@ -53,6 +53,7 @@ + @@ -86,6 +87,7 @@ + @@ -492,7 +494,7 @@ for (var i = 0; i < btns.length; i++) { Right after this, kid. -
-
+
OK
💦
-
GOOD
🎶
BAD
💢
@@ -1284,7 +1286,7 @@ for (var i = 0; i < btns.length; i++) { I'm not your dad. -
-
+
BAD
💢
-
-
-
@@ -1319,7 +1321,7 @@ for (var i = 0; i < btns.length; i++) { I have.
OK
💦
-
-
-
+
GOOD
🎶
-
@@ -2360,7 +2362,7 @@ for (var i = 0; i < btns.length; i++) {
-
- +
@@ -2376,7 +2378,7 @@ for (var i = 0; i < btns.length; i++) { - + @@ -3627,7 +3629,7 @@ for (var i = 0; i < btns.length; i++) { - + @@ -4274,7 +4276,7 @@ for (var i = 0; i < btns.length; i++) {
I mean, how does it feel to wave your gun at an enemy who's completely lost the will to fight?
OK
💦
GOOD
🎶
-
-
OK
💦
...I could get used to it.
I cry like a baby.
-
OK
💦
-
-
-
-
- +
@@ -4301,7 +4303,7 @@ for (var i = 0; i < btns.length; i++) { - + @@ -5429,7 +5431,7 @@ for (var i = 0; i < btns.length; i++) {
Maybe kids got spanked a long time ago, but people don't do that anymore, right?
Some things are timeless.
-
BAD
💢
-
-
BAD
💢
-
- +
@@ -5445,7 +5447,7 @@ for (var i = 0; i < btns.length; i++) { - + @@ -5642,7 +5644,7 @@ for (var i = 0; i < btns.length; i++) { - + @@ -5957,7 +5959,7 @@ for (var i = 0; i < btns.length; i++) {
The truth is... You're a good person, aren't you?
GOOD
🎶
OK
💦
-
-
GOOD
🎶
Actually... I'm bad.Wow, you got me.
-
-
-
OK
💦
BAD
💢
-
- +
@@ -5984,7 +5986,7 @@ for (var i = 0; i < btns.length; i++) { - + @@ -6442,7 +6444,7 @@ for (var i = 0; i < btns.length; i++) { - + @@ -6452,7 +6454,7 @@ for (var i = 0; i < btns.length; i++) {
What are we gonna do, huh?
Let's hit on some ladies.
-
OK
💦
GOOD
🎶
-
-
-
GOOD
🎶
GOOD
🎶
-
OK
💦
I'm not telling.
-
- +
@@ -6466,7 +6468,7 @@ for (var i = 0; i < btns.length; i++) { - + @@ -6870,7 +6872,7 @@ for (var i = 0; i < btns.length; i++) { - + @@ -6929,7 +6931,7 @@ for (var i = 0; i < btns.length; i++) { - + @@ -7376,7 +7378,7 @@ for (var i = 0; i < btns.length; i++) {
What you thinking now?
I have homework tonight.
-
-
GOOD
🎶
GOOD
🎶
-
You seemed useful.
GOOD
🎶
GOOD
🎶
-
GOOD
🎶
GOOD
🎶
I want to get stronger.
-
GOOD
🎶
-
GOOD
🎶
GOOD
🎶
BAD
💢
- +
@@ -7733,7 +7735,7 @@ for (var i = 0; i < btns.length; i++) { - + @@ -7832,7 +7834,7 @@ for (var i = 0; i < btns.length; i++) { - + @@ -8003,7 +8005,7 @@ for (var i = 0; i < btns.length; i++) {
You given much thought, what if you go to place where you could die at any moment?
What kind of girl is she?
-
GOOD
🎶
OK
💦
GOOD
🎶
-
You're not an animal.
-
GOOD
🎶
GOOD
🎶
-
-
-
- +
@@ -8018,7 +8020,7 @@ for (var i = 0; i < btns.length; i++) { - + diff --git a/info.md b/info.md index 1fd1722..af22808 100644 --- a/info.md +++ b/info.md @@ -1,7 +1,7 @@ ##### This Project & Credits This is a tool/guide to help with negotiations in Persona 5 and Persona 5 Royal. -The Royal section takes the negotiation information from Persona 5, so there can be discrepancies between the versions. If you want to help, contribute, or report mistakes, please use the open issue on Github for P5 Royal, the open issue for P5, or the Google Form. Submitted questions are up-to-date as of **May 31st**. +The Royal section takes the negotiation information from Persona 5, so there can be discrepancies between the versions. If you want to help, contribute, or report mistakes, please use the open issue on Github for P5 Royal, the open issue for P5, or the Google Form. Submitted questions are up-to-date as of **June 5th**. Thank you to GooberSD/Chompobar for giving me permission to use their guide to update this guide. @@ -9,10 +9,12 @@ Thank you to GooberSD/Chompobar for giving me permission to use Here is a link to the form with "Persona 5 Royal" pre-selected. Google Forms doesn't allow default answers. Other edits were incorportated. The selection for the different wording and reaction is generalized; the reactions can either be a correction or addition. +6/5: Who is the Persona with the Shadow name "General of Hell" from the original game? Is it Nebiros? 5/3: The Shadows between the two versions have enough difference that the tables were getting crowded. As per your suggestion, I've split the data over two pages. +4/26: Here is a link to the form with "Persona 5 Royal" pre-selected. Google Forms doesn't allow default answers. Other edits were incorportated. The selection for the different wording and reaction is generalized; the reactions can either be a correction or addition. + --- ##### Shadows diff --git a/royal.md b/royal.md index c196be0..c725c9c 100644 --- a/royal.md +++ b/royal.md @@ -51,6 +51,7 @@ + @@ -247,7 +248,7 @@ for (var i = 0; i < btns.length; i++) {
You're showing off your strength to me, aren't you? I total-hee read your mind, ho.
You're misunderstanding.
-
-
-
BAD
💢
-
GOOD
🎶
- +
@@ -261,7 +262,7 @@ for (var i = 0; i < btns.length; i++) { - + @@ -412,7 +413,7 @@ for (var i = 0; i < btns.length; i++) {
After confronting me like this... Are you that kind of human too?
You've got a point.
-
-
GOOD
🎶
-
-
GOOD
🎶
- +
@@ -439,7 +440,7 @@ for (var i = 0; i < btns.length; i++) { - + @@ -676,7 +677,7 @@ for (var i = 0; i < btns.length; i++) {
Are all the kids these days doin' stuff like this?
Want to join in?
-
OK
💦
-
OK
💦
-
-
- +
@@ -699,7 +700,7 @@ for (var i = 0; i < btns.length; i++) { - + @@ -1039,7 +1040,7 @@ for (var i = 0; i < btns.length; i++) {
But I've been around the block, so I know--there's something else you want from me, isn't there?
-
-
-
-
GOOD
🎶
I just want you to die happy.
GOOD
🎶
- +
@@ -1061,7 +1062,7 @@ for (var i = 0; i < btns.length; i++) { - + @@ -1633,6 +1634,39 @@ for (var i = 0; i < btns.length; i++) {
Didn't you feel like that when you were a kid, too?
Being a kid is tough.
OK
💦
GOOD
🎶
-
GOOD
🎶
GOOD
🎶
BAD
💢
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Hey, if I don't die here, what do you think I'll be like in the future?
gloomyirritabletimidupbeat
A fashionable older woman.
-
GOOD
🎶
-
GOOD
🎶
I can't measure that.
-
-
-
OK
💦
Living in darkness.
GOOD
🎶
-
-
-
@@ -1765,39 +1799,6 @@ for (var i = 0; i < btns.length; i++) {
Hey, if ya got any medicine, lend me some. One of them painkillers...
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Hey, if I don't die here, what do you think I'll be like in the future?
gloomyirritabletimidupbeat
A fashionable older woman.
-
GOOD
🎶
-
GOOD
🎶
I can't measure that.
-
-
-
OK
💦
Living in darkness.
GOOD
🎶
-
-
-
@@ -2029,7 +2030,7 @@ for (var i = 0; i < btns.length; i++) {
Hey, mister, will you give me a yummy snack to eat?
-
- +
@@ -2056,7 +2057,7 @@ for (var i = 0; i < btns.length; i++) { - + @@ -2240,10 +2241,10 @@ for (var i = 0; i < btns.length; i++) { - - - - + + + + @@ -2689,7 +2690,7 @@ for (var i = 0; i < btns.length; i++) {
...How 'bout you, sonny? What kinda trip do you wanna take?
A trip to hell.
GOOD
🎶
OK
💦
BAD
💢
-
-
Quit messing with me.
-
GOOD
🎶
-
-
You're paying?
-
- +
@@ -2703,7 +2704,7 @@ for (var i = 0; i < btns.length; i++) { - + @@ -2722,7 +2723,7 @@ for (var i = 0; i < btns.length; i++) {
I suppose that's why I feel so confused, child. After all, why am I being treated like this?
Because you resisted.
-
-
GOOD
🎶
OK
💦
OK
💦
-
- +
@@ -2737,7 +2738,7 @@ for (var i = 0; i < btns.length; i++) { - + @@ -3481,7 +3482,7 @@ for (var i = 0; i < btns.length; i++) {
I suppose this "real world" where you come from must be fairly boring.
You're right.
OK
💦
-
-
GOOD
🎶
-
-
- +
@@ -3497,7 +3498,7 @@ for (var i = 0; i < btns.length; i++) { - + @@ -3514,7 +3515,7 @@ for (var i = 0; i < btns.length; i++) {
I'm busy, ho. It's tough being so popular.
-
-
GOOD
🎶
-
GOOD
🎶
Your popularity won't last.
-
- +
@@ -3534,7 +3535,7 @@ for (var i = 0; i < btns.length; i++) { - + @@ -3712,7 +3713,7 @@ for (var i = 0; i < btns.length; i++) {
I'm inclined to turn you down, but if you still wish to speak, I will perhaps consider it.
Do you have time?
GOOD
🎶
OK
💦
GOOD
🎶
OK
💦
GOOD
🎶
-
- +
@@ -3733,7 +3734,7 @@ for (var i = 0; i < btns.length; i++) { - + @@ -3877,6 +3878,39 @@ for (var i = 0; i < btns.length; i++) {
I'm thinking that maybe I can be more grandmotherly. How can I go ahead and do that for you?
Scold me every so often.
-
-
GOOD
🎶
-
-
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Is it just me, or does something stink?
gloomyirritabletimidupbeat
It's just you.
-
-
-
-
It's coming from you.
BAD
💢
-
-
-
I smell a lie.
-
-
-
-
@@ -4042,7 +4076,7 @@ for (var i = 0; i < btns.length; i++) {
Is it not possible for this series of events involving you and me to be attributed to that?
GOOD
🎶
- +
@@ -4058,7 +4092,7 @@ for (var i = 0; i < btns.length; i++) { - + @@ -4075,6 +4109,39 @@ for (var i = 0; i < btns.length; i++) {
Isn't that just like when a human woman gets married and moves in with her husband?
-
-
-
-
GOOD
🎶
No.
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Isn't that kinda... outdated thinking?
gloomyirritabletimidupbeat
Yea.
-
-
-
-
No way.
-
-
-
-
It's for your own good.
-
-
-
GOOD
🎶
@@ -4372,7 +4439,7 @@ for (var i = 0; i < btns.length; i++) {
Isn't that kinda... outdated thinking?
-
- +
@@ -4400,7 +4467,7 @@ for (var i = 0; i < btns.length; i++) { - + @@ -4768,7 +4835,7 @@ for (var i = 0; i < btns.length; i++) {
It's pretty rude, man.
My apologies.
GOOD
🎶
GOOD
🎶
OK
💦
GOOD
🎶
-
GOOD
🎶
- +
@@ -4790,7 +4857,7 @@ for (var i = 0; i < btns.length; i++) { - + @@ -5329,7 +5396,7 @@ for (var i = 0; i < btns.length; i++) {
Me guessing you have power that me not have. But what is it...?
Empathy.
GOOD
🎶
-
-
GOOD
🎶
-
-
- +
@@ -5357,7 +5424,7 @@ for (var i = 0; i < btns.length; i++) { - + @@ -6682,7 +6749,7 @@ for (var i = 0; i < btns.length; i++) {
So me am going to haunt you for the rest of your life. Me always right behind you...
I don't get it...
-
GOOD
🎶
BAD
💢
-
-
-
- +
@@ -6695,7 +6762,7 @@ for (var i = 0; i < btns.length; i++) { - + @@ -6946,7 +7013,7 @@ for (var i = 0; i < btns.length; i++) {
What is irritating you so much?
Rotten adults.
GOOD
🎶
OK
💦
-
-
-
GOOD
🎶
- +
@@ -6962,7 +7029,7 @@ for (var i = 0; i < btns.length; i++) { - + @@ -7078,7 +7145,7 @@ for (var i = 0; i < btns.length; i++) {
What's it like to be all kissy face with somebody?
-
BAD
💢
-
-
BAD
💢
I shouldn't tell you.
-
- +
@@ -7094,7 +7161,7 @@ for (var i = 0; i < btns.length; i++) { - + @@ -7870,7 +7937,7 @@ for (var i = 0; i < btns.length; i++) {
When you eat curry, mister, what do you like to add?
GOOD
🎶
GOOD
🎶
GOOD
🎶
-
GOOD
🎶
Worcestershire sauce.
-
- +
@@ -7900,7 +7967,7 @@ for (var i = 0; i < btns.length; i++) { - +
You go back to your mother's arms. You need take nap now.
BAD
💢
OK
💦
GOOD
🎶
-
GOOD
🎶
@@ -8261,7 +8328,7 @@ for (var i = 0; i < btns.length; i++) { - + @@ -8299,7 +8366,7 @@ for (var i = 0; i < btns.length; i++) {
It's for love.
-
GOOD
🎶
BAD
💢
-
-
-
- +
@@ -8329,7 +8396,7 @@ for (var i = 0; i < btns.length; i++) { - +
You will receive punishment for treating me this way, mark my words.
-
BAD
💢
-
-
GOOD
🎶
@@ -8629,7 +8696,7 @@ for (var i = 0; i < btns.length; i++) {
GOOD
🎶
- +
@@ -8645,7 +8712,7 @@ for (var i = 0; i < btns.length; i++) { - + diff --git a/shadows.md b/shadows.md index 641467b..2ff6456 100644 --- a/shadows.md +++ b/shadows.md @@ -927,7 +927,7 @@ function filterShadows() { - + diff --git a/shadows_royal.md b/shadows_royal.md index cc06c3c..d58ce52 100644 --- a/shadows_royal.md +++ b/shadows_royal.md @@ -1107,7 +1107,7 @@ function filterShadows() { - +
...You've come from some other company to scout me-hee out. There's no mistaking it, ho!
-
-
-
-
GOOD
🎶
It's a misunderstanding.
Queen's NecklaceZealous MessengerTreasure Demon Justice Upbeat Gun
Queen's NecklaceZealous MessengerTreasure Demon Empress ? Psychic