abian/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Quickly unbreak the broken bits before anyone notices.

Browse Source 
This was SVN commit r2216.
This commit is contained in:
Acumen 2005-05-03 00:02:37 +00:00
parent cab424ce81
commit 158f967926
7 changed files with 123 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
binaries/data/mods/official/gui/test/1_init.xml
View File

@ -88,10 +88,10 @@
<script file="gui/test/functions_session_subwindows.js"><![CDATA[
]]></script>
<script file="gui/test/functions_session_subwindows_manual.js"><![CDATA[
<script file="gui/test/functions_session_subwindow_manual.js"><![CDATA[
]]></script>
<script file="gui/test/functions_session_subwindows_jukebox.js"><![CDATA[
<script file="gui/test/functions_session_subwindow_jukebox.js"><![CDATA[
]]></script>
<script file="gui/test/functions_session.js"><![CDATA[

6
binaries/data/mods/official/gui/test/2_mainmenu.xml
View File

@ -238,10 +238,10 @@
server.onClientConnect = function (event) {
console.write("new client connected! ID: " + event.id + ", Name: " + event.name + ", Session: " + event.session);
//var playerSlot = g_GameAttributes.getOpenSlot();
var playerSlot = g_GameAttributes.getOpenSlot();
// assign a slot
//playerSlot.assignToSession(event.session);
//console.write("slot: " + playerSlot.player);
playerSlot.assignToSession(event.session);
console.write("slot: " + playerSlot.player);
}
]]></action>
</object>

7
binaries/data/mods/official/gui/test/4_session.xml
View File

@ -510,6 +510,13 @@
messageBox(600, 200, "Do you want to leave the current game? There might be more dudes to slaughter.", "Confirmation", 0, btCaptions, btCode);
]]></action>
</object>
<object type="button" name="SN_INGAME_MENU_BTN_JUKEBOX" style="session_button_object" hotkey="jukebox" ><action on="Load"><![CDATA[ addSizeCoordArray(this.name, Crd[SN_INGAME_MENU_BTN_JUKEBOX]); GUIObjectSetCaption(this.name, "Playlist Editor"); ]]></action>
<action on="Press"><![CDATA[
// Toggle jukebox.
GUIObjectToggle("JUKEBOX_GUI");
GUIObjectToggle("SESSION_GUI");
]]></action>
</object>
</object>
</object>

14
binaries/data/mods/official/gui/test/6_2_jukebox.xml
View File

@ -10,20 +10,20 @@
<objects>
<object type="empty" name="JUKEBOX_GUI" size="0 0 100% 100%" z="1" hotkey="onlinehelp" hidden="true">
<action on="Press"><![CDATA[
// Toggle jukebox.
GUIObjectToggle("JUKEBOX_GUI");
GUIObjectToggle("SESSION_GUI");
]]></action>
<object type="empty" name="JUKEBOX_GUI" size="0 0 100% 100%" z="1" hidden="true">
<object type="text" name="JUKEBOX_BKG" sprite="0ad_window" font="prospero16" textcolor="0 0 0" z="100" hidden="false" ghost="true"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[JUKEBOX_BKG]); ]]></action>
<action on="Tick"><![CDATA[
if !( getGUIObjectByName( "MANUAL_GUI" ).hidden )
if (!getGUIObjectByName("JUKEBOX_GUI").hidden)
jukeboxDisplay();
]]></action>
</object>
<object type="button" name="JUKEBOX_TITLEBAR" sprite="message_box_titlebar_middle" font="prospero18" text_align="center" text_valign="center" ><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[JUKEBOX_TITLEBAR]); GUIObjectSetCaption(this.name, "Jukebox"); ]]></action></object>
<!--
<object type="combobox" name="JUKEBOX_CATEGORY" sprite="0ad_window" text_align="left" ><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[JUKEBOX_CATEGORY]); GUIObjectSetCaption(this.name, "All"); ]]></action></object>
<object type="list" name="JUKEBOX_LIST_FILE" sprite="0ad_indent" text_align="left" ><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[JUKEBOX_LIST_FILE]); GUIObjectSetCaption(this.name, ""); ]]></action></object>
-->
<object type="button" name="JUKEBOX_EXIT_BUTTON" sprite="exit_sprite" sprite_over="exit_sprite_over" ghost="false" z="100" hidden="false"><action on="Load"><![CDATA[ setSizeArray(this.name, Crd[JUKEBOX_EXIT_BUTTON]); ]]></action>
<action on="Press"><![CDATA[
// Close jukebox.

33
binaries/data/mods/official/gui/test/functions_session_subwindow_jukebox.js
View File

@ -16,6 +16,33 @@ function initJukebox()
Crd[Crd.last-1].x = 50;
Crd[Crd.last-1].y = 50;
// Title background of jukebox.
JUKEBOX_TITLEBAR = addArrayElement(Crd, Crd.last);
Crd[Crd.last-1].rleft = mid_screen; Crd[Crd.last-1].rtop = top_screen;
Crd[Crd.last-1].rright = mid_screen; Crd[Crd.last-1].rbottom = top_screen;
Crd[Crd.last-1].width = 100;
Crd[Crd.last-1].height = 32;
Crd[Crd.last-1].x = 0;
Crd[Crd.last-1].y = Crd[JUKEBOX_BKG].y;
// List of tracks.
JUKEBOX_LIST_FILE = addArrayElement(Crd, Crd.last);
Crd[Crd.last-1].rleft = left_screen; Crd[Crd.last-1].rtop = top_screen;
Crd[Crd.last-1].rright = right_screen; Crd[Crd.last-1].rbottom = bottom_screen;
Crd[Crd.last-1].width = 100;
Crd[Crd.last-1].height = 75;
Crd[Crd.last-1].x = 100;
Crd[Crd.last-1].y = 100;
// Combobox to select category of tracks to list.
JUKEBOX_CATEGORY = addArrayElement(Crd, Crd.last);
Crd[Crd.last-1].rleft = right_screen; Crd[Crd.last-1].rtop = bottom_screen;
Crd[Crd.last-1].rright = right_screen; Crd[Crd.last-1].rbottom = bottom_screen;
Crd[Crd.last-1].width = 100;
Crd[Crd.last-1].height = 32;
Crd[Crd.last-1].x = 20;
Crd[Crd.last-1].y = 20;
// Jukebox exit button.
JUKEBOX_EXIT_BUTTON = addArrayElement(Crd, Crd.last);
Crd[Crd.last-1].rleft = right_screen; Crd[Crd.last-1].rtop = top_screen;
@ -30,9 +57,9 @@ function initJukebox()
function jukeboxDisplay()
{
// Display heading.
JukeBoxBkg = getGUIObjectByName("MANUAL_BKG");
JukeBoxBkg.caption = "Jukebox";
// // Display heading.
// JukeBoxBkg = getGUIObjectByName("JUKEBOX_TITLEBAR");
// JukeBoxBkg.caption = "Jukebox";
}
// ====================================================================

129
binaries/data/mods/official/gui/test/functions_session_subwindow_manual.js
View File

@ -89,68 +89,71 @@ function manualDisplay()
ManualRollover.caption = selection[0].traits.id.rollover;
}
ManualText = getGUIObjectByName("MANUAL_NAME");
ManualText.caption = "";
// Display name(s).
if (selection[0].traits.id.generic)
ManualRollover.caption += selection[0].traits.id.generic;
ManualText.caption += selection[0].traits.id.generic;
if (selection[0].traits.id.generic && selection[0].traits.id.specific)
ManualRollover.caption += " - ";
ManualText.caption += " - ";
if (selection[0].traits.id.specific)
ManualRollover.caption += selection[0].traits.id.specific;
ManualText.caption += selection[0].traits.id.specific;
if (selection[0].traits.id.specific && selection[0].traits.id.ranked)
ManualRollover.caption += " - ";
ManualText.caption += " - ";
if (selection[0].traits.id.ranked)
ManualRollover.caption += selection[0].traits.id.ranked;
ManualText.caption += selection[0].traits.id.ranked;
// Personal name.
if (selection[0].traits.id.personal && selection[0].traits.id.personal != "")
ManualRollover.caption += " - " + selection[0].traits.id.personal;
ManualRollover.caption += "\n";
ManualText.caption += " - " + selection[0].traits.id.personal;
ManualText.caption += "\n";
// Display civilisation.
if (selection[0].traits.id.civ && selection[0].traits.id.civ_code)
ManualRollover.caption += "Civilisation: " + selection[0].traits.id.civ + " (" + selection[0].traits.id.civ_code + ")" + "\n";
ManualText.caption += "Civilisation: " + selection[0].traits.id.civ + " (" + selection[0].traits.id.civ_code + ")" + "\n";
if (!selection[0].traits.id.civ_code)
ManualRollover.caption += "Civilisation: " + selection[0].traits.id.civ + "\n";
ManualText.caption += "Civilisation: " + selection[0].traits.id.civ + "\n";
// Display player info.
if (selection[0].player){
if (selection[0].player.name)
ManualRollover.caption += "Player Name: " + selection[0].player.name + "\n";
ManualText.caption += "Player Name: " + selection[0].player.name + "\n";
if (selection[0].player.id)
ManualRollover.caption += "Player ID: " + selection[0].player.id + "\n";
ManualText.caption += "Player ID: " + selection[0].player.id + "\n";
if (selection[0].player.colour)
ManualRollover.caption += "Player Colour: " + selection[0].player.colour + "\n";
ManualText.caption += "Player Colour: " + selection[0].player.colour + "\n";
if (selection[0].player.controlled)
ManualRollover.caption += "Player Controlled: " + selection[0].player.controlled + "\n";
ManualText.caption += "Player Controlled: " + selection[0].player.controlled + "\n";
// if (players[])
// ManualRollover.caption += "Players[]: " + players[] + "\n";
// ManualText.caption += "Players[]: " + players[] + "\n";
}
// Display hitpoints.
if (selection[0].traits.health.curr && selection[0].traits.health.max && selection[0].traits.health)
ManualRollover.caption += "Hitpoints: " + selection[0].traits.health.curr + "/" + selection[0].traits.health.max + "\n";
ManualText.caption += "Hitpoints: " + selection[0].traits.health.curr + "/" + selection[0].traits.health.max + "\n";
// Display rank.
if (selection[0].traits.up.rank)
ManualRollover.caption += "Rank: " + selection[0].traits.up.rank + "\n";
ManualText.caption += "Rank: " + selection[0].traits.up.rank + "\n";
// Display experience.
if (selection[0].traits.up && selection[0].traits.up.curr && selection[0].traits.up.req)
ManualRollover.caption += "XP: " + selection[0].traits.up.curr + "/" + selection[0].traits.up.req + "\n";
ManualText.caption += "XP: " + selection[0].traits.up.curr + "/" + selection[0].traits.up.req + "\n";
// Display population.
if (selection[0].traits.population)
{
if (selection[0].traits.population.sub)
ManualRollover.caption += "Pop: -" + selection[0].traits.population.sub + "\n";
ManualText.caption += "Pop: -" + selection[0].traits.population.sub + "\n";
if (selection[0].traits.population.add)
ManualRollover.caption += "Housing: +" + selection[0].traits.population.add + "\n";
ManualText.caption += "Housing: +" + selection[0].traits.population.add + "\n";
}
// Display garrison.
if (selection[0].traits.garrison)
{
if (selection[0].traits.garrison.curr && selection[0].traits.garrison.max)
ManualRollover.caption += "Garrison: " + selection[0].traits.garrison.curr + "/" + selection[0].traits.garrison.max + "\n";
ManualText.caption += "Garrison: " + selection[0].traits.garrison.curr + "/" + selection[0].traits.garrison.max + "\n";
}
// Display supply.
@ -161,10 +164,10 @@ function manualDisplay()
// If Supply is infinite,
if (selection[0].traits.supply.curr == "0" && selection[0].traits.supply.max == "0")
// Use infinity symbol.
ManualRollover.caption += "Supply: " + selection[0].traits.supply.curr + "/" + selection[0].traits.supply.max + " " + selection[0].traits.supply.type + " (" + selection[0].traits.supply.subtype + ")\n";
ManualText.caption += "Supply: " + selection[0].traits.supply.curr + "/" + selection[0].traits.supply.max + " " + selection[0].traits.supply.type + " (" + selection[0].traits.supply.subtype + ")\n";
else
// Use numbers.
ManualRollover.caption += "Supply: 8 " + selection[0].traits.supply.type + " (" + selection[0].traits.supply.subtype + ")\n";
ManualText.caption += "Supply: 8 " + selection[0].traits.supply.type + " (" + selection[0].traits.supply.subtype + ")\n";
}
}
@ -172,21 +175,21 @@ function manualDisplay()
{
// Display UP on death.
if (selection[0].traits.loot.up)
ManualRollover.caption += "UP: " + selection[0].traits.loot.up + "\n";
ManualText.caption += "UP: " + selection[0].traits.loot.up + "\n";
// Display loot.
if (selection[0].traits.loot.food || selection[0].traits.loot.wood || selection[0].traits.loot.stone || selection[0].traits.loot.ore)
{
ManualRollover.caption += "Loot: ";
ManualText.caption += "Loot: ";
if (selection[0].traits.loot.food)
ManualRollover.caption += selection[0].traits.loot.food + " Food ";
ManualText.caption += selection[0].traits.loot.food + " Food ";
if (selection[0].traits.loot.wood)
ManualRollover.caption += selection[0].traits.loot.wood + " Wood ";
ManualText.caption += selection[0].traits.loot.wood + " Wood ";
if (selection[0].traits.loot.stone)
ManualRollover.caption += selection[0].traits.loot.stone + " Stone ";
ManualText.caption += selection[0].traits.loot.stone + " Stone ";
if (selection[0].traits.loot.ore)
ManualRollover.caption += selection[0].traits.loot.ore + " Ore ";
ManualRollover.caption += "\n";
ManualText.caption += selection[0].traits.loot.ore + " Ore ";
ManualText.caption += "\n";
}
}
@ -195,122 +198,122 @@ function manualDisplay()
{
if (selection[0].traits.minimap && selection[0].traits.minimap.type)
ManualRollover.caption += "Map Type: " + selection[0].traits.minimap.type + "\n";
ManualText.caption += "Map Type: " + selection[0].traits.minimap.type + "\n";
if (selection[0].traits.minimap && selection[0].traits.minimap.red && selection[0].traits.minimap.green && selection[0].traits.minimap.blue)
ManualRollover.caption += "Map Colour: " + selection[0].traits.minimap.red + "-" + selection[0].traits.minimap.green + "-" + selection[0].traits.minimap.blue + "\n";
ManualText.caption += "Map Colour: " + selection[0].traits.minimap.red + "-" + selection[0].traits.minimap.green + "-" + selection[0].traits.minimap.blue + "\n";
}
// Armour.
if (selection[0].traits.armour)
{
ManualRollover.caption += "Armour: ";
ManualText.caption += "Armour: ";
if (selection[0].traits.armour.value)
{
ManualRollover.caption += selection[0].traits.armour.value + " [";
ManualText.caption += selection[0].traits.armour.value + " [";
if (selection[0].traits.armour.crush)
ManualRollover.caption += "Crush: " + Math.round(selection[0].traits.armour.crush*100) + "%, ";
ManualText.caption += "Crush: " + Math.round(selection[0].traits.armour.crush*100) + "%, ";
if (selection[0].traits.armour.hack)
ManualRollover.caption += "Hack: " + Math.round(selection[0].traits.armour.hack*100) + "%, ";
ManualText.caption += "Hack: " + Math.round(selection[0].traits.armour.hack*100) + "%, ";
if (selection[0].traits.armour.pierce)
ManualRollover.caption += "Pierce: " + Math.round(selection[0].traits.armour.pierce*100) + "%";
ManualText.caption += "Pierce: " + Math.round(selection[0].traits.armour.pierce*100) + "%";
ManualRollover.caption += "]\n";
ManualText.caption += "]\n";
}
}
// Attack.
if (selection[0].actions.attack)
{
ManualRollover.caption += "Attack: ";
ManualText.caption += "Attack: ";
if (selection[0].actions.attack.damage)
{
ManualRollover.caption += selection[0].actions.attack.damage + " [";
ManualText.caption += selection[0].actions.attack.damage + " [";
if (selection[0].actions.attack.crush)
ManualRollover.caption += "Crush: " + Math.round(selection[0].actions.attack.crush*100) + "%, ";
ManualText.caption += "Crush: " + Math.round(selection[0].actions.attack.crush*100) + "%, ";
if (selection[0].actions.attack.hack)
ManualRollover.caption += "Hack: " + Math.round(selection[0].actions.attack.hack*100) + "%, ";
ManualText.caption += "Hack: " + Math.round(selection[0].actions.attack.hack*100) + "%, ";
if (selection[0].actions.attack.pierce)
ManualRollover.caption += "Pierce: " + Math.round(selection[0].actions.attack.pierce*100) + "%";
ManualText.caption += "Pierce: " + Math.round(selection[0].actions.attack.pierce*100) + "%";
ManualRollover.caption += "]\n";
ManualText.caption += "]\n";
}
if (selection[0].actions.attack.range)
ManualRollover.caption += "Attack Range: " + selection[0].actions.attack.range + "\n";
ManualText.caption += "Attack Range: " + selection[0].actions.attack.range + "\n";
if (selection[0].actions.attack.accuracy)
ManualRollover.caption += "Attack Accuracy: " + selection[0].actions.attack.accuracy*100 + "%\n";
ManualText.caption += "Attack Accuracy: " + selection[0].actions.attack.accuracy*100 + "%\n";
}
// Speed.
if (selection[0].actions.move)
{
if (selection[0].actions.move.speed)
ManualRollover.caption += "Speed: " + selection[0].actions.move.speed + "\n";
ManualText.caption += "Speed: " + selection[0].actions.move.speed + "\n";
// Turn Radius.
if (selection[0].actions.move.turningradius)
ManualRollover.caption += "TurnRadius: " + selection[0].actions.move.turningradius + "\n";
ManualText.caption += "TurnRadius: " + selection[0].actions.move.turningradius + "\n";
}
// Vision.
if (selection[0].traits.vision)
{
if (selection[0].traits.vision.los)
ManualRollover.caption += "LOS: " + selection[0].traits.vision.los + "\n";
ManualText.caption += "LOS: " + selection[0].traits.vision.los + "\n";
}
// Classes.
if (selection[0].traits.id.class1)
ManualRollover.caption += "Class1: " + selection[0].traits.id.class1 + "\n";
ManualText.caption += "Class1: " + selection[0].traits.id.class1 + "\n";
if (selection[0].traits.id.class2)
ManualRollover.caption += "Class2: " + selection[0].traits.id.class2 + "\n";
ManualText.caption += "Class2: " + selection[0].traits.id.class2 + "\n";
if (selection[0].traits.id.class3)
ManualRollover.caption += "Class3: " + selection[0].traits.id.class3 + "\n";
ManualText.caption += "Class3: " + selection[0].traits.id.class3 + "\n";
// Name directory.
if (selection[0].traits.id.personal1 && selection[0].traits.id.personal2)
ManualRollover.caption += "Name File: " + selection[0].traits.id.personal1 + " & " + selection[0].traits.id.personal2 + "\n";
ManualText.caption += "Name File: " + selection[0].traits.id.personal1 + " & " + selection[0].traits.id.personal2 + "\n";
// Internal flag.
if (selection[0].traits.id.internal_only)
ManualRollover.caption += "Internal: " + selection[0].traits.id.internal_only + "\n";
ManualText.caption += "Internal: " + selection[0].traits.id.internal_only + "\n";
// Icon.
if (selection[0].traits.id.icon)
ManualRollover.caption += "Icon: " + selection[0].traits.id.icon + "\n";
ManualText.caption += "Icon: " + selection[0].traits.id.icon + "\n";
if (selection[0].traits.id.icon_cell)
ManualRollover.caption += "Icon_Cell: " + selection[0].traits.id.icon_cell + "\n";
ManualText.caption += "Icon_Cell: " + selection[0].traits.id.icon_cell + "\n";
// Version.
if (selection[0].traits.id.version)
ManualRollover.caption += "Version: " + selection[0].traits.id.version + "\n";
ManualText.caption += "Version: " + selection[0].traits.id.version + "\n";
// Lists.
if (selection[0].actions.create && selection[0].actions.create.list)
{
if (selection[0].actions.create.list.unit)
ManualRollover.caption += "Trains: " + selection[0].actions.create.list.unit + "\n";
ManualText.caption += "Trains: " + selection[0].actions.create.list.unit + "\n";
if (selection[0].actions.create.list.structciv || selection[0].actions.create.list.structmil)
{
ManualRollover.caption += "Builds: ";
ManualText.caption += "Builds: ";
if (selection[0].actions.create.list.structciv)
ManualRollover.caption += selection[0].actions.create.list.structciv + " ";
ManualText.caption += selection[0].actions.create.list.structciv + " ";
if (selection[0].actions.create.list.structmil)
ManualRollover.caption += selection[0].actions.create.list.structmil + " ";
ManualRollover.caption += "\n";
ManualText.caption += selection[0].actions.create.list.structmil + " ";
ManualText.caption += "\n";
}
if (selection[0].actions.create.list.tech)
ManualRollover.caption += "Research: " + selection[0].actions.create.list.research + "\n";
ManualText.caption += "Research: " + selection[0].actions.create.list.research + "\n";
}
@ -432,7 +435,7 @@ function manualDisplay()
}
if (ManualTypeString != "")
ManualRollover.caption = ManualRollover.caption + "Type(s): " + ManualTypeString + "\n";
ManualText.caption = ManualText.caption + "Type(s): " + ManualTypeString + "\n";
}
// Display history text.

8
binaries/data/mods/official/gui/test/functions_session_subwindows.js
View File

@ -34,6 +34,14 @@ function initSubWindows()
Crd[Crd.last-1].height = Crd[SN_INGAME_MENU_BTN_RETURN].height;
Crd[Crd.last-1].x = Crd[SN_INGAME_MENU_BTN_RETURN].x;
Crd[Crd.last-1].y = Crd[SN_INGAME_MENU_BTN_EXIT].y-Crd[SN_INGAME_MENU_BTN_EXIT].height-SN_INGAME_MENU_BTN.span;
SN_INGAME_MENU_BTN_JUKEBOX = addArrayElement(Crd, Crd.last);
Crd[Crd.last-1].rleft = mid_screen; Crd[Crd.last-1].rtop = mid_screen;
Crd[Crd.last-1].rright = mid_screen; Crd[Crd.last-1].rbottom = mid_screen;
Crd[Crd.last-1].width = Crd[SN_INGAME_MENU_BTN_RETURN].width;
Crd[Crd.last-1].height = Crd[SN_INGAME_MENU_BTN_RETURN].height;
Crd[Crd.last-1].x = Crd[SN_INGAME_MENU_BTN_RETURN].x;
Crd[Crd.last-1].y = Crd[SN_INGAME_MENU_BTN_RESIGN].y-Crd[SN_INGAME_MENU_BTN_RESIGN].height-SN_INGAME_MENU_BTN.span;
}
// ====================================================================