Skip to content

Commit

Permalink
Super feeder, remove unused chars and guns #712
Browse files Browse the repository at this point in the history
  • Loading branch information
@cxong
cxong committed Jul 17, 2024
1 parent 31dd5af commit 4bd68bd
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 501 deletions.
58 changes: 0 additions & 58 deletions data/.wolf3d/N3Ddata.cdogscpn/bullets.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,64 +161,6 @@
"Sound": "goat_kick"
}
}
},
{
"Name": "ghost_drain",
"Power": 3,
"Mass": 0,
"Hit": {
"Flesh": {
"Sound": "hits/gas"
}
}
},
{
"Name": "fireball",
"Pic": {
"Type": "Animated",
"Sprites": "fireball_small",
"TicksPerFrame": 4
},
"Speed": 350,
"Range": 200,
"Power": 15,
"Mass": 18.0,
"Size": [3, 3],
"Special": {
"Effect": "Flame"
},
"Hit": {
"Flesh": {
"Sound": "hits/fire"
},
"Wall": {
"Sound": "hits/fire"
}
},
"Spark": "fireball_hit"
},
{
"Name": "energy_ball",
"Pic": {
"Type": "Animated",
"Sprites": "fireball_green",
"TicksPerFrame": 4
},
"Speed": 625,
"Range": 200,
"Power": 46,
"Mass": 40.0,
"Size": [3, 3],
"Special": "Flame",
"Spark": "fireball_green_hit",
"Hit": {
"Flesh": {
"Sound": "hits/fire"
},
"Wall": {
"Sound": "hits/fire"
}
}
}
]
}
287 changes: 0 additions & 287 deletions data/.wolf3d/N3Ddata.cdogscpn/characters.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,94 +133,6 @@
"probabilityToShoot": 12,
"actionDelay": 15
},
{
"Class": "Pacman Ghost",
"HairType": "pacman_ghost",
"Skin": "00ff00ff",
"Arms": "404040ff",
"Body": "404040ff",
"Legs": "404040ff",
"Hair": "ad0000ff",
"Feet": "404040ff",
"Facehair": "ad0000ff",
"Hat": "ad0000ff",
"Glasses": "ad0000ff",
"speed": 130,
"Gun": "Ghost Drain",
"maxHealth": 40,
"excessHealth": 80,
"flags": 34087936,
"probabilityToMove": 50,
"probabilityToTrack": 40,
"probabilityToShoot": 0,
"actionDelay": 15
},
{
"Class": "Pacman Ghost",
"HairType": "pacman_ghost",
"Skin": "00ff00ff",
"Arms": "404040ff",
"Body": "404040ff",
"Legs": "404040ff",
"Hair": "fca600ff",
"Feet": "404040ff",
"Facehair": "fca600ff",
"Hat": "fca600ff",
"Glasses": "fca600ff",
"speed": 128,
"Gun": "Ghost Drain",
"maxHealth": 40,
"excessHealth": 80,
"flags": 34087936,
"probabilityToMove": 50,
"probabilityToTrack": 40,
"probabilityToShoot": 0,
"actionDelay": 15
},
{
"Class": "Pacman Ghost",
"HairType": "pacman_ghost",
"Skin": "00ff00ff",
"Arms": "404040ff",
"Body": "404040ff",
"Legs": "404040ff",
"Hair": "4147fcff",
"Feet": "404040ff",
"Facehair": "4147fcff",
"Hat": "4147fcff",
"Glasses": "4147fcff",
"speed": 128,
"Gun": "Ghost Drain",
"maxHealth": 40,
"excessHealth": 80,
"flags": 34087936,
"probabilityToMove": 50,
"probabilityToTrack": 40,
"probabilityToShoot": 0,
"actionDelay": 15
},
{
"Class": "Pacman Ghost",
"HairType": "pacman_ghost",
"Skin": "00ff00ff",
"Arms": "404040ff",
"Body": "404040ff",
"Legs": "404040ff",
"Hair": "ff6c84ff",
"Feet": "404040ff",
"Facehair": "ff6c84ff",
"Hat": "ff6c84ff",
"Glasses": "ff6c84ff",
"speed": 128,
"Gun": "Ghost Drain",
"maxHealth": 40,
"excessHealth": 80,
"flags": 34087936,
"probabilityToMove": 50,
"probabilityToTrack": 40,
"probabilityToShoot": 0,
"actionDelay": 15
},
{
"Class": "Hans Grosse",
"HairType": "flattop",
Expand Down Expand Up @@ -266,28 +178,6 @@
"probabilityToShoot": 52,
"actionDelay": 40
},
{
"Class": "Fake Hitler",
"HairType": "hitler",
"Skin": "ffb871ff",
"Arms": "ffe841ff",
"Body": "404040ff",
"Legs": "850000ff",
"Hair": "000000ff",
"Feet": "404040ff",
"Facehair": "000000ff",
"Hat": "000000ff",
"Glasses": "000000ff",
"speed": 192,
"Gun": "Flamethrower",
"maxHealth": 350,
"excessHealth": 700,
"flags": 9344,
"probabilityToMove": 50,
"probabilityToTrack": 40,
"probabilityToShoot": 12,
"actionDelay": 15
},
{
"Class": "Mecha Hitler",
"HairType": "hitler",
Expand Down Expand Up @@ -398,183 +288,6 @@
"probabilityToShoot": 42,
"actionDelay": 40
},
{
"Class": "Trans Grosse",
"HairType": "flattop",
"Skin": "ffbf73ff",
"Arms": "368700ff",
"Body": "00850cff",
"Legs": "028707ff",
"Hair": "c47300ff",
"Feet": "027b0cff",
"Facehair": "c47300ff",
"Hat": "c47300ff",
"Glasses": "c47300ff",
"speed": 192,
"Gun": "Dual Chain Gun",
"maxHealth": 1000,
"excessHealth": 2000,
"flags": 25728,
"Drop": "keys/plain/yellow",
"probabilityToMove": 40,
"probabilityToTrack": 20,
"probabilityToShoot": 42,
"actionDelay": 40
},
{
"Class": "Barnacle Wilhelm",
"HairType": "donut",
"Skin": "ffbf73ff",
"Arms": "ffc368ff",
"Body": "2c53ffff",
"Legs": "04ff0bff",
"Hair": "fcf678ff",
"Feet": "00187bff",
"Facehair": "fcf678ff",
"Hat": "fcf678ff",
"Glasses": "fcf678ff",
"speed": 258,
"Gun": "Chaingun and Rocket Launcher",
"maxHealth": 1100,
"excessHealth": 2200,
"flags": 25728,
"Drop": "keys/plain/yellow",
"probabilityToMove": 40,
"probabilityToTrack": 20,
"probabilityToShoot": 42,
"actionDelay": 40
},
{
"Class": "Ubermutant",
"HairType": "flattop",
"Skin": "e9e9e9ff",
"Arms": "093f00ff",
"Body": "003f06ff",
"Legs": "003c08ff",
"Hair": "000000ff",
"Feet": "404040ff",
"Facehair": "000000ff",
"Hat": "000000ff",
"Glasses": "000000ff",
"speed": 386,
"Gun": "boss_chaingun1",
"maxHealth": 1200,
"excessHealth": 2400,
"flags": 25728,
"Drop": "keys/plain/yellow",
"probabilityToMove": 40,
"probabilityToTrack": 20,
"probabilityToShoot": 42,
"actionDelay": 40
},
{
"Class": "Death Knight",
"HatType": "helmet",
"Skin": "ffbf73ff",
"Arms": "bf2424ff",
"Body": "4f4f4fff",
"Legs": "3e3f3eff",
"Hair": "4f4f4fff",
"Feet": "494a4aff",
"Facehair": "4f4f4fff",
"Hat": "4f4f4fff",
"Glasses": "4f4f4fff",
"speed": 256,
"Gun": "Dual Chaingun and Rocket Launcher",
"maxHealth": 1400,
"excessHealth": 2800,
"flags": 25728,
"Drop": "keys/plain/yellow",
"probabilityToMove": 40,
"probabilityToTrack": 20,
"probabilityToShoot": 42,
"actionDelay": 40
},
{
"Class": "Ghost",
"HairType": "ghost",
"Skin": "00ff00ff",
"Arms": "404040ff",
"Body": "404040ff",
"Legs": "404040ff",
"Hair": "ad0000ff",
"Feet": "404040ff",
"Facehair": "ad0000ff",
"Hat": "ad0000ff",
"Glasses": "ad0000ff",
"speed": 102,
"Gun": "Ghost Drain",
"maxHealth": 12,
"excessHealth": 24,
"flags": 9344,
"probabilityToMove": 90,
"probabilityToTrack": 90,
"probabilityToShoot": 0,
"actionDelay": 15
},
{
"Class": "Angel of Death",
"Skin": "ff0000ff",
"Arms": "ff0000ff",
"Body": "e90a0aff",
"Legs": "f70000ff",
"Hair": "000000ff",
"Feet": "ee0000ff",
"Facehair": "000000ff",
"Hat": "000000ff",
"Glasses": "000000ff",
"speed": 192,
"Gun": "Energy Ball",
"maxHealth": 1600,
"excessHealth": 3200,
"flags": 25728,
"probabilityToMove": 40,
"probabilityToTrack": 20,
"probabilityToShoot": 42,
"actionDelay": 40
},
{
"Class": "Ogre",
"Skin": "00ff00ff",
"Arms": "404040ff",
"Body": "404040ff",
"Legs": "404040ff",
"Hair": "000000ff",
"Feet": "404040ff",
"Facehair": "404040ff",
"Hat": "404040ff",
"Glasses": "404040ff",
"speed": 256,
"Gun": "Machine gun",
"maxHealth": 40,
"excessHealth": 80,
"flags": 1024,
"probabilityToMove": 50,
"probabilityToTrack": 25,
"probabilityToShoot": 2,
"actionDelay": 15
},
{
"Class": "Ogre",
"Skin": "00ff00ff",
"Arms": "404040ff",
"Body": "404040ff",
"Legs": "404040ff",
"Hair": "000000ff",
"Feet": "404040ff",
"Facehair": "404040ff",
"Hat": "404040ff",
"Glasses": "404040ff",
"speed": 256,
"Gun": "Machine gun",
"maxHealth": 40,
"excessHealth": 80,
"flags": 1024,
"probabilityToMove": 50,
"probabilityToTrack": 25,
"probabilityToShoot": 2,
"actionDelay": 15
},
{
"Class": "Lady",
"PlayerTemplateName": "Naamah",
Expand Down
Binary file removed data/.wolf3d/N3Ddata.cdogscpn/graphics/smg.png
View file
Binary file not shown.
Binary file added data/.wolf3d/N3Ddata.cdogscpn/graphics/super_feeder.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 4bd68bd

Please sign in to comment.