Skip to content

Commit

Permalink
Merge pull request #624 from Pseudo-Corp/stripe
Browse files Browse the repository at this point in the history
implement pseudocoins
  • Loading branch information
Pseudonian authored Jan 4, 2025
2 parents dabaf0d + 31cfbb3 commit 11ace0a
Show file tree
Hide file tree
Showing 65 changed files with 1,794 additions and 268 deletions.
Binary file modified Pictures/Default/patchnotes.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/Jar of PseudoCoins.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/Jug of PseudoCoins.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Pictures/Legacy/patchnotes.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/Magic Pot of PseudoCoins.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Pictures/Monotonous/patchnotes.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/Piggy Bank of PseudoCoins.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/PseudoCoin border.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/PseudoCoinAscentUnlock.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/PseudoCoinCalculator.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/PseudoCoinCubes.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/PseudoCoinExtraOffline.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/PseudoCoinFreeDailyImprovement.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/PseudoCoinGeneration.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/PseudoCoinGoldenQuark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/PseudoCoinLuck.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/PseudoCoinPotion.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/PseudoCoinTalismanUnlock.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/PseudoShop/ADD_CODE_CAP_BUFF.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/PseudoShop/AMBROSIA_GENERATION_BUFF.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/PseudoShop/AMBROSIA_LOADOUT_SLOT_QOL.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/PseudoShop/AMBROSIA_LUCK_BUFF.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/PseudoShop/CORRUPTION_LOADOUT_SLOT_QOL.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/PseudoShop/CUBE_BUFF.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Pictures/PseudoShop/GOLDEN_QUARK_BUFF.png
Binary file added Pictures/PseudoShop/INSTANT_UNLOCK_1.png
Binary file added Pictures/PseudoShop/INSTANT_UNLOCK_2.png
Binary file added Pictures/PseudoShop/OFFLINE_TIMER_CAP_BUFF.png
Binary file added Pictures/PseudoShop/PseudoCoin border.png
Binary file added Pictures/PseudoShop/PseudoCoins.png
Binary file added Pictures/Roll of PseudoCoins.png
Binary file modified Pictures/Simplified/patchnotes.png
Binary file added Pictures/cart.png
263 changes: 257 additions & 6 deletions Synergism.css
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ body {
--buildings-hover-color: #666;
--blessings-canbuy-color: #222;
--blessings-hover-color: #444;
--darkgold-color: #b59410;
--tab-color: #171717;
--singtab-color: black;
--buttonimg-color: black;
Expand Down Expand Up @@ -201,8 +202,8 @@ button {
outline: none;
}

body button:hover,
body button:active {
body button:hover:not(:disabled),
body button:active:not(:disabled) {
background-color: var(--hover-color);
}

Expand Down Expand Up @@ -477,7 +478,8 @@ body button:active {
font-size: min(1em, 20px);
}

.offlineStats {
.offlineStats,
.cartList {
display: flex;
flex-direction: column;
z-index: 3;
Expand All @@ -491,7 +493,8 @@ body button:active {
margin-bottom: 2px;
}

.offlineStatElement {
.offlineStatElement,
.cartListElement {
margin-left: 10px;
}

Expand All @@ -507,7 +510,9 @@ body button:active {
margin: 5px 0;
}

#exitOffline {
#exitOffline,
#closeCart,
#checkout {
width: 18em;
min-height: auto;
min-width: 220px;
Expand All @@ -519,7 +524,9 @@ body button:active {
color: white;
}

#exitOffline:hover {
#exitOffline:hover,
#closeCart:hover,
#checkout:not(:disabled):hover {
background-color: var(--purplehover-color);
}

Expand Down Expand Up @@ -2662,6 +2669,7 @@ p#ascendHotKeys {
background-color: #fff4b3;
} */

.subtabSwitcher > * > button.buttonActive,
.subtabSwitcher > button.buttonActive {
background-color: crimson;
}
Expand Down Expand Up @@ -3936,6 +3944,13 @@ img#singularityPerksIcon {
font-weight: bold;
}

#bbLoadoutContainer {
display: flex;
flex-direction: row;
align-items: center;
margin-top: 10px;
}

form input:hover {
background-color: var(--hover-color);
cursor: pointer;
Expand All @@ -3949,3 +3964,239 @@ form input:hover {
margin-right: auto;
margin-top: 5px;
}

.pseudoUpgradeContainer {
display: grid;
grid-template-columns: repeat(4, 1fr);
gap: 10px;
justify-items: center;
width: 70%;
margin: 0 auto;
}

.pseudoCoinContainer {
margin: 10px 10px 0 0;
border: 1px solid #ccc;
border: 2px solid orchid;
text-align: center;
}

#pseudoCoins > #productContainer > section > * > .pseudoCoinImage {
margin-top: 8px;
}

.pseudoCoinText {
width: 90%;
height: 80px;
padding: 10px;
box-sizing: border-box;
text-align: center;
box-shadow: 0 0 10px rgb(0 0 0 / 10%);
border: 1px solid #ccc;
margin: 5px auto;
}

.pseudoCoinButton {
width: 50%;
padding: 10px;
background-color: black;
color: white;
cursor: pointer;
border: 2px solid white;
font-size: 1.2em;
word-wrap: break-word;
margin-bottom: 5px;
}

.pseudoCoinButton:hover {
background-color: white;
color: black;
}

#cart {
width: fit-content;
margin: 5px auto 0;
border: 2px solid white;
border-radius: 5px;
}

#cart > img {
width: 24px;
height: 24px;
}

#totalCost {
margin: 0 auto;
}

#closeCart,
#checkout {
margin: 2px auto 4px;
}

.cartListElementContainer > * {
width: 5vh;
}

.cartListElementContainer > button {
min-height: unset;
height: 50%;
border: 2px solid green;
border-radius: 2px;
}

#itemList {
display: flex;
flex-wrap: wrap;
flex-direction: column;
}

.cartListElementContainer {
display: flex;
}

.cartListElement {
width: 30vh;
}

.cartListElementContainer > span:first-of-type {
width: 80%;
}

#upgradesContainer {
width: 100%;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
}

#cartContainer {
display: flex;
width: 70vh;
justify-content: center;
margin: 0 auto;
margin-top: 10px;
}

#upgradeGrid {
display: grid;
grid-template-columns: repeat(6, 15%);
grid-template-rows: repeat(2, 15%);
column-gap: 10px;
row-gap: 64px;
margin: 0;
width: 38%;
padding-top: 15px;
max-height: 192px;
}

#upgradeGrid > div {
position: relative;
height: 64px;
width: 64px;
background: #222;
place-self: center;
}

#upgradeGrid > div > p {
margin: 0;
position: absolute;
bottom: 0;
}

#upgradeGrid > div > p:nth-child(odd) {
margin: 0;
position: absolute;
top: 0;
right: 0;
}

#upgradeGrid > div > img {
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
border-radius: 50%;
width: 70%;
}

#upgradeGrid > div[data-id].active {
outline: 2px solid white;
}

#pseudoCoinAmounts {
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
margin: 10px;
}

#pseudoCoinAmounts > img {
max-height: 32px;
max-width: 32px;
}

#upgradeInfo {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
margin: 10px auto;
width: 50%;
border: 3px solid var(--darkgold-color);
}

#pseudoCoinUpgradeName {
background-color: var(--darkgold-color);
width: 100%;
text-align: center;
font-size: 0.8em;
}

#pseudoCoinUpgradeDescription {
display: grid;
height: 128px;
grid-template-columns: repeat(3, 1fr);
grid-template-rows: 128px;
width: 100%;
}

#pseudoCoinUpgradeIcon {
grid-column: 1;
margin: auto;
}

#pseudoCoinUpgradeTexts {
display: grid;
grid-template-rows: repeat(3, 1fr);
grid-column: 2 / 4;
margin: auto;
width: 100%;
height: 100%;
align-items: center;
}

#pCoinUpgradeDesc {
grid-row: 1 / 3;
text-align: center;
margin: auto;
width: 100%;
}

#pCoinUpgradeDesc > p {
margin: 0;
}

#pCoinButton {
grid-row: 3;
margin: 0 auto;
width: 100%;
}

#buy {
width: 100%;
border: 2px solid gold;
font-size: 1.2em;
}
Loading

0 comments on commit 11ace0a

Please sign in to comment.