Skip to content

Commit

Permalink
Merge pull request #10 from OGSteam/develop
Browse files Browse the repository at this point in the history
Use of hyperspace technology to calculate the number of pt/gt. ( Close issue #9 )
  • Loading branch information
Choubakawa authored Sep 28, 2019
2 parents cc8bfc8 + 073826f commit 496f198
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 5 deletions.
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,8 @@
- Hide "Moon" choice menu if no moon detected for the user
- Fix typos issues in uninstall.php + define "$mod_uninstall_table" to NULL (no DB created, avoid unexpected results if not supplied)
- Fix typos error in FR lang file
- Removed unnecessary files
- Removed unnecessary files

### OGSCalc V2.0.6

- Use of hyperspace technology to calculate the number of pt/gt
5 changes: 3 additions & 2 deletions js/ogscalc.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ var nanitesUser = {};
var uDRUser = {};
var cSPUser = {};
var labUser = 0;
var capaPT = 5000;
var capaGT = 25000;
var capaPT = 5000 + ( 5000 * HyperespaceLevelUser * 0.05 );
var capaGT = 25000 + ( 25000 * HyperespaceLevelUser * 0.05 );

var metalRate = document.getElementById( "metal_rate" );
var crystalRate = document.getElementById( "crystal_rate" );
Expand Down Expand Up @@ -262,6 +262,7 @@ function keepOnlyNumber( value ) {
}

function initOGSCalc() {

getLevelsOfUser();
initHtml();
showProductionConverted();
Expand Down
3 changes: 2 additions & 1 deletion ogscalc.php
Original file line number Diff line number Diff line change
Expand Up @@ -794,7 +794,8 @@
<script type="text/javascript">
var speedUni = "<?php echo $server_config['speed_uni']; ?>";
var IonsLevelUser = "<?php echo $Ions = $user_technology['Ions'] != '' ? $user_technology['Ions'] : '0'; ?>";
var RRILevelUser = "<?php echo $Ions = $user_technology['RRI'] != '' ? $user_technology['RRI'] : '0'; ?>";
var RRILevelUser = "<?php echo $Ions = $user_technology['RRI'] != '' ? $user_technology['RRI'] : '0'; ?>";
var HyperespaceLevelUser = "<?php echo $Ions = $user_technology['Hyp'] != '' ? $user_technology['Hyp'] : '0'; ?>";
var view = "<?php echo $view; ?>";
var productionUser = <?php echo json_encode($user_production['reel']); ?>;
var metalPerHour = parseInt(<?php echo $prodMetal; ?>, 10);
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
OGSCalc
2.0.5
2.0.6
OGSCalc,OGSCalc,ogscalc,ogscalc,ogscalc.php,1,0
3.3.2

0 comments on commit 496f198

Please sign in to comment.