Skip to content

feat: update catalog database #25

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
tinoue merged 8 commits into from
Nov 2, 2025
Merged

feat: update catalog database #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
43848ac
feat: update ShootingRuleCatalog.csv to introduce new entries for fas…
tinoue Oct 28, 2025
d5eb6d6
chore: update catalog database files and commit IDs to reflect latest…
tinoue Oct 28, 2025
a529ac0
fix: update TYPE96 SENIOR entry in GunCatalog.csv to correct availabi…
tinoue Oct 31, 2025
a782d1f
chore: update catalog database files and commit IDs for realm and sql…
tinoue Oct 31, 2025
38b742e
fix: correct spelling of "USP MATCH" in GunCatalog.csv entry
tinoue Nov 1, 2025
966e3d8
chore: update catalog database files and commit IDs for realm and sql…
tinoue Nov 1, 2025
ab72dd1
fix: update availability status for Kar98k entry in GunCatalog.csv
tinoue Nov 1, 2025
947ede4
chore: update catalog database files and commit IDs for realm and sql…
tinoue Nov 1, 2025
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
Binary file modified db/realm/catalog_data.realm
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion db/realm/catalog_data.realm.commitid
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
de38f4f
ab72dd1
Binary file modified db/sqlite/catalog_data.db
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion db/sqlite/catalog_data.db.commitid
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
de38f4f
ab72dd1
5 changes: 3 additions & 2 deletions source_data/GunCatalog.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1834,7 +1834,7 @@ _id,manufacturerId,shortName,fullName,description,shortNameJa,fullNameJa,descrip
13067,"crown","CFS45","","","CFS45","","",1,1,2,,

13070,"crown","GLK33","","Slide Stop","GLK33","","スライドストップ",1,1,2,,
13071,"crown","UPS MATCH","","Slide Stop","UPS MATCH","","スライドストップ",1,1,2,,
13071,"crown","USP MATCH","","Slide Stop","USP MATCH","","スライドストップ",1,1,2,,
13072,"crown","1911A1","","Slide Stop","1911A1","","スライドストップ",1,1,2,,
13073,"crown","P228","","Slide Stop","P228","","スライドストップ",1,1,2,,

Expand Down Expand Up @@ -1865,7 +1865,8 @@ _id,manufacturerId,shortName,fullName,description,shortNameJa,fullNameJa,descrip
13101,"crown","AWM SNIPER RIFLE","","","AWM スナイパーライフル","","",2,1,2,,
13110,"crown","SUPER RIFLE U10 SENIOR","","","スーパーライフルU10シニア","","",2,1,0,,
13111,"crown","SUPER RIFLE DRAGUNOV SVD","","","スーパーライフルドラグノフSVD","","",2,1,0,,
13112,"crown","TYPE96 SENIOR","","","タイプ96 シニア","","",2,1,2,,
13112,"crown","TYPE96 SENIOR","","","タイプ96 シニア","","",2,1,0,,
13113,"crown","Kar98k","","","","","",2,1,0,,
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Nov 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This new entry for the Kar98k is missing Japanese names (shortNameJa, fullNameJa). While these fields are optional according to docs/GunCatalog.md, most other entries include them. For consistency and to improve localization, please consider adding the Japanese names. For example, Kar98k could be used for shortNameJa.


13120,"crown","ELEX9","","","エレックス9","","",8,2,2,,
13121,"crown","CP7","","","CP7","","",8,2,2,,
Expand Down
14 changes: 7 additions & 7 deletions source_data/ShootingRuleCatalog.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ _id,type,name,description,url,nameJa,descriptionJa,urlJa,range100x,unitOfRange,v
91,"issf","10m air pistol","10m (10.94yds), 5 shots in 250 sec x 2 stages. Pistol with iron sights only. Standing position, with the gun held in one hand only. Start with the muzzle pointed below 45 degrees.","/docs/competition-rules/air-pistol","10m エアピストル","10m, 5発/250秒 x 2ステージ。ピストル、立射片手撃ち。アイアンサイトのみ。銃口を45度以下に向けた状態からの射撃開始。","",1000,0,"issf_10m_pistol",1,1,1,5,250,2,0
94,"issf","5m air rifle","5m (5.47yds), 5 shots in 250 sec x 2 stages. Rifles (including shotguns and SMGs) with any sights. Standing position. Start with the muzzle pointed below 45 degrees. Double-sized ISSF target.","/docs/competition-rules/air-rifle","5m エアライフル","5m, 5発/250秒 x 2ステージ。ライフル(ショットガン・SMG含む)、立射のみ。サイトに制限なし。銃口を45度以下に向けた状態からの射撃開始。2倍サイズのISSFターゲット。","",500,0,"issf_10m_rifle",2,30,1,5,250,2,0
95,"issf","10m air rifle","10m (10.94yds), 5 shots in 250 sec x 2 stages. Rifles (including shotguns and SMGs) with any sights. Standing position. Start with the muzzle pointed below 45 degrees. Double-sized ISSF target.","/docs/competition-rules/air-rifle","10m エアライフル","10m, 5発/250秒 x 2ステージ。ライフル(ショットガン・SMG含む)、立射のみ。サイトに制限なし。銃口を45度以下に向けた状態からの射撃開始。2倍サイズのISSFターゲット。","",1000,0,"issf_10m_rifle",2,30,1,5,250,2,0
100,"speed_draw","10 ft Quick Draw Speed Challenge","10 feet (3m), Single shot x 5 strings. Scored by time to hit; best 4/5 total. Handgun only; any sights are allowed. Standing, holstered, start from a hands-up position.","/docs/competition-rules/quick-draw-speed-challenge","3m クイックドロー スピードチャレンジ","10フィート(3m), 1発 x 5ストリング。命中までの時間で採点、上位4発を合計。ハンドガンのみ、サイトの制限なし。要ホルスター。立射、ハンズアップポジションからのスタート。","",1000,2,"speed_shooting",3,1,0,1,3,5,0
105,"speed","10ft Speed Challenge","10 feet (3m), Single shot x 5 strings. Scored by time to hit; best 4/5 total. Any type of guns and sights are allowed. Standing position; start from an aimed-down position.","/docs/competition-rules/speed-challenge","3m スピードチャレンジ","10フィート(3m), 1発 x 5ストリング。命中までの時間で採点、上位4発を合計。銃の種類・サイトの制限なし。立射、エイムダウンポジションからのスタート。","",1000,2,"speed_shooting",3,0,0,1,3,5,0
110,"sprint_draw","5m Quick Draw Precision Sprint","5m (5.47yds), Single shot in 3 sec x 10 stages. Handgun only; any sights are allowed. Standing, holstered, start from a hands-up position.","/docs/competition-rules/quick-draw-precision-sprint","5m クイックドロー 精密スプリント","5m, 1発/3秒 x 10ステージ。ハンドガンのみ、サイトの制限なし。要ホルスター。立射、ハンズアップポジションからのスタート。","",500,0,"",3,1,0,1,3,10,0
115,"sprint","5m Precision Sprint","5m (5.47yds), Single shot in 3 sec x 10 stages. Any type of guns and sights are allowed. Standing position. Start with the muzzle pointed below 45 degrees.","/docs/competition-rules/precision-sprint","5m 精密スプリント","5m, 1発/3秒 x 10ステージ。銃の種類・サイトの制限なし。立射のみ。銃口を45度以下に向けた状態からの射撃開始。","",500,0,"",3,0,0,1,3,10,0
120,"wfda","40cm Fast Draw Standing BB","40cm (16in), single shot in 1 sec x 7 strings. Scored by time to hit; best 5/7 total. Revolvers only, fired in single action. Standing with holster. Start with hands at sides, not touching the gun.","/docs/competition-rules/40cm-fast-draw-standing-bb","40cm ファストドロー スタンディングBB","40cm, 1発/1秒 x 7回。命中までの時間で採点、上位5発を合計。リボルバーのみ使用可(シングルアクション操作)。要ホルスター。立射。スタートはハンズアットサイドポジション(手を銃に触れず、近くに置いた状態)","",40,0,"speed_shooting",1,1,0,1,1,7,0
125,"wfda","40cm Pre-Cocked Fast Draw Standing BB","40cm (16in), single shot in 1 sec x 7 strings. Scored by time to hit; best 5/7 total. Pre-cocked handgun only. Standing with holster. Start with hands at sides, not touching the gun.","/docs/competition-rules/40cm-fast-draw-standing-bb","40cm プリコック ファストドロー スタンディングBB","40cm, 1発/1秒 x 7回。命中までの時間で採点、上位5発を合計。プリコック状態のハンドガンのみ使用可。要ホルスター。立射。スタートはハンズアットサイドポジション(手を銃に触れず、近くに置いた状態)","",40,0,"speed_shooting",1,1,0,1,1,7,0
100,"speed_draw","10ft Quick Draw Speed Challenge","10 feet (3m), single shot x 5 strings. Scored by time to hit; best 4/5 total. Handgun only; any sights are allowed. Standing, holstered, start from a hands-up position.","/docs/competition-rules/quick-draw-speed-challenge","3m クイックドロー スピードチャレンジ","10フィート(3m), 1発 x 5ストリング。命中までの時間で採点、上位4発を合計。ハンドガンのみ、サイトの制限なし。要ホルスター。立射、ハンズアップポジションからのスタート。","",1000,2,"speed_shooting",3,1,0,1,3,5,0
105,"speed","10ft Speed Challenge","10 feet (3m), single shot x 5 strings. Scored by time to hit; best 4/5 total. Any type of guns and sights are allowed. Standing position; start from an aimed-down position.","/docs/competition-rules/speed-challenge","3m スピードチャレンジ","10フィート(3m), 1発 x 5ストリング。命中までの時間で採点、上位4発を合計。銃の種類・サイトの制限なし。立射、エイムダウンポジションからのスタート。","",1000,2,"speed_shooting",3,0,0,1,3,5,0
110,"sprint_draw","5m Quick Draw Precision Sprint","5m (5.47yds), single shot in 3 sec x 10 stages. Handgun only; any sights are allowed. Standing, holstered, start from a hands-up position.","/docs/competition-rules/quick-draw-precision-sprint","5m クイックドロー 精密スプリント","5m, 1発/3秒 x 10ステージ。ハンドガンのみ、サイトの制限なし。要ホルスター。立射、ハンズアップポジションからのスタート。","",500,0,"",3,1,0,1,3,10,0
115,"sprint","5m Precision Sprint","5m (5.47yds), single shot in 3 sec x 10 stages. Any type of guns and sights are allowed. Standing position. Start with the muzzle pointed below 45 degrees.","/docs/competition-rules/precision-sprint","5m 精密スプリント","5m, 1発/3秒 x 10ステージ。銃の種類・サイトの制限なし。立射のみ。銃口を45度以下に向けた状態からの射撃開始。","",500,0,"",3,0,0,1,3,10,0
120,"wfda_jp","40cm Fast Draw Standing BB","40cm (16in), single shot in 1 sec x 7 strings. Scored by time to hit; best 5/7 total. Revolvers only, fired in single action. Standing with holster. Start with hands at sides, not touching the gun.","/docs/competition-rules/40cm-fast-draw-standing-bb","40cm ファストドロー スタンディングBB","40cm, 1発/1秒 x 7回。命中までの時間で採点、上位5発を合計。リボルバーのみ使用可(シングルアクション操作)。要ホルスター。立射。スタートはハンズアットサイドポジション(手を銃に触れず、近くに置いた状態)","",40,0,"speed_shooting",1,1,0,1,1,7,0
125,"wfda_jp","40cm Cocked Fast Draw Standing BB","40cm (16in), single shot in 1 sec x 7 strings. Scored by time to hit; best 5/7 total. Handguns only: semi-autos with safety off or revolvers hammer cocked. Standing with holster. Start with hands at sides, not touching the gun.","/docs/competition-rules/40cm-fast-draw-standing-bb","40cm コック済 ファストドロー スタンディングBB","40cm, 1発/1秒 x 7回。命中までの時間で採点、上位5発を合計。オートマティックはセーフティ解除、リボルバーはハンマーコック可。要ホルスター。立射。スタートはハンズアットサイドポジション(手を銃に触れず、近くに置いた状態)","",40,0,"speed_shooting",1,1,0,1,1,7,0
130,"wfda","5ft Fast Draw Standing BB","5 ft (1.5m), single shot in 1 sec x 7 strings. Scored by time to hit; best 5/7 total. Revolvers only, fired in single action. Standing with holster. Hand on the gun at start, finger outside the trigger guard.","/docs/competition-rules/5ft-fast-draw-standing-bb","1.5m ファストドロー スタンディングBB","5フィート(1.5m), 1発/1秒 x 7回。命中までの時間で採点、上位5発を合計。リボルバーのみ使用可(シングルアクション操作)。要ホルスター。立射。銃に片手を置き、トリガーに指をかけない状態でスタート","",500,2,"speed_shooting",1,1,0,1,1,7,0
135,"wfda","5ft Pre-Cocked Fast Draw Standing BB","5 ft (1.5m), single shot in 1 sec x 7 strings. Scored by time to hit; best 5/7 total. Pre-cocked handgun only. Standing with holster. Hand on the gun at start, finger outside the trigger guard.","/docs/competition-rules/5ft-fast-draw-standing-bb","1.5m プリコック ファストドロー スタンディングBB","5フィート(1.5m), 1発/1秒 x 7回。命中までの時間で採点、上位5発を合計。プリコック状態のハンドガンのみ使用可。要ホルスター。立射。銃に片手を置き、トリガーに指をかけない状態でスタート","",500,2,"speed_shooting",1,1,0,1,1,7,0
135,"wfda","5ft Cocked Fast Draw Standing BB","5 ft (1.5m), single shot in 1 sec x 7 strings. Scored by time to hit; best 5/7 total. Handguns only: semi-autos with safety off or revolvers hammer cocked. Standing with holster. Hand on the gun at start, finger outside the trigger guard.","/docs/competition-rules/5ft-fast-draw-standing-bb","1.5m コック済 ファストドロー スタンディングBB","5フィート(1.5m), 1発/1秒 x 7回。命中までの時間で採点、上位5発を合計。オートマティックはセーフティ解除、リボルバーはハンマーコック可。要ホルスター。立射。銃に片手を置き、トリガーに指をかけない状態でスタート","",500,2,"speed_shooting",1,1,0,1,1,7,0
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Nov 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

There appears to be an inconsistency in the type field. The rules with _id 120 and 125 were updated to type: 'wfda_jp', but this rule (_id: 135) was not, even though it received similar updates to rule 125. For consistency, should this rule's type also be wfda_jp? This might also apply to the related rule with _id 130.

135,"wfda_jp","5ft Cocked Fast Draw Standing BB","5 ft (1.5m), single shot in 1 sec x 7 strings. Scored by time to hit; best 5/7 total. Handguns only: semi-autos with safety off or revolvers hammer cocked. Standing with holster. Hand on the gun at start, finger outside the trigger guard.","/docs/competition-rules/5ft-fast-draw-standing-bb","1.5m コック済 ファストドロー スタンディングBB","5フィート(1.5m), 1発/1秒 x 7回。命中までの時間で採点、上位5発を合計。オートマティックはセーフティ解除、リボルバーはハンマーコック可。要ホルスター。立射。銃に片手を置き、トリガーに指をかけない状態でスタート","",500,2,"speed_shooting",1,1,0,1,1,7,0