1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use prep time setting in text

Browse Source 
Remove debug prep time
This commit is contained in:
rftrdev
2022-10-26 20:48:15 -07:00
parent 54b0bf96b9
commit 02d6e48226
9 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Rebel Command.cpp
+5 -5
View File
@@ -2778,7 +2778,8 @@ void RenderMissionOverview()
case MOS_HELP:
{
UINT16 y = WEBSITE_TOP + 100;
y += DisplayWrappedString(WEBSITE_LEFT + 35, y, 400, 2, FONT12ARIAL, FONT_MCOLOR_BLACK, szRebelCommandText[RCT_MISSION_HELP_1], FONT_MCOLOR_BLACK, FALSE, 0);
swprintf(sText, szRebelCommandText[RCT_MISSION_HELP_1], gRebelCommandSettings.iMissionPrepTime);
y += DisplayWrappedString(WEBSITE_LEFT + 35, y, 400, 2, FONT12ARIAL, FONT_MCOLOR_BLACK, sText, FONT_MCOLOR_BLACK, FALSE, 0);
y += 20;
y += DisplayWrappedString(WEBSITE_LEFT + 35, y, 400, 2, FONT12ARIAL, FONT_MCOLOR_BLACK, szRebelCommandText[RCT_MISSION_HELP_2], FONT_MCOLOR_BLACK, FALSE, 0);
y += 20;
@@ -2947,9 +2948,9 @@ void PrepareMission(INT8 index)
{
MissionHelpers::missionParam = SerialiseMissionFirstEvent(FALSE, mercs[agentIndex[index]]->ubProfile, static_cast<RebelCommandAgentMissions>(rebelCommandSaveInfo.availableMissions[index]), missionDuration, static_cast<UINT8>(extraBits));
if (merc->bSex == MALE)
swprintf(text, szRebelCommandText[RCT_MISSION_POPUP_PART2_MALE], text, merc->zNickname);
swprintf(text, szRebelCommandText[RCT_MISSION_POPUP_PART2_MALE], text, merc->zNickname, gRebelCommandSettings.iMissionPrepTime);
else
swprintf(text, szRebelCommandText[RCT_MISSION_POPUP_PART2_FEMALE], text, merc->zNickname);
swprintf(text, szRebelCommandText[RCT_MISSION_POPUP_PART2_FEMALE], text, merc->zNickname, gRebelCommandSettings.iMissionPrepTime);
}
DoLapTopMessageBox(MSG_BOX_LAPTOP_DEFAULT, text, LAPTOP_SCREEN, MSG_BOX_FLAG_YESNO, [](UINT8 exitValue) {
@@ -2984,8 +2985,7 @@ void PrepareMission(INT8 index)
// queue up the mission start event. make sure we use the top of the hour because I'm lazy and we're handling the assignment here instead of Assignments.cpp
const UINT32 time = GetWorldTotalMin();
//AddStrategicEvent(EVENT_REBELCOMMAND, time + (60 - time % 60) + 60 * gRebelCommandSettings.iMissionPrepTime, MissionHelpers::missionParam);
AddStrategicEvent(EVENT_REBELCOMMAND, time + (60 - time % 60) + 60, MissionHelpers::missionParam); // rftr todo: DELETE ME
AddStrategicEvent(EVENT_REBELCOMMAND, time + (60 - time % 60) + 60 * gRebelCommandSettings.iMissionPrepTime, MissionHelpers::missionParam);
missionMap.insert(std::make_pair(static_cast<RebelCommandAgentMissions>(evt.missionId), MissionHelpers::missionParam));
rebelCommandSaveInfo.iSupplies -= GetMissionCost();
Utils/_ChineseText.cpp
+3 -3
View File
@@ -11968,7 +11968,7 @@ STR16 szRebelCommandText[] =
L"Prepare Mission (%d supplies)",
L"View active mission effects",
L"View available mission list",
L"You are able to prepare one of the two missions presented. Once an agent is dispatched, they will be unavailable for approximately 24 hours before becoming available again. A popup will notify you when preparations are complete. If preparations succeed, the mission's effects become active.",
L"You are able to prepare one of the two missions presented. Once an agent is dispatched, they will be unavailable for approximately %d hours before becoming available again. A popup will notify you when preparations are complete. If preparations succeed, the mission's effects become active.",
L"A rebel agent can be sent to prepare a mission, but your mercenaries will be far more effective. Their experience level and skills can provide additional bonuses to missions.",
L"The cost of preparing a mission increases based on the number other missions either active or being prepared.",
L"New missions will be available on Day %d at 00:00.",
@@ -11977,8 +11977,8 @@ STR16 szRebelCommandText[] =
L"%s - Active - Expires on Day %d, %02d:%02d",
L"[%s (%d supplies)]",
L"%s Send a rebel agent to prepare this mission?",
L"%s Send %s to prepare this mission? He will return in 24 hours.",
L"%s Send %s to prepare this mission? She will return in 24 hours.",
L"%s Send %s to prepare this mission? He will return in approximately %d hours.",
L"%s Send %s to prepare this mission? She will return in approximately %d hours.",
L"Mission \"%s\" is now in effect.",
L"Preparations for mission \"%s\" failed.",
L"Mission \"%s\" has expired and is no longer in effect.",
Utils/_DutchText.cpp
+3 -3
View File
@@ -11978,7 +11978,7 @@ STR16 szRebelCommandText[] = // TODO.Translate
L"Prepare Mission (%d supplies)",
L"View active mission effects",
L"View available mission list",
L"You are able to prepare one of the two missions presented. Once an agent is dispatched, they will be unavailable for approximately 24 hours before becoming available again. A popup will notify you when preparations are complete. If preparations succeed, the mission's effects become active.",
L"You are able to prepare one of the two missions presented. Once an agent is dispatched, they will be unavailable for approximately %d hours before becoming available again. A popup will notify you when preparations are complete. If preparations succeed, the mission's effects become active.",
L"A rebel agent can be sent to prepare a mission, but your mercenaries will be far more effective. Their experience level and skills can provide additional bonuses to missions.",
L"The cost of preparing a mission increases based on the number other missions either active or being prepared.",
L"New missions will be available on Day %d at 00:00.",
@@ -11987,8 +11987,8 @@ STR16 szRebelCommandText[] = // TODO.Translate
L"%s - Active - Expires on Day %d, %02d:%02d",
L"[%s (%d supplies)]",
L"%s Send a rebel agent to prepare this mission?",
L"%s Send %s to prepare this mission? He will return in 24 hours.",
L"%s Send %s to prepare this mission? She will return in 24 hours.",
L"%s Send %s to prepare this mission? He will return in approximately %d hours.",
L"%s Send %s to prepare this mission? She will return in approximately %d hours.",
L"Mission \"%s\" is now in effect.",
L"Preparations for mission \"%s\" failed.",
L"Mission \"%s\" has expired and is no longer in effect.",
Utils/_EnglishText.cpp
+3 -3
View File
@@ -11969,7 +11969,7 @@ STR16 szRebelCommandText[] =
L"Prepare Mission (%d supplies)",
L"View active mission effects",
L"View available mission list",
L"You are able to prepare one of the two missions presented. Once an agent is dispatched, they will be unavailable for approximately 24 hours before becoming available again. A popup will notify you when preparations are complete. If preparations succeed, the mission's effects become active.",
L"You are able to prepare one of the two missions presented. Once an agent is dispatched, they will be unavailable for approximately %d hours before becoming available again. A popup will notify you when preparations are complete. If preparations succeed, the mission's effects become active.",
L"A rebel agent can be sent to prepare a mission, but your mercenaries will be far more effective. Their experience level and skills can provide additional bonuses to missions.",
L"The cost of preparing a mission increases based on the number other missions either active or being prepared.",
L"New missions will be available on Day %d at 00:00.",
@@ -11978,8 +11978,8 @@ STR16 szRebelCommandText[] =
L"%s - Active - Expires on Day %d, %02d:%02d",
L"[%s (%d supplies)]",
L"%s Send a rebel agent to prepare this mission?",
L"%s Send %s to prepare this mission? He will return in 24 hours.",
L"%s Send %s to prepare this mission? She will return in 24 hours.",
L"%s Send %s to prepare this mission? He will return in approximately %d hours.",
L"%s Send %s to prepare this mission? She will return in approximately %d hours.",
L"Mission \"%s\" is now in effect.",
L"Preparations for mission \"%s\" failed.",
L"Mission \"%s\" has expired and is no longer in effect.",
Utils/_FrenchText.cpp
+3 -3
View File
@@ -11960,7 +11960,7 @@ STR16 szRebelCommandText[] = // TODO.Translate
L"Prepare Mission (%d supplies)",
L"View active mission effects",
L"View available mission list",
L"You are able to prepare one of the two missions presented. Once an agent is dispatched, they will be unavailable for approximately 24 hours before becoming available again. A popup will notify you when preparations are complete. If preparations succeed, the mission's effects become active.",
L"You are able to prepare one of the two missions presented. Once an agent is dispatched, they will be unavailable for approximately %d hours before becoming available again. A popup will notify you when preparations are complete. If preparations succeed, the mission's effects become active.",
L"A rebel agent can be sent to prepare a mission, but your mercenaries will be far more effective. Their experience level and skills can provide additional bonuses to missions.",
L"The cost of preparing a mission increases based on the number other missions either active or being prepared.",
L"New missions will be available on Day %d at 00:00.",
@@ -11969,8 +11969,8 @@ STR16 szRebelCommandText[] = // TODO.Translate
L"%s - Active - Expires on Day %d, %02d:%02d",
L"[%s (%d supplies)]",
L"%s Send a rebel agent to prepare this mission?",
L"%s Send %s to prepare this mission? He will return in 24 hours.",
L"%s Send %s to prepare this mission? She will return in 24 hours.",
L"%s Send %s to prepare this mission? He will return in approximately %d hours.",
L"%s Send %s to prepare this mission? She will return in approximately %d hours.",
L"Mission \"%s\" is now in effect.",
L"Preparations for mission \"%s\" failed.",
L"Mission \"%s\" has expired and is no longer in effect.",
Utils/_GermanText.cpp
+3 -3
View File
@@ -11882,7 +11882,7 @@ STR16 szRebelCommandText[] = // TODO.Translate
L"Prepare Mission (%d supplies)",
L"View active mission effects",
L"View available mission list",
L"You are able to prepare one of the two missions presented. Once an agent is dispatched, they will be unavailable for approximately 24 hours before becoming available again. A popup will notify you when preparations are complete. If preparations succeed, the mission's effects become active.",
L"You are able to prepare one of the two missions presented. Once an agent is dispatched, they will be unavailable for approximately %d hours before becoming available again. A popup will notify you when preparations are complete. If preparations succeed, the mission's effects become active.",
L"A rebel agent can be sent to prepare a mission, but your mercenaries will be far more effective. Their experience level and skills can provide additional bonuses to missions.",
L"The cost of preparing a mission increases based on the number other missions either active or being prepared.",
L"New missions will be available on Day %d at 00:00.",
@@ -11891,8 +11891,8 @@ STR16 szRebelCommandText[] = // TODO.Translate
L"%s - Active - Expires on Day %d, %02d:%02d",
L"[%s (%d supplies)]",
L"%s Send a rebel agent to prepare this mission?",
L"%s Send %s to prepare this mission? He will return in 24 hours.",
L"%s Send %s to prepare this mission? She will return in 24 hours.",
L"%s Send %s to prepare this mission? He will return in approximately %d hours.",
L"%s Send %s to prepare this mission? She will return in approximately %d hours.",
L"Mission \"%s\" is now in effect.",
L"Preparations for mission \"%s\" failed.",
L"Mission \"%s\" has expired and is no longer in effect.",
Utils/_ItalianText.cpp
+3 -3
View File
@@ -11969,7 +11969,7 @@ STR16 szRebelCommandText[] = // TODO.Translate
L"Prepare Mission (%d supplies)",
L"View active mission effects",
L"View available mission list",
L"You are able to prepare one of the two missions presented. Once an agent is dispatched, they will be unavailable for approximately 24 hours before becoming available again. A popup will notify you when preparations are complete. If preparations succeed, the mission's effects become active.",
L"You are able to prepare one of the two missions presented. Once an agent is dispatched, they will be unavailable for approximately %d hours before becoming available again. A popup will notify you when preparations are complete. If preparations succeed, the mission's effects become active.",
L"A rebel agent can be sent to prepare a mission, but your mercenaries will be far more effective. Their experience level and skills can provide additional bonuses to missions.",
L"The cost of preparing a mission increases based on the number other missions either active or being prepared.",
L"New missions will be available on Day %d at 00:00.",
@@ -11978,8 +11978,8 @@ STR16 szRebelCommandText[] = // TODO.Translate
L"%s - Active - Expires on Day %d, %02d:%02d",
L"[%s (%d supplies)]",
L"%s Send a rebel agent to prepare this mission?",
L"%s Send %s to prepare this mission? He will return in 24 hours.",
L"%s Send %s to prepare this mission? She will return in 24 hours.",
L"%s Send %s to prepare this mission? He will return in approximately %d hours.",
L"%s Send %s to prepare this mission? She will return in approximately %d hours.",
L"Mission \"%s\" is now in effect.",
L"Preparations for mission \"%s\" failed.",
L"Mission \"%s\" has expired and is no longer in effect.",
Utils/_PolishText.cpp
+3 -3
View File
@@ -11982,7 +11982,7 @@ STR16 szRebelCommandText[] = // TODO.Translate
L"Prepare Mission (%d supplies)",
L"View active mission effects",
L"View available mission list",
L"You are able to prepare one of the two missions presented. Once an agent is dispatched, they will be unavailable for approximately 24 hours before becoming available again. A popup will notify you when preparations are complete. If preparations succeed, the mission's effects become active.",
L"You are able to prepare one of the two missions presented. Once an agent is dispatched, they will be unavailable for approximately %d hours before becoming available again. A popup will notify you when preparations are complete. If preparations succeed, the mission's effects become active.",
L"A rebel agent can be sent to prepare a mission, but your mercenaries will be far more effective. Their experience level and skills can provide additional bonuses to missions.",
L"The cost of preparing a mission increases based on the number other missions either active or being prepared.",
L"New missions will be available on Day %d at 00:00.",
@@ -11991,8 +11991,8 @@ STR16 szRebelCommandText[] = // TODO.Translate
L"%s - Active - Expires on Day %d, %02d:%02d",
L"[%s (%d supplies)]",
L"%s Send a rebel agent to prepare this mission?",
L"%s Send %s to prepare this mission? He will return in 24 hours.",
L"%s Send %s to prepare this mission? She will return in 24 hours.",
L"%s Send %s to prepare this mission? He will return in approximately %d hours.",
L"%s Send %s to prepare this mission? She will return in approximately %d hours.",
L"Mission \"%s\" is now in effect.",
L"Preparations for mission \"%s\" failed.",
L"Mission \"%s\" has expired and is no longer in effect.",
Utils/_RussianText.cpp
+3 -3
View File
@@ -11963,7 +11963,7 @@ STR16 szRebelCommandText[] = // TODO.Translate
L"Prepare Mission (%d supplies)",
L"View active mission effects",
L"View available mission list",
L"You are able to prepare one of the two missions presented. Once an agent is dispatched, they will be unavailable for approximately 24 hours before becoming available again. A popup will notify you when preparations are complete. If preparations succeed, the mission's effects become active.",
L"You are able to prepare one of the two missions presented. Once an agent is dispatched, they will be unavailable for approximately %d hours before becoming available again. A popup will notify you when preparations are complete. If preparations succeed, the mission's effects become active.",
L"A rebel agent can be sent to prepare a mission, but your mercenaries will be far more effective. Their experience level and skills can provide additional bonuses to missions.",
L"The cost of preparing a mission increases based on the number other missions either active or being prepared.",
L"New missions will be available on Day %d at 00:00.",
@@ -11972,8 +11972,8 @@ STR16 szRebelCommandText[] = // TODO.Translate
L"%s - Active - Expires on Day %d, %02d:%02d",
L"[%s (%d supplies)]",
L"%s Send a rebel agent to prepare this mission?",
L"%s Send %s to prepare this mission? He will return in 24 hours.",
L"%s Send %s to prepare this mission? She will return in 24 hours.",
L"%s Send %s to prepare this mission? He will return in approximately %d hours.",
L"%s Send %s to prepare this mission? She will return in approximately %d hours.",
L"Mission \"%s\" is now in effect.",
L"Preparations for mission \"%s\" failed.",
L"Mission \"%s\" has expired and is no longer in effect.",