From 942b636b3ebddd8f50be952158dc0867d00adf39 Mon Sep 17 00:00:00 2001 From: Midorica Date: Mon, 18 Mar 2024 22:33:39 -0400 Subject: [PATCH] cxb: fixing rev s1 support --- changelog.md | 4 +++ titles/cxb/data/rss1/Shop/ShopList_Sale.csv | 3 -- titles/cxb/data/rss1/Shop/ShopList_SkinBg.csv | 4 --- .../data/rss1/Shop/ShopList_SkinEffect.csv | 11 ------ .../cxb/data/rss1/Shop/ShopList_SkinNotes.csv | 6 ---- titles/cxb/rss1.py | 36 ------------------- 6 files changed, 4 insertions(+), 60 deletions(-) delete mode 100644 titles/cxb/data/rss1/Shop/ShopList_Sale.csv delete mode 100644 titles/cxb/data/rss1/Shop/ShopList_SkinBg.csv delete mode 100644 titles/cxb/data/rss1/Shop/ShopList_SkinEffect.csv delete mode 100644 titles/cxb/data/rss1/Shop/ShopList_SkinNotes.csv diff --git a/changelog.md b/changelog.md index 3aa0559..437a3b2 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,10 @@ # Changelog Documenting updates to ARTEMiS, to be updated every time the master branch is pushed to. +## 20240318 +### CXB ++ Fixing handle_data_shop_list_detail_request for Sunrise S1 + ## 20240302 ### SAO + Fixing new profile creation with right heroes and start VP diff --git a/titles/cxb/data/rss1/Shop/ShopList_Sale.csv b/titles/cxb/data/rss1/Shop/ShopList_Sale.csv deleted file mode 100644 index 5e9fb72..0000000 --- a/titles/cxb/data/rss1/Shop/ShopList_Sale.csv +++ /dev/null @@ -1,3 +0,0 @@ -saleID.,�J�n��,�I����,ShopID,Price, -0,1411696799,1443236400,0,7000, -1,1411783199,1443322800,1,7000, diff --git a/titles/cxb/data/rss1/Shop/ShopList_SkinBg.csv b/titles/cxb/data/rss1/Shop/ShopList_SkinBg.csv deleted file mode 100644 index 44c4843..0000000 --- a/titles/cxb/data/rss1/Shop/ShopList_SkinBg.csv +++ /dev/null @@ -1,4 +0,0 @@ -shopID.,pNo.,Ver.,otO,otOQID,,o,Ŏ,ItemCode,i,\^Cv,Text,Type,Value(op),Value,Ώۋ,Difficulty(op),Difficulty,Level(op),Level,Grade(Op),Grade,GaugeType(op),GaugeType,HS(op)i,HS,APP,DAP,F-V,F-H,FullCombo,Combo(op),Combo,ClearRate(op),ClearRate,vC,n, -3000,1,1.00.00,1,-1,-,1411697520.0288,1443233520.0288,skb0000,10,1,MASTERȏ2S+ȏtR{NAB,1,1,1,-,1,2,-1,-1,1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,,, -3001,2,1.00.00,1,-1,-,1411697520.0288,1443233520.0288,skb0001,10,1,Next Frontier (MasterjNA,0,-1,-1,bleeze,1,2,-1,-1,1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,,, -3002,3,1.00.00,1,-1,-,1412103600.0288,1443639598.992,skb0002,10,2,Masterȏ1ȂS+ȏŃNAB,1,1,1,-,1,2,-1,-1,1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,,1, diff --git a/titles/cxb/data/rss1/Shop/ShopList_SkinEffect.csv b/titles/cxb/data/rss1/Shop/ShopList_SkinEffect.csv deleted file mode 100644 index bb6486e..0000000 --- a/titles/cxb/data/rss1/Shop/ShopList_SkinEffect.csv +++ /dev/null @@ -1,11 +0,0 @@ -shopID.,�����pNo.,Ver.,�o���t���O,�o���t���O�Q��ID,����,�o������,���Ŏ���,ItemCode,���i,�\���^�C�v,Text,Type,Value(op),Value,�Ώۋ�,Difficulty(op),Difficulty,Level(op),Level,Grade(Op),Grade,GaugeType(op),GaugeType,HS(op)i,HS,APP,DAP,F-V,F-H,FullCombo,Combo(op),Combo,ClearRate(op),ClearRate,�v���C��,�n��, -5000,1,10000,1,-1,-,1411697520,1443233520,ske0000,10,1,MASTER�ȏ��2��S+�ȏ�t���R���{�N���A����B,1,1,1,-,1,2,-1,-1,1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,,, -5001,2,10000,1,-1,-,1411697520,1443233520,ske0001,10,1,Next Frontier (Master�j���N���A,0,-1,-1,megaro,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,,, -5002,3,10000,1,-1,-,1412103600,1443639598,ske0002,10,2,Master�ȏ��1�Ȃ�S+�ȏ�ŃN���A����B,1,1,1,-,1,2,-1,-1,1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,,1, -5003,4,10000,1,-1,-,1412103600,1443639598,ske0003,10,0,Master�ȏ��1�Ȃ�S+�ȏ�ŃN���A����B,1,1,1,-,1,2,-1,-1,1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,,, -5004,5,10000,1,-1,-,1412103600,1443639598,ske0004,10,2,2�ȃN���A,1,1,2,-,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,,, -5005,5,10000,1,-1,-,1412103600,1443639598,ske0005,10,2,3�ȃN���A,1,1,3,-,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,,, -5006,5,10000,1,-1,-,1412103600,1443639598,ske0006,10,2,4�ȃN���A,1,1,4,-,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,,, -5007,5,10000,1,-1,-,1412103600,1443639598,ske0007,10,2,5�ȃN���A,1,1,5,-,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,,, -5008,5,10000,1,-1,-,1412103600,1443639598,ske0008,10,2,6�ȃN���A,1,1,6,-,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,,, -5009,5,10000,1,-1,-,1412103600,1443639598,ske0009,10,2,7�ȃN���A,1,1,7,-,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,,, diff --git a/titles/cxb/data/rss1/Shop/ShopList_SkinNotes.csv b/titles/cxb/data/rss1/Shop/ShopList_SkinNotes.csv deleted file mode 100644 index 0b496f2..0000000 --- a/titles/cxb/data/rss1/Shop/ShopList_SkinNotes.csv +++ /dev/null @@ -1,6 +0,0 @@ -shopID.,�����pNo.,Ver.,�o���t���O,�o���t���O�Q��ID,����,�o������,���Ŏ���,ItemCode,���i,�\���^�C�v,Text,Type,Value(op),Value,�Ώۋ�,Difficulty(op),Difficulty,Level(op),Level,Grade(Op),Grade,GaugeType(op),GaugeType,HS(op)i,HS,APP,DAP,F-V,F-H,FullCombo,Combo(op),Combo,ClearRate(op),ClearRate,�v���C��,�n��, -4000,1,10000,1,-1,-,1411697520,4096483201,skt0000,10,1,MASTER�ȏ��2��S+�ȏ�t���R���{�N���A����B,1,1,1,-,1,2,-1,-1,1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,,, -4001,2,10000,1,-1,-,1411697520,4096483201,skt0001,10,1,Next Frontier (Master�j���N���A,0,-1,-1,megaro,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,,, -4002,3,10000,1,-1,-,1412103600,4096483201,skt0002,10,2,Master�ȏ��1�Ȃ�S+�ȏ�ŃN���A����B,1,1,1,-,1,2,-1,-1,1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,,1, -4003,4,10000,1,-1,-,1412103600,4096483201,skt0003,10,0,Master�ȏ��1�Ȃ�S+�ȏ�ŃN���A����B,1,1,1,-,1,2,-1,-1,1,1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,,, -4004,5,10000,1,-1,-,1412103600,4096483201,skt0004,10,2,aaaaaaaaaaaaaaaaa,1,1,20,-,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,,, diff --git a/titles/cxb/rss1.py b/titles/cxb/rss1.py index cce0315..4999cc5 100644 --- a/titles/cxb/rss1.py +++ b/titles/cxb/rss1.py @@ -73,42 +73,6 @@ class CxbRevSunriseS1(CxbBase): for line in lines: ret_str += f"{line[:-1]}\r\n" - # ShopListSale load - ret_str += "\r\n#ShopListSale\r\n" - with open( - r"titles/cxb/data/rss1/Shop/ShopList_Sale.csv", encoding="shift-jis" - ) as shop: - lines = shop.readlines() - for line in lines: - ret_str += f"{line[:-1]}\r\n" - - # ShopListSkinBg load - ret_str += "\r\n#ShopListSkinBg\r\n" - with open( - r"titles/cxb/data/rss1/Shop/ShopList_SkinBg.csv", encoding="shift-jis" - ) as shop: - lines = shop.readlines() - for line in lines: - ret_str += f"{line[:-1]}\r\n" - - # ShopListSkinEffect load - ret_str += "\r\n#ShopListSkinEffect\r\n" - with open( - r"titles/cxb/data/rss1/Shop/ShopList_SkinEffect.csv", encoding="shift-jis" - ) as shop: - lines = shop.readlines() - for line in lines: - ret_str += f"{line[:-1]}\r\n" - - # ShopListSkinNotes load - ret_str += "\r\n#ShopListSkinNotes\r\n" - with open( - r"titles/cxb/data/rss1/Shop/ShopList_SkinNotes.csv", encoding="shift-jis" - ) as shop: - lines = shop.readlines() - for line in lines: - ret_str += f"{line[:-1]}\r\n" - # ShopListTitle load ret_str += "\r\n#ShopListTitle\r\n" with open(