From 31800a915ecd60b605b16f54b0addf9f593c90ae Mon Sep 17 00:00:00 2001
From: LingASDJ <2735951230@qq.com>
Date: Tue, 16 May 2023 08:52:39 +0800
Subject: [PATCH] Fixed Question

---
 core/src/main/assets/interfaces/toolbar.png   | Bin 4219 -> 3516 bytes
 .../items/weapon/melee/BloodthirstyThorn.java |  39 +++---------------
 .../scenes/GameNewsScene.java                 |  23 ++++++++++-
 3 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/core/src/main/assets/interfaces/toolbar.png b/core/src/main/assets/interfaces/toolbar.png
index ac849eada029fa7d88cf7b8e1948d9c52b4e4436..1fb89beb94e8a60923cbad77ead0cb6bbcc4c6b3 100644
GIT binary patch
literal 3516
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

literal 4219
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
D*L(zL

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/BloodthirstyThorn.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/BloodthirstyThorn.java
index 09f2192d0..e68049b1c 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/BloodthirstyThorn.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/BloodthirstyThorn.java
@@ -27,7 +27,6 @@ import com.shatteredpixel.shatteredpixeldungeon.windows.WndMessage;
 import com.shatteredpixel.shatteredpixeldungeon.windows.WndOptions;
 import com.watabou.noosa.Game;
 import com.watabou.noosa.audio.Sample;
-import com.watabou.utils.Bundle;
 import com.watabou.utils.Random;
 
 import java.util.ArrayList;
@@ -190,7 +189,11 @@ public class BloodthirstyThorn extends MeleeWeapon {
             }
 
             //返回圣杯一致的等级
-            bloodthirstyThorn.level=chaliceOfBlood.level();
+            if(chaliceOfBlood!=null){
+                bloodthirstyThorn.level=chaliceOfBlood.level();
+            } else {
+                bloodthirstyThorn.level=Random.NormalIntRange(3,6);
+            }
 
             bloodthirstyThorn.quantity(1).identify();
 
@@ -272,37 +275,7 @@ public class BloodthirstyThorn extends MeleeWeapon {
 
     }
 
-    //动态改变图标1
-    @Override
-    public void restoreFromBundle(Bundle bundle) {
-        super.restoreFromBundle(bundle);
-        super.image = ItemSpriteSheet.BloodDir;
-        if (level() >= 5) {
-            super.image = ItemSpriteSheet.BloodDied;
-            //在载入存档更新图标的同时更新攻击范围
-            RCH=2;
-            ACC = 1.95f;
-        } else {
-            super.image = ItemSpriteSheet.BloodDir;
-        }
-    }
-
-    //动态改变图标2
-    @Override
-    public void storeInBundle(Bundle bundle) {
-        super.storeInBundle(bundle);
-        super.image = ItemSpriteSheet.BloodDir;
-        if (level() >= 5) {
-            //在保存存档更新图标的同时更新攻击范围
-            super.image = ItemSpriteSheet.BloodDied;
-            RCH=2;
-            ACC = 1.95f;
-        } else {
-            super.image = ItemSpriteSheet.BloodDir;
-        }
-    }
-
-    //动态改变图标3
+    //动态改变图标与范围
     @Override
     public int image() {
         super.image = ItemSpriteSheet.BloodDir;
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameNewsScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameNewsScene.java
index a56689c39..47b42113e 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameNewsScene.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameNewsScene.java
@@ -274,11 +274,30 @@ public class GameNewsScene extends PixelScene {  //定义GameNewsScene类，继
                             if (index == 0) {
                                 // 如果是桌面版就打开桌面版的下载链接，否则打开安卓版的下载链接
                                 if (DeviceCompat.isDesktop()) {
-                                    ShatteredPixelDungeon.platform.openURI(article.DesktopURL);
+                                    ShatteredPixelDungeon.scene().add(new WndOptions(Icons.get(Icons.CHANGES),
+                                            article.title,
+                                            article.summary,
+                                            "JAR版下载","NoJVM-版本下载") {
+                                        @Override
+                                        protected void onSelect(int index) {
+                                            if (index == 0) {
+                                                ShatteredPixelDungeon.platform.openURI(article.DesktopURL);
+                                            } else {
+                                                ShatteredPixelDungeon.platform.openURI("https://lingasdj.lanzouo.com/b05rqansf");
+                                            }
+                                            Gdx.app.exit();
+                                        }
+
+                                        @Override
+                                        public void onBackPressed() {
+                                            //
+                                        }
+                                    });
                                 } else {
                                     ShatteredPixelDungeon.platform.openURI(article.URL);
+                                    Gdx.app.exit();
                                 }
-                                Gdx.app.exit();
+
                             }
                         }