WebSVN – spk – Diff – /libspk/src/Packages.cpp

+				}
 				else if ( cmd.Compare("GlobalSetting") )
 					m_lGlobals.PushBack(CyString(rest.token(":", 1)), CyString(rest.tokens(":", 2)));
 				else if ( cmd.Compare("FakePatchOrder") )
 					m_lFakePatchOrder.PushBack(CyString(rest.token(":", 1)), CyString(rest.tokens(":", 2)));
+				else if ( cmd.Compare("EMPPriceOverride") )
+					this->addEMPPriceOverride(rest.token(" ", 1).toLong(), rest.token(" ", 2).toLong());
+				else if ( cmd.Compare("EMPNotoOverride") )
+					this->addEMPNotoOverride(rest.token(" ", 1).toLong(), rest.token(" ", 2).toLong());
+				else if ( cmd.Compare("BuiltInWarePriceOverride") )
+					this->addBuiltInWarePriceOverride(rest.token(" ", 1).toLong(), rest.token(" ", 2).toLong());
+				else if ( cmd.Compare("BuiltInWareNotoOverride") )
+					this->addBuiltInWareNotoOverride(rest.token(" ", 1).toLong(), rest.token(" ", 2).toLong());
+				else if ( cmd.Compare("CustomWarePriceOverride") )
+					this->addCustomWarePriceOverride(rest.token(";", 1), rest.token(";", 2).toLong());
+				else if ( cmd.Compare("CustomWareNotoOverride") )
+					this->addCustomWareNotoOverride(rest.token(";", 1), rest.token(";", 2).toLong());
 				else if ( cmd == "globalfiles" )
 					iStatus = READ_GLOBAL;
 				if ( progress )
+				{
 	if ( package->IsMod() && !disabled ) {
 		m_pEnabledMod = package;
 		CLog::log(CLog::Log_Install, 1, "Setting package as primary mod");
+	}
+	package->updateTextDB();
 	m_bRemoveDir = true;
 	CLog::log(CLog::Log_Install, 1, "Saving data to file");
 	this->WriteData();
+	{
 		for ( SStringList *str = m_lFakePatchOrder.Head(); str; str = str->next )
 			lines.PushBack(CyString("FakePatchOrder: ") + str->str + ":" + str->data);
+	}
+	for(CListNode<SWarePriceOverride> *node = m_lWarePrices.Front(); node; node = node->next()) {
+		SWarePriceOverride *ware = node->Data();
+		switch(ware->type) {
+			case Ware_EMP:
+				lines.PushBack(CyString(Utils::String("EMPPriceOverride:") + (long)ware->pos + " " + (long)ware->relval));
+				if ( ware->bNotority )
+					lines.PushBack(CyString(Utils::String("EMPNotoOverride:") + (long)ware->pos + " " + (long)ware->notority));
+				break;
+			case Ware_Custom:
+				lines.PushBack(CyString(Utils::String("CustomWarePriceOverride:") + ware->id + ";" + (long)ware->relval));
+				if ( ware->bNotority )
+					lines.PushBack(CyString(Utils::String("CustomWareNotoOverride:") + ware->id + ";" + (long)ware->notority));
+				break;
+			case Ware_BuiltIn:
+				lines.PushBack(CyString(Utils::String("BuiltInWarePriceOverride:") + (long)ware->pos + " " + (long)ware->relval));
+				if ( ware->bNotority )
+					lines.PushBack(CyString(Utils::String("BuiltInWareNotoOverride:") + (long)ware->pos + " " + (long)ware->notority));
+				break;
+		}
+	}
 	// write the global file list
 	lines.PushBack("GlobalFiles:");
 	int num = 0;
 	for ( CListNode<C_File> *fn = m_lFiles.Front(); fn; fn = fn->next() )
+	{
 						create = true;
 						w->pWare->iDescID = wareTextID;
 						w->iText = wareTextID;
 						wareTextID += 10;
 						w->iPos = wareLines.Count();
+						long price = this->customWareOveridePrice(w->pWare->sID);
+						int notority = w->pWare->iNotority;
+						if ( !this->customWareOverideNoto(w->pWare->sID, &notority) ) notority = w->pWare->iNotority;
+						if ( !price ) price = w->pWare->iPrice;
-						wareLines.PushBack(CyString("28;0;0;0;0;") + (long)wareLines.Count() + ";" + (long)(w->iText + 3) + ";" + (long)w->pWare->iVolumn + ";" + (long)w->pWare->iPrice + ";1;1;" + (long)w->pWare->iSize + ";" + (long)w->pWare->iPrice + ";" + (long)w->pWare->iNotority + ";0;0;" + w->sWareName.ToUpper() + ";");
+						wareLines.PushBack(CyString("28;0;0;0;0;") + (long)wareLines.Count() + ";" + (long)(w->iText + 3) + ";" + (long)w->pWare->iVolumn + ";" + price + ";1;1;" + (long)w->pWare->iSize + ";" + price + ";" + (long)notority + ";0;0;" + w->sWareName.ToUpper() + ";");
+					}
+				}
 				if ( create )
+				{
 			readFile.remove();
+		}
+	}
+}
-void CPackages::CreateEMPFile(CyString progDir)
+Utils::String CPackages::empWaresForGame(int *maxsize)
+{
-	// do emp wares
-	int maxsize = 0;
+	if ( maxsize ) (*maxsize) = 0;
-	Utils::String empWares;
 	if ( m_iGame == GAME_X3TC )
+	{
-		maxsize = EMP_X3TC;
+		if ( maxsize ) (*maxsize) = EMP_X3TC;
-		empWares = GetX3TCEmp();
+		return GetX3TCEmp();
+	}
 	else if ( m_iGame == GAME_X3AP )
+	{
-		maxsize = EMP_X3AP;
+		if ( maxsize ) (*maxsize) = EMP_X3AP;
-		empWares = GetX3TCEmp();
+		return GetX3TCEmp();
+	}
 	else if ( m_iGame == GAME_X3 )
+	{
-		maxsize = EMP_X3;
+		if ( maxsize ) (*maxsize) = EMP_X3;
-		empWares = GetX3Emp();
+		return GetX3Emp();
+	}
+	return Utils::String::Null();
+}
+void CPackages::_addWareOverride(enum WareTypes type, int pos, const Utils::String &id, int value, bool noto)
+{
+	for(CListNode<SWarePriceOverride> *node = m_lWarePrices.Front(); node; node = node->next()) {
+		SWarePriceOverride *wp = node->Data();
+		if ( wp->type == type ) {
+			if ( wp->type == Ware_Custom && !wp->id.Compare(id) ) continue;
+			else if ( wp->type != Ware_Custom && wp->pos != pos ) continue;
+			if ( noto ) {
+				wp->notority  = value;
+				wp->bNotority = value;
+			}
+			else wp->relval = value;
+			return;
+		}
+	}
+	SWarePriceOverride *ware = new SWarePriceOverride;
+	ware->bNotority = noto;
+	ware->notority = (noto) ? value : 0;
+	ware->relval = (noto) ? 0 : value;
+	ware->type = type;
+	ware->pos = pos;
+	ware->id = id;
+	m_lWarePrices.push_back(ware);
+}
+void CPackages::addEMPPriceOverride(int empId, int price)
+{
+	_addWareOverride(Ware_EMP, empId, Utils::String::Null(), price, false);
+}
+void CPackages::addEMPNotoOverride(int empId, int noto)
+{
+	_addWareOverride(Ware_EMP, empId, Utils::String::Null(), noto, true);
+}
+void CPackages::addBuiltInWarePriceOverride(int empId, int price)
+{
+	_addWareOverride(Ware_BuiltIn, empId, Utils::String::Null(), price, false);
+}
+void CPackages::addBuiltInWareNotoOverride(int empId, int noto)
+{
+	_addWareOverride(Ware_BuiltIn, empId, Utils::String::Null(), noto, false);
+}
+void CPackages::addCustomWarePriceOverride(const Utils::String &id, int price)
+{
+	_addWareOverride(Ware_Custom, 0, id, price, false);
+}
+void CPackages::addCustomWareNotoOverride(const Utils::String &id, int noto)
+{
+	_addWareOverride(Ware_Custom, 0, id, noto, true);
+}
+void CPackages::CreateEMPFile(CyString progDir)
+{
+	// do emp wares
+	int maxsize = 0;
+	Utils::String empWares = empWaresForGame(&maxsize);
 	if ( maxsize )
+	{
 		int e = ExtractGameFile("types/TWareT.pck", m_sTempDir + "/TWareT.txt");
 		if ( e )
+		{
 			int oldSize = -1;
 			int version = -1;
 			// read first number
 			CFileIO readFile((e == -1) ? "TWareT.txt" : m_sTempDir + "/TWareT.txt");
-			std::vector<CyString> *lines = readFile.ReadLines();
+			std::vector<Utils::String> *lines = readFile.readLines();
 			if ( lines )
+			{
 				for ( int i = 0; i < (int)lines->size(); i++ )
+				{
-					CyString line(lines->at(i));
+					Utils::String line(lines->at(i));
-					line.RemoveFirstSpace();
+					line.removeFirstSpace();
-					line.RemoveChar('\r');
+					line.removeChar('\r');
-					line.RemoveChar(9);
+					line.removeChar(9);
 					if ( line[0] == '/' )
 						continue;
 					if ( oldSize == -1 )
+					{
-						version = line.GetToken(";", 1, 1).ToInt();
+						version = line.token(";", 1).toLong();
-						oldSize = line.GetToken(";", 2, 2).ToInt();
+						oldSize = line.token(";", 2).toLong();
+					}
 					else
+					{
-						line.RemoveEndSpace();
+						line.removeEndSpace();
-						if ( line.Right(1) != ";" )
+						if ( line.right(1) != ";" )
 							line += ";";
+						// check for any override values for built in wares
+						if ( (i >= 62 && i <= 81) || (i >= 88 && i <= 93) ) {
+							int pos = i - ((i >= 88) ? 88 : 62);
+							int price = this->builtInWareOveridePrice(pos);
+							if ( price ) {
+								line = line.replaceToken(";", 9, Utils::String::Number(price));
+								line = line.replaceToken(";", 13, Utils::String::Number(price));
+							}
+							int noto = 0;
+							if ( this->builtInWareOverideNoto(pos, &noto) ) {
+								line = line.replaceToken(";", 14, Utils::String::Number(noto));
+							}
+						}
+						// check for any override values for EMP
+						if ( i >= 116 ) {
+							int price = this->empOveridePrice(i - 116);
+							if ( price ) {
+								line = line.replaceToken(";", 9, Utils::String::Number(price));
+								line = line.replaceToken(";", 13, Utils::String::Number(price));
+							}
+							int noto = 0;
+							if ( this->empOverideNoto(i - 116, &noto) ) {
+								line = line.replaceToken(";", 14, Utils::String::Number(noto));
+							}
+						}
-						wareLines.PushBack(line);
+						wareLines.PushBack(CyString(line));
 						if ( wareLines.Count() >= oldSize )
 							break;
+					}
+				}
 			// need filler entries
 			while ( wareLines.Count() < maxsize )
 				wareLines.PushBack("27;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;SS_WARE_FILLER;");
 			int empEntries = 0;
-			CyString *empStr = CyString(empWares).SplitToken("\n", &empEntries);
+			Utils::String *empStr = empWares.tokenise("\n", &empEntries);
 			if ( empEntries && empStr )
+			{
+				// apply any price overrides
+				for(int i = 0; i < empEntries; i++) {
+					int price = this->empOveridePrice(i);
+					if ( price ) {
+						empStr[i] = empStr[i].replaceToken(";", 9, Utils::String::Number(price));
+						empStr[i] = empStr[i].replaceToken(";", 13, Utils::String::Number(price));
+					}
+					int noto = 0;
+					if ( this->empOverideNoto(i, &noto) ) {
+						empStr[i] = empStr[i].replaceToken(";", 14, Utils::String::Number(noto));
+					}
+				}
 				// remove any empty end entries
-				while ( empStr[empEntries - 1].Empty() )
+				while ( empStr[empEntries - 1].empty() )
 					--empEntries;
 				CyStringList addAfter;
 				if ( wareLines.Count() > maxsize )
+				{
 			WriteFile.remove();
+		}
+	}
+}
+bool CPackages::readWares(Utils::CStringList &list)
+{
+	CTextDB text;
+	// read through all text files and extract all the used wares
+	for(CListNode<C_File> *node = m_lFiles.Front(); node; node = node->next()) {
+		C_File *file = node->Data();
+		if ( file->GetFileType() == FILETYPE_TEXT ) {
+			Utils::String baseFile = CFileIO(file->filePointer()).baseName();
+			int lang = (baseFile.isin("-L")) ? baseFile.right(3) : baseFile.truncate(-4);
+			// read in the text file to the database
+			text.parseTextFile(17, 17, file->filePointer(), lang);
+		}
+	}
+	text.setLanguage(44);
+	// now go through all emp wares and get the ones we have text for
+	Utils::String empWares = empWaresForGame();
+	int totalWares = 0;
+	Utils::String *wares = empWares.tokenise("\n", &totalWares);
+	for(int i = 0; i < totalWares; i++) {
+		int textId = wares[i].token(";", 7).toLong();
+		if ( text.exists(44, 17, textId) ) {
+			list.pushBack(text.get(44, 17, textId), text.get(44, 17, textId + 1));
+		}
+	}
+	CLEANSPLIT(wares, totalWares);
+	return true;
+}
+int CPackages::_warePriceOverride(enum WareTypes type, int pos, const Utils::String &id)
+{
+	for(CListNode<SWarePriceOverride> *node = m_lWarePrices.Front(); node; node = node->next()) {
+		if ( node->Data()->type == type ) {
+			if ( node->Data()->type == Ware_Custom && id.Compare(node->Data()->id) ) return node->Data()->relval;
+			else if ( node->Data()->type != Ware_Custom && node->Data()->pos == pos ) return node->Data()->relval;
+		}
+	}
+	return 0;
+}
+bool CPackages::_wareNotoOverride(enum WareTypes type, int pos, const Utils::String &id, int *noto)
+{
+	for(CListNode<SWarePriceOverride> *node = m_lWarePrices.Front(); node; node = node->next()) {
+		if ( node->Data()->type == type && node->Data()->bNotority ) {
+			if ( node->Data()->type == Ware_Custom && !id.Compare(node->Data()->id) ) continue;
+			else if ( node->Data()->type != Ware_Custom && node->Data()->pos != pos ) continue;
+			(*noto) = node->Data()->notority;
+			return true;
+		}
+	}
+	return false;
+}
+void CPackages::_removeWareOverride(enum WareTypes type, int pos, const Utils::String &id)
+{
+	for(CListNode<SWarePriceOverride> *node = m_lWarePrices.Front(); node; node = node->next()) {
+		if ( node->Data()->type == type ) {
+			if ( node->Data()->type == Ware_Custom && !id.Compare(node->Data()->id) ) continue;
+			else if ( node->Data()->type != Ware_Custom && node->Data()->pos != pos ) continue;
+			m_lWarePrices.remove(node);
+			break;
+		}
+	}
+}
+int CPackages::empOveridePrice(int id)
+{
+	return _warePriceOverride(Ware_EMP, id, Utils::String::Null());
+}
+bool CPackages::empOverideNoto(int id, int *noto)
+{
+	return _wareNotoOverride(Ware_EMP, id, Utils::String::Null(), noto);
+}
+int CPackages::builtInWareOveridePrice(int id)
+{
+	return _warePriceOverride(Ware_BuiltIn, id, Utils::String::Null());
+}
+bool CPackages::builtInWareOverideNoto(int id, int *noto)
+{
+	return _wareNotoOverride(Ware_BuiltIn, id, Utils::String::Null(), noto);
+}
+int CPackages::customWareOveridePrice(const Utils::String &id)
+{
+	return _warePriceOverride(Ware_Custom, 0, id);
+}
+bool CPackages::customWareOverideNoto(const Utils::String &id, int *noto)
+{
+	return _wareNotoOverride(Ware_Custom, 0, id, noto);
+}
+void CPackages::removeEmpOverride(int pos)
+{
+	_removeWareOverride(Ware_EMP, pos, Utils::String::Null());
+}
+void CPackages::removeBuiltinWareOverride(int pos)
+{
+	_removeWareOverride(Ware_BuiltIn, pos, Utils::String::Null());
+}
+void CPackages::removeCustomWareOverride(const Utils::String &id)
+{
+	_removeWareOverride(Ware_Custom, 0, id);
+}
 bool CPackages::ReadGlobals(CyStringList &globals)
+{
 	int e = ExtractGameFile("types/Globals.pck", m_sTempDir);
 	if ( e )
+	{

Subversion Repositories spk

(root)/libspk/src/Packages.cpp – Rev 87 → 88