Merge pull request #79 from neutronc/rails_2_maintenance

Rails 2 maintenance

Author: neutronc

1835_20200301_2250_Hakko.rails

@@ -36,7 +36,7 @@ buildscript {
 // reference: https://github.com/johnrengelman/shadow
 plugins {
   id 'java' // or 'groovy' Must be explicitly applied
-  id 'com.github.johnrengelman.shadow' version '2.0.1'
+  id 'com.github.johnrengelman.shadow' version '5.0.0'
 }
 
 // Addition of macAppBundle
@@ -131,124 +131,7 @@ task makeDevelopVersion(type: Copy) {
 	into resourceFilesDir
 }
 
-// The following implements a creation of a Webstart version
-// refer to http://www.apprenticeshipnotes.org/2013/01/generating-webstart-files-using-gradle.html
-// and http://java.dzone.com/articles/java-web-start-jnlp-hello
 
-task createBuildDir << {
-    def dir = new File("${webstartBuildDir}")
-    if (!dir.exists()) {
-      dir.mkdirs()
-    }
-}
-
-task (copyJarFiles, type:Copy, dependsOn:[jar, createBuildDir]) {
-//	the next line is required if we have several jars
-    from configurations.runtime
-    from("${buildDir}/libs")
-    into("${webstartBuildDir}")
-    include('*.jar')
-}
-
-task (updateManifest, dependsOn: copyJarFiles) << {
-    def buildFiles = fileTree(dir: "${webstartBuildDir}", include:"**/*.jar")
-    buildFiles.each {
-      ant.jar(destfile: it, update: true) {
-	delegate.manifest {
-	  attribute(name: "Permissions", value: "all-permissions")
-	  attribute(name: "Codebase", value: "${railsCodebase}")
-	  attribute(name: "Application-Name", value: "${name}") 
-	  attribute(name: "Trusted-Only", value: "true")
-	}
-      }
-    }
-}
-
-task (signAll, dependsOn: updateManifest) << {
-    def libFiles = fileTree(dir: "${webstartBuildDir}", include:"**/*.jar")
-    libFiles.each {
-        ant.signjar(
-                alias: "${keyAlias}",
-                jar: it,
-		keystore: "${keystoreFile}",
-		storepass: "rails18xx",
-                preservelastmodified: "true",
-		lazy: "true")
-    }
-}
-
-task createWebStartDir << {
-    def dir = new File("${webstartDestDir}")
-    if (!dir.exists()) {
-      dir.mkdirs()
-    }
-}
-
-task(generateWebStartFiles, type:Copy, dependsOn: [createWebStartDir, signAll]) {
-    from("${webstartBuildDir}")
-    into("${webstartDestDir}")
-    include('*.jar')
-}
-
-task generateWebStartJnlp() << {
-    File jnlpTemplateFile = new File("${buildFilesDir}/template.jnlp")
-    def root = new XmlParser().parse(jnlpTemplateFile)
-    def jnlpFileName = "${sourceforgeJnlpFileName}"
-    
-    // Setting values in the jnlp template
-    // Setting root values
-    
-    // Http CodeBase
-    root.@codebase = sourceforgeJnlpPath
-    root.@href = jnlpFileName
-
-    // Setting information values
-    def information = root.information[0]
-    
-    def title = information.title[0]
-    title.setValue("${project.name}")
-    
-    def vendor = information.vendor[0]
-    vendor.setValue("${railsVendor}")
-    
-    def homepage = information.homepage[0]
-    homepage.@href = "${railsHomepage}"
-    
-    // Setting resources
-    def resource = root.resources[0]
-    def j2se = resource.j2se[0]
-    j2se.@version = "1.6+"
-    
-    def collection = fileTree(dir:"${webstartBuildDir}", include:"**/*.jar")
-    def mainJar = 'rails.jar'
-
-    collection.each {
-        def resourceValues = [href: it.name]
-        if (mainJar == it.name) {
-            resourceValues = [href: it.name, main: 'true']
-        }
-        resource.appendNode('jar', resourceValues)
-    }
-    
-    // Setting the main class
-    def applicationDesc = root.'application-desc'[0]
-    applicationDesc.'@main-class' = "$railsMainClass"
-    
-    // Writing the jnlp file filled
-    File jnlpFile = new File("${webstartDestDir}/" + jnlpFileName)
-    new XmlNodePrinter(new PrintWriter(jnlpFile)).print(root)
-}
-
-// upload via ant task
-task uploadWebstart() << {
-  ant.scp(todir:"${sourceforgeUserName}:${sfpwd}@${sourceforgeUploadPath}") {
-    fileset(dir:"${webstartDestDir}")
-  }
-}
-
-task cleanWebstart (type:Delete, dependsOn:clean) {
-  delete "${webstartBuildDir}", "${webstartDestDir}"
-}
 
 launch4j {
     mainClassName = "${railsMainClass}"

build.gradle

@@ -16,7 +16,7 @@
  */
 public class PlayerShareUtils {
 
-    public static SortedSet<Integer> sharesToSell (PublicCompany company, Player player) {
+	public static SortedSet<Integer> sharesToSell (PublicCompany company, Player player) {
 
         if (company.hasMultipleCertificates()) {
             if (player == company.getPresident()) {
@@ -88,13 +88,18 @@ private static SortedSet<Integer> presidentSellMultiple(PublicCompany company, P
         Player potential = company.findPlayerToDump();
         int potentialShareNumber = potential.getPortfolioModel().getShare(company);
         int shareNumberDumpDifference = presidentShareNumber - potentialShareNumber;
+        boolean presidentShareOnly = false;
 
-        // ... if this is less than what the pool allows => goes back to non-president selling
-        int poolAllows = poolAllowsShareNumbers(company);
-        if (shareNumberDumpDifference <= poolAllows) {
-            return otherSellMultiple(company, president);
+        if (presidentCert.getShare() == presidentShareNumber)  { // Only President Share to be sold...
+            presidentShareOnly = true;
         }
 
+        // ... if this is less than what the pool allows => goes back to non-president selling only if non president share... (1835 or other multipe director shares...)
+        int poolAllows = poolAllowsShareNumbers(company);
+        if ((shareNumberDumpDifference <= poolAllows) && (!presidentShareOnly)) {
+            return otherSellMultiple(company, president);
+        } 
+                
         // second: separate the portfolio into other shares and president certificate
         ImmutableList.Builder<PublicCertificate> otherCerts = ImmutableList.builder();
         for (PublicCertificate c:president.getPortfolioModel().getCertificates(company)) {
@@ -124,7 +129,7 @@ private static SortedSet<Integer> presidentSellMultiple(PublicCompany company, P
                     // d is the amount sold in addition to standard shares, returned has the remaining part of the president share
                     int remaining = presidentCert.getShares() - d;
                     if (returnShareNumbers.contains(remaining)) {
-                        sharesToSell.add(s);
+                        sharesToSell.add(s+d);
                     }
                 } else {
                     break; // pool is full
@@ -175,8 +180,15 @@ public static List<PublicCertificate> findCertificatesToSell(PublicCompany compa
                     break;
                 }
             }
+                else if (cert.isPresidentShare() && cert.getShares()== shareUnits) {
+                    certsToSell.add(cert);
+                    nbCertsToSell--;
+                    if (nbCertsToSell == 0) {
+                        break;
+                }
+            }
         }
-        
+
         return certsToSell.build();
     }
 

src/main/java/net/sf/rails/game/PlayerShareUtils.java

@@ -237,7 +237,7 @@ public boolean sellShares(SellShares action) {
         int presSharesToSell = 0;
         int numberToSell = action.getNumber();
         int shareUnits = action.getShareUnits();
-
+        int presidentExchange = action.getPresidentExchange();
 
         // Dummy loop to allow a quick jump out
         while (true) {

src/main/java/net/sf/rails/game/ShareSellingRound.java

@@ -422,7 +422,9 @@ public void setSellableShares() {
                 Player potential = company.findPlayerToDump();
                 if (potential != null) {
                     dumpThreshold = ownedShare - potential.getPortfolioModel().getShareNumber(company) + 1;
-                    possibleSharesToSell = PlayerShareUtils.sharesToSell(company, currentPlayer);
+                  possibleSharesToSell = PlayerShareUtils.sharesToSell(company, currentPlayer);
+                    
+                    
                     dumpIsPossible = true;
                     log.debug("dumpThreshold = " + dumpThreshold);
                     log.debug("possibleSharesToSell = " + possibleSharesToSell);
@@ -445,8 +447,8 @@ public void setSellableShares() {
             SortedMultiset<Integer> certCount = playerPortfolio.getCertificateTypeCounts(company);
 
             // Make sure that single shares are always considered (due to possible dumping)
-            SortedSet<Integer> certSizeElements =Sets.newTreeSet(certCount.elementSet());
-            certSizeElements.add(1);
+            SortedSet<Integer> certSizeElements = Sets.newTreeSet(certCount.elementSet());
+            certSizeElements.add(1); 
 
             for (int shareSize:certSizeElements) {
                 int number = certCount.count(shareSize);
@@ -489,18 +491,36 @@ public void setSellableShares() {
                 if (number <= 0) {
                     continue;
                 }
+                
 
-                for (int i=1; i<=number; i++) {
-                    // check if selling would dump the company
-                    if (dumpIsPossible && i*shareSize >= dumpThreshold) {
-                        // dumping requires that the total is in the possibleSharesToSell list and that shareSize == 1
-                        // multiple shares have to be sold separately
-                        if (shareSize == 1 && possibleSharesToSell.contains(i*shareSize)) {
-                            possibleActions.add(new SellShares(company, shareSize, i, price, 1));
+                for (int i=1; i<=number; i++) { //For a president certificate only the number is 2.. but it may also be 2 if the player has more than just the president certificate..
+                    if(checkIfSplitSaleOfPresidentAllowed()) {
+                        // check if selling would dump the company
+                        if (dumpIsPossible && i*shareSize >= dumpThreshold) {
+                            // dumping requires that the total is in the possibleSharesToSell list 
+                            if (shareSize == 1 && possibleSharesToSell.contains(i*shareSize)) {
+                                possibleActions.add(new SellShares(company, shareSize, i, price, 1));
+                            }
+                        } else {
+                            // ... no dumping: standard sell
+                            possibleActions.add(new SellShares(company, shareSize, i, price, 0));
                         }
-                    } else {
-                        // ... no dumping: standard sell
-                        possibleActions.add(new SellShares(company, shareSize, i, price, 0));
+                    }
+                    else {
+                         if (dumpIsPossible && i*shareSize >= dumpThreshold) { 
+                             if ( certCount.isEmpty() && number == 2) {
+                         
+                             possibleActions.add(new SellShares(company, 2, 1, price, 1));  
+                             }
+                             else {
+                                 if (((!certCount.isEmpty()) && (number ==1) ) || number >2) {
+                                     possibleActions.add(new SellShares(company, shareSize, i, price, 1));
+                                 }
+                             }
+                         }
+                         else {
+                             possibleActions.add(new SellShares(company, shareSize, i, price, 0));
+                         }
                     }
                 }
             }
@@ -524,6 +544,11 @@ public void setSellableShares() {
         }
     }
 
+    protected boolean checkIfSplitSaleOfPresidentAllowed() {
+        // To be overwritten in Stockround Classes for games where that is not allowed e.g. 1835
+        return true;
+    }
+
     protected void setSpecialActions() {
 
         List<SpecialProperty> sps =
@@ -1053,6 +1078,17 @@ > getGameParameterAsInt(GameDef.Parm.POOL_SHARE_LIMIT)) {
                     numberToSell -= presidentShareNumbersToSell;
                 }
             }
+            else {
+               if (currentPlayer == company.getPresident() && shareUnits == 2) {
+                   dumpedPlayer = company.findPlayerToDump();
+                   if (dumpedPlayer != null) {
+                       presidentShareNumbersToSell = PlayerShareUtils.presidentShareNumberToSell(
+                               company, currentPlayer, dumpedPlayer, numberToSell+1);
+                       // reduce the numberToSell by the president (partial) sold certificate
+                       numberToSell -= presidentShareNumbersToSell;
+                   }
+               }
+            }
 
             certsToSell = PlayerShareUtils.findCertificatesToSell(company, currentPlayer, numberToSell, shareUnits);
 
@@ -1406,7 +1442,7 @@ protected void finishTurn() {
                 setAutopass (currentPlayer, false);
             } else {
                 // Process a pass for a player that has set Autopass
-        		done (null, currentPlayer.getId(), true);
+                done (null, currentPlayer.getId(), true);
             }
         }
     }
@@ -1614,14 +1650,14 @@ public String getRoundName() {
         return "StockRound " + getStockRoundNumber();
     }
 
-	public boolean isSellObligationLifted(PublicCompany company) {
+    public boolean isSellObligationLifted(PublicCompany company) {
         return sellObligationLifted != null
         && sellObligationLifted.contains(company);
     }
 
-	public void setSellObligationLifted (PublicCompany company) {
+    public void setSellObligationLifted (PublicCompany company) {
         if (sellObligationLifted == null) {
-			sellObligationLifted = HashSetState.create(this, "sellObligationLifted");
+            sellObligationLifted = HashSetState.create(this, "sellObligationLifted");
         }
         sellObligationLifted.add(company);
     }

src/main/java/net/sf/rails/game/StockRound.java

@@ -104,7 +104,7 @@ ImmutableMultimap<String, PublicCertificate> getCertificatesByType(PublicCompany
     SortedMultiset<Integer> getCertificateTypeCounts(PublicCompany company) {
         ImmutableSortedMultiset.Builder<Integer> certCount = ImmutableSortedMultiset.naturalOrder();
         for (PublicCertificate cert : getCertificates(company)) {
-            if (!cert.isPresidentShare()) {
+            if (!cert.isPresidentShare()) { 
                 certCount.add(cert.getShares());
             }
         }

src/main/java/net/sf/rails/game/model/CertificatesModel.java

@@ -229,7 +229,7 @@ public ImmutableList<PublicCertificate> getCertsOfType(String certTypeId) {
 
     /** 
      * @return a sorted Multiset<Integer> of shareNumbers of the certificates
-     * Remark: excludes the presdident share
+     * Remark: excludes the presdident share if not of a different size as the standard share...
      */
     // FIXME: Integers could be replaced later by CerficateTypes
     public SortedMultiset<Integer> getCertificateTypeCounts(PublicCompany company) {