Skip to content

Commit

Permalink
Merge pull request #52 from SilenceFactor/feature/loadouts
Browse files Browse the repository at this point in the history
Added loadout system
  • Loading branch information
Brent-Call authored Apr 10, 2024
2 parents 9dfbbc2 + 21ba5a2 commit 15678d7
Show file tree
Hide file tree
Showing 4 changed files with 894 additions and 3 deletions.
13 changes: 13 additions & 0 deletions game.js
Original file line number Diff line number Diff line change
Expand Up @@ -4601,6 +4601,11 @@ dojo.declare("com.nuclearunicorn.game.ui.GamePage", null, {
for (var i = 0; i < game.challenges.challenges.length; i++){
game.challenges.challenges[i].pending = false;
}
if(game.village.loadoutController.loadouts){
if(game.village.loadoutController.loadouts.length == 0){
game.village.loadoutController.toggleDefaultLoadouts();
}
}
game.resetAutomatic();
});
},
Expand Down Expand Up @@ -4907,6 +4912,13 @@ dojo.declare("com.nuclearunicorn.game.ui.GamePage", null, {
}
}
var reservesSaveData = this.challenges.reserves.getSaveData();

var loadouts = [];
for (var i in this.village.loadoutController.loadouts){
var _loadout = this.village.loadoutController.loadouts[i].save();
loadouts.push(_loadout);
}

var saveData = {
saveVersion: this.saveVersion,
game : lsData.game,
Expand Down Expand Up @@ -4962,6 +4974,7 @@ dojo.declare("com.nuclearunicorn.game.ui.GamePage", null, {
jobs: [],
traits: [],
hadKittenHunters: false,
loadouts: loadouts
},
workshop: {
hideResearched: this.workshop.hideResearched,
Expand Down
13 changes: 13 additions & 0 deletions js/jsx/left.jsx.js
Original file line number Diff line number Diff line change
Expand Up @@ -714,6 +714,19 @@ WPins = React.createClass({
});
}
}

for (var i in this.props.game.village.loadoutController.loadouts) {
var loadout = this.props.game.village.loadoutController.loadouts[i];

if (loadout.pinned){
pins.push({
title: $I("left.loadout.do", [loadout.title]),
handler: function(loadout){
loadout.setLoadout(true);
}.bind(this, loadout)
})
}
}
return pins;
},
render: function(){
Expand Down
Loading

0 comments on commit 15678d7

Please sign in to comment.