[endspiel] 7 new revisions pushed by tvsdes...@gmail.com on 2009-09-09 18:27 GMT

[codesite...@google.com]

7 new revisions:

Revision: d87e23cca1
Author: tvsd...@gmail.com
Date: Tue Sep 8 12:51:53 2009
Log: Исправлена ошибка с возвращением к разговору с NPC после логаута.
http://code.google.com/p/endspiel/source/detail?r=d87e23cca1

Revision: 75bd2e068a
Author: tvsd...@gmail.com
Date: Wed Sep 9 11:20:57 2009
Log: Созданы таблицы для мобов
http://code.google.com/p/endspiel/source/detail?r=75bd2e068a

Revision: db376f2a20
Author: tvsd...@gmail.com
Date: Wed Sep 9 11:22:23 2009
Log: Добавлен класс для отображения кнопки моба
http://code.google.com/p/endspiel/source/detail?r=db376f2a20

Revision: 31f1f9125a
Author: tvsd...@gmail.com
Date: Wed Sep 9 11:23:44 2009
Log: Добавлен класс пассивного взаимодействия с мобами. Содержит метод
полу...
http://code.google.com/p/endspiel/source/detail?r=31f1f9125a

Revision: 006cbdbe4f
Author: tvsd...@gmail.com
Date: Wed Sep 9 11:24:58 2009
Log: Добавлено создание экземпляра контроллера пассивного взаимодействия
с ...
http://code.google.com/p/endspiel/source/detail?r=006cbdbe4f

Revision: a62a9fa5f4
Author: tvsd...@gmail.com
Date: Wed Sep 9 11:25:45 2009
Log: Список мобов текущей клетки передается в обработчик шаблонов.
http://code.google.com/p/endspiel/source/detail?r=a62a9fa5f4

Revision: dce2a778c1
Author: tvsd...@gmail.com
Date: Wed Sep 9 11:26:28 2009
Log: Добавлен шаблон для отображения списка мобов текущей клетки.
http://code.google.com/p/endspiel/source/detail?r=dce2a778c1

==============================================================================
Revision: d87e23cca1
Author: tvsd...@gmail.com
Date: Tue Sep 8 12:51:53 2009
Log: Исправлена ошибка с возвращением к разговору с NPC после логаута.
http://code.google.com/p/endspiel/source/detail?r=d87e23cca1

Modified:
/lib/player.class.php

=======================================
--- /lib/player.class.php Tue Aug 25 06:34:27 2009
+++ /lib/player.class.php Tue Sep 8 12:51:53 2009
@@ -279,7 +279,6 @@
}
default:
{
- return array('mode' => 'idle');
}
}
}

==============================================================================
Revision: 75bd2e068a
Author: tvsd...@gmail.com
Date: Wed Sep 9 11:20:57 2009
Log: Созданы таблицы для мобов
http://code.google.com/p/endspiel/source/detail?r=75bd2e068a

Modified:
/install.sql

=======================================
--- /install.sql Thu Sep 3 11:07:44 2009
+++ /install.sql Wed Sep 9 11:20:57 2009
@@ -206,6 +206,33 @@
INDEX (`sid`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;

+
+DROP TABLE IF EXISTS `mob_types`;
+
+CREATE TABLE IF NOT EXISTS `mob_types`(
+ `id` int(11) NOT NULL auto_increment,
+ `name` VARCHAR(255) NOT NULL,
+ `description` TEXT DEFAULT '',
+ `hp` int(11) NOT NULL,
+ `mp` int(11) NOT NULL,
+ INDEX (`id`)
+ ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+
+DROP TABLE IF EXISTS `mobs`;
+
+CREATE TABLE IF NOT EXISTS `mobs`(
+ `id` int(11) NOT NULL auto_increment,
+ X int(11) NOT NULL DEFAULT 0,
+ Y int(11) NOT NULL DEFAULT 0,
+ Z int(11) NOT NULL DEFAULT 0,
+ L int(11) unsigned NOT NULL DEFAULT 0,
+ `mtype` int(11) NOT NULL,
+ `hp` int(11) NOT NULL,
+ `mp` int(11) NOT NULL,
+ INDEX (`id`)
+ ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
#Шаблоны игровых объектов

DROP TABLE IF EXISTS `item_types`;

==============================================================================
Revision: db376f2a20
Author: tvsd...@gmail.com
Date: Wed Sep 9 11:22:23 2009
Log: Добавлен класс для отображения кнопки моба
http://code.google.com/p/endspiel/source/detail?r=db376f2a20

Modified:
/css/base.css

=======================================
--- /css/base.css Mon Aug 31 02:17:42 2009
+++ /css/base.css Wed Sep 9 11:22:23 2009
@@ -17,6 +17,7 @@
.error { color:#ee0000 }

.npc { background:#aaf8d0; color:#000 }
+.mob { background:#f8b08a; color:#000 }
.player { background:#f8d0aa; color:#000 }
.door { background:#aad0f8; color:#000; border:1px solid #cccccc;
-moz-border-radius-topright:9px; -moz-border-radius-bottomright:9px; }


==============================================================================
Revision: 31f1f9125a
Author: tvsd...@gmail.com
Date: Wed Sep 9 11:23:44 2009
Log: Добавлен класс пассивного взаимодействия с мобами. Содержит метод
получения списка мобов.
http://code.google.com/p/endspiel/source/detail?r=31f1f9125a

Added:
/lib/mobs.class.php

=======================================
--- /dev/null
+++ /lib/mobs.class.php Wed Sep 9 11:23:44 2009
@@ -0,0 +1,49 @@
+<?php
+/*
+ * mobs.class.php
+ *
+ * Copyright 2009 Valery Tverdohleb <tvsd...@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
modify
+ * it under the terms of the GNU General Public License as published
by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+class Mobs
+{
+ public function listMobsAtPos($coords)
+ {
+ if ($coords['L'] == 0)
+ {
+ $stmt = Engine::get()->db->prepare('SELECT t.`name`, m.`id` FROM `mobs`
AS m LEFT JOIN `mob_types` AS t ON m.`mtype` = t.`id` WHERE m.`X` = :X AND
m.`Y` = :Y AND m.`Z` = :Z AND m.`L` = 0;');
+ $stmt->bindValue(':X',$coords['X']);
+ $stmt->bindValue(':Y',$coords['Y']);
+ $stmt->bindValue(':Z',$coords['Z']);
+ }
+ else
+ {
+ $stmt = Engine::get()->db->prepare('SELECT t.`name`, m.`id` FROM `mobs`
AS m LEFT JOIN `mob_types` AS t ON m.`mtype` = t.`id` WHERE m.`L` = :L;');
+ $stmt->bindValue(':L',$coords['L']);
+ }
+ $stmt->execute();
+ $r = array();
+ while ($i = $stmt->fetch(PDO::FETCH_ASSOC))
+ {
+ $r[$i['id']] = $i;
+ }
+ return $r;
+ }
+}
+
+?>

==============================================================================
Revision: 006cbdbe4f
Author: tvsd...@gmail.com
Date: Wed Sep 9 11:24:58 2009
Log: Добавлено создание экземпляра контроллера пассивного взаимодействия с
мобами в суперкласс.
http://code.google.com/p/endspiel/source/detail?r=006cbdbe4f

Modified:
/lib/engine.class.php

=======================================
--- /lib/engine.class.php Mon Aug 31 09:45:34 2009
+++ /lib/engine.class.php Wed Sep 9 11:24:58 2009
@@ -37,6 +37,7 @@
require_once("map.class.php");
require_once("pmanager.class.php");
require_once("npc.class.php");
+require_once("mobs.class.php");
require_once("controller.class.php");

require_once("c.idle.class.php");
@@ -59,6 +60,7 @@
public $map;
public $npc;
public $messaging;
+ public $mobs;

static function get()
{
@@ -155,12 +157,18 @@
$this->map->load($coords['X'],$coords['Y'],$coords['Z'],$coords['L']);
}
$this->loadNPC($coords);
+ $this->loadMobs($coords);
}

protected function loadNPC($coords)
{
$this->npc = new NPC($coords);
}
+
+ protected function loadMobs($coords)
+ {
+ $this->mobs = new Mobs($coords);
+ }


}

==============================================================================
Revision: a62a9fa5f4
Author: tvsd...@gmail.com
Date: Wed Sep 9 11:25:45 2009
Log: Список мобов текущей клетки передается в обработчик шаблонов.
http://code.google.com/p/endspiel/source/detail?r=a62a9fa5f4

Modified:
/lib/c.idle.class.php

=======================================
--- /lib/c.idle.class.php Thu Sep 3 11:09:48 2009
+++ /lib/c.idle.class.php Wed Sep 9 11:25:45 2009
@@ -262,6 +262,12 @@
$npcs = Engine::get()->npc->listNPCs(); //Получаем список NPC
Engine::get()->smarty->assign('npcs',$npcs); //Передаем в шаблон

+ /*
+ * Вывод мобов
+ */
+ $mobs =
Engine::get()->mobs->listMobsAtPos(Engine::get()->player->coords());
//Получаем список мобов
+ Engine::get()->smarty->assign('mobs',$mobs); //Передаем в шаблон
+
Engine::get()->smarty->display('base.index.idle.tpl'); //Генерация
страницы
}


==============================================================================
Revision: dce2a778c1
Author: tvsd...@gmail.com
Date: Wed Sep 9 11:26:28 2009
Log: Добавлен шаблон для отображения списка мобов текущей клетки.
http://code.google.com/p/endspiel/source/detail?r=dce2a778c1

Added:
/tpl/tpl/base.include.mobslist.tpl
Modified:
/tpl/tpl/base.index.idle.tpl

=======================================
--- /dev/null
+++ /tpl/tpl/base.include.mobslist.tpl Wed Sep 9 11:26:28 2009
@@ -0,0 +1,16 @@
+{if count($mobs) gt 0}
+<table>
+ {foreach from=$mobs item=m}
+ <tr>
+ <td>
+ <form action="/" method="POST">
+ <input type="hidden" name="m" value="attack" />
+ <input type="hidden" name="d" value="mob" />
+ <input type="hidden" name="i" value="{$m.id}" />
+ <input class="mob" type="submit" value="{$m.name}" />
+ </form>
+ </td>
+ </tr>
+ {/foreach}
+</table>
+{/if}
=======================================
--- /tpl/tpl/base.index.idle.tpl Mon Aug 31 09:50:22 2009
+++ /tpl/tpl/base.index.idle.tpl Wed Sep 9 11:26:28 2009
@@ -61,6 +61,7 @@
</td>
<td>
{include file='base.include.playerlist.tpl' players=$players
touched=$touched}
+ {include file='base.include.mobslist.tpl' mobs=$mobs}
{include file='base.include.ioglist.tpl' iog=$itemsonground}
{include file='base.include.npcslist.tpl' npcs=$npcs}
{include file='base.include.doorslist.tpl' doors=$doors}