Merge pull request #159 from GamerNoTitle/revert-157-dev

Revert merge: Substitute part has something wrong
GamerNoTitle · Jul 17, 2024 · d6c747b · d6c747b
2 parents fdf1e63 + 7342b1c
commit d6c747b
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 65 deletions.
diff --git a/db/data.db b/db/data.db
diff --git a/lang/en.yml b/lang/en.yml
@@ -54,18 +54,11 @@ metadata:
     # Available language: ar-AE / de-DE / en-US / es-ES / es-MX / fr-FR / id-ID / it-IT / ja-JP / ko-KR / pl-PL / pt-BR / ru-RU / th-TH / tr-TR / vi-VN / zh-CN / zh-TW
     # For China mainland players, all the names of the guns are using zh-TW, cause this program does not support Valorant from Tencent.
     # example: https://valorant-api.com/v1/weapons/skinlevels/a117218e-4f0e-0cca-7758-7ea30b08ac05?language=zh-CN
-    Voiceover: 
-      - Localized voice-over may differ in your region
-    KillEffect: 
-      - Every time you kill an enemy, a custom visual effect and sound plays
-    AttackerDefenderSwap: 
-      - The skin design changes if you are Attacker or Defender
-    TopFrag: 
-      - Aura is active only when player has the most kills in the game
-    Animation: 
-      - During Inspect animation, a custom music track plays for 30 seconds.
-    VFX:
-      - Press inspect twice quickly to trigger rainbow effect
+    Voiceover: Localized voice-over may differ in your region
+    KillEffect: Every time you kill an enemy, a custom visual effect and sound plays
+    AttackerDefenderSwap: The skin design changes if you are Attacker or Defender
+    TopFrag: Aura is active only when player has the most kills in the game
+    Animation: During Inspect animation, a custom music track plays for 30 seconds.
 
 global:
   title:

diff --git a/lang/ja-JP.yml b/lang/ja-JP.yml
@@ -54,18 +54,11 @@ metadata:
     # Available language: ar-AE / de-DE / en-US / es-ES / es-MX / fr-FR / id-ID / it-IT / ja-JP / ko-KR / pl-PL / pt-BR / ru-RU / th-TH / tr-TR / vi-VN / zh-CN / zh-TW
     # For China mainland players, all the names of the guns are using zh-TW, cause this program does not support Valorant from Tencent.
     # example: https://valorant-api.com/v1/weapons/skinlevels/a117218e-4f0e-0cca-7758-7ea30b08ac05?language=zh-CN
-    Voiceover: 
-      - ローカライズされた音声は、お住まいの地域によって異なる可能性があります
-    KillEffect: 
-      - 敵をキルするたびに、カスタムビジュアルエフェクトとオーディオが再生される
-    AttackerDefenderSwap: 
-      - アタック時とディフェンス時でスキンのデザインが変化
-    TopFrag: 
-      - オーラは試合中に最多キルを獲得している間のみ発動
-    Animation: 
-      - 武器を見る動作中、専用の楽曲が 30 秒再生される
-    VFX:
-      - 「武器を見る」を素早く2回押すとレインボーエフェクトが発動
+    Voiceover: ローカライズされた音声は、お住まいの地域によって異なる可能性があります
+    KillEffect: 敵をキルするたびに、カスタムビジュアルエフェクトとオーディオが再生される
+    AttackerDefenderSwap: アタック時とディフェンス時でスキンのデザインが変化
+    TopFrag: オーラは試合中に最多キルを獲得している間のみ発動
+    Animation: 武器を見る動作中、専用の楽曲が 30 秒再生される
 
 global:
   title:

diff --git a/lang/zh-CN.yml b/lang/zh-CN.yml
@@ -57,18 +57,11 @@ metadata:
     # Available language: ar-AE / de-DE / en-US / es-ES / es-MX / fr-FR / id-ID / it-IT / ja-JP / ko-KR / pl-PL / pt-BR / ru-RU / th-TH / tr-TR / vi-VN / zh-CN / zh-TW
     # For China mainland players, all the names of the guns are using zh-TW, cause this program does not support Valorant from Tencent.
     # example: https://valorant-api.com/v1/weapons/skinlevels/a117218e-4f0e-0cca-7758-7ea30b08ac05?language=zh-CN
-    Voiceover: 
-      - 在地化語音可能會因地區而異
-    KillEffect: 
-      - 每次擊殺敵人時，都會播放專屬視覺特效及音效
-    AttackerDefenderSwap: 
-      - 此造型設計會因你是攻擊方或守備方而變化
-    TopFrag: 
-      - 在對戰中取得最多擊殺時才會顯示光環
-    Animation: 
-      - 查看武器動畫期間，會播放30秒的自訂配樂
-    VFX:
-      - 快速按兩下查看以觸發彩虹效果
+    Voiceover: 在地化語音可能會因地區而異
+    KillEffect: 每次擊殺敵人時，都會播放專屬視覺特效及音效
+    AttackerDefenderSwap: 此造型設計會因你是攻擊方或守備方而變化
+    TopFrag: 在對戰中取得最多擊殺時才會顯示光環
+    Animation: 查看武器動畫期間，會播放一段30秒的專屬配樂
 
 global:
   title:

diff --git a/lang/zh-TW.yml b/lang/zh-TW.yml
@@ -54,18 +54,11 @@ metadata:
     # Available language: ar-AE / de-DE / en-US / es-ES / es-MX / fr-FR / id-ID / it-IT / ja-JP / ko-KR / pl-PL / pt-BR / ru-RU / th-TH / tr-TR / vi-VN / zh-CN / zh-TW
     # For China mainland players, all the names of the guns are using zh-TW, cause this program does not support Valorant from Tencent.
     # example: https://valorant-api.com/v1/weapons/skinlevels/a117218e-4f0e-0cca-7758-7ea30b08ac05?language=zh-CN
-    Voiceover: 
-      - 在地化語音可能會因地區而異
-    KillEffect: 
-      - 每次擊殺敵人時，都會播放專屬視覺特效及音效
-    AttackerDefenderSwap: 
-      - 此造型設計會因你是攻擊方或守備方而變化
-    TopFrag: 
-      - 在對戰中取得最多擊殺時才會顯示光環
-    Animation: 
-      - 查看武器動畫期間，會播放30秒的自訂配樂
-    VFX:
-      - 快速按兩下查看以觸發彩虹效果
+    Voiceover: 在地化語音可能會因地區而異
+    KillEffect: 每次擊殺敵人時，都會播放專屬視覺特效及音效
+    AttackerDefenderSwap: 此造型設計會因你是攻擊方或守備方而變化
+    TopFrag: 在對戰中取得最多擊殺時才會顯示光環
+    Animation: 查看武器動畫期間，會播放一段30秒的專屬配樂
 
 global:
   title:

diff --git a/templates/inventory.html b/templates/inventory.html
@@ -125,8 +125,6 @@ <h5 class="modal-title"><img src={{weapon.tier}} height="28px" width="28px"> {{w
                     <video width=100% controls>
                       <source src="{{level.streamedVideo|replace('valorant.dyn.riotcdn.net', 'cdn.val.qq.com')}}"
                         type="video/mp4">
-                        <source src="{{level.streamedVideo|replace('valorant.dyn.riotcdn.net', 'val.cdn.bili33.top')}}"
-                        type="video/mp4">
                       <source src="{{level.streamedVideo}}" type="video/mp4">
                       {{lang.inventory.modal.videonotavaliable}}
                     </video>

diff --git a/templates/library.html b/templates/library.html
@@ -114,8 +114,6 @@ <h5 class="modal-title"><img src={{weapon.tier}} height="28px" width="28px"> {{w
                       <video width=100% controls>
                         <source src="{{level.streamedVideo|replace('valorant.dyn.riotcdn.net', 'cdn.val.qq.com')}}"
                           type="video/mp4">
-                        <source src="{{level.streamedVideo|replace('valorant.dyn.riotcdn.net', 'val.cdn.bili33.top')}}"
-                          type="video/mp4">
                         <source src="{{level.streamedVideo}}" type="video/mp4">
                         {{lang.library.modal.videonotavaliable}}
                       </video>

diff --git a/templates/myMarket.html b/templates/myMarket.html
@@ -85,8 +85,6 @@ <h5 class="modal-title"><img src={{weapon.tier}} height="28px" width="28px"> {{w
                     <video id="{{level.streamedVideo}}" width=100% controls>
                       <source src="{{level.streamedVideo|replace('valorant.dyn.riotcdn.net', 'cdn.val.qq.com')}}"
                         type="video/mp4">
-                        <source src="{{level.streamedVideo|replace('valorant.dyn.riotcdn.net', 'val.cdn.bili33.top')}}"
-                        type="video/mp4">
                       <source src="{{level.streamedVideo}}" type="video/mp4">
                       {{lang.market.modal.videonotavaliable}}
                     </video>
@@ -206,8 +204,6 @@ <h5 class="modal-title"><img src={{weapon.tier}} height="28px" width="28px"> {{w
                     <video id="{{level.streamedVideo}}" width=100% controls>
                       <source src="{{level.streamedVideo|replace('valorant.dyn.riotcdn.net', 'cdn.val.qq.com')}}"
                         type="video/mp4">
-                        <source src="{{level.streamedVideo|replace('valorant.dyn.riotcdn.net', 'cdn.val.bili33.top')}}"
-                        type="video/mp4">
                       <source src="{{level.streamedVideo}}" type="video/mp4">
                       {{lang.nightmarket.modal.videonotavaliable}}
                     </video>

diff --git a/utils/Register.py b/utils/Register.py
@@ -254,9 +254,8 @@ def library(app: Flask, request: Request, lang):
                     level['displayName'] = level['displayName'].replace(name, '').replace('\n', '').replace(
                         '（', '').replace('）', '').replace(' / ', '').replace('／', '/').replace('(', '').replace(')', '').replace('：', '').replace(' - ', '').replace('。', '')
                     for descr in dict(description_to_del).values():
-                        for subdescr in descr:
-                            level['displayName'] = level['displayName'].replace(
-                                subdescr, '')
+                        level['displayName'] = level['displayName'].replace(
+                            descr, '')
                     try:
                         if level['levelItem'] == None:
                             level['levelItem'] = levelup_info['EEquippableSkinLevelItem::VFX']
@@ -280,6 +279,7 @@ def library(app: Flask, request: Request, lang):
                             levelup_info['level'] + ' 5', '')   # Clear out extra level symbols
                 weapon_list.append(
                     {"name": name, "img": base_img, "levels": levels, "chromas": chromas, "unlock": unlock, "tier": tier_img})
+            print(json.dumps(weapon_list))
             return render_template('library.html', weapon_list=weapon_list,
                                    lang=yaml.load(transtable, Loader=yaml.FullLoader),
                                    search=True, query=request.form.get('query'), pc=pc)
@@ -457,9 +457,8 @@ def inventory(app: Flask, request: Request, lang):
                 level['displayName'] = level['displayName'].replace(name, '').replace('\n', '').replace(
                     '（', '').replace('）', '').replace(' / ', '').replace('／', '/').replace('(', '').replace(')', '').replace('：', '').replace(' - ', '').replace('。', '')
                 for descr in dict(description_to_del).values():
-                    for subdescr in descr:
-                        level['displayName'] = level['displayName'].replace(
-                            subdescr, '')
+                    level['displayName'] = level['displayName'].replace(
+                        descr, '')
                 try:
                     if level['levelItem'] == None:
                         level['levelItem'] = levelup_info['EEquippableSkinLevelItem::VFX']

diff --git a/utils/Weapon.py b/utils/Weapon.py
@@ -124,9 +124,7 @@ def __init__(self, uuid: str, name: str, cost: int = 0, discount: int = 0, disco
             level['displayName'] = level['displayName'].replace(self.name, '').replace('\n', '').replace(
                 '（', '').replace('）', '').replace(' / ', '').replace('／', '/').replace('(', '').replace(')', '').replace('：', '').replace(' - ', '').replace('。', '')
             for descr in dict(description_to_del).values():
-                for subdescr in descr:
-                    level['displayName'] = level['displayName'].replace(
-                        subdescr, '')
+                level['displayName'] = level['displayName'].replace(descr, '')
             try:
                 if level['levelItem'] == None:
                     level['levelItem'] = levelup_info['EEquippableSkinLevelItem::VFX']