Skip to content

Commit

Permalink
Deploying to gh-pages from @ bdcdcf3 🚀
Browse files Browse the repository at this point in the history
  • Loading branch information
@Pseudonian
Pseudonian committed May 29, 2024
1 parent 762954c commit d285f92
Show file tree
Hide file tree
Showing 17 changed files with 715 additions and 221 deletions.
91 changes: 78 additions & 13 deletions Synergism.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1558,6 +1558,26 @@ p#transcendhotkeys {
padding: 0;
}

#challengesTabsToggle {
display: flex;
justify-content: center;
flex-flow: wrap;
margin-top: 15px;
margin-bottom: 10px;
gap: 10px 15px;
}

#challengesTabsToggle > button {
min-width: 100px;
text-align: center;
}

.singularityChallenges {
display: flex;
justify-content: center;
column-gap: 4px;
}

#challengesWrapper {
display: flex;
flex-direction: column;
Expand All @@ -1567,14 +1587,23 @@ p#transcendhotkeys {
#challengeIntroduction {
text-align: center;
font-size: 1.2em;
margin: 20px 0 0;
margin-top: 10px;
margin-bottom: 10px;
}

#ExaltIntroduction {
text-align: center;
font-size: 1.2em;
margin-top: 10px;
margin-bottom: 10px;
}

#challengesAutoToggles {
display: flex;
justify-content: center;
flex-flow: wrap;
gap: 10px 15px;
margin-bottom: 10px;
}

#challengesAutoToggles > button {
Expand Down Expand Up @@ -1635,10 +1664,11 @@ p#transcendhotkeys {
}

#challengeDetails {
display: flex;
display: grid;
grid-template-columns: repeat(2, auto);
justify-content: center;
max-width: 1200px;
align-self: center;
margin-top: 10px;
}

#challengeTimers {
Expand Down Expand Up @@ -3545,12 +3575,6 @@ header #obtainiumDisplay { color: pink; }
border: 2px solid blue;
}

.singularityChallenges {
display: flex;
justify-content: center;
column-gap: 4px;
}

.rainbowBorder {
width: 64px;
height: 64px;
Expand All @@ -3570,6 +3594,11 @@ header #obtainiumDisplay { color: pink; }
border-radius: 3px;
}

.rainbowBorder:hover {
cursor: pointer;
background-color: var(--hover-color);
}

.rainbowBorder::before {
position: absolute;
width: 150%; /* 96px */
Expand Down Expand Up @@ -3667,13 +3696,49 @@ img#singularityPerksIcon {
}

#singularityChallengeDetails {
width: 50%;
margin-left: 25%;
display: block;
}

#singularityChallengesMultiline {
#singularityChallengesInfo {
white-space: pre-line;
margin: 15px 0 0;
margin-top: 10px;
margin-bottom: 5px;
text-align: center;
}

#singularityChallengeAllRewards {
display: grid;
grid-template-rows: repeat(2, auto);
grid-template-columns: repeat(2, 375px);
justify-content: center;
grid-gap: 10px;
}

#singularityChallengeScalingHeader {
font-weight: bold;
font-size: 1.2em;
text-align: center;
margin: 0;
}

#singularityChallengeUniqueHeader {
font-weight: bold;
font-size: 1.2em;
text-align: center;
margin: 0;
}

#singularityChallengesScalingRewards {
display: block;
white-space: pre-line;
margin: 0;
text-align: center;
}

#singularityChallengesUniqueRewards {
display: block;
white-space: pre-line;
margin: 0;
}

.newPerk {
Expand Down
105 changes: 53 additions & 52 deletions dist/out.js
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dist/out.js.map
View file

Large diffs are not rendered by default.

71 changes: 40 additions & 31 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1547,7 +1547,12 @@
</div>

<div id="challenges" style="display: none;">
<div id="challengesWrapper">
<div id="challengesTabsToggle">
<button id="toggleChallengesSubTab1" style="border: 2px solid green; color: white; background-color: crimson" i18n="tabs.challenges.normal"></button>
<button id="toggleChallengesSubTab2" class="singChallenges" style="border: 2px solid purple; color: gold" i18n="tabs.challenges.exalt"></button>
</div>
<!-- You call containers "Steamed Wrappers" despite the fact they contain multiple elements? -->
<div id="challengesWrapper1">
<p id="challengeIntroduction" style="color: white" i18n="challenges.header"></p>
<div id="challengesAutoToggles">
<button class="research150" id="toggleAutoChallengeStart"></button>
Expand Down Expand Up @@ -1655,6 +1660,39 @@
<p class="reincarnationunlock" id="challengewarningreincarnation" i18n="footnotes.challenges.leaveReincarnation"></p>
</div>
</div>
<div id="challengesWrapper2" style="display: none;">
<div id="singularityChallenges">
<div id="singularityChallengeFlavor">
<p id="ExaltIntroduction" i18n="singularityChallenge.intro"></p>
</div>
<div class="singularityChallenges">
<div id="noSingularityUpgradesDiv" class="rainbowBorder">
<img id="noSingularityUpgrades" class="challenge" src="Pictures/Default/ExaltChalNoSingularityUpgrade.png">
</div>
<div id="oneChallengeCapDiv" class="rainbowBorder">
<img id="oneChallengeCap" class="challenge" src="Pictures/Default/ExaltChalOneChallengeCap.png">
</div>
<div id="limitedAscensionsDiv" class="rainbowBorder">
<img id="limitedAscensions" class="challenge" src="Pictures/Default/ExaltChalLimitedAscensions.png">
</div>
<div id="noOcteractsDiv" class="rainbowBorder">
<img id="noOcteracts" class="challenge" src="Pictures/Default/ExaltChalNoOcteracts.png">
</div>
<div id="noAmbrosiaUpgradesDiv" class="rainbowBorder">
<img id="noAmbrosiaUpgrades" class="challenge" src="Pictures/Default/ExaltChalNoAmbrosiaUpgrades.png">
</div>
</div>
<div id="singularityChallengeDetails">
<p id="singularityChallengesInfo"></p>
<div id="singularityChallengeAllRewards">
<p id="singularityChallengeScalingHeader" i18n="singularityChallenge.ScalingHeader"></p>
<p id="singularityChallengeUniqueHeader" i18n="singularityChallenge.UniqueHeader"></p>
<p id="singularityChallengesScalingRewards"></p>
<p id="singularityChallengesUniqueRewards"></p>
</div>
</div>
</div>
</div>
</div>

<div id="research" style="display: none;">
Expand Down Expand Up @@ -3967,8 +4005,7 @@ <h1>Artists</h1>
<button id="toggleSingularitySubTab1" style="border: 2px solid silver; color: white; background-color: crimson" i18n="tabs.main.shop"></button>
<button id="toggleSingularitySubTab2" style="border: 2px solid orange; color: white" i18n="tabs.singularity.perks-penalties"></button>
<button id="toggleSingularitySubTab3" class="octeracts" style="border: 2px solid blue; color: white" i18n="tabs.singularity.octeracts"></button>
<button id="toggleSingularitySubTab4" class="singChallenges" style="border: 2px solid purple; color: gold" i18n="tabs.singularity.exalt"></button>
<button id="toggleSingularitySubTab5" class="ambrosia" style="border: 2px solid #ffbf00; color: gold" i18n="tabs.singularity.ambrosia"></button>
<button id="toggleSingularitySubTab4" class="ambrosia" style="border: 2px solid #ffbf00; color: gold" i18n="tabs.singularity.ambrosia"></button>
</div>

<div id="singularityContainer1">
Expand Down Expand Up @@ -4350,34 +4387,6 @@ <h1>Artists</h1>
</div>

<div id="singularityContainer4" style="display: none;">
<div id="singularityChallenges" class="singularityContainer">
<div id="singularityChallengeFlavor">
<p id="singularityChallengeIntro" i18n="singularityChallenge.intro"></p>
</div>
<div class="singularityChallenges">
<div id="noSingularityUpgradesDiv" class="rainbowBorder">
<img id="noSingularityUpgrades" src="Pictures/Default/ExaltChalNoSingularityUpgrade.png">
</div>
<div id="oneChallengeCapDiv" class="rainbowBorder">
<img id="oneChallengeCap" src="Pictures/Default/ExaltChalOneChallengeCap.png">
</div>
<div id="limitedAscensionsDiv" class="rainbowBorder">
<img id="limitedAscensions" src="Pictures/Default/ExaltChalLimitedAscensions.png">
</div>
<div id="noOcteractsDiv" class="rainbowBorder">
<img id="noOcteracts" src="Pictures/Default/ExaltChalNoOcteracts.png">
</div>
<div id="noAmbrosiaUpgradesDiv" class="rainbowBorder">
<img id="noAmbrosiaUpgrades" src="Pictures/Default/ExaltChalNoAmbrosiaUpgrades.png">
</div>
</div>
<div id="singularityChallengeDetails">
<p id="singularityChallengesMultiline"></p>
</div>
</div>
</div>

<div id="singularityContainer5" style="display: none;">
<div id="singularityAmbrosia" class="singularityContainer">
<div id="ambrosiaDisplay">
<img src="Pictures/Default/Ambrosia.png" loading="lazy">
Expand Down
53 changes: 43 additions & 10 deletions translations/da.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2239,6 +2239,10 @@
"blessings": "Blessings",
"spirits": "[=-Spirits-=]"
},
"challenges":{
"normal": "Normal",
"exalt": "EXALT"
},
"cubes": {
"cubeTributes": "Cube Tributes",
"tesseract": "Tesseract Gifts",
Expand All @@ -2250,8 +2254,7 @@
},
"singularity": {
"perks-penalties": "Perks / Penalties",
"octeracts": "Octeracts",
"exalt": "EXALT"
"octeracts": "Octeracts"
},
"settings": {
"languages": "🌐 Languages 🌐",
Expand Down Expand Up @@ -2818,26 +2821,56 @@
"data": {
"noSingularityUpgrades": {
"name": "No Singularity Upgrades",
"description": "Simply put, you have to beat the target singularity without (most) Singularity Upgrades. Octeracts, Perks and Quality of Life Singularity Upgrades are preserved.",
"rewardDescription": "Each completion increases cube gain of every dimension by 50%! First completion gives +12% Golden Quarks. 20th awards something `special` ;)"
"description": "Simply put, you have to beat the target singularity without (most) Singularity Upgrades.<br/>Octeracts, Perks and Quality of Life Singularity Upgrades are preserved.",
"ScalingReward1":"+50% increase to <<yellow|ALL Cube>> gain",
"UniqueReward1":"1st - +12% <<gold|Golden Quarks>>!",
"UniqueReward2":"1st - A free <<var(--blueberry-box-color)|Blueberry>>!",
"UniqueReward3":"20th - A new <<orchid|Quark Shop>> upgrade!",
"UniqueReward4":"30th - +6% <<lime|&#9752 Ambrosia Luck>> for free!",
"UniqueReward5":"30th - A new <<orchid|Quark Shop>> upgrade for NOT FREE!"
},
"oneChallengeCap": {
"name": "One Challenge Caps",
"description": "Beat the target Singularity, but the first 14 Challenges have cap of only 1!",
"rewardDescription": "Each completion increases Corruption Multiplier Values by 0.03, no matter what. First Completion gives +3 to Reincarnation Challenge Cap. 20th completion grants +1 free Corruption level!"
"ScalingReward1":"+0.03 increase to <<var(--red-text-color)|Corrupt Multiplier>> values",
"ScalingReward2":"+1% <<var(--blueberry-box-color)|Blueberry Generation>> Speed",
"UniqueReward1":"1st - +3 <<green|Reincarnation Challenge>> Cap!",
"UniqueReward2":"20th - +1 Free <<var(--red-text-color)|Corruption Level>>",
"UniqueReward3":"20th - A new <<orchid|Quark Shop>> upgrade!"
},
"noOcteracts": {
"name": "No Octeract Effects",
"description": "Beat the target Singularity, but octeracts and their upgrades do nothing! Effective Singularity is also much higher based on tier.",
"rewardDescription": "Each completion increases Octeract to Cube Bonus power by 0.02 (BASE: 2.00). First completion adds a bonus to Offerings based on Octeracts. Final completion adds a bonus to Obtainium based on Octeracts."
"description": "Beat the target Singularity, but octeracts and their upgrades do nothing!<br/>Effective Singularity is also much higher based on tier.",
"ScalingReward1":"+0.02 increase to <<var(--lightseagreen-text-color)|OCTERACT to CUBE>> bonus power (Base: 2.00)",
"UniqueReward1":"1st - A bonus to <<Gold|Offerings>> based on <<var(--lightseagreen-text-color)|Octeracts>>!",
"UniqueReward2":"10th - A bonus to <<steelblue|Obtainium>> based on <<var(--lightseagreen-text-color)|Octeracts>>!",
"UniqueReward3":"10th - A new <<orchid|Quark Shop>> upgrade!"
},
"limitedAscensions": {
"name": "Twenty Ascensions Challenge",
"description": "Derpsmith put an embargo on Ascensions. Only (20 - completions) are allowed throughout the entire Singularity, before Ascensions trigger massive debuffs! Ascension Count Multiplier is hardcapped at 1. Oh and Delta is disabled. Ha.",
"rewardDescription": "Each completion grants 0.1% Ascension Speed per completion per digit in your Ascension count! First completion doubles the cap of all hepteract. Final completion adds another calculator in the shop!"
"description": "Derpsmith put an embargo on Ascensions. Only (20 - completions) are allowed throughout the entire Singularity, before Ascensions trigger massive debuffs!<br/>Ascension Count Multiplier is hardcapped at 1. Oh and Delta is disabled. Ha.",
"ScalingReward1":"<<orange|+0.1% Ascension Speed>> per Digit in your <<orange|Ascension Count!>>",
"UniqueReward1":"1st - Permanently double the cap of <<Pink|all Hepteracts>> for free!!! (This is really good!)",
"UniqueReward2":"1st - A new feature ;) <<var(--red-text-color)|[WORK IN PROGRESS]>>",
"UniqueReward3":"20th - A bonus to <<Yellow|Cubes>>, <<steelblue|Obtainium>> & <<Gold|Offerings>> while in an EXALT! (Based on that Exalts total completions!)",
"UniqueReward4":"25th - A new <<orchid|Quark Shop>> Calculator, amazing!"
},
"noAmbrosiaUpgrades": {
"name": "No Ambrosia Upgrades",
"description": "Gold Guy has lost his muster (and yes, that's his name!) and needs your help.<br/>Clear the Singularity without any effects from Ambrosia or Ambrosia-Tier Upgrades!",
"ScalingReward1":"+15 & +0.5% <<lime|&#9752 Ambrosia Luck>>",
"ScalingReward2":"+2% <<var(--blueberry-box-color)|Blueberry Generation>> Speed",
"UniqueReward1":"1st - A free <<var(--blueberry-box-color)|Blueberry>>!",
"UniqueReward2":"1st - +1 <<var(--amber-text-color)|Ambrosia>> every time <<var(--amber-text-color)|Ambrosia>> is gained!",
"UniqueReward3":"10th - Another free <<var(--blueberry-box-color)|Blueberry>>!!!",
"UniqueReward4":"15th - A new <<orchid|Quark Shop>> upgrade!",
"UniqueReward5":"20th - A THIRD FREE <<var(--blueberry-box-color)|BLUEBERRY>>?!?!",
"UniqueReward6":"20th - An <<gold|ULTRA Quark Shop>> upgrade!"
}
},
"intro": "Do you have what it takes to earn EXALT from Ant God?"
"intro": "Do you have what it takes to earn EXALT from Ant God?",
"ScalingHeader": "Scaling Effects (Per Completion)",
"UniqueHeader": "Unique Effects (On Completion #)"
},
"settings": {
"confirmationTitle": "Confirmation Toggles",
Expand Down
Loading

0 comments on commit d285f92

Please sign in to comment.