diff --git a/docs/rh-log.txt b/docs/rh-log.txt index 5ff1f8ee7..a27f31067 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,3 +1,6 @@ +August 11, 2008 (Changes by Graf Zahl) +- Did a thorough check of all DECORATE conversions and fixed the errors I found. + August 10, 2008 (Changes by Graf Zahl) - Macro-fied all access to action functions. - Changed action function definition so that they have to be defined with a diff --git a/wadsrc/static/actors/strife/entityboss.txt b/wadsrc/static/actors/strife/entityboss.txt index b6ec8ac5f..3980eb04e 100644 --- a/wadsrc/static/actors/strife/entityboss.txt +++ b/wadsrc/static/actors/strife/entityboss.txt @@ -90,9 +90,9 @@ ACTOR EntityBoss : SpectralMonster 128 States { Spawn: - MNAM A 100 A_SentinelBob - MNAM B 60 Bright A_SentinelBob - MNAM CDEFGHIJKL 4 Bright A_SentinelBob + MNAM A 100 + MNAM B 60 Bright + MNAM CDEFGHIJKL 4 Bright MNAL A 4 Bright A_Look MNAL B 4 Bright A_SentinelBob Goto Spawn+12 @@ -184,7 +184,6 @@ ACTOR EntitySecond : SpectralMonster Missile: MNAL W 4 Bright A_FaceTarget MNAL U 4 Bright A_CustomMissile("SpectralLightningH3",32,0) - MNAL V 4 Bright A_SentinelBob Goto See+4 Pain: diff --git a/wadsrc/static/actors/strife/sentinel.txt b/wadsrc/static/actors/strife/sentinel.txt index b046b3d24..8128063c4 100644 --- a/wadsrc/static/actors/strife/sentinel.txt +++ b/wadsrc/static/actors/strife/sentinel.txt @@ -85,6 +85,7 @@ ACTOR SentinelFX1 ACTOR SentinelFX2 : SentinelFX1 { SeeSound "sentinel/plasma" + Damage 1 States { Death: diff --git a/wadsrc/static/actors/strife/stalker.txt b/wadsrc/static/actors/strife/stalker.txt index 32098d14c..80732131e 100644 --- a/wadsrc/static/actors/strife/stalker.txt +++ b/wadsrc/static/actors/strife/stalker.txt @@ -55,7 +55,7 @@ ACTOR Stalker 186 STLK K 3 A_StalkerAttack SeeFloor: STLK J 3 A_StalkerWalk - STLK JKK 3 A_Chase + STLK KK 3 A_Chase STLK L 3 A_StalkerWalk STLK L 3 A_Chase Loop diff --git a/wadsrc/static/actors/strife/strifehumanoid.txt b/wadsrc/static/actors/strife/strifehumanoid.txt index f3ac73cb0..fc7d85d81 100644 --- a/wadsrc/static/actors/strife/strifehumanoid.txt +++ b/wadsrc/static/actors/strife/strifehumanoid.txt @@ -22,7 +22,7 @@ ACTOR StrifeHumanoid BURN N 5 Bright BURN OPQPQ 5 Bright BURN RSTU 7 Bright - BURN V -1 + BURN V 700 Stop Disintegrate: DISR A 5 A_PlaySoundEx("misc/disruptordeath", "Voice") @@ -30,7 +30,7 @@ ACTOR StrifeHumanoid DISR D 5 A_NoBlocking DISR EF 5 DISR GHIJ 4 - MEAT D -1 + MEAT D 700 Stop } } diff --git a/wadsrc/static/actors/strife/strifeweapons.txt b/wadsrc/static/actors/strife/strifeweapons.txt index a9e2deff8..a6cdd324f 100644 --- a/wadsrc/static/actors/strife/strifeweapons.txt +++ b/wadsrc/static/actors/strife/strifeweapons.txt @@ -187,7 +187,7 @@ ACTOR StrifeCrossbow : StrifeWeapon 2001 XBOW F 5 XBOW G 0 A_ShowElectricFlash XBOW G 5 A_CheckReload - Goto Ready + Goto Ready+1 Flash: XBOW KLM 5 Loop @@ -347,7 +347,7 @@ ACTOR RocketTrail // Rocket Puff -------------------------------------------------------------- -ACTOR MiniMissilePuff +ACTOR MiniMissilePuff : StrifePuff { -ALLOWPARTICLES States @@ -538,7 +538,7 @@ ACTOR Mauler2 : Mauler MAUL I 20 A_FireMauler2Pre MAUL J 10 A_Light1 BLSF A 10 Bright A_FireMauler2 - MAUL B 3 Bright A_Light2 + MAUL B 10 Bright A_Light2 MAUL C 2 MAUL D 2 A_Light0 MAUL E 2 A_ReFire @@ -613,7 +613,9 @@ ACTOR MaulerTorpedoWave States { Spawn: - TWAV ABC 9 Bright + TWAV AB 9 Bright + Death: + TWAV C 9 Bright Stop } } @@ -685,7 +687,7 @@ ACTOR PhosphorousGrenade GRIN AB 3 A_Countdown Loop Death: - BNG3 A 1 A_SpawnItemEx("PhosphorousFire") + BNG3 A 2 A_SpawnItemEx("PhosphorousFire") Stop } } diff --git a/wadsrc/static/actors/strife/thingstoblowup.txt b/wadsrc/static/actors/strife/thingstoblowup.txt index 5d0088c43..2b8f3d93e 100644 --- a/wadsrc/static/actors/strife/thingstoblowup.txt +++ b/wadsrc/static/actors/strife/thingstoblowup.txt @@ -27,7 +27,7 @@ ACTOR Piston 45 ConversationID 123,-1,-1 Health 100 Speed 16 - Radius 16 + Radius 20 Height 76 Mass 10000000 +SOLID @@ -61,7 +61,7 @@ ACTOR Piston 45 ACTOR Computer 182 { Game Strife - ConversationID 128,-1,-1 + ConversationID 124,-1,-1 Health 80 Speed 27 Radius 26