Reimplement one-hit KO effect
parent
5fa7921e41
commit
c62cb27cdb
|
@ -1982,11 +1982,25 @@ export class DamagePhase extends PokemonPhase {
|
||||||
start() {
|
start() {
|
||||||
super.start();
|
super.start();
|
||||||
|
|
||||||
|
if (this.damageResult === HitResult.ONE_HIT_KO) {
|
||||||
|
this.scene.toggleInvert(true);
|
||||||
|
this.scene.time.delayedCall(Utils.fixedInt(1000), () => {
|
||||||
|
this.scene.toggleInvert(false);
|
||||||
|
this.applyDamage();
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.applyDamage();
|
||||||
|
}
|
||||||
|
|
||||||
|
applyDamage() {
|
||||||
switch (this.damageResult) {
|
switch (this.damageResult) {
|
||||||
case HitResult.EFFECTIVE:
|
case HitResult.EFFECTIVE:
|
||||||
this.scene.playSound('hit');
|
this.scene.playSound('hit');
|
||||||
break;
|
break;
|
||||||
case HitResult.SUPER_EFFECTIVE:
|
case HitResult.SUPER_EFFECTIVE:
|
||||||
|
case HitResult.ONE_HIT_KO:
|
||||||
this.scene.playSound('hit_strong');
|
this.scene.playSound('hit_strong');
|
||||||
break;
|
break;
|
||||||
case HitResult.NOT_VERY_EFFECTIVE:
|
case HitResult.NOT_VERY_EFFECTIVE:
|
||||||
|
|
|
@ -33,6 +33,7 @@ import { Setting, settingOptions } from './system/settings';
|
||||||
import SettingsUiHandler from './ui/settings-ui-handler';
|
import SettingsUiHandler from './ui/settings-ui-handler';
|
||||||
import MessageUiHandler from './ui/message-ui-handler';
|
import MessageUiHandler from './ui/message-ui-handler';
|
||||||
import { Species } from './data/species';
|
import { Species } from './data/species';
|
||||||
|
import InvertPostFX from './pipelines/invert';
|
||||||
|
|
||||||
const enableAuto = true;
|
const enableAuto = true;
|
||||||
const quickStart = false;
|
const quickStart = false;
|
||||||
|
@ -1072,6 +1073,13 @@ export default class BattleScene extends Phaser.Scene {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
toggleInvert(invert: boolean): void {
|
||||||
|
if (invert)
|
||||||
|
this.cameras.main.setPostPipeline(InvertPostFX);
|
||||||
|
else
|
||||||
|
this.cameras.main.removePostPipeline('InvertPostFX');
|
||||||
|
}
|
||||||
|
|
||||||
getCurrentPhase(): BattlePhase {
|
getCurrentPhase(): BattlePhase {
|
||||||
return this.currentPhase;
|
return this.currentPhase;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1313,16 +1313,13 @@ export class ClearWeatherAttr extends MoveEffectAttr {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export class OneHitKOAttr extends MoveEffectAttr {
|
export class OneHitKOAttr extends MoveAttr {
|
||||||
constructor() {
|
|
||||||
super(false, MoveEffectTrigger.HIT);
|
|
||||||
}
|
|
||||||
|
|
||||||
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
|
apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
|
||||||
if (target.species.speciesId === Species.ETERNATUS && target.formIndex === 1)
|
if (target.species.speciesId === Species.ETERNATUS && target.formIndex === 1)
|
||||||
return false;
|
return false;
|
||||||
target.damage(target.hp, true);
|
|
||||||
user.scene.queueMessage('It\'s a one-hit KO!');
|
(args[0] as Utils.BooleanHolder).value = true;
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
import Phaser from 'phaser';
|
import Phaser from 'phaser';
|
||||||
import BattleScene from './battle-scene';
|
import BattleScene from './battle-scene';
|
||||||
|
import InvertPostFX from './pipelines/invert';
|
||||||
|
|
||||||
const config: Phaser.Types.Core.GameConfig = {
|
const config: Phaser.Types.Core.GameConfig = {
|
||||||
type: Phaser.WEBGL,
|
type: Phaser.WEBGL,
|
||||||
|
@ -10,6 +11,7 @@ const config: Phaser.Types.Core.GameConfig = {
|
||||||
mode: Phaser.Scale.FIT
|
mode: Phaser.Scale.FIT
|
||||||
},
|
},
|
||||||
pixelArt: true,
|
pixelArt: true,
|
||||||
|
pipeline: [ InvertPostFX ] as unknown as Phaser.Types.Core.PipelineConfig,
|
||||||
scene: [ BattleScene ]
|
scene: [ BattleScene ]
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,27 @@
|
||||||
|
import { Game } from "phaser";
|
||||||
|
|
||||||
|
const fragShader = `
|
||||||
|
precision mediump float;
|
||||||
|
|
||||||
|
uniform sampler2D uMainSampler;
|
||||||
|
|
||||||
|
varying vec2 outTexCoord;
|
||||||
|
|
||||||
|
void main()
|
||||||
|
{
|
||||||
|
gl_FragColor = 1.0 - texture2D(uMainSampler, outTexCoord);
|
||||||
|
}
|
||||||
|
`;
|
||||||
|
|
||||||
|
export default class InvertPostFX extends Phaser.Renderer.WebGL.Pipelines.PostFXPipeline {
|
||||||
|
constructor (game: Game) {
|
||||||
|
super({
|
||||||
|
game,
|
||||||
|
name: 'InvertPostFX',
|
||||||
|
fragShader,
|
||||||
|
uniforms: [
|
||||||
|
'uMainSampler'
|
||||||
|
]
|
||||||
|
} as Phaser.Types.Renderer.WebGL.WebGLPipelineConfig);
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,7 +1,7 @@
|
||||||
import Phaser from 'phaser';
|
import Phaser from 'phaser';
|
||||||
import BattleScene, { AnySound } from './battle-scene';
|
import BattleScene, { AnySound } from './battle-scene';
|
||||||
import BattleInfo, { PlayerBattleInfo, EnemyBattleInfo } from './ui/battle-info';
|
import BattleInfo, { PlayerBattleInfo, EnemyBattleInfo } from './ui/battle-info';
|
||||||
import Move, { HighCritAttr, HitsTagAttr, applyMoveAttrs, FixedDamageAttr, VariablePowerAttr, Moves, allMoves, MoveCategory, TypelessAttr, CritOnlyAttr, getMoveTargets, AttackMove, AddBattlerTagAttr } from "./data/move";
|
import Move, { HighCritAttr, HitsTagAttr, applyMoveAttrs, FixedDamageAttr, VariablePowerAttr, Moves, allMoves, MoveCategory, TypelessAttr, CritOnlyAttr, getMoveTargets, AttackMove, AddBattlerTagAttr, OneHitKOAttr } from "./data/move";
|
||||||
import { default as PokemonSpecies, PokemonSpeciesForm, getPokemonSpecies } from './data/pokemon-species';
|
import { default as PokemonSpecies, PokemonSpeciesForm, getPokemonSpecies } from './data/pokemon-species';
|
||||||
import * as Utils from './utils';
|
import * as Utils from './utils';
|
||||||
import { Type, TypeDamageMultiplier, getTypeDamageMultiplier } from './data/type';
|
import { Type, TypeDamageMultiplier, getTypeDamageMultiplier } from './data/type';
|
||||||
|
@ -790,14 +790,22 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
|
||||||
console.log('damage', damage, move.name, move.power, sourceAtk, targetDef);
|
console.log('damage', damage, move.name, move.power, sourceAtk, targetDef);
|
||||||
|
|
||||||
if (!result) {
|
if (!result) {
|
||||||
if (typeMultiplier.value >= 2)
|
if (!typeMultiplier.value)
|
||||||
result = HitResult.SUPER_EFFECTIVE;
|
|
||||||
else if (typeMultiplier.value >= 1)
|
|
||||||
result = HitResult.EFFECTIVE;
|
|
||||||
else if (typeMultiplier.value > 0)
|
|
||||||
result = HitResult.NOT_VERY_EFFECTIVE;
|
|
||||||
else
|
|
||||||
result = HitResult.NO_EFFECT;
|
result = HitResult.NO_EFFECT;
|
||||||
|
else {
|
||||||
|
const oneHitKo = new Utils.BooleanHolder(false);
|
||||||
|
applyMoveAttrs(OneHitKOAttr, source, this, move, oneHitKo);
|
||||||
|
if (oneHitKo.value) {
|
||||||
|
result = HitResult.ONE_HIT_KO;
|
||||||
|
isCritical = false;
|
||||||
|
damage.value = this.hp;
|
||||||
|
} else if (typeMultiplier.value >= 2)
|
||||||
|
result = HitResult.SUPER_EFFECTIVE;
|
||||||
|
else if (typeMultiplier.value >= 1)
|
||||||
|
result = HitResult.EFFECTIVE;
|
||||||
|
else
|
||||||
|
result = HitResult.NOT_VERY_EFFECTIVE;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!source.isPlayer())
|
if (!source.isPlayer())
|
||||||
|
@ -828,6 +836,9 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
|
||||||
case HitResult.NO_EFFECT:
|
case HitResult.NO_EFFECT:
|
||||||
this.scene.queueMessage(`It doesn\'t affect ${this.name}!`);
|
this.scene.queueMessage(`It doesn\'t affect ${this.name}!`);
|
||||||
break;
|
break;
|
||||||
|
case HitResult.ONE_HIT_KO:
|
||||||
|
this.scene.queueMessage('It\'s a one-hit KO!');
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1692,13 +1703,14 @@ export enum HitResult {
|
||||||
SUPER_EFFECTIVE,
|
SUPER_EFFECTIVE,
|
||||||
NOT_VERY_EFFECTIVE,
|
NOT_VERY_EFFECTIVE,
|
||||||
NO_EFFECT,
|
NO_EFFECT,
|
||||||
|
ONE_HIT_KO,
|
||||||
STATUS,
|
STATUS,
|
||||||
FAIL,
|
FAIL,
|
||||||
MISS,
|
MISS,
|
||||||
OTHER
|
OTHER
|
||||||
}
|
}
|
||||||
|
|
||||||
export type DamageResult = HitResult.EFFECTIVE | HitResult.SUPER_EFFECTIVE | HitResult.NOT_VERY_EFFECTIVE | HitResult.OTHER;
|
export type DamageResult = HitResult.EFFECTIVE | HitResult.SUPER_EFFECTIVE | HitResult.NOT_VERY_EFFECTIVE | HitResult.ONE_HIT_KO | HitResult.OTHER;
|
||||||
|
|
||||||
export class PokemonMove {
|
export class PokemonMove {
|
||||||
public moveId: Moves;
|
public moveId: Moves;
|
||||||
|
|
Loading…
Reference in New Issue