M-Labs/web2019
4
0
Fork 5
Code Issues 16 Pull Requests 9 Releases Wiki Activity

Add warnings if phaser has next card too long and increase it's virtual HP consumption #151

Open
esavkin wants to merge 2 commits from esavkin/web2019:148-phaser-fix into master
pull from: esavkin/web2019:148-phaser-fix
merge into: M-Labs:master
Conversation 1 Commits 2 Files Changed 4 +94 -35
esavkin commented 2024-09-05 12:29:19 +08:00
Contributor
Copy Link

Closes #148

Closes #148
esavkin force-pushed 148-phaser-fix from cc89d0b1fd to 2868c8d4cd 2024-10-14 11:06:46 +08:00 Compare
sb10q reviewed 2024-10-16 11:22:42 +08:00
static/js/shop/warnings.js Outdated
@@ -145,1 +158,4 @@
}
},
"phaser_not_fit": {
message: "Since one or more Phasers may interfere with their next cards, they may additional space, that wouldn't fit into the crate. Consider removing cards, placing short cards after Phaser(s), or choosing larger crate.",
sb10q commented 2024-10-16 11:22:42 +08:00
Owner
Copy Link

"they may additional space"?

"they may additional space"?
sb10q commented 2024-10-16 11:23:14 +08:00
Owner
Copy Link

And why "may interfere"? It's pretty clear whether they do or not.

And why "*may* interfere"? It's pretty clear whether they do or not.
esavkin force-pushed 148-phaser-fix from 2868c8d4cd to 813a81fba9 2025-02-03 15:32:41 +08:00 Compare
esavkin force-pushed 148-phaser-fix from 813a81fba9 to 1123794b1a 2025-02-03 15:50:10 +08:00 Compare
esavkin force-pushed 148-phaser-fix from 1123794b1a to 937e5768f4 2025-03-25 16:39:30 +08:00 Compare
This pull request has changes conflicting with the target branch.
  • static/js/shop.bundle.js
  • static/js/shop/warnings.js
  • static/js/shop_data.js
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u 148-phaser-fix:esavkin-148-phaser-fix
git checkout esavkin-148-phaser-fix
Sign in to join this conversation.
Reviewers
No Reviewers
sb10q
Labels
No items
No Label
Milestone
No items
No Milestone
Assignees
Clear assignees
architeuthis atse fsagbuya jordens occheung sb10q
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: M-Labs/web2019#151
Delete Branch "esavkin/web2019:148-phaser-fix"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?