Skip to content

Hotfix: tweak spell prices #291

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.

Sign up for GitHub

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

Merged
ECWireless merged 2 commits into from
Oct 29, 2024
Merged

Hotfix: tweak spell prices #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
934eced
Tweak the spell prices
ECWireless Oct 29, 2024
185770e
Trim all chat inputs
ECWireless Oct 29, 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
13 changes: 10 additions & 3 deletions packages/client/src/components/ChatBox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ export const ChatBox: React.FC = () => {
Record<string, string>
>({});

const [chatScrolledOnce, setChatScrolledOnce] = useState(false);

const adjustTextareaHeight = useCallback(() => {
if (textareaRef.current) {
textareaRef.current.style.height = 'auto';
Expand All @@ -59,10 +61,15 @@ export const ChatBox: React.FC = () => {
}, []);

const scrollToBottom = useCallback(() => {
if (messagesEndRef.current) {
const isInView = messagesEndRef.current
? messagesEndRef.current.getBoundingClientRect().top < window.innerHeight
: false;

if ((!chatScrolledOnce || isInView) && messagesEndRef.current) {
setChatScrolledOnce(true);
messagesEndRef.current.scrollIntoView({ behavior: 'smooth' });
}
}, []);
}, [chatScrolledOnce]);

useEffect(() => {
adjustTextareaHeight();
Expand All @@ -72,7 +79,7 @@ export const ChatBox: React.FC = () => {
if (isLoggedIn && isGroupMember && chatUser) {
scrollToBottom();
}
}, [chatUser, isGroupMember, isLoggedIn, scrollToBottom]);
}, [chatUser, isGroupMember, isLoggedIn, messages, scrollToBottom]);

useEffect(() => {
(async () => {
Expand Down
23 changes: 17 additions & 6 deletions packages/client/src/contexts/ChatContext.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,12 @@ export const ChatProvider = ({ children }: ChatProviderProps): JSX.Element => {
const {
components: { CombatEncounter, CombatOutcome, MarketplaceSale, ShopSale },
} = useMUD();
const { armorTemplates, spellTemplates, weaponTemplates } = useItems();
const {
armorTemplates,
consumableTemplates,
spellTemplates,
weaponTemplates,
} = useItems();
const { monsterTemplates } = useMonsters();
const { allCharacters } = useMap();

Expand Down Expand Up @@ -186,6 +191,7 @@ export const ChatProvider = ({ children }: ChatProviderProps): JSX.Element => {

const allItems = [
...armorTemplates,
...consumableTemplates,
...spellTemplates,
...weaponTemplates,
];
Expand Down Expand Up @@ -222,7 +228,12 @@ export const ChatProvider = ({ children }: ChatProviderProps): JSX.Element => {

const { buyer, itemId, timestamp } = marketplaceSale;

const allItems = [...armorTemplates, ...spellTemplates, ...weaponTemplates];
const allItems = [
...armorTemplates,
...consumableTemplates,
...spellTemplates,
...weaponTemplates,
];

const customerName =
allCharacters.find(character => character.owner === buyer)?.name ?? null;
Expand Down Expand Up @@ -380,9 +391,9 @@ export const ChatProvider = ({ children }: ChatProviderProps): JSX.Element => {
}, []);

const onSendMessage = useCallback(async () => {
const oldMessage = newMessage;
const oldMessage = newMessage.trim();

if (!newMessage) {
if (!oldMessage) {
return;
}

Expand All @@ -399,7 +410,7 @@ export const ChatProvider = ({ children }: ChatProviderProps): JSX.Element => {
{
delivered: false,
from: user.account,
message: newMessage,
message: oldMessage,
timestamp: Date.now(),
},
]);
Expand All @@ -408,7 +419,7 @@ export const ChatProvider = ({ children }: ChatProviderProps): JSX.Element => {
setIsSending(false);

await user.chat.send(GROUP_CHAT_ID, {
content: newMessage,
content: oldMessage,
type: 'Text',
});
} catch (e) {
Expand Down
4 changes: 2 additions & 2 deletions packages/contracts/items.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@
"initialSupply": 10000000000000000000,
"metadataUri": "18_wall_of_force.json",
"name": "Wall of Force",
"price": 100000000000000000000,
"price": 150000000000000000000,
"stats": {
"effects": [
"0xeee09063621624b3000000000000000000000000000000000000000000000000"
Expand All @@ -290,7 +290,7 @@
"initialSupply": 10000000000000000000,
"metadataUri": "19_ice_lance.json",
"name": "Ice Lance",
"price": 100000000000000000000,
"price": 200000000000000000000,
"stats": {
"effects": [
"0xeee09063621624b3000000000000000000000000000000000000000000000000"
Expand Down
6 changes: 3 additions & 3 deletions packages/contracts/monsters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"class": 2,
"experience": 100,
"hitPoints": 21,
"intelligence": 8,
"intelligence": 12,
"inventory": [16],
"level": 2,
"strength": 4
Expand Down Expand Up @@ -129,10 +129,10 @@
"class": 2,
"experience": 205,
"hitPoints": 30,
"intelligence": 12,
"intelligence": 15,
"inventory": [17],
"level": 5,
"strength": 14
"strength": 9
}
},
{
Expand Down
6 changes: 3 additions & 3 deletions packages/contracts/worlds.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"17069": {
"address": "0xc85ee40fbe19f55416e356db98af9e67a97175ee",
"blockNumber": 8949955
"address": "0x63b00f7701df69e854bdcb1d4e2c0d014272cc42",
"blockNumber": 8997761
},
"31337": {
"address": "0x64972f2e920106cc8b4402d42b921b009ec169a0"
"address": "0xeec1be76f77727f64003b06060460b04cd1fbe37"
},
"84532": {
"address": "0x3cf01199a18fd3900c49710563177505085371ca",
Expand Down