From: <lpa...@us...> - 2013-01-01 15:32:23
|
Revision: 8526 http://planeshift.svn.sourceforge.net/planeshift/?rev=8526&view=rev Author: lpancallo Date: 2013-01-01 15:32:16 +0000 (Tue, 01 Jan 2013) Log Message: ----------- crafting books: enchant gems and subprocess exclusion by Eredin Modified Paths: -------------- trunk/src/server/bulkobjects/pstrade.h trunk/src/server/cachemanager.cpp Modified: trunk/src/server/bulkobjects/pstrade.h =================================================================== --- trunk/src/server/bulkobjects/pstrade.h 2012-12-31 01:41:35 UTC (rev 8525) +++ trunk/src/server/bulkobjects/pstrade.h 2013-01-01 15:32:16 UTC (rev 8526) @@ -161,10 +161,10 @@ uint32 GetGarbageId() const { return garbageId; } int GetGarbageQty() const { return garbageQty; } int GetPrimarySkillId() const { return priSkillId; } + int GetSubprocessId() const { return subprocess; } unsigned int GetMinPrimarySkill() const { return minPriSkill; } unsigned int GetMaxPrimarySkill() const { return maxPriSkill; } - int GetPrimaryPracticePts() const { return priPracticePts; } - int GetPrimaryQualFactor() const { return priQualFactor; } + int GetPrimaryPracticePts() const { return priPracticePts; } int GetPrimaryQualFactor() const { return priQualFactor; } int GetSecondarySkillId() const { return secSkillId; } unsigned int GetMinSecondarySkill() const { return minSecSkill; } unsigned int GetMaxSecondarySkill() const { return maxSecSkill; } Modified: trunk/src/server/cachemanager.cpp =================================================================== --- trunk/src/server/cachemanager.cpp 2012-12-31 01:41:35 UTC (rev 8525) +++ trunk/src/server/cachemanager.cpp 2013-01-01 15:32:16 UTC (rev 8526) @@ -1690,15 +1690,17 @@ for(int k=0; k<procArray->GetSize(); k++) { psTradeProcesses* proc = procArray->Get(k); - craftInfo = new CraftTransInfo; + if( proc->GetSubprocessId()==0 ) { + craftInfo = new CraftTransInfo; - craftInfo->priSkillId = proc->GetPrimarySkillId(); - craftInfo->minPriSkill = proc->GetMinPrimarySkill(); - craftInfo->secSkillId = proc->GetSecondarySkillId(); - craftInfo->minSecSkill = proc->GetMinSecondarySkill(); - craftInfo->craftStepDescription = CreateTransCraftDescription(t,proc); + craftInfo->priSkillId = proc->GetPrimarySkillId(); + craftInfo->minPriSkill = proc->GetMinPrimarySkill(); + craftInfo->secSkillId = proc->GetSecondarySkillId(); + craftInfo->minSecSkill = proc->GetMinSecondarySkill(); + craftInfo->craftStepDescription = CreateTransCraftDescription(t,proc); //printf ( "DEBUG: Describe Transformation - item %i--[process %i]-->result %i = %s\n", itemID, processID, resultID, craftInfo->craftStepDescription.GetData()); - newArray->Push(craftInfo); + newArray->Push(craftInfo); + } } } @@ -1774,12 +1776,15 @@ if(resultID == Key || Contains(itemStack, Key) ) { -//printf( "DEBUG : ListProductionSteps : next(%u), result ID %i\n", Key, resultID ); - DescribeTransformation(rArray->Get(0), newArray); +//printf( "DEBUG : ListProductionSteps : next(%u), result ID %i has %i transformations\n", Key, resultID, rArray->GetSize() ); + for( int j=0; j<rArray->GetSize(); j++ ) + { + DescribeTransformation(rArray->Get(j), newArray); + } } else if( !Contains(itemStack, Key)) { - if(!Contains(finalItems, Key)) + if(!Contains(finalItems, Key)) { ListProductionSteps(newArray, txResultHash, finalItems, Key, patternID, groupID, itemStack); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |