From 1d87f6b16aec8f5bdab36fc93f0fc17e4e3e5ed3 Mon Sep 17 00:00:00 2001 From: LingASDJ <2735951230@qq.com> Date: Sat, 19 Aug 2023 00:51:15 +0800 Subject: [PATCH] update firegirl --- .../main/assets/sprites/boss/FireWitch.png | Bin 0 -> 6329 bytes .../shatteredpixeldungeon/Assets.java | 3 ++ .../shatteredpixeldungeon/Conducts.java | 16 +++------ .../sprites/FireWitchGirlSprites.java | 31 ++++++++++++++++++ 4 files changed, 38 insertions(+), 12 deletions(-) create mode 100644 core/src/main/assets/sprites/boss/FireWitch.png create mode 100644 core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/FireWitchGirlSprites.java diff --git a/core/src/main/assets/sprites/boss/FireWitch.png b/core/src/main/assets/sprites/boss/FireWitch.png new file mode 100644 index 0000000000000000000000000000000000000000..6de62bbc7df38db6238372fc5254a80fa10e8e09 GIT binary patch literal 6329 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 literal 0 HcmV?d00001 diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Assets.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Assets.java index 1ef568561..5532d20c9 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Assets.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Assets.java @@ -317,8 +317,11 @@ public class Assets { public static final String DICT = "sprites/boss/DictFish.png"; public static final String ROOMSTONE = "sprites/boss/RoomStone.png"; + public static final String VSGR = "sprites/boss/SeaVastGirl.png"; + public static final String FSGR = "sprites/boss/FireWitch.png"; + public static final String SXGR = "sprites/boss/IceSlowGirl.png"; public static final String SKFS = "sprites/boss/SakaFishBoss.png"; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Conducts.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Conducts.java index c70d933e4..6ce976ee2 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Conducts.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Conducts.java @@ -10,18 +10,10 @@ import java.util.Arrays; public class Conducts { public enum Conduct { NULL, - BOSSRUSH(1.2f), - MONEYLETGO(1.5f); - - public float scoreMod; - - Conduct(){ - scoreMod = 1f; - } - - Conduct(float scoreMod){ - this.scoreMod = scoreMod; - } + BOSSRUSH, + MONEYLETGO; + /**深海副本*/ + //SEADLC @Override public String toString() { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/FireWitchGirlSprites.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/FireWitchGirlSprites.java new file mode 100644 index 000000000..953a9e471 --- /dev/null +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/FireWitchGirlSprites.java @@ -0,0 +1,31 @@ +package com.shatteredpixel.shatteredpixeldungeon.sprites; + +import com.shatteredpixel.shatteredpixeldungeon.Assets; +import com.watabou.noosa.TextureFilm; + +public class FireWitchGirlSprites extends MobSprite { + + public FireWitchGirlSprites() { + super(); + + texture( Assets.Sprites.FSGR ); + + TextureFilm frames = new TextureFilm( texture, 24, 24 ); + + idle = new Animation( 2, true ); + idle.frames( frames, 0, 0, 0, 1,1,1 ); + + run = new Animation( 8, true ); + run.frames( frames, 2,3, 4, 5 ); + + attack = new Animation( 15, false ); + attack.frames( frames, 6,7, 8,0 ); + + die = new Animation( 7, false ); + die.frames( frames, 9,10,11); + + play( idle ); + } + +} +