pry door should only work on closed objects #61

BGforgeNet · Jan 20, 2021 · 36d3e46 · 36d3e46
1 parent ad5c1d9
commit 36d3e46
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/data/text/english/dialog/containr.msg b/data/text/english/dialog/containr.msg
@@ -290,6 +290,7 @@
 {187}{}{ strains her back while trying to bust the lock and takes }
 {188}{}{ points of damage.}
 
+{601}{}{It is open, dummy.}
 #############################################################
 #  Damage done to the door due to explosives.               #
 #############################################################

diff --git a/data/text/english/dialog/door.msg b/data/text/english/dialog/door.msg
@@ -288,6 +288,7 @@
 {187}{}{ strains her back while trying to bust the lock and takes }
 {188}{}{ points of damage.}
 
+{601}{}{It is open, dummy.}
 #############################################################
 #  Damage done to the door due to explosives.               #
 #############################################################

diff --git a/scripts_src/generic/ziwoddor.ssl b/scripts_src/generic/ziwoddor.ssl
@@ -1392,7 +1392,12 @@ crowbar or some similar instrument.
 procedure Pry_Door begin
   variable Stat_Roll;
   script_overrides;
-
+
+  if not obj_is_locked(self_obj) then begin
+    display_msg(my_mstr(601));
+    return;
+  end
+
   Stat_Roll:=do_check(source_obj,STAT_st,Crowbar_Bonus);
 
   if (is_success(Stat_Roll)) then begin

diff --git a/scripts_src/headers/doors_containers.h b/scripts_src/headers/doors_containers.h
@@ -190,7 +190,12 @@ crowbar or some similar instrument.
 #ifndef custom_Pry_Door
   procedure Pry_Door begin
     variable Stat_Roll;
-
+
+    if not obj_is_locked(self_obj) then begin
+      display_msg(my_mstr(601));
+      return;
+    end
+
     Stat_Roll:=do_check(source_obj,STAT_st,Crowbar_Bonus);
 
     if (is_success(Stat_Roll)) then begin