fix: restore Shimaraby/Shimacat sprites and remove Cat Flying (refs #688)#689
Merged
takaokouji merged 3 commits intoMay 13, 2026
Merged
Conversation
The trademark detection test had `'Cat-Flying'` (hyphen) but the actual sprite/costume names use `'Cat Flying'` (space), so Cat Flying entries were never caught and remained in the libraries despite being a Scratch trademark. - Fix `trademarkNames` array in removed-trademarks.test.js (Cat-Flying → Cat Flying) - Remove Cat Flying sprite from sprites.json - Remove Cat Flying-a, Cat Flying-b costumes from costumes.json Refs #688 Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
…tream merge The Shimaraby and Shimacat sprite/costume entries were silently overwritten during upstream merges (most recently in PR #630, and also in the v13.7.2 merge before that). The asset PNGs in static/smalruby-assets/ remained but the library entries pointing to them were gone, so the sprites disappeared from the editor. - Re-add Shimaraby and Shimacat sprite entries to sprites.json (between Shark 2 and Shirt) - Re-add Shimaraby-a/b and Shimacat-a/b costume entries to costumes.json - Add smalruby-original-sprites.test.js as a regression guard so that future upstream merges fail loudly if these entries are wiped again Refs #688 Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
…sprites Adds a section to phase2-conflicts.md warning that sprites.json / costumes.json upstream changes do not produce git conflicts but can silently wipe Smalruby-original entries (Shimaraby, Shimacat). Includes the verification commands and the trademark-sprite checklist that must be run after every upstream merge. This is the recurrence-prevention measure for the issue caught in #688 where two consecutive upstream merges (#630 and the v13.7.2 merge before it) wiped Shimaraby/Shimacat without anyone noticing. Refs #688 Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
30 tasks
github-actions Bot
pushed a commit
that referenced
this pull request
May 13, 2026
…-restore-shimaraby-remove-cat-flying fix: restore Shimaraby/Shimacat sprites and remove Cat Flying (refs #688)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
スモウルビー公式キャラクター Shimaraby / Shimacat スプライト・コスチュームが upstream マージで消失していたので復元する。あわせて、Scratch トレードマークに該当する Cat Flying スプライト・コスチュームがテスト不備により残存していたので除去し、テスト不備も修正する。
詳細は #688 を参照。
原因
dedebb4ecd(feat/upstream-merge-2026-05) でアップストリームのsprites.json/costumes.jsonを上書きした際に Smalruby 独自エントリが消失。実は 1 つ前の v13.7.2 マージ (4e2ddc1406) でも同じ消失が起きており、2 連続で同じ衝突を見落としている。 アセット PNG (packages/scratch-gui/static/smalruby-assets/) は残存。removed-trademarks.test.jsのtrademarkNames配列で'Cat-Flying'(ハイフン) と書かれていたが、実データは'Cat Flying'(スペース) のため検出をすり抜けていた。Implementation Steps
.claude/skills/upstream-merge/phase2-conflicts.md)Definition of Done
removed-trademarks.test.jsに'Cat Flying'(スペース) が含まれ pass するsprites.json/costumes.jsonから Cat Flying が完全に消えているsprites.jsonに Shimaraby, Shimacat sprite が存在するcostumes.jsonに Shimaraby-a/b, Shimacat-a/b が存在するsmalruby-original-sprites.test.jspasshttp://localhost:8601):shimaraby-aで stage に追加、Shimacat も同様に追加・表示確認Test plan
removed-trademarks.test.js(jest) passsmalruby-original-sprites.test.js(jest) passRefs #688
🤖 Generated with Claude Code