Skip to content
This repository
Browse code

[276] Partly update for patch 3.3.5a. Icons update also provided.

  • Loading branch information...
commit af3643b1021d3d5989baea0a0b4b5f186462c05a 1 parent 8a5454e
Shadez authored
48 _css/master.css
@@ -723,32 +723,50 @@ img.p21s{position:relative;z-index:99;margin-left:4px}
723 723 #changeLink { float: right; color: #FED500; margin: 0 4px 0 0; background: transparent url('../images/icons/user-menu-icons.gif') no-repeat scroll 0 -55px; padding-left: 15px; }
724 724 .menuItem { height:35px; margin:1px 0 0; padding: 5px 5px 0 5px; }
725 725 .menuItem span { color:#A97A7A; font-size:11px; line-height:12px; text-transform:none;}
726   -.menuItem p { color:white; line-height:11px; margin: 5px 0 0 25px; padding:0; font-size: 10px; text-transform:none; }
  726 +.menuItem p { color:white; margin: 1px 0 0 0; padding:0; font-size: 10px; text-transform:none; }
727 727 .menuItem .charName { color: #FFD200; text-decoration: none; }
728 728 .charName { font-weight: bold }
729   -.character-achievement { float: right; margin-top: 18px; font-size: 10px; line-height: 12px; color: #FFF !important; padding:0 16px 0 0; background:url('../images/icons/user-menu-icons.gif') no-repeat 100% -18px; }
730   -.charlist { color: #A97A7A ; background-color: #6A0100; }
  729 +.character-achievement { float: right; font-size: 10px; line-height: 12px; color: #FFF !important; padding:0 16px 0 0; background:url('../images/icons/user-menu-icons.gif') no-repeat 100% -18px; }
  730 +.charlist { color: #A97A7A ; background-color: #6A0100; cursor: pointer; }
731 731 .charlist:hover { background-color: #550100; }
732 732 #myBookmarks { background-color: #141715; color: #fff; line-height: 24px; padding: 0 0 0 7px; font-size: 12px; margin: 0; font-weight: bold; }
733 733 .bmlist { background-color: #192221;}
734 734 .bmlist:hover { background-color: #101615 }
735 735 .bmlist span { color: #486666 !important; display: inline; font-weight: normal; }
736   -a.rmBookmark, a:visited.rmBookmark {float: right; position: relative; top: 0; right: -20px; background:url('../images/icons/remove.gif') no-repeat 0 -11px; width:11px; height: 12px; padding:0 !important; display:block; }
  736 +a.rmBookmark, a:visited.rmBookmark {float: right; background:url('../images/icons/remove.gif') no-repeat 0 -11px; width:11px; height: 12px; padding:0 !important; display:block; margin-left: 5px; }
737 737 a.rmBookmark:hover {background-position:0 0}
738 738 .nobookmark,.nobookmark:hover {white-space:normal;background:#141715;text-align:center;padding:0;}
739 739 .nobookmark strong {color:#ff9a18;font-weight:bold;line-height:25px;}
740 740 .nobookmark p {color:#6c7379 !important;text-align:left;padding:0 10px 5px !important}
741   -.menuItem em, .user-mod em { background: url('../images/icons/class/classes.gif') no-repeat; width: 16px; display: block; height: 16px; margin: 0 5px 0 0px; float: left;}
742   -em.classId1{background-position:-64px -16px !important}
743   -em.classId2{background-position:-64px 0px !important}
744   -em.classId3{background-position:-32px 0px !important}
745   -em.classId4{background-position:-16px -16px !important}
746   -em.classId5{background-position:0 -16px !important}
747   -em.classId6{background-position:0 0}
748   -em.classId7{background-position:-32px -16px !important}
749   -em.classId8{background-position:-48px 0 !important}
750   -em.classId9{background-position:-48px -16px !important}
751   -em.classId11{background-position:-16px 0 !important}
  741 +.menuItem .classMeta, .user-mod em, .bmlist em { background: url('../images/icons/class/classes.gif') no-repeat; width: 16px; display: block; height: 16px; margin: 0 5px 0 0px; float: left;}
  742 +.menuItem .classId1, em.classId1 { background-position:-64px -16px !important}
  743 +.menuItem .classId2, em.classId2 { background-position:-64px 0px !important}
  744 +.menuItem .classId3, em.classId3 { background-position:-32px 0px !important}
  745 +.menuItem .classId4, em.classId4 { background-position:-16px -16px !important}
  746 +.menuItem .classId5, em.classId5 { background-position:0 -16px !important}
  747 +.menuItem .classId6, em.classId6 { background-position:0 0}
  748 +.menuItem .classId7, em.classId7 { background-position:-32px -16px !important}
  749 +.menuItem .classId8, em.classId8 { background-position:-48px 0 !important}
  750 +.menuItem .classId9, em.classId9 { background-position:-48px -16px !important}
  751 +.menuItem .classId11, em.classId11 { background-position:-16px 0 !important}
  752 +.menuItemRank { float: left; width: 25px; padding-top: 6px; }
  753 +.menuItemAvatar { float: left; width: 30px; margin-right: 5px; }
  754 +.menuItemMeta { float: left; width: 180px; }
  755 +
  756 +.user-mod .userName { padding-left: 25px; }
  757 +.iconClassId1 { background: url("../images/icons/class/1.gif") 0 50% no-repeat; }
  758 +.iconClassId2 { background: url("../images/icons/class/2.gif") 0 50% no-repeat; }
  759 +.iconClassId3 { background: url("../images/icons/class/3.gif") 0 50% no-repeat; }
  760 +.iconClassId4 { background: url("../images/icons/class/4.gif") 0 50% no-repeat; }
  761 +.iconClassId5 { background: url("../images/icons/class/5.gif") 0 50% no-repeat; }
  762 +.iconClassId6 { background: url("../images/icons/class/6.gif") 0 50% no-repeat; }
  763 +.iconClassId7 { background: url("../images/icons/class/7.gif") 0 50% no-repeat; }
  764 +.iconClassId8 { background: url("../images/icons/class/8.gif") 0 50% no-repeat; }
  765 +.iconClassId9 { background: url("../images/icons/class/9.gif") 0 50% no-repeat; }
  766 +.iconClassId10 { background: url("../images/icons/class/10.gif") 0 50% no-repeat; }
  767 +.iconClassId11 { background: url("../images/icons/class/11.gif") 0 50% no-repeat; }
  768 +.iconClassId12 { background: url("../images/icons/class/12.gif") 0 50% no-repeat; }
  769 +
752 770 /* paging arrows */
753 771 .bookmarknumber {margin-left:5px; display: inline;}
754 772 #bmArrows a{ line-height: 9px !important; font-weight: normal !important; display: block; width: 5px; height: 9px !important; text-decoration:none; float: left; padding: 0 !important; font-size:1px;}
23 _layout/nav/bookmarks.xsl
@@ -9,7 +9,7 @@
9 9 var maxBookmarks = "<xsl:value-of select='characters/@max' />";
10 10
11 11
12   - $("#bookmarksRemaining").html(currBookmarks);
  12 + $("#bookmarksRemaining").html(currBookmarks);
13 13
14 14 if(currBookmarks &lt; 1){
15 15 $("#bmArrows").hide();
@@ -21,7 +21,6 @@
21 21 '<span><xsl:value-of select="$loc/strs/common/str[@id='user.bookmark.character']"/></span><em></em></a>');
22 22 }
23 23 </script>
24   -
25 24
26 25 <xsl:choose>
27 26 <!-- character has bookmarks -->
@@ -33,7 +32,6 @@
33 32 <div class="user-line-item nobookmark" style="height: auto;">
34 33 <strong><xsl:value-of select="$loc/strs/login/str[@id='armory.login.bookmark.nobookmark']"/></strong>
35 34 <p><xsl:value-of select="$loc/strs/login/str[@id='armory.login.bookmark.nobookmark.desc']"/></p>
36   -
37 35 </div>
38 36 </xsl:otherwise>
39 37 </xsl:choose>
@@ -48,7 +46,6 @@
48 46 <xsl:variable name="totalPages" select="ceiling(count(character) div $charPerPage)" />
49 47
50 48 <span id="bm-currPage" style="display: none;">1</span>
51   -
52 49 <span id="bm-totalPages" style="display: none;"><xsl:value-of select="ceiling(count(character) div $charPerPage)" /></span>
53 50
54 51 <!-- go through each bookmarked character -->
@@ -59,7 +56,6 @@
59 56 <xsl:with-param name="currPosition" select="(position() + $charPerPage) - 1" />
60 57 <xsl:with-param name="pagenum" select="'1'" />
61 58 <xsl:with-param name="charPerPage" select="$charPerPage" />
62   -
63 59 </xsl:call-template>
64 60 </xsl:when>
65 61 <xsl:when test="position() = (($charPerPage * 1) + 1)">
@@ -69,7 +65,6 @@
69 65 <xsl:with-param name="charPerPage" select="$charPerPage" />
70 66 </xsl:call-template>
71 67 </xsl:when>
72   -
73 68 <xsl:when test="position() = (($charPerPage * 2) + 1)">
74 69 <xsl:call-template name="singlePage">
75 70 <xsl:with-param name="currPosition" select="position() + $charPerPage" />
@@ -79,7 +74,6 @@
79 74 </xsl:when>
80 75 <xsl:when test="position() = (($charPerPage * 3) + 1)">
81 76 <xsl:call-template name="singlePage">
82   -
83 77 <xsl:with-param name="currPosition" select="position() + $charPerPage" />
84 78 <xsl:with-param name="pagenum" select="'4'" />
85 79 <xsl:with-param name="charPerPage" select="$charPerPage" />
@@ -89,7 +83,6 @@
89 83 <xsl:call-template name="singlePage">
90 84 <xsl:with-param name="currPosition" select="position() + $charPerPage" />
91 85 <xsl:with-param name="pagenum" select="'5'" />
92   -
93 86 <xsl:with-param name="charPerPage" select="$charPerPage" />
94 87 </xsl:call-template>
95 88 </xsl:when>
@@ -99,7 +92,6 @@
99 92 <xsl:with-param name="pagenum" select="'6'" />
100 93 <xsl:with-param name="charPerPage" select="$charPerPage" />
101 94 </xsl:call-template>
102   -
103 95 </xsl:when>
104 96 </xsl:choose>
105 97
@@ -112,7 +104,6 @@
112 104
113 105 <xsl:param name="pagenum" />
114 106 <xsl:param name="currPosition" />
115   -
116 107 <xsl:param name="charPerPage" />
117 108
118 109 <div id="page{$pagenum}" class="bmPage" style="display: none;">
@@ -123,7 +114,6 @@
123 114 <xsl:if test="position() &lt;= ($pagenum * $charPerPage) and position() &gt;= ((($pagenum - 1) * $charPerPage) + 1)">
124 115 <xsl:call-template name="singleBookmark">
125 116 <xsl:with-param name="charNode" select="current()" />
126   -
127 117 </xsl:call-template>
128 118 </xsl:if>
129 119 </xsl:for-each>
@@ -137,14 +127,14 @@
137 127 <xsl:param name="charNode" />
138 128
139 129 <xsl:variable name="txtClassbm" select="$loc/strs/classes/str[@id=concat('armory.classes.class.', $charNode/@classId,'.', $charNode/@genderId)]" />
140   -
141 130
142 131 <div class="menuItem bmlist">
143   - <a class="character-achievement staticTip" onMouseOver="setTipText('{$loc/strs/login/str[@id='armory.login.achievements']}');"
144   - href="character-achievements.xml?{@url}"><xsl:value-of select="@achPoints"/></a>
145   -
  132 +
146 133 <a href="javascript:void(0);" class="rmBookmark staticTip"
147   - onMouseOver="setTipText('{$loc/strs/login/str[@id='armory.login.bookmark.remove']}');">&#160;</a>
  134 + onMouseOver="setTipText('{$loc/strs/login/str[@id='armory.login.bookmark.remove']}');">&#160;</a>
  135 +
  136 + <a class="character-achievement staticTip" onMouseOver="setTipText('{$loc/strs/login/str[@id='armory.login.achievements']}');"
  137 + href="character-achievements.xml?{@url}"><xsl:value-of select="@achPoints"/></a>
148 138
149 139 <em class="classId{@classId} staticTip" onmouseover="setTipText('{$txtClassbm}')"></em>
150 140 <a href="character-sheet.xml?{@url}" class="charName"><xsl:value-of select="@name"/></a>
@@ -153,7 +143,6 @@
153 143 <p>
154 144 <xsl:apply-templates mode="printf" select="$loc/strs/character/str[@id='charLevelStr']">
155 145 <xsl:with-param name="param1" select="@level" />
156   -
157 146 <xsl:with-param name="param2" select="''" />
158 147 <xsl:with-param name="param3" select="$txtClassbm" />
159 148 </xsl:apply-templates>
121 _layout/nav/user-menu.xsl
@@ -14,7 +14,6 @@
14 14
15 15 <xsl:variable name="user" select="document('../../character-select.xml?sel=2')" />
16 16 <xsl:variable name="pinned" select="$user/page/characters/character[@selected=1]" />
17   -
18 17 <xsl:variable name="txtPinClass" select="$loc/strs/classes/str[@id=concat('armory.classes.class.', $pinned/@classId,'.', $pinned/@genderId)]" />
19 18 <xsl:variable name="txtPinLevel" select="$loc/strs/character/str[@id='character-level-sheet']" />
20 19 <xsl:variable name="txtPinRace" select="$loc/strs/races/str[@id=concat('armory.races.race.', $pinned/@raceId,'.', $pinned/@genderId)]" />
@@ -26,18 +25,18 @@
26 25 <div class="user-mod" style="text-align: right;">
27 26 <xsl:if test="/page/pageIndex">
28 27 <xsl:attribute name="class">user-mod loginbg</xsl:attribute>
29   -
30 28 <xsl:attribute name="style">text-align: right; </xsl:attribute>
31   - </xsl:if>
  29 + </xsl:if>
  30 +
32 31 <!-- menu hover link -->
33 32 <a href="javascript:void(0)" id="bookmark-user">
34 33 <xsl:if test="/page/pageIndex">
35 34 <xsl:attribute name="style">margin: 3px 6px 0 0;</xsl:attribute>
36 35 </xsl:if>
37 36 </a>
  37 +
38 38 <xsl:choose>
39 39 <xsl:when test="string-length($txtPinClass) = 0">
40   -
41 40 <span class="loggedInAs"><xsl:value-of select="$loc/strs/login/str[@id='armory.login.nochars']"/></span>
42 41 <br />
43 42 <a id="logoutLink" href="index.xml?logout=1"><xsl:value-of select="$loc/strs/login/str[@id='armory.login.logout']" /></a>
@@ -46,9 +45,7 @@
46 45 <span class="loggedInAs"><xsl:value-of select="$loc/strs/login/str[@id='armory.login.logged']"/></span>
47 46 <br />
48 47
49   - <a href="character-sheet.xml?{$pinned/@url}" class="userName">
50   - <em class="classId{$pinned/@classId} staticTip" onmouseover="setTipText('{$txtPinClass}')" style="margin: 2px 4px 0 0;"></em>
51   -
  48 + <a href="character-sheet.xml?{$pinned/@url}" class="userName iconClassId{$pinned/@classId} staticTip" onmouseover="setTipText('{$txtPinClass}')">
52 49 <xsl:value-of select="$pinned/@name"/></a> |
53 50 <a id="logoutLink" href="index.xml?logout=1"><xsl:value-of select="$loc/strs/login/str[@id='armory.login.logout']" /></a>
54 51 </xsl:otherwise>
@@ -58,19 +55,17 @@
58 55 <xsl:otherwise>
59 56 <xsl:choose>
60 57 <xsl:when test="not(/page/pageIndex)">
61   -
62 58 <a id="loginLinkRedirect" class="loginLink"
63   - href="{/page/@requestUrl}?login=1"><xsl:value-of select="$loc/strs/login/str[@id='armory.login.login']" /></a>
  59 + href="{/page/@requestUrl}?login&amp;cr"><xsl:value-of select="$loc/strs/login/str[@id='armory.login.login']" /></a>
64 60 </xsl:when>
65 61 <xsl:otherwise>
66 62 <div class="loginbg">
67 63 <a id="loginLinkRedirect" class="loginLink"
68   - href="{/page/@requestUrl}?login=1"><xsl:value-of select="$loc/strs/login/str[@id='armory.login.login']" /></a>
  64 + href="{/page/@requestUrl}?login&amp;cr"><xsl:value-of select="$loc/strs/login/str[@id='armory.login.login']" /></a>
69 65 </div>
70 66 </xsl:otherwise>
71 67 </xsl:choose>
72 68 </xsl:otherwise>
73   -
74 69 </xsl:choose>
75 70 </xsl:template>
76 71
@@ -97,56 +92,93 @@
97 92 }
98 93 }
99 94
100   - $(document).ready(function() {
101   - loadScript('vault/calendar/alerts-user.json?callback=loadCalendarAlerts', 'jsonAlerts');
102   - });
103   -
104 95 ]]>
105 96 </script>
106 97
107   - <xsl:variable name="user" select="document('../../character-select.xml?sel=2')" />
108   - <xsl:variable name="profile" select="$user/page/characters/character" />
109   - <xsl:variable name="bookmark" select="document('../../bookmarks.xml')/page/characters" />
  98 + <xsl:variable name="user" select="document('../../character-select.xml?sel=2')" />
  99 + <xsl:variable name="profile" select="$user/page/characters/character" />
  100 + <xsl:variable name="bookmark" select="document('../../bookmarks.xml')/page/characters" />
110 101
111 102 <div id="menuHolder">
112 103 <xsl:if test="/page/pageIndex">
113 104 <xsl:attribute name="style">top: 64px; right: 10px;</xsl:attribute>
114 105 </xsl:if>
  106 +
115 107 <div id="myCharacters">
116   - <a id="changeLink" href="character-select.xml">[<xsl:value-of select="$loc/strs/common/str[@id='user.manage.settings']"/>]</a>
  108 + <a id="changeLink" href="character-select.xml"> <xsl:value-of select="$loc/strs/common/str[@id='user.manage.more']"/></a>
117 109 <xsl:value-of select="$loc/strs/common/str[@id='user.change.character']"/>
118   -
119 110 </div>
120   -
  111 +
  112 + <script type="text/javascript">
  113 + $(function() {
  114 + $('.charlist').click(function() {
  115 + var that = $(this);
  116 + var name = $('.menu-char-name', that).val();
  117 + var realm = $('.menu-char-realm', that).val();
  118 +
  119 + changeMainCharacter(name, realm, this);
  120 + });
  121 + });
  122 + </script>
  123 +
  124 + <div id="characterHolder">
  125 +
121 126 <!-- print each selected character -->
122   - <xsl:for-each select="$profile[@selected &lt; 3]">
  127 + <xsl:for-each select="$profile[@selected &lt; 5]">
123 128 <xsl:sort select="@selected"/>
124   -
125 129 <xsl:variable name="txtClass" select="$loc/strs/classes/str[@id=concat('armory.classes.class.', current()/@classId,'.', current()/@genderId)]" />
126 130
127 131 <div class="menuItem charlist">
128   - <a href="character-achievements.xml?{@url}" class="character-achievement staticTip"
129   - onmouseover="setTipText('{$loc/strs/login/str[@id='armory.login.achievements']}');"><xsl:value-of select="@achPoints" /></a>
130   - <a href="character-calendar.xml?{@url}" class="user-alerts staticTip" style="display: none;"
131   - onmouseover="setTipText('{$loc/strs/login/str[@id='armory.login.calendar.pending']}')">0</a>
132   - <a href="character-sheet.xml?{@url}" class="charName js-character-name">
133   - <em class="classId{@classId} staticTip" onmouseover="setTipText('{$txtClass}')"></em>
134   -
135   - <xsl:value-of select="@name" />
136   - </a> -
137   - <span class="js-character-realm"><xsl:value-of select="@realm" /></span>
138   -
139   - <p>
140   - <xsl:apply-templates mode="printf" select="$loc/strs/character/str[@id='charLevelStr']">
141   - <xsl:with-param name="param1" select="@level" />
142   - <xsl:with-param name="param2" select="''" />
143   - <xsl:with-param name="param3" select="$txtClass" />
144   - </xsl:apply-templates>
145   - </p>
  132 + <input type="hidden" class="menu-char-name" value="{@name}" />
  133 + <input type="hidden" class="menu-char-realm" value="{@realm}" />
  134 +
  135 + <div class="menuItemRank" style="visibility: hidden">
  136 + <xsl:if test="@selected = 1">
  137 + <xsl:attribute name="style"></xsl:attribute>
  138 + </xsl:if>
  139 +
  140 + <img src="images/icons/icon-guildmaster.gif" alt="" class="staticTip" onmouseover="setTipText('{$loc/strs/character-select/str[@id='primaryChar']}')" />
  141 + </div>
  142 +
  143 + <div class="menuItemAvatar">
  144 + <xsl:choose>
  145 + <xsl:when test="@level = '80'">
  146 + <img class="primchar-avatar" src="images/portraits/wow-80/{@genderId}-{@raceId}-{@classId}.gif" width="30" height="30" />
  147 + </xsl:when>
  148 + <xsl:when test="@level &gt;= '70'">
  149 + <img class="primchar-avatar" src="images/portraits/wow-70/{@genderId}-{@raceId}-{@classId}.gif" width="30" height="30" />
  150 + </xsl:when>
  151 + <xsl:when test="@level &gt;= '60'">
  152 + <img class="primchar-avatar" src="images/portraits/wow/{@genderId}-{@raceId}-{@classId}.gif" width="30" height="30" />
  153 + </xsl:when>
  154 + <xsl:otherwise>
  155 + <img class="primchar-avatar" src="images/portraits/wow-default/{@genderId}-{@raceId}-{@classId}.gif" width="30" height="30" />
  156 + </xsl:otherwise>
  157 + </xsl:choose>
  158 + </div>
146 159
  160 + <div class="menuItemMeta">
  161 + <a href="/vault/character-calendar.xml?{@url}" class="user-alerts staticTip" style="display: none;" onmouseover="setTipText('{$loc/strs/login/str[@id='armory.login.calendar.pending']}')">0</a>
  162 +
  163 + <a href="character-sheet.xml?{@url}" class="charName js-character-name"><xsl:value-of select="@name" /></a> -
  164 + <span class="js-character-realm"><xsl:value-of select="@realm" /></span>
  165 +
  166 + <p>
  167 + <a href="character-achievements.xml?{@url}" class="character-achievement staticTip" onmouseover="setTipText('{$loc/strs/login/str[@id='armory.login.achievements']}');"><xsl:value-of select="@achPoints" /></a>
  168 +
  169 + <xsl:apply-templates mode="printf" select="$loc/strs/character/str[@id='charLevelStr']">
  170 + <xsl:with-param name="param1" select="@level" />
  171 + <xsl:with-param name="param2" select="''" />
  172 + <xsl:with-param name="param3" select="$txtClass" />
  173 + </xsl:apply-templates>
  174 + </p>
  175 + </div>
  176 +
  177 + <span class="clear"><!-- --></span>
147 178 </div>
148 179 </xsl:for-each>
149   -
  180 + </div>
  181 +
150 182 <!-- bookmarks -->
151 183 <div id="myBookmarks">
152 184 <!-- paging arrows -->
@@ -154,7 +186,6 @@
154 186 <a id="bmBack" class="staticTip" onmouseover="setTipText('{$loc/strs/common/str[@id='user.bookmark.previous']}');" href="javascript:void(0)"> </a>
155 187 <a id="bmFwd" class="staticTip" onmouseover="setTipText('{$loc/strs/common/str[@id='user.bookmark.forward']}');" href="javascript:void(0)"> </a>
156 188 </div>
157   -
158 189 <xsl:value-of select="$loc/strs/common/str[@id='user.change.bookmarks']"/>
159 190 </div>
160 191 <xsl:choose>
@@ -164,14 +195,14 @@
164 195 </xsl:when>
165 196 <xsl:otherwise>
166 197 <div class="menuItem nobookmark" style="height: auto;">
167   -
168 198 <strong><xsl:value-of select="$loc/strs/login/str[@id='armory.login.bookmark.nobookmark']"/></strong>
169 199 <p><xsl:value-of select="$loc/strs/login/str[@id='armory.login.bookmark.nobookmark.desc']"/></p>
170 200 </div>
171 201 </xsl:otherwise>
172 202 </xsl:choose>
173 203 </div>
174   - <div class="clear"><xsl:comment/></div>
  204 +
  205 + <span class="clear"><!-- --></span>
175 206 </xsl:template>
176 207
177 208
2  includes/armory_loader.php
@@ -30,7 +30,7 @@
30 30 if(!@include('classes/class.connector.php')) {
31 31 die('<b>Error:</b> can not load connector class!');
32 32 }
33   -define('DB_VERSION', 'armory_r265');
  33 +define('DB_VERSION', 'armory_r276');
34 34 @include('revision_nr.php');
35 35 $armory = new Connector();
36 36 /* Check DbVersion */
2  includes/revision_nr.php
... ... @@ -1,5 +1,5 @@
1 1 <?php
2 2
3   -define('ARMORY_REVISION', 275);
  3 +define('ARMORY_REVISION', 276);
4 4
5 5 ?>
28 sql/updates/armory_r276_patch_335.sql
... ... @@ -0,0 +1,28 @@
  1 +/*!40101 SET NAMES utf8 */;
  2 +/*!40101 SET SQL_MODE=''*/;
  3 +/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
  4 +
  5 +UPDATE `armory_db_version` SET `version` = 'armory_r276';
  6 +
  7 +-- Achievement.dbc
  8 +REPLACE INTO `armory_achievement` VALUES (4815, -1, 0, 'Der Zwielichtzerstorer (25 Spieler)', 'The Twilight Destroyer (25 player)', 'El Destructor del Crepusculo (25 j.)', 'Le destructeur du Crepuscule (25 joueurs)', 'Сумеречный разрушитель (25 игроков)', '0', 'Defeat Halion in The Ruby Sanctum in 25-player mode.', 'Derrota a Halion en El Sagrario Rubi en el modo de 25 jugadores.', 'Vaincre Halion au sanctum Rubis en mode 25 joueurs.', 'Убейте Халиона в Рубиновом святилище в рейде на 25 игроков.', 14923, 10, 35, 0, 164, 'spell_shadow_twilight', '', '', '', '', ''),
  9 +(4816, -1, 4815, 'Heroisch: Der Zwielichtzerstorer (25 Spieler)', 'Heroic: The Twilight Destroyer (25 player)', 'Heroico: El Destructor del Crepusculo (25 j.)', 'Le destructeur du Crepuscule : mode heroique (25 joueurs)', 'Сумеречный разрушитель (героич., 25 игроков)', '0', 'Defeat Halion in The Ruby Sanctum in 25-player Heroic mode.', 'Derrota a Halion en El Sagrario Rubi en el modo de 25 jugadores en dificultad heroica.', 'Vaincre Halion au sanctum Rubis en mode heroique a 25 joueurs.', 'Убейте Халиона в Рубиновом святилище в рейде на 25 игроков в героическом режиме.', 14923, 10, 36, 0, 164, 'spell_shadow_twilight', '', '', '', '', ''),
  10 +(4817, -1, 0, 'Der Zwielichtzerstorer (10 Spieler)', 'The Twilight Destroyer (10 player)', 'El Destructor del Crepusculo (10 j.)', 'Le destructeur du Crepuscule (10 joueurs)', 'Сумеречный разрушитель (10 игроков)', '0', 'Defeat Halion in The Ruby Sanctum in 10-player mode.', 'Derrota a Halion en El Sagrario Rubi en el modo de 10 jugadores.', 'Vaincre Halion au sanctum Rubis en mode 10 joueurs.', 'Убейте Халиона в Рубиновом святилище в рейде на 10 игроков.', 14922, 10, 35, 0, 164, 'spell_shadow_twilight', '', '', '', '', ''),
  11 +(4818, -1, 4817, 'Heroisch: Der Zwielichtzerstorer (10 Spieler)', 'Heroic: The Twilight Destroyer (10 player)', 'Heroico: El Destructor del Crepusculo (10 j.)', 'Le destructeur du Crepuscule : mode heroique (10 joueurs)', 'Сумеречный разрушитель (героич., 10 игроков)', '0', 'Defeat Halion in The Ruby Sanctum in 10-player Heroic mode.', 'Derrota a Halion en El Sagrario Rubi en el modo de 10 jugadores en dificultad heroica.', 'Vaincre Halion au sanctum Rubis en mode heroique a 10 joueurs.', 'Убейте Халиона в Рубиновом святилище в рейде на 10 игроков в героическом режиме.', 14922, 10, 36, 0, 164, 'spell_shadow_twilight', '', '', '', '', ''),
  12 +(4820, -1, 0, 'Siege uber Halion (Rubinsanktum', 'Halion kills (Ruby Sanctum 25 player)', 'Muertes de Halion (El Sagrario Rubi 25 j.)', 'Morts de Halion (Sanctum Rubis a 25)', 'Убийства Халиона (Рубиновое святилище, 25 игроков)', 'Siege uber Halion (Rubinsanktum', 'Halion kills (Ruby Sanctum 25 player)', 'Muertes de Halion (El Sagrario Rubi 25 j.)', 'Morts de Halion (sanctum Rubis a 25)', 'Убийства Халиона (Рубиновое святилище, 25 игроков)', 15062, 0, 69, 1, 1, '', '0', '', '', '', ''),
  13 +(4821, -1, 0, 'Siege uber Halion (Rubinsanktum', 'Halion kills (Ruby Sanctum 10 player)', 'Muertes de Halion (El Sagrario Rubi 10 j.)', 'Morts de Halion (Sanctum Rubis a 10)', 'Убийства Халиона (Рубиновое святилище, 10 игроков)', 'Siege uber Halion (Rubinsanktum', 'Halion kills (Ruby Sanctum 10 player)', 'Muertes de Halion (El Sagrario Rubi 10 j.)', 'Morts de Halion (sanctum Rubis a 10)', 'Убийства Халиона (Рубиновое святилище, 10 игроков)', 15062, 0, 67, 1, 1, '', '0', '', '', '', ''),
  14 +(4822, -1, 0, 'Siege uber Halion (Heroisches Rubinsanktum', 'Halion kills (Heroic Ruby Sanctum 10 player)', 'Muertes de Halion (El Sagrario Rubi heroica 10 j.)', 'Morts de Halion (Sanctum Rubis heroique a 10)', 'Убийства Халиона (Рубиновое святилище, 10 игроков, героич.)', 'Siege uber Halion (Heroisches Rubinsanktum', 'Halion kills (Heroic Ruby Sanctum 10 player)', 'Muertes de Halion (El Sagrario Rubi heroica 10 j.)', 'Morts de Halion (sanctum Rubis heroique a 10)', 'Убийства Халиона (Рубиновое святилище, 10 игроков, героич.)', 15062, 0, 68, 1, 1, '', '0', '', '', '', ''),
  15 +(4823, -1, 0, 'Siege uber Halion (Heroisches Rubinsanktum', 'Halion kills (Heroic Ruby Sanctum 25 player)', 'Muertes de Halion (El Sagrario Rubi heroica 25 j.)', 'Morts de Halion (Sanctum Rubis heroique a 25)', 'Убийства Халиона (Рубиновое святилище, 25 игроков, героич.)', 'Siege uber Halion (Heroisches Rubinsanktum', 'Halion kills (Heroic Ruby Sanctum 25 player)', 'Muertes de Halion (El Sagrario Rubi heroica 25 j.)', 'Morts de Halion (sanctum Rubis heroique a 25)', 'Убийства Халиона (Рубиновое святилище, 25 игроков, героич.)', 15062, 0, 70, 1, 1, '', '0', '', '', '', '');
  16 +
  17 +-- ItemDisplayInfo.dbc
  18 +REPLACE INTO `armory_icons` VALUES (68106, 'inv_misc_rubysanctum2'),
  19 +(68107, 'inv_misc_rubysanctum3'),
  20 +(68108, 'inv_misc_rubysanctum1'),
  21 +(68109, 'inv_misc_rubysanctum4'),
  22 +(68328, 'inv_sigil_thorim'),
  23 +(68742, 't_roboticon');
  24 +
  25 +-- remove empty icon entries
  26 +DELETE FROM `armory_icons` WHERE `icon`='';
  27 +
  28 +/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
BIN  wow-icons/_images/wow-icons_update_r276.7z
Binary file not shown

0 comments on commit af3643b

Please sign in to comment.
Something went wrong with that request. Please try again.