Skip to content

Commit

Permalink
0.9.5-BP-Halloween Wave
Browse files Browse the repository at this point in the history 
as name
  • Loading branch information
@hmdzl001
hmdzl001 committed Oct 24, 2020
1 parent adb9796 commit 9916150
Show file tree
Hide file tree
Showing 49 changed files with 881 additions and 116 deletions.
Binary file modified assets/items.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/oldpetreddragon.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/performer.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/petreddragon.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/soldier.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/warrior.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion java/com/hmdzl/spspd/Dungeon.java
View file
Expand Up @@ -900,7 +900,7 @@ public static Level newLevel() {
level.create();

Statistics.qualifiedForNoKilling = !bossLevel();
if (depth<26 && depth!=21 && !Dungeon.bossLevel(depth) && (Dungeon.dewDraw || Dungeon.dewWater)){
if (depth<26 && !Dungeon.bossLevel(depth) && (Dungeon.dewDraw || Dungeon.dewWater)){
Buff.prolong(Dungeon.hero, Dewcharge.class, Dewcharge.DURATION+(Math.max(Statistics.prevfloormoves,1)));
//GLog.p("You feel the dungeon charge with dew!");
}
Expand Down
2 changes: 1 addition & 1 deletion java/com/hmdzl/spspd/actors/buffs/Barkskin.java
View file
Expand Up @@ -44,7 +44,7 @@ public boolean act() {
if (target.isAlive()) {

spend(TICK);
barkleft = (int)barkleft/2;
barkleft = barkleft-1;
if (barkleft <= 1) {
detach();
}
Expand Down
65 changes: 63 additions & 2 deletions java/com/hmdzl/spspd/actors/hero/Hero.java
View file
Expand Up @@ -71,6 +71,7 @@
import com.hmdzl.spspd.items.DolyaSlate;
import com.hmdzl.spspd.items.Generator;
import com.hmdzl.spspd.items.KindOfArmor;
import com.hmdzl.spspd.items.KindofMisc;
import com.hmdzl.spspd.items.armor.glyphs.Iceglyph;
import com.hmdzl.spspd.items.artifacts.AlienBag;
import com.hmdzl.spspd.items.artifacts.EtherealChains;
Expand All @@ -87,6 +88,7 @@
import com.hmdzl.spspd.items.misc.JumpF;
import com.hmdzl.spspd.items.misc.JumpP;
import com.hmdzl.spspd.items.misc.JumpS;
import com.hmdzl.spspd.items.misc.LeaderFlag;
import com.hmdzl.spspd.items.misc.PotionOfMage;
import com.hmdzl.spspd.items.misc.RangeBag;
import com.hmdzl.spspd.items.misc.SavageHelmet;
Expand Down Expand Up @@ -694,7 +696,17 @@ public boolean act() {
spendAndNext(TICK);
return false;
}


if( Statistics.time == 1 & Dungeon.hero.heroClass == HeroClass.PERFORMER & Dungeon.skins == 4){
int people = Dungeon.hero.spp;
Dungeon.gold = Math.max(0, Dungeon.gold - people);
}

LeaderFlag lflag = belongings.getItem(LeaderFlag.class);
if (Statistics.time == 1){
lflag.charge = 1440;
}

Egg egg = belongings.getItem(Egg.class);
if (egg!=null){
egg.moves++;
Expand Down Expand Up @@ -1441,6 +1453,13 @@ public int attackProc(Char enemy, int damage) {
Buff.affect(enemy, DBurning.class).reignite(enemy);
}
break;
case PERFORMER:
if (Dungeon.skins == 4) {
int people = Dungeon.hero.spp - Dungeon.hero.lvl;
if (people > 0 )
damage = damage + people;
}
break;
case FOLLOWER:
if (Dungeon.skins==4) {
Dungeon.hero.spp = Random.Int(100);
Expand Down Expand Up @@ -1640,7 +1659,7 @@ public int defenseProc(Char enemy, int damage) {
Dungeon.gold -= x;
Dungeon.hero.spp +=x;
if ( x > 0);
damage = (int)(damage*0.3);}
damage = (int)(damage*0.7);}
}
switch (subClass) {
case LEADER:
Expand Down Expand Up @@ -1760,6 +1779,13 @@ public void damage(int dmg, Object src) {
dmg = Math.max(1,HT / 2);
}
}

if (heroClass == HeroClass.PERFORMER && Dungeon.skins == 4) {
int people = Dungeon.hero.spp - Dungeon.hero.lvl;
if (people > 0 )
dmg = (int) Math.ceil(dmg * (1+ (people*0.01)));
}

//if (buff(Hot.class) != null){dmg = (int) Math.ceil(dmg * 1.20);}

/*DefenceUp drup = buff(DefenceUp.class);
Expand Down Expand Up @@ -2045,6 +2071,41 @@ public void earnExp(int exp) {
if (heroClass == HeroClass.SOLDIER){
HT+=3;
}

if (heroClass == HeroClass.WARRIOR && Dungeon.skins == 4){
Hero hero = Dungeon.hero;
KindOfWeapon weapon = hero.belongings.weapon;
KindOfArmor armor = hero.belongings.armor;
KindofMisc misc1 = hero.belongings.misc1;
KindofMisc misc2 = hero.belongings.misc2;
KindofMisc misc3 = hero.belongings.misc3;
if (weapon != null && weapon.level >= 0 ) {
Dungeon.hero.spp += weapon.level+1;
hero.belongings.weapon = null;
weapon.updateQuickslot();
} else if ( armor != null && armor.level >= 0 ) {
Dungeon.hero.spp += armor.level+1;
hero.belongings.armor = null;
} else if ( misc1 != null && misc1.unique == false ) {
Dungeon.hero.spp += misc1.level+1;
hero.belongings.misc1 = null;
} else if ( misc2 != null && misc2.unique == false ) {
Dungeon.hero.spp += misc2.level+1;
hero.belongings.misc2 = null;
} else if ( misc3 != null && misc3.unique == false ) {
Dungeon.hero.spp += misc3.level+1;
hero.belongings.misc3 = null;
} else {
Dungeon.gold = 0;
}

}

if (heroClass == HeroClass.PERFORMER && Dungeon.skins == 4){
Dungeon.hero.spp += lvl;
}


if (buff(HopeMind.class) != null){
HT+=1;
}
Expand Down
53 changes: 50 additions & 3 deletions java/com/hmdzl/spspd/actors/hero/HeroClass.java
View file
Expand Up @@ -42,6 +42,7 @@
import com.hmdzl.spspd.items.armor.normalarmor.LifeArmor;
import com.hmdzl.spspd.items.armor.normalarmor.NormalArmor;
import com.hmdzl.spspd.items.armor.normalarmor.RubberArmor;
import com.hmdzl.spspd.items.armor.normalarmor.StyrofoamArmor;
import com.hmdzl.spspd.items.artifacts.AlienBag;
import com.hmdzl.spspd.items.artifacts.Artifact;
import com.hmdzl.spspd.items.artifacts.EtherealChains;
Expand All @@ -60,6 +61,13 @@
import com.hmdzl.spspd.items.challengelists.PrisonChallenge;
import com.hmdzl.spspd.items.challengelists.SewerChallenge;
import com.hmdzl.spspd.items.challengelists.WisdomChallenge;
import com.hmdzl.spspd.items.eggs.BlueDragonEgg;
import com.hmdzl.spspd.items.eggs.GoldDragonEgg;
import com.hmdzl.spspd.items.eggs.GreenDragonEgg;
import com.hmdzl.spspd.items.eggs.LightDragonEgg;
import com.hmdzl.spspd.items.eggs.RedDragonEgg;
import com.hmdzl.spspd.items.eggs.ShadowDragonEgg;
import com.hmdzl.spspd.items.eggs.VioletDragonEgg;
import com.hmdzl.spspd.items.journalpages.Vault;
import com.hmdzl.spspd.items.medicine.Hardpill;
import com.hmdzl.spspd.items.medicine.Powerpill;
Expand All @@ -76,12 +84,14 @@
import com.hmdzl.spspd.items.misc.HealBag;
import com.hmdzl.spspd.items.misc.HorseTotem;
import com.hmdzl.spspd.items.misc.JumpF;
import com.hmdzl.spspd.items.misc.LeaderFlag;
import com.hmdzl.spspd.items.misc.MKbox;
import com.hmdzl.spspd.items.misc.MechPocket;
import com.hmdzl.spspd.items.misc.NeedPaper;
import com.hmdzl.spspd.items.misc.NmHealBag;
import com.hmdzl.spspd.items.misc.PPC;
import com.hmdzl.spspd.items.misc.RangeBag;
import com.hmdzl.spspd.items.misc.RewardPaper;
import com.hmdzl.spspd.items.misc.SavageHelmet;
import com.hmdzl.spspd.items.misc.UndeadBook;
import com.hmdzl.spspd.items.nornstone.BlueNornStone;
Expand Down Expand Up @@ -146,11 +156,13 @@
import com.hmdzl.spspd.items.wands.WandOfPoison;
import com.hmdzl.spspd.items.weapon.Weapon;
import com.hmdzl.spspd.items.weapon.guns.GunA;
import com.hmdzl.spspd.items.weapon.guns.GunB;
import com.hmdzl.spspd.items.weapon.guns.GunC;
import com.hmdzl.spspd.items.weapon.guns.Sling;
import com.hmdzl.spspd.items.weapon.melee.Dagger;
import com.hmdzl.spspd.items.weapon.melee.Glaive;
import com.hmdzl.spspd.items.weapon.melee.Knuckles;
import com.hmdzl.spspd.items.weapon.melee.Mace;
import com.hmdzl.spspd.items.weapon.melee.Rapier;
import com.hmdzl.spspd.items.weapon.melee.ShortSword;
import com.hmdzl.spspd.items.weapon.melee.MageBook;
Expand Down Expand Up @@ -361,6 +373,15 @@ private static void initCommon(Hero hero) {
new ShadowEater().collect();
new TestWeapon().upgrade(90).collect();

new GoldDragonEgg().collect();
new VioletDragonEgg().collect();
new ShadowDragonEgg().collect();
new LightDragonEgg().collect();
new GreenDragonEgg().collect();
new RedDragonEgg().collect();
new BlueDragonEgg().collect();
new PocketBall(10).collect();

for(int i=0; i<199; i++){
new ScrollOfMagicalInfusion().identify().collect();
new ScrollOfUpgrade().identify().collect();
Expand All @@ -381,11 +402,11 @@ private static void initCommon(Hero hero) {
new Seedpod.Seed().collect();
new ScrollOfRegrowth().collect();
}
new WandOfFlock().upgrade(10).identify().collect();
new WandOfPoison().upgrade(10).identify().collect();
//new WandOfFlock().upgrade(10).identify().collect();
//new WandOfPoison().upgrade(10).identify().collect();
new SewerReward().collect();
new SaveYourLife().collect();
new FireCracker().collect();
//new FireCracker().collect();

Dungeon.gold = 10000;
//Dungeon.gold = 10000000;
Expand Down Expand Up @@ -460,6 +481,23 @@ private static void initWarrior(Hero hero) {
Dungeon.limitedDrops.strengthPotions.count+=2;

} else if (Dungeon.skins == 4) {
hero.STR += 3;
Dungeon.limitedDrops.strengthPotions.count+=3;

(hero.belongings.weapon = new GunB()).identify();
(hero.belongings.armor = new StyrofoamArmor()).identify();

new TestWeapon().identify().collect();
new TestWeapon().identify().collect();
new TestWeapon().identify().collect();
new TestWeapon().identify().collect();

new RewardPaper().identify().collect();

new JumpW().collect();




} else if (Dungeon.skins == 5) {

Expand Down Expand Up @@ -686,7 +724,16 @@ private static void initPerformer(Hero hero) {

} else if (Dungeon.skins == 4) {

hero.STR += 2;
Dungeon.limitedDrops.strengthPotions.count+=2;

(hero.belongings.weapon = new Mace()).identify();
(hero.belongings.armor = new LeatherArmor()).identify();

new LeaderFlag().collect();
new JumpP().collect();

Dungeon.gold += 1000;

} else if (Dungeon.skins == 5) {

Expand Down
2 changes: 1 addition & 1 deletion java/com/hmdzl/spspd/actors/mobs/ManySkeleton.java
View file
Expand Up @@ -113,7 +113,7 @@ public int hitSkill(Char target) {

@Override
public void die(Object cause) {
Skeleton.spawnAround(this.pos);
SommonSkeleton.spawnAround(this.pos);
super.die(cause);
}

Expand Down
8 changes: 5 additions & 3 deletions java/com/hmdzl/spspd/actors/mobs/Mob.java
View file
Expand Up @@ -530,10 +530,12 @@ public int defenseProc(Char enemy, int damage) {

if (buff(SoulMark.class) != null) {
int restoration = Math.max(damage, HP);
Dungeon.hero.buff(Hunger.class).satisfy(restoration*0.5f);
Dungeon.hero.HP = (int)Math.ceil(Math.min(Dungeon.hero.HT, Dungeon.hero.HP+(restoration*0.25f)));
//Dungeon.hero.buff(Hunger.class).satisfy(restoration*0.5f);
Dungeon.hero.HP = (int)Math.ceil(Math.min(Dungeon.hero.HT, Dungeon.hero.HP+(restoration*0.15f)));
Dungeon.hero.sprite.emitter().burst( Speck.factory(Speck.HEALING), 1 );
}
if (Dungeon.hero.petHP < Dungeon.hero.HT)
Dungeon.hero.petHP += (int)Math.ceil(restoration*0.10f);
}

return damage;
}
Expand Down
2 changes: 1 addition & 1 deletion java/com/hmdzl/spspd/items/DwarfHammer.java
View file
Expand Up @@ -54,7 +54,7 @@ public void execute(Hero hero, String action) {

if (action == AC_BREAK) {

if (Dungeon.bossLevel() || Dungeon.depth > 25 || Dungeon.depth < 22) {
if (Dungeon.bossLevel() || Dungeon.depth > 25 || Dungeon.depth < 21) {
hero.spend(DwarfHammer.TIME_TO_USE);
GLog.w(Messages.get(this, "prevent"));
return;
Expand Down
2 changes: 1 addition & 1 deletion java/com/hmdzl/spspd/items/Generator.java
View file
Expand Up @@ -332,7 +332,7 @@ public static int order(Item item) {
ScrollOfMagicalInfusion.class, ScrollOfPsionicBlast.class,
ScrollOfMirrorImage.class, ScrollOfRegrowth.class, ScrollOfSacrifice.class};
Category.SCROLL.probs = new float[] { 30, 10, 15, 0, 10, 20, 10, 8, 8,
0, 3, 6, 0, 0 };
0, 3, 6, 6, 0 };

Category.POTION.classes = new Class<?>[] { PotionOfHealing.class,
PotionOfExperience.class, PotionOfToxicGas.class,
Expand Down
6 changes: 6 additions & 0 deletions java/com/hmdzl/spspd/items/Gold.java
View file
Expand Up @@ -25,6 +25,7 @@
import com.hmdzl.spspd.Statistics;
import com.hmdzl.spspd.actors.buffs.GoldTouch;
import com.hmdzl.spspd.actors.hero.Hero;
import com.hmdzl.spspd.actors.hero.HeroClass;
import com.hmdzl.spspd.items.artifacts.MasterThievesArmband;
import com.hmdzl.spspd.scenes.GameScene;
import com.hmdzl.spspd.sprites.CharSprite;
Expand Down Expand Up @@ -68,6 +69,11 @@ public boolean doPickUp(Hero hero) {
Statistics.goldCollected += quantity;
Badges.validateGoldCollected();

if(Dungeon.skins == 4 && Dungeon.hero.heroClass == HeroClass.WARRIOR){
Dungeon.gold += (int)(quantity*0.2);
Statistics.goldCollected += quantity;
}

MasterThievesArmband.Thievery thievery = hero
.buff(MasterThievesArmband.Thievery.class);
GoldTouch goldtouch = hero
Expand Down

0 comments on commit 9916150

Please sign in to comment.