Merge pull request #270 from hydroflame/fix-travelToCity

made travel cost a constant and prevent travelToCity from traveling i…
This commit is contained in:
danielyxie 2018-06-04 09:09:39 -05:00 committed by GitHub
commit f28ffcc49e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 7 deletions

@ -14,6 +14,8 @@ let CONSTANTS = {
BaseCostFor1GBOfRamServer: 55000, //1 GB of RAM
BaseCostFor1GBOfRamHacknetNode: 30000,
TravelCost: 200000,
BaseCostForHacknetNode: 1000,
BaseCostForHacknetNodeCore: 500000,

@ -1823,32 +1823,32 @@ function initLocationButtons() {
});
travelToAevum.addEventListener("click", function() {
travelBoxCreate(Locations.Aevum, 200000);
travelBoxCreate(Locations.Aevum, CONSTANTS.TravelCost);
return false;
});
travelToChongqing.addEventListener("click", function() {
travelBoxCreate(Locations.Chongqing, 200000);
travelBoxCreate(Locations.Chongqing, CONSTANTS.TravelCost);
return false;
});
travelToSector12.addEventListener("click", function() {
travelBoxCreate(Locations.Sector12, 200000);
travelBoxCreate(Locations.Sector12, CONSTANTS.TravelCost);
return false;
});
travelToNewTokyo.addEventListener("click", function() {
travelBoxCreate(Locations.NewTokyo, 200000);
travelBoxCreate(Locations.NewTokyo, CONSTANTS.TravelCost);
return false;
});
travelToIshima.addEventListener("click", function() {
travelBoxCreate(Locations.Ishima, 200000);
travelBoxCreate(Locations.Ishima, CONSTANTS.TravelCost);
return false;
});
travelToVolhaven.addEventListener("click", function() {
travelBoxCreate(Locations.Volhaven, 200000);
travelBoxCreate(Locations.Volhaven, CONSTANTS.TravelCost);
return false;
});

@ -2473,7 +2473,11 @@ function NetscriptFunctions(workerScript) {
case Locations.NewTokyo:
case Locations.Ishima:
case Locations.Volhaven:
Player.loseMoney(200000);
if(Player.money.lt(CONSTANTS.TravelCost)) {
workerScript.scriptRef.log("ERROR: not enough money to travel with travelToCity().");
throw makeRuntimeRejectMsg(workerScript, "ERROR: not enough money to travel with travelToCity().");
}
Player.loseMoney(CONSTANTS.TravelCost);
Player.city = cityname;
Player.gainIntelligenceExp(CONSTANTS.IntelligenceSingFnBaseExpGain);
if (workerScript.disableLogs.ALL == null && workerScript.disableLogs.travelToCity == null) {