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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.123 by root, Fri May 11 21:07:14 2007 UTC vs.
Revision 1.139 by root, Fri May 18 01:01:02 2007 UTC

   draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
                         MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
   close_and_delete (fp, comp);
 }
+float
+player::weapon_speed () const
+{
+  return ob->speed / weapon_sp * .5f;//TODO, the .5 is arbitrary
+}
 /* This loads the first map an puts the player on it. */
 static void
 set_first_map (object *op)
 {
   op->contr->maplevel = first_map_path;
   new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
   esrv_new_player (this, ob->weight + ob->carrying);
+  ob->flag [FLAG_READY_WEAPON] = false;
+  ob->flag [FLAG_READY_SKILL]  = false;
+  ob->flag [FLAG_READY_BOW]    = false;
   for (object *op = ob->inv; op; op = op->below)
     if (op->flag [FLAG_APPLIED])
       switch (op->type)
         {
           case WAND:
           case ROD:
           case HORN:
           case BOW:
-          case SKILL:
           case SKILL_TOOL:
           case WEAPON:
-            apply_special (ob, op, AP_UNAPPLY);
+            op->flag [FLAG_APPLIED] = false;
             apply_special (ob, op, AP_APPLY);
             break;
-        }
+          case SKILL:
+            op->flag [FLAG_APPLIED] = false;
+            break;
+        }
+  ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
   ob->update_stats ();
   ns->floorbox_update ();
   esrv_send_inventory (ob, ob);
   esrv_add_spells (this, 0);
   activate ();
 player::set_object (object *op)
 {
   ob = op;
   ob->contr = this;              /* this aren't yet in archetype */
-  ob->speed_left = 0.5;
+  ob->speed_left = 0.5f;
-  ob->speed      = 1.0;
+  ob->speed      = 1.0f;
   ob->direction  = 5;            /* So player faces south */
 }
 player::player ()
 {
 }
 void
 object::roll_stats ()
 {
-  int statsort [7];
+  int statsort [NUM_STATS];
   for (;;)
     {
       int sum = 0;
-      for (int i = 7; i--; )
+      for (int i = NUM_STATS; i--; )
         sum += statsort [i] = roll_stat ();
       if (sum >= 82 && sum <= 116)
         break;
     }
   // Sort the stats so that rerolling is easier...
-  std::sort (statsort, statsort + 7, std::greater<int>());
+  std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
+  for (int i = 0; i < NUM_STATS; ++i)
-  stats.Str = statsort[0];
+    stats.stat (i) = statsort [i];
-  stats.Dex = statsort[1];
-  stats.Con = statsort[2];
-  stats.Int = statsort[3];
-  stats.Wis = statsort[4];
-  stats.Pow = statsort[5];
-  stats.Cha = statsort[6];
   stats.exp = 0;
   stats.ac  = 0;
   stats.hp    = stats.maxhp;
 }
 void
 object::swap_stats (int a, int b)
 {
-  int tmp = get_attr_value (&contr->orig_stats, a);
+  swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
-  set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
-  set_attr_value (&contr->orig_stats, b, tmp);
+  for (int i = 0; i < NUM_STATS; ++i)
-  stats.Str = contr->orig_stats.Str;
+    stats.stat (i) = contr->orig_stats.stat (i);
-  stats.Dex = contr->orig_stats.Dex;
-  stats.Con = contr->orig_stats.Con;
-  stats.Int = contr->orig_stats.Int;
-  stats.Wis = contr->orig_stats.Wis;
-  stats.Pow = contr->orig_stats.Pow;
-  stats.Cha = contr->orig_stats.Cha;
   //TODO: the following code looks so borked and should, at the very least,
   // be merged with the similar code in roll_stats
   stats.ac  = 0;
  */
 int
 fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
 {
   object *left, *bow;
-  int bowspeed, mflags;
+  int mflags;
   maptile *m;
   if (!dir)
     {
       new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
       return 0;
     }
-  if (player *pl = op->contr)
+  if (op->contr)
-    {
+    bow = op->current_weapon;
-      bow = pl->ranged_ob;
-      op->set_weapon (bow);
-    }
   else
     {
       for (bow = op->inv; bow; bow = bow->below)
         /* Don't check for applied - monsters don't apply bows - in that way, they
          * don't need to switch back and forth between bows and weapons.
     {
       new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
       return 0;
     }
-  bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
-  /* penalize ROF for bestarrow */
-  if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
-    bowspeed -= dex_bonus[op->stats.Dex] + 5;
-  if (bowspeed < 1)
-    bowspeed = 1;
   if (arrow == NULL)
     {
       if ((arrow = find_arrow (op, bow->race)) == NULL)
         {
           if (op->type == PLAYER)
   arrow->set_owner (op);
   arrow->skill = bow->skill;
   arrow->direction = dir;
-  if (op->type == PLAYER)
-    {
-      op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
-      op->update_stats ();
-    }
-  SET_ANIMATION (arrow, arrow->direction);
-  arrow->stats.sp    = arrow->stats.wc;    /* save original wc and dam */
+  arrow->stats.sp    = arrow->stats.wc;    /* save original wc, dam, attacktype and slaying */
   arrow->stats.hp    = arrow->stats.dam;
   arrow->stats.grace = arrow->attacktype;
   if (arrow->slaying)
     arrow->spellarg = strdup (arrow->slaying);
-  arrow->stats.dam += op->stats.dam + arrow->magic;
+  if (player *pl = op->contr)
+    {
+      if (!pl->has_hit)
+        {
+          pl->has_hit = 1;
+          pl->ob->speed_left += pl->weapon_speed () - pl->ob->speed;
+        }
+#if 0
+          float speed = pl->weapon_sp;
+          /* penalize ROF for bestarrow */
+          if (pl->bowtype == bow_bestarrow)
+            speed *= .9f;
+          else
+            speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
+          op->speed_left += speed - op->speed;
+#endif
+    }
+  SET_ANIMATION (arrow, arrow->direction);
   /* update the speed */
-  arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
+  arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0
-                           0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
+                 + bow->stats.dam / 7.0;
-  arrow->set_speed (max (arrow->speed, 1.0));
+  arrow->set_speed (max (arrow->speed, 2.0));
   arrow->speed_left = 0;
-  arrow->stats.wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
+  int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
   if (op->type == PLAYER)
     {
       arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
-      arrow->stats.wc -= dex_bonus[op->stats.Dex];
+      wc -= dex_bonus[op->stats.Dex];
       if (!arrow->slaying)
         arrow->slaying = op->slaying;
+      arrow->attacktype |= op->attacktype;
     }
   else
     {
       arrow->level = op->level;
       arrow->stats.wc -= bow->magic;
       if (!arrow->slaying)
         arrow->slaying = bow->slaying;
-    }
-  arrow->stats.wc -= arrow->level;
-  arrow->attacktype |= bow->attacktype;
+      arrow->attacktype |= bow->attacktype;
+    }
+  wc -= arrow->level;
+  arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
+  arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
   arrow->move_type = MOVE_FLY_LOW;
   arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
   play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
   m->insert (arrow, sx, sy, op);
     }
   return ret;
 }
 /* Fires a misc (wand/rod/horn) object in 'dir'.
  * Broken apart from 'fire' to keep it more readable.
  */
 void
 fire_misc_object (object *op, int dir)
     {
       LOG (llevError, "Object %s lacks a spell\n", &item->name);
       return;
     }
-  op->set_weapon (item);
+  if (!op->change_weapon (item))
+    return;
   if (item->type == WAND)
     {
       if (item->stats.food <= 0)
         {
   object *ob = pl->ranged_ob;
   if (!ob)
     return;
+  if (!op->change_weapon (ob))
+    return;
   switch (ob->type)
     {
       case BOW:
         player_fire_bow (op, dir);
         break;
       case BUILDER:
         apply_map_builder (op, dir);
         break;
       case SKILL:
-      case SKILL_TOOL:
         do_skill (op, op, ob, dir, 0);
         break;
       default:
         fire_misc_object (op, dir);
       /* If the creature is a pet, push it even if the player is not
        * peaceful.  Our assumption is the creature is a pet if the
        * player owns it and it is either friendly or unagressive.
        */
-      if ((op->type == PLAYER)
+      if (op->type == PLAYER
-#if COZY_SERVER
-          &&
-          ((mon->owner && mon->owner->contr
+          && ((mon->owner && mon->owner->contr
-            && same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op)
+               && same_party (mon->owner->contr->party, op->contr->party))
-#else
-          && mon->owner == op
+              || mon->owner == op)
-#endif
           && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
         {
           /* If we're braced, we don't want to switch places with it */
           if (op->contr->braced)
             return;
       /* in certain circumstances, you shouldn't attack friendly
        * creatures.  Note that if you are braced, you can't push
        * someone, but put it inside this loop so that you won't
        * attack them either.
        */
-      if ((mon->type == PLAYER || mon->enemy != op) &&
+      if ((mon->type == PLAYER || mon->enemy != op)
-          (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && (
+          && (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
-#ifdef PROHIBIT_PLAYERKILL
-            (op->contr->peaceful
+          && ((op->contr->peaceful
-             || (mon->type == PLAYER
+               || (mon->type == PLAYER && mon->contr->peaceful))
-                 && mon->contr->
-                 peaceful)) &&
-#else
-            op->contr->peaceful &&
-#endif
-            !on_battleground))
+              && !on_battleground))
         {
           if (!op->contr->braced)
             {
               play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
               push_ob (mon, dir, op);
        * that party_number -1 is no party, so attacks can still happen.
        */
       else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
                ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
         {
-          /* If the player hasn't hit something this tick, and does
-           * so, give them speed boost based on weapon speed.  Doing
-           * it here is better than process_players2, which basically
-           * incurred a 1 tick offset.
-           */
           if (!op->contr->has_hit)
             {
+              op->contr->has_hit = 1;
-              op->speed_left += op->speed / op->contr->weapon_sp;
+              op->speed_left += op->contr->weapon_speed () - op->speed;
-              op->contr->has_hit = 1;   /* The last action was to hit, so use weapon_sp */
             }
           skill_attack (mon, op, 0, 0, 0);
           /* If attacking another player, that player gets automatic
 handle_newcs_player (object *op)
 {
   if (QUERY_FLAG (op, FLAG_SCARED))
     {
       flee_player (op);
       /* If player is still scared, that is his action for this tick */
-      if (QUERY_FLAG (op, FLAG_SCARED))
+      if (op->flag [FLAG_SCARED])
         {
-          op->speed_left--;
+          --op->speed_left;
           return 0;
         }
     }
   /* call this here - we also will call this in do_ericserver, but
    * called, so we recheck it here.
    */
   if (op->contr->ns->handle_command ())
     return 1;
-  if (op->speed_left > 0)
+  if (op->speed_left > 0.f)
     {
       if (op->direction && (op->contr->run_on || op->contr->fire_on))
         {
           /* All move commands take 1 tick, at least for now */
-          op->speed_left--;
+          --op->speed_left;
           /* Instead of all the stuff below, let move_player take care
            * of it.  Also, some of the skill stuff is only put in
            * there, as well as the confusion stuff.
            */
           move_player (op, op->direction);
-          return op->speed_left > 0;
+          return op->speed_left > 0.f;
         }
     }
   return 0;
 }
         }
       /* Digestion */
       if (--op->last_eat < 0)
         {
-#ifdef COZY_SERVER
-          int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;
-          int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
-#else
           int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
-#endif
           if (op->contr->gen_hp > 0)
             op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
           else
             op->last_eat = 25 * (1 + bonus) / (penalty + 1);
       object *force;
       int at;
       force = get_archetype (FORCE_NAME);
       /* 50 ticks should be enough time for the spell to abate */
-      force->speed = 0.1;
+      force->speed = 0.1f;
-      force->speed_left = -5.0;
+      force->speed_left = -5.f;
       SET_FLAG (force, FLAG_APPLIED);
       for (at = 0; at < NROFATTACKS; at++)
         if (will_kill_again & (1 << at))
           force->resist[at] = 100;

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.123 by root, Fri May 11 21:07:14 2007 UTC vs. Revision 1.139 by root, Fri May 18 01:01:02 2007 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.123 by root, Fri May 11 21:07:14 2007 UTC vs.
Revision 1.139 by root, Fri May 18 01:01:02 2007 UTC