Skip to content

Commit 0c0039f

Browse files
FieteFiete
Fiete
authored and
Fiete
committedSep 18, 2020
Added option "one unit on each ship"
1 parent ff1fc17 commit 0c0039f

File tree

5 files changed

+938
-872
lines changed

5 files changed

+938
-872
lines changed
 

‎ShipLoader/.build.number

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
#Build Number for ANT. Do not edit!
2-
#Tue Aug 04 14:55:16 CEST 2020
3-
build.number=62
1+
#Build Number for ANT. Do not edit!
2+
#Fri Sep 18 17:35:49 CEST 2020
3+
build.number=63

‎ShipLoader/etc/shiploaderplugin_resources.properties

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ plugin.shiploader.mainmenu.confirmorders.title = Confirm units
1717
plugin.shiploader.mainmenu.unconfirmorders.title = Unconfirm units
1818
plugin.shiploader.mainmenu.distribute.title = Distribute silver among units
1919
plugin.shiploader.mainmenu.execute.title = Load!
20+
plugin.shiploader.mainmenu.execute_one.title = Load one unit on each ship
2021
plugin.shiploader.mainmenu.help.title = Help
2122
plugin.shiploader.mainmenu.show.title = Show marked units and ships
2223

‎ShipLoader/etc/shiploaderplugin_resources_de.properties

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ plugin.shiploader.mainmenu.confirmorders.title = Einheiten best
1717
plugin.shiploader.mainmenu.unconfirmorders.title = Einheiten nicht bestätigen
1818
plugin.shiploader.mainmenu.distribute.title = Silber an Einheiten verteilen
1919
plugin.shiploader.mainmenu.execute.title = Beladung durchführen
20+
plugin.shiploader.mainmenu.execute_one.title = 1 Einheit pro Schiff
2021
plugin.shiploader.mainmenu.help.title = Hilfe
2122
plugin.shiploader.mainmenu.show.title = Markierte Einheiten und Schiffe zeigen
2223

‎ShipLoader/src/magellan/plugin/shiploader/ShipLoader.java

+913-868
Large diffs are not rendered by default.

‎ShipLoader/src/magellan/plugin/shiploader/ShipLoaderPlugin.java

+20-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,8 @@ public class ShipLoaderPlugin implements MagellanPlugIn, UnitContainerContextMen
110110
* @author stm
111111
*/
112112
public enum PlugInAction {
113-
EXECUTE("mainmenu.execute"), DISTRIBUTESILVER("mainmenu.distribute"), SHOW("mainmenu.show"),
113+
EXECUTE("mainmenu.execute"), EXECUTE_ONE("mainmenu.execute_one"), DISTRIBUTESILVER("mainmenu.distribute"), SHOW(
114+
"mainmenu.show"),
114115
CLEAR("mainmenu.clear"), CLEARORDERS("mainmenu.clearorders"),
115116
CONFIRMORDERS("mainmenu.confirm"), UNCONFIRMORDERS("mainmenu.unconfirm"),
116117
HELP("mainmenu.help"), UNKNOWN("");
@@ -232,6 +233,12 @@ public List<JMenuItem> getMenuItems() {
232233
executeMenu.addActionListener(this);
233234
menu.add(executeMenu);
234235

236+
final JMenuItem execute_oneMenu =
237+
new JMenuItem(getString("plugin.shiploader.mainmenu.execute_one.title"));
238+
execute_oneMenu.setActionCommand(PlugInAction.EXECUTE_ONE.getID());
239+
execute_oneMenu.addActionListener(this);
240+
menu.add(execute_oneMenu);
241+
235242
final JMenuItem distributeMenu =
236243
new JMenuItem(getString("plugin.shiploader.mainmenu.distribute.title"));
237244
distributeMenu.setActionCommand(PlugInAction.DISTRIBUTESILVER.getID());
@@ -380,6 +387,10 @@ public void actionPerformed(ActionEvent e) {
380387
execute();
381388
break;
382389
}
390+
case EXECUTE_ONE: {
391+
execute_one();
392+
break;
393+
}
383394
case DISTRIBUTESILVER: {
384395
distribute();
385396
break;
@@ -777,6 +788,14 @@ protected void execute() {
777788
}
778789
}
779790

791+
protected void execute_one() {
792+
loader.execute_one();
793+
if (loader.getErrors() > 0) {
794+
JOptionPane.showMessageDialog(client, getString("plugin.shiploader.message.loaderrors",
795+
new Integer[] { loader.getErrors() }));
796+
}
797+
}
798+
780799
/**
781800
* @see magellan.client.extern.MagellanPlugIn#quit(boolean)
782801
*/

0 commit comments

Comments
 (0)
Please sign in to comment.