Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Matias #4

Open
wants to merge 131 commits into
base: master
Choose a base branch
from
Open
Changes from 11 commits
Commits
Show all changes
131 commits
Select commit Hold shift + click to select a range
0a20071
My first commit.
juakotorres Apr 20, 2016
c2393e7
Added documentation in the player class, above the method that allow …
SetaSouto Apr 20, 2016
0b055e5
Founded the variable that manage how fast runs the player: PLAYERTHRUST
SetaSouto Apr 20, 2016
550dbed
Resuelta la issue 12: Ahora el jugador corre por un tiempo limitado, …
SetaSouto Apr 22, 2016
4479bf6
Se agregó un método en main que retorna el nivel de dificultad del ju…
SetaSouto Apr 23, 2016
f1f9cea
Se agregó un método para setear el skill del juego en el player. setG…
SetaSouto Apr 23, 2016
c247459
Se agregaron los setters para waitTired y maxTired de acuerdo al nive…
SetaSouto Apr 23, 2016
0ec64b7
Se quitó el getGameSkill() del main, no era necesario. El status del …
SetaSouto Apr 23, 2016
dbb7af7
Se quitaron unos print.
SetaSouto Apr 23, 2016
c6a3b06
RESUELTO: El cansancio y el tiempo de espera para comenzar a descansa…
SetaSouto Apr 23, 2016
262842b
Creación de los tipos de zombie.
juakotorres Apr 26, 2016
3faa362
commit test 1
Apr 26, 2016
adbd72b
Se agregaron los zombies con sus colores sin sprite. Además de su
juakotorres Apr 27, 2016
8ad78e4
Cambiando firma de un metodo.
juakotorres Apr 27, 2016
e0f5949
Se agregaron los métodos para obtener las variables tired y maxTired …
SetaSouto May 3, 2016
a8b69ad
Se agregó los colores a los sprites de los zombies. El personaje fallece
juakotorres May 3, 2016
d619fde
Se agrgó el mensaje que muestra en pantalla que tan cansado está el j…
SetaSouto May 3, 2016
8f7838a
Added prob. of zombi's type spawn
May 3, 2016
128ac68
merged with brauliozombie
May 3, 2016
6d3c88e
it works! the last commit has problems that has been fixed here
May 3, 2016
0165bb8
Se corrigió un comentario desactualizado
May 4, 2016
647557c
refactoring
May 4, 2016
7f71bf0
Ahora la probabilidad de los zombies depende del nivel de dificultad
May 4, 2016
e68bded
Se cambio las prob de aparicion de zombies
May 4, 2016
d57f55e
Zombie inmune al ácido y además arreglar color gris. Zombie aparece
juakotorres May 4, 2016
ba108c9
merge braulio
May 4, 2016
4a5f3ea
Se elimino el interruntp que hacia que los zombies no esperaran para …
May 5, 2016
a7f36d3
Se agrega el tiempo de Spawn de un zombie.
May 5, 2016
b66354a
Se agregó el cheatcode que permite mostrar en pantalla el porcentaje …
SetaSouto May 5, 2016
440f51f
Se agregaron System.out.println para encontrar los eventos del mouse
May 5, 2016
5d63d0c
Melee attack y negro letal.
juakotorres May 5, 2016
f9d53b0
Se corrigio un comentario
May 5, 2016
bd0ff05
Merge branch 'braulio' into zombie
May 5, 2016
c106cc1
First click = second when shooting
masotrix May 6, 2016
c8e9b6d
First click = second when shooting (fix)
masotrix May 6, 2016
21f5a71
Standardizing
masotrix May 6, 2016
9e91a4b
Standardizing
masotrix May 6, 2016
0af6a68
Standardizing
masotrix May 6, 2016
d9b49df
Optimización sprites zombies.
juakotorres May 6, 2016
83d36e0
Ahora los zombies aparecen dentro de un rango de tiempo
May 7, 2016
0e3c0d7
Merge pull request #46 from njara/Nicolas
njara May 8, 2016
01b384e
Merge pull request #47 from njara/Matias
njara May 8, 2016
822f38c
cambios para hacer merge
May 8, 2016
33f797c
Merge remote-tracking branch 'origin/Armas' into Nicolas
May 8, 2016
09d30a3
Disparo alternativo
masotrix May 8, 2016
fc16450
Merge branch 'Armas' of https://github.com/njara/mochadoom into Armas
masotrix May 8, 2016
039ef59
Se creó una plantilla de codigo a seguir para implementar los demas
May 8, 2016
238831f
Se quitó un try-catch.
May 8, 2016
e0ecf73
Merge pull request #48 from njara/Nicolas
njara May 8, 2016
76db5b1
Se cambio la implementacion al disparo secundario del arma shotgun,
May 8, 2016
a5254c2
Merge pull request #49 from njara/zombie
juakotorres May 9, 2016
e2d7e65
Merge pull request #50 from njara/jugador
Lapnis May 9, 2016
b2f2228
Merge pull request #51 from njara/Nicolas
njara May 9, 2016
67a72e9
Demo 1
juakotorres May 9, 2016
ff67fad
hola
juakotorres May 9, 2016
05a0140
Punch
masotrix May 10, 2016
551f4a7
Punch Right
masotrix May 10, 2016
b74cbd8
Rocket Launcher
masotrix May 10, 2016
2d4dab1
Refactoring clase Zombie, ahora los zombies con objetos por separado.
juakotorres May 12, 2016
02e3530
Merge branch 'braulio' into zombie
May 12, 2016
09e072f
Se borro pom sin querer.
juakotorres May 12, 2016
02bdf3d
Merge branch 'zombie' of https://github.com/njara/mochadoom into zombie
May 12, 2016
d8aac94
Se quitó .classpath y .proyect, no los commiteen!
May 12, 2016
5ccc2aa
Se pasó la responsabilidad de tener el color del sprite
juakotorres May 12, 2016
c80ee70
Colores dentro de las clases Zombie
juakotorres May 25, 2016
8579ceb
Merge branch 'zombie' of https://github.com/njara/mochadoom into zombie
juakotorres May 25, 2016
35bd379
- Nuevo metodo en Actions para disparo secundario de plasma gun
pablogomezm May 26, 2016
b749dcf
Merge pull request #53 from njara/zombie
njara May 26, 2016
e978fcc
- Cambie StateNum de plasma rifle por uno nuevo correspondiente al
pablogomezm May 26, 2016
549b72b
- Agregue A_FirePlasmaAlternate a think_t para el disparo secundario de
pablogomezm May 26, 2016
f9dd6eb
Merge pull request #52 from njara/Matias
njara May 26, 2016
26bac2c
Se quitaron los print.
SetaSouto May 26, 2016
6ff82ef
Actualizar
masotrix May 26, 2016
f0d6071
Conflict resolved
masotrix May 26, 2016
0553d34
Agregado envenenamiento(copiado de commit anterior) y antídoto(medikit).
juakotorres May 27, 2016
523d671
Detalle de un booleano.
juakotorres May 27, 2016
0df7106
- Commits antiguos de deteccion de botones del mouse en
pablogomezm May 28, 2016
e10868d
- A_FirePlasmaAlternate para el modo alternativo de plasma gun en
pablogomezm May 28, 2016
d7b1112
- Cambios para el disparo secundario de plasma gun localizados en
pablogomezm May 28, 2016
91b14ea
- Cambio en prints de deteccion de boton
pablogomezm May 28, 2016
718bb2f
Se crean Zombies al rededor de los monstruoes segun la dificultad.
May 30, 2016
6d380cf
Se agregaron clases para los monstruos.
juakotorres May 30, 2016
3a9d1e5
Enlaces a monstruos agregados a javadoc.
juakotorres May 30, 2016
021656d
- Sprite de arma ya no desaparece con click derecho
pablogomezm May 31, 2016
ae50448
- Disparo secundario funciona (dispara igual que el primario pero aun no
pablogomezm May 31, 2016
e4565e1
Zombies aparecen alrededor de monstruos.
juakotorres May 31, 2016
382c549
Ahora los zombies pueden ser dibujados en el mapa con su respectivo c…
SetaSouto May 31, 2016
1845cd8
Horde Mode
juakotorres May 31, 2016
fdb788a
Ahora el mapa se puede desplazar. Si se desea desplazar en (x,y) pixe…
SetaSouto Jun 2, 2016
c3da2ac
Se implemento el disparo secundario para el arma MachineGun y dispara…
xZeok Jun 2, 2016
cd4493e
Saw and punch
masotrix Jun 3, 2016
f8dc9ac
Improve punch design
masotrix Jun 3, 2016
f65b120
- Disparo secundario de plasma gun deja efecto de quemado y dispara en
pablogomezm Jun 4, 2016
bcc8b8e
Al usar el disparo secundario de MachineGun el jugador se daña por so…
xZeok Jun 4, 2016
1221b76
Al usar el disparo secundario de MachineGun el jugador se daña por so…
xZeok Jun 4, 2016
ef4e085
Se implemento el disparo secundario para la BFG
xZeok Jun 4, 2016
2d64637
Missile Secondary Shot
masotrix Jun 5, 2016
2379336
El disparo secundario de la BFG ahora dispara en multiples direccione…
xZeok Jun 5, 2016
316026b
Cambio en el orden del menu, y archivos necesarios para correr juego.
juakotorres Jun 6, 2016
1b98133
Merge pull request #55 from njara/Jaime
Jun 6, 2016
68252dd
Merge remote-tracking branch 'remotes/origin/iss10_braulio' into zombie
Jun 6, 2016
af8c665
Se implementa el cheatcode "marcopolo", que cambia la visualización p…
Jun 6, 2016
c12b1b4
Merge branch 'jugador' of https://github.com/njara/mochadoom into jug…
Jun 6, 2016
904f947
Correciones luego de juntar los cambios de Fabian y Javier
Jun 6, 2016
5349bdf
Eliminación de codigo incompleto
Jun 6, 2016
bea73fd
Merge branch 'master' of https://github.com/njara/mochadoom into jugador
Jun 6, 2016
6377dea
- Intento de cambio de colores fallido, no afecta funcionalidad
pablogomezm Jun 6, 2016
b052ddb
- Cambios de master incorporados a mano para hacer que el merge sea
pablogomezm Jun 7, 2016
2c026cf
- Merge de master a branch Pablo mediante intelliJ y traspasado a
pablogomezm Jun 7, 2016
620dc11
Merge remote-tracking branch 'remotes/origin/master' into Pablo
Jun 7, 2016
02ccb4f
Merge remote-tracking branch 'remotes/origin/master' into zombie
Jun 7, 2016
c4b6839
Merge pull request #57 from njara/Pablo
Jun 7, 2016
52023bd
Merge pull request #58 from njara/zombie
Jun 7, 2016
8d243dd
Merge pull request #59 from njara/Matias
masotrix Jun 7, 2016
f90cb06
Merged weapon changes
masotrix Jun 7, 2016
9f051e4
- se esta implementando el damageOverTime que se usara al usar la mac…
xZeok Aug 4, 2016
c1289d3
- ahora la funcion damagePlayer mata al jugador correctamente cuando …
xZeok Aug 4, 2016
ec7b8a0
- pequeño fix a la funcion DamagePlayer y ahora la BFG modo alternati…
xZeok Aug 4, 2016
a955944
Se agrego la bengala como disparo secundario, y se creo el metodo par…
Aug 4, 2016
65be9ed
- now the secondary mode of the machine gun damage the player over time
xZeok Aug 7, 2016
9125d24
Merge pull request #61 from njara/Jaime
xZeok Aug 8, 2016
ef7fb01
Merge pull request #64 from njara/bengala
njara Aug 9, 2016
45656b7
- se arreglo un error del daño por veneno (y por tiempo) en el cual s…
xZeok Aug 9, 2016
33e0e54
Merge branch 'master' of https://github.com/njara/mochadoom
Aug 9, 2016
b9569c2
Merge branch 'Jaime' of https://github.com/njara/mochadoom
xZeok Aug 9, 2016
5e464f8
Chain and punsh to head with bug
masotrix Aug 9, 2016
d1c35ae
Merge branch 'Matias'
masotrix Aug 9, 2016
43c8bbb
Aim for head fixed
masotrix Aug 9, 2016
0fb7242
Merge branch 'master' of https://github.com/njara/mochadoom
masotrix Aug 9, 2016
1b4a76b
Nothing
masotrix Aug 11, 2016
9db3729
Merge branch 'master' into Matias
masotrix Aug 11, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion run
100755 → 100644
Original file line number Diff line number Diff line change
@@ -2,4 +2,4 @@

cp target/mochadoom-1.6.1-SNAPSHOT.jar src/main/config/doom.jar
cd src/main/config
java -jar doom.jar -iwad freedoom1.wad
java -jar doom.jar -iwad freedoom1.wad -file horde.wad
Binary file modified src/main/config/doom.jar
Binary file not shown.
Binary file added src/main/config/horde.wad
Binary file not shown.
576 changes: 63 additions & 513 deletions src/main/java/net/sourceforge/mochadoom/data/info.java

Large diffs are not rendered by default.

49 changes: 49 additions & 0 deletions src/main/java/net/sourceforge/mochadoom/data/mobjinfo/Baby_t.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
package net.sourceforge.mochadoom.data.mobjinfo;

import static net.sourceforge.mochadoom.gamelogic.mobj_t.MF_COUNTKILL;
import static net.sourceforge.mochadoom.gamelogic.mobj_t.MF_SHOOTABLE;
import static net.sourceforge.mochadoom.gamelogic.mobj_t.MF_SOLID;
import static net.sourceforge.mochadoom.menu.fixed_t.FRACUNIT;

import net.sourceforge.mochadoom.data.sounds.sfxenum_t;
import net.sourceforge.mochadoom.defines.StateNum;
/**
* more info in this site: <a href="http://doom.wikia.com/wiki/Arachnotron">Baby</a>
* @author Joaquin
*
*/
public class Baby_t extends Monster_t {

public Baby_t() {
super( 68, // doomednum
StateNum.S_BSPI_STND, // spawnstate
500, // spawnhealth
StateNum.S_BSPI_SIGHT, // seestate
sfxenum_t.sfx_bspsit, // seesound
8, // reactiontime
sfxenum_t.sfx_None, // attacksound
StateNum.S_BSPI_PAIN, // painstate
128, // painchance
sfxenum_t.sfx_dmpain, // painsound
StateNum.S_NULL, // meleestate
StateNum.S_BSPI_ATK1, // missilestate
StateNum.S_BSPI_DIE1, // deathstate
StateNum.S_NULL, // xdeathstate
sfxenum_t.sfx_bspdth, // deathsound
12, // speed
64 * FRACUNIT, // radius
64 * FRACUNIT, // height
600, // mass
0, // damage
sfxenum_t.sfx_bspact, // activesound
MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL, // flags
StateNum.S_BSPI_RAISE1 // raisestate
);
}

@Override
public String getsubType() {
return "MT_BABY";
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
package net.sourceforge.mochadoom.data.mobjinfo;

import static net.sourceforge.mochadoom.gamelogic.mobj_t.MF_SHOOTABLE;
import static net.sourceforge.mochadoom.gamelogic.mobj_t.MF_SOLID;
import static net.sourceforge.mochadoom.menu.fixed_t.FRACUNIT;

import net.sourceforge.mochadoom.data.sounds.sfxenum_t;
import net.sourceforge.mochadoom.defines.StateNum;
/**
* more info in this site: <a href="http://doom.wikia.com/wiki/Boss_Brain">Boss Brain</a>
* @author Joaquin
*
*/
public class BossBrain_t extends Monster_t {

public BossBrain_t() {
super(88, // doomednum
StateNum.S_BRAIN, // spawnstate
250, // spawnhealth
StateNum.S_NULL, // seestate
sfxenum_t.sfx_None, // seesound
8, // reactiontime
sfxenum_t.sfx_None, // attacksound
StateNum.S_BRAIN_PAIN, // painstate
255, // painchance
sfxenum_t.sfx_bospn, // painsound
StateNum.S_NULL, // meleestate
StateNum.S_NULL, // missilestate
StateNum.S_BRAIN_DIE1, // deathstate
StateNum.S_NULL, // xdeathstate
sfxenum_t.sfx_bosdth, // deathsound
0, // speed
16 * FRACUNIT, // radius
16 * FRACUNIT, // height
10000000, // mass
0, // damage
sfxenum_t.sfx_None, // activesound
MF_SOLID | MF_SHOOTABLE, // flags
StateNum.S_NULL // raisestate
);
}

@Override
public String getsubType() {
return "MT_BOSSBRAIN";
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
package net.sourceforge.mochadoom.data.mobjinfo;

import static net.sourceforge.mochadoom.gamelogic.mobj_t.MF_COUNTKILL;
import static net.sourceforge.mochadoom.gamelogic.mobj_t.MF_SHOOTABLE;
import static net.sourceforge.mochadoom.gamelogic.mobj_t.MF_SOLID;
import static net.sourceforge.mochadoom.menu.fixed_t.FRACUNIT;

import net.sourceforge.mochadoom.data.sounds.sfxenum_t;
import net.sourceforge.mochadoom.defines.StateNum;
/**
* more info in this site: <a href="http://doom.wikia.com/wiki/Baron_of_Hell">Bruiser</a>
* @author Joaquin
*
*/
public class Bruiser_t extends Monster_t {

public Bruiser_t() {
super(3003, // doomednum
StateNum.S_BOSS_STND, // spawnstate
1000, // spawnhealth
StateNum.S_BOSS_RUN1, // seestate
sfxenum_t.sfx_brssit, // seesound
8, // reactiontime
sfxenum_t.sfx_None, // attacksound
StateNum.S_BOSS_PAIN, // painstate
50, // painchance
sfxenum_t.sfx_dmpain, // painsound
StateNum.S_BOSS_ATK1, // meleestate
StateNum.S_BOSS_ATK1, // missilestate
StateNum.S_BOSS_DIE1, // deathstate
StateNum.S_NULL, // xdeathstate
sfxenum_t.sfx_brsdth, // deathsound
8, // speed
24 * FRACUNIT, // radius
64 * FRACUNIT, // height
1000, // mass
0, // damage
sfxenum_t.sfx_dmact, // activesound
MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL, // flags
StateNum.S_BOSS_RAISE1 // raisestate
);
}

@Override
public String getsubType() {
return "MT_BRUISER";
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
package net.sourceforge.mochadoom.data.mobjinfo;

import static net.sourceforge.mochadoom.gamelogic.mobj_t.MF_COUNTKILL;
import static net.sourceforge.mochadoom.gamelogic.mobj_t.MF_SHOOTABLE;
import static net.sourceforge.mochadoom.gamelogic.mobj_t.MF_SOLID;
import static net.sourceforge.mochadoom.menu.fixed_t.FRACUNIT;

import net.sourceforge.mochadoom.data.sounds.sfxenum_t;
import net.sourceforge.mochadoom.defines.StateNum;
/**
* more info in this site: <a href="http://doom.wikia.com/wiki/Chaingunner">ChainGuy</a>
* @author Joaquin
*
*/
public class ChainGuy_t extends Monster_t {

public ChainGuy_t() {
super( 65, // doomednum
StateNum.S_CPOS_STND, // spawnstate
70, // spawnhealth
StateNum.S_CPOS_RUN1, // seestate
sfxenum_t.sfx_posit2, // seesound
8, // reactiontime
sfxenum_t.sfx_None, // attacksound
StateNum.S_CPOS_PAIN, // painstate
170, // painchance
sfxenum_t.sfx_popain, // painsound
StateNum.S_NULL, // meleestate
StateNum.S_CPOS_ATK1, // missilestate
StateNum.S_CPOS_DIE1, // deathstate
StateNum.S_CPOS_XDIE1, // xdeathstate
sfxenum_t.sfx_podth2, // deathsound
8, // speed
20 * FRACUNIT, // radius
56 * FRACUNIT, // height
100, // mass
0, // damage
sfxenum_t.sfx_posact, // activesound
MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL, // flags
StateNum.S_CPOS_RAISE1 // raisestate
);
}

@Override
public String getsubType() {
return "MT_CHAINGUY";
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
package net.sourceforge.mochadoom.data.mobjinfo;

import static net.sourceforge.mochadoom.gamelogic.mobj_t.MF_COUNTKILL;
import static net.sourceforge.mochadoom.gamelogic.mobj_t.MF_NOGRAVITY;
import static net.sourceforge.mochadoom.gamelogic.mobj_t.MF_SHOOTABLE;
import static net.sourceforge.mochadoom.gamelogic.mobj_t.MF_SOLID;
import static net.sourceforge.mochadoom.gamelogic.mobj_t.MF_SPAWNCEILING;
import static net.sourceforge.mochadoom.menu.fixed_t.FRACUNIT;

import net.sourceforge.mochadoom.data.sounds.sfxenum_t;
import net.sourceforge.mochadoom.defines.StateNum;
/**
* more info in this site: <a href="http://doom.wikia.com/wiki/Commander_Keen">Commander Keen</a>
* @author Joaquin
*
*/
public class CommanderKeen_t extends Monster_t {

public CommanderKeen_t() {
super(72, // doomednum
StateNum.S_KEENSTND, // spawnstate
100, // spawnhealth
StateNum.S_NULL, // seestate
sfxenum_t.sfx_None, // seesound
8, // reactiontime
sfxenum_t.sfx_None, // attacksound
StateNum.S_KEENPAIN, // painstate
256, // painchance
sfxenum_t.sfx_keenpn, // painsound
StateNum.S_NULL, // meleestate
StateNum.S_NULL, // missilestate
StateNum.S_COMMKEEN, // deathstate
StateNum.S_NULL, // xdeathstate
sfxenum_t.sfx_keendt, // deathsound
0, // speed
16 * FRACUNIT, // radius
72 * FRACUNIT, // height
10000000, // mass
0, // damage
sfxenum_t.sfx_None, // activesound
MF_SOLID | MF_SPAWNCEILING | MF_NOGRAVITY | MF_SHOOTABLE | MF_COUNTKILL, // flags
StateNum.S_NULL // raisestate
);
}

@Override
public String getsubType() {
return "MT_KEEN";
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
package net.sourceforge.mochadoom.data.mobjinfo;

import static net.sourceforge.mochadoom.gamelogic.mobj_t.MF_COUNTKILL;
import static net.sourceforge.mochadoom.gamelogic.mobj_t.MF_SHOOTABLE;
import static net.sourceforge.mochadoom.gamelogic.mobj_t.MF_SOLID;
import static net.sourceforge.mochadoom.menu.fixed_t.FRACUNIT;

import net.sourceforge.mochadoom.data.sounds.sfxenum_t;
import net.sourceforge.mochadoom.defines.StateNum;

/**
* more info in this site: <a href="http://doom.wikia.com/wiki/Cyberdemon">Cyborg</a>
* @author Joaquin
*
*/
public class Cyborg_t extends Monster_t {

public Cyborg_t() {
super( 16, // doomednum
StateNum.S_CYBER_STND, // spawnstate
4000, // spawnhealth
StateNum.S_CYBER_RUN1, // seestate
sfxenum_t.sfx_cybsit, // seesound
8, // reactiontime
sfxenum_t.sfx_None, // attacksound
StateNum.S_CYBER_PAIN, // painstate
20, // painchance
sfxenum_t.sfx_dmpain, // painsound
StateNum.S_NULL, // meleestate
StateNum.S_CYBER_ATK1, // missilestate
StateNum.S_CYBER_DIE1, // deathstate
StateNum.S_NULL, // xdeathstate
sfxenum_t.sfx_cybdth, // deathsound
16, // speed
40 * FRACUNIT, // radius
110 * FRACUNIT, // height
1000, // mass
0, // damage
sfxenum_t.sfx_dmact, // activesound
MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL, // flags
StateNum.S_NULL // raisestate
);
}

@Override
public String getsubType() {
return "MT_CYBORG";
}

}
49 changes: 49 additions & 0 deletions src/main/java/net/sourceforge/mochadoom/data/mobjinfo/Fatso_t.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
package net.sourceforge.mochadoom.data.mobjinfo;

import static net.sourceforge.mochadoom.gamelogic.mobj_t.MF_COUNTKILL;
import static net.sourceforge.mochadoom.gamelogic.mobj_t.MF_SHOOTABLE;
import static net.sourceforge.mochadoom.gamelogic.mobj_t.MF_SOLID;
import static net.sourceforge.mochadoom.menu.fixed_t.FRACUNIT;

import net.sourceforge.mochadoom.data.sounds.sfxenum_t;
import net.sourceforge.mochadoom.defines.StateNum;
/**
* more info in this site: <a href="doom.wikia.com/wiki/Mancubus">Fatso</a>
* @author Joaquin
*
*/
public class Fatso_t extends Monster_t {

public Fatso_t() {
super( 67, // doomednum
StateNum.S_FATT_STND, // spawnstate
600, // spawnhealth
StateNum.S_FATT_RUN1, // seestate
sfxenum_t.sfx_mansit, // seesound
8, // reactiontime
sfxenum_t.sfx_None, // attacksound
StateNum.S_FATT_PAIN, // painstate
80, // painchance
sfxenum_t.sfx_mnpain, // painsound
StateNum.S_NULL, // meleestate
StateNum.S_FATT_ATK1, // missilestate
StateNum.S_FATT_DIE1, // deathstate
StateNum.S_NULL, // xdeathstate
sfxenum_t.sfx_mandth, // deathsound
8, // speed
48 * FRACUNIT, // radius
64 * FRACUNIT, // height
1000, // mass
0, // damage
sfxenum_t.sfx_posact, // activesound
MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL, // flags
StateNum.S_FATT_RAISE1 // raisestate
);
}

@Override
public String getsubType() {
return "MT_FATSO";
}

}
Original file line number Diff line number Diff line change
@@ -3,9 +3,10 @@
import static net.sourceforge.mochadoom.gamelogic.mobj_t.MF_COUNTKILL;
import static net.sourceforge.mochadoom.gamelogic.mobj_t.MF_SHOOTABLE;
import static net.sourceforge.mochadoom.gamelogic.mobj_t.MF_SOLID;
import static net.sourceforge.mochadoom.gamelogic.mobj_t.MF_NOGRAVITY;
import static net.sourceforge.mochadoom.gamelogic.mobj_t.MF_JUSTHIT;
import static net.sourceforge.mochadoom.menu.fixed_t.FRACUNIT;

import net.sourceforge.mochadoom.data.sounds;
import net.sourceforge.mochadoom.data.sounds.sfxenum_t;
import net.sourceforge.mochadoom.defines.StateNum;
import net.sourceforge.mochadoom.rendering.LightsAndColors;
@@ -18,7 +19,7 @@ public GreenZombie_t() {
,200,sfxenum_t.sfx_popain,StateNum.S_NULL,StateNum.S_NULL,
StateNum.S_POSS_DIE1,StateNum.S_POSS_XDIE1,sfxenum_t.sfx_podth1,
10,20 * FRACUNIT,56 * FRACUNIT,100,0,sfxenum_t.sfx_posact,
MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL,StateNum.S_POSS_RAISE1);
MF_SOLID | MF_SHOOTABLE | MF_COUNTKILL | MF_NOGRAVITY | MF_JUSTHIT,StateNum.S_POSS_RAISE1);
}

public GreenZombie_t(int doomednum2, StateNum spawnstate2, int spawnhealth2, StateNum seestate2, sfxenum_t seesound2,
Loading