mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-04 23:42:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

changed to UNKNOWN implementation

Browse Source
This commit is contained in:
Luc 2024-04-24 16:59:42 -04:00
parent 7a449e6d57
commit 2e0cd6faa7
2 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/data/type.ts
View File

@ -18,8 +18,7 @@ export enum Type {
DRAGON,
DARK,
FAIRY,
STELLAR,
TYPELESS
STELLAR
};
export type TypeDamageMultiplier = 0 | 0.25 | 0.5 | 1 | 2 | 4;
@ -46,7 +45,6 @@ export function getTypeDamageMultiplier(attackType: integer, defType: integer):
case Type.DRAGON:
case Type.DARK:
case Type.FAIRY:
case Type.TYPELESS:
return 1;
case Type.GHOST:
default:
@ -70,7 +68,6 @@ export function getTypeDamageMultiplier(attackType: integer, defType: integer):
case Type.ELECTRIC:
case Type.ICE:
case Type.DRAGON:
case Type.TYPELESS:
return 1;
case Type.ROCK:
case Type.BUG:
@ -96,7 +93,6 @@ export function getTypeDamageMultiplier(attackType: integer, defType: integer):
case Type.DRAGON:
case Type.DARK:
case Type.FAIRY:
case Type.TYPELESS:
return 1;
case Type.FIGHTING:
case Type.BUG:
@ -122,7 +118,6 @@ export function getTypeDamageMultiplier(attackType: integer, defType: integer):
case Type.ICE:
case Type.DRAGON:
case Type.DARK:
case Type.TYPELESS:
return 1;
case Type.FIGHTING:
case Type.POISON:
@ -151,7 +146,6 @@ export function getTypeDamageMultiplier(attackType: integer, defType: integer):
case Type.DRAGON:
case Type.DARK:
case Type.FAIRY:
case Type.TYPELESS:
return 1;
case Type.POISON:
case Type.ROCK:
@ -177,7 +171,6 @@ export function getTypeDamageMultiplier(attackType: integer, defType: integer):
case Type.DRAGON:
case Type.DARK:
case Type.FAIRY:
case Type.TYPELESS:
return 1;
case Type.NORMAL:
case Type.FLYING:
@ -205,7 +198,6 @@ export function getTypeDamageMultiplier(attackType: integer, defType: integer):
case Type.DRAGON:
case Type.DARK:
case Type.FAIRY:
case Type.TYPELESS:
return 1;
case Type.FIGHTING:
case Type.GROUND:
@ -231,7 +223,6 @@ export function getTypeDamageMultiplier(attackType: integer, defType: integer):
case Type.ICE:
case Type.DRAGON:
case Type.FAIRY:
case Type.TYPELESS:
return 1;
case Type.POISON:
case Type.BUG:
@ -251,7 +242,6 @@ export function getTypeDamageMultiplier(attackType: integer, defType: integer):
case Type.WATER:
case Type.ELECTRIC:
case Type.DARK:
case Type.TYPELESS:
return 1;
case Type.NORMAL:
case Type.FLYING:
@ -283,7 +273,6 @@ export function getTypeDamageMultiplier(attackType: integer, defType: integer):
case Type.PSYCHIC:
case Type.DRAGON:
case Type.DARK:
case Type.TYPELESS:
return 1;
case Type.BUG:
case Type.STEEL:
@ -312,7 +301,6 @@ export function getTypeDamageMultiplier(attackType: integer, defType: integer):
case Type.DRAGON:
case Type.DARK:
case Type.FAIRY:
case Type.TYPELESS:
return 1;
case Type.STEEL:
case Type.FIRE:
@ -339,7 +327,6 @@ export function getTypeDamageMultiplier(attackType: integer, defType: integer):
case Type.DRAGON:
case Type.DARK:
case Type.FAIRY:
case Type.TYPELESS:
return 1;
case Type.GROUND:
case Type.WATER:
@ -367,7 +354,6 @@ export function getTypeDamageMultiplier(attackType: integer, defType: integer):
case Type.DRAGON:
case Type.DARK:
case Type.FAIRY:
case Type.TYPELESS:
return 1;
case Type.FLYING:
case Type.STEEL:
@ -395,7 +381,6 @@ export function getTypeDamageMultiplier(attackType: integer, defType: integer):
case Type.ICE:
case Type.DRAGON:
case Type.FAIRY:
case Type.TYPELESS:
return 1;
case Type.FIGHTING:
case Type.PSYCHIC:
@ -423,7 +408,6 @@ export function getTypeDamageMultiplier(attackType: integer, defType: integer):
case Type.DRAGON:
case Type.DARK:
case Type.FAIRY:
case Type.TYPELESS:
return 1;
case Type.ICE:
return 0.5;
@ -447,7 +431,6 @@ export function getTypeDamageMultiplier(attackType: integer, defType: integer):
case Type.STEEL:
case Type.PSYCHIC:
case Type.DARK:
case Type.TYPELESS:
return 1;
case Type.FIRE:
case Type.WATER:
@ -475,7 +458,6 @@ export function getTypeDamageMultiplier(attackType: integer, defType: integer):
case Type.ELECTRIC:
case Type.ICE:
case Type.DRAGON:
case Type.TYPELESS:
return 1;
case Type.GHOST:
case Type.DARK:
@ -501,7 +483,6 @@ export function getTypeDamageMultiplier(attackType: integer, defType: integer):
case Type.PSYCHIC:
case Type.ICE:
case Type.FAIRY:
case Type.TYPELESS:
return 1;
case Type.FIGHTING:
case Type.BUG:
@ -513,8 +494,6 @@ export function getTypeDamageMultiplier(attackType: integer, defType: integer):
}
case Type.STELLAR:
return 1;
case Type.TYPELESS:
return 1;
}
}
@ -558,7 +537,7 @@ export function getTypeRgb(type: Type): [ integer, integer, integer ] {
return [ 232, 136, 200 ];
case Type.STELLAR:
return [ 255, 255, 255 ];
case Type.TYPELESS:
case Type.UNKNOWN:
return [ 104, 160, 144 ];
default:
return [ 0, 0, 0 ];

6
src/field/pokemon.ts
View File

@ -701,10 +701,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
}
if (!types.length) // become typeless if no types are present
types.push(Type.TYPELESS);
types.push(Type.UNKNOWN);
if (types.length > 1 && types.includes(Type.TYPELESS)) { // remove typeless if other types are present
const index = types.indexOf(Type.TYPELESS);
if (types.length > 1 && types.includes(Type.UNKNOWN)) { // remove UNKNOWN if other types are present
const index = types.indexOf(Type.UNKNOWN);
if (index !== -1) {
types.splice(index, 1);
}