Skip to content

Commit

Permalink
more Damage_Critter #61 - white space differences
Browse files Browse the repository at this point in the history
  • Loading branch information
burner1024 committed Jan 11, 2021
1 parent 465fc25 commit c202e30
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 75 deletions.
26 changes: 1 addition & 25 deletions scripts_src/modoc/midavdor.ssl
Original file line number Diff line number Diff line change
Expand Up @@ -1475,32 +1475,7 @@ procedure Pry_Door begin
end


/*
Should the trap go off for any reason by critter influence, then this procedure will
be called to deal damage to the critter, display a message stating how much damage
was taken, and remove the trap.
*/

procedure Damage_Critter begin
variable Trap_Damage;

Trap_Damage:=random(MIN_DAMAGE,MAX_DAMAGE);

if (source_obj == dude_obj) then begin
critter_dmg(dude_obj,Trap_Damage,(DMG_explosion BWOR DMG_BYPASS_ARMOR));
/* display_msg("You set off the trap and were hit for "+Trap_Damage+" points of damage.); */
display_msg(mstr(166)+Trap_Damage+mstr(167));
end

else begin
critter_dmg(source_obj,Trap_Damage,(DMG_explosion BWOR DMG_BYPASS_ARMOR));
/* display_msg(Critter_Name+" set off the trap was hit for "+Trap_Damage+" points of damage"); */
display_msg(obj_name(source_obj)+mstr(168)+Trap_Damage+mstr(169));
end

/* The trap is now disarmed and should never go off again. */
set_local_var(LVAR_Trapped, STATE_INACTIVE);
end

procedure destroy_p_proc begin
if (cage_door) then begin
Expand All @@ -1523,3 +1498,4 @@ begin

call Lock_Door;
end
#include "../headers/doors2.h"
26 changes: 1 addition & 25 deletions scripts_src/modoc/midoor.ssl
Original file line number Diff line number Diff line change
Expand Up @@ -1451,32 +1451,7 @@ procedure Pry_Door begin
end


/*
Should the trap go off for any reason by critter influence, then this procedure will
be called to deal damage to the critter, display a message stating how much damage
was taken, and remove the trap.
*/

procedure Damage_Critter begin
variable Trap_Damage;

Trap_Damage:=random(MIN_DAMAGE,MAX_DAMAGE);

if (source_obj == dude_obj) then begin
critter_dmg(dude_obj,Trap_Damage,(DMG_explosion BWOR DMG_BYPASS_ARMOR));
/* display_msg("You set off the trap and were hit for "+Trap_Damage+" points of damage.); */
display_msg(mstr(166)+Trap_Damage+mstr(167));
end

else begin
critter_dmg(source_obj,Trap_Damage,(DMG_explosion BWOR DMG_BYPASS_ARMOR));
/* display_msg(Critter_Name+" set off the trap was hit for "+Trap_Damage+" points of damage"); */
display_msg(obj_name(source_obj)+mstr(168)+Trap_Damage+mstr(169));
end

/* The trap is now disarmed and should never go off again. */
set_local_var(LVAR_Trapped, STATE_INACTIVE);
end

procedure destroy_p_proc begin
if (cage_door) then begin
Expand All @@ -1499,3 +1474,4 @@ begin

call Lock_Door;
end
#include "../headers/doors2.h"
26 changes: 1 addition & 25 deletions scripts_src/modoc/mimirdor.ssl
Original file line number Diff line number Diff line change
Expand Up @@ -1477,32 +1477,7 @@ procedure Pry_Door begin
end


/*
Should the trap go off for any reason by critter influence, then this procedure will
be called to deal damage to the critter, display a message stating how much damage
was taken, and remove the trap.
*/

procedure Damage_Critter begin
variable Trap_Damage;

Trap_Damage:=random(MIN_DAMAGE,MAX_DAMAGE);

if (source_obj == dude_obj) then begin
critter_dmg(dude_obj,Trap_Damage,(DMG_explosion BWOR DMG_BYPASS_ARMOR));
/* display_msg("You set off the trap and were hit for "+Trap_Damage+" points of damage.); */
display_msg(mstr(166)+Trap_Damage+mstr(167));
end

else begin
critter_dmg(source_obj,Trap_Damage,(DMG_explosion BWOR DMG_BYPASS_ARMOR));
/* display_msg(Critter_Name+" set off the trap was hit for "+Trap_Damage+" points of damage"); */
display_msg(obj_name(source_obj)+mstr(168)+Trap_Damage+mstr(169));
end

/* The trap is now disarmed and should never go off again. */
set_local_var(LVAR_Trapped, STATE_INACTIVE);
end

procedure destroy_p_proc begin
if (cage_door) then begin
Expand All @@ -1525,3 +1500,4 @@ begin

call Lock_Door;
end
#include "../headers/doors2.h"

0 comments on commit c202e30

Please sign in to comment.