Sync with UPU: crowbar nerf, grammar fixes.

Ref BGforgeNet/Fallout2_Unofficial_Patch#61
    BGforgeNet/Fallout2_Unofficial_Patch#101
    #187

Author: burner1024

data/text/english/dialog/containr.msg

@@ -254,40 +254,37 @@
 
 # Player uses an item on the door
 {176}{}{You bust the lock off the container.}
-{177}{}{You strain your back while trying to bust the lock and
- take a point of damage.}
+{177}{}{You strain your back while trying to bust the lock off and take a point of damage.}
 
 # The following set of lines is to be translated as:
-# You strain your back while trying to bust the lock and
+# You strain your back while trying to bust the lock off and
 # take [x] points of damage.
 
-{178}{}{You strain your back while trying to bust the lock and
+{178}{}{You strain your back while trying to bust the lock off and
  take }
 {179}{}{ points of damage.}
-{180}{}{You are too weak to bust the lock.}
+{180}{}{You are too weak to bust the lock off.}
 
 # NPC uses an item on the door
 # The following lines are prepended by the NPC's name
 {181}{}{ busts the lock off the container.}
-{182}{}{ strains his back while trying to bust the lock and takes
- a point of damage.}
+{182}{}{ strains his back while trying to bust the lock off and takes a point of damage.}
 
 # The following line set of lines is to be translated as:
-# NPC strains his back while trying to bust the lock and
+# NPC strains his back while trying to bust the lock off and
 # takes [x] points of damage
 
-{183}{}{ strains his back while trying to bust the lock and takes }
+{183}{}{ strains his back while trying to bust the lock off and takes }
 {184}{}{ points of damage.}
 
 {185}{}{ is too weak to bust the lock.}
-{186}{}{ strains her back while trying to bust the lock and takes
- a point of damage.}
+{186}{}{ strains her back while trying to bust the lock off and takes a point of damage.}
 
 # The following line set of lines is to be translated as:
-# NPC strains her back while trying to bust the lock and
+# NPC strains her back while trying to bust the lock off and
 # takes [x] points of damage
 
-{187}{}{ strains her back while trying to bust the lock and takes }
+{187}{}{ strains her back while trying to bust the lock off and takes }
 {188}{}{ points of damage.}
 
 {601}{}{It is open, dummy.}

data/text/english/dialog/door.msg

@@ -252,40 +252,36 @@
 
 # Player uses an item on the door
 {176}{}{You bust the lock off the door.}
-{177}{}{You strain your back while trying to bust the lock and
- take a point of damage.}
+{177}{}{You strain your back while trying to bust the lock off and take a point of damage.}
 
 # The following set of lines is to be translated as:
-# You strain your back while trying to bust the lock and
+# You strain your back while trying to bust the lock off and
 # take [x] points of damage.
 
-{178}{}{You strain your back while trying to bust the lock and
- take }
+{178}{}{You strain your back while trying to bust the lock off and take }
 {179}{}{ points of damage.}
-{180}{}{You are too weak to bust the lock.}
+{180}{}{You are too weak to bust the lock off.}
 
 # NPC uses an item on the door
 # The following lines are prepended by the NPC's name
 {181}{}{ busts the lock off the door.}
-{182}{}{ strains his back while trying to bust the lock and takes
- a point of damage.}
+{182}{}{ strains his back while trying to bust the lock off and takes a point of damage.}
 
 # The following line set of lines is to be translated as:
-# NPC strains his back while trying to bust the lock and
+# NPC strains his back while trying to bust the lock off and
 # takes [x] points of damage
 
-{183}{}{ strains his back while trying to bust the lock and takes }
+{183}{}{ strains his back while trying to bust the lock off and takes }
 {184}{}{ points of damage.}
 
 {185}{}{ is too weak to bust the lock.}
-{186}{}{ strains her back while trying to bust the lock and takes
- a point of damage.}
+{186}{}{ strains her back while trying to bust the lock off and takes a point of damage.}
 
 # The following line set of lines is to be translated as:
-# NPC strains her back while trying to bust the lock and
+# NPC strains her back while trying to bust the lock off and
 # takes [x] points of damage
 
-{187}{}{ strains her back while trying to bust the lock and takes }
+{187}{}{ strains her back while trying to bust the lock off and takes }
 {188}{}{ points of damage.}
 
 {601}{}{It is open, dummy.}

scripts_src/generic/ziwoddor.ssl

@@ -1,3 +1,4 @@
+/** @tra door.msg */
 /*
 	Copyright 1998-2003 Interplay Entertainment Corp.  All rights reserved.
 */
@@ -21,10 +22,11 @@
 
 
 /* Include Files */
-#ifndef SCRIPT_REALNAME //kivicdoor includes this file, need to avoid warning
-#define SCRIPT_REALNAME "ziwoddor"
+#ifndef SCRIPT_REALNAME // kivicdoor includes this file, need to avoid warning
+  #define SCRIPT_REALNAME "ziwoddor"
 #endif
 #include "../headers/define.h"
+#include "../sfall/define_extra.h"
 
 #define NAME                    SCRIPT_DOOR
 
@@ -84,6 +86,9 @@
 #define MIN_DAMAGE                      (10)
 #define MAX_DAMAGE                      (20)
 
+// 3 and less is just not enough to work the crowbar
+#define MIN_STRENGTH  4
+
 /* Experience Points for Skills */
 #define Lockpick_Exp                    EXP_LOCKPICK_NEG_20
 #define Traps_Exp                       EXP_TRAPS_NORMAL
@@ -1427,28 +1432,30 @@ procedure Lock_Door begin
   end
 end
 
-
-/***************************************************************************
-This procedure is used should the player try to pry the door open using a
-crowbar or some similar instrument.
-***************************************************************************/
-// For wood doors, Crowbar_Bonus = 0, which means always success
+/**
+ * This procedure is used should the player try to pry the door open using a crowbar or some similar instrument.
+ */
 procedure roll_pry_success begin
-  variable rnd = random(1,10);
-  if rnd <= (get_critter_stat(source_obj,STAT_st) + Crowbar_Bonus) then return true;
+  variable rnd = random(MIN_STRENGTH, 10);
+  if (get_critter_stat(source_obj, STAT_st) + Crowbar_Bonus) > rnd then return true;
   return false;
 end
 
-// Sturdier doors and high strength provide more chance to mangle the crowbar
-// Any STR char + wood door = 1% chance to destroy
-// 5 STR char + metal door = 10% chance to destroy
-// 10 STR char + metal door = 20% chance to destroy
+// Sturdier doors and high strength provide higher chance to mangle the crowbar
+// 4 STR char + wood door = 1% chance to destroy
+// 5 STR char + metal container = 10% chance to destroy
+// 10 STR char + metal container = 20% chance to destroy
 procedure roll_pry_destroy_crowbar begin
-  variable rnd = random(1,100);
-  variable str = get_critter_stat(source_obj,STAT_st);
+  variable rnd = random(1, 100);
+  variable str = get_critter_stat(source_obj, STAT_st);
+
+  // Too weak to bend it
+  if str < MIN_STRENGTH then return false;
+
   // Base Crowbar_Bonus = 0 (wood door). For metal doors, default is -2
   variable penalty = str * Crowbar_Bonus;
   if rnd + penalty <= 1 then return true;
+
   return false;
 end
 
@@ -1462,6 +1469,16 @@ procedure Pry_Door begin
     return;
   end
 
+  /** True if I am a container, False otherwise (door) */
+  variable is_container = false;
+  if (obj_type(self_obj) == OBJ_TYPE_ITEM) and (obj_item_subtype(self_obj) == item_type_container) then begin
+    is_container = true;
+  end
+  // No prying open metal doors
+  if (DOOR_STATUS == STATE_METAL) and (not is_container) then begin
+    display_msg(mstr(500));
+  end
+
   // crowbar destroy runs always, discouraging high STR characters from spamming it
   pry_destroy_crowbar = roll_pry_destroy_crowbar();
   if pry_destroy_crowbar then begin

scripts_src/headers/containers.h

@@ -3,6 +3,7 @@
 
 #include "scripts.h"
 #include "define.h"
+#include "../sfall/define_extra.h"
 #ifndef NAME
   #define NAME                    SCRIPT_CONTAINR
 #endif

scripts_src/headers/doors.h

@@ -5,6 +5,7 @@
 
 #include "scripts.h"
 #include "define.h"
+#include "../sfall/define_extra.h"
 #ifndef NAME
   #define NAME                    SCRIPT_DOOR
 #endif

scripts_src/headers/doors_containers.h

@@ -1,5 +1,5 @@
 /** @tra door.msg */
-// Also used in contaners: containr.msg
+// Also used in containers: containr.msg
 
 #ifndef DOORS_CONTAINERS_H
 #define DOORS_CONTAINERS_H
@@ -80,6 +80,8 @@
   #define MAX_DAMAGE                      (20)
 #endif
 
+// 3 and less is just not enough to work the crowbar
+#define MIN_STRENGTH  4
 
 /* Standard Script Procedures */
 procedure look_at_p_proc;
@@ -235,27 +237,30 @@ was taken, and remove the trap.
   end
 #endif
 
-/***************************************************************************
-This procedure is used should the player try to pry the door open using a
-crowbar or some similar instrument.
-***************************************************************************/
-// For wood doors, Crowbar_Bonus = 0, which means always success
+/**
+ * This procedure is used should the player try to pry the door open using a crowbar or some similar instrument.
+ */
 procedure roll_pry_success begin
-  variable rnd = random(1,10);
-  if rnd <= (get_critter_stat(source_obj,STAT_st) + Crowbar_Bonus) then return true;
+  variable rnd = random(MIN_STRENGTH, 10);
+  if (get_critter_stat(source_obj, STAT_st) + Crowbar_Bonus) > rnd then return true;
   return false;
 end
 
-// Sturdier doors and high strength provide more chance to mangle the crowbar
-// Any STR char + wood door = 1% chance to destroy
-// 5 STR char + metal door = 10% chance to destroy
-// 10 STR char + metal door = 20% chance to destroy
+// Sturdier doors and high strength provide higher chance to mangle the crowbar
+// 4 STR char + wood door = 1% chance to destroy
+// 5 STR char + metal container = 10% chance to destroy
+// 10 STR char + metal container = 20% chance to destroy
 procedure roll_pry_destroy_crowbar begin
-  variable rnd = random(1,100);
-  variable str = get_critter_stat(source_obj,STAT_st);
+  variable rnd = random(1, 100);
+  variable str = get_critter_stat(source_obj, STAT_st);
+
+  // Too weak to bend it
+  if str < MIN_STRENGTH then return false;
+
   // Base Crowbar_Bonus = 0 (wood door). For metal doors, default is -2
   variable penalty = str * Crowbar_Bonus;
   if rnd + penalty <= 1 then return true;
+
   return false;
 end
 
@@ -270,6 +275,16 @@ end
       return;
     end
 
+    /** True if I am a container, False otherwise (door) */
+    variable is_container = false;
+    if (obj_type(self_obj) == OBJ_TYPE_ITEM) and (obj_item_subtype(self_obj) == item_type_container) then begin
+      is_container = true;
+    end
+    // No prying open metal doors
+    if (DOOR_STATUS == STATE_METAL) and (not is_container) then begin
+      display_msg(my_mstr(500));
+    end
+
     // crowbar destroy runs always, discouraging high STR characters from spamming it
     pry_destroy_crowbar = roll_pry_destroy_crowbar();
     if pry_destroy_crowbar then begin