[ViewVC] Diff of: cvs/deliantra/server/server/apply.C

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.278 by root, Thu Nov 17 04:49:22 2016 UTC vs.
Revision 1.283 by root, Sat Nov 17 23:40:03 2018 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
+ * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
  * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2001 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992 Frank Tore Johansen
  *
  * Deliantra is free software: you can redistribute it and/or modify it under
  * Returns 0 if it was not able to work for some reason.
  *
  * Checks if weapon was prepared, if enough potions on the floor, ...
  *
  * We are hiding extra information about the weapon in the level and
  * last_eat numbers for an object.  Hopefully this won't break anything ??
  * level == max improve last_eat == current improve
  */
 static int
 improve_weapon (object *op, object *improver, object *weapon)
 {
                     "powerful for you to use. Unready it if you "
                     "really want to improve it.");
       return 0;
     }
-  /* This just increases damage by 5 points, no matter what.  No sacrifice
+  /* This just increases damage by 5 points, no matter what. No sacrifice
-   * is needed.  Since stats.dam is now a 16 bit value and not 8 bit,
+   * is needed. Since stats.dam is now a 16 bit value and not 8 bit,
    * don't put any maximum value on damage - the limit is how much the
-   * weapon  can be improved.
+   * weapon can be improved.
    */
   if (improver->stats.sp == IMPROVE_DAMAGE)
     {
       weapon->stats.dam += 5;
       weapon->weight += 5000;   /* 5 KG's */
  * the stats of a player w/ armour as well as a weapon
  * will probably horribly unbalance the game. Magic enchanting
  * depends on the level of the character - ie the plus
  * value (magic) of the armour can never be increased beyond
  * the level of the character / 10 -- rounding upish, nor may
  * the armour value of the piece of equipment exceed either
  * the users level or 90)
  * Modified by MSW for partial resistance.  Only support
  * changing of physical area right now.
  */
 static int
     item->nrof *= nr;
   if (converter->flag [FLAG_PRECIOUS])
     item->set_flag (FLAG_UNPAID);
   if (converter->is_in_shop ())
     {
       // converters on shop floors don't work anymore, bug lets check for it
       // and report in case someone still does it.
       LOG (llevDebug, "ITEMBUG: broken converter, converters on shop floor don't work: %s\n",
            converter->debug_desc ());
   else if (price_in < sint64 (item->nrof) * item->value)
     {
       LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n",
            &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name);
       /**
        * elmex: we are going to let the game continue, as the mapcreator
        * hopefully had something in mind when doing this.
        */
     }
   // elmex: only identify if we need to, for example so that generated money doesn't
   return 1;
 }
 /**
  * Handle apply on containers.
  * By Eneq(@csd.uu.se).
  * Moved to own function and added many features [Tero.Haatanen@lut.fi]
  * added the alchemical cauldron to the code -b.t.
  */
 static int
         {
           /* Somebody dropped an unpaid item, just move to an adjacent place. */
           int i = find_free_spot (op, op->map, op->x, op->y, 1, 9);
           if (i != -1)
-            rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, shop_mat);
+            rv = transfer_ob (op, op->x + DIRX (i), op->y + DIRY (i), 0, shop_mat);
           return 0;
         }
       /* Removed code that checked for multipart objects - it appears that
       if (i == -1)
         LOG (llevError, "Internal shop-mat problem.\n");
       else
         {
           op->remove ();
-          op->x += freearr_x[i];
+          op->x += DIRX (i);
-          op->y += freearr_y[i];
+          op->y += DIRY (i);
           rv = insert_ob_in_map (op, op->map, shop_mat, 0) == NULL;
         }
     }
   op->clr_flag (FLAG_NO_APPLY);
     }
   /* Sign or magic mouth?  Do we need to see it, or does it talk to us?
    * No way to know for sure.  The presumption is basically that if
    * move_on is zero, it needs to be manually applied (doesn't talk
    * to us).
    */
   if (op->flag [FLAG_BLIND] && !op->flag [FLAG_WIZ] && !sign->move_on)
     {
       op->failmsg ("You are unable to read while blind!");
       return;
   victim->play_sound (trap->sound ? trap->sound : sound_find ("fall_hole"));
   victim->statusmsg ("You fall through the hole!", NDI_RED);
   transfer_ob (victim,
-               EXIT_X (trap) + freearr_x[dir],
+               EXIT_X (trap) + DIRX (dir),
-               EXIT_Y (trap) + freearr_y[dir],
+               EXIT_Y (trap) + DIRY (dir),
                0, victim);
 }
 /**
  * Unapplies specified item.
               /* if we have an applied weapon/shield, and unapply it would free
                * enough slots to equip the new item, then just set "can
                * apply unapply". We don't care about the logic below - if you have a
                * shield equipped and try to equip another shield, there is only
                * one choice.  However, the check for the number of body locations
                * does take into the account cases where what is being applied
                * may be two handed for example.
                */
               if (ws)
                 if ((who->slot[i].used - ws->slot[i].info + op->slot[i].info) >= 0)
                   else if (tmp != tmp1)
                     retval |= CAN_APPLY_UNAPPLY_MULT;
                   /* This object isn't using up all the slots, so there must
                    * be another. If so, and it the new item doesn't need all
                    * the slots, the player then has a choice.
                    */
                   if ((who->slot[i].used - tmp1->slot[i].info != who->slot[i].info)
                       && abs (op->slot[i].info) < who->slot[i].info)
                     retval |= CAN_APPLY_UNAPPLY_CHOICE;
       return 1;
     }
   /* Ok.  We are now at the state where we can apply the new object.
    * Note that we don't have the checks for can_use_...
    * below - that is already taken care of by can_apply_object.
    */
   // split away all the other items from the stack, so only one item is left
   tmp = op->nrof > 1 ? op->split (op->nrof - 1) : 0;
       arch_flag = 1;
       name_flag = 1;
       race_flag = 1;
     }
   /* If the director has race set, only affect objects with a arch,
    * name or race that matches.
    */
   if ((op->race) &&
       ((!(victim->arch && arch_flag && victim->arch->archname) || op->race != victim->arch->archname)) &&
       ((!(victim->name && name_flag) || op->race != victim->name)) &&
   /* Only exits affect DMs. */
   if (victim->flag [FLAG_WIZPASS] && trap->type != EXIT && trap->type != SIGN)
     return;
   /* move_apply() is the most likely candidate for causing unwanted and
    * possibly unlimited recursion.
    */
   /* The following was changed because it was causing perfectly correct
    * maps to fail.  1)  it's not an error to recurse:
    * rune detonates, summoning monster.  monster lands on nearby rune.
    * nearby rune detonates.  This sort of recursion is expected and
    * proper.  This code was causing needless crashes.
    */
   if (recursion_depth >= 500)
     {
       LOG (llevDebug, "WARNING: move_apply(): aborting recursion "
            "[trap arch %s, name %s; victim arch %s, name %s]\n", &trap->arch->archname, &trap->name, &victim->arch->archname, &victim->name);
               }
             for (ab = trap->above, max = 100, sound_was_played = 0; --max && ab; ab = ab_next)
               {
                 /* need to set this up, since if we do transfer the object,
                  * ab->above would be bogus
                  */
                 ab_next = ab->above;
                 if ((ab->move_type && trap->move_on) || ab->move_type == 0)
                   {
    *
    *  2- The learner's skill level in literacy adjusts the chance to learn
    *     a spell.
    *
    *  3 -Automatically fail to learn if you read while confused
    *
    * Overall, chances are the same but a player will find having a high
    * literacy rate very useful!  -b.t.
    */
   if (op->flag [FLAG_CONFUSED])
     {
       op->failmsg ("In your confused state you flub the wording of the text!");
       scroll_failure (op, 0 - random_roll (0, spell->level, op, PREFER_LOW), max (spell->stats.sp, spell->stats.grace));
                 else if (invtmp->arch
                          && invtmp->type != TREASURE && invtmp->type != SPELL && invtmp->type != CLASS
                          && invtmp->has_random_items ())
                   {
                     create_treasure (invtmp->randomitems, invtmp, 0, difficulty, 0);
                     /* Need to clear this so that we never try to create
                      * treasure again for this object
                      */
                     invtmp->randomitems = NULL;
                   }
               }

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/server/apply.C (file contents): Revision 1.278 by root, Thu Nov 17 04:49:22 2016 UTC vs. Revision 1.283 by root, Sat Nov 17 23:40:03 2018 UTC

Diff Legend

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.278 by root, Thu Nov 17 04:49:22 2016 UTC vs.
Revision 1.283 by root, Sat Nov 17 23:40:03 2018 UTC