Skip to content

Commit

Permalink
Исправлена ошибка с отображением имени города.
Browse files Browse the repository at this point in the history
  • Loading branch information
devapromix committed Nov 15, 2022
1 parent 4b3be39 commit 3425e09
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 6 deletions.
12 changes: 10 additions & 2 deletions worlds/elvion/includes/class.location.php
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,9 @@ public function change_region($region_ident, $food, $gold) {
$user['char_mana_cur'] = $user['char_mana_max'];
$user['char_region'] = $region['region_ident'];
$user['char_region_level'] = $region['region_level'];
$user['char_region_town_name'] = $region['region_town_name'];
$user['char_gold'] -= $gold;
$user['char_food'] -= $food;
User::update("char_life_cur=".$user['char_life_cur'].",char_mana_cur=".$user['char_mana_cur'].",char_gold=".$user['char_gold'].",char_food=".$user['char_food'].",char_region=".$user['char_region'].",char_region_level=".$user['char_region_level'].",char_region_town_name='".$user['char_region_town_name']."'");
User::update("char_life_cur=".$user['char_life_cur'].",char_mana_cur=".$user['char_mana_cur'].",char_gold=".$user['char_gold'].",char_food=".$user['char_food'].",char_region=".$user['char_region'].",char_region_level=".$user['char_region_level']);
}

public static function get_location($location_ident) {
Expand Down Expand Up @@ -351,6 +350,15 @@ public function get_graveyard_description() {
return $region['region_graveyard_description'];
}

public function get_town_name() {
global $user, $tb_regions, $connection;
$query = "SELECT region_town_name FROM ".$tb_regions." WHERE region_ident=".$user['char_region'];
$result = mysqli_query($connection, $query)
or die('{"error":"Ошибка считывания данных: '.mysqli_error($connection).'"}');
$region = $result->fetch_assoc();
return $region['region_town_name'];
}

public function get_town_description() {
global $user, $tb_regions, $connection;
$query = "SELECT region_town_description FROM ".$tb_regions." WHERE region_ident=".$user['char_region'];
Expand Down
4 changes: 2 additions & 2 deletions worlds/elvion/locations/gate.php
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<?php

if ($action == 'gate') {
$user['title'] = 'Врата в '.$user['char_region_town_name'];
$user['title'] = 'Врата в '.$user['class']['location']->get_town_name();
if ($user['char_life_cur'] > 0) {
$user['description'] = 'Вы стоите у главных ворот в город. Здесь всегда полно народу - кто-то спешит в город, кто-то его покидает. Угрюмые стражники подозрительно всматриваются в каждого проходящего. Глубоко вдохнув полной грудью вы решаете, что пора двигаться дальше.';
} else $user['class']['location']->shades();

$user['links'] = array();
if ($user['char_life_cur'] > 0) {

$user['class']['location']->go_to_the_town('Войти в '.$user['char_region_town_name']);
$user['class']['location']->go_to_the_town('Войти в '.$user['class']['location']->get_town_name());
$user['class']['location']->go_to_the_graveyard('Идти на Кладбище', 1);
switch ($user['char_region']) {
case 1:
Expand Down
4 changes: 2 additions & 2 deletions worlds/elvion/locations/town.php
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?php

if ($action == 'town') {
$user['title'] = $user['char_region_town_name'];
$user['title'] = $user['class']['location']->get_town_name();
if ($user['char_life_cur'] > 0)
$user['description'] = $user['class']['location']->get_town_description();
else $user['class']['location']->shades();
$user['links'] = array();
if ($user['char_life_cur'] > 0) {
$user['class']['location']->go_to_the_gate('Покинуть '.$user['char_region_town_name']);
$user['class']['location']->go_to_the_gate('Покинуть '.$user['title']);
Location::addlink('Посетить Таверну', 'index.php?action=tavern', 1);
Location::addlink('Отправиться в Банк', 'index.php?action=bank', 2);
Location::addlink('Идти в Магическую Башню', 'index.php?action=magictower', 3);
Expand Down

0 comments on commit 3425e09

Please sign in to comment.