* added spawns for vehicle accessories
 * display if npc is an accessory or has acceories
Home:
 * searching from home no longer adds index.php to the url

thought of the day: what do i do with spawns on transport-maps?
This commit is contained in:
Sarjuuk
2014-11-09 16:06:27 +01:00
parent 336f28b34f
commit edfb0be602
10 changed files with 494 additions and 4 deletions

View File

@@ -564,10 +564,10 @@ trait spawnHelper
$label = [];
if (User::isInGroup(U_GROUP_STAFF))
$label[] = 'GUID'.Lang::$main['colon'].$s['guid'];
$label[] = $s['guid'] < 0 ? 'Vehicle Accessory' : 'GUID'.Lang::$main['colon'].$s['guid'];
if ($_ = Util::formatTime($s['respawn'] * 1000, false))
$label[] = Lang::$npc['respawnIn'].Lang::$main['colon'].$_;
if ($s['respawn'])
$label[] = Lang::$npc['respawnIn'].Lang::$main['colon'].Util::formatTime($s['respawn'] * 1000, false);
if (User::isInGroup(U_GROUP_STAFF))
{

View File

@@ -364,6 +364,9 @@ $lang = array(
'worth' => "Wert",
'unkPosition' => "Der Aufenthaltsort dieses NPCs ist nicht bekannt.",
'difficultyPH' => "Dieser NPC ist ein Platzhalter für einen anderen Modus von",
'seat' => "Sitz",
'accessory' => "Zusätze",
'accessoryFor' => "Dieser NPC ist Zusatz für Fahrzeug",
'quotes' => "Zitate",
'gainsDesc' => "Nach dem Töten dieses NPCs erhaltet Ihr",
'repWith' => "Ruf mit der Fraktion",

View File

@@ -359,6 +359,9 @@ $lang = array(
'worth' => "Worth",
'unkPosition' => "The location of this NPC is unknown.",
'difficultyPH' => "This NPC is a placeholder for a different mode of",
'seat' => "Seat",
'accessory' => "Accessories",
'accessoryFor' => "This NPC is an accessory for vehicle",
'quotes' => "Quotes",
'gainsDesc' => "After killing this NPC you will gain",
'repWith' => "reputation with",

View File

@@ -364,6 +364,9 @@ $lang = array(
'worth' => "Valor",
'unkPosition' => "No se conoce la ubicación de este PNJ.",
'difficultyPH' => "[Este PNJ es un marcador de posición para un modo diferente de]",
'seat' => "[Seat]",
'accessory' => "[Accessory]",
'accessoryFor' => "[This creature is an accessory for vehicle]",
'quotes' => "Citas",
'gainsDesc' => "Tras acabar con este PNJ ganarás",
'repWith' => "reputación con",

View File

@@ -363,6 +363,9 @@ $lang = array(
'worth' => "Vaut",
'unkPosition' => "L'emplacement de ce PNJ est inconnu.",
'difficultyPH' => "[Ce PNJ est un espace réservé pour un autre mode de]",
'seat' => "[Seat]",
'accessory' => "[Accessory]",
'accessoryFor' => "[This creature is an accessory for vehicle]",
'quotes' => "Citations",
'gainsDesc' => "Après avoir tué ce PNJ vous allez obtenir",
'repWith' => "points de réputation avec",

View File

@@ -363,6 +363,9 @@ $lang = array(
'worth' => "Деньги",
'unkPosition' => "Местоположение этого НИП неизвестно.",
'difficultyPH' => "[Этот НИП является прототипом для другого режима]",
'seat' => "[Seat]",
'accessory' => "[Accessory]",
'accessoryFor' => "[This creature is an accessory for vehicle]",
'quotes' => "Цитаты",
'gainsDesc' => "В награду за убийство этого НИПа вы получите",
'repWith' => "репутации с",

View File

@@ -63,6 +63,7 @@ class NpcPage extends GenericPage
$_altIds = [];
$_altNPCs = null;
$position = null;
$accessory = [];
// difficulty entries of self
if ($this->subject->getField('cuFlags') & NPC_CU_DIFFICULTY_DUMMY)
@@ -81,6 +82,13 @@ class NpcPage extends GenericPage
$_altNPCs = new CreatureList(array(['id', array_keys($_altIds)]));
}
if ($_ = DB::World()->selectCol('SELECT DISTINCT entry FROM vehicle_template_accessory WHERE accessory_entry = ?d', $this->typeId))
{
$vehicles = new CreatureList(array(['id', $_]));
foreach ($vehicles->iterate() as $id => $__)
$accessory[] = [$id, $vehicles->getField('name', true)];
}
// try to determine, if it's spawned in a dungeon or raid (shaky at best, if spawned by script)
$mapType = 0;
if ($maps = DB::Aowow()->selectCol('SELECT DISTINCT areaId from ?_spawns WHERE type = ?d AND typeId = ?d', TYPE_NPC, $this->typeId))
@@ -271,6 +279,7 @@ class NpcPage extends GenericPage
$this->map = $map;
$this->infobox = '[ul][li]'.implode('[/li][li]', $infobox).'[/li][/ul]';
$this->position = $position;
$this->accessory = $accessory;
$this->quotes = $this->getQuotes();
$this->reputation = $this->getOnKillRep($_altIds, $mapType);
$this->redButtons = array(
@@ -695,6 +704,36 @@ class NpcPage extends GenericPage
)
);
}
// tab: passengers
if ($_ = DB::World()->selectCol('SELECT accessory_entry as ARRAY_KEY, GROUP_CONCAT(seat_id) FROM vehicle_template_accessory WHERE entry = ?d', $this->typeId))
{
$passengers = new CreatureList(array(['id', array_keys($_)]));
if (!$passengers->error)
{
$data = $passengers->getListviewData();
$xCols = null;
if (User::isInGroup(U_GROUP_STAFF))
{
foreach ($data as $id => &$d)
$d['seat'] = str_replace(',', ', ', $_[$id]);
$xCols = "$[Listview.funcBox.createSimpleCol('seat', '".Lang::$npc['seat']."', '10%', 'seat')]";
}
$this->extendGlobalData($passengers->getJSGlobals(GLOBALINFO_SELF));
$this->lvTabs[] = array(
'file' => 'creature',
'data' => $data,
'params' => array(
'extraCols' => $xCols,
'name' => Lang::$npc['accessory'],
'id' => 'accessory'
)
);
}
}
}
protected function generateTooltip($asError = false)

422
setup/updates/02_spawns.sql Normal file
View File

@@ -0,0 +1,422 @@
ALTER TABLE `aowow_spawns`
ALTER `guid` DROP DEFAULT;
ALTER TABLE `aowow_spawns`
CHANGE COLUMN `guid` `guid` INT(11) NOT NULL FIRST;
DELETE FROM `aowow_spawns` WHERE `guid` < 0;
INSERT INTO `aowow_spawns` VALUES
(-415,1,29556,0,0,1,66,0,22,40,0),
(-414,1,29556,0,0,1,66,0,22,40,0),
(-413,1,29556,0,0,1,66,0,22,40,0),
(-412,1,29556,0,0,1,66,0,22,40,0),
(-411,1,29556,0,0,1,66,0,22,40,0),
(-410,1,29556,0,0,1,66,0,22,40,0),
(-409,1,29556,0,0,1,66,0,22,40,0),
(-408,1,29556,0,0,1,66,0,22,40,0),
(-407,1,29556,0,0,1,66,0,22,40,0),
(-406,1,33780,0,0,1,210,0,67,22,0),
(-405,1,33780,0,0,1,210,0,67,22,0),
(-404,1,33780,0,0,1,210,0,67,21,0),
(-403,1,31260,0,1,1,4813,0,53,62,0),
(-402,1,36658,0,1,1,4813,0,43,23,0),
(-401,1,36477,0,1,1,4813,0,46,39,0),
(-400,1,31260,0,1,1,4813,0,61,56,0),
(-399,1,28717,0,1,1,4813,0,56,56,0),
(-398,1,28717,0,1,1,4813,0,56,56,0),
(-397,1,28717,0,1,1,4813,0,56,56,0),
(-396,1,28717,0,1,1,4813,0,56,56,0),
(-395,1,38309,0,1,1,4812,5,8,53,0),
(-394,1,38308,0,1,1,4812,5,8,53,0),
(-393,1,33695,0,0,1,210,0,44,33,0),
(-392,1,33695,0,0,1,210,0,44,33,0),
(-391,1,33695,0,0,1,210,0,44,33,0),
(-390,1,32840,0,0,1,3430,0,55,53,0),
(-389,1,32830,0,0,1,3430,0,55,53,0),
(-388,1,34822,0,0,1,3430,0,55,53,0),
(-387,1,34824,0,0,1,3430,0,55,53,0),
(-386,1,34819,0,0,1,3430,0,55,53,0),
(-385,1,34823,0,0,1,3430,0,55,53,0),
(-384,1,34812,0,0,1,3430,0,55,53,0),
(-383,1,32840,0,0,1,3430,0,55,53,0),
(-382,1,32830,0,0,1,3430,0,55,53,0),
(-381,1,34822,0,0,1,3430,0,55,53,0),
(-380,1,34824,0,0,1,3430,0,55,53,0),
(-379,1,34819,0,0,1,3430,0,55,53,0),
(-378,1,34823,0,0,1,3430,0,55,53,0),
(-377,1,34812,0,0,1,3430,0,55,53,0),
(-376,1,32840,0,0,1,3430,0,55,53,0),
(-375,1,32830,0,0,1,3430,0,55,53,0),
(-374,1,34822,0,0,1,3430,0,55,53,0),
(-373,1,34824,0,0,1,3430,0,55,53,0),
(-372,1,34819,0,0,1,3430,0,55,53,0),
(-371,1,34823,0,0,1,3430,0,55,53,0),
(-370,1,34812,0,0,1,3430,0,55,53,0),
(-369,1,32840,0,0,1,3430,0,55,53,0),
(-368,1,32830,0,0,1,3430,0,55,53,0),
(-367,1,34822,0,0,1,3430,0,55,53,0),
(-366,1,34824,0,0,1,3430,0,55,53,0),
(-365,1,34819,0,0,1,3430,0,55,53,0),
(-364,1,34823,0,0,1,3430,0,55,53,0),
(-363,1,34812,0,0,1,3430,0,55,53,0),
(-362,1,32840,0,0,1,85,0,62,66,0),
(-361,1,32830,0,0,1,85,0,62,66,0),
(-360,1,34822,0,0,1,85,0,62,66,0),
(-359,1,34824,0,0,1,85,0,62,66,0),
(-358,1,34819,0,0,1,85,0,62,66,0),
(-357,1,34823,0,0,1,85,0,62,66,0),
(-356,1,34812,0,0,1,85,0,62,66,0),
(-355,1,32840,0,0,1,85,0,62,66,0),
(-354,1,32830,0,0,1,85,0,62,66,0),
(-353,1,34822,0,0,1,85,0,62,66,0),
(-352,1,34824,0,0,1,85,0,62,66,0),
(-351,1,34819,0,0,1,85,0,62,66,0),
(-350,1,34823,0,0,1,85,0,62,66,0),
(-349,1,34812,0,0,1,85,0,62,66,0),
(-348,1,32840,0,0,1,85,0,61,66,0),
(-347,1,32830,0,0,1,85,0,61,66,0),
(-346,1,34822,0,0,1,85,0,61,66,0),
(-345,1,34824,0,0,1,85,0,61,66,0),
(-344,1,34819,0,0,1,85,0,61,66,0),
(-343,1,34823,0,0,1,85,0,61,66,0),
(-342,1,34812,0,0,1,85,0,61,66,0),
(-341,1,32840,0,0,1,85,0,61,66,0),
(-340,1,32830,0,0,1,85,0,61,66,0),
(-339,1,34822,0,0,1,85,0,61,66,0),
(-338,1,34824,0,0,1,85,0,61,66,0),
(-337,1,34819,0,0,1,85,0,61,66,0),
(-336,1,34823,0,0,1,85,0,61,66,0),
(-335,1,34812,0,0,1,85,0,61,66,0),
(-334,1,32840,0,0,1,1638,0,30,68,0),
(-333,1,32830,0,0,1,1638,0,30,68,0),
(-332,1,34822,0,0,1,1638,0,30,68,0),
(-331,1,34824,0,0,1,1638,0,30,68,0),
(-330,1,34819,0,0,1,1638,0,30,68,0),
(-329,1,34823,0,0,1,1638,0,30,68,0),
(-328,1,34812,0,0,1,1638,0,30,68,0),
(-327,1,32840,0,0,1,1638,0,30,69,0),
(-326,1,32830,0,0,1,1638,0,30,69,0),
(-325,1,34822,0,0,1,1638,0,30,69,0),
(-324,1,34824,0,0,1,1638,0,30,69,0),
(-323,1,34819,0,0,1,1638,0,30,69,0),
(-322,1,34823,0,0,1,1638,0,30,69,0),
(-321,1,34812,0,0,1,1638,0,30,69,0),
(-320,1,32840,0,0,1,1638,0,31,67,0),
(-319,1,32830,0,0,1,1638,0,31,67,0),
(-318,1,34822,0,0,1,1638,0,31,67,0),
(-317,1,34824,0,0,1,1638,0,31,67,0),
(-316,1,34819,0,0,1,1638,0,31,67,0),
(-315,1,34823,0,0,1,1638,0,31,67,0),
(-314,1,34812,0,0,1,1638,0,31,67,0),
(-313,1,32840,0,0,1,1638,0,31,68,0),
(-312,1,32830,0,0,1,1638,0,31,68,0),
(-311,1,34822,0,0,1,1638,0,31,68,0),
(-310,1,34824,0,0,1,1638,0,31,68,0),
(-309,1,34819,0,0,1,1638,0,31,68,0),
(-308,1,34823,0,0,1,1638,0,31,68,0),
(-307,1,34812,0,0,1,1638,0,31,68,0),
(-306,1,32840,0,0,1,14,0,46,14,0),
(-305,1,32830,0,0,1,14,0,46,14,0),
(-304,1,34822,0,0,1,14,0,46,14,0),
(-303,1,34824,0,0,1,14,0,46,14,0),
(-302,1,34819,0,0,1,14,0,46,14,0),
(-301,1,34823,0,0,1,14,0,46,14,0),
(-300,1,34812,0,0,1,14,0,46,14,0),
(-299,1,32840,0,0,1,14,0,46,15,0),
(-298,1,32830,0,0,1,14,0,46,15,0),
(-297,1,34822,0,0,1,14,0,46,15,0),
(-296,1,34824,0,0,1,14,0,46,15,0),
(-295,1,34819,0,0,1,14,0,46,15,0),
(-294,1,34823,0,0,1,14,0,46,15,0),
(-293,1,34812,0,0,1,14,0,46,15,0),
(-292,1,32840,0,0,1,14,0,46,15,0),
(-291,1,32830,0,0,1,14,0,46,15,0),
(-290,1,34822,0,0,1,14,0,46,15,0),
(-289,1,34824,0,0,1,14,0,46,15,0),
(-288,1,34819,0,0,1,14,0,46,15,0),
(-287,1,34823,0,0,1,14,0,46,15,0),
(-286,1,34812,0,0,1,14,0,46,15,0),
(-285,1,32840,0,0,1,14,0,46,14,0),
(-284,1,32830,0,0,1,14,0,46,14,0),
(-283,1,34822,0,0,1,14,0,46,14,0),
(-282,1,34824,0,0,1,14,0,46,14,0),
(-281,1,34819,0,0,1,14,0,46,14,0),
(-280,1,34823,0,0,1,14,0,46,14,0),
(-279,1,34812,0,0,1,14,0,46,14,0),
(-278,1,32840,0,0,1,3557,0,76,51,0),
(-277,1,32830,0,0,1,3557,0,76,51,0),
(-276,1,34822,0,0,1,3557,0,76,51,0),
(-275,1,34824,0,0,1,3557,0,76,51,0),
(-274,1,34819,0,0,1,3557,0,76,51,0),
(-273,1,34823,0,0,1,3557,0,76,51,0),
(-272,1,34812,0,0,1,3557,0,76,51,0),
(-271,1,32840,0,0,1,3557,0,76,50,0),
(-270,1,32830,0,0,1,3557,0,76,50,0),
(-269,1,34822,0,0,1,3557,0,76,50,0),
(-268,1,34824,0,0,1,3557,0,76,50,0),
(-267,1,34819,0,0,1,3557,0,76,50,0),
(-266,1,34823,0,0,1,3557,0,76,50,0),
(-265,1,34812,0,0,1,3557,0,76,50,0),
(-264,1,32840,0,0,1,3557,0,75,50,0),
(-263,1,32830,0,0,1,3557,0,75,50,0),
(-262,1,34822,0,0,1,3557,0,75,50,0),
(-261,1,34824,0,0,1,3557,0,75,50,0),
(-260,1,34819,0,0,1,3557,0,75,50,0),
(-259,1,34823,0,0,1,3557,0,75,50,0),
(-258,1,34812,0,0,1,3557,0,75,50,0),
(-257,1,32840,0,0,1,3557,0,76,51,0),
(-256,1,32830,0,0,1,3557,0,76,51,0),
(-255,1,34822,0,0,1,3557,0,76,51,0),
(-254,1,34824,0,0,1,3557,0,76,51,0),
(-253,1,34819,0,0,1,3557,0,76,51,0),
(-252,1,34823,0,0,1,3557,0,76,51,0),
(-251,1,34812,0,0,1,3557,0,76,51,0),
(-250,1,32840,0,0,1,1657,0,69,36,0),
(-249,1,32830,0,0,1,1657,0,69,36,0),
(-248,1,34822,0,0,1,1657,0,69,36,0),
(-247,1,34824,0,0,1,1657,0,69,36,0),
(-246,1,34819,0,0,1,1657,0,69,36,0),
(-245,1,34823,0,0,1,1657,0,69,36,0),
(-244,1,34812,0,0,1,1657,0,69,36,0),
(-243,1,32840,0,0,1,1657,0,69,34,0),
(-242,1,32830,0,0,1,1657,0,69,34,0),
(-241,1,34822,0,0,1,1657,0,69,34,0),
(-240,1,34824,0,0,1,1657,0,69,34,0),
(-239,1,34819,0,0,1,1657,0,69,34,0),
(-238,1,34823,0,0,1,1657,0,69,34,0),
(-237,1,34812,0,0,1,1657,0,69,34,0),
(-236,1,32840,0,0,1,1657,0,68,36,0),
(-235,1,32830,0,0,1,1657,0,68,36,0),
(-234,1,34822,0,0,1,1657,0,68,36,0),
(-233,1,34824,0,0,1,1657,0,68,36,0),
(-232,1,34819,0,0,1,1657,0,68,36,0),
(-231,1,34823,0,0,1,1657,0,68,36,0),
(-230,1,34812,0,0,1,1657,0,68,36,0),
(-229,1,32840,0,0,1,1657,0,68,34,0),
(-228,1,32830,0,0,1,1657,0,68,34,0),
(-227,1,34822,0,0,1,1657,0,68,34,0),
(-226,1,34824,0,0,1,1657,0,68,34,0),
(-225,1,34819,0,0,1,1657,0,68,34,0),
(-224,1,34823,0,0,1,1657,0,68,34,0),
(-223,1,34812,0,0,1,1657,0,68,34,0),
(-222,1,32840,0,0,1,12,0,34,50,0),
(-221,1,32830,0,0,1,12,0,34,50,0),
(-220,1,34822,0,0,1,12,0,34,50,0),
(-219,1,34824,0,0,1,12,0,34,50,0),
(-218,1,34819,0,0,1,12,0,34,50,0),
(-217,1,34823,0,0,1,12,0,34,50,0),
(-216,1,34812,0,0,1,12,0,34,50,0),
(-215,1,32840,0,0,1,12,0,34,50,0),
(-214,1,32830,0,0,1,12,0,34,50,0),
(-213,1,34822,0,0,1,12,0,34,50,0),
(-212,1,34824,0,0,1,12,0,34,50,0),
(-211,1,34819,0,0,1,12,0,34,50,0),
(-210,1,34823,0,0,1,12,0,34,50,0),
(-209,1,34812,0,0,1,12,0,34,50,0),
(-208,1,32840,0,0,1,12,0,35,50,0),
(-207,1,32830,0,0,1,12,0,35,50,0),
(-206,1,34822,0,0,1,12,0,35,50,0),
(-205,1,34824,0,0,1,12,0,35,50,0),
(-204,1,34819,0,0,1,12,0,35,50,0),
(-203,1,34823,0,0,1,12,0,35,50,0),
(-202,1,34812,0,0,1,12,0,35,50,0),
(-201,1,32840,0,0,1,12,0,35,50,0),
(-200,1,32830,0,0,1,12,0,35,50,0),
(-199,1,34822,0,0,1,12,0,35,50,0),
(-198,1,34824,0,0,1,12,0,35,50,0),
(-197,1,34819,0,0,1,12,0,35,50,0),
(-196,1,34823,0,0,1,12,0,35,50,0),
(-195,1,34812,0,0,1,12,0,35,50,0),
(-194,1,32840,0,0,1,1,0,52,36,0),
(-193,1,32830,0,0,1,1,0,52,36,0),
(-192,1,34822,0,0,1,1,0,52,36,0),
(-191,1,34824,0,0,1,1,0,52,36,0),
(-190,1,34819,0,0,1,1,0,52,36,0),
(-189,1,34823,0,0,1,1,0,52,36,0),
(-188,1,34812,0,0,1,1,0,52,36,0),
(-187,1,32840,0,0,1,1,0,52,37,0),
(-186,1,32830,0,0,1,1,0,52,37,0),
(-185,1,34822,0,0,1,1,0,52,37,0),
(-184,1,34824,0,0,1,1,0,52,37,0),
(-183,1,34819,0,0,1,1,0,52,37,0),
(-182,1,34823,0,0,1,1,0,52,37,0),
(-181,1,34812,0,0,1,1,0,52,37,0),
(-180,1,32840,0,0,1,1,0,52,37,0),
(-179,1,32830,0,0,1,1,0,52,37,0),
(-178,1,34822,0,0,1,1,0,52,37,0),
(-177,1,34824,0,0,1,1,0,52,37,0),
(-176,1,34819,0,0,1,1,0,52,37,0),
(-175,1,34823,0,0,1,1,0,52,37,0),
(-174,1,34812,0,0,1,1,0,52,37,0),
(-173,1,32840,0,0,1,1,0,52,36,0),
(-172,1,32830,0,0,1,1,0,52,36,0),
(-171,1,34822,0,0,1,1,0,52,36,0),
(-170,1,34824,0,0,1,1,0,52,36,0),
(-169,1,34819,0,0,1,1,0,52,36,0),
(-168,1,34823,0,0,1,1,0,52,36,0),
(-167,1,34812,0,0,1,1,0,52,36,0),
(-166,1,32934,0,1,1,4273,2,51,86,0),
(-165,1,32933,0,1,1,4273,2,51,86,0),
(-164,1,32933,0,1,1,4273,2,51,86,0),
(-163,1,32933,0,1,1,4273,2,51,86,0),
(-162,1,32934,0,1,1,4273,2,51,86,0),
(-161,1,32934,0,1,1,4273,2,51,86,0),
(-160,1,27268,0,0,1,65,0,79,51,0),
(-159,1,27268,0,0,1,65,0,81,51,0),
(-158,1,27662,0,0,1,65,0,77,49,0),
(-157,1,27662,0,0,1,65,0,77,49,0),
(-156,1,27662,0,0,1,65,0,77,49,0),
(-155,1,27662,0,0,1,65,0,77,49,0),
(-154,1,28616,0,0,1,4298,0,52,46,0),
(-153,1,28616,0,0,1,4298,0,53,46,0),
(-152,1,28768,0,0,1,4298,0,54,41,0),
(-151,1,28768,0,0,1,4298,0,58,38,0),
(-150,1,28768,0,0,1,4298,0,57,31,0),
(-149,1,28768,0,0,1,4298,0,54,45,0),
(-148,1,28768,0,0,1,4298,0,55,42,0),
(-147,1,28768,0,0,1,4298,0,53,48,0),
(-146,1,28768,0,0,1,4298,0,55,44,0),
(-145,1,28768,0,0,1,4298,0,56,44,0),
(-144,1,28768,0,0,1,4298,0,56,48,0),
(-143,1,28768,0,0,1,4298,0,53,51,0),
(-142,1,28768,0,0,1,4298,0,58,47,0),
(-141,1,29982,0,1,1,4416,1,46,33,0),
(-140,1,29982,0,1,1,4416,1,46,33,0),
(-139,1,29982,0,1,1,4416,1,46,33,0),
(-138,1,29836,0,1,1,4416,1,48,31,0),
(-137,1,29836,0,1,1,4416,1,46,30,0),
(-136,1,29836,0,1,1,4416,1,45,31,0),
(-135,1,24849,0,1,1,206,1,37,33,0),
(-134,1,24849,0,1,1,206,1,37,33,0),
(-133,1,24849,0,1,1,206,3,11,15,0),
(-132,1,24849,0,1,1,206,3,11,15,0),
(-131,1,24849,0,1,1,206,1,44,36,0),
(-130,1,24849,0,1,1,206,1,44,36,0),
(-129,1,24849,0,1,1,206,1,36,24,0),
(-128,1,24849,0,1,1,206,1,36,24,0),
(-127,1,24849,0,1,1,206,1,34,40,0),
(-126,1,24849,0,1,1,206,1,34,40,0),
(-125,1,24849,0,1,1,206,1,29,36,0),
(-124,1,24849,0,1,1,206,1,29,36,0),
(-123,1,24849,0,1,1,206,3,16,28,0),
(-122,1,24849,0,1,1,206,3,16,28,0),
(-121,1,24849,0,1,1,206,3,16,28,0),
(-120,1,24849,0,1,1,206,1,83,62,0),
(-119,1,24849,0,1,1,206,1,83,62,0),
(-118,1,24849,0,1,1,206,1,83,62,0),
(-117,1,31882,0,0,1,210,0,59,45,0),
(-116,1,31882,0,0,1,210,0,59,45,0),
(-115,1,31882,0,0,1,210,0,59,45,0),
(-114,1,31882,0,0,1,210,0,59,45,0),
(-113,1,31884,0,0,1,210,0,59,45,0),
(-112,1,31891,0,0,1,210,0,59,45,0),
(-111,1,32486,0,0,1,210,0,46,63,0),
(-110,1,32486,0,0,1,210,0,45,64,0),
(-109,1,32486,0,0,1,210,0,44,65,0),
(-108,1,30332,0,0,1,210,0,32,23,0),
(-107,1,30332,0,0,1,210,0,31,26,0),
(-106,1,32190,0,0,1,210,0,51,44,0),
(-105,1,32190,0,0,1,210,0,47,41,0),
(-104,1,32190,0,0,1,210,0,47,41,0),
(-103,1,32190,0,0,1,210,0,50,45,0),
(-102,1,33780,0,0,1,210,0,76,24,0),
(-101,1,30332,0,0,1,210,0,30,22,0),
(-100,1,30332,0,0,1,210,0,29,23,0),
(-99,1,30332,0,0,1,210,0,33,19,0),
(-98,1,30332,0,0,1,210,0,31,20,0),
(-97,1,30332,0,0,1,210,0,30,21,0),
(-96,1,30332,0,0,1,210,0,34,22,0),
(-95,1,30332,0,0,1,210,0,34,24,0),
(-94,1,30332,0,0,1,210,0,35,24,0),
(-93,1,30332,0,0,1,210,0,27,26,0),
(-92,1,30332,0,0,1,210,0,27,27,0),
(-91,1,30332,0,0,1,210,0,27,30,0),
(-90,1,30332,0,0,1,210,0,26,31,0),
(-89,1,30332,0,0,1,210,0,25,33,0),
(-88,1,30332,0,0,1,210,0,26,34,0),
(-87,1,30332,0,0,1,210,0,25,36,0),
(-86,1,30332,0,0,1,210,0,30,35,0),
(-85,1,30332,0,0,1,210,0,24,36,0),
(-84,1,30332,0,0,1,210,0,27,38,0),
(-83,1,31263,0,0,1,210,0,53,54,0),
(-82,1,31263,0,0,1,210,0,58,53,0),
(-81,1,31263,0,0,1,210,0,56,53,0),
(-80,1,31263,0,0,1,210,0,57,54,0),
(-79,1,31263,0,0,1,210,0,59,61,0),
(-78,1,31263,0,0,1,210,0,56,53,0),
(-77,1,31263,0,0,1,210,0,54,51,0),
(-76,1,31263,0,0,1,210,0,58,63,0),
(-75,1,31263,0,0,1,210,0,56,51,0),
(-74,1,31263,0,0,1,210,0,58,57,0),
(-73,1,31263,0,0,1,210,0,58,55,0),
(-72,1,31263,0,0,1,210,0,59,59,0),
(-71,1,29440,0,0,1,67,0,40,86,0),
(-70,1,29440,0,0,1,67,0,40,86,0),
(-69,1,29440,0,0,1,67,0,40,86,0),
(-68,1,29440,0,0,1,67,0,40,86,0),
(-67,1,29440,0,0,1,67,0,40,86,0),
(-66,1,29440,0,0,1,67,0,40,86,0),
(-65,1,29440,0,0,1,67,0,40,86,0),
(-64,1,29440,0,0,1,67,0,40,86,0),
(-63,1,29440,0,0,1,67,0,40,86,0),
(-62,1,27627,0,0,1,394,0,62,42,0),
(-61,1,29694,0,0,1,67,0,34,54,0),
(-60,1,29694,0,0,1,67,0,33,54,0),
(-59,1,29694,0,0,1,67,0,33,54,0),
(-58,1,29694,0,0,1,67,0,33,54,0),
(-57,1,29694,0,0,1,67,0,33,54,0),
(-56,1,29694,0,0,1,67,0,33,54,0),
(-55,1,29694,0,0,1,67,0,33,54,0),
(-54,1,29694,0,0,1,67,0,33,54,0),
(-53,1,29694,0,0,1,67,0,33,55,0),
(-52,1,29694,0,0,1,67,0,34,55,0),
(-51,1,29694,0,0,1,67,0,32,55,0),
(-50,1,29694,0,0,1,67,0,34,55,0),
(-49,1,29694,0,0,1,67,0,34,55,0),
(-48,1,29694,0,0,1,67,0,33,55,0),
(-47,1,29694,0,0,1,67,0,33,55,0),
(-46,1,29694,0,0,1,67,0,34,55,0),
(-45,1,29694,0,0,1,67,0,32,55,0),
(-44,1,29694,0,0,1,67,0,31,60,0),
(-43,1,29694,0,0,1,67,0,31,60,0),
(-42,1,29694,0,0,1,67,0,32,61,0),
(-41,1,29694,0,0,1,67,0,32,61,0),
(-40,1,28053,0,0,1,3711,0,27,60,0),
(-39,1,28006,0,0,1,65,0,54,31,0),
(-38,1,27559,0,0,1,65,0,44,16,0),
(-37,1,27559,0,0,1,65,0,41,20,0),
(-36,1,27559,0,0,1,65,0,40,17,0),
(-35,1,27559,0,0,1,65,0,42,17,0),
(-34,1,27559,0,0,1,65,0,43,16,0),
(-33,1,27559,0,0,1,65,0,42,17,0),
(-32,1,27559,0,0,1,65,0,40,19,0),
(-31,1,27559,0,0,1,65,0,40,17,0),
(-30,1,27559,0,0,1,65,0,40,18,0),
(-29,1,29699,0,0,1,66,0,28,70,0),
(-28,1,29699,0,0,1,66,0,24,69,0),
(-27,1,29699,0,0,1,66,0,29,77,0),
(-26,1,29699,0,0,1,66,0,28,75,0),
(-25,1,29699,0,0,1,66,0,29,82,0),
(-24,1,29699,0,0,1,66,0,27,82,0),
(-23,1,29699,0,0,1,66,0,30,83,0),
(-22,1,29699,0,0,1,66,0,26,82,0),
(-21,1,29699,0,0,1,66,0,25,82,0),
(-20,1,29699,0,0,1,66,0,20,82,0),
(-19,1,29699,0,0,1,66,0,21,83,0),
(-18,1,29699,0,0,1,66,0,30,67,0),
(-17,1,24751,0,0,1,495,0,75,65,0),
(-16,1,33780,0,0,1,210,0,73,20,0),
(-15,1,33780,0,0,1,210,0,73,22,0),
(-14,1,33780,0,0,1,210,0,75,23,0),
(-13,1,33780,0,0,1,210,0,73,23,0),
(-12,1,33780,0,0,1,210,0,74,23,0),
(-11,1,33780,0,0,1,210,0,73,25,0),
(-10,1,33780,0,0,1,210,0,73,26,0),
(-9,1,33780,0,0,1,210,0,73,26,0),
(-8,1,33780,0,0,1,210,0,77,18,0),
(-7,1,33780,0,0,1,210,0,77,18,0),
(-6,1,33780,0,0,1,210,0,77,19,0),
(-5,1,33780,0,0,1,210,0,73,20,0),
(-4,1,33780,0,0,1,210,0,74,20,0),
(-3,1,33780,0,0,1,210,0,75,20,0),
(-2,1,40100,0,1,1,4987,0,49,54,0),
(-1,1,40083,0,1,1,4987,0,49,54,0);

View File

@@ -13,7 +13,7 @@
<?php $this->brick('announcement'); ?>
<div class="home-search" id="home-search">
<form method="get" action="index.php">
<form method="get" action="/">
<input type="text" name="search" />
</form>
</div>

View File

@@ -20,6 +20,20 @@
<?php
$this->brick('article');
if ($this->accessory):
echo ' <div>'.Lang::$npc['accessoryFor'].' ';
$n = count($this->accessory);
foreach ($this->accessory as $i => $ac):
if ($n > 1 && $i > 0):
echo ($i == $n - 1) ? Lang::$main['and'] : ', ';
endif;
echo '<a href="?npc='.$ac[0].'">'.$ac[1].'</a>';
endforeach;
echo ".</div>\n";
endif;
if (is_array($this->position)):
echo ' <div>'.Lang::$npc['difficultyPH'].' <a href="?npc='.$this->position[0].'">'.$this->position[1]."</a>.</div>\n";
?>