Skip to content

Commit 06fa01b

Browse files
JoyfulShushJoyfulShush
committed
Merge branch 'master' into tsclient
2 parents b7b9b36 + b18387c commit 06fa01b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+3586
-102
lines changed

‎src/TSMapEditor/Config/Default/UI/UIConstants.ini‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
; This file defines various user-interface related constants used in the editor.
55

66
[UI]
7-
UITreeViewLineHeight=20
7+
UITreeViewLineHeight=30
8+
UITreeViewCategoryHeight=20

‎src/TSMapEditor/Config/Default/UI/Windows/AITriggersWizardStepWindow.ini‎

Lines changed: 172 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,172 @@
1+
[AITriggersWizardStepWindow]
2+
$Width=700
3+
$Height=350
4+
$CC0=lblHeader:XNALabel
5+
$CC1=lblDescription:XNALabel
6+
$CC2=lblDifficulties:XNALabel
7+
$CC3=lbDifficulties:EditorListBox
8+
$CC4=lblSelectedAITrigger:XNALabel
9+
$CC5=lblCondition:XNALabel
10+
$CC6=ddConditionType:XNADropDown
11+
$CC7=lblConditionType:XNALabel
12+
$CC8=ddComparator:XNADropDown
13+
$CC9=lblComparator:XNALabel
14+
$CC10=lblQuantity:XNALabel
15+
$CC11=tbQuantity:EditorNumberTextBox
16+
$CC12=selComparisonObjectType:EditorPopUpSelector
17+
$CC13=lblComparisonObjectType:XNALabel
18+
$CC14=panelLine:XNAPanel
19+
$CC15=lblWeights:XNALabel
20+
$CC16=lblInitial:XNALabel
21+
$CC17=tbInitial:EditorNumberTextBox
22+
$CC18=lblMinimum:XNALabel
23+
$CC19=tbMinimum:EditorNumberTextBox
24+
$CC20=lblMaximum:XNALabel
25+
$CC21=tbMaximum:EditorNumberTextBox
26+
$CC23=btnFinish:EditorButton
27+
$CC24=btnApplyAITriggersOtherDiffs:EditorButton
28+
HasCloseButton=true
29+
30+
[lblHeader]
31+
$X=EMPTY_SPACE_SIDES
32+
$Y=EMPTY_SPACE_TOP
33+
FontIndex=1
34+
Text=Create Team Wizard - AI Triggers
35+
36+
[lblDescription]
37+
$X=getX(lblHeader)
38+
$Y=getBottom(lblHeader) + VERTICAL_SPACING
39+
Text=Manage the AI Triggers of the teams for every difficulty.
40+
41+
[lblDifficulties]
42+
$X=getX(lblHeader)
43+
$Y=getBottom(lblDescription) + (VERTICAL_SPACING * 3)
44+
Text=Difficulties:
45+
FontIndex=1
46+
47+
[lbDifficulties]
48+
$X=getX(lblHeader)
49+
$Y=getBottom(lblDifficulties) + VERTICAL_SPACING
50+
$Height=100
51+
$Width=120
52+
53+
[lblSelectedAITrigger]
54+
$X=getRight(lbDifficulties) + (HORIZONTAL_SPACING * 5)
55+
$Y=getY(lblDifficulties)
56+
FontIndex=1
57+
Text=Selected AI Trigger:
58+
59+
[lblCondition]
60+
$X=getX(lblSelectedAITrigger)
61+
$Y=getBottom(lblSelectedAITrigger) + (VERTICAL_SPACING * 3)
62+
FontIndex=1
63+
Text=Condition
64+
65+
[ddConditionType]
66+
$X=getX(lblCondition) + 100
67+
$Width=getWidth(AITriggersWizardStepWindow) - getX(ddConditionType) - EMPTY_SPACE_SIDES
68+
$Y=getBottom(lblCondition) + VERTICAL_SPACING
69+
Option0=-1 None
70+
Option1=0 Enemy Owns
71+
Option2=1 House Owns
72+
Option3=2 Enemy On Yellow Power
73+
Option4=3 Enemy On Red Power
74+
Option5=4 Enemy Has X Credits
75+
76+
[lblConditionType]
77+
$X=getX(lblSelectedAITrigger)
78+
$Y=getY(ddConditionType) + 1
79+
Text=Type:
80+
81+
[ddComparator]
82+
$X=getX(ddConditionType)
83+
$Y=getBottom(ddConditionType) + VERTICAL_SPACING
84+
$Width=160
85+
Option0=00 less than
86+
Option1=01 less than or equal to
87+
Option2=02 equal to
88+
Option3=03 more than or equal to
89+
Option4=04 more than
90+
Option5=05 not equal to
91+
92+
[lblComparator]
93+
$X=getX(lblSelectedAITrigger)
94+
$Y=getY(ddComparator) + 1
95+
Text=Comparator:
96+
97+
[lblQuantity]
98+
$X=getRight(ddComparator) + (HORIZONTAL_SPACING * 3)
99+
$Y=getY(lblComparator)
100+
Text=Quantity:
101+
102+
[tbQuantity]
103+
$X=getX(lblQuantity) + 100
104+
$Width=getWidth(AITriggersWizardStepWindow) - getX(tbQuantity) - EMPTY_SPACE_SIDES
105+
$Y=getY(ddComparator)
106+
107+
[selComparisonObjectType]
108+
$X=getX(ddConditionType)
109+
$Width=getWidth(ddConditionType)
110+
$Y=getBottom(ddComparator) + VERTICAL_SPACING
111+
112+
[lblComparisonObjectType]
113+
$X=getX(lblSelectedAITrigger)
114+
$Y=getY(selComparisonObjectType) + 1
115+
Text=Object Type:
116+
117+
[panelLine]
118+
$X=getX(lblSelectedAITrigger)
119+
$Y=getBottom(selComparisonObjectType) + (VERTICAL_SPACING * 3)
120+
$Width=getWidth(AITriggersWizardStepWindow) - getX(panelLine) - EMPTY_SPACE_SIDES
121+
$Height=0
122+
123+
[lblWeights]
124+
$X=getX(lblSelectedAITrigger)
125+
$Y=getBottom(panelLine) + (VERTICAL_SPACING * 3)
126+
FontIndex=1
127+
Text=Weights
128+
129+
[lblInitial]
130+
$X=getX(lblSelectedAITrigger)
131+
$Y=getBottom(lblWeights) + VERTICAL_SPACING + 1
132+
Text=Initial:
133+
134+
[tbInitial]
135+
$X=getRight(lblInitial) + 20
136+
$Width=120
137+
$Y=getY(lblInitial) - 1
138+
AllowDecimals=yes
139+
140+
[lblMinimum]
141+
$X=getRight(tbInitial) + (HORIZONTAL_SPACING * 3)
142+
$Y=getY(lblInitial)
143+
Text=Min.:
144+
145+
[tbMinimum]
146+
$X=getRight(lblMinimum) + 20
147+
$Y=getY(tbInitial)
148+
$Width=getWidth(tbInitial)
149+
AllowDecimals=yes
150+
151+
[lblMaximum]
152+
$X=getRight(tbMinimum) + (HORIZONTAL_SPACING * 3)
153+
$Y=getY(lblInitial)
154+
Text=Max.:
155+
156+
[tbMaximum]
157+
$X=getRight(lblMaximum) + 20
158+
$Y=getY(tbInitial)
159+
$Width=getWidth(tbInitial)
160+
AllowDecimals=yes
161+
162+
[btnFinish]
163+
$Width=100
164+
$X=getRight(AITriggersWizardStepWindow) - EMPTY_SPACE_SIDES - getWidth(btnFinish)
165+
$Y=getBottom(AITriggersWizardStepWindow) - EMPTY_SPACE_BOTTOM - getHeight(btnFinish)
166+
Text=Finish
167+
168+
[btnApplyAITriggersOtherDiffs]
169+
$Width=200
170+
$X=getX(btnFinish) - getWidth(btnApplyAITriggersOtherDiffs) - HORIZONTAL_SPACING
171+
$Y=getY(btnFinish)
172+
Text=Apply to Other Difficulties

‎src/TSMapEditor/Config/Default/UI/Windows/GeneralSettingsWizardStepWindow.ini‎

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
[GeneralSettingsWizardStepWindow]
2+
$Width=400
3+
$Height=400
4+
$CC0=lblHeader:XNALabel
5+
$CC1=lblDescription:XNALabel
6+
$CC2=lblDescription2:XNALabel
7+
$CC3=lblTeamName:XNALabel
8+
$CC4=tbTeamName:EditorTextBox
9+
$CC5=chkTeamNameAsPrefix:XNACheckBox
10+
$CC6=chkTeamNameShorten:XNACheckBox
11+
$CCline1=panelLine1:XNAPanel
12+
$CC7=lblCreateTeamsForDiffs:XNALabel
13+
$CC8=chkCreateHard:XNACheckBox
14+
$CC9=chkCreateMedium:XNACheckBox
15+
$CC10=chkCreateEasy:XNACheckBox
16+
$CCline2=panelLine2:XNAPanel
17+
$CC11=lblHouse:XNALabel
18+
$CC12=ddHouse:XNADropDown
19+
$CC13=lblColor:XNALabel
20+
$CC14=ddColor:XNADropDown
21+
$CC15=chkAddAITriggers:XNACheckBox
22+
$CC16=btnNext:EditorButton
23+
HasCloseButton=true
24+
25+
[lblHeader]
26+
$X=EMPTY_SPACE_SIDES
27+
$Y=EMPTY_SPACE_TOP
28+
FontIndex=1
29+
Text=Create Team Wizard - General Settings
30+
31+
[lblDescription]
32+
$X=getX(lblHeader)
33+
$Y=getBottom(lblHeader) + VERTICAL_SPACING
34+
Text=The Wizard allows quickly creating groups of TaskForces,
35+
36+
[lblDescription2]
37+
$X=getX(lblDescription)
38+
$Y=getBottom(lblDescription) + (VERTICAL_SPACING / 2)
39+
Text=Scripts and TeamTypes for multiple difficulty levels.
40+
41+
[lblTeamName]
42+
$X=getX(lblHeader)
43+
$Y=getBottom(lblDescription2) + (VERTICAL_SPACING * 3)
44+
Text=Team Name:
45+
46+
[tbTeamName]
47+
$X=getRight(lblTeamName) + (HORIZONTAL_SPACING * 2)
48+
$Y=getY(lblTeamName)
49+
$Width=300
50+
51+
[chkTeamNameAsPrefix]
52+
$X=getX(lblTeamName)
53+
$Y=getBottom(lblTeamName) + (VERTICAL_SPACING * 3)
54+
Text=Difficulty Name as Prefix
55+
56+
[chkTeamNameShorten]
57+
$X=getRight(chkTeamNameAsPrefix) + (HORIZONTAL_SPACING * 3)
58+
$Y=getY(chkTeamNameAsPrefix)
59+
Text=Shorten Difficulty Name
60+
61+
[panelLine1]
62+
$X=getX(lblTeamName)
63+
$Y=getBottom(chkTeamNameAsPrefix) + (VERTICAL_SPACING * 3)
64+
$Width=getWidth(GeneralSettingsWizardStepWindow) - getX(panelLine1) - EMPTY_SPACE_SIDES
65+
$Height=0
66+
67+
[lblCreateTeamsForDiffs]
68+
$X=getX(lblTeamName)
69+
$Y=getBottom(panelLine1) + (VERTICAL_SPACING * 3)
70+
Text=Create Teams for Difficulties:
71+
72+
[chkCreateHard]
73+
$X=getRight(lblCreateTeamsForDiffs) + (HORIZONTAL_SPACING * 3)
74+
$Y=getY(lblCreateTeamsForDiffs)
75+
Text=Hard
76+
77+
[chkCreateMedium]
78+
$X=getRight(chkCreateHard) + (HORIZONTAL_SPACING * 3)
79+
$Y=getY(lblCreateTeamsForDiffs)
80+
Text=Medium
81+
82+
[chkCreateEasy]
83+
$X=getRight(chkCreateMedium) + (HORIZONTAL_SPACING * 3)
84+
$Y=getY(lblCreateTeamsForDiffs)
85+
Text=Easy
86+
87+
[panelLine2]
88+
$X=getX(lblTeamName)
89+
$Y=getBottom(lblCreateTeamsForDiffs) + (VERTICAL_SPACING * 3)
90+
$Width=getWidth(GeneralSettingsWizardStepWindow) - getX(panelLine1) - EMPTY_SPACE_SIDES
91+
$Height=0
92+
93+
[lblHouse]
94+
$X=getX(lblTeamName)
95+
$Y=getBottom(panelLine2) + (VERTICAL_SPACING * 3)
96+
Text=House:
97+
98+
[ddHouse]
99+
$X=getRight(lblHouse) + (HORIZONTAL_SPACING * 3)
100+
$Y=getY(lblHouse)
101+
$Width=200
102+
103+
[lblColor]
104+
$X=getX(lblTeamName)
105+
$Y=getBottom(lblHouse) + (VERTICAL_SPACING * 3)
106+
Text=Color:
107+
108+
[ddColor]
109+
$X=getX(ddHouse)
110+
$Y=getY(lblColor)
111+
$Width=getWidth(ddHouse)
112+
113+
[chkAddAITriggers]
114+
$X=getX(lblTeamName)
115+
$Y=getBottom(lblColor) + (VERTICAL_SPACING * 3)
116+
Text=Add AI Triggers to Created Teams
117+
118+
[btnNext]
119+
$Width=100
120+
$X=getRight(GeneralSettingsWizardStepWindow) - EMPTY_SPACE_SIDES - getWidth(btnNext)
121+
$Y=getBottom(GeneralSettingsWizardStepWindow) - EMPTY_SPACE_BOTTOM - getHeight(btnNext)
122+
Text=Next

‎src/TSMapEditor/Config/Default/UI/Windows/ScriptWizardStepWindow.ini‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
[ScriptWizardStepWindow]
2+
$Width=600
3+
$Height=300
4+
$CC0=lblHeader:XNALabel
5+
$CC1=lblDescription:XNALabel
6+
$CC2=lblDifficulties:XNALabel
7+
$CC3=lbDifficulties:EditorListBox
8+
$CC4=lblScriptsHeader:XNALabel
9+
$CC5=lblScripts:XNALabel
10+
$CC6=ddScripts:XNADropDown
11+
$CC7=lblScriptActions:XNALabel
12+
$CC8=lbScriptActions:EditorListBox
13+
$CC9=btnOpenScripts:EditorButton
14+
$CC10=btnRefresh:EditorButton
15+
$CC11=btnNext:EditorButton
16+
$CC12=btnApplyScriptOtherDiffs:EditorButton
17+
HasCloseButton=true
18+
19+
[lblHeader]
20+
$X=EMPTY_SPACE_SIDES
21+
$Y=EMPTY_SPACE_TOP
22+
FontIndex=1
23+
Text=Create Team Wizard - Scripts
24+
25+
[lblDescription]
26+
$X=getX(lblHeader)
27+
$Y=getBottom(lblHeader) + VERTICAL_SPACING
28+
Text=Manage the Script used by the teams in this configuration.
29+
30+
[lblDifficulties]
31+
$X=getX(lblHeader)
32+
$Y=getBottom(lblDescription) + (VERTICAL_SPACING * 3)
33+
Text=Difficulties:
34+
FontIndex=1
35+
36+
[lbDifficulties]
37+
$X=getX(lblHeader)
38+
$Y=getBottom(lblDifficulties) + VERTICAL_SPACING
39+
$Height=100
40+
$Width=120
41+
42+
[lblScriptsHeader]
43+
$X=getX(lbDifficulties) + getWidth(lbDifficulties) + (HORIZONTAL_SPACING * 5)
44+
$Y=getY(lblDifficulties)
45+
Text=Scripts:
46+
FontIndex=1
47+
48+
[lblScripts]
49+
$X=getX(lblScriptsHeader)
50+
$Y=getBottom(lblScriptsHeader) + VERTICAL_SPACING + 1
51+
Text=Selected Script:
52+
53+
[ddScripts]
54+
$X=getRight(lblScripts) + 60
55+
$Y=getY(lblScripts) - 1
56+
$Width=getWidth(ScriptWizardStepWindow) - getX(ddScripts) - EMPTY_SPACE_SIDES
57+
$Height=getHeight(ScriptWizardStepWindow) - getY(ddScripts) - EMPTY_SPACE_BOTTOM - 30
58+
59+
[lblScriptActions]
60+
$X=getX(lblScriptsHeader)
61+
$Y=getBottom(lblScripts) + VERTICAL_SPACING
62+
Text=Actions:
63+
64+
[lbScriptActions]
65+
$X=getX(ddScripts)
66+
$Y=getBottom(ddScripts) + VERTICAL_SPACING
67+
$Height=getHeight(ScriptWizardStepWindow) - getY(lbScriptActions) - 40
68+
$Width=getWidth(ddScripts)
69+
70+
[btnOpenScripts]
71+
$X=getX(lblScriptsHeader)
72+
$Y=getBottom(lblScriptActions) + EMPTY_SPACE_TOP
73+
$Width=120
74+
Text=Open Scripts
75+
76+
[btnRefresh]
77+
$X=getX(lblScriptsHeader)
78+
$Y=getBottom(btnOpenScripts) + VERTICAL_SPACING
79+
$Width=getWidth(btnOpenScripts)
80+
Text=Refresh Scripts
81+
82+
[btnNext]
83+
$Width=100
84+
$X=getRight(ScriptWizardStepWindow) - EMPTY_SPACE_SIDES - getWidth(btnNext)
85+
$Y=getBottom(ScriptWizardStepWindow) - EMPTY_SPACE_BOTTOM - getHeight(btnNext)
86+
Text=Next
87+
88+
[btnApplyScriptOtherDiffs]
89+
$X=getX(ddScripts)
90+
$Y=getY(btnNext)
91+
$Width=getWidth(ScriptWizardStepWindow) - getX(btnApplyScriptOtherDiffs) - getWidth(btnNext) - EMPTY_SPACE_SIDES - HORIZONTAL_SPACING
92+
Text=Apply to Other Difficulties

0 commit comments

Comments
 (0)