From 506334a0ae62e1289e10c0e94c3da0aa1880d893 Mon Sep 17 00:00:00 2001 From: Adam Jordanek Date: Mon, 19 Mar 2018 22:50:38 +0100 Subject: [PATCH 01/33] Fix: Rec --- includes/pages/game/ShowFleetAjaxPage.class.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/includes/pages/game/ShowFleetAjaxPage.class.php b/includes/pages/game/ShowFleetAjaxPage.class.php index 006a815b9..68a1b3af6 100644 --- a/includes/pages/game/ShowFleetAjaxPage.class.php +++ b/includes/pages/game/ShowFleetAjaxPage.class.php @@ -1,7 +1,7 @@ returnData['ships'][$elementID] = $PLANET[$resource[$elementID]] - $shipsNeed; @@ -217,4 +218,4 @@ public function show() $this->sendData(600, $LNG['fa_sending']." ".array_sum($fleetArray)." ". $LNG['tech'][$shipID[0]] ." ".$LNG['gl_to']." ".$targetData['galaxy'].":".$targetData['system'].":".$targetData['planet']." ..."); } -} \ No newline at end of file +} From 1cd2b77f21351cfea64a3d0f5fd7863804dba476 Mon Sep 17 00:00:00 2001 From: Adam Jordanek Date: Tue, 20 Mar 2018 22:04:21 +0100 Subject: [PATCH 02/33] Remove sorting of the Battle Hall --- .../pages/game/ShowBattleHallPage.class.php | 23 +++---------------- .../game/page.battleHall.default.tpl | 6 ++--- 2 files changed, 6 insertions(+), 23 deletions(-) diff --git a/includes/pages/game/ShowBattleHallPage.class.php b/includes/pages/game/ShowBattleHallPage.class.php index 5b97750c7..cb31d37ee 100644 --- a/includes/pages/game/ShowBattleHallPage.class.php +++ b/includes/pages/game/ShowBattleHallPage.class.php @@ -1,7 +1,7 @@ select($sql, array( ':universe' => Universe::current() @@ -79,10 +64,8 @@ function show() $this->assign(array( 'TopKBList' => $TopKBList, - 'sort' => $sort, - 'order' => $order, )); $this->display('page.battleHall.default.tpl'); } -} \ No newline at end of file +} diff --git a/styles/templates/game/page.battleHall.default.tpl b/styles/templates/game/page.battleHall.default.tpl index da151ba76..9c7d2b09d 100644 --- a/styles/templates/game/page.battleHall.default.tpl +++ b/styles/templates/game/page.battleHall.default.tpl @@ -11,8 +11,8 @@ {$LNG.tkb_platz} {$LNG.tkb_owners} - {$LNG.tkb_datum} - {$LNG.tkb_units} + {$LNG.tkb_datum} + {$LNG.tkb_units} {foreach $TopKBList as $row} @@ -34,4 +34,4 @@ {$LNG.tkb_legende}{$LNG.tkb_gewinner}{$LNG.tkb_verlierer} -{/block} \ No newline at end of file +{/block} From 3282d4e88d839ee778fd13e14ff06e1136f225e6 Mon Sep 17 00:00:00 2001 From: Adam Jordanek Date: Tue, 20 Mar 2018 23:39:36 +0100 Subject: [PATCH 03/33] Research: Check all planets --- .../pages/game/ShowResearchPage.class.php | 131 ++++++++++-------- 1 file changed, 70 insertions(+), 61 deletions(-) diff --git a/includes/pages/game/ShowResearchPage.class.php b/includes/pages/game/ShowResearchPage.class.php index 6718e4ef7..ae94dc45d 100644 --- a/includes/pages/game/ShowResearchPage.class.php +++ b/includes/pages/game/ShowResearchPage.class.php @@ -1,7 +1,7 @@ select($sql, array( + ':owner' => $USER['id'], + )); + + foreach ($planets as $planet) + { + if ($planet['b_building'] == 0) + continue; + + $CurrentQueue = unserialize($planet['b_building_id']); + foreach($CurrentQueue as $ListIDArray) { + if($ListIDArray[0] == 6 || $ListIDArray[0] == 31) + return false; + } } return true; } - + private function CancelBuildingFromQueue() { global $PLANET, $USER, $resource; @@ -59,7 +68,7 @@ private function CancelBuildingFromQueue() $elementId = $USER['b_tech_id']; $costResources = BuildFunctions::getElementPrice($USER, $PLANET, $elementId, false, $USER[$resource[$elementId]] + 1); - + if($PLANET['id'] == $USER['b_tech_planet']) { if(isset($costResources[901])) { $PLANET[$resource[901]] += $costResources[901]; } @@ -88,9 +97,9 @@ private function CancelBuildingFromQueue() $db->update($sql, $params); } - + if(isset($costResources[921])) { $USER[$resource[921]] += $costResources[921]; } - + $USER['b_tech_id'] = 0; $USER['b_tech'] = 0; $USER['b_tech_planet'] = 0; @@ -109,7 +118,7 @@ private function CancelBuildingFromQueue() { if($elementId == $ListIDArray[0] || empty($ListIDArray[0])) continue; - + if($ListIDArray[4] != $PLANET['id']) { $sql = "SELECT :resource6, :resource31, id FROM %%PLANETS%% WHERE id = :id;"; $CPLANET = $db->selectSingle($sql, array( @@ -119,13 +128,13 @@ private function CancelBuildingFromQueue() )); } else $CPLANET = $PLANET; - + $CPLANET[$resource[31].'_inter'] = $this->ecoObj->getNetworkLevel($USER, $CPLANET); $BuildEndTime += BuildFunctions::getBuildingTime($USER, $CPLANET, $ListIDArray[0], NULL, false, $ListIDArray[1]); $ListIDArray[3] = $BuildEndTime; - $NewCurrentQueue[] = $ListIDArray; + $NewCurrentQueue[] = $ListIDArray; } - + if(!empty($NewCurrentQueue)) { $USER['b_tech'] = TIMESTAMP; $USER['b_tech_queue'] = serialize($NewCurrentQueue); @@ -144,7 +153,7 @@ private function CancelBuildingFromQueue() private function RemoveBuildingFromQueue($QueueID) { global $USER, $PLANET, $resource; - + $CurrentQueue = unserialize($USER['b_tech_queue']); if ($QueueID <= 1 || empty($CurrentQueue)) { @@ -161,13 +170,13 @@ private function RemoveBuildingFromQueue($QueueID) { return false; } - + $elementId = $CurrentQueue[$QueueID - 2][0]; $BuildEndTime = $CurrentQueue[$QueueID - 2][3]; unset($CurrentQueue[$QueueID - 1]); $NewCurrentQueue = array(); foreach($CurrentQueue as $ID => $ListIDArray) - { + { if ($ID < $QueueID - 1) { $NewCurrentQueue[] = $ListIDArray; } else { @@ -185,15 +194,15 @@ private function RemoveBuildingFromQueue($QueueID) )); } else $CPLANET = $PLANET; - + $CPLANET[$resource[31].'_inter'] = $this->ecoObj->getNetworkLevel($USER, $CPLANET); - + $BuildEndTime += BuildFunctions::getBuildingTime($USER, $CPLANET, NULL, $ListIDArray[0]); $ListIDArray[3] = $BuildEndTime; - $NewCurrentQueue[] = $ListIDArray; + $NewCurrentQueue[] = $ListIDArray; } } - + if(!empty($NewCurrentQueue)) $USER['b_tech_queue'] = serialize($NewCurrentQueue); else @@ -215,14 +224,14 @@ private function AddBuildingToQueue($elementId, $AddMode = true) } $CurrentQueue = unserialize($USER['b_tech_queue']); - + if (!empty($CurrentQueue)) { $ActualCount = count($CurrentQueue); } else { $CurrentQueue = array(); $ActualCount = 0; } - + if(Config::get()->max_elements_tech != 0 && Config::get()->max_elements_tech <= $ActualCount) { return false; @@ -237,20 +246,20 @@ private function AddBuildingToQueue($elementId, $AddMode = true) } $costResources = BuildFunctions::getElementPrice($USER, $PLANET, $elementId, !$AddMode, $BuildLevel); - + if(!BuildFunctions::isElementBuyable($USER, $PLANET, $elementId, $costResources)) { return false; } - + if(isset($costResources[901])) { $PLANET[$resource[901]] -= $costResources[901]; } if(isset($costResources[902])) { $PLANET[$resource[902]] -= $costResources[902]; } if(isset($costResources[903])) { $PLANET[$resource[903]] -= $costResources[903]; } if(isset($costResources[921])) { $USER[$resource[921]] -= $costResources[921]; } - + $elementTime = BuildFunctions::getBuildingTime($USER, $PLANET, $elementId, $costResources); $BuildEndTime = TIMESTAMP + $elementTime; - + $USER['b_tech_queue'] = serialize(array(array($elementId, $BuildLevel, $elementTime, $BuildEndTime, $PLANET['id']))); $USER['b_tech'] = $BuildEndTime; $USER['b_tech_id'] = $elementId; @@ -261,19 +270,19 @@ private function AddBuildingToQueue($elementId, $AddMode = true) { if($QueueSubArray[0] != $elementId) continue; - + $addLevel++; } - + $BuildLevel += $addLevel; - + if($pricelist[$elementId]['max'] < $BuildLevel) { return false; } - + $elementTime = BuildFunctions::getBuildingTime($USER, $PLANET, $elementId, NULL, !$AddMode, $BuildLevel); - + $BuildEndTime = $CurrentQueue[$ActualCount - 1][3] + $elementTime; $CurrentQueue[] = array($elementId, $BuildLevel, $elementTime, $BuildEndTime, $PLANET['id']); $USER['b_tech_queue'] = serialize($CurrentQueue); @@ -287,52 +296,52 @@ private function getQueueData() $scriptData = array(); $quickinfo = array(); - + if ($USER['b_tech'] == 0) return array('queue' => $scriptData, 'quickinfo' => $quickinfo); - + $CurrentQueue = unserialize($USER['b_tech_queue']); - + foreach($CurrentQueue as $BuildArray) { if ($BuildArray[3] < TIMESTAMP) continue; - + $PlanetName = ''; - + $quickinfo[$BuildArray[0]] = $BuildArray[1]; - + if($BuildArray[4] != $PLANET['id']) $PlanetName = $USER['PLANETS'][$BuildArray[4]]['name']; - + $scriptData[] = array( - 'element' => $BuildArray[0], - 'level' => $BuildArray[1], - 'time' => $BuildArray[2], - 'resttime' => ($BuildArray[3] - TIMESTAMP), - 'destroy' => ($BuildArray[4] == 'destroy'), + 'element' => $BuildArray[0], + 'level' => $BuildArray[1], + 'time' => $BuildArray[2], + 'resttime' => ($BuildArray[3] - TIMESTAMP), + 'destroy' => ($BuildArray[4] == 'destroy'), 'endtime' => _date('U', $BuildArray[3], $USER['timezone']), 'display' => _date($LNG['php_tdformat'], $BuildArray[3], $USER['timezone']), 'planet' => $PlanetName, ); } - + return array('queue' => $scriptData, 'quickinfo' => $quickinfo); } public function show() { global $PLANET, $USER, $LNG, $resource, $reslist, $pricelist; - + if ($PLANET[$resource[31]] == 0) { $this->printMessage($LNG['bd_lab_required']); } - + $TheCommand = HTTP::_GP('cmd',''); $elementId = HTTP::_GP('tech', 0); $ListID = HTTP::_GP('listid', 0); - - $PLANET[$resource[31].'_inter'] = ResourceUpdate::getNetworkLevel($USER, $PLANET); + + $PLANET[$resource[31].'_inter'] = ResourceUpdate::getNetworkLevel($USER, $PLANET); if(!empty($TheCommand) && $_SERVER['REQUEST_METHOD'] === 'POST' && $USER['urlaubs_modus'] == 0) { @@ -351,12 +360,12 @@ public function show() $this->AddBuildingToQueue($elementId, false); break; } - + $this->redirectTo('game.php?page=research'); } - + $bContinue = $this->CheckLabSettingsInQueue($PLANET); - + $queueData = $this->getQueueData(); $TechQueue = $queueData['queue']; $QueueCount = count($TechQueue); @@ -366,7 +375,7 @@ public function show() { if (!BuildFunctions::isTechnologieAccessible($USER, $PLANET, $elementId)) continue; - + if(isset($queueData['quickinfo'][$elementId])) { $levelToBuild = $queueData['quickinfo'][$elementId]; @@ -375,7 +384,7 @@ public function show() { $levelToBuild = $USER[$resource[$elementId]]; } - + $costResources = BuildFunctions::getElementPrice($USER, $PLANET, $elementId, false, $levelToBuild+1); $costOverflow = BuildFunctions::getRestPrice($USER, $PLANET, $elementId, $costResources); $elementTime = BuildFunctions::getBuildingTime($USER, $PLANET, $elementId, $costResources); @@ -392,14 +401,14 @@ public function show() 'levelToBuild' => $levelToBuild, ); } - + $this->assign(array( 'ResearchList' => $ResearchList, 'IsLabinBuild' => !$bContinue, 'IsFullQueue' => Config::get()->max_elements_tech == 0 || Config::get()->max_elements_tech == count($TechQueue), 'Queue' => $TechQueue, )); - + $this->display('page.research.default.tpl'); } } From abf198dc82e951049be152f95fb5a89435e51cfa Mon Sep 17 00:00:00 2001 From: mys Date: Wed, 21 Mar 2018 20:36:24 +0100 Subject: [PATCH 04/33] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 18c61d637..43a98ce88 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ SteemNova expansion goes as follows: 3. Game manual and tips & tricks for newbies. 4. ~~Specify detailed explanation how the reward system will work~~. (https://steemit.com/steemnova/@steemnova/steemnova-weekly-sbd-reward-scheme-for-members-of-the-best-alliances) 5. Announce bug bounties, artwork contests and utopian-io task requests for contributors (mobile UI, visual bugs etc.). -6. Steem accounts integration. +6. ~~Steem accounts integration.~~ (https://github.com/steemnova/steemnova/pull/67) ## Local installation From 920164078367aa58bcad9c8e9aafe11aa8724e89 Mon Sep 17 00:00:00 2001 From: Rishi556 Date: Thu, 22 Mar 2018 07:00:59 -0500 Subject: [PATCH 05/33] Update INGAME.php --- language/en/INGAME.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/language/en/INGAME.php b/language/en/INGAME.php index 5c755e94f..4db6e618f 100644 --- a/language/en/INGAME.php +++ b/language/en/INGAME.php @@ -1016,7 +1016,7 @@ $LNG['market_info_description'] = "Left side - sale offers | Right side - buy amount

• Bought offers cannot be canceled •
• Players are allowed to trade for any exchange rate (ratio) •"; $LNG['market_p_msg_not_found'] = 'Offer not found.'; -$LNG['market_p_msg_more_ships_is_needed'] = 'More ships is needed.'; +$LNG['market_p_msg_more_ships_is_needed'] = 'More ships are needed.'; $LNG['market_p_msg_resources_error'] = 'Not enough resources.'; $LNG['market_p_msg_sent'] = 'Sent %s Light Cargos, %s Heavy Cargos'; From 5514bd94957b74e6a5216e876af84f2b038350f4 Mon Sep 17 00:00:00 2001 From: DeanLogic Date: Thu, 22 Mar 2018 20:54:48 -0400 Subject: [PATCH 06/33] Update INGAME.php --- language/en/INGAME.php | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/language/en/INGAME.php b/language/en/INGAME.php index 5c755e94f..caca8c204 100644 --- a/language/en/INGAME.php +++ b/language/en/INGAME.php @@ -109,11 +109,11 @@ //----------------------------------------------------------------------------// // Vista Geral -$LNG['ov_newname_specialchar'] = 'The names of the planet is allowed only numbers, letters, spaces, _,-,.'; +$LNG['ov_newname_specialchar'] = 'For names of planets, use only numbers, letters, spaces, _,-,.'; $LNG['ov_newname_done'] = 'The new name was entered!'; $LNG['ov_planet_abandoned'] = 'The planet was destroyed!'; $LNG['ov_principal_planet_cant_abanone'] = 'You can not delete the main planet!'; -$LNG['ov_abandon_planet_not_possible'] = 'The planet cannot be erased, by having existing activities!'; +$LNG['ov_abandon_planet_not_possible'] = 'The planet cannot be erased, it currenty has existing activities!'; $LNG['ov_wrong_pass'] = 'Password incorrect!'; $LNG['ov_have_new_message'] = 'You have a new message'; $LNG['ov_have_new_messages'] = 'You have %d new messages'; @@ -222,7 +222,7 @@ $LNG['gl_activity_inactive'] = '(%d min)'; $LNG['gl_ajax_status_ok'] = 'Done'; $LNG['gl_ajax_status_fail'] = 'Error'; -$LNG['gl_free_desc'] = 'A planet deshabitado. Here is the ideal place to develop a new colony'; +$LNG['gl_free_desc'] = 'This planet is habitable. Here is the ideal place to develop a new colony'; $LNG['gl_free'] = 'Free'; $LNG['gl_yes'] = 'Yes'; $LNG['gl_no'] = 'No'; @@ -234,10 +234,10 @@ //----------------------------------------------------------------------------// // Sensor Phalanx -$LNG['px_no_deuterium'] = "Don't have enough deuterium!"; +$LNG['px_no_deuterium'] = "You don't have enough deuterium!"; $LNG['px_scan_position'] = 'Investigate position'; $LNG['px_fleet_movement'] = 'Fleet in movement'; -$LNG['px_no_fleet'] = 'There is no moving fleets.'; +$LNG['px_no_fleet'] = 'There are no moving fleets.'; $LNG['px_out_of_range'] = 'Out of reach'; //----------------------------------------------------------------------------// @@ -327,7 +327,7 @@ $LNG['fl_planet_populed'] = 'This planet is populed!'; $LNG['fl_no_same_alliance'] = 'The target player of the planet must be of your Alliance or be on your friends list!'; $LNG['fl_not_ally_deposit'] = 'Dont have deposit of Alliance'; -$LNG['fl_deploy_only_your_planets'] = 'You can only deploy fleets in your own planets!'; +$LNG['fl_deploy_only_your_planets'] = 'You can only deploy fleets on your own planets!'; $LNG['fl_fleet_sended'] = 'Fleet sent'; $LNG['fl_from'] = 'From'; $LNG['fl_arrival_time'] = 'Target time'; @@ -371,7 +371,7 @@ $LNG['fl_player_is_strong'] = 'Player is too strong!'; $LNG['fl_no_hold_depot'] = 'No Alliance Depot is located on the target.'; $LNG['fl_not_enough_deuterium'] = 'Not enough deuterium available.'; -$LNG['fl_not_enough_space'] = 'You have not enough cargo space available.'; +$LNG['fl_not_enough_space'] = 'You do not have enough cargo space available.'; $LNG['fl_hold_time_not_exists'] = 'Invalid retention time.'; $LNG['fl_system_places'] = 'Special locations'; $LNG['fl_no_noresource_exchange'] = 'No resources in exchange field'; @@ -387,15 +387,15 @@ $LNG['bd_tech'] = 'Research'; $LNG['bd_tech_next_level'] = 'Research to the next level '; $LNG['bd_add_to_list'] = 'Add to list'; -$LNG['bd_no_more_fields'] = 'Without free fields on the planet'; +$LNG['bd_no_more_fields'] = 'You are without free fields on the planet'; $LNG['bd_remaining'] = 'Remaining:'; -$LNG['bd_lab_required'] = 'First you have to build a research lab!'; -$LNG['bd_building_lab'] = 'You cant upgrade researches when research lab is leveling up'; +$LNG['bd_lab_required'] = 'First, you have to build a research lab!'; +$LNG['bd_building_lab'] = 'You cannot upgrade researches when research lab is leveling up'; $LNG['bd_max_lvl'] = 'Max. Level:'; $LNG['bd_lvl'] = 'Level'; $LNG['bd_research'] = 'Research for'; $LNG['bd_shipyard_required'] = 'You need to build a Shipyard first'; -$LNG['bd_building_shipyard'] = 'You cant build ships when Shipyard is raising level'; +$LNG['bd_building_shipyard'] = 'You cannot build ships when Shipyard is raising level'; $LNG['bd_available'] = 'Available: '; $LNG['bd_build_ships'] = 'Build'; $LNG['bd_protection_shield_only_one'] = 'You can only build the shield 1 time!'; @@ -768,8 +768,8 @@ $LNG['al_rank_desc']['RANKS'] = 'Can configure the Ranks'; $LNG['al_rank_desc']['MANAGEUSERS'] = 'Can manage members'; $LNG['al_rank_desc']['EVENTS'] = 'Can see events'; -$LNG['al_invalid_rank_name'] = 'In the Rank name are only numbers, letters, spaces, _, -. allowed!'; -$LNG['al_make_ally_insufficient_points'] = 'You have not enough points to create an Alliance.
It is required %s points, and you have %s points.'; +$LNG['al_invalid_rank_name'] = 'In the Rank name only numbers, letters, spaces, _, -. allowed!'; +$LNG['al_make_ally_insufficient_points'] = 'You do have not enough points to create an Alliance.
It requires %s points, and you have %s points.'; //----------------------------------------------------------------------------// // Lista de Amigos @@ -978,7 +978,7 @@ $LNG['cff_mission_own_recy_0'] = 'One of your %s from %s %s %s reached the debris %s. Mission: %s'; $LNG['cff_mission_own_recy_1'] = 'One of your %s returns from debris %s back to planet %s %s %s. Mission: %s'; $LNG['cff_mission_target_bad'] = 'A hostile %s from player %s from %s %s %s reached the %s %s %s. Mission: %s'; -$LNG['cff_mission_target_good'] = 'A hostile %s from player %s from %s %s %s reached the %s %s %s. Mission: %s'; +$LNG['cff_mission_target_good'] = 'A friendly %s from player %s from %s %s %s reached the %s %s %s. Mission: %s'; $LNG['cff_mission_target_stay'] = 'A friendly %s from player %s from %s %s %s is in Orbit of the %s %s %s. Mission: %s'; $LNG['cff_mission_target_mip'] = 'Missile attack (%d) from player %s from %s %s %s on the %s %s %s.'; @@ -1139,7 +1139,7 @@ $LNG['ti_admin_open'] = 'The ticket has been opened!'; $LNG['ti_admin_close'] = 'The ticket was closed!'; $LNG['ti_error_closed'] = 'No answer can be created on this ticket, because it was already closed!'; -$LNG['ti_create_info'] = '

Please, when creating a support Ticket, describes and explains what is your issue with the maximum detail possible!

+$LNG['ti_create_info'] = '

Please, when creating a support Ticket, describes and explain what is your issue with the maximum detail possible!

A detailed description of what you want to ask, shortens the duration of time of resolution and avoids the waste of time on both sides

For issues related to accounts, specify facilitates the assignment of problem and also shortens the time.

'; $LNG['ti_create_head'] = 'Create Ticket'; From 3eab2fd6c433b4f55e370f96db1193484755136e Mon Sep 17 00:00:00 2001 From: Martin Date: Fri, 23 Mar 2018 14:53:19 +0100 Subject: [PATCH 07/33] Fixed confirmation dialog --- styles/templates/game/page.marketPlace.default.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/styles/templates/game/page.marketPlace.default.tpl b/styles/templates/game/page.marketPlace.default.tpl index ce2bfbbde..1ceb3d287 100644 --- a/styles/templates/game/page.marketPlace.default.tpl +++ b/styles/templates/game/page.marketPlace.default.tpl @@ -134,7 +134,7 @@ $('#shipT').on('change', function (e) { $('#shipT').trigger("change"); $(".market_form").submit( function() { - var c = confirm({$LNG.market_confirm_are_you_sure}); + var c = confirm("{$LNG.market_confirm_are_you_sure}"); if (c) { $(this).append('') } From d65a1f996cb300f568a4b9b64d1930d15aa2d998 Mon Sep 17 00:00:00 2001 From: DeanLogic Date: Fri, 23 Mar 2018 14:57:32 -0400 Subject: [PATCH 08/33] Fix Large Shield Dome definition Original text for the Large Shield Dome caused confusion about its functionality. The text has been changed from "The development of the Large Shield Dome needs substantially more energy to endur attacks." to "The development of the Large Shield Dome allows for substantially more energy to be absorbed during attacks." This shows that the dome absorbs more energy and does not require more energy to operate. --- language/en/TECH.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/language/en/TECH.php b/language/en/TECH.php index 8b09bf3e5..d4c02f913 100644 --- a/language/en/TECH.php +++ b/language/en/TECH.php @@ -258,7 +258,7 @@ 405 => 'An ion cannon is a weapon that fires beams of ions (positively or negatively charged particles).', 406 => 'the Plasma Turret uses a large nuclear reactor fuel cell to power an electromagnetic accelerator that fires a pulse, or toroid, of plasma.', 407 => 'The Small Shield Dome envelops the whole planet in a field, which can absorb tremendous amounts of energy.', -408 => 'The development of the Large Shield Dome needs substantially more energy to endur attacks.', +408 => 'The development of the Large Shield Dome allows for substantially more energy to be absorbed during attacks.', 409 => 'The evolution of the Great Shield Dome Shield technology. It uses much more energy but can endur even more attacks than any other shield.', 410 => 'After years of research at the gravitational force, researchers where able to develop a Graviation cannon that generate small concentrated Gravition field that can be shoot at the enemy.', 411 => 'There is an immovable defensive platform. It has no direct power, and is held by Gravity in a stable orbit of the planet. The start of this process requires high masses of energy.', From e478a50445bec65990c75452fa1286af5aa24504 Mon Sep 17 00:00:00 2001 From: Martin Date: Fri, 23 Mar 2018 22:05:53 +0100 Subject: [PATCH 09/33] Fix wrong stats for applications --- includes/pages/game/ShowAlliancePage.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/pages/game/ShowAlliancePage.class.php b/includes/pages/game/ShowAlliancePage.class.php index d241a1da0..75ce6f90c 100644 --- a/includes/pages/game/ShowAlliancePage.class.php +++ b/includes/pages/game/ShowAlliancePage.class.php @@ -1083,7 +1083,7 @@ protected function adminDetailApply() LEFT JOIN %%USERS%% AS u ON r.userId = u.id INNER JOIN - %%STATPOINTS%% AS stat + %%STATPOINTS%% AS stat ON r.userId = stat.id_owner LEFT JOIN %%PLANETS%% AS p ON p.id = u.id_planet WHERE From a1bb160d9a9af414e386dd42a2ff2150e83edce8 Mon Sep 17 00:00:00 2001 From: etaletai <13@etaletai.com> Date: Sat, 24 Mar 2018 08:32:13 -0700 Subject: [PATCH 10/33] linguistic fixes for clarity and precision --- language/en/INGAME.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/language/en/INGAME.php b/language/en/INGAME.php index 5c755e94f..15589e5c1 100644 --- a/language/en/INGAME.php +++ b/language/en/INGAME.php @@ -411,8 +411,8 @@ $LNG['bd_on'] = 'connected'; $LNG['bd_max_builds'] = 'You will have only max. %d queue building!'; $LNG['bd_next_level'] = 'Next level:'; -$LNG['bd_need_engine'] = 'Need more %s of %s'; -$LNG['bd_more_engine'] = 'Produced %s %s more'; +$LNG['bd_need_engine'] = 'Requires more %s of %s'; +$LNG['bd_more_engine'] = 'Will produce %s %s more'; $LNG['bd_jump_gate_action'] = 'Jump'; $LNG['bd_cancel_warning'] = 'ATTENTION!
If you cancel only will receive 60% of your resources s invested.'; $LNG['bd_cancel_send'] = 'Cancel construction'; @@ -1168,8 +1168,8 @@ //----------------------------------------------------------------------------// // Simulador de Batalha -$LNG['bs_derbis_raport'] = "Needed for recycling the debris: %s %s or %s %s. "; -$LNG['bs_steal_raport'] = "Needed to capture the resources: %s %s or %s %s or %s %s."; +$LNG['bs_derbis_raport'] = "Requiresed for recycling the debris: %s %s or %s %s. "; +$LNG['bs_steal_raport'] = "Requiresed to capture the resources: %s %s or %s %s or %s %s."; $LNG['bs_names'] = "Shipname"; $LNG['bs_atter'] = "Attacker"; $LNG['bs_deffer'] = "Defender"; From 8c06b5de9e1ac275b9fcbe9e8d8c8aaec5bf5b62 Mon Sep 17 00:00:00 2001 From: etaletai <13@etaletai.com> Date: Sat, 24 Mar 2018 13:18:16 -0700 Subject: [PATCH 11/33] Fixes "More ships is needed." -> "More ships required." --- language/en/INGAME.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/language/en/INGAME.php b/language/en/INGAME.php index 15589e5c1..129a35df1 100644 --- a/language/en/INGAME.php +++ b/language/en/INGAME.php @@ -1016,7 +1016,7 @@ $LNG['market_info_description'] = "Left side - sale offers | Right side - buy amount

• Bought offers cannot be canceled •
• Players are allowed to trade for any exchange rate (ratio) •"; $LNG['market_p_msg_not_found'] = 'Offer not found.'; -$LNG['market_p_msg_more_ships_is_needed'] = 'More ships is needed.'; +$LNG['market_p_msg_more_ships_is_needed'] = 'More ships required.'; $LNG['market_p_msg_resources_error'] = 'Not enough resources.'; $LNG['market_p_msg_sent'] = 'Sent %s Light Cargos, %s Heavy Cargos'; From 595a84fc34ccfdcf9cd8237a372dc8234c3a123f Mon Sep 17 00:00:00 2001 From: louis88 <35930080+louis88-steemit@users.noreply.github.com> Date: Sat, 24 Mar 2018 21:21:17 +0100 Subject: [PATCH 12/33] Update INGAME.php Added German Translation for the Marketplace --- language/de/INGAME.php | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/language/de/INGAME.php b/language/de/INGAME.php index b19a297c1..f7d37ed8f 100644 --- a/language/de/INGAME.php +++ b/language/de/INGAME.php @@ -1022,6 +1022,33 @@ $LNG['fa_vacation_mode_current'] = 'Fehler, Sie befinden sich im Urlaubsmodus'; $LNG['fa_sending'] = 'Gesendet'; + +//----------------------------------------------------------------------------// +// MARKETPLACE +$LNG['market_p_total'] ='Gesamt'; +$LNG['market_p_cost_type'] ='Art der Kosten'; +$LNG['market_p_cost_amount'] ='Menge'; +$LNG['market_p_end'] = 'Ende'; +$LNG['market_p_from_duration'] ='Flug von'; +$LNG['market_p_to_duration'] ='Flug nach'; +$LNG['market_p_submit'] = 'Handel annehmen!'; +$LNG['market_p_buy'] = 'Kaufen'; +$LNG['market_ship_as_first'] = 'Schiffstyp wählen für den Handel'; +$LNG['market_confirm_are_you_sure'] = 'Bist du sicher?'; +$LNG['market_info_header'] = "Marktplatz"; +$LNG['market_info_description'] = "Linke Seite - Martplatzangebot | Rechte Seite - Kaufbetrag

• Angenommene Marktplatzangebote können nicht storniert werden. •
• Die Spieler können zu jedem Wechselkurs (Verhältnis) handeln. •"; +$LNG['market_p_msg_not_found'] = 'Angebot nicht gefunden.'; +$LNG['market_p_msg_more_ships_is_needed'] = 'Es werden weitere Schiffe benötigt.'; +$LNG['market_p_msg_resources_error'] = 'Nicht genug Ressourcen vorhanden.'; +$LNG['market_p_msg_sent'] = 'Sende %s Kleine Transporter, %s Große Transporter'; +$LNG['market_msg_trade_topic'] = "Handelsstatus"; +$LNG['market_msg_trade_from'] = "SteemNova Marktplatz"; +$LNG['market_msg_trade_bought'] = 'Deine Flotte fliegt zu %s mit %s %s, %s %s, %s %s und es kostet %s %s'; +$LNG['market_msg_trade_sold'] = 'Deine Flotte fliegt zu %s mit %s %s, %s %s, %s %s.'; + + + + //----------------------------------------------------------------------------// // MissilesAjax.php $LNG['ma_silo_level'] = 'Du benötigst Raketensilo Stufe 4!'; From 7e17875afe2820eb25983193df3e8ba94ff22244 Mon Sep 17 00:00:00 2001 From: louis88 <35930080+louis88-steemit@users.noreply.github.com> Date: Sat, 24 Mar 2018 21:30:17 +0100 Subject: [PATCH 13/33] Update INGAME.php Added two more Translations --- language/de/INGAME.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/language/de/INGAME.php b/language/de/INGAME.php index f7d37ed8f..a8f2ea675 100644 --- a/language/de/INGAME.php +++ b/language/de/INGAME.php @@ -1022,7 +1022,6 @@ $LNG['fa_vacation_mode_current'] = 'Fehler, Sie befinden sich im Urlaubsmodus'; $LNG['fa_sending'] = 'Gesendet'; - //----------------------------------------------------------------------------// // MARKETPLACE $LNG['market_p_total'] ='Gesamt'; @@ -1045,9 +1044,8 @@ $LNG['market_msg_trade_from'] = "SteemNova Marktplatz"; $LNG['market_msg_trade_bought'] = 'Deine Flotte fliegt zu %s mit %s %s, %s %s, %s %s und es kostet %s %s'; $LNG['market_msg_trade_sold'] = 'Deine Flotte fliegt zu %s mit %s %s, %s %s, %s %s.'; - - - +$LNG['lm_marketplace'] = 'Marktplatz'; +$LNG['lm_trader'] = 'Markt'; //----------------------------------------------------------------------------// // MissilesAjax.php From 7e5e86dc0bc7ba7066934da1431aaa7e556509ab Mon Sep 17 00:00:00 2001 From: louis88 <35930080+louis88-steemit@users.noreply.github.com> Date: Sat, 24 Mar 2018 21:32:22 +0100 Subject: [PATCH 14/33] Update TECH.php Changed Atomkraftwerk to Fusionskraftwerk --- language/de/TECH.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/language/de/TECH.php b/language/de/TECH.php index 2ca9811b4..f7336138f 100644 --- a/language/de/TECH.php +++ b/language/de/TECH.php @@ -79,7 +79,7 @@ 3 => 'Deuteriumsynthetisierer', 4 => 'Solarkraftwerk', 6 => 'TechnoDome', - 12 => 'Atomkraftwerk', + 12 => 'Fusionskraftwerk', 14 => 'Roboterfabrik', 15 => 'Nanitenfabrik', 21 => 'Raumschiffwerft', @@ -194,7 +194,7 @@ 3 => 'Entziehen dem Wasser eines Planeten den geringen Deuteriumanteil.', 4 => 'Solarkraftwerke gewinnen Energie aus Sonneneinstrahlung. Einige Gebäude benötigen Energie für ihren Betrieb.', 6 => 'Sie verkürzt pro Stufe die Forschungszeit um 8%.', - 12 => 'Das Atomkraftwerk gewinnt Energie aus Brennstäben die aus Deuterium gefertigt werden.', + 12 => 'Das Fusionskraftwerk gewinnt Energie aus Brennstäben die aus Deuterium gefertigt werden.', 14 => 'Roboterfabriken stellen einfache Arbeitskräfte zur Verfügung, die beim Bau der planetaren Infrastruktur eingesetzt werden. Jede Stufe erhöht damit die Geschwindigkeit des Ausbaus von Gebäuden.', 15 => 'Stellt die Krönung der Robotertechnik dar. Jede Stufe halbiert die Bauzeit von Gebäuden, Schiffen und Verteidigung.', 21 => 'In der planetaren Werft werden alle Arten von Schiffen und Verteidigungsanlagen gebaut.', @@ -295,7 +295,7 @@ 3 => 'Deuterium ist schwerer Wasserstoff. Daher sind ähnlich wie bei den Minen die grössten Vorräte auf dem Grund des Meeres. Der Ausbau des Synthetisierers sorgt ebenfalls für die Erschließung dieser Deuterium-Tiefenlagerstätten. Deuterium wird als Treibstoff für die Schiffe, für fast alle Forschungen, für einen Blick in die Galaxie sowie für den Sensorphalanx-Scan benötigt.', 4 => 'Um die Energie zur Versorgung der Minen und Synthetisierern zu gewährleisten, sind riesige Solarkraftwerkanlagen von Nöten. Je größer die Anlagen ausgebaut sind, desto mehr Oberfläche ist mit photovoltaischen Zellen bedeckt, welche Lichtenergie in elektrische Energie umwandeln. Solarkraftwerke stellen den Grundstock der planetaren Energieversorgung dar.', 6 => 'Aufgrund der immer zeitaufwendigeren Forschungen, haben sich die klügsten Köpfe der intergalaktischen Forschungsnetzwerke zusammengetan und den TechnoDome entwickelt. Er verkürzt die Forschungszeiten um 8%', - 12 => 'Im Atomkraftwerk werden Atome gespalten, um so mehr Energie zu erzeugen als in dem Solarkraftwerk, allerdings ist es teurer im Bau.', + 12 => 'Im Fusionskraftwerk werden Atome gespalten, um so mehr Energie zu erzeugen als in dem Solarkraftwerk, allerdings ist es teurer im Bau.', 14 => 'Roboterfabriken stellen einfache Arbeitskräfte zur Verfügung, die beim Bau der planetaren Infrastruktur eingesetzt werden können. Jede Stufe erhöht damit die Geschwindigkeit des Ausbaus von Gebäuden.', 15 => 'Die Nanitenfabrik ist die Krönung der Robotertechnik. Naniten sind nanometergroße Roboter, die durch Vernetzung zu außerordentlichen Leistungen im Stande sind. Einmal erforscht erhöhen sie die Produktivität in fast allen Bereichen. Die Nanitenfabrik halbiert pro Stufe die Bauzeit von Gebäuden, Schiffen und Verteidigungsanlagen.', 21 => 'In der planetaren Werft werden alle Arten von Schiffen und Verteidigungsanlagen gebaut. Je größer sie ist, desto schneller können aufwendigere und größere Schiffe und Verteidigungsanlagen gebaut werden. Durch Anbau einer Nanitenfabrik werden winzige Roboter erstellt, die den Arbeitern helfen, schneller zu arbeiten.', From 8fd7635204821c2ec032e7370f561d58fe5f8ed1 Mon Sep 17 00:00:00 2001 From: louis88 <35930080+louis88-steemit@users.noreply.github.com> Date: Sat, 24 Mar 2018 21:38:51 +0100 Subject: [PATCH 15/33] Update FLEET.php added german translation string --- language/de/FLEET.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/language/de/FLEET.php b/language/de/FLEET.php index 998045f81..269068742 100644 --- a/language/de/FLEET.php +++ b/language/de/FLEET.php @@ -164,6 +164,7 @@ $LNG['sys_tran_mess_user'] = 'Eine friedliche Flotte von %s %s erreicht %s %s und liefert %s %s, %s %s und %s %s.'; $LNG['sys_mess_fleetback'] = 'Flottenrückkehr'; $LNG['sys_tran_mess_back'] = 'Eine deiner Flotten kehrt zum Planeten %s %s zurück.'; +$LNG['sys_trade_mess_back'] = 'Eine deiner Handelsflotten kehrte erfolglos zum Planeten %s %s zurück.'; $LNG['sys_recy_gotten'] = 'Deine Recycler haben %s %s und %s %s Gesammelt.'; $LNG['sys_gain'] = 'Gewinn'; $LNG['sys_irak_subject'] = 'Raketeneinschlag'; @@ -209,4 +210,4 @@ $LNG['type_planet_1'] = 'Planet'; $LNG['type_planet_2'] = 'Trümmerfeld'; -$LNG['type_planet_3'] = 'Mond'; \ No newline at end of file +$LNG['type_planet_3'] = 'Mond'; From 999d526053cf868c701d158ef34d8ff36080442c Mon Sep 17 00:00:00 2001 From: louis88 <35930080+louis88-steemit@users.noreply.github.com> Date: Sat, 24 Mar 2018 21:45:22 +0100 Subject: [PATCH 16/33] Update TECH.php added better description for Fusionskraftwerk --- language/de/TECH.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/language/de/TECH.php b/language/de/TECH.php index f7336138f..e1e93906d 100644 --- a/language/de/TECH.php +++ b/language/de/TECH.php @@ -295,7 +295,7 @@ 3 => 'Deuterium ist schwerer Wasserstoff. Daher sind ähnlich wie bei den Minen die grössten Vorräte auf dem Grund des Meeres. Der Ausbau des Synthetisierers sorgt ebenfalls für die Erschließung dieser Deuterium-Tiefenlagerstätten. Deuterium wird als Treibstoff für die Schiffe, für fast alle Forschungen, für einen Blick in die Galaxie sowie für den Sensorphalanx-Scan benötigt.', 4 => 'Um die Energie zur Versorgung der Minen und Synthetisierern zu gewährleisten, sind riesige Solarkraftwerkanlagen von Nöten. Je größer die Anlagen ausgebaut sind, desto mehr Oberfläche ist mit photovoltaischen Zellen bedeckt, welche Lichtenergie in elektrische Energie umwandeln. Solarkraftwerke stellen den Grundstock der planetaren Energieversorgung dar.', 6 => 'Aufgrund der immer zeitaufwendigeren Forschungen, haben sich die klügsten Köpfe der intergalaktischen Forschungsnetzwerke zusammengetan und den TechnoDome entwickelt. Er verkürzt die Forschungszeiten um 8%', - 12 => 'Im Fusionskraftwerk werden Atome gespalten, um so mehr Energie zu erzeugen als in dem Solarkraftwerk, allerdings ist es teurer im Bau.', + 12 => 'Im Fusionskraftwerk werden Atome miteinander fusioniert, um so mehr Energie zu erzeugen als in dem Solarkraftwerk, allerdings ist es teurer im Bau.', 14 => 'Roboterfabriken stellen einfache Arbeitskräfte zur Verfügung, die beim Bau der planetaren Infrastruktur eingesetzt werden können. Jede Stufe erhöht damit die Geschwindigkeit des Ausbaus von Gebäuden.', 15 => 'Die Nanitenfabrik ist die Krönung der Robotertechnik. Naniten sind nanometergroße Roboter, die durch Vernetzung zu außerordentlichen Leistungen im Stande sind. Einmal erforscht erhöhen sie die Produktivität in fast allen Bereichen. Die Nanitenfabrik halbiert pro Stufe die Bauzeit von Gebäuden, Schiffen und Verteidigungsanlagen.', 21 => 'In der planetaren Werft werden alle Arten von Schiffen und Verteidigungsanlagen gebaut. Je größer sie ist, desto schneller können aufwendigere und größere Schiffe und Verteidigungsanlagen gebaut werden. Durch Anbau einer Nanitenfabrik werden winzige Roboter erstellt, die den Arbeitern helfen, schneller zu arbeiten.', From faf21fc9f3b978c2736f3b250529c273d87be71e Mon Sep 17 00:00:00 2001 From: mys Date: Sun, 25 Mar 2018 14:49:00 +0200 Subject: [PATCH 17/33] Rebalance buildings and technologies cost --- includes/classes/class.BuildFunctions.php | 2 +- includes/classes/class.statbuilder.php | 26 ++++++----------------- install/install.sql | 2 +- 3 files changed, 8 insertions(+), 22 deletions(-) diff --git a/includes/classes/class.BuildFunctions.php b/includes/classes/class.BuildFunctions.php index a8c64f5bd..c05759bc2 100644 --- a/includes/classes/class.BuildFunctions.php +++ b/includes/classes/class.BuildFunctions.php @@ -92,7 +92,7 @@ public static function getElementPrice($USER, $PLANET, $Element, $forDestroy = f $price[$resType] = $ressourceAmount; if(isset($pricelist[$Element]['factor']) && $pricelist[$Element]['factor'] != 0 && $pricelist[$Element]['factor'] != 1) { - $price[$resType] *= pow($pricelist[$Element]['factor'], $elementLevel); + $price[$resType] *= pow($pricelist[$Element]['factor'], $elementLevel - 1); } if($forLevel && (in_array($Element, $reslist['fleet']) || in_array($Element, $reslist['defense']) || in_array($Element, $reslist['missile']))) { diff --git a/includes/classes/class.statbuilder.php b/includes/classes/class.statbuilder.php index 2fb17566f..0d96e2306 100644 --- a/includes/classes/class.statbuilder.php +++ b/includes/classes/class.statbuilder.php @@ -169,18 +169,11 @@ private function GetTechnoPoints($USER) { if($USER[$resource[$Techno]] == 0) continue; - // Points = (All resources / PointsPerCost) * Factor * ( 2 * ( Factor ^ Level ) - Factor) + 1) // PointsPerCot == Config::get()->stat_settings + for ($i = 1; $i <= $PLANET[$resource[$Build]]; $i++) { + $BuildPoints += ($pricelist[$Techno]['cost'][901] + $pricelist[$Techno]['cost'][902] + $pricelist[$Techno]['cost'][903]) * pow($pricelist[$Techno]['factor'], $i - 1); + } $TechCounts += $USER[$resource[$Techno]]; - $TechPoints += - ($pricelist[$Techno]['cost'][901] + $pricelist[$Techno]['cost'][902] + $pricelist[$Techno]['cost'][903]) - * $pricelist[$Techno]['factor'] - * ( - 2 * ( - pow($pricelist[$Techno]['factor'], $USER[$resource[$Techno]]) - $pricelist[$Techno]['factor'] - ) + 1 - ); - $this->setRecords($USER['id'], $Techno, $USER[$resource[$Techno]]); } @@ -198,17 +191,10 @@ private function GetBuildPoints($PLANET) { if($PLANET[$resource[$Build]] == 0) continue; - // Points = (All resources / PointsPerCost) * Factor * ( 2 * ( Factor ^ Level ) - Factor) + 1) // PointsPerCot == Config::get()->stat_settings - $BuildPoints += - ($pricelist[$Build]['cost'][901] + $pricelist[$Build]['cost'][902] + $pricelist[$Build]['cost'][903]) - * $pricelist[$Build]['factor'] - * ( - 2 * ( - pow($pricelist[$Build]['factor'], $PLANET[$resource[$Build]]) - $pricelist[$Build]['factor'] - ) + 1 - ); - + for ($i = 1; $i <= $PLANET[$resource[$Build]]; $i++) { + $BuildPoints += ($pricelist[$Build]['cost'][901] + $pricelist[$Build]['cost'][902] + $pricelist[$Build]['cost'][903]) * pow($pricelist[$Build]['factor'], $i - 1); + } $BuildCounts += $PLANET[$resource[$Build]]; $this->setRecords($PLANET['id_owner'], $Build, $PLANET[$resource[$Build]]); diff --git a/install/install.sql b/install/install.sql index ca4fab528..c0f5fd7af 100644 --- a/install/install.sql +++ b/install/install.sql @@ -955,7 +955,7 @@ INSERT INTO `%PREFIX%vars` (`elementID`, `name`, `class`, `onPlanetType`, `onePe (3, 'deuterium_sintetizer', 0, '1', 0, 1.50, 255, 225, 75, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, '(10 * $BuildLevel * pow((1.1), $BuildLevel) * (-0.002 * $BuildTemp + 1.28) * (0.1 * $BuildLevelFactor))', '- (30 * $BuildLevel * pow((1.1), $BuildLevel)) * (0.1 * $BuildLevelFactor)', NULL, NULL, NULL, NULL), (4, 'solar_plant', 0, '1', 0, 1.50, 255, 75, 30, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, '(20 * $BuildLevel * pow((1.1), $BuildLevel)) * (0.1 * $BuildLevelFactor)', NULL, NULL, NULL, NULL), (6, 'university', 0, '1', 0, 2.00, 255, 100000000, 50000000, 25000000, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), -(12, 'fusion_plant', 0, '1', 0, 2.00, 255, 900, 360, 180, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, '- (10 * $BuildLevel * pow(1.1,$BuildLevel) * (0.1 * $BuildLevelFactor))', '(30 * $BuildLevel * pow((1.05 + $BuildEnergy * 0.01), $BuildLevel)) * (0.1 * $BuildLevelFactor)', NULL, NULL, NULL, NULL), +(12, 'fusion_plant', 0, '1', 0, 1.80, 255, 900, 360, 180, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, '- (10 * $BuildLevel * pow(1.1,$BuildLevel) * (0.1 * $BuildLevelFactor))', '(30 * $BuildLevel * pow((1.05 + $BuildEnergy * 0.01), $BuildLevel)) * (0.1 * $BuildLevelFactor)', NULL, NULL, NULL, NULL), (14, 'robot_factory', 0, '1,3', 0, 2.00, 255, 400, 120, 200, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (15, 'nano_factory', 0, '1', 0, 2.00, 255, 1000000, 500000, 100000, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), (21, 'hangar', 0, '1,3', 0, 2.00, 255, 400, 200, 100, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL), From a8a969f820e43c1208f6d6ca43f5fc21b1aced5c Mon Sep 17 00:00:00 2001 From: mys Date: Sun, 25 Mar 2018 14:51:29 +0200 Subject: [PATCH 18/33] Update class.statbuilder.php --- includes/classes/class.statbuilder.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/classes/class.statbuilder.php b/includes/classes/class.statbuilder.php index 0d96e2306..a712b5f74 100644 --- a/includes/classes/class.statbuilder.php +++ b/includes/classes/class.statbuilder.php @@ -169,7 +169,7 @@ private function GetTechnoPoints($USER) { if($USER[$resource[$Techno]] == 0) continue; - // PointsPerCot == Config::get()->stat_settings + // PointsPerCot == Config::get()->stat_settings for ($i = 1; $i <= $PLANET[$resource[$Build]]; $i++) { $BuildPoints += ($pricelist[$Techno]['cost'][901] + $pricelist[$Techno]['cost'][902] + $pricelist[$Techno]['cost'][903]) * pow($pricelist[$Techno]['factor'], $i - 1); } @@ -191,7 +191,7 @@ private function GetBuildPoints($PLANET) { if($PLANET[$resource[$Build]] == 0) continue; - // PointsPerCot == Config::get()->stat_settings + // PointsPerCot == Config::get()->stat_settings for ($i = 1; $i <= $PLANET[$resource[$Build]]; $i++) { $BuildPoints += ($pricelist[$Build]['cost'][901] + $pricelist[$Build]['cost'][902] + $pricelist[$Build]['cost'][903]) * pow($pricelist[$Build]['factor'], $i - 1); } From e38e3c798c8112ef42279297009fab3abada5def Mon Sep 17 00:00:00 2001 From: mys Date: Sun, 25 Mar 2018 19:39:26 +0200 Subject: [PATCH 19/33] Update INGAME.php --- language/en/INGAME.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/language/en/INGAME.php b/language/en/INGAME.php index 129a35df1..396f248a0 100644 --- a/language/en/INGAME.php +++ b/language/en/INGAME.php @@ -1168,8 +1168,8 @@ //----------------------------------------------------------------------------// // Simulador de Batalha -$LNG['bs_derbis_raport'] = "Requiresed for recycling the debris: %s %s or %s %s. "; -$LNG['bs_steal_raport'] = "Requiresed to capture the resources: %s %s or %s %s or %s %s."; +$LNG['bs_derbis_raport'] = "Required for recycling the debris: %s %s or %s %s. "; +$LNG['bs_steal_raport'] = "Required to capture the resources: %s %s or %s %s or %s %s."; $LNG['bs_names'] = "Shipname"; $LNG['bs_atter'] = "Attacker"; $LNG['bs_deffer'] = "Defender"; From 53044df5101a1505a6b63362f4eb74b16bd31492 Mon Sep 17 00:00:00 2001 From: mys Date: Mon, 26 Mar 2018 00:23:50 +0200 Subject: [PATCH 20/33] Prevent double alliance names in Statistics page --- includes/classes/class.statbuilder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/classes/class.statbuilder.php b/includes/classes/class.statbuilder.php index a712b5f74..e91359467 100644 --- a/includes/classes/class.statbuilder.php +++ b/includes/classes/class.statbuilder.php @@ -106,7 +106,7 @@ private function GetUsersInfosFromDB() $Return['Fleets'] = $FlyingFleets; $Return['Planets'] = $database->select('SELECT SQL_BIG_RESULT DISTINCT '.$select_buildings.' p.id, p.universe, p.id_owner, u.authlevel, u.bana, u.username FROM %%PLANETS%% as p LEFT JOIN %%USERS%% as u ON u.id = p.id_owner;'); $Return['Users'] = $database->select('SELECT SQL_BIG_RESULT DISTINCT '.$selected_tech.$select_fleets.$select_defenses.' u.id, u.ally_id, u.authlevel, u.bana, u.universe, u.username, s.tech_rank AS old_tech_rank, s.build_rank AS old_build_rank, s.defs_rank AS old_defs_rank, s.fleet_rank AS old_fleet_rank, s.total_rank AS old_total_rank FROM %%USERS%% as u LEFT JOIN %%STATPOINTS%% as s ON s.stat_type = 1 AND s.id_owner = u.id LEFT JOIN %%PLANETS%% as p ON u.id = p.id_owner GROUP BY s.id_owner, u.id, u.authlevel;'); - $Return['Alliance'] = $database->select('SELECT SQL_BIG_RESULT DISTINCT a.id, a.ally_universe, s.tech_rank AS old_tech_rank, s.build_rank AS old_build_rank, s.defs_rank AS old_defs_rank, s.fleet_rank AS old_fleet_rank, s.total_rank AS old_total_rank FROM %%ALLIANCE%% as a LEFT JOIN %%STATPOINTS%% as s ON s.stat_type = 2 AND s.id_owner = a.id;'); + $Return['Alliance'] = $database->select('SELECT SQL_BIG_RESULT DISTINCT a.id, a.ally_universe, s.tech_rank AS old_tech_rank, s.build_rank AS old_build_rank, s.defs_rank AS old_defs_rank, s.fleet_rank AS old_fleet_rank, s.total_rank AS old_total_rank FROM %%ALLIANCE%% as a LEFT JOIN %%STATPOINTS%% as s ON s.stat_type = 2 AND s.id_owner = a.id GROUP BY a.id;'); return $Return; } From 75fde64618a78ee934cc0a3b10c1a9f970703ea4 Mon Sep 17 00:00:00 2001 From: mys Date: Mon, 26 Mar 2018 00:30:01 +0200 Subject: [PATCH 21/33] Bash rule as default --- includes/constants.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/constants.php b/includes/constants.php index 96fb77b44..f5942e45a 100644 --- a/includes/constants.php +++ b/includes/constants.php @@ -134,14 +134,14 @@ define('SPY_VIEW_FACTOR' , 1); // Bash Settings -define('BASH_ON' , false); +define('BASH_ON' , true); define('BASH_COUNT' , 6); define('BASH_TIME' , 86400); // Bash rule on wars: // 0 = NORMAL // 1 = ON WAR, BASH RULE IS DEACTIVE -define('BASH_WAR' , 0); +define('BASH_WAR' , 1); // MINIMUM FLEET TIME MUST HIGHER THEN BASH_TIME define('FLEETLOG_AGE' , 86400); From 9dc051b3e49f51361dd19b45dfccfab1b8352ae2 Mon Sep 17 00:00:00 2001 From: mys Date: Mon, 26 Mar 2018 00:54:40 +0200 Subject: [PATCH 22/33] Tech points fix --- includes/classes/class.statbuilder.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/classes/class.statbuilder.php b/includes/classes/class.statbuilder.php index e91359467..a9e598349 100644 --- a/includes/classes/class.statbuilder.php +++ b/includes/classes/class.statbuilder.php @@ -170,8 +170,8 @@ private function GetTechnoPoints($USER) if($USER[$resource[$Techno]] == 0) continue; // PointsPerCot == Config::get()->stat_settings - for ($i = 1; $i <= $PLANET[$resource[$Build]]; $i++) { - $BuildPoints += ($pricelist[$Techno]['cost'][901] + $pricelist[$Techno]['cost'][902] + $pricelist[$Techno]['cost'][903]) * pow($pricelist[$Techno]['factor'], $i - 1); + for ($i = 1; $i <= $USER[$resource[$Techno]]; $i++) { + $TechPoints += ($pricelist[$Techno]['cost'][901] + $pricelist[$Techno]['cost'][902] + $pricelist[$Techno]['cost'][903]) * pow($pricelist[$Techno]['factor'], $i - 1); } $TechCounts += $USER[$resource[$Techno]]; From e3bb38f8402957fcd0164ae847d210e298c3b571 Mon Sep 17 00:00:00 2001 From: etaletai <13@etaletai.com> Date: Mon, 26 Mar 2018 15:48:07 -0700 Subject: [PATCH 23/33] pedant-fix invalid action messge. --- language/en/INGAME.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/language/en/INGAME.php b/language/en/INGAME.php index 77fcccc75..f2ff03a6d 100644 --- a/language/en/INGAME.php +++ b/language/en/INGAME.php @@ -16,6 +16,7 @@ // Translated into English by QwataKayean . All rights reversed (C) 2012 // 2Moons - Copyright (C) 2010-2012 Slaver +// Grammar Pedantry fixes @etaletai 2018 @@ -28,7 +29,7 @@ $LNG['loading'] = 'Loading ...'; -$LNG['invalid_action'] = 'Action Invalidated!!'; +$LNG['invalid_action'] = 'Action Invalid!'; $LNG['type_mission_1'] = 'Attack'; $LNG['type_mission_2'] = 'ACS - Attack on cooperation'; From 6ced3b2b674246272e2f5ae8ae1aa69776e96bfb Mon Sep 17 00:00:00 2001 From: etaletai <13@etaletai.com> Date: Mon, 26 Mar 2018 15:48:41 -0700 Subject: [PATCH 24/33] pedant-fix research dark matter. --- language/en/INGAME.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/language/en/INGAME.php b/language/en/INGAME.php index f2ff03a6d..bacebe081 100644 --- a/language/en/INGAME.php +++ b/language/en/INGAME.php @@ -41,7 +41,7 @@ $LNG['type_mission_8'] = 'Recycle'; $LNG['type_mission_9'] = 'Destroy'; $LNG['type_mission_10'] = 'Missile attack'; -$LNG['type_mission_11'] = 'Research of Dark matter '; +$LNG['type_mission_11'] = 'Research Dark matter '; $LNG['type_mission_15'] = 'Expedition'; $LNG['type_mission_16'] = 'Trade'; From edde4063503321c0cd8d5ffa9ccf9b030def120b Mon Sep 17 00:00:00 2001 From: etaletai <13@etaletai.com> Date: Mon, 26 Mar 2018 15:50:10 -0700 Subject: [PATCH 25/33] pedant-fix admin messages. --- language/en/INGAME.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/language/en/INGAME.php b/language/en/INGAME.php index bacebe081..68fb94cc0 100644 --- a/language/en/INGAME.php +++ b/language/en/INGAME.php @@ -57,8 +57,8 @@ $LNG['page_doesnt_exist'] = 'This page does not exist'; $LNG['bad_forum_url'] = 'The Forum link is incorrect!'; -$LNG['admin_access_1'] = 'Players have access temporarily s administrative functions!'; -$LNG['admin_access_link'] = 'Disable this access'; +$LNG['admin_access_1'] = 'Players have temporary administrative permissions.'; +$LNG['admin_access_link'] = 'Access Denied'; $LNG['admin_access_2'] = ", If you don't need any longer"; From ced6729c4f5b1406b92218b1228b9c3734a0e108 Mon Sep 17 00:00:00 2001 From: etaletai <13@etaletai.com> Date: Mon, 26 Mar 2018 15:53:34 -0700 Subject: [PATCH 26/33] pedant-fix support messages. --- language/en/INGAME.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/language/en/INGAME.php b/language/en/INGAME.php index 68fb94cc0..b4109898b 100644 --- a/language/en/INGAME.php +++ b/language/en/INGAME.php @@ -1152,7 +1152,7 @@ $LNG['ti_answer'] = 'Respond'; $LNG['ti_create'] = 'Ticket created on '; $LNG['ti_responded'] = 'Ticket replied on '; -$LNG['ti_not_exist'] = 'The ticket #%d dont exist!'; +$LNG['ti_not_exist'] = 'Ticket #%d not found.'; $LNG['ti_from'] = 'by'; $LNG['ti_re'] = 'FW:'; $LNG['ti_error_no_subject'] = 'You must enter a subject!'; @@ -1169,9 +1169,9 @@ //----------------------------------------------------------------------------// // Simulador de Batalha -$LNG['bs_derbis_raport'] = "Required for recycling the debris: %s %s or %s %s. "; -$LNG['bs_steal_raport'] = "Required to capture the resources: %s %s or %s %s or %s %s."; -$LNG['bs_names'] = "Shipname"; +$LNG['bs_derbis_raport'] = "Required for recycling debris: %s %s or %s %s. "; +$LNG['bs_steal_raport'] = "Required to capture resources: %s %s or %s %s or %s %s."; +$LNG['bs_names'] = "Ship Name"; $LNG['bs_atter'] = "Attacker"; $LNG['bs_deffer'] = "Defender"; $LNG['bs_steal'] = "The defenders resources:"; @@ -1196,9 +1196,9 @@ //----------------------------------------------------------------------------// // Logout $LNG['lo_title'] = 'Successfully logged out'; -$LNG['lo_logout'] = 'Your session was terminated. Hopefully voltes'; +$LNG['lo_logout'] = 'Your session was terminated. Hopefully on purpose.'; $LNG['lo_redirect'] = 'Redirect'; $LNG['lo_notify'] = 'Will be redirected in 5 seconds'; -$LNG['lo_continue'] = 'Click here not to wait'; +$LNG['lo_continue'] = 'Click to continue.'; //----------------------------------------------------------------------------// From 16d7c88a23c547b259d39efb224ed7c59f1ed756 Mon Sep 17 00:00:00 2001 From: Etaletai #13 <36354460+etaletai13@users.noreply.github.com> Date: Tue, 27 Mar 2018 01:24:07 -0700 Subject: [PATCH 27/33] Update INGAME.php fixup for fixup; clarifying --- language/en/INGAME.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/language/en/INGAME.php b/language/en/INGAME.php index b4109898b..c0961ce4c 100644 --- a/language/en/INGAME.php +++ b/language/en/INGAME.php @@ -58,8 +58,8 @@ $LNG['page_doesnt_exist'] = 'This page does not exist'; $LNG['bad_forum_url'] = 'The Forum link is incorrect!'; $LNG['admin_access_1'] = 'Players have temporary administrative permissions.'; -$LNG['admin_access_link'] = 'Access Denied'; -$LNG['admin_access_2'] = ", If you don't need any longer"; +$LNG['admin_access_link'] = 'Disable this access'; +$LNG['admin_access_2'] = ", If you don't need it any longer"; //----------------------------------------------------------------------------// From fa99eeea3d00743d63ca9845ebcab6b4b0a46c23 Mon Sep 17 00:00:00 2001 From: Etaletai #13 <36354460+etaletai13@users.noreply.github.com> Date: Tue, 27 Mar 2018 07:03:45 -0700 Subject: [PATCH 28/33] Pedantic grammar and fluency fixes. tn_vacation_mode, tn_delete_mode, --- lm_technology, --- ov_newname_done, ov_abandon_planet_not_possible, ov_teamspeak_not_online, fl_arrival, fl_empty_target, fl_expedition_fleets_limit, fl_error_not_avalible, fl_error_empty_derbis [is this itself a typo?], fl_error_no_moon, fl_no_expedition_slot, fl_bash_protection, fl_admin_attack, --- bd_build_next_level, bd_no_more_fields, bd_building_lab, bd_building_shipyard, bd_protection_shield_only_one, bd_price_for_destroy (I chose "demolish" instead, because it refers to deliberately destroying your own stuff), bd_need_engine, bd_cancel_warning, sys_nomore_level --- of_still, of_active --- tr_not_enought (typo there?), tr_exchange_done, --- language/en/INGAME.php | 74 +++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/language/en/INGAME.php b/language/en/INGAME.php index c0961ce4c..401c388ed 100644 --- a/language/en/INGAME.php +++ b/language/en/INGAME.php @@ -64,8 +64,8 @@ //----------------------------------------------------------------------------// // Topnav -$LNG['tn_vacation_mode'] = "Now you're in vacation mode"; -$LNG['tn_delete_mode'] = 'The account at %s will be automatically deleted!'; +$LNG['tn_vacation_mode'] = "Your account is in vacation mode"; +$LNG['tn_delete_mode'] = 'The account at %s will be deleted!'; //----------------------------------------------------------------------------// // Menu @@ -83,7 +83,7 @@ $LNG['lm_officiers'] = 'Officers'; $LNG['lm_trader'] = 'Market'; $LNG['lm_fleettrader'] = 'Merchant of Fleets'; -$LNG['lm_technology'] = 'Technologies'; +$LNG['lm_technology'] = 'Technology'; $LNG['lm_messages'] = 'Messages'; $LNG['lm_alliance'] = 'Alliance'; $LNG['lm_buddylist'] = 'Friends'; @@ -108,13 +108,13 @@ $LNG['lm_disclamer'] = 'Credits'; //----------------------------------------------------------------------------// -// Vista Geral +// Overview $LNG['ov_newname_specialchar'] = 'For names of planets, use only numbers, letters, spaces, _,-,.'; -$LNG['ov_newname_done'] = 'The new name was entered!'; +$LNG['ov_newname_done'] = 'Planet renamed!'; $LNG['ov_planet_abandoned'] = 'The planet was destroyed!'; $LNG['ov_principal_planet_cant_abanone'] = 'You can not delete the main planet!'; -$LNG['ov_abandon_planet_not_possible'] = 'The planet cannot be erased, it currenty has existing activities!'; +$LNG['ov_abandon_planet_not_possible'] = 'Planets cannot be deleted during activities.'; $LNG['ov_wrong_pass'] = 'Password incorrect!'; $LNG['ov_have_new_message'] = 'You have a new message'; $LNG['ov_have_new_messages'] = 'You have %d new messages'; @@ -148,7 +148,7 @@ $LNG['ov_no_admins_online'] = 'Currently, there is no administrator online'; $LNG['ov_userbanner'] = "Player's Banner"; $LNG['ov_userrank_info'] = '%s (%s %d %s %s)'; -$LNG['ov_teamspeak_not_online'] = 'The Teamspeak server not active this'; +$LNG['ov_teamspeak_not_online'] = 'The Teamspeak server is not active'; $LNG['ov_teamspeak'] = 'Teamspeak'; $LNG['ov_teamspeak_connect'] = 'Connect'; $LNG['ov_teamspeak_online'] = 'Online'; @@ -158,7 +158,7 @@ $LNG['ov_chat_online'] = 'Players in chat:'; //----------------------------------------------------------------------------// -// Galáxia +// Galaxy $LNG['gl_no_deuterium_to_view_galaxy'] = 'You dont have enough deuterium to view the galaxy'; $LNG['gl_legend'] = 'Legend'; @@ -242,7 +242,7 @@ $LNG['px_out_of_range'] = 'Out of reach'; //----------------------------------------------------------------------------// -// Império +// Empire $LNG['lv_imperium_title'] = 'Empire'; $LNG['lv_planet'] = 'Planet'; $LNG['lv_name'] = 'Name'; @@ -275,10 +275,10 @@ $LNG['fl_mission'] = 'Mission'; $LNG['fl_ammount'] = 'Number'; $LNG['fl_beginning'] = 'Start'; -$LNG['fl_departure'] = 'Arrival(Destination)'; +$LNG['fl_departure'] = 'Arrival (Destination)'; $LNG['fl_destiny'] = 'Destination'; $LNG['fl_objective'] = 'Target'; -$LNG['fl_arrival'] = 'Arrival(Back)'; +$LNG['fl_arrival'] = 'Return Arrival'; $LNG['fl_info_detail'] = 'Details'; $LNG['fl_order'] = 'Order'; $LNG['fl_new_mission_title'] = 'New mission: Select fleet'; @@ -316,11 +316,11 @@ $LNG['fl_resources_left'] = 'Capacity avaliable'; $LNG['fl_all_resources'] = 'All resources'; $LNG['fl_multi_alarm'] = 'Multi alarm!'; -$LNG['fl_empty_target'] = 'Without mission available (the planet exist?)'; +$LNG['fl_empty_target'] = 'No mission available (does this planet exist?)'; $LNG['fl_expedition_alert_message'] = 'Attention! Explorations are dangerous missions, you can lose your fleet!'; $LNG['fl_dm_alert_message'] = 'Beware, if in %s %s was found, destroyed the fleets!'; $LNG['fl_vacation_mode_active'] = 'Vacation mode active'; -$LNG['fl_expedition_fleets_limit'] = 'No slots of Exploration avaliable!'; +$LNG['fl_expedition_fleets_limit'] = 'No exploration slots avaliable!'; $LNG['fl_week_player'] = 'The player is under the protection of weak player'; $LNG['fl_strong_player'] = 'The player is too strong.'; $LNG['fl_in_vacation_player'] = 'The player is in vacation mode'; @@ -353,18 +353,18 @@ $LNG['fl_acs_newname_alphanum'] = 'The ACS name must contain alphanumeric characters only'; $LNG['fl_acs_change'] = 'Change'; $LNG['fl_acs_change_name'] = 'Type the new name'; -$LNG['fl_error_not_avalible'] = 'These coordinates do not have any planet'; -$LNG['fl_error_empty_derbis'] = "Don't have any debris fields!"; -$LNG['fl_error_no_moon'] = 'Does not have any moon in these coordinates!'; +$LNG['fl_error_not_avalible'] = 'There is nothing at these coordinates!'; +$LNG['fl_error_empty_derbis'] = "No debris fields!"; +$LNG['fl_error_no_moon'] = 'No moon found at these coordinates!'; $LNG['fl_error_same_planet'] = 'Start and destination planet are identical!'; $LNG['fl_invalid_target'] = 'No valid target'; $LNG['fl_no_noresource'] = 'No raw materials loaded!'; $LNG['fl_no_target'] = 'No available target planet'; $LNG['fl_not_all_ship_avalible'] = 'Not all ships present.'; -$LNG['fl_no_expedition_slot'] = 'You cant start more expeditions!'; +$LNG['fl_no_expedition_slot'] = "You can't start more expeditions!"; $LNG['fl_invalid_mission'] = 'Invalid mission'; -$LNG['fl_bash_protection'] = 'Bash Rule'; -$LNG['fl_admin_attack'] = 'You can attack the administrators'; +$LNG['fl_bash_protection'] = 'This would violate the Bash Rule'; +$LNG['fl_admin_attack'] = "You can't attack an administrator"; $LNG['fl_target_exists'] = 'Target planet'; $LNG['fl_target_not_exists'] = 'Target planet does not exist!'; $LNG['fl_only_planets_colonizable'] = 'Only planets can be colonized.'; @@ -377,57 +377,57 @@ $LNG['fl_system_places'] = 'Special locations'; $LNG['fl_no_noresource_exchange'] = 'No resources in exchange field'; //----------------------------------------------------------------------------// -// Edificios +// Buildings $LNG['bd_dismantle'] = 'Demolish'; $LNG['bd_interrupt'] = 'Cancel'; $LNG['bd_cancel'] = 'Cancel'; $LNG['bd_working'] = 'Busy'; $LNG['bd_build'] = 'Build'; -$LNG['bd_build_next_level'] = 'Build to the next level '; +$LNG['bd_build_next_level'] = 'Upgrade '; $LNG['bd_research'] = 'Research'; $LNG['bd_tech'] = 'Research'; $LNG['bd_tech_next_level'] = 'Research to the next level '; $LNG['bd_add_to_list'] = 'Add to list'; -$LNG['bd_no_more_fields'] = 'You are without free fields on the planet'; +$LNG['bd_no_more_fields'] = 'Planet has no fields remaining'; $LNG['bd_remaining'] = 'Remaining:'; $LNG['bd_lab_required'] = 'First, you have to build a research lab!'; -$LNG['bd_building_lab'] = 'You cannot upgrade researches when research lab is leveling up'; +$LNG['bd_building_lab'] = 'You cannot research during lab upgrades.'; $LNG['bd_max_lvl'] = 'Max. Level:'; $LNG['bd_lvl'] = 'Level'; $LNG['bd_research'] = 'Research for'; $LNG['bd_shipyard_required'] = 'You need to build a Shipyard first'; -$LNG['bd_building_shipyard'] = 'You cannot build ships when Shipyard is raising level'; +$LNG['bd_building_shipyard'] = "Cannot build ships until Shipyard upgrade is completed.'; $LNG['bd_available'] = 'Available: '; $LNG['bd_build_ships'] = 'Build'; -$LNG['bd_protection_shield_only_one'] = 'You can only build the shield 1 time!'; +$LNG['bd_protection_shield_only_one'] = 'You can only build one shield!'; $LNG['bd_build_defenses'] = 'Build defense'; $LNG['bd_actual_production'] = 'Current production:'; $LNG['bd_completed'] = 'Complete'; $LNG['bd_operating'] = '(In construction)'; $LNG['bd_continue'] = 'Continue'; -$LNG['bd_price_for_destroy'] = 'Cost to destroy:'; +$LNG['bd_price_for_destroy'] = 'Cost to demolish:'; $LNG['bd_ready'] = 'Ready'; $LNG['bd_finished'] = 'Finished'; $LNG['bd_maxlevel'] = 'Maximum level reached'; $LNG['bd_on'] = 'connected'; $LNG['bd_max_builds'] = 'You will have only max. %d queue building!'; $LNG['bd_next_level'] = 'Next level:'; -$LNG['bd_need_engine'] = 'Requires more %s of %s'; +$LNG['bd_need_engine'] = 'Requires %s more %s'; $LNG['bd_more_engine'] = 'Will produce %s %s more'; $LNG['bd_jump_gate_action'] = 'Jump'; -$LNG['bd_cancel_warning'] = 'ATTENTION!
If you cancel only will receive 60% of your resources s invested.'; +$LNG['bd_cancel_warning'] = 'ATTENTION!
If you cancel only will recoup 60% of your cost.'; $LNG['bd_cancel_send'] = 'Cancel construction'; $LNG['bd_destroy_time'] = 'Duration'; $LNG['bd_max_ships'] = 'max'; $LNG['bd_max_ships_long'] = 'Maximum possible units to build'; $LNG['sys_notenough_money'] = 'You dont have enough resources on %s [%d:%d:%d] to build %s.
Your ressources are: %s %s , %s %s and %s %s.
The cost of construction is %s %s , %s %s and %s %s.'; -$LNG['sys_nomore_level'] = "You're trying to destroy a building that no longer have ( %s )."; +$LNG['sys_nomore_level'] = "There's no building ( %s ) to demolish."; $LNG['sys_buildlist'] = "List of construction"; $LNG['sys_techlist'] = 'Research list'; $LNG['sys_buildlist_fail'] = "Impossible to build"; //----------------------------------------------------------------------------// -// Recursos +// Resources $LNG['rs_amount'] = 'Quantity'; $LNG['rs_lvl'] = 'Level'; $LNG['rs_production_on_planet'] = 'Resources produced on the planet "%s"'; @@ -440,21 +440,21 @@ $LNG['rs_ress_bonus'] = 'Bonus (Officers/Bonus):'; //----------------------------------------------------------------------------// -// Oficiais +// Officers $LNG['of_recruit'] = 'Recruit'; $LNG['of_max_lvl'] = 'Max Level'; $LNG['of_offi'] = 'Official'; $LNG['of_lvl'] = 'Level'; $LNG['of_dm_trade'] = '%s - Shop'; -$LNG['of_still'] = 'Continua'; -$LNG['of_active'] = 'active'; +$LNG['of_still'] = 'Continue'; +$LNG['of_active'] = 'Active'; //----------------------------------------------------------------------------// -// Mercado +// Merchants $LNG['tr_cost_dm_trader'] = 'You have to pay the merchant %s %s!'; -$LNG['tr_not_enought'] = "Don't own enough %s."; -$LNG['tr_exchange_done'] = 'Trade made with success'; +$LNG['tr_not_enought'] = "Don't have enough %s."; +$LNG['tr_exchange_done'] = 'Trade successful'; $LNG['tr_exchange_error'] = 'The amount of resources is wrong or are insufficient'; $LNG['tr_call_trader'] = 'Call a merchant'; $LNG['tr_call_trader_who_buys'] = 'Call a merchant who purchases'; @@ -467,7 +467,7 @@ $LNG['tr_exchange'] = 'Trade'; //----------------------------------------------------------------------------// -// Tecnologia +// Tecnology $LNG['tt_requirements'] = 'Requirements'; $LNG['tt_lvl'] = 'Level '; From 037880939aa4e786d2c86a4f445e73b0f235ad8c Mon Sep 17 00:00:00 2001 From: Etaletai #13 <36354460+etaletai13@users.noreply.github.com> Date: Tue, 27 Mar 2018 14:19:03 -0700 Subject: [PATCH 29/33] Update INGAME.php rollback lm_technology to "technologies" --- language/en/INGAME.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/language/en/INGAME.php b/language/en/INGAME.php index 401c388ed..525d34e88 100644 --- a/language/en/INGAME.php +++ b/language/en/INGAME.php @@ -83,7 +83,7 @@ $LNG['lm_officiers'] = 'Officers'; $LNG['lm_trader'] = 'Market'; $LNG['lm_fleettrader'] = 'Merchant of Fleets'; -$LNG['lm_technology'] = 'Technology'; +$LNG['lm_technology'] = 'Technologies'; $LNG['lm_messages'] = 'Messages'; $LNG['lm_alliance'] = 'Alliance'; $LNG['lm_buddylist'] = 'Friends'; From 860a0dc963fb58fdfea01ba5eb89aca39a2121bc Mon Sep 17 00:00:00 2001 From: Etaletai #13 <36354460+etaletai13@users.noreply.github.com> Date: Tue, 27 Mar 2018 14:20:25 -0700 Subject: [PATCH 30/33] Update INGAME.php Formatting on 'fl_arrival' for consistency. --- language/en/INGAME.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/language/en/INGAME.php b/language/en/INGAME.php index 525d34e88..72ec74195 100644 --- a/language/en/INGAME.php +++ b/language/en/INGAME.php @@ -278,7 +278,7 @@ $LNG['fl_departure'] = 'Arrival (Destination)'; $LNG['fl_destiny'] = 'Destination'; $LNG['fl_objective'] = 'Target'; -$LNG['fl_arrival'] = 'Return Arrival'; +$LNG['fl_arrival'] = 'Arrival (Return)'; $LNG['fl_info_detail'] = 'Details'; $LNG['fl_order'] = 'Order'; $LNG['fl_new_mission_title'] = 'New mission: Select fleet'; From 9de637407d1f9c47293f17a95663da521f4f5fb5 Mon Sep 17 00:00:00 2001 From: mys Date: Tue, 27 Mar 2018 23:25:18 +0200 Subject: [PATCH 31/33] Move feed links from chainbb.com to busy.org --- scripts/game/overview.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/game/overview.js b/scripts/game/overview.js index 3c821707c..9738984a2 100644 --- a/scripts/game/overview.js +++ b/scripts/game/overview.js @@ -8,7 +8,7 @@ steem.api.getDiscussionsByCreated({"tag": "steemnova", "limit": 3}, function(err $('#feed_'+i).css('display', ''); $('#created_'+i).text(discussion['created'].replace("T", " ")); $('#title_'+i).text(discussion['title']); - $('#url_'+i).attr('href', 'https://chainbb.com' + discussion['url']); + $('#url_'+i).attr('href', 'https://busy.org' + discussion['url']); $('#author_'+i).text(' by @' + discussion['author']); } } else { @@ -39,4 +39,4 @@ $(document).ready(function() } }); }, 1000); -}); \ No newline at end of file +}); From b9faccfe06aaf3b492dd4480b67207bd7e183185 Mon Sep 17 00:00:00 2001 From: mys Date: Wed, 28 Mar 2018 00:36:06 +0200 Subject: [PATCH 32/33] Apostrophe typo --- language/en/INGAME.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/language/en/INGAME.php b/language/en/INGAME.php index 72ec74195..f2cea2dc2 100644 --- a/language/en/INGAME.php +++ b/language/en/INGAME.php @@ -396,7 +396,7 @@ $LNG['bd_lvl'] = 'Level'; $LNG['bd_research'] = 'Research for'; $LNG['bd_shipyard_required'] = 'You need to build a Shipyard first'; -$LNG['bd_building_shipyard'] = "Cannot build ships until Shipyard upgrade is completed.'; +$LNG['bd_building_shipyard'] = 'Cannot build ships until Shipyard upgrade is completed.'; $LNG['bd_available'] = 'Available: '; $LNG['bd_build_ships'] = 'Build'; $LNG['bd_protection_shield_only_one'] = 'You can only build one shield!'; From dfa991cc4da6254b3b4d35a82d1bee4ff4d9e5dc Mon Sep 17 00:00:00 2001 From: mys Date: Wed, 28 Mar 2018 09:12:24 +0200 Subject: [PATCH 33/33] php7.0-curl library in README install instructions For SteemConnect auth --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 43a98ce88..905b599f7 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ SteemNova expansion goes as follows: ## Local installation - Clone the repo: `git clone https://github.com/steemnova/steemnova` -- Install components: `apt-get install apache2 php7.0 php7.0-gd php7.0-fpm php7.0-mysql libapache2-mod mysql-server` +- Install components: `apt-get install apache2 php7.0 php7.0-gd php7.0-fpm php7.0-mysql php7.0-curl libapache2-mod mysql-server` - Install [php-ds extension](https://github.com/php-ds/extension) - `apt-get install php-pear php7.0-dev` - pecl install ds