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

[Andrew C. <ac...@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;