Skip to content

Commit 857c6ff

Browse files
committed
added new cards and fixed discard system
1 parent a4e4364 commit 857c6ff

File tree

3 files changed

+15
-7
lines changed

3 files changed

+15
-7
lines changed

client/pages/GAH/gah.css

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ a:hover {
9292
margin-top: 20px;
9393
padding: 5px;
9494
display: inline-block;
95+
overflow-x: auto;
9596
}
9697

9798
#player-cards {
@@ -102,6 +103,7 @@ a:hover {
102103
margin-top: 20px;
103104
padding: 5px;
104105
display: inline-block;
106+
overflow-x: auto;
105107
}
106108

107109
#player-list {
@@ -186,6 +188,7 @@ a:hover {
186188
vertical-align: text-top;
187189
padding: 5px;
188190
margin-right: 10px;
191+
overflow-y: auto;
189192
}
190193

191194
.chosen-card {
@@ -198,6 +201,7 @@ a:hover {
198201
vertical-align: text-top;
199202
padding: 5px;
200203
margin-right: 10px;
204+
overflow-y: auto;
201205
}
202206

203207
.judge-chosen-card {
@@ -210,6 +214,7 @@ a:hover {
210214
vertical-align: text-top;
211215
padding: 5px;
212216
margin-right: 10px;
217+
overflow-y: auto;
213218
}
214219

215220
.white-card {
@@ -222,6 +227,7 @@ a:hover {
222227
vertical-align: text-top;
223228
padding: 5px;
224229
margin-right: 10px;
230+
overflow-y: auto;
225231
}
226232

227233
.white-card:hover {
@@ -238,6 +244,7 @@ a:hover {
238244
vertical-align: text-top;
239245
padding: 5px;
240246
margin-right: 10px;
247+
overflow-y: auto;
241248
}
242249

243250
.judge-choice:hover {
@@ -266,6 +273,7 @@ a:hover {
266273
vertical-align: text-top;
267274
padding: 5px;
268275
margin-right: 10px;
276+
overflow-y: auto;
269277
}
270278

271279
#credits {

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "grapechat",
3-
"version": "2.0.6",
3+
"version": "2.0.7",
44
"description": "chat app for friends with secret hitler and cards against humanity clones",
55
"main": "server.js",
66
"scripts": {

server.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,10 @@ var fWins = 0;
9090
}
9191
//GAH packs
9292
{
93-
var basePackBlue = ["Call your doctor if you experience ____ for more than 4 hours.", "Today I learned that ____ can lead to erectile dysfunction.", "Airport security stopped and searched me when they noticed ____.", "I jumped off the bridge as soon as I saw ____.", "Elon Musk's new project: ____.", "____? Sounds like a personal problem.", "Kids today need to learn about ____.", "My dog seems to be ____, I don't know what to do.", "Oh frick! What if my mom sees me when I'm ____!", "Four score and seven years ago, our fathers brought forth ____...", "It is 2050. ____ has taken the world by storm, and human life seems hopeless.", "Try new Super Lunchables! Now with extra ____!", "You know ____ is just a ploy made by the Chinese government, right?", "If you ask me, people who are ____ have no place in this country.", "You know what's better than 24? ____.", "I procrastinate way too much. I've been ____ for the past 20 minutes instead of doing homework."];
94-
var basePackWhite = ["detective pikachu", "listening to that one song that goes 'ooooh you touch my tralala'", "putting up christmas lights on Thanksgiving", "a gaggle of geese", "Ayatollah Khomeini", "a slow and agonizing descent into madness", "Leonardo DiCaprio's *one* oscar", "a pair of carjacks + my nipples", "dividing by zero", "CNN", "being addicted to eating rocks", "invading poland", "a broken bungie cable", "slaughtering innocent Chinese women and children at Nanjing", "a sumo wrestler sitting on my face", "underwear masks", "global warming", "ethnic cleansing", "avacado toast", "a star-shaped penis bulge", "burning alive in the middle of Antarctica", "my supersuit", "25 dead horses all being beaten at once", "kids dressed up as Fortnite skins for Halloween", "the birds and the bees", "a trash can full of nothing but right index fingers", "slavery", "giving grandma 2 cans of dogfood for dinner instead of just 1"];
95-
var personalPackBlue = ["Gentlemen, the next time I see ____ it's a class jug.", "According to <i>An Introduction to Catholic Ethics</i>, all ethical teachings can be explained in a metaphor about ____.", "Fallout 76 isn't bad, it just isn't as good as ____.", "Nick Cochrin is such a liberal. I mean come on, look at how much he loves ____!", "Gus enjoys ____ way too much.", "____? That's not very epic...", "____? That ain't very cash money of you.", "The new siege operator takes ____ to a whole new level.", "Sea of Thieves is a good game. The new update brought in ____!", "Ian Bowen left Rockhurst because of ____.", "Peanut butter is best with ____.", "For Honor isn't dead, it's ____."];
96-
var personalPackWhite = ["bengay", "Mr. Wooten", "Rhonda", "Henry Retardo", "David Spitz", "Juuling in the third floor bathroom", "Coach Moe", "Nutting in No Nut Novemeber", "time and space", "Right Wing Populism", "Lucas Richardson", "Gillcrist's beard", "Red Dead Redemption 2", "Nick Cockring", "Ian", "Mr. Valentini", "medium-rare ribeye steak", "a liberal", "slig", "homosexuals", "the Victory App", "romaine lettuce", "an epic victory royale", "a pair of gross brown shoes", "a marshmallow someone named Keith", "voiceoverpete", "Hyperdimension Neptunia", '"Killing God, an essay by Sal Nigro', "steamed hams", "a dead game", "Yung Gravy"];
93+
var basePackBlue = ["Call your doctor if you experience ____ for more than 4 hours.", "Today I learned that ____ can lead to erectile dysfunction.", "Airport security stopped and searched me when they noticed ____.", "I jumped off the bridge as soon as I saw ____.", "Elon Musk's new project: ____.", "____? Sounds like a personal problem.", "Kids today need to learn about ____.", "My dog seems to be ____, I don't know what to do.", "Oh frick! What if my mom sees me when I'm ____!", "Four score and seven years ago, our fathers brought forth ____...", "It is 2050. ____ has taken the world by storm, and human life seems hopeless.", "Try new Super Lunchables! Now with extra ____!", "You know ____ is just a ploy made by the Chinese government, right?", "If you ask me, people who are ____ have no place in this country.", "You know what's better than 24? ____.", "I procrastinate way too much. I've been ____ for the past 20 minutes instead of doing homework.", "How dare you make such an accusation, I am not ____!", "Hey, I get it. You're just tired of ____.", "Alright, don't say I didn't warn you! I'm ____!", "Have you heard about the most recent government scandal? Donald Trump is ____.", "I was searching through the garbage when I found it: ____."];
94+
var basePackWhite = ["detective pikachu", "listening to that one song that goes 'ooooh you touch my tralala'", "putting up christmas lights on Thanksgiving", "a gaggle of geese", "Ayatollah Khomeini", "a slow and agonizing descent into madness", "Leonardo DiCaprio's *one* oscar", "a pair of carjacks + my nipples", "dividing by zero", "CNN", "being addicted to eating rocks", "invading poland", "a broken bungie cable", "slaughtering innocent Chinese women and children at Nanjing", "a sumo wrestler sitting on my face", "underwear masks", "global warming", "ethnic cleansing", "avacado toast", "a star-shaped penis bulge", "burning alive in the middle of Antarctica", "my supersuit", "25 dead horses all being beaten at once", "kids dressed up as Fortnite skins for Halloween", "the birds and the bees", "a trash can full of nothing but right index fingers", "slavery", "giving grandma 2 cans of dogfood for dinner instead of just 1", "saying the n-word", "midget porn", "Lil Tay", "dad beating me in a drunken frenzy", "slipping 3 viagra's into grandpa's scotch", "killing Jesus again", "putting a bomb inside of my dog's stomach and blowing it up on the road when people come by to help him", "slashing my neighbor's tires", "German engineering", "dangling a quadriplegic's severed arms and legs in front of him", "a bowling ball with 4 holes", "a micropenis", "a penny with Robert E. Lee on it", "a third trimester abortion", "Lou Gehrig's disease", "a McRib sandwich", "premature ejaculation", "a brain aneurysm", "using your epipen on yourself for the rush while the 5 year old at the table next to you dies"];
95+
var personalPackBlue = ["Gentlemen, the next time I see ____ it's a class jug.", "According to <i>An Introduction to Catholic Ethics</i>, all ethical teachings can be explained in a metaphor about ____.", "Fallout 76 isn't bad, it just isn't as good as ____.", "Nick Cochrin is such a liberal. I mean come on, look at how much he loves ____!", "Gus enjoys ____ way too much.", "____? That's not very epic...", "____? That ain't very cash money of you.", "The new siege operator takes ____ to a whole new level.", "Sea of Thieves is a good game. The new update brought in ____!", "Ian Bowen left Rockhurst because of ____.", "Peanut butter is best with ____.", "For Honor isn't dead, it's ____.", "Okay, so basically, I’m ____.", "____ kills love.", 'I asked Darby why I deserve JUG. He said I was "____".', "Today in Mr. Wickenhauser's class, we learned about ____!"];
96+
var personalPackWhite = ["bengay", "Mr. Wooten", "Rhonda", "Henry Retardo", "David Spitz", "Juuling in the third floor bathroom", "Coach Moe", "Nutting in No Nut Novemeber", "time and space", "Right Wing Populism", "Lucas Richardson", "Gillcrist's beard", "Red Dead Redemption 2", "Nick Cockring", "Ian", "Mr. Valentini", "medium-rare ribeye steak", "a liberal", "slig", "homosexuals", "the Victory App", "romaine lettuce", "an epic victory royale", "a pair of gross brown shoes", "a marshmallow someone named Keith", "voiceoverpete", "Hyperdimension Neptunia", '"Killing God", an essay by Sal Nigro', "steamed hams", "a dead game", "Yung Gravy", "Chris Elmore's Tinder account", "splooge", "sully's glistening dome of a head", "watching porn on my TI-84 Plus CE", "playing DOOM on an etch-a-sketch"];
9797
}
9898

9999
io.on('connection', (socket) => {
@@ -1165,12 +1165,12 @@ function buildGAHWhite() {
11651165
whiteDeck = [];
11661166
if (basePack) {
11671167
for (var i = 0; i < basePackWhite.length; i++)
1168-
if(!gahDiscard.includes(basePackBlue[i]))
1168+
if(gahDiscard.includes(basePackWhite[i]))
11691169
whiteDeck.push(basePackWhite[i]);
11701170
}
11711171
if (personalPack) {
11721172
for (var i = 0; i < personalPackWhite.length; i++)
1173-
if(!gahDiscard.includes(basePackBlue[i]))
1173+
if(gahDiscard.includes(personalPackWhite[i]))
11741174
whiteDeck.push(personalPackWhite[i]);
11751175
}
11761176

0 commit comments

Comments
 (0)