LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merging 1.7.5 Source: items/weapon changes

Browse Source
This commit is contained in:
Evan Debenham 2015-02-04 01:19:05 -05:00
parent fbd2fb907e
commit 37e1c8b8ff
8 changed files with 135 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java
View File

@ -37,6 +37,8 @@ import com.watabou.utils.Random;
public class Weapon extends KindOfWeapon {
private static final int HITS_TO_KNOW = 20;
private static final String TXT_IDENTIFY =
"You are now familiar enough with your %s to identify it. It is %s.";
private static final String TXT_INCOMPATIBLE =
@ -52,7 +54,7 @@ public class Weapon extends KindOfWeapon {
}
public Imbue imbue = Imbue.NONE;
private int hitsToKnow = 20;
private int hitsToKnow = HITS_TO_KNOW;
protected Enchantment enchantment;
@ -72,12 +74,14 @@ public class Weapon extends KindOfWeapon {
}
}
private static final String UNFAMILIRIARITY = "unfamiliarity";
private static final String ENCHANTMENT = "enchantment";
private static final String IMBUE = "imbue";
@Override
public void storeInBundle( Bundle bundle ) {
super.storeInBundle( bundle );
bundle.put( UNFAMILIRIARITY, hitsToKnow );
bundle.put( ENCHANTMENT, enchantment );
bundle.put( IMBUE, imbue );
}
@ -85,6 +89,9 @@ public class Weapon extends KindOfWeapon {
@Override
public void restoreFromBundle( Bundle bundle ) {
super.restoreFromBundle( bundle );
if ((hitsToKnow = bundle.getInt( UNFAMILIRIARITY )) == 0) {
hitsToKnow = HITS_TO_KNOW;
}
enchantment = (Enchantment)bundle.get( ENCHANTMENT );
imbue = bundle.getEnum( IMBUE, Imbue.class );
}
@ -160,7 +167,7 @@ public class Weapon extends KindOfWeapon {
}
} else {
if (enchant) {
enchant( Enchantment.random() );
enchant( );
}
}
@ -198,10 +205,21 @@ public class Weapon extends KindOfWeapon {
}
public Weapon enchant( Enchantment ench ) {
this.enchantment = ench;
enchantment = ench;
return this;
}
public Weapon enchant() {
Class<? extends Enchantment> oldEnchantment = enchantment != null ? enchantment.getClass() : null;
Enchantment ench = Enchantment.random();
while (ench.getClass() == oldEnchantment) {
ench = Enchantment.random();
}
return enchant( ench );
}
public boolean isEnchanted() {
return enchantment != null;
}
@ -215,8 +233,8 @@ public class Weapon extends KindOfWeapon {
private static final Class<?>[] enchants = new Class<?>[]{
Fire.class, Poison.class, Death.class, Paralysis.class, Leech.class,
Slow.class, Swing.class, Piercing.class, Instability.class, Horror.class, Luck.class };
private static final float[] chances= new float[]{ 10, 10, 1, 2, 1, 2, 3, 3, 3, 2, 2 };
Slow.class, Shock.class, Instability.class, Horror.class, Luck.class };
private static final float[] chances= new float[]{ 10, 10, 1, 2, 1, 2, 6, 3, 2, 2 };
public abstract boolean proc( Weapon weapon, Char attacker, Char defender, int damage );

2
src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Horror.java
View File

@ -45,7 +45,7 @@ public class Horror extends Weapon.Enchantment {
if (defender == Dungeon.hero) {
Buff.affect( defender, Vertigo.class, Vertigo.duration(defender) );
} else {
Buff.affect( defender, Terror.class, Terror.DURATION ).source = attacker;
Buff.affect( defender, Terror.class, Terror.DURATION ).object = attacker.id();
}
return true;

8
src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Instability.java
View File

@ -28,13 +28,7 @@ public class Instability extends Weapon.Enchantment {
@Override
public boolean proc( Weapon weapon, Char attacker, Char defender, int damage ) {
Enchantment ench = random();
if (weapon instanceof Boomerang) {
while (ench instanceof Piercing || ench instanceof Swing) {
ench = Enchantment.random();
}
}
return ench.proc( weapon, attacker, defender, damage );
return random().proc( weapon, attacker, defender, damage );
}
@Override

75
src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Piercing.java
View File

@ -1,75 +0,0 @@
/*
* Pixel Dungeon
* Copyright (C) 2012-2014 Oleg Dolya
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*/
package com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments;
import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon.Enchantment;
import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
import com.watabou.utils.Random;
public class Piercing extends Enchantment {
private static final String TXT_PIERCING = "Piercing %s";
@Override
public boolean proc( Weapon weapon, Char attacker, Char defender, int damage ) {
int level = Math.max( 0, weapon.level );
int maxDamage = (int)(damage * Math.pow( 2, -1d / (level + 1) ));
if (maxDamage >= 1) {
int d = defender.pos - attacker.pos;
int pos = defender.pos + d;
while (pos >= 0 && pos < Level.LENGTH) {
Char ch = Actor.findChar( pos );
if (ch == null) {
break;
}
int dr = Random.IntRange( 0, ch.dr() );
int dmg = Random.Int( 1, maxDamage );
int effectiveDamage = Math.max( dmg - dr, 0 );
ch.damage( effectiveDamage, this );
ch.sprite.bloodBurstA( attacker.sprite.center(), effectiveDamage );
ch.sprite.flash();
pos += d;
}
return true;
} else {
return false;
}
}
@Override
public String name( String weaponName) {
return String.format( TXT_PIERCING, weaponName );
}
}

100
src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Shock.java Normal file
View File

@ -0,0 +1,100 @@
/*
* Pixel Dungeon
* Copyright (C) 2012-2015 Oleg Dolya
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*/
package com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments;
import java.util.ArrayList;
import java.util.HashSet;
import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.effects.Lightning;
import com.shatteredpixel.shatteredpixeldungeon.effects.particles.SparkParticle;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon;
import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
import com.shatteredpixel.shatteredpixeldungeon.levels.traps.LightningTrap;
import com.watabou.utils.Random;
public class Shock extends Weapon.Enchantment {
private static final String TXT_SHOCKING = "Shocking %s";
@Override
public boolean proc( Weapon weapon, Char attacker, Char defender, int damage ) {
// lvl 0 - 25%
// lvl 1 - 40%
// lvl 2 - 50%
int level = Math.max( 0, weapon.level );
if (Random.Int( level + 4 ) >= 3) {
points[0] = attacker.pos;
nPoints = 1;
affected.clear();
affected.add( attacker );
hit( defender, Random.Int( 1, damage / 2 ) );
attacker.sprite.parent.add( new Lightning( points, nPoints, null ) );
return true;
} else {
return false;
}
}
@Override
public String name( String weaponName ) {
return String.format( TXT_SHOCKING, weaponName );
}
private ArrayList<Char> affected = new ArrayList<Char>();
private int[] points = new int[20];
private int nPoints;
private void hit( Char ch, int damage ) {
if (damage < 1) {
return;
}
affected.add( ch );
ch.damage( Level.water[ch.pos] && !ch.flying ? (int)(damage * 2) : damage, LightningTrap.LIGHTNING );
ch.sprite.centerEmitter().burst( SparkParticle.FACTORY, 3 );
ch.sprite.flash();
points[nPoints++] = ch.pos;
HashSet<Char> ns = new HashSet<Char>();
for (int i=0; i < Level.NEIGHBOURS8.length; i++) {
Char n = Actor.findChar( ch.pos + Level.NEIGHBOURS8[i] );
if (n != null && !affected.contains( n )) {
ns.add( n );
}
}
if (ns.size() > 0) {
hit( Random.element( ns ), Random.Int( damage / 2, damage ) );
}
}
}

74
src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Swing.java
View File

@ -1,74 +0,0 @@
/*
* Pixel Dungeon
* Copyright (C) 2012-2014 Oleg Dolya
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*/
package com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments;
import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon.Enchantment;
import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
import com.watabou.utils.Random;
public class Swing extends Enchantment {
private static final String TXT_WILD = "Wild %s";
@Override
public boolean proc( Weapon weapon, Char attacker, Char defender, int damage ) {
int level = Math.max( 0, weapon.level );
int maxDamage = (int)(damage * Math.pow( 2, -1d / (level + 1) ));
if (maxDamage >= 1) {
int p = attacker.pos;
int[] neighbours = {
p+1, p-1, p+Level.WIDTH, p-Level.WIDTH,
p+1+Level.WIDTH, p+1-Level.WIDTH, p-1+Level.WIDTH, p-1-Level.WIDTH};
for (int n : neighbours) {
Char ch = Actor.findChar( n );
if (ch != null && ch != defender && ch.isAlive()) {
int dr = Random.IntRange( 0, ch.dr() );
int dmg = Random.Int( 1, maxDamage );
int effectiveDamage = Math.max( dmg - dr, 0 );
ch.damage( effectiveDamage, this );
ch.sprite.bloodBurstA( attacker.sprite.center(), effectiveDamage );
ch.sprite.flash();
}
}
return true;
} else {
return false;
}
}
@Override
public String name( String weaponName) {
return String.format( TXT_WILD, weaponName );
}
}

2
src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MeleeWeapon.java
View File

@ -187,7 +187,7 @@ public class MeleeWeapon extends Weapon {
super.random();
if (Random.Int( 10 + level ) == 0) {
enchant( Enchantment.random() );
enchant();
}
return this;

13
src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Boomerang.java
View File

@ -16,13 +16,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*/
package com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Piercing;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Swing;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
import com.shatteredpixel.shatteredpixeldungeon.sprites.MissileSprite;
@ -70,15 +68,6 @@ public class Boomerang extends MissileWeapon {
return super.degrade();
}
@Override
public Weapon enchant( Enchantment ench ) {
while (ench instanceof Piercing || ench instanceof Swing) {
ench = Enchantment.random();
}
return super.enchant( ench );
}
@Override
public void proc( Char attacker, Char defender, int damage ) {
super.proc( attacker, defender, damage );