Skip to content

Commit

Permalink
Merge pull request #10 from VsKatshuma/dev
Browse files Browse the repository at this point in the history
Release Version 0.5
  • Loading branch information
mmKALLL authored Oct 7, 2019
2 parents 852f1b3 + a907c00 commit 469a0e1
Show file tree
Hide file tree
Showing 16 changed files with 1,310 additions and 187 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ bower_components
# Compiled binary addons (https://nodejs.org/api/addons.html)
build/
dist/
built/
dist.zip

# Dependency directories
node_modules/
Expand Down
Binary file added assets/sprites/ingame-5.jpg
Loading
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/sprites/ingame-6.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
"node": ">=10.15.0"
},
"scripts": {
"start": "sh -c 'node_modules/.bin/tsc --noEmit' && sh -c 'node_modules/.bin/parcel index.html'",
"start": "sh -c 'node_modules/.bin/tsc --noEmit' && sh -c 'node_modules/.bin/parcel index.html --open'",
"build": "sh -c 'node_modules/.bin/tsc --noEmit' && sh -c 'node_modules/.bin/parcel build index.html'",
"test": "echo \"Error: no test specified\" && exit 1"
},
"repository": {
Expand Down
265 changes: 253 additions & 12 deletions src/characters/katshuma.ts
Original file line number Diff line number Diff line change
@@ -1,25 +1,266 @@
import { Character } from "../types";
import { generateAttack, createHitbox } from "../utilities";


export const Katshuma: Character = {
name: 'Katshuma',
id: 'katshuma',
health: 100,
walkSpeed: 5,
maxHealth: 100,
walkSpeed: 7,
airSpeed: 8,
weight: 1,
maxJumps: 2,
jumpStrength: 1,
hurtboxRadius: 20,
attacks: {
LightNeutral: {
...generateAttack([
{ ...createHitbox(4, 12, 5), radius: 123 },
{ ...createHitbox(12, 20, 10) },
{ ...createHitbox(19, 40, 50) }
]),
projectile: true,
}
// TODO: Add remaining attacks
LightNeutral: {
...generateAttack([
{ ...createHitbox(4, 12, 5), radius: 123 },
{ ...createHitbox(12, 20, 10) }
]),
projectile: false
},
LightForward: {
...generateAttack([
{
damage: 4,
radius: 20,
knockbackBase: 6,
knockbackGrowth: 2,
knockbackX: 0.5, // NEEDS TO TAKE FACING INTO ACCOUNT
knockbackY: -1,
hitstunBase: 20,
hitstunGrowth: 1,
hitLag: 30,
// characterSpecific: ,
movesWithCharacter: true,
x: 5, // NEEDS TO TAKE FACING INTO ACCOUNT
y: 5,
framesUntilActivation: 0,
framesUntilEnd: 40,
// onStart: () => {},
onActivation: () => {},
onHit: () => {},
onEnd: () => {},
}
])
},
LightDown: {
...generateAttack([
{
damage: 6,
radius: 20,
knockbackBase: 15,
knockbackGrowth: 5,
knockbackX: 1, // NEEDS TO TAKE FACING INTO ACCOUNT
knockbackY: 1,
hitstunBase: 20,
hitstunGrowth: 1,
hitLag: 30,
// characterSpecific: ,
movesWithCharacter: true,
x: 30, // NEEDS TO TAKE FACING INTO ACCOUNT
y: 30,
framesUntilActivation: 0,
framesUntilEnd: 40,
// onStart: () => {},
onActivation: () => {},
onHit: () => {},
onEnd: () => {},
}
])
},
airLightNeutral: {
...generateAttack([
{
damage: 9,
radius: 20,
knockbackBase: 1,
knockbackGrowth: 1,
knockbackX: 1, // NEEDS TO TAKE FACING INTO ACCOUNT
knockbackY: -1,
hitstunBase: 20,
hitstunGrowth: 1,
hitLag: 30,
// characterSpecific: ,
movesWithCharacter: true,
x: 0, // NEEDS TO TAKE FACING INTO ACCOUNT
y: -5,
framesUntilActivation: 0,
framesUntilEnd: 40,
// onStart: () => {},
onActivation: () => {},
onHit: () => {},
onEnd: () => {},
}
])
},
airLightUp: {
...generateAttack([
{
damage: 4,
radius: 20,
knockbackBase: 12,
knockbackGrowth: 2,
knockbackX: 0, // NEEDS TO TAKE FACING INTO ACCOUNT
knockbackY: -1,
hitstunBase: 10,
hitstunGrowth: 1,
hitLag: 30,
// characterSpecific: ,
movesWithCharacter: true,
x: 10, // NEEDS TO TAKE FACING INTO ACCOUNT
y: -50,
framesUntilActivation: 0,
framesUntilEnd: 40,
// onStart: () => {},
onActivation: () => {},
onHit: () => {},
onEnd: () => {},
}
]),
...generateAttack([
{
damage: 4,
radius: 20,
knockbackBase: 18,
knockbackGrowth: 2,
knockbackX: 0, // NEEDS TO TAKE FACING INTO ACCOUNT
knockbackY: -1,
hitstunBase: 10,
hitstunGrowth: 1,
hitLag: 30,
// characterSpecific: ,
movesWithCharacter: true,
x: -10, // NEEDS TO TAKE FACING INTO ACCOUNT
y: -50,
framesUntilActivation: 0,
framesUntilEnd: 40,
// onStart: () => {},
onActivation: () => {},
onHit: () => {},
onEnd: () => {},
}
])
},
airLightDown: {
...generateAttack([
{
damage: 10,
radius: 30,
knockbackBase: 30,
knockbackGrowth: 3,
knockbackX: 0, // NEEDS TO TAKE FACING INTO ACCOUNT
knockbackY: 1,
hitstunBase: 10,
hitstunGrowth: 1,
hitLag: 30,
// characterSpecific: ,
movesWithCharacter: true,
x: 0, // NEEDS TO TAKE FACING INTO ACCOUNT
y: 50,
framesUntilActivation: 0,
framesUntilEnd: 40,
// onStart: () => {},
onActivation: () => {},
onHit: () => {},
onEnd: () => {},
}
])
},
airLightForward: {
...generateAttack([
{
damage: 5,
radius: 10,
knockbackBase: 10,
knockbackGrowth: 2,
knockbackX: 1, // NEEDS TO TAKE FACING INTO ACCOUNT
knockbackY: -0.2,
hitstunBase: 10,
hitstunGrowth: 1,
hitLag: 30,
// characterSpecific: ,
movesWithCharacter: true,
x: 15, // NEEDS TO TAKE FACING INTO ACCOUNT
y: -5,
framesUntilActivation: 0,
framesUntilEnd: 40,
// onStart: () => {},
onActivation: () => {},
onHit: () => {},
onEnd: () => {},
}
])
},
airLightBack: {
...generateAttack([
{
damage: 8,
radius: 20,
knockbackBase: 30,
knockbackGrowth: 5,
knockbackX: 1, // NEEDS TO TAKE FACING INTO ACCOUNT
knockbackY: -0.4,
hitstunBase: 25,
hitstunGrowth: 1,
hitLag: 30,
// characterSpecific: ,
movesWithCharacter: true,
x: 30, // NEEDS TO TAKE FACING INTO ACCOUNT
y: 0,
framesUntilActivation: 0,
framesUntilEnd: 40,
// onStart: () => {},
onActivation: () => {},
onHit: () => {},
onEnd: () => {},
}
])
},
SpecialNeutral: {
...generateAttack([])
},
SpecialDown: {
...generateAttack([])
},
airSpecialNeutral: {
...generateAttack([])
},
airSpecialUp: {
...generateAttack([])
},
airSpecialDown: {
...generateAttack([])
},
airSpecialForward: {
...generateAttack([])
},
airSpecialBack: {
...generateAttack([])
},
MeterNeutral: {
...generateAttack([])
},
MeterForward: {
...generateAttack([])
},
MeterDown: {
...generateAttack([])
},
airMeterNeutral: {
...generateAttack([])
},
airMeterUp: {
...generateAttack([])
},
airMeterDown: {
...generateAttack([])
},
airMeterForward: {
...generateAttack([])
},
airMeterBack: {
...generateAttack([])
}
},
}
Loading

0 comments on commit 469a0e1

Please sign in to comment.