Merge branch 'master' into Missing-aliases-for-Jcc-instruction-family-#190

Plugin Radioactive Cloud/src/main/java/net/simon987/pluginradioactivecloud/RadioactiveCloud.java

@@ -1,4 +1,32 @@
 package net.simon987.pluginradioactivecloud;
 
-public class RadioactiveCloud {
+import net.simon987.server.GameServer;
+import net.simon987.server.game.objects.ControllableUnit;
+import net.simon987.server.game.objects.Enterable;
+import net.simon987.server.game.objects.GameObject;
+import net.simon987.server.game.objects.Radioactive;
+
+public class RadioactiveCloud extends GameObject implements Radioactive, Enterable {
+    private final static int CORRUPTION_BLOCK_SIZE =
+            GameServer.INSTANCE.getConfig().getInt("radioactive_cloud_corruption_block_size");
+
+    /**
+     * Called when an object attempts to walk directly into a Enterable object
+     *
+     * @param object The game object that attempted to enter
+     * @return true if successful, false to block the object
+     */
+    @Override
+    public boolean enter(GameObject object) {
+        if (object instanceof ControllableUnit) {
+            ((ControllableUnit) object).getCpu().getMemory().corrupt(CORRUPTION_BLOCK_SIZE);
+        }
+
+        return true;
+    }
+
+    @Override
+    public char getMapInfo() {
+        return 0;
+    }
 }

Server/pom.xml

@@ -114,7 +114,7 @@
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-core</artifactId>
-            <version>5.1.5.RELEASE</version>
+            <version>5.1.11.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.sparkjava</groupId>

Server/src/main/resources/config.properties

@@ -93,6 +93,7 @@ electric_box_damage=5
 electric_box_energy_given=70
 #RadioactiveObstacle
 radioactive_obstacle_corruption_block_size=10
+radioactive_cloud_corruption_block_size=40
 
 #SecretKey
 secret_key=<your_secret_key>

Server/src/main/resources/templates/footer.vm

@@ -1,5 +1,5 @@
 <div class="container">
-    <span class="text-muted">©2019 Simon Fortier</span>
+    <span class="text-muted">©2020 simon987</span>
 </div>
 
 <script src="js/popper.min.js"></script>

Server/src/main/resources/templates/play.vm

@@ -32,10 +32,10 @@
                 </li>
                 <li class="nav-item">
                     <a class="nav-link regular-screen" target="_blank"
-                       href="https://join.slack.com/t/muchassemblyrequired/shared_invite/enQtMjY3Mjc1OTUwNjEwLTkyOTIwOTA5OGY4MDVlMGI4NzM5YzlhMWJiMGY1OWE2NjUxODQ1NWQ1YTcxMTA1NGZkYzNjYzMyM2E1ODdmNzg"><i
+                       href="https://join.slack.com/t/muchassemblyrequired/shared_invite/enQtMjY3Mjc1OTUwNjEwLWRjMjRkZTg2N2EyNWRjN2YyMDc0YzIyMTUyYzFiNTBmMTU3OGQ1ZjA0MWY0M2IyYjUxZTA4NjRkMWVkNDk2NzY"><i
                             class="mi">chat</i> Slack</a>
                     <a class="nav-link small-screen" target="_blank"
-                       href="https://join.slack.com/t/muchassemblyrequired/shared_invite/enQtMjY3Mjc1OTUwNjEwLTkyOTIwOTA5OGY4MDVlMGI4NzM5YzlhMWJiMGY1OWE2NjUxODQ1NWQ1YTcxMTA1NGZkYzNjYzMyM2E1ODdmNzg"><i
+                       href="https://join.slack.com/t/muchassemblyrequired/shared_invite/enQtMjY3Mjc1OTUwNjEwLWRjMjRkZTg2N2EyNWRjN2YyMDc0YzIyMTUyYzFiNTBmMTU3OGQ1ZjA0MWY0M2IyYjUxZTA4NjRkMWVkNDk2NzY"><i
                             class="mi">chat</i></a>
                 </li>
                 <li class="nav-item">

jenkins/Jenkinsfile

@@ -1,33 +0,0 @@
-def remote = [:]
-remote.name = 'remote'
-remote.host = env.DEPLOY_HOST
-remote.user = env.DEPLOY_USER
-remote.identityFile = '/var/lib/jenkins/.ssh/id_rsa'
-remote.knownHosts = '/var/lib/jenkins/.ssh/known_hosts'
-remote.allowAnyHosts = true
-remote.retryCount = 3
-remote.retryWaitSec = 3
-logLevel = 'FINER'
-remote.port = 2299
-
-pipeline {
-    agent any
-    stages {
-        stage('Build') {
-			steps {
-				sh './jenkins/build.sh'
-				//stash includes: 'target/', name: 'target'
-			}
-        }
-        stage('Deploy') {
-            steps {
-				//unstash 'target'
-				sshCommand remote: remote, command: 'rm -rf mar/target mar/deploy.sh'
-				sshPut remote: remote, from: 'target', into: 'mar'
-				sshPut remote: remote, from: 'jenkins/deploy.sh', into: 'mar/deploy.sh'
-				sshCommand remote: remote, command: 'chmod +x mar/deploy.sh && ./mar/deploy.sh'
-            }
-        }
-   	}
-}
-

jenkins/build.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-mvn package

jenkins/deploy.sh

@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-export MARROOT="mar"
-
-screen -S mar -X quit
-echo "Starting MAR"
-
-cp ${MARROOT}/marConfig.properties ${MARROOT}/target/config.properties
-cp -r ${MARROOT}/marCerts/ ${MARROOT}/target/certificates
-
-screen -S mar -d -m bash -c "cd ${MARROOT}/target && java -jar server-*.jar"
-sleep 1
-screen -list