Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mercs now start with weapons in their inventory #110

Merged
merged 3 commits into from
Aug 27, 2016
Merged

Mercs now start with weapons in their inventory #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0bb8a10
Mercs now spawn with items
Aug 26, 2016
e763a39
Merge branch 'develop' of https://github.com/JGelfand/DestinationSol.…
Aug 26, 2016
fc22815
Inserted placeholder for mer equip stuff
Aug 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions main/res/configs/planets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
mercenaries: [
{
hull: pirateSmall,
items: "rep:1:3 s1",
items: "blaster|gun s1 rep:1:3",
money: 100,
},
],
Expand Down Expand Up @@ -156,7 +156,7 @@
mercenaries: [
{
hull: desertOrbiter,
items: "rep:1:3 s1",
items: "fixedBombGun a1:.25 rep:1:3",
money: 150,
},
],
Expand Down Expand Up @@ -211,4 +211,4 @@
},
],
},
}
}
5 changes: 5 additions & 0 deletions main/src/org/destinationsol/game/ship/SolShip.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,11 @@ private boolean tryCollectLoot(SolObject obj, SolGame game) {
boolean canAdd = c.canAdd(i);
if (canAdd) {
c.add(i);
if(c == myItemContainer&&myPilot.getMapHint()=="Merc")
{
//System.out.println("Merc could try to equip");
//insert equip code here, if it's something we want to do
}
}
return canAdd;
}
Expand Down