Compare commits

..

No commits in common. "d2c8c8d7d5ef30d90a8e9c009fb60385c0bd0e11" and "7434f28fa61e3c9160e01da4598c942f74d553ef" have entirely different histories.

2743 changed files with 3850 additions and 115 deletions

View File

@ -27,7 +27,7 @@ class InventoryItem extends Item
public function printInfo()
{
echo $this->getAllInfo();
parent::printAllInfo();
if ($this->present) {
echo "<p style='color: maroon; font-style: italic'>Это подарок от $this->present. Вы не можете передать его кому-либо ещё.</p>";
}
@ -48,8 +48,9 @@ IMG;
}
}
public function printControls(){
// Для кнопок управления под картинкой.
public function printControls()
{
/* Тут будут кнопки под картинкой. */
}
private function dressStatsChecks(): ?string
@ -129,9 +130,14 @@ IMG;
return $error ?? true;
}
public static function destroyItem($itemId)
/**
* @param $itemId
*
* @return bool
*/
public static function destroyItem($itemId): bool
{
DBPDO::INIT()->execute('delete from inventory where dressed_slot = 0 and owner_id = ? and item_id = ?', [$_SESSION['uid'], $itemId]);
return DBPDO::INIT()->execute('delete from inventory where dressed_slot = 0 and owner_id = ? and item_id = ?', [$_SESSION['uid'], $itemId]);
}
/** Надеюсь, временная заглушка, которая объединяет get_meshok() и другую выдачу одной строкой.

View File

@ -102,14 +102,6 @@ class Item
$this->typename = 'Хлам';
}
$this->item_cost = $this->calculateItemCost();
}
/** Рассчёт стоимости предмета в зависимости от его характеристик.
* @return int
*/
private function calculateItemCost(): int
{
$sum_stats =
$this->add_strength +
$this->add_dexterity +
@ -129,7 +121,8 @@ class Item
$mods_cost_modifier = 2 + floor($sum_mods / 50);
$damage_cost_modifier = 1 + floor($sum_damage / 100);
$result = intval($sum_stats * $stats_cost_modifier + $sum_mods * $mods_cost_modifier + $sum_damage * $damage_cost_modifier);
return $result < 1 ? 1 : $result;
$this->item_cost = $result < 1 ? 1 : $result;
}
protected function wrap(int $number): string
@ -141,51 +134,50 @@ class Item
}
}
public function getAllInfo(): string
protected function printAllInfo()
{
$needsLines = [
'сила' => $this->need_strength,
'ловкость' => $this->need_dexterity,
'интуиция' => $this->need_intuition,
'выносливость' => $this->need_endurance,
'интеллект' => $this->need_intelligence,
'мудрость' => $this->need_wisdom,
"сила" => $this->need_strength,
"ловкость" => $this->need_dexterity,
"интуиция" => $this->need_intuition,
"выносливость" => $this->need_endurance,
"интеллект" => $this->need_intelligence,
"мудрость" => $this->need_wisdom,
];
$addsLines = [
'Сила' => $this->add_strength,
'Ловкость' => $this->add_dexterity,
'Интуиция' => $this->add_intuition,
'Выносливость' => $this->add_endurance,
'Интеллект' => $this->add_intelligence,
'Мудрость' => $this->add_wisdom,
'Точность' => $this->add_accuracy,
'Увёртливость' => $this->add_evasion,
'Шанс крита' => $this->add_criticals,
"Сила" => $this->add_strength,
"Ловкость" => $this->add_dexterity,
"Интуиция" => $this->add_intuition,
"Выносливость" => $this->add_endurance,
"Интеллект" => $this->add_intelligence,
"Мудрость" => $this->add_wisdom,
"Точность" => $this->add_accuracy,
"Увёртливость" => $this->add_evasion,
"Шанс крита" => $this->add_criticals,
];
$str = "<b>$this->name</b> (Масса: $this->weight)";
$str .= '<br> Стоимость: ' . $this->item_cost;
$str .= '<br> Долговечность: ' . $this->durability;
$str .= "<br><em>$this->typename</em><br>";
echo "<b>$this->name</b> (Масса: $this->weight)";
echo "<br> Стоимость: " . $this->item_cost;
echo "<br> Долговечность: " . $this->durability;
echo "<br><em>$this->typename</em><br>";
foreach ($needsLines as $stat => $value) {
if ($value > 0) {
$str .= "<br>Требуется $stat" . $this->wrap($value);
echo "<br>Требуется $stat" . $this->wrap($value);
}
}
foreach ($addsLines as $stat => $value) {
if ($value) {
$str .= "<br>$stat" . $this->wrap($value);
echo "<br>$stat" . $this->wrap($value);
}
}
if ($this->add_min_physical_damage && !$this->add_max_physical_damage) {
$damage = $this->add_min_physical_damage . ' - ' . $this->add_min_physical_damage;
$damage = $this->add_min_physical_damage . " - " . $this->add_min_physical_damage;
} elseif (!$this->add_min_physical_damage && $this->add_max_physical_damage) {
$damage = $this->add_max_physical_damage . ' - ' . $this->add_max_physical_damage;
$damage = $this->add_max_physical_damage . " - " . $this->add_max_physical_damage;
} elseif ($this->add_min_physical_damage && $this->add_max_physical_damage) {
$damage = $this->add_min_physical_damage . ' - ' . $this->add_max_physical_damage;
$damage = $this->add_min_physical_damage . " - " . $this->add_max_physical_damage;
}
if (isset($damage)) {
$str .= '<br>Урон: ' . $damage;
echo "<br>Урон: " . $damage;
}
return $str;
}
}

View File

@ -49,7 +49,6 @@ SQL;
private $optype;
private ?int $shop_item_quantity;
private ?int $price;
public static string $status = '';
public function __construct($row, $operationType = null)
{
@ -62,12 +61,11 @@ SQL;
$this->item_id = $row->item_id ?? $row->id;
}
public function printInfo(): string
public function printInfo()
{
//$this->printAllInfo();
$str = $this->getAllInfo();
$this->printAllInfo();
if ($this->optype === 'buyshop' && $this->shop_item_quantity > 0 && $this->shop_item_quantity < 20) {
$str .= "<div style='margin-top: 9px; font-style: italic;'>На складе осталось $this->shop_item_quantity единиц товара!</div>";
echo "<div style='margin-top: 9px; font-style: italic;'>На складе осталось $this->shop_item_quantity единиц товара!</div>";
}
if ($this->optype === 'sellshop') {
if ($this->getSellPriceMean() < 50) {
@ -81,37 +79,36 @@ SQL;
} else {
$goods = 'это превосходное изделие';
}
$str .= "<div style='margin-top: 9px; font-style: italic;'>В среднем за $goods можно выручить <span class='success'>{$this->getSellPriceMean()}</span> кр.</div>";
echo "<div style='margin-top: 9px; font-style: italic;'>В среднем за $goods можно выручить <span class='success'>{$this->getSellPriceMean()}</span> кр.</div>";
}
return $str;
}
public function printImage(): string
public function printImage()
{
if (!$this->image) {
$this->image = 'noitem.png';
}
return "<img src='/i/sh/$this->image' class='item-wrap-normal' alt=''>";
echo "<img src='/i/sh/$this->image' class='item-wrap-normal' alt=''>";
}
//todo наличка после покупки отображается с задержкой.
public static function buyItem($id, User $buyer)
public static function buyItem($id, User $buyer): string
{
$db = new DBPDO();
$check = $db->ofetch("select * from trade_offers where shop_item_id = ?", $id);
if (empty($check->shop_item_quantity) || empty($check->shop_item_id)) {
self::$status = self::NO_ITEMS_IN_STOCK;
return self::NO_ITEMS_IN_STOCK;
}
// TODO БАРТЕР!
if (isset($check->barter_item_list_json)) {
self::$status = "Работаем по бартеру!";
echo "Работаем по бартеру!";
}
$db->execute(self::BUY_QUERY, [$buyer->getId(), $check->shop_item_id]);
$item = $db->ofetch("select item_id, name, price from inventory where item_id = ?", $db->lastInsertId());
if (empty($item->item_id) || empty($item->name)) {
self::$status = 'Запрос в базу не прошёл.';
return 'Запрос в базу не прошёл.';
} else {
$user = new User($_SESSION['uid']);
// Если не хватает налички, снимаем с банка с комиссией.
@ -120,12 +117,14 @@ SQL;
$bank = new Bank($buyer->getId());
$bank->withdrawMoney($item->price);
} catch (GameException $e) {
self::$status = 'Банковская ошибка! ' . self::NO_MONEY;
echo 'Банковская ошибка!';
return self::NO_MONEY;
}
} else {
$user->setMoney($user->getMoney() - $item->price);
$user->saveMoney();
}
}
if ($check->shop_item_quantity != -1) {
@ -134,10 +133,10 @@ SQL;
$deloText = $buyer->getLogin() . " купил товар «" . $item->name . "» id:(" . $item->item_id . ") в магазине за " . $item->price . ".";
GameLogs::addUserLog($buyer->getId(), $deloText);
self::$status = "Предмет " . $item->name . " куплен за " . $item->price . ".";
return "Предмет " . $item->name . " куплен за " . $item->price . ".";
}
public static function sellItem($id, User $seller, $bankTrade = 0)
public static function sellItem($id, User $seller, $bankTrade = 0): string
{
$db = new DBPDO();
$item = $db->ofetch('select * from inventory where item_id = ?', $id);
@ -155,10 +154,11 @@ SQL;
$deloText = "{$seller->getLogin()} продал товар «{$sellingItemName}» id:($id) в магазине за $sellingPrice кр.";
GameLogs::addUserLog($seller->getId(), $deloText);
if ($sellingPrice == 0) {
self::$status = "После длительных и изнурительных торгов вы плюнули на всё и просто подарили ваш «{$sellingItemName}» торговцу.";
$status = "После длительных и изнурительных торгов вы плюнули на всё и просто подарили ваш «{$sellingItemName}» торговцу.";
} else {
self::$status = "Вы продали «{$sellingItemName}» за $sellingPrice кр.";
$status = "Вы продали «{$sellingItemName}» за $sellingPrice кр.";
}
return $status;
}
/** Подчсчёт средней суммы продажи.
@ -177,19 +177,18 @@ SQL;
/**
* Для кнопок управления под картинкой предмета в зависимости от ситуации.
*/
public function printControls(): string
public function printControls()
{
if (!in_array($this->optype, ['setmarket', 'unsetmarket', 'buymarket', 'sellshop', 'buyshop',])) {
return '';
}
$str = $this->optype == 'setmarket' ? '<input placeholder=" ' . $this->price . ' " name="cost">' : '';
$button_name = self::BUTTON[$this->optype];
return <<<FORM
if (in_array($this->optype, ['setmarket', 'unsetmarket', 'buymarket', 'sellshop', 'buyshop',])) {
$str = $this->optype == 'setmarket' ? '<input placeholder=" ' . $this->price . ' " name="cost">' : '';
$button_name = self::BUTTON[$this->optype];
echo <<<FORM
<form method="post">$str
<input type="hidden" name="itemId" value="$this->item_id">
<br><input type="submit" name="$this->optype" value="$button_name">
</form>
FORM;
}
}
/**

View File

@ -9,11 +9,6 @@
use Battles\Database\DBPDO;
use Battles\User;
include_once 'classes/Database/db.php';
include_once 'classes/Database/Mysql.php';
include_once 'classes/Database/Statement.php';
include_once 'classes/Database/Exception.php';
ini_set('display_errors', 'On');
error_reporting(E_ALL);
const GAMEDOMAIN = "battles.lan";

BIN
i/1_7.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 604 B

BIN
i/1green_.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 B

BIN
i/1m.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
i/1x1.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 49 B

BIN
i/1yellow.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 B

BIN
i/2_7.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
i/2m.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
i/3_7.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
i/3m.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

BIN
i/6107455_bigthumb.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

BIN
i/Lp.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
i/Lp2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

BIN
i/Mherz.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 298 B

BIN
i/a1.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 149 B

BIN
i/a2.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 134 B

BIN
i/a3.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 139 B

BIN
i/a4.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 136 B

BIN
i/a5.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 148 B

BIN
i/aaxe5.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
i/achieve.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

BIN
i/ages.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
i/ajax-loader.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 96 KiB

BIN
i/align_3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 526 B

BIN
i/align_4.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 519 B

BIN
i/align_5.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 532 B

BIN
i/align_6.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 507 B

BIN
i/align_7.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 520 B

BIN
i/amolot1.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
i/amulet83_du2.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
i/armor53.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
i/arrow3.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 124 B

BIN
i/artefact1.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 203 B

BIN
i/back_yellow.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 43 B

BIN
i/bagr.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
i/bank.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

BIN
i/blink.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 656 B

BIN
i/boots15.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
i/bug1.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 952 B

BIN
i/buttons/1x1.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 49 B

BIN
i/buttons/a_0.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 95 B

BIN
i/buttons/a___vip.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
i/buttons/a_l.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 107 B

BIN
i/buttons/a_r.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 106 B

BIN
i/buttons/active_bg.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 52 B

BIN
i/buttons/active_left.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 80 B

BIN
i/buttons/active_right.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 82 B

BIN
i/buttons/admin.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 985 B

BIN
i/buttons/alx.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
i/buttons/b___.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 574 B

BIN
i/buttons/b___1.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 766 B

BIN
i/buttons/b___bg2.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 54 B

BIN
i/buttons/b___chat_off.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 551 B

BIN
i/buttons/b___cl1.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
i/buttons/b___clear.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 663 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 520 B

BIN
i/buttons/b___filter_on.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 568 B

BIN
i/buttons/b___ok.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 516 B

BIN
i/buttons/b___slow_off.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 573 B

BIN
i/buttons/b___slow_on.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 567 B

BIN
i/buttons/b___smile.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 571 B

BIN
i/buttons/b___sys_off.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 626 B

BIN
i/buttons/b___sys_on.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 570 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 483 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 407 B

BIN
i/buttons/b_notepad.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
i/buttons/battles.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
i/buttons/beg_chat_03.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
i/buttons/bkf_l_r1_02.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
i/buttons/ch1_active.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 693 B

BIN
i/buttons/ch1_passive.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 566 B

BIN
i/buttons/ch2_active.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 677 B

BIN
i/buttons/ch2_passive.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 570 B

BIN
i/buttons/ch3_active.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 671 B

BIN
i/buttons/ch3_passive.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 576 B

BIN
i/buttons/ch4_active.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 720 B

BIN
i/buttons/ch4_passive.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 591 B

BIN
i/buttons/ch5_active.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 653 B

BIN
i/buttons/ch5_passive.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 599 B

BIN
i/buttons/ch6_active.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 720 B

BIN
i/buttons/ch6_passive.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 587 B

BIN
i/buttons/clan.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 508 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
i/buttons/location.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
i/buttons/nonact_bg.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 52 B

BIN
i/buttons/nonact_left.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 98 B

BIN
i/buttons/nonact_right.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 99 B

BIN
i/buttons/php.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
i/buttons/radiodj_but.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 714 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 635 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 777 B

BIN
i/buttons/smilestitle.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 704 B

BIN
i/buttons/up_left_dec12.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

BIN
i/buttons/zvuk.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 841 B

Some files were not shown because too many files have changed in this diff Show More