dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-06-17 22:03:56 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fixes to the economic tutorial (D194) following 15e2b42525

Browse source 
Reviewed By: Itms
Differential Revision: https://code.wildfiregames.com/D520
This was SVN commit r19628.
This commit is contained in:
mimo 2017-05-21 16:41:39 +00:00
parent aa4c542926
commit 61b243fdc6
5 changed files with 8 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
binaries/data/mods/public/gui/gamesetup/gamesetup.js
View file

@ -1781,6 +1781,7 @@ function launchGame()
function launchTutorial()
{
g_GameAttributes.mapType = "scenario";
selectMap("maps/tutorials/starting_economy_walkthrough");
launchGame();
}

6
binaries/data/mods/public/gui/session/tutorial_panel.xml
View file

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<object name="tutorialPanel" type="image" sprite="ModernFade" size="50%-300 38 50%+300 350" hidden="true">
<object name="tutorialPanel" type="image" sprite="ModernFade" size="50%-300 38 50%+300 352" hidden="true">
<object size="10 10 100%-20 100%-48">
<object name="tutorialText" type="text" style="TutorialPanel"/>
</object>
<object name="tutorialWarning" type="text" style="ModernLeftLabelText" size="10 100%-40 100%-180 100%-12"/>
<object name="tutorialWarning" type="text" style="ModernLeftLabelText" size="10 100%-42 100%-20 100%-12"/>
<object name="tutorialReady" type="button" style="ModernButtonRed" size="100%-160 100%-40 100%-20 100%-12">
<object name="tutorialReady" type="button" style="ModernButtonRed" size="100%-160 100%-42 100%-20 100%-12">
<translatableAttribute id="caption">Ready</translatableAttribute>
<action on="Press">Engine.PostNetworkCommand({"type": "dialog-answer", "tutorial": "ready"});</action>
</object>

12
binaries/data/mods/public/maps/scripts/Tutorial.js
View file

@ -90,18 +90,6 @@ Trigger.prototype.WarningMessage = function(txt)
});
};
Trigger.prototype.OnPlayerCommandTrigger = function() {};
Trigger.prototype.OnResearchQueuedTrigger = function() {};
Trigger.prototype.OnResearchFinishedTrigger = function() {};
Trigger.prototype.OnStructureBuiltTrigger = function() {};
Trigger.prototype.OnTrainingQueuedTrigger = function() {};
Trigger.prototype.OnTrainingFinishedTrigger = function() {};
Trigger.prototype.OnDeserializedTrigger = function()
{
this.index = Math.max(0, this.index - 1);

4
binaries/data/mods/public/maps/tutorials/starting_economy_walkthrough.js
View file

@ -6,7 +6,7 @@ let tutorialGoals = [
"instructions": markForTranslation("To start off, select your building, the Civic Center, by clicking on it. A selection ring in the color of your civilization will be displayed after clicking."),
},
{
"instructions": markForTranslation("Now that the Civic Center is selected, you will notice that a production panel will appear on the lower right of your screen detailing the actions that the buildings support. For the production panel, available actions are not masked in any color, while an icon masked in either grey or red indicates that the action has not been unlocked or you do not have sufficient resources to perform that action, respectively. Additionally, you can hover your mouse over icon to show a tooltip with more details.\nThe top row of buttons contains portraits of units that may be trained at the building while the bottom one or two rows will have researchable technologies. Hover your mouse over the 'II' icon. The tooltip will tell us that advancing to 'Town Phase' requires both more constructed structures as well as more Food and Wood resources."),
"instructions": markForTranslation("Now that the Civic Center is selected, you will notice that a production panel will appear on the lower right of your screen detailing the actions that the buildings support. For the production panel, available actions are not masked in any color, while an icon masked in either grey or red indicates that the action has not been unlocked or you do not have sufficient resources to perform that action, respectively. Additionally, you can hover your mouse over any icon to show a tooltip with more details.\nThe top row of buttons contains portraits of units that may be trained at the building while the bottom one or two rows will have researchable technologies. Hover your mouse over the 'II' icon. The tooltip will tell us that advancing to 'Town Phase' requires both more constructed structures as well as more Food and Wood resources."),
},
{
"instructions": markForTranslation("You have two main types of starting units: Female Citizens and Citizen Soldiers. Female Citizens are purely economic units; they have low HP, no armour, and little to no attack. Citizen Soldiers are workers by default, but in times of need, can utilizing a weapon to fight. You have two categories of Citizen Soldiers: Infantry and Cavalry. Female Citizens and Infantry Citizen Soldiers can gather any land resources while Cavalry Citizen Soldiers can only gather meat from hunted animals.\n"),
@ -49,7 +49,7 @@ let tutorialGoals = [
!msg.cmd.data.command || msg.cmd.data.command != "gather" ||
!msg.cmd.data.resourceType || msg.cmd.data.resourceType.specific != "tree")
{
this.WarningMessage(markForTranslation("Select the Civic Center, then hover your mouse over the tree and right-click when you see your cursor change into a Wood icon."));
this.WarningMessage(markForTranslation("Select the Civic Center, then hover your mouse over a tree and right-click when you see the cursor change into a Wood icon."));
return;
}
this.NextGoal();

4
binaries/data/mods/public/maps/tutorials/starting_economy_walkthrough.xml
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ede1e12bccc988bb1d7fde7ca69514c22496b4cec43cad209ad2816defad2141
size 251612
oid sha256:4edbb0d89389ce3dbecd2815cb23c333a16c66cd75c15ccaa54927944d432b9e
size 251502