yolinlin/aowow
1
0
Fork 0
mirror of https://github.com/Sarjuuk/aowow.git synced 2025-11-29 15:58:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Currency

Browse Source 
* expanded tooltips
  * moved cap from hardcoded to DB
  * can now set description (manually)
Itemset
  * expanded tooltips
Lang
  * number formating is now locale-aware
This commit is contained in:
Sarjuuk
2015-07-11 15:17:34 +02:00
parent 08270ae09e
commit 54695a9490
16 changed files with 271 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
setup/db_structure.sql
View File

@@ -513,6 +513,7 @@ CREATE TABLE `aowow_currencies` (
`cuFlags` int(10) unsigned NOT NULL,
`iconId` mediumint(9) NOT NULL,
`itemId` int(16) NOT NULL,
`cap` mediumint(8) unsigned NOT NULL,
`name_loc0` varchar(64) NOT NULL,
`name_loc2` varchar(64) NOT NULL,
`name_loc3` varchar(64) NOT NULL,

47
setup/tools/filegen/templates/power.js.in
View File

@@ -27,13 +27,15 @@ if (typeof $WowheadPower == "undefined") {
eventAttached = false,
npcs = {},
objects = {},
items = {},
quests = {},
spells = {},
npcs = {},
objects = {},
items = {},
quests = {},
spells = {},
achievements = {},
profiles = {},
itemsets = {},
currencies = {},
profiles = {},
showLogo = 1,
@@ -51,9 +53,11 @@ if (typeof $WowheadPower == "undefined") {
TYPE_NPC = 1,
TYPE_OBJECT = 2,
TYPE_ITEM = 3,
TYPE_ITEMSET = 4,
TYPE_QUEST = 5,
TYPE_SPELL = 6,
TYPE_ACHIEVEMENT = 10,
TYPE_CURRENCY = 17,
TYPE_PROFILE = 100,
CURSOR_HSPACE = 15,
@@ -68,9 +72,11 @@ if (typeof $WowheadPower == "undefined") {
1: [npcs, "npc", "NPC" ],
2: [objects, "object", "Object" ],
3: [items, "item", "Item" ],
4: [itemsets, "itemset", "Item Set" ],
5: [quests, "quest", "Quest" ],
6: [spells, "spell", "Spell" ],
10: [achievements, "achievement", "Achievement"],
17: [currencies, "currency", "Currency" ],
100: [profiles, "profile", "Profile" ]
},
SCALES = {
@@ -90,7 +96,14 @@ if (typeof $WowheadPower == "undefined") {
};
if (isRemote) {
var Locale = { id: 0, name: "enus" };
var Locale = {
getId: function () {
return 0;
},
getName: function () {
return "enus";
}
}
}
function init() {
@@ -248,8 +261,8 @@ if (typeof $WowheadPower == "undefined") {
i2 = 3;
if (t.href.indexOf("http://") == 0 || t.href.indexOf("https://") == 0) {
i0 = 1;
// url = t.href.match(/^https?:\/\/(.+?)?\.?wowhead\.com(?:\:\d+)?\/\??(item|quest|spell|achievement|npc|object)=([0-9]+)/);
url = t.href.match(/^https?:\/\/(.*)\/?\??(item|quest|spell|achievement|npc|object)=([0-9]+)/);
// url = t.href.match(/^https?:\/\/(.+?)?\.?wowhead\.com(?:\:\d+)?\/\??(item|quest|spell|achievement|npc|object|itemset|currency)=(-?[0-9]+)/);
url = t.href.match(/^https?:\/\/(.*)\/?\??(item|quest|spell|achievement|npc|object|itemset|currency)=(-?[0-9]+)/);
if (url == null) {
// url = t.href.match(/^http:\/\/(.+?)?\.?wowhead\.com\/\?(profile)=([^&#]+)/)
url = t.href.match(/^https?:\/\/(.*)\/?\??(profile)=([^&#]+)/);
@@ -258,7 +271,7 @@ if (typeof $WowheadPower == "undefined") {
showLogo = 0;
}
else {
url = t.href.match(/()\?(item|quest|spell|achievement|npc|object)=([0-9]+)/);
url = t.href.match(/()\?(item|quest|spell|achievement|npc|object|itemset|currency)=(-?[0-9]+)/);
if (url == null) {
url = t.href.match(/()\?(profile)=([^&#]+)/);
}
@@ -271,7 +284,7 @@ if (typeof $WowheadPower == "undefined") {
i0 = 0;
i1 = 1;
i2 = 2;
url = t.rel.match(/(item|quest|spell|achievement|npc|object).?([0-9]+)/);
url = t.rel.match(/(item|quest|spell|achievement|npc|object|itemset|currency).?(-?[0-9]+)/);
// if (url == null) { // sarjuuk: also matches 'profiler' and 'profiles' which screws with the language-menu workaround
// url = t.rel.match(/(profile).?([^&#]+)/);
// }
@@ -700,6 +713,10 @@ if (typeof $WowheadPower == "undefined") {
this.register(TYPE_NPC, id, locale, json);
};
this.registerCurrency = function (id, locale, json) {
this.register(TYPE_CURRENCY, id, locale, json)
};
this.registerObject = function (id, locale, json) {
this.register(TYPE_OBJECT, id, locale, json);
};
@@ -708,6 +725,10 @@ if (typeof $WowheadPower == "undefined") {
this.register(TYPE_ITEM, id, locale, json);
};
this.registerItemSet = function (id, locale, json) {
this.register(TYPE_ITEMSET, id, locale, json);
};
this.registerQuest = function (id, locale, json) {
this.register(TYPE_QUEST, id, locale, json);
};
@@ -740,11 +761,11 @@ if (typeof $WowheadPower == "undefined") {
};
this.requestItem = function (id, params) {
this.request(TYPE_ITEM, id, Locale.id, params);
this.request(TYPE_ITEM, id, Locale.getId(), params);
};
this.requestSpell = function (id) {
this.request(TYPE_SPELL, id, Locale.id);
this.request(TYPE_SPELL, id, Locale.getId());
};
this.getStatus = function (type, id, locale) {

4
setup/tools/sqlgen/currencies.func.php
View File

@@ -18,7 +18,9 @@ $customData = array(
2 => ['cuFlags' => CUSTOM_EXCLUDE_FOR_LISTVIEW, 'category' => 3],
4 => ['cuFlags' => CUSTOM_EXCLUDE_FOR_LISTVIEW, 'category' => 3],
22 => ['cuFlags' => CUSTOM_EXCLUDE_FOR_LISTVIEW, 'category' => 3],
141 => ['cuFlags' => CUSTOM_EXCLUDE_FOR_LISTVIEW, 'category' => 3]
141 => ['cuFlags' => CUSTOM_EXCLUDE_FOR_LISTVIEW, 'category' => 3],
103 => ['cap' => 10000], // Arena Points
104 => ['cap' => 75000] // Honor Points
);
$reqDBC = ['itemdisplayinfo', 'currencytypes'];

5
setup/updates/1436619600_01.sql Normal file
View File

@@ -0,0 +1,5 @@
ALTER TABLE `aowow_currencies`
ADD COLUMN `cap` MEDIUMINT UNSIGNED NOT NULL AFTER `itemId`;
UPDATE `aowow_currencies` SET `cap` = 10000 WHERE `id` = 103;
UPDATE `aowow_currencies` SET `cap` = 75000 WHERE `id` = 104;