Fixed osetval bug, and quest reward bug --Rumble

changelog

@@ -36,12 +36,20 @@ Xlist (mlist, olist, rlist, zlist, slist, tlist, qlist)
 (lots of major bugfixes too)
 @
 tbaMUD 3.61
-[Mar 17 2010] - Fizban
+[Apr 22 2010] - Rumble
+  Fixed osetval not modifying AC on players. (thanks Rudeboyrave)
+[Apr 12 2010] - Rumble 
+  Fixed gain_exp quest reward that gave gold and not xp. (thanks Vatiken)
+Mar 17 2010] - Fizban
   Made non-existant objects in pfiles be skipped instead of crashing the MUD (thanks drefs)
+  Fixed plist overflow.
+[Mar 11 2010] - Rumble
+  Updated do_export_zone to include shop files (thanks Kyle)
+[Mar 07 2010] - Rumble
+  Updated do_scan. (thanks Zman)
 [Feb 13 2010] - Rumble
   Removed delete object option in oedit menu.
 [Feb 08 2010] - Rumble
-  Added another define for Windows MSVC users to hide useless warnings. (thanks Kyle)
   Added CIRCLE_WINDOWS check for tell m-w usage of getpid(). (thanks Kyle)
   Changed zcheck to ignore object type TRASH when checking for a cost of 0.
   Changed teleport level to LVL_BUILDER.

doc/README

@@ -5,7 +5,9 @@ All requests for help or bugs should be reported to: builderacademy.net 9091.
 
 Information about CircleMUD can be found at the CircleMUD Home Page and FTP:
 http://www.circlemud.org
-ftp://ftp.circlemud.org
+
+Although outdated, the CircleMUD archives contain many great ideas in the
+/contrib/ section.
 
 Both of these sites are outdated and no longer maintained. The latest 
 information and downloads can be found at:
@@ -89,8 +91,7 @@ If you have strange problems -- and you can't figure out the answer by reading
 the documentation -- fear not, there are many other resources available.
 
 http://cwg.lazuras.org/
-http://groups.yahoo.com/group/circle-newbies/
+http://tbamud.com/
-http://post.queensu.ca/cgi-bin/listserv/wa?SUBED1=circle&A=1
 
 No matter how you choose to get help, make sure to always include the
 following information:
@@ -106,6 +107,6 @@ following information:
      also be sure to include the output of 'configure' and the file
      'config.log'.
 
-You may also stop by the Builder Academy at anytime. builderacademy.net 9091
+You may also stop by the Builder Academy at anytime. tbamud.com 9091
 
 --Rumble

doc/README.UNIX

@@ -1,3 +1,6 @@
+Although you will be compiling tbaMUD, this document is still relevant for
+recent versions of UNIX and LINUX.
+
                      Compiling CircleMUD under UNIX
                             by Jeremy Elson 
                  For help, write to help@circlemud.org
@@ -16,15 +19,10 @@ UNIX system -- even one that we have never seen before.  However, if you
 do have problems, please drop us a note at help@circlemud.org so that we
 can try to make Circle work with every UNIX variant that we can.
 
-1)  Download the latest version of CircleMUD.  You can always find the
+1)  You can also find information at the WWW site:
-    latest version at the following anonymous FTP sites:
-
-        ftp.circlemud.org:/pub/CircleMUD/3.x
-        ftp2.circlemud.org:/pub/CircleMUD/3.x
-
-    You can also find information at the WWW site:
 
         http://www.circlemud.org/
+        Old FTP mirror: http://www.circlemud.org/pub/CircleMUD/
 
     The latest version will be called something ending in .tar.gz, like
     "circle30bplXX.tar.gz". (where 'XX' is the patchlevel)

lib/misc/bugs

@@ -1,16 +1,24 @@
 Text      test2~
-Body            test2
+Body                  test2
 ~
 Name      Rumble~
 Level     34
 Room      1204
 Flags     1 0 0 0
 End
-Text       test 5~
+Text      test 5~
-Body      test5
+Body            test5
 ~
 Name      Rumble~
 Level     34
 Room      1204
 Flags     0 0 0 0
 End
+Text       "tell guide help" when you enter the game does nothing~
+Body      Exactly what the header says.
+~
+Name      Surgo~
+Level     1
+Room      3001
+Flags     0 0 0 0
+End

lib/world/trg/30.trg

@@ -542,8 +542,8 @@ Mortal Greet~
 2 s 100
 ~
 * By Rumble of The Builder Academy    tbamud.com 9091
-* TBA mortal greet and equip. New players start at level 0.
+wait 1 sec
-if %actor.level% == 0
+if %actor.level% < 3
   if !%actor.eq(*)%
     %load% obj 3037 %actor% light
     %load% obj 3083 %actor% rfinger

src/dg_objcmd.c

@@ -683,7 +683,8 @@ static OCMD(do_odoor)
 static OCMD(do_osetval)
 {
   char arg1[MAX_INPUT_LENGTH], arg2[MAX_INPUT_LENGTH];
-  int position, new_value;
+  int position, new_value, worn_on;
+  struct char_data *worn_by = NULL;
 
   two_arguments(argument, arg1, arg2);
   if (arg1 == NULL || !*arg1 || arg2 == NULL || !*arg2 || !is_number(arg1) || !is_number(arg2)) {
@@ -693,9 +694,21 @@ static OCMD(do_osetval)
 
   position = atoi(arg1);
   new_value = atoi(arg2);
-  if (position>=0 && position<NUM_OBJ_VAL_POSITIONS)
+
+  if (position>=0 && position<NUM_OBJ_VAL_POSITIONS) {
+    worn_by = obj->worn_by;
+    worn_on = obj->worn_on;
+
+    if (worn_by != NULL) {
+      unequip_char(worn_by, worn_on);
+    }
+
     GET_OBJ_VAL(obj, position) = new_value;
-  else
+
+    if (worn_by != NULL) {
+      equip_char(worn_by, obj, worn_on);
+    }
+  } else
     obj_log(obj, "osetval: position out of bounds!");
 }
 

src/quest.c

@@ -308,7 +308,7 @@ void generic_complete_quest(struct char_data *ch)
             QST_GOLD(rnum));
     }
     if (QST_EXP(rnum)) {
-      gain_exp(ch, QST_GOLD(rnum));
+      gain_exp(ch, QST_EXP(rnum));
       send_to_char(ch,
             "You have been awarded %d experience points for your service.\r\n",
             QST_EXP(rnum));