[Planeshift-cvs] CVS: planeshift/docs history.txt,1.3849,1.3850

[Anders Reggestad <magodra@us...>]

Update of /cvsroot/planeshift/planeshift/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8086/docs

Modified Files:
	history.txt 
Log Message:
- Added support to memorize when items are picked up.
- Created a new InventoryPerception.
- Added parameter radius to memory find function. This will find
  memories within radius from the given position. This to prevent
  a number of memories about the same thing with just small 
  diffrences in position.


Index: history.txt
===================================================================
RCS file: /cvsroot/planeshift/planeshift/docs/history.txt,v
retrieving revision 1.3849
retrieving revision 1.3850
diff -C2 -d -r1.3849 -r1.3850
*** history.txt	19 Oct 2006 21:57:09 -0000	1.3849
--- history.txt	19 Oct 2006 22:07:44 -0000	1.3850
***************
*** 1,2 ****
--- 1,10 ----
+ *** 2006-10-19 by Anders Reggestad
+ - Added support to memorize when items are picked up.
+ - Created a new InventoryPerception.
+ - Added parameter radius to memory find function. This will find
+   memories within radius from the given position. This to prevent
+   a number of memories about the same thing with just small 
+   diffrences in position.
+ 
  *** 2006-10-19 by Andrew Dai
  - Fixed a problem where the container view was not being refreshed when a

[Planeshift-cvs] CVS: planeshift/src/npcclient networkmgr.cpp, 1.118, 1.119 npcbehave.cpp, 1.139, 1.140 npcclient.cpp, 1.116, 1.117 perceptions.cpp, 1.47, 1.48 perceptions.h, 1.25, 1.26 tribe.cpp, 1.16, 1.17 tribe.h, 1.13, 1.14

[Anders Reggestad <magodra@us...>]

Update of /cvsroot/planeshift/planeshift/src/npcclient
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8086/src/npcclient

Modified Files:
	networkmgr.cpp npcbehave.cpp npcclient.cpp perceptions.cpp 
	perceptions.h tribe.cpp tribe.h 
Log Message:
- Added support to memorize when items are picked up.
- Created a new InventoryPerception.
- Added parameter radius to memory find function. This will find
  memories within radius from the given position. This to prevent
  a number of memories about the same thing with just small 
  diffrences in position.


Index: networkmgr.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/npcclient/networkmgr.cpp,v
retrieving revision 1.118
retrieving revision 1.119
diff -C2 -d -r1.118 -r1.119
*** networkmgr.cpp	5 Oct 2006 20:22:11 -0000	1.118
--- networkmgr.cpp	19 Oct 2006 22:07:44 -0000	1.119
***************
*** 623,626 ****
--- 623,632 ----
                  if (!owner || !npc)
                      break;
+                 
+                 iSector *sector;
+                 csVector3 pos;
+                 float yrot;
+                 psGameObject::GetPosition(owner,pos,yrot,sector);
+ 
                  /* TODO: Create a inventory for each NPC.
                  if (inserted)
***************
*** 634,640 ****
                  */
                  csString str;
!                 str.Format("inventory:%s",item_name.GetData());
  
!                 Perception pcpt( str );
  
                  npcclient->TriggerEvent( npc, &pcpt);
--- 640,646 ----
                  */
                  csString str;
!                 str.Format("inventory:%s",(inserted?"added":"removed"));
  
!                 InventoryPerception pcpt( str, item_name, pos, sector, 5.0 );
  
                  npcclient->TriggerEvent( npc, &pcpt);
***************
*** 644,648 ****
                  if (npc->GetTribe())
                  {
!                     npc->GetTribe()->HandlePerception(str);
                  }
                  // ... end of hack.
--- 650,654 ----
                  if (npc->GetTribe())
                  {
!                     npc->GetTribe()->HandlePerception(&pcpt);
                  }
                  // ... end of hack.

Index: npcbehave.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/npcclient/npcbehave.cpp,v
retrieving revision 1.139
retrieving revision 1.140
diff -C2 -d -r1.139 -r1.140
*** npcbehave.cpp	18 Oct 2006 20:41:54 -0000	1.139
--- npcbehave.cpp	19 Oct 2006 22:07:44 -0000	1.140
***************
*** 2507,2511 ****
  bool MemorizeOperation::Run(NPC *npc,EventManager *eventmgr)
  {
!     npc->Printf(">>> Memorize %s",npc->GetLastPerception()->GetType().GetDataSafe());
  
      psTribe * tribe = npc->GetTribe();
--- 2507,2518 ----
  bool MemorizeOperation::Run(NPC *npc,EventManager *eventmgr)
  {
!     Perception * percept = npc->GetLastPerception();
!     if (!percept)
!     {
!         npc->Printf(">>> Memorize No Perception.");
!         return true; // Nothing more to do for this op.
!     }
!     
!     npc->Printf(">>> Memorize '%s' '%s'.",percept->GetType(),percept->GetName());
  
      psTribe * tribe = npc->GetTribe();
***************
*** 2513,2517 ****
      if ( !tribe ) return true; // Nothing more to do for this op.
  
!     tribe->Memorize(npc, npc->GetLastPerception());
  
      return true; // Nothing more to do for this op.
--- 2520,2524 ----
      if ( !tribe ) return true; // Nothing more to do for this op.
  
!     tribe->Memorize(npc, percept );
  
      return true; // Nothing more to do for this op.

Index: npcclient.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/npcclient/npcclient.cpp,v
retrieving revision 1.116
retrieving revision 1.117
diff -C2 -d -r1.116 -r1.117
*** npcclient.cpp	18 Oct 2006 20:41:54 -0000	1.116
--- npcclient.cpp	19 Oct 2006 22:07:44 -0000	1.117
***************
*** 1486,1490 ****
                          memory->name.GetDataSafe(),
                          memory->pos.x,memory->pos.y,memory->pos.z,memory->radius,
!                         memory->sector->QueryObject()->GetName(),
                          (memory->npc?memory->npc->GetName().GetDataSafe():""));
              }
--- 1486,1490 ----
                          memory->name.GetDataSafe(),
                          memory->pos.x,memory->pos.y,memory->pos.z,memory->radius,
!                         (memory->sector?memory->sector->QueryObject()->GetName():""),
                          (memory->npc?memory->npc->GetName().GetDataSafe():""));
              }

Index: perceptions.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/npcclient/perceptions.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** perceptions.cpp	13 Oct 2006 14:33:11 -0000	1.47
--- perceptions.cpp	19 Oct 2006 22:07:44 -0000	1.48
***************
*** 168,171 ****
--- 168,172 ----
  {
      Perception *p = new Perception(name);
+     p->type = type;
      return p;
  }
***************
*** 481,484 ****
--- 482,493 ----
  }
  
+ //---------------------------------------------------------------------------------
+ Perception *InventoryPerception::MakeCopy()
+ {
+     InventoryPerception *p = new InventoryPerception(name,type,pos,sector,radius);
+     return p;
+ }
+ 
+ 
  /// NPC Pet Perceptions ===========================================================
  //---------------------------------------------------------------------------------

Index: perceptions.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/npcclient/perceptions.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** perceptions.h	13 Oct 2006 06:41:44 -0000	1.25
--- perceptions.h	19 Oct 2006 22:07:44 -0000	1.26
***************
*** 99,105 ****
  {
  protected:
      csString name;
  
!     // Values used by perseptions. Usally they correspond to the same value in a reaction.  
      csString  type;
  
--- 99,106 ----
  {
  protected:
+     /// The name of this perception.
      csString name;
  
!     /// Values used by perseptions. Usally they correspond to the same value in a reaction.  
      csString  type;
  
***************
*** 107,120 ****
      Perception(const char *n) { name = n; }
      virtual ~Perception() {}
!     const char *GetName() { return name; }
!     
!     const csString& GetType() { return type; }
  
      virtual bool ShouldReact(Reaction *reaction,NPC *npc) { return name == reaction->GetEventType(); }
      virtual Perception *MakeCopy();
-     virtual bool GetLocation(csVector3& pos, iSector*& sector) { return false; }
      virtual void ExecutePerception(NPC *npc,float weight) { }
    
      virtual iCelEntity *GetEntity() { return NULL; }
  };
  
--- 108,125 ----
      Perception(const char *n) { name = n; }
      virtual ~Perception() {}
! 
  
      virtual bool ShouldReact(Reaction *reaction,NPC *npc) { return name == reaction->GetEventType(); }
      virtual Perception *MakeCopy();
      virtual void ExecutePerception(NPC *npc,float weight) { }
    
      virtual iCelEntity *GetEntity() { return NULL; }
+ 
+     const char* GetName() { return name; }
+     const char* GetType() { return type; }
+     void SetType(const char* type) { this->type = type; }
+     virtual bool GetLocation(csVector3& pos, iSector*& sector) { return false; }
+     virtual float GetRadius() const { return 0.0; }
+     
  };
  
***************
*** 288,292 ****
      iCelEntity *target;
      float       spell_severity;
-     csString    type; // Spell type
  
  public:
--- 293,296 ----
***************
*** 318,321 ****
--- 322,347 ----
  };
  
+ /**
+  * This perception is used when a item is added or removed from inventory.
+  */
+ class InventoryPerception : public Perception
+ {
+ protected:
+     csVector3 pos;
+     iSector * sector;
+     float     radius;
+ 
+ public:
+     InventoryPerception(const char *n,const char *t, const csVector3& p, iSector* s, float r)
+         : Perception(n), pos(p), radius(r) { type = t; sector = s; }
+ 
+     virtual Perception *MakeCopy();
+     virtual bool GetLocation(csVector3& pos, iSector*& sector)
+         { pos = this->pos; sector = this->sector; return true; }
+ 
+     virtual float GetRadius() const { return radius; }
+     
+ };
+ 
  
  /// NPC Pet Perceptions ============================================

Index: tribe.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/npcclient/tribe.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** tribe.cpp	13 Oct 2006 06:41:44 -0000	1.16
--- tribe.cpp	19 Oct 2006 22:07:44 -0000	1.17
***************
*** 135,147 ****
  
  
! void psTribe::HandlePerception(csString perception)
  {
!     csArray<csString> strarr = psSplitt (perception,':');
      
      if (strarr[0] == "inventory")
      {
!         AddResource(strarr[1],1);
      }
-     
  }
  
--- 135,155 ----
  
  
! void psTribe::HandlePerception(Perception *perception)
  {
!     csString name = perception->GetName();
!     
!     csArray<csString> strarr = psSplitt (name,':');
      
      if (strarr[0] == "inventory")
      {
!         if (strarr[1] == "added")
!         {
!             AddResource(perception->GetType(),1);
!         }
!         else
!         {
!             AddResource(perception->GetType(),-1);
!         }
      }
  }
  
***************
*** 306,342 ****
  void psTribe::Memorize(NPC * npc, Perception * perception)
  {
!     LocationPerception * locPerception = dynamic_cast<LocationPerception*>(perception);
! 
!     if (locPerception) // Received memory for a location
!     {
!         Memory*   memory;
!         csVector3 pos;
!         iSector*  sector;
!         csString  name = locPerception->GetType();
!         float     radius = locPerception->GetRadius();
!         
!         locPerception->GetLocation(pos,sector);
          
  
!         memory = FindPrivMemory(name,pos,sector,npc);
!         if (memory)
!         {
!             npc->Printf("Has this in privat knowledge -> do nothing");
!             return;
!         }
! 
!         memory = FindMemory(name,pos,sector);
!         if (memory)
!         {
!             npc->Printf("Has this in tribe knowledge -> do nothing");
!             return;
!         }
!         
!         npc->Printf("Store in privat memory.");
!         AddMemory(name,pos,sector,radius,npc);
      }
  }
  
! psTribe::Memory* psTribe::FindPrivMemory(csString name,const csVector3& pos, iSector* sector, NPC * npc)
  {
      csList<Memory*>::Iterator it(memories);
--- 314,345 ----
  void psTribe::Memorize(NPC * npc, Perception * perception)
  {
!     // Retriv date from the perception
!     csString  name = perception->GetType();
!     float     radius = perception->GetRadius();
!     csVector3 pos;
!     iSector*  sector;
!     perception->GetLocation(pos,sector);
          
+     // Store the perception if not known from before
  
!     Memory* memory = FindPrivMemory(name,pos,sector,radius,npc);
!     if (memory)
!     {
!         npc->Printf("Has this in privat knowledge -> do nothing");
!         return;
      }
+     
+     memory = FindMemory(name,pos,sector,radius);
+     if (memory)
+     {
+         npc->Printf("Has this in tribe knowledge -> do nothing");
+         return;
+     }
+     
+     npc->Printf("Store in privat memory: '%s' %.2f %.2f %2f %.2f '%s'",name.GetDataSafe(),pos.x,pos.y,pos.z,radius,npc->GetName().GetDataSafe());
+     AddMemory(name,pos,sector,radius,npc);
  }
  
! psTribe::Memory* psTribe::FindPrivMemory(csString name,const csVector3& pos, iSector* sector, float radius, NPC * npc)
  {
      csList<Memory*>::Iterator it(memories);
***************
*** 344,350 ****
      {
          Memory * memory = it.Next();
!         if (memory->name == name && memory->pos == pos && memory->sector == sector && memory->npc == npc)
          {
!             return memory;
          }
      }
--- 347,357 ----
      {
          Memory * memory = it.Next();
!         if (memory->name == name && memory->sector == sector && memory->npc == npc)
          {
!             float dist = (memory->pos - pos).Norm();
!             if (dist <= radius)
!             {
!                 return memory;
!             }
          }
      }
***************
*** 352,356 ****
  }
  
! psTribe::Memory* psTribe::FindMemory(csString name,const csVector3& pos, iSector* sector)
  {
      csList<Memory*>::Iterator it(memories);
--- 359,363 ----
  }
  
! psTribe::Memory* psTribe::FindMemory(csString name,const csVector3& pos, iSector* sector, float radius)
  {
      csList<Memory*>::Iterator it(memories);
***************
*** 358,364 ****
      {
          Memory * memory = it.Next();
!         if (memory->name == name && memory->pos == pos && memory->sector == sector && memory->npc == NULL)
          {
!             return memory;
          }
      }
--- 365,375 ----
      {
          Memory * memory = it.Next();
!         if (memory->name == name && memory->sector == sector && memory->npc == NULL)
          {
!             float dist = (memory->pos - pos).Norm();
!             if (dist <= radius)
!             {
!                 return memory;
!             }
          }
      }
***************
*** 399,403 ****
          if (memory->npc == npc)
          {
!             if (FindMemory(memory->name,memory->pos,memory->sector))
              {
                  // Tribe know this so delete the memory.
--- 410,414 ----
          if (memory->npc == npc)
          {
!             if (FindMemory(memory->name,memory->pos,memory->sector,memory->radius))
              {
                  // Tribe know this so delete the memory.

Index: tribe.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/npcclient/tribe.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** tribe.h	13 Oct 2006 06:41:44 -0000	1.13
--- tribe.h	19 Oct 2006 22:07:44 -0000	1.14
***************
*** 88,92 ****
  
      /** Handled a perception given to this tribe */
!     void HandlePerception(csString perception);
  
      /** Add a new resource to the tribe resource table */
--- 88,92 ----
  
      /** Handled a perception given to this tribe */
!     void HandlePerception(Perception * perception);
  
      /** Add a new resource to the tribe resource table */
***************
*** 146,155 ****
       * Find a privat memory
       */
!     Memory* FindPrivMemory(csString name,const csVector3& pos, iSector* sector, NPC* npc);
  
      /**
       * Find a memory
       */
!     Memory* FindMemory(csString name,const csVector3& pos, iSector* sector);
  
      /**
--- 146,155 ----
       * Find a privat memory
       */
!     Memory* FindPrivMemory(csString name,const csVector3& pos, iSector* sector, float radius, NPC* npc);
  
      /**
       * Find a memory
       */
!     Memory* FindMemory(csString name,const csVector3& pos, iSector* sector, float radius);
  
      /**

[Planeshift-cvs] CVS: planeshift/src/server npcmanager.cpp, 1.145, 1.146

[Anders Reggestad <magodra@us...>]

Update of /cvsroot/planeshift/planeshift/src/server
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8086/src/server

Modified Files:
	npcmanager.cpp 
Log Message:
- Added support to memorize when items are picked up.
- Created a new InventoryPerception.
- Added parameter radius to memory find function. This will find
  memories within radius from the given position. This to prevent
  a number of memories about the same thing with just small 
  diffrences in position.


Index: npcmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/npcmanager.cpp,v
retrieving revision 1.145
retrieving revision 1.146
diff -C2 -d -r1.145 -r1.146
*** npcmanager.cpp	9 Oct 2006 20:50:07 -0000	1.145
--- npcmanager.cpp	19 Oct 2006 22:07:44 -0000	1.146
***************
*** 1624,1629 ****
      outbound->msg->Add( (bool) inserted );
      cmd_count++;
!     Debug5(LOG_NPC, owner->GetEntity()->GetID(),"Added perception: %s has %s %s %s inventory.\n",
             owner->GetEntity()->GetName(),
             (inserted?"added":"removed"),
             itemdata->GetName(),
--- 1624,1630 ----
      outbound->msg->Add( (bool) inserted );
      cmd_count++;
!     Debug6(LOG_NPC, owner->GetEntity()->GetID(),"Added perception: %s(%u) has %s %s %s inventory.\n",
             owner->GetEntity()->GetName(),
+            owner->GetEntity()->GetID(),
             (inserted?"added":"removed"),
             itemdata->GetName(),

[Planeshift-cvs] CVS: planeshift/data npcbehave.xml,1.44,1.45

[Anders Reggestad <magodra@us...>]

Update of /cvsroot/planeshift/planeshift/data
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8086/data

Modified Files:
	npcbehave.xml 
Log Message:
- Added support to memorize when items are picked up.
- Created a new InventoryPerception.
- Added parameter radius to memory find function. This will find
  memories within radius from the given position. This to prevent
  a number of memories about the same thing with just small 
  diffrences in position.


Index: npcbehave.xml
===================================================================
RCS file: /cvsroot/planeshift/planeshift/data/npcbehave.xml,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** npcbehave.xml	13 Oct 2006 06:41:45 -0000	1.44
--- npcbehave.xml	19 Oct 2006 22:07:44 -0000	1.45
***************
*** 355,366 ****
        <!-- debug state="no" /-->
      </behavior>
  
!     <react event="tribe:explore"      behavior="Explore"    delta="100" />
!     <react event="location sensed"    behavior="ExploreLoc" delta="0"   type="mine" only_interrupt="Explore" />
!     <react event="tribe:dig"          behavior="Dig"        delta="100" />
!     <react event="tribe:path1"        behavior="Path1"      delta="100" />
!     <react event="tribe:path2"        behavior="Path2"      delta="100" />
!     <react event="tribe:reproduce"    behavior="Reproduce"  delta="0"   inactive_only="yes" />
!     <react event="tribe:resurrect"    behavior="Resurrect"  delta="0"   inactive_only="yes" when_dead="yes" />
    </npctype>
    
--- 355,372 ----
        <!-- debug state="no" /-->
      </behavior>
+     <behavior name="RememberLoc" completion_decay="0" growth="0" initial="0" >
+       <debug state="yes" />
+       <memorize obj="perception" />
+       <debug state="no" />
+     </behavior>
  
!     <react event="tribe:explore"      behavior="Explore"     delta="100" />
!     <react event="location sensed"    behavior="ExploreLoc"  delta="0"   type="mine" only_interrupt="Explore" />
!     <react event="tribe:dig"          behavior="Dig"         delta="100" />
!     <react event="tribe:path1"        behavior="Path1"       delta="100" />
!     <react event="tribe:path2"        behavior="Path2"       delta="100" />
!     <react event="tribe:reproduce"    behavior="Reproduce"   delta="0"   inactive_only="yes" />
!     <react event="tribe:resurrect"    behavior="Resurrect"   delta="0"   inactive_only="yes" when_dead="yes" />
!     <react event="inventory:added"    behavior="RememberLoc" delta="0"   type="Gold Ore"/>
    </npctype>
    

[Planeshift-cvs] CVS: planeshift/src/server psserverchar.cpp, 1.400, 1.401 psserverchar.h, 1.73, 1.74

[Andy Dai <khakilord@us...>]

Update of /cvsroot/planeshift/planeshift/src/server
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4075/src/server

Modified Files:
	psserverchar.cpp psserverchar.h 
Log Message:
Fixed a problem where the container view was not being refreshed when a slot movement failed.

Index: psserverchar.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/psserverchar.cpp,v
retrieving revision 1.400
retrieving revision 1.401
diff -C2 -d -r1.400 -r1.401
*** psserverchar.cpp	19 Oct 2006 21:45:50 -0000	1.400
--- psserverchar.cpp	19 Oct 2006 21:57:09 -0000	1.401
***************
*** 2680,2684 ****
  }
  
! void SlotManager::SendContainerError( int result, Client* fromClient )
  {
      csString errorMessage = "No Error";
--- 2680,2684 ----
  }
  
! void SlotManager::SendContainerError( int result, Client* fromClient, int containerID, int slotID, int parentContainerID )
  {
      csString errorMessage = "No Error";
***************
*** 2729,2732 ****
--- 2729,2733 ----
          }       
      }   
+     psserver->GetCharManager()->ViewItem(fromClient, containerID, slotID, parentContainerID);
      psserver->SendSystemError(fromClient->GetClientNum(), errorMessage );        
  }
***************
*** 3021,3025 ****
                  else 
                      remainder = -1;
!                 SlotManager::SendContainerError( result, fromClient );
              }
          }
--- 3022,3026 ----
                  else 
                      remainder = -1;
!                 SlotManager::SendContainerError( result, fromClient, eToSlot, toSlot, toContainer );
              }
          }

Index: psserverchar.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/psserverchar.h,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** psserverchar.h	10 Oct 2006 16:08:29 -0000	1.73
--- psserverchar.h	19 Oct 2006 21:57:09 -0000	1.74
***************
*** 129,133 ****
        * @param fromClient The client the error message should be sent to.
        */
!     static void SendContainerError( int result, Client* fromClient );
  
      /** This creates a money item.
--- 129,133 ----
        * @param fromClient The client the error message should be sent to.
        */
!     static void SendContainerError( int result, Client* fromClient, int containerID, int slotID, int parentContainerID );
  
      /** This creates a money item.

[Planeshift-cvs] CVS: planeshift/docs history.txt,1.3848,1.3849

[Andy Dai <khakilord@us...>]

Update of /cvsroot/planeshift/planeshift/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4075/docs

Modified Files:
	history.txt 
Log Message:
Fixed a problem where the container view was not being refreshed when a slot movement failed.

Index: history.txt
===================================================================
RCS file: /cvsroot/planeshift/planeshift/docs/history.txt,v
retrieving revision 1.3848
retrieving revision 1.3849
diff -C2 -d -r1.3848 -r1.3849
*** history.txt	19 Oct 2006 21:45:50 -0000	1.3848
--- history.txt	19 Oct 2006 21:57:09 -0000	1.3849
***************
*** 1,2 ****
--- 1,6 ----
+ *** 2006-10-19 by Andrew Dai
+ - Fixed a problem where the container view was not being refreshed when a
+   slot movement failed.
+ 
  *** 2006-10-19 by Andrew Craig
  - Added a crafted_quality column to the item_instances table. This is set

[Planeshift-cvs] CVS: planeshift/src/server/database/mysql item_instances.sql, 1.52, 1.53 upgrade_schema.sql, 1.58, 1.59

[Andrew Craig <acraig@us...>]

Update of /cvsroot/planeshift/planeshift/src/server/database/mysql
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32181/src/server/database/mysql

Modified Files:
	item_instances.sql upgrade_schema.sql 
Log Message:
Added crafted_quality to the item_instances table to fix funny 1.43/1.00 things in the info window. 

Index: item_instances.sql
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/database/mysql/item_instances.sql,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** item_instances.sql	9 Oct 2006 22:17:39 -0000	1.52
--- item_instances.sql	19 Oct 2006 21:45:50 -0000	1.53
***************
*** 34,37 ****
--- 34,38 ----
    `decay_resistance` float(3,2) NOT NULL default '0.00',
    `item_quality` float(5,2) default '50',
+   `crafted_quality` float(5,2) default '50',
    `item_stats_id_standard` int(10) unsigned NOT NULL default '0',
    `item_stats_id_unique` int(10) unsigned default '0',

Index: upgrade_schema.sql
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/database/mysql/upgrade_schema.sql,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** upgrade_schema.sql	18 Oct 2006 20:41:54 -0000	1.58
--- upgrade_schema.sql	19 Oct 2006 21:45:50 -0000	1.59
***************
*** 366,367 ****
--- 366,373 ----
  source sc_locations.sql;
  UPDATE `server_options` SET `option_value`='1127' WHERE `option_name`='db_version';
+ 
+ alter table item_instances add column `crafted_quality` float(5,2) default '-1';
+ ALTER TABLE item_instances MODIFY COLUMN crafted_quality float(5,2) default '-1' AFTER item_quality;
+ UPDATE `server_options` SET `option_value`='1128' WHERE `option_name`='db_version';
+ 
+ 

[Planeshift-cvs] CVS: planeshift/src/common/util location.cpp, 1.15, 1.16 psconst.h, 1.163, 1.164

[Andrew Craig <acraig@us...>]

Update of /cvsroot/planeshift/planeshift/src/common/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32181/src/common/util

Modified Files:
	location.cpp psconst.h 
Log Message:
Added crafted_quality to the item_instances table to fix funny 1.43/1.00 things in the info window. 

Index: location.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/util/location.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** location.cpp	18 Oct 2006 20:41:54 -0000	1.15
--- location.cpp	19 Oct 2006 21:45:50 -0000	1.16
***************
*** 255,259 ****
      loc.pos.z = node->GetAttributeValueAsFloat("z");
      loc.sectorName = node->GetAttributeValue("sector");
!     loc.sector = engine->FindSector(loc.sectorName);
      loc.radius = node->GetAttributeValueAsFloat("radius");
      loc.rot_angle = 0.0;
--- 255,262 ----
      loc.pos.z = node->GetAttributeValueAsFloat("z");
      loc.sectorName = node->GetAttributeValue("sector");
!     
!     if ( loc.sectorName.Length() > 0 )
!         loc.sector = engine->FindSector(loc.sectorName);
! 
      loc.radius = node->GetAttributeValueAsFloat("radius");
      loc.rot_angle = 0.0;

Index: psconst.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/common/util/psconst.h,v
retrieving revision 1.163
retrieving revision 1.164
diff -C2 -d -r1.163 -r1.164
*** psconst.h	18 Oct 2006 20:41:54 -0000	1.163
--- psconst.h	19 Oct 2006 21:45:50 -0000	1.164
***************
*** 71,75 ****
  
  // Remember to bump this in server_options.sql and add to upgrade_schema.sql!
! #define DATABASE_VERSION_STR "1127"
  
  #define RANGE_TO_SEE_ACTOR_LABELS 14
--- 71,75 ----
  
  // Remember to bump this in server_options.sql and add to upgrade_schema.sql!
! #define DATABASE_VERSION_STR "1128"
  
  #define RANGE_TO_SEE_ACTOR_LABELS 14

[Planeshift-cvs] CVS: planeshift/docs history.txt,1.3847,1.3848

[Andrew Craig <acraig@us...>]

Update of /cvsroot/planeshift/planeshift/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32181/docs

Modified Files:
	history.txt 
Log Message:
Added crafted_quality to the item_instances table to fix funny 1.43/1.00 things in the info window. 

Index: history.txt
===================================================================
RCS file: /cvsroot/planeshift/planeshift/docs/history.txt,v
retrieving revision 1.3847
retrieving revision 1.3848
diff -C2 -d -r1.3847 -r1.3848
*** history.txt	18 Oct 2006 20:41:54 -0000	1.3847
--- history.txt	19 Oct 2006 21:45:50 -0000	1.3848
***************
*** 1,2 ****
--- 1,8 ----
+ *** 2006-10-19 by Andrew Craig
+ - Added a crafted_quality column to the item_instances table. This is set
+   when an item is crafted. This will be used instead of item_stats 
+   max quality if the item was crafted.  
+   Database version push.
+ 
  *** 2006-10-18 by Anders Reggestad
  - Added DB tables for locations => DB VERSION BUMPED

[Planeshift-cvs] CVS: planeshift/src/server/bulkobjects psitem.cpp, 1.207, 1.208 psitem.h, 1.117, 1.118

[Andrew Craig <acraig@us...>]

Update of /cvsroot/planeshift/planeshift/src/server/bulkobjects
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32181/src/server/bulkobjects

Modified Files:
	psitem.cpp psitem.h 
Log Message:
Added crafted_quality to the item_instances table to fix funny 1.43/1.00 things in the info window. 

Index: psitem.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/bulkobjects/psitem.cpp,v
retrieving revision 1.207
retrieving revision 1.208
diff -C2 -d -r1.207 -r1.208
*** psitem.cpp	17 Oct 2006 18:26:56 -0000	1.207
--- psitem.cpp	19 Oct 2006 21:45:50 -0000	1.208
***************
*** 385,389 ****
          SetItemQuality(GetMaxItemQuality(),false);
      }
!         
      if ( row.GetUInt32("char_id_owner") == 0 )
      {
--- 385,392 ----
          SetItemQuality(GetMaxItemQuality(),false);
      }
!     
!     // Set the crafted quality for this item. 
!     crafted_quality = row.GetFloat("crafted_quality");
!                    
      if ( row.GetUInt32("char_id_owner") == 0 )
      {
***************
*** 503,506 ****
--- 506,510 ----
               "stack_count",
               "item_quality",
+              "crafted_quality",
               "decay_resistance",
               "creator_mark_id",
***************
*** 551,554 ****
--- 555,559 ----
               "stack_count",
               "item_quality",
+              "crafted_quality",
               "decay_resistance",
               "creator_mark_id",
***************
*** 595,598 ****
--- 600,606 ----
      // Item quality
      fields.FormatPush("%1.2f",GetItemQuality());
+     
+     // Crafted Quality
+     fields.FormatPush("%1.2f", GetMaxItemQuality());
  
      fields.FormatPush("%1.2f",GetDecayResistance());
***************
*** 862,871 ****
  float psItem::GetMaxItemQuality()
  {
!     return current_stats->GetQuality();
  }
  
  void psItem::SetMaxItemQuality(float v)
  {
!     base_stats->SetQuality(v);
  }
  
--- 870,882 ----
  float psItem::GetMaxItemQuality()
  {
!     if ( crafted_quality == -1 )
!         return current_stats->GetQuality();
!     else
!         return crafted_quality;
  }
  
  void psItem::SetMaxItemQuality(float v)
  {
!     crafted_quality = v;    
  }
  

Index: psitem.h
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/bulkobjects/psitem.h,v
retrieving revision 1.117
retrieving revision 1.118
diff -C2 -d -r1.117 -r1.118
*** psitem.h	8 Oct 2006 22:31:13 -0000	1.117
--- psitem.h	19 Oct 2006 21:45:50 -0000	1.118
***************
*** 299,304 ****
      float decay_resistance; // percent 3.2
  
!     /// Current quality of item, value between 0 and 100.
!     float item_quality;
      /// Original quality of item, used to detect save requirements
      float item_quality_original;
--- 299,307 ----
      float decay_resistance; // percent 3.2
  
!     
!     float item_quality;                     ///< Current quality of item
!     float crafted_quality;                  ///< The crafted max quality of the item.
!     
!     
      /// Original quality of item, used to detect save requirements
      float item_quality_original;

[Planeshift-cvs] CVS: planeshift/src/server psserverchar.cpp, 1.399, 1.400 workmanager.cpp, 1.202, 1.203

[Andrew Craig <acraig@us...>]

Update of /cvsroot/planeshift/planeshift/src/server
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32181/src/server

Modified Files:
	psserverchar.cpp workmanager.cpp 
Log Message:
Added crafted_quality to the item_instances table to fix funny 1.43/1.00 things in the info window. 

Index: psserverchar.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/psserverchar.cpp,v
retrieving revision 1.399
retrieving revision 1.400
diff -C2 -d -r1.399 -r1.400
*** psserverchar.cpp	17 Oct 2006 18:12:24 -0000	1.399
--- psserverchar.cpp	19 Oct 2006 21:45:50 -0000	1.400
***************
*** 1616,1620 ****
      itemCategory.Format( "Category: %s", itemStats->GetCategory()->name.GetData() );
      weight.Format("\nWeight: %.2f", item->GetSumWeight() );
!     itemQuality.Format("\nQuality: %.1f/%1.0f", item->GetItemQuality(),item->GetMaxItemQuality() );
      itemInfo += itemCategory+weight+itemQuality;
  
--- 1616,1620 ----
      itemCategory.Format( "Category: %s", itemStats->GetCategory()->name.GetData() );
      weight.Format("\nWeight: %.2f", item->GetSumWeight() );
!     itemQuality.Format("\nQuality: %.2f/%.2f", item->GetItemQuality(),item->GetMaxItemQuality() );
      itemInfo += itemCategory+weight+itemQuality;
  

Index: workmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/workmanager.cpp,v
retrieving revision 1.202
retrieving revision 1.203
diff -C2 -d -r1.202 -r1.203
*** workmanager.cpp	10 Oct 2006 16:01:27 -0000	1.202
--- workmanager.cpp	19 Oct 2006 21:45:50 -0000	1.203
***************
*** 2419,2425 ****
          // Set stuff
          newItem->SetItemQuality(itemQuality,false);
          newItem->SetStackCount(newQty);
          newItem->SetOwningCharacter( owner, false);
! 		newItem->SetDecayResistance(0.5,false);
  
          if ( parent )
--- 2419,2426 ----
          // Set stuff
          newItem->SetItemQuality(itemQuality,false);
+         newItem->SetMaxItemQuality(itemQuality);            // Set the max quality the same as the inital quality.
          newItem->SetStackCount(newQty);
          newItem->SetOwningCharacter( owner, false);
!         newItem->SetDecayResistance(0.5,false);
  
          if ( parent )
***************
*** 2933,2939 ****
          currentQuality = currentQuality -((currentQuality*expFactor)/100);
          
!         // Make it perfect if it's better then perfect
! 		float maxQuality = transItem->GetMaxItemQuality();
! 		if ( currentQuality > 1000)
          {
              currentQuality = 1000;
--- 2934,2939 ----
          currentQuality = currentQuality -((currentQuality*expFactor)/100);
          
!        
!         if ( currentQuality > 1000)
          {
              currentQuality = 1000;