Skip to content

Commit

Permalink
Adodb -> PDO, and removal of start_* variables (simplify and improve …
Browse files Browse the repository at this point in the history 
…consistency)
  • Loading branch information
@thekabal
thekabal committed Jul 10, 2017
1 parent 2399a8d commit cbe6433
Show file tree
Hide file tree
Showing 19 changed files with 157 additions and 85 deletions.
5 changes: 3 additions & 2 deletions attack.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -621,8 +621,9 @@
"ship_energy = ?, ship_colonists = 0, ship_fighters = 100, dev_warpedit = 0, dev_genesis = 0, dev_beacon = 0, dev_emerwarp = 0, " .
"dev_escapepod = 'N', dev_fuelscoop = 'N', dev_minedeflector = 0, on_planet = 'N', rating = ?, cleared_defenses = ' ', " .
"dev_lssd = 'N' WHERE ship_id = ?;",
array($tkireg->start_energy, $rating, $targetinfo['ship_id'])
array(100, $rating, $targetinfo['ship_id'])
);

Tki\Db::LogDbErrors($pdo_db, $resx, __LINE__, __FILE__);
Tki\PlayerLog::WriteLog($pdo_db, $targetinfo['ship_id'], \Tki\LogEnums::ATTACK_LOSE, "$playerinfo[character_name]|Y");
Tki\Bounty::collect($pdo_db, $langvars, $playerinfo['ship_id'], $targetinfo['ship_id']);
Expand Down Expand Up @@ -793,7 +794,7 @@
"ship_colonists = 0, ship_fighters = 100, dev_warpedit = 0, dev_genesis = 0, dev_beacon = 0, dev_emerwarp = 0, dev_escapepod = 'N', " .
"dev_fuelscoop = 'N', dev_minedeflector = 0, on_planet = 'N', rating = ?, dev_lssd = 'N' " .
"WHERE ship_id = ?",
array($tkireg->start_energy, $rating, $playerinfo['ship_id'])
array(100, $rating, $playerinfo['ship_id'])
);
Tki\Db::LogDbErrors($pdo_db, $resx, __LINE__, __FILE__);
Tki\Bounty::collect($pdo_db, $langvars, $targetinfo['ship_id'], $playerinfo['ship_id']);
Expand Down
2 changes: 1 addition & 1 deletion check_mines.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@
{
$rating = round($playerinfo['rating'] / 2);
echo $langvars['l_chm_luckescapepod'] . "<br><br>";
$resx = $db->Execute("UPDATE {$db->prefix}ships SET hull=0, engines=0, power=0, sensors=0, computer=0, beams=0, torp_launchers=0, torps=0, armor=0, armor_pts=100, cloak=0, shields=0, sector=1, ship_organics=0, ship_ore=0, ship_goods=0, ship_energy=?, ship_colonists=0, ship_fighters=100, dev_warpedit=0, dev_genesis=0, dev_beacon=0, dev_emerwarp=0, dev_escapepod='N', dev_fuelscoop='N', dev_minedeflector=0, on_planet='N', rating=?, cleared_defenses=' ', dev_lssd='N' WHERE ship_id=?", array($tkireg->start_energy, $rating, $playerinfo['ship_id']));
$resx = $db->Execute("UPDATE {$db->prefix}ships SET hull=0, engines=0, power=0, sensors=0, computer=0, beams=0, torp_launchers=0, torps=0, armor=0, armor_pts=100, cloak=0, shields=0, sector=1, ship_organics=0, ship_ore=0, ship_goods=0, ship_energy=?, ship_colonists=0, ship_fighters=100, dev_warpedit=0, dev_genesis=0, dev_beacon=0, dev_emerwarp=0, dev_escapepod='N', dev_fuelscoop='N', dev_minedeflector=0, on_planet='N', rating=?, cleared_defenses=' ', dev_lssd='N' WHERE ship_id=?", array(100, $rating, $playerinfo['ship_id']));
Tki\Db::LogDbErrors($pdo_db, $resx, __LINE__, __FILE__);
Tki\Bounty::cancel($pdo_db, $playerinfo['ship_id']);
}
Expand Down
4 changes: 1 addition & 3 deletions classes/Combat.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -491,16 +491,14 @@ public static function shipToShip(\PDO $pdo_db, array $langvars, int $ship_id, R

$sql = "UPDATE ::prefix::ships SET hull = 0, engines = 0, power = 0, sensors = 0, computer = 0, beams = 0, torp_launchers = 0, ";
$sql .= "torps = 0, armor = 0, armor_pts = 100, cloak = 0, shields = 0, sector = 1, ship_organics = 0, ship_ore = 0, ";
$sql .= "ship_goods = 0, ship_energy = :start_energy, ship_colonists = 0, ship_fighters = 100, dev_warpedit = 0, dev_genesis = 0, ";
$sql .= "ship_goods = 0, ship_energy = 100, ship_colonists = 0, ship_fighters = 100, dev_warpedit = 0, dev_genesis = 0, ";
$sql .= "dev_beacon = 0, dev_emerwarp = 0, dev_escapepod = 'N', dev_fuelscoop = 'N', dev_minedeflector = 0, on_planet = 'N', ";
$sql .= "rating = :rating, dev_lssd='N' WHERE ship_id = :ship_id";
$stmt = $pdo_db->prepare($sql);
$stmt->bindParam(':start_energy', $tkireg->start_energy, \PDO::PARAM_INT);
$stmt->bindParam(':rating', $rating, \PDO::PARAM_INT);
$stmt->bindParam(':ship_id', $targetinfo['ship_id'], \PDO::PARAM_INT);
$update = $stmt->execute();
\Tki\Db::logDbErrors($pdo_db, $update, __LINE__, __FILE__);

\Tki\PlayerLog::writeLog($pdo_db, $targetinfo['ship_id'], LogEnums::ATTACK_LOSE, "$playerinfo[character_name]|Y");
\Tki\Bounty::collect($pdo_db, $langvars, $playerinfo['ship_id'], $targetinfo['ship_id']);
}
Expand Down
9 changes: 3 additions & 6 deletions classes/PlanetCombat.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,6 @@ public static function prime(\PDO $pdo_db, $db, string $lang, array $langvars, R
$attackertorps = round(pow($tkireg->level_factor, $playerinfo['torp_launchers'])) * 2;
$attackerarmor = $playerinfo['armor_pts'];

// Now modify player beams, shields and torpedos on available materiel
$tkireg->start_energy = $playerinfo['ship_energy'];

// Beams
if ($attackerbeams > $playerinfo['ship_energy'])
{
Expand Down Expand Up @@ -403,7 +400,7 @@ public static function prime(\PDO $pdo_db, $db, string $lang, array $langvars, R
if ($playerinfo['dev_escapepod'] == "Y")
{
echo "<center><font color='white'>" . $langvars['l_cmb_escapepod'] . "</font></center><br><br>";
$resx = $db->Execute("UPDATE {$db->prefix}ships SET hull=0,engines=0,power=0,sensors=0,computer=0,beams=0,torp_launchers=0,torps=0,armor=0,armor_pts=100,cloak=0,shields=0,sector=1,ship_organics=0,ship_ore=0,ship_goods=0,ship_energy = ?,ship_colonists=0,ship_fighters=100,dev_warpedit=0,dev_genesis=0,dev_beacon=0,dev_emerwarp=0,dev_escapepod='N',dev_fuelscoop='N',dev_minedeflector=0,on_planet='N',dev_lssd='N' WHERE ship_id = ?;", array($tkireg->start_energy, $playerinfo['ship_id']));
$resx = $db->Execute("UPDATE {$db->prefix}ships SET hull=0,engines=0,power=0,sensors=0,computer=0,beams=0,torp_launchers=0,torps=0,armor=0,armor_pts=100,cloak=0,shields=0,sector=1,ship_organics=0,ship_ore=0,ship_goods=0,ship_energy = ?,ship_colonists=0,ship_fighters=100,dev_warpedit=0,dev_genesis=0,dev_beacon=0,dev_emerwarp=0,dev_escapepod='N',dev_fuelscoop='N',dev_minedeflector=0,on_planet='N',dev_lssd='N' WHERE ship_id = ?;", array(100, $playerinfo['ship_id']));
\Tki\Db::logDbErrors($pdo_db, $resx, __LINE__, __FILE__);
\Tki\Bounty::collect($pdo_db, $langvars, $planetinfo['owner'], $playerinfo['ship_id']);
}
Expand Down Expand Up @@ -442,9 +439,9 @@ public static function prime(\PDO $pdo_db, $db, string $lang, array $langvars, R
$langvars['l_cmb_youlostarmorpoints'] = str_replace("[cmb_attackerarmor]", $attackerarmor, $langvars['l_cmb_youlostarmorpoints']);
echo $langvars['l_cmb_youlostarmorpoints'] . "<br>";
$energy = $playerinfo['ship_energy'];
$energy_lost = $tkireg->start_energy - $playerinfo['ship_energy'];
$energy_lost = 100 - $playerinfo['ship_energy'];
$langvars['l_cmb_energyused'] = str_replace("[cmb_energy_lost]", $energy_lost, $langvars['l_cmb_energyused']);
$langvars['l_cmb_energyused'] = str_replace("[cmb_playerinfo_ship_energy]", $tkireg->start_energy, $langvars['l_cmb_energyused']);
$langvars['l_cmb_energyused'] = str_replace("[cmb_playerinfo_ship_energy]", 100, $langvars['l_cmb_energyused']);
echo $langvars['l_cmb_energyused'] . "<br></center>";
$resx = $db->Execute("UPDATE {$db->prefix}ships SET ship_energy = ?, ship_fighters = ship_fighters - ?, torps = torps - ?, armor_pts = armor_pts - ?, rating = rating - ? WHERE ship_id = ?;", array($energy, $fighters_lost, $attackertorps, $armor_lost, $rating_change, $playerinfo['ship_id']));
\Tki\Db::logDbErrors($pdo_db, $resx, __LINE__, __FILE__);
Expand Down
14 changes: 0 additions & 14 deletions classes/Reg.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,19 +158,6 @@
* @property mixed sched_ticks
* @property mixed sched_turns
* @property mixed space_plague_kills
* @property mixed start_armor
* @property mixed start_beacon
* @property mixed start_credits
* @property mixed start_editors
* @property mixed start_emerwarp
* @property mixed start_energy
* @property mixed start_escape_pod
* @property mixed start_fighters
* @property mixed start_genesis
* @property mixed start_lssd
* @property mixed start_minedeflectors
* @property mixed start_scoop
* @property mixed start_turns
* @property mixed starvation_death_rate
* @property mixed team_planet_transfers
* @property mixed tkitimer
Expand All @@ -183,7 +170,6 @@
* @property mixed upgrade_factor
* @property mixed kabal_aggression
* @property mixed kabal_planets
* @property mixed kabal_start_credits
* @property mixed kabal_unemployment
*
*/
Expand Down
16 changes: 0 additions & 16 deletions config/classic_config.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,21 +54,6 @@ allow_genesis_destroy = false; // Allow players
allow_sofa = false; // Allow the sub-orbital fighter sofa attack in this game?
allow_ksm = true; // Allow the known space map in this game?
[STARTING_VALUES]
start_fighters = 10; // The amount of fighters on the ship the player starts with
start_armor = 10; // The armor a player starts with
start_credits = 1000; // The credits a player starts the game with
start_energy = 100; // The amount of energy on the ship the player starts with
start_turns = 1200; // The number of turns all players are given at the start of the game
start_lssd = 'N'; // Do ships start with an lssd ?
start_editors = 0; // Starting warp editors
start_minedeflectors = 0; // Start mine deflectors
start_emerwarp = 0; // Start emergency warp units
start_beacon = 0; // Start space_beacons
start_genesis = 0; // Starting genesis torps
start_escape_pod = 'N'; // Start game equipped with escape pod?
start_scoop = 'N'; // Start game equipped with fuel scoop?
[IBANK]
ibank_interest = '0.0003'; // Interest rate for account funds - Note that this is calculated every system update
ibank_paymentfee = '0.05'; // Paymentfee
Expand Down Expand Up @@ -181,7 +166,6 @@ fullscan_cost = 1; // The cost in tu
scan_error_factor = 20; // The percentage added to the comparison of cloak to sensors to determne the possibility of error

[KABAL_CODE]
kabal_start_credits = 1000000; // What Kabal start with
kabal_unemployment = 100000; // Amount of credits each kabal receive on each kabal tick
kabal_aggression = 100; // Percent of kabal that are aggressive or hostile
kabal_planets = 5; // Percent of created kabal that will own planets. Recommended to keep at small percentage
Expand Down
11 changes: 6 additions & 5 deletions create_universe/80.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,15 +241,16 @@
$stmt->bindParam(':password', $admin_hashed_pw, \PDO::PARAM_STR);
$stmt->bindParam(':recovery_time', $admin_recovery_time, \PDO::PARAM_NULL);
$stmt->bindParam(':email', $tkireg->admin_mail, PDO::PARAM_STR);
$stmt->bindParam(':turns', $tkireg->start_turns, \PDO::PARAM_INT);
$stmt->bindParam(':armor_pts', $tkireg->start_armor, \PDO::PARAM_INT);
$stmt->bindParam(':credits', $tkireg->start_credits, \PDO::PARAM_INT);
$stmt->bindParam(':turns', 1200, \PDO::PARAM_INT);
$stmt->bindParam(':armor_pts', 10, \PDO::PARAM_INT);
$stmt->bindParam(':credits', 1000, \PDO::PARAM_INT);
$stmt->bindParam(':sector', $admin_sector, \PDO::PARAM_INT);
$stmt->bindParam(':ship_energy', $tkireg->start_energy, \PDO::PARAM_INT);
$stmt->bindParam(':ship_fighters', $tkireg->start_fighters, \PDO::PARAM_INT);
$stmt->bindParam(':ship_energy', 100, \PDO::PARAM_INT);
$stmt->bindParam(':ship_fighters', 10, \PDO::PARAM_INT);
$stmt->bindParam(':last_login', $admin_last_login, \PDO::PARAM_STR);
$stmt->bindParam(':ip_address', $admin_ip, \PDO::PARAM_INT);
$stmt->bindParam(':lang', $tkireg->default_lang, \PDO::PARAM_STR);

$resxx = $stmt->execute();
$variables['admin_account_results']['result'] = Tki\Db::logDbErrors($pdo_db, $resxx, __LINE__, __FILE__);
$variables['admin_mail'] = $tkireg->admin_mail;
Expand Down
2 changes: 1 addition & 1 deletion info_publiclist.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
$res->MoveNext();
}

$info['G-TURNS-START'] = $tkireg->start_turns;
$info['G-TURNS-START'] = 1200;
$info['G-TURNS-MAX'] = $tkireg->max_turns;

$info['G-SCHED-TICKS'] = $tkireg->sched_ticks;
Expand Down
2 changes: 1 addition & 1 deletion kabal_control.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,7 @@

// Add kabal record to ships table ... modify if the ships schema changes
$thesql = "INSERT INTO {$db->prefix}ships ( `ship_id` , `ship_name` , `ship_destroyed` , `character_name` , `password` , `email` , `hull` , `engines` , `power` , `computer` , `sensors` , `beams` , `torp_launchers` , `torps` , `shields` , `armor` , `armor_pts` , `cloak` , `credits` , `sector` , `ship_ore` , `ship_organics` , `ship_goods` , `ship_energy` , `ship_colonists` , `ship_fighters` , `ship_damage` , `turns` , `on_planet` , `dev_warpedit` , `dev_genesis` , `dev_beacon` , `dev_emerwarp` , `dev_escapepod` , `dev_fuelscoop` , `dev_minedeflector` , `turns_used` , `last_login` , `rating` , `score` , `team` , `team_invite` , `interface` , `ip_address` , `planet_id` , `trade_colonists` , `trade_fighters` , `trade_torps` , `trade_energy` , `cleared_defenses` , `lang` , `dev_lssd` )
VALUES (NULL,'$shipname','N','$character','$makepass','$emailname',$kaballevel,$kaballevel,$kaballevel,$kaballevel,$kaballevel,$kaballevel,$kaballevel,$maxtorps,$kaballevel,$kaballevel,$maxarmor,$kaballevel,$start_credits,$sector,0,0,0,$maxenergy,0,$maxfighters,0,$start_turns,'N',0,0,0,0,'N','N',0,0, '$stamp',0,0,0,0,'N','127.0.0.1',0,'Y','N','N','Y',NULL,'$default_lang','Y')";
VALUES (NULL,'$shipname','N','$character','$makepass','$emailname',$kaballevel,$kaballevel,$kaballevel,$kaballevel,$kaballevel,$kaballevel,$kaballevel,$maxtorps,$kaballevel,$kaballevel,$maxarmor,$kaballevel,1000,$sector,0,0,0,$maxenergy,0,$maxfighters,0,1200,'N',0,0,0,0,'N','N',0,0, '$stamp',0,0,0,0,'N','127.0.0.1',0,'Y','N','N','Y',NULL,'$default_lang','Y')";
$result2 = $db->Execute($thesql);
Tki\Db::LogDbErrors($pdo_db, $result2, __LINE__, __FILE__);
if (!$result2)
Expand Down
Loading

0 comments on commit cbe6433

Please sign in to comment.