Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Preparing Beta Branch #3186

Merged
merged 43 commits into from
Nov 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
b1411f2
ci(main): adjusting the repo copy by capitalizing the org repo name.
h0lybyte Nov 7, 2024
f773a96
docs(journal): updating daily notes.
h0lybyte Nov 7, 2024
8a4fbc3
Merge pull request #3183 from KBVE/patch-atomic-ci-fix-for-kbve-deplo…
h0lybyte Nov 7, 2024
022573c
Merge pull request #3184 from KBVE/patch-atomic-daily-journal-11-07-2…
h0lybyte Nov 7, 2024
776ac0c
Merge pull request #3185 from KBVE/dev
h0lybyte Nov 7, 2024
faf149e
refactor(nx): another quick cleanup and refactor of the shad library.
h0lybyte Nov 7, 2024
0d7af8e
refactor(shad): reimported the shadcn-ui library and tested it with a…
h0lybyte Nov 7, 2024
dc19217
Merge pull request #3187 from KBVE/patch-atomic-herbmail-deployment-1…
h0lybyte Nov 7, 2024
78c292e
feat(nx): upgrading to v20.0.11
h0lybyte Nov 7, 2024
b8e2ba3
Merge pull request #3189 from KBVE/patch-atomic-updates-for-herbmail-…
h0lybyte Nov 7, 2024
27888cb
fix(astro): preparing for the shadcnui changes.
h0lybyte Nov 8, 2024
2abe149
Merge pull request #3190 from KBVE/patch-atomic-journal-changes-11-07…
h0lybyte Nov 8, 2024
fb89fb4
fix(astro): new footer for herbmail
h0lybyte Nov 8, 2024
8cda56f
fix(shadcnui): resolved the issue with astro process.
h0lybyte Nov 8, 2024
0f9db34
fix(herbmail.com): updated the website!
h0lybyte Nov 8, 2024
5062535
sync(herbmail.com): switching to mac dev.
h0lybyte Nov 8, 2024
eb7824f
Merge pull request #3191 from KBVE/patch-atomic-herbmail-shad-build-1…
h0lybyte Nov 8, 2024
8e93062
feat(fudster): added raw docker build without python.
h0lybyte Nov 8, 2024
57c57c9
feat(herbmail.com): added a nav bar to herbmail.com
h0lybyte Nov 8, 2024
491f648
Merge pull request #3192 from KBVE/patch-atomic-herbmail-updates-11-0…
h0lybyte Nov 8, 2024
3457ba8
fix(kbve.com): adjusting the shop and itemdb index.
h0lybyte Nov 8, 2024
4b50d45
fix(cryptothrone.com): updating the temp nx 20 / astro fix.
h0lybyte Nov 8, 2024
885a40d
fix(cryptothrone.com): adjusted the dice font to be white instead bla…
h0lybyte Nov 8, 2024
5bc973a
Merge pull request #3193 from KBVE/patch-atomic-updating-astro-pages-…
h0lybyte Nov 8, 2024
c85be55
fix(cryptothrone.com): adjusting the build requirements and minor twe…
h0lybyte Nov 8, 2024
6f3768e
perf(cryptothrone.com): using memo and callback for the dice.
h0lybyte Nov 8, 2024
f14a2bc
chore(cryptothrone.com): removed doubled import of phaser.
h0lybyte Nov 8, 2024
81f9248
chore(cryptothrone.com): kept the double import commented out.
h0lybyte Nov 8, 2024
a5e100d
Merge pull request #3194 from KBVE/patch-atomic-generic-astro-changes…
h0lybyte Nov 8, 2024
41dc092
docs(journal): added daily notes
h0lybyte Nov 8, 2024
2d8cf79
feat(laser): adding a chunking system for the map.
h0lybyte Nov 9, 2024
3d38ae5
Merge pull request #3195 from KBVE/patch-atomic-updating-astro-builds…
h0lybyte Nov 9, 2024
31bff68
feat(laser): updating the chunk rendering for phaser tilemaps.
h0lybyte Nov 9, 2024
762d8d6
fix(laser): trying to resolve chunking bug in loadNewMap function.
h0lybyte Nov 9, 2024
b15fc09
fix(laser): additional changes to the chunk render.
h0lybyte Nov 9, 2024
7bcdd71
fix(laser): almost get the rendering to work.
h0lybyte Nov 9, 2024
7ae836c
fix(laser): still trying to adjust the rendering, too many errors.
h0lybyte Nov 9, 2024
0054101
Merge pull request #3196 from KBVE/patch-atomic-more-changes-to-the-m…
h0lybyte Nov 9, 2024
8474778
docs(journal): updating the daily journal entries.
h0lybyte Nov 10, 2024
aea5da6
Merge pull request #3197 from KBVE/patch-atomic-daily-journal-11-09-2…
h0lybyte Nov 10, 2024
5017455
fix(cryptothrone.com): reverting to the older loadmap function.
h0lybyte Nov 10, 2024
1a088e5
Merge pull request #3198 from KBVE/patch-atomic-change-map-11-10-2024…
h0lybyte Nov 10, 2024
d3d92fa
Merge pull request #3188 from KBVE/dev
h0lybyte Nov 10, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 3 additions & 20 deletions .github/workflows/ci-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ jobs:
API_TOKEN_GITHUB: ${{ secrets.UNITY_PAT }}
with:
source_file: 'dist/apps/kbve.com/'
destination_repo: 'kbve/kbve.com'
destination_repo: 'KBVE/kbve.com'
destination_folder: '/docs'
destination_branch: 'dev'
destination_branch_create: 'patch-kbve-deploy-${{ needs.globals.outputs.sha256head }}'
Expand All @@ -211,7 +211,7 @@ jobs:
API_TOKEN_GITHUB: ${{ secrets.UNITY_PAT }}
with:
source_file: 'dist/apps/herbmail.com/'
destination_repo: 'kbve/herbmail.com'
destination_repo: 'KBVE/herbmail.com'
destination_folder: '/docs'
destination_branch: 'main'
destination_branch_create: 'patch-herbmail-deploy-${{ needs.globals.outputs.sha256head }}'
Expand Down Expand Up @@ -275,7 +275,7 @@ jobs:
API_TOKEN_GITHUB: ${{ secrets.UNITY_PAT }}
with:
source_file: 'dist/apps/cryptothrone.com/'
destination_repo: 'kbve/cryptothrone.com'
destination_repo: 'KBVE/cryptothrone.com'
destination_folder: '/docs'
destination_branch: 'main'
destination_branch_create: 'patch-cryptothrone-deploy-${{ needs.globals.outputs.sha256head }}'
Expand Down Expand Up @@ -547,15 +547,6 @@ jobs:
name: atlas-python-package-distributions
path: apps/atlas/dist/

- name: KBVE Shell
uses: ./.github/actions/kbve-shell
with:
flag: '-pythonbump apps/atlas'
create_pull_request: true
github_token: ${{ secrets.GITHUB_TOKEN }}
pull_request_title: 'python-atlas-minor-version-bump-${{ needs.globals.outputs.sha256head }}'
pull_request_body: 'Bumping up the minor version of the Python ATLAS package.'


# [Fudster] -> Publish (As App)
python_fudster_build:
Expand Down Expand Up @@ -616,14 +607,6 @@ jobs:
name: fudster-python-package-distributions
path: apps/fudster/dist/

- name: KBVE Shell
uses: ./.github/actions/kbve-shell
with:
flag: '-pythonbump apps/fudster'
create_pull_request: true
github_token: ${{ secrets.GITHUB_TOKEN }}
pull_request_title: 'python-fudster-minor-version-bump-${{ needs.globals.outputs.sha256head }}'
pull_request_body: 'Bumping up the minor version of the Python fudster package.'


# @[ERust] -> Publish
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -102,4 +102,5 @@ apps/expo-cityvote/.tamagui/css/*

# NuGetScracthroot
NuGetScratchroot/
dotnet-install.sh
dotnet-install.sh
vite.config.*.timestamp*
1 change: 1 addition & 0 deletions apps/cryptothrone.com/astro.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { fileURLToPath } from 'node:url';

// https://astro.build/config
export default defineConfig({
site: 'https://cryptothrone.com',
outDir: '../../dist/apps/cryptothrone.com',
integrations: [
react(),
Expand Down
24 changes: 23 additions & 1 deletion apps/cryptothrone.com/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,33 @@
"sourceRoot": "apps/cryptothrone.com/src",
"tags": [],
"targets": {
"dev": {
"executor": "nx:run-commands",
"options": {
"cwd": "apps/cryptothrone.com",
"commands": [
"UV_THREADPOOL_SIZE=4 NODE_OPTIONS=\"--max-old-space-size=4096\" nx exec -- astro dev"
],
"parallel": false
}

},
"build": {
"executor": "nx:run-commands",
"options": {
"cwd": "apps/cryptothrone.com",
"commands": [
"UV_THREADPOOL_SIZE=4 NODE_OPTIONS=\"--max-old-space-size=4096\" nx exec -- astro build"
],
"parallel": false
}

},
"buildx": {
"executor": "@nxtensions/astro:build",
"options": {}
},
"dev": {
"devx": {
"executor": "@nxtensions/astro:dev",
"options": {}
},
Expand Down
24 changes: 12 additions & 12 deletions apps/cryptothrone.com/src/components/game/menu/ModalDice.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// DiceRollModal.tsx
import React, { useState, useEffect, memo } from 'react';
import React, { useState, useEffect, memo, useCallback } from 'react';
import { useStore } from '@nanostores/react';
import { playerStealDiceRoll } from './tempstore';
import { eventEmitterInstance as EventEmitter, notificationType, queryItemDB, type DiceRollResultEventData, type PlayerStealEventData } from '@kbve/laser';
Expand Down Expand Up @@ -48,23 +48,23 @@ const ModalDice: React.FC = () => {
let message = '';

switch (true) {
case roll >= 24:
case roll == 24:
itemName = '01J27QABD2GPFNRVK69S51HSGB';
message = `You successfully stole a ${itemName}!`;
break;
case roll >= 20:
case roll == 23:
itemName = '01J27QN2KZG1RDZW4CE9Q9Z3YQ';
message = `You successfully stole a ${itemName}!`;
break;
case roll >= 18:
case roll == 19:
itemName = '01J269PK47V1DWX2S1251DEASD';
message = `You successfully stole a ${itemName}!`;
break;
case roll >= 15:
case roll == 18:
itemName = 'Blue Shark';
message = `You successfully stole a ${itemName}!`;
break;
case roll >= 12:
case roll == 17:
itemName = 'Salmon';
message = `You successfully stole a ${itemName}!`;
break;
Expand Down Expand Up @@ -101,17 +101,17 @@ const ModalDice: React.FC = () => {
}
};

const handleClose = () => {
const handleClose = useCallback(() => {
updateDiceValues([]);
setDiceValues([]);
setCurrentRoll(null);
playerStealDiceRoll.set(null);
};
}, []);

if (!_npc$) return null;

return (
<div className="fixed inset-0 flex items-center justify-center z-50 bg-zinc-800 bg-opacity-50">
<div className="fixed inset-0 flex items-center justify-center z-50 bg-zinc-800 bg-opacity-50 text-white">
<div className="bg-zinc-800 p-4 rounded-lg shadow-lg w-3/4">
<DiceRollMessage npcName={_npc$.npcName} roll={currentRoll} />
<MemoizedMinigameDiceComponent />
Expand All @@ -125,7 +125,7 @@ const DiceRollMessage: React.FC<{ npcName: string, roll: number | null }> = ({ n
<div>
<h2 className="text-lg text-yellow-400 font-bold mb-4">Steal Attempt</h2>
<p className="mb-4">
Roll the dice to steal from {npcName}. You need a total of 12 or higher to succeed.
Roll the dice to steal from {npcName}. You need a total of 17 or higher to succeed.
</p>
{roll !== null && (
<p className="mb-4">
Expand All @@ -152,13 +152,13 @@ const MinigameDiceComponent: React.FC = () => (

const MemoizedMinigameDiceComponent = memo(MinigameDiceComponent);

const CloseButton: React.FC<{ handleClose: () => void }> = ({ handleClose }) => (
const CloseButton: React.FC<{ handleClose: () => void }> = memo(({ handleClose }) => (
<button
onClick={handleClose}
className="block w-full py-2 bg-red-500 text-white rounded hover:bg-red-700 mt-2"
>
Close
</button>
);
));

export default ModalDice;
Loading
Loading