Skip to content

Commit f7c3721

Browse files
small code changes
1 parent e7e3372 commit f7c3721

File tree

3 files changed

+17
-13
lines changed

3 files changed

+17
-13
lines changed

hero.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,14 @@ class buildHeroClass extends Hero {
115115

116116
public function buildHero(){
117117
$db = new DataBase;
118-
$heroDB = $db->runQuery('SELECT * FROM hero where id=1');
119-
$statsHero = $db->runQuery('SELECT * FROM `attributes_max_min` WHERE subject_type="hero" and subject_id='.$heroDB[0]['id']);
118+
$heroDB = $db->runQuery(
119+
'SELECT * FROM hero where id=1'
120+
);
121+
$statsHero = $db->runQuery(
122+
'SELECT *
123+
FROM `attributes_max_min`
124+
WHERE subject_type="hero" and subject_id='.$heroDB[0]['id']
125+
);
120126
$stats = $this->getDBStats($statsHero);
121127
$this->setId($heroDB[0]['id']);
122128
$this->setLevel($heroDB[0]['level']);

index.php

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,8 @@
3636
$_SESSION['battle_logs'] = Logger::getInstance();
3737
}
3838

39-
4039
$results = $game->figth($_SESSION['hero'], $_SESSION['monster'], $_SESSION['turn'], $_SESSION['turnCounter'], $_SESSION['battle_logs']);
4140

42-
43-
// [$hero, $monster, $turn, $stop_battle, $turnCounter, $log_pass];
4441
$_SESSION['hero'] = $results[0];
4542
$_SESSION['monster'] = $results[1];
4643
$_SESSION['turn'] = $results[2];
@@ -53,26 +50,25 @@
5350
<div id='first'>
5451
<?php
5552

56-
// echo 'Hero: '.$_SESSION['hero']->id.' </br>';
5753
echo 'Hero: '.$_SESSION['hero']->getName().'</br>';
5854
echo 'Health: '.$_SESSION['hero']->getStats()[0]['max'].' - '.$_SESSION['hero']->getStats()[0]['min'].' "from interval value set" '.$_SESSION['hero']->getHealth(). '</br>';
5955
echo 'Strength: '.$_SESSION['hero']->getStats()[1]['max'].' - '.$_SESSION['hero']->getStats()[1]['min'].' "from interval value set" '.$_SESSION['hero']->getStrength(). '</br>';
6056
echo 'Defence: '.$_SESSION['hero']->getStats()[2]['max'].' - '.$_SESSION['hero']->getStats()[2]['min'].' "from interval value set" '.$_SESSION['hero']->getDefence(). '</br>';
6157
echo 'Speed: '.$_SESSION['hero']->getStats()[3]['max'].' - '.$_SESSION['hero']->getStats()[3]['min'].' "from interval value set" '.$_SESSION['hero']->getSpeed(). '</br>';
6258
echo 'Luck: '.$_SESSION['hero']->getStats()[4]['max'].' - '.$_SESSION['hero']->getStats()[4]['min'].' "from interval value set" '.$_SESSION['hero']->getLuck(). '</br>';
63-
// var_dump($_SESSION['hero']->getStats());
59+
6460
?>
6561
</div>
6662
<div id='second'>
6763
<?php
68-
// echo 'Hero: '.$_SESSION['hero']->id.' </br>';
64+
6965
echo 'Monster: '.$_SESSION['monster']->getName().'</br>';
7066
echo 'Health: '.$_SESSION['monster']->getStats()[0]['max'].' - '.$_SESSION['monster']->getStats()[0]['min'].' "from interval value set" '.$_SESSION['monster']->getHealth(). '</br>';
7167
echo 'Strength: '.$_SESSION['monster']->getStats()[1]['max'].' - '.$_SESSION['monster']->getStats()[1]['min'].' "from interval value set" '.$_SESSION['monster']->getStrength(). '</br>';
7268
echo 'Defence: '.$_SESSION['monster']->getStats()[2]['max'].' - '.$_SESSION['monster']->getStats()[2]['min'].' "from interval value set" '.$_SESSION['monster']->getDefence(). '</br>';
7369
echo 'Speed: '.$_SESSION['monster']->getStats()[3]['max'].' - '.$_SESSION['monster']->getStats()[3]['min'].' "from interval value set" '.$_SESSION['monster']->getSpeed(). '</br>';
7470
echo 'Luck: '.$_SESSION['monster']->getStats()[4]['max'].' - '.$_SESSION['monster']->getStats()[4]['min'].' "from interval value set" '.$_SESSION['monster']->getLuck(). '</br>';
75-
// var_dump('Monster ', $_SESSION['monster']);
71+
7672
?>
7773
</div>
7874
</div>

monster.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,13 @@ function setStats($stats){
112112
class buildMonsterClass {
113113

114114
public function buildMonster($id = 1){
115-
$query_monster = 'SELECT * FROM monster where id=' . $id;
116115
$db = new DataBase;
117-
$monsterDB = $db->runQuery($query_monster);
118-
$query_attributes = 'SELECT * FROM `attributes_max_min` WHERE subject_type="monster" and subject_id=' . $monsterDB[0]['id'];
119-
$statsMonster = $db->runQuery($query_attributes);
116+
$monsterDB = $db->runQuery(
117+
'SELECT * FROM monster where id=' . $id
118+
);
119+
$statsMonster = $db->runQuery(
120+
'SELECT * FROM `attributes_max_min` WHERE subject_type="monster" and subject_id=' . $monsterDB[0]['id']
121+
);
120122
$stats = $this->getDBStats($statsMonster);
121123
$monster = new Monster(
122124
$monsterDB[0]['id'],

0 commit comments

Comments
 (0)