Skip to content

Commit 717bf13

Browse files
committed
v2.1.9
Improved the documentation for scripted widgets and their APIs. Added missing `widget-icon` values. Corrected documented argument order for `object.set_progress_bar`. Corrected description for the `player_skull` variant ID. Widget position 11 is now listed as "Bottom Right (Meter Only)." When creating a new variant from scratch, the main window's title bar should no longer display the internal Qt resource path for the "blank" variant files. When creating a new variant from scratch and saving it via "Save As," the "Save" option should become available. Fixed documentation generation: we now properly handle notes with IDs. Regenerated the help manual.
1 parent a8ed071 commit 717bf13

File tree

19 files changed

+155
-75
lines changed

19 files changed

+155
-75
lines changed

native/src/RVTDocumentationProcessor/content/base.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ namespace content {
3939
}
4040
has_any_named = true;
4141
//
42-
bool has_id = note.id.isEmpty();
42+
bool has_id = !note.id.isEmpty();
4343
out += QString("<h3>%1%2%3</h3>\n")
4444
.arg(has_id ? QString("<a name=\"%1\">").arg(note.id) : "")
4545
.arg(note.title)

native/src/ReachVariantTool/ReachVariantTool.rc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ IDI_ICON1 ICON DISCARDABLE "ReachVariantTool.ico"
33
// Edit these to control the embedded version information.
44
#define VER_MAJOR 2
55
#define VER_MINOR 1
6-
#define VER_PATCH 8
7-
#define VER_BUILD 2
6+
#define VER_PATCH 9
7+
#define VER_BUILD 0
88

99
// No need to edit anything below here. :)
1010

native/src/ReachVariantTool/docs/working - help docs/editor/script_window/script-widgets.xml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,20 @@
1414
two HUD widgets have the same position, they will not overlap; they will be
1515
positioned adjacent to each other in an intelligent fashion. However, some
1616
widget positions will overlap standard HUD elements such as the shield bar
17-
or motion tracker.
17+
or motion tracker. Additionally, if a gametype tries to display more than two
18+
widgets to the same player at the same position, only two of them will actually
19+
be shown by the game, preferring ones earlier in the widget list.
1820
</p>
1921
<p>
2022
Most of the page is taken up by an image which displays where the HUD widget
2123
will appear. This preview only shows the selected widget, and it assumes that
2224
only the selected widget is showing.
2325
</p>
26+
<p>
27+
Note that the bottom-right widget position is only suitable for "meter" widgets
28+
&mdash; that is, those which use the "set_meter_params" function. Widgets in
29+
this position can display icons and meters, but not any text. The widget will
30+
appear below the hardcoded scoring UI.
31+
</p>
2432
</body>
2533
</article>

native/src/ReachVariantTool/docs/working - help docs/script/api/object.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -447,28 +447,28 @@
447447
</method>
448448
<method name="set_progress_bar" id="15">
449449
<args>
450-
<arg name="who" type="player-set" />
451450
<arg name="timer">
452451
The word <var>none</var>, or an integer constant indicating the index of an
453452
object.timer variable, or a relative alias of an object-timer variable
454453
prefixed with <code>object.</code> i.e. <code>object.alias_name</code>.
455454
</arg>
455+
<arg name="who" type="player-set" />
456456
</args>
457457
<blurb>Set whether an object displays a progress bar, and who should be able to see it.</blurb>
458458
<example>
459459
for each object with label "koth_hill" do
460-
current_object.set_progress_bar(everyone, 3)
460+
current_object.set_progress_bar(3, everyone)
461461
end
462462

463463
alias capture_timer = object.timer[0]
464464
for each object with label "territory" do
465465
for each player do
466-
current_object.set_progress_bar(mod_player, current_player, 1, object.capture_timer)
466+
current_object.set_progress_bar(object.capture_timer, mod_player, current_player, 1)
467467
end
468468
end
469469

470470
for each object with label "ignore_me" do
471-
current_object.set_progress_bar(everyone, none)
471+
current_object.set_progress_bar(none, everyone)
472472
end
473473
</example>
474474
<category id="object-ui" />

native/src/ReachVariantTool/docs/working - help docs/script/api/variant-string-id.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@
6363
<dt>emile</dt>
6464
<dd>A variant name for Spartan bipeds; produces a male Spartan with Noble 4 (Emile)'s armor.</dd>
6565
<dt>player_skull</dt>
66-
<dd>A variant name for Spartan bipeds; produces a male Spartan with the Haunted helmet.</dd>
66+
<dd>A variant name for Spartan bipeds; produces a male Spartan with the Hazop helmet and CBRN, CQC shoulders, trauma kit,
67+
and FJ/PARA knee guards. (Bungie used the name "player_skull" internally for the CQC shoulders and Hazop helmet.)</dd>
6768
<dt>kat</dt>
6869
<dd>A variant name for Spartan bipeds; produces a female Spartan with Noble 2 (Kat)'s armor.</dd>
6970
<dt>minor</dt>

native/src/ReachVariantTool/docs/working - help docs/script/api/waypoint-icon.xml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,16 @@
5252
<dt>territory_i</dt>
5353
<dd>Displays the number 9.</dd>
5454
<dt>supply</dt>
55-
<dd>TBA</dd>
55+
<dd>Line art depicting a cube.</dd>
5656
<dt>supply_health</dt>
57-
<dd>TBA</dd>
57+
<dd>A downward-pointing triangle outline with a circle drawn in the middle.</dd>
5858
<dt>supply_air_drop</dt>
5959
<dd>A small box suspended from a parachute.</dd>
6060
<dt>supply_ammo</dt>
61-
<dd>TBA</dd>
61+
<dd>Three bullets lined up horizontally in a row.</dd>
6262
<dt>arrow</dt>
63-
<dd>TBA</dd>
63+
<dd>An arrow pointing top-left. The "tail" of the arrow bends to form a circle
64+
wrapping around the arrow.</dd>
6465
<dt>defend</dt>
6566
<dd>An icon indicating that a location should be defended.</dd>
6667
<dt>ordnance</dt>

native/src/ReachVariantTool/docs/working - help docs/script/api/widget-icon.xml

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -45,45 +45,52 @@
4545
<dd>A soccer ball.</dd>
4646
<dt>headhunter</dt>
4747
<dd>The icon for the Headhunter gametype.</dd>
48-
<!-- TODO: verify all below icons -->
4948
<dt>crosshair</dt>
50-
<dd></dd>
49+
<dd>A crosshair encircled by a spiky circular shape.</dd>
5150
<dt>wheel</dt>
52-
<dd></dd>
51+
<dd>A tire surrounded by feathers.</dd>
5352
<dt>swirl</dt>
5453
<dd>A swirl icon &mdash; the same icon used for what is called "Insane" in legacy Reach and "Action Sack" in MCC.</dd>
5554
<dt>bunker</dt>
56-
<dd></dd>
55+
<dd>...</dd>
5756
<dt>health_pack</dt>
58-
<dd></dd>
57+
<dd>...</dd>
5958
<dt>castle_defense</dt>
60-
<dd></dd>
59+
<dd>A filled-in shield shape, with the silhouette of a castle tower cut out of the middle.</dd>
6160
<dt>return</dt>
62-
<dd></dd>
61+
<dd>An arrow pointing bottom-left. The tail of the arrow bends to the left and then around
62+
the arrow, forming a box which encloses the arrow.</dd>
6363
<dt>shapes</dt>
6464
<dd>Line art of 3D geometric shapes.</dd>
6565
<dt>cartographer</dt>
6666
<dd>The insignia for the Silent Cartographer.</dd>
6767
<dt>eight_ball</dt>
68-
<dd></dd>
68+
<dd>A drawing of an eight ball, of the variety seen in billiards.</dd>
6969
<dt>noble</dt>
7070
<dd>The Noble Team insignia.</dd>
7171
<dt>covenant</dt>
7272
<dd>A Covenant insignia.</dd>
7373
<dt>attack</dt>
74-
<dd></dd>
74+
<dd>A rounded diamond shape, inside of which is a downward-pointing arrow. Beneath the
75+
arrow, between it and the diamond, is a bent line following the diamond's shape.</dd>
7576
<dt>defend</dt>
76-
<dd></dd>
77+
<dd>...</dd>
7778
<dt>ordnance</dt>
78-
<dd></dd>
79+
<dd>...</dd>
7980
<dt>circle</dt>
80-
<dd></dd>
81+
<dd>A downward-pointing triangle outline with a small circle drawn inside.</dd>
8182
<dt>recon</dt>
82-
<dd></dd>
83+
<dd>A rounded rectangle, with a targeting reticle drawn inside: four corners of a
84+
non-rounded rectangle, and a plus symbol at the center.</dd>
8385
<dt>recover</dt>
84-
<dd></dd>
86+
<dd>...</dd>
8587
<dt>ammo</dt>
86-
<dd></dd>
88+
<dd>...</dd>
89+
<dt>skull</dt>
90+
<dd>A skull icon, of the variety seen in Campaign and Firefight.</dd>
91+
<dt>forge</dt>
92+
<dd>The icon for Forge: a hammer (more like a gavel, actually) slamming down onto
93+
an anvil, emitting stylized sparks.</dd>
8794
</dl>
8895
</description>
8996
</script-type>

native/src/ReachVariantTool/docs/working - help docs/script/api/widget.xml

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,18 @@
1919
end
2020
</example>
2121
<note>
22-
A HUD widget must display the same text to all players. If you may need to
23-
display different text to different players at the same time, you will need
24-
to define multiple widgets and manage their visibility and text appropriately.
22+
<p>
23+
A HUD widget must display the same format string to all players. If you may
24+
need to display completely different text to different players at the same
25+
time, you will need to define multiple widgets and manage their visibility
26+
and text appropriately.
27+
</p>
28+
<p>
29+
Some format string parameters make it possible to display different values
30+
within a single string, for each player viewing the widget. The
31+
<a href="script/api/ns_unnamed/hud_player">hud_player</a> variable is one
32+
such parameter.
33+
</p>
2534
</note>
2635
</method>
2736
<method name="set_value_text" id="47">
@@ -67,6 +76,13 @@
6776
<arg name="icon" type="widget-icon" />
6877
</args>
6978
<blurb>Set the HUD widget's icon.</blurb>
79+
<description>
80+
<p>
81+
This function sets what icon a HUD widget displays. Note that Halo: Reach will
82+
only actually display a widget's icon if the widget is in the "Lower Center"
83+
or "Meter Only" positions.
84+
</p>
85+
</description>
7086
<example>
7187
script_widget[0].set_icon(infection)
7288
</example>

native/src/ReachVariantTool/help/editor/script_window/script-widgets.html

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,13 +188,21 @@ <h1>Scripted HUD Widgets</h1>
188188
two HUD widgets have the same position, they will not overlap; they will be
189189
positioned adjacent to each other in an intelligent fashion. However, some
190190
widget positions will overlap standard HUD elements such as the shield bar
191-
or motion tracker.
191+
or motion tracker. Additionally, if a gametype tries to display more than two
192+
widgets to the same player at the same position, only two of them will actually
193+
be shown by the game, preferring ones earlier in the widget list.
192194
</p>
193195
<p>
194196
Most of the page is taken up by an image which displays where the HUD widget
195197
will appear. This preview only shows the selected widget, and it assumes that
196198
only the selected widget is showing.
197199
</p>
200+
<p>
201+
Note that the bottom-right widget position is only suitable for "meter" widgets
202+
— that is, those which use the "set_meter_params" function. Widgets in
203+
this position can display icons and meters, but not any text. The widget will
204+
appear below the hardcoded scoring UI.
205+
</p>
198206

199207
</main>
200208
<script src="resources/sidebar.js"></script>

native/src/ReachVariantTool/help/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ <h1>Index</h1>
201201
<p>
202202
As an example, here's Minesweeper recreated in <i>Halo: Reach</i>:
203203
</p>
204-
<iframe allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" width="560" frameborder="0" allowfullscreen="allowfullscreen" src="https://www.youtube.com/embed/-sP8ElrIdek" height="315"></iframe>
204+
<iframe width="560" frameborder="0" src="https://www.youtube.com/embed/-sP8ElrIdek" height="315" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen="allowfullscreen"></iframe>
205205

206206
</main>
207207
<script src="resources/sidebar.js"></script>

0 commit comments

Comments
 (0)