stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-18 18:11:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'eggman-hitboxes' into 2210-pre2

Browse source
This commit is contained in:
spherallic 2022-02-10 13:15:51 +01:00
commit 8f91b99ecf
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
extras/conf/SRB2-22.cfg
View file

@ -4037,16 +4037,16 @@ thingtypes
{ {
title = "Egg Mobile"; title = "Egg Mobile";
sprite = "EGGMA1"; sprite = "EGGMA1";
width = 24; width = 36;
height = 76; height = 84;
flags4text = "[4] End level on death"; flags4text = "[4] End level on death";
} }
201 201
{ {
title = "Egg Slimer"; title = "Egg Slimer";
sprite = "EGGNA1"; sprite = "EGGNA1";
width = 24; width = 36;
height = 76; height = 84;
flags4text = "[4] End level on death"; flags4text = "[4] End level on death";
flags8text = "[8] Speed up when hit"; flags8text = "[8] Speed up when hit";
} }
@ -4054,7 +4054,7 @@ thingtypes
{ {
title = "Sea Egg"; title = "Sea Egg";
sprite = "EGGOA1"; sprite = "EGGOA1";
width = 32; width = 36;
height = 116; height = 116;
flags4text = "[4] End level on death"; flags4text = "[4] End level on death";
} }
@ -4062,8 +4062,8 @@ thingtypes
{ {
title = "Egg Colosseum"; title = "Egg Colosseum";
sprite = "EGGPA1"; sprite = "EGGPA1";
width = 24; width = 36;
height = 76; height = 84;
flags4text = "[4] End level on death"; flags4text = "[4] End level on death";
} }
204 204

16
src/info.c
View file

@ -5682,8 +5682,8 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_EGGMOBILE_FLEE1, // xdeathstate S_EGGMOBILE_FLEE1, // xdeathstate
sfx_s3kb4, // deathsound sfx_s3kb4, // deathsound
4, // speed 4, // speed
24*FRACUNIT, // radius 36*FRACUNIT, // radius
76*FRACUNIT, // height 84*FRACUNIT, // height
0, // display offset 0, // display offset
sfx_None, // mass sfx_None, // mass
3, // damage 3, // damage
@ -5817,8 +5817,8 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_EGGMOBILE2_FLEE1,// xdeathstate S_EGGMOBILE2_FLEE1,// xdeathstate
sfx_s3kb4, // deathsound sfx_s3kb4, // deathsound
2*FRACUNIT, // speed 2*FRACUNIT, // speed
24*FRACUNIT, // radius 36*FRACUNIT, // radius
76*FRACUNIT, // height 84*FRACUNIT, // height
0, // display offset 0, // display offset
0, // mass 0, // mass
3, // damage 3, // damage
@ -5925,7 +5925,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_EGGMOBILE3_FLEE1, // xdeathstate S_EGGMOBILE3_FLEE1, // xdeathstate
sfx_s3kb4, // deathsound sfx_s3kb4, // deathsound
8*FRACUNIT, // speed 8*FRACUNIT, // speed
32*FRACUNIT, // radius 36*FRACUNIT, // radius
116*FRACUNIT, // height 116*FRACUNIT, // height
0, // display offset 0, // display offset
MT_FAKEMOBILE, // mass MT_FAKEMOBILE, // mass
@ -5952,7 +5952,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // xdeathstate S_NULL, // xdeathstate
sfx_mswarp, // deathsound sfx_mswarp, // deathsound
8*FRACUNIT, // speed 8*FRACUNIT, // speed
32*FRACUNIT, // radius 36*FRACUNIT, // radius
116*FRACUNIT, // height 116*FRACUNIT, // height
0, // display offset 0, // display offset
0, // mass 0, // mass
@ -6006,8 +6006,8 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_EGGMOBILE4_FLEE1,// xdeathstate S_EGGMOBILE4_FLEE1,// xdeathstate
sfx_s3kb4, // deathsound sfx_s3kb4, // deathsound
0, // speed 0, // speed
24*FRACUNIT, // radius 36*FRACUNIT, // radius
76*FRACUNIT, // height 84*FRACUNIT, // height
0, // display offset 0, // display offset
0, // mass 0, // mass
3, // damage 3, // damage