Added Settings

Author: Joonardo

.cache-main

@@ -4,5 +4,6 @@
 	<classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="lib" path="/usr/share/scala/lib/scala-swing_2.11-1.0.2.jar"/>
+	<classpathentry kind="lib" path="/usr/share/scala/lib/scala-xml_2.11-1.0.4.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

.classpath

@@ -5,6 +5,7 @@
  */
 
 import java.awt.{Color, Graphics2D}
+import Settings._
 import Utils._
 import java.util.Random
 import math.{Pi, round, cos, sin, pow, abs, signum}
@@ -60,10 +61,9 @@ abstract class GameObject(val ownerOp : Option[Player]) {
 
 class Character(val owner : Player) extends GameObject(Some(owner)) with Hittable {
   var shouldMove = false
-  var health = 100
-  val maxHealth = 200
+  var health = InitialHealth
   var position = Rng.getPos()
-  val maxVelocity = 300.0
+  //val maxVelocity = 300.0
   var angVel = 0.0
   val maxAngVel = 2.0
   var left = true
@@ -87,9 +87,9 @@ class Character(val owner : Player) extends GameObject(Some(owner)) with Hittabl
     this.owner.alive = false
     this.owner.died = System.currentTimeMillis()
     if(this.owner != destroyer)
-      destroyer.score += 40
+      destroyer.score += Bounty
     else
-      destroyer.score -= 30
+      destroyer.score -= SuicidePenalty
   }
 
   def shoot() = this.weapon.fire()
@@ -149,15 +149,15 @@ class Character(val owner : Player) extends GameObject(Some(owner)) with Hittabl
     //Move
 
     if(this.shouldMove){
-      this.velocity += Vector.polar(dir, 400*dt)
+      this.velocity += Vector.polar(dir, Acceleration*dt)
     }
-    this.velocity *= pow(.25, dt)
+    this.velocity *= pow(Friction, dt)
     this.position = this.position + this.velocity*dt
 
     this.dir = this.dir % (2*Pi)
     checkCollision()
-    if(this.health > this.maxHealth){
-      this.health = this.maxHealth
+    if(this.health > MaxHealth){
+      this.health = MaxHealth
     }
   }
 }

src/GameObject.scala

@@ -6,12 +6,11 @@
 
 //import scala.swing.event.Key.Value
 
-import Utils._
+import Settings._
 
 class Player(val key : String) {
   var alive = true
   var died = 0L
-  val respawnTime = 5000 //5s
   var character = new Character(this)
   private var keyDown = false
   GameObjectRoot.addGameObject(this.character)
@@ -47,11 +46,11 @@ class Player(val key : String) {
   }
 
   def tryRespawn() = {
-    if(!this.alive && System.currentTimeMillis() - this.died > this.respawnTime){
+    if(!this.alive && System.currentTimeMillis() - this.died > RespawnTime){
       this.character = new Character(this)
       GameObjectRoot.addGameObject(this.character)
       this.alive = true
-      this.end = System.currentTimeMillis() // Prevent kicking
+      //this.end = System.currentTimeMillis() // Prevent kicking
     }
   }
 

src/Player.scala

@@ -13,6 +13,7 @@ import java.awt.{Color, Image}
 import java.awt.geom.Ellipse2D
 import javax.imageio.ImageIO
 import Utils._
+import Settings._
 
 abstract class Powerup extends GameObject(None) with Hittable {
   val pic : Image
@@ -40,15 +41,15 @@ object Powerup {
     classOf[ScorePackage]
   )
   def random() = {
-    val v = round(Rng.getFloat()*(powerups.size - 1))
+    val v = round(Rng.getFloat()*(this.powerups.length-1))
     powerups(v).newInstance().asInstanceOf[Powerup]
   }
 }
 
 class HealthPackage extends Powerup {
   val pic = ImageIO.read(new File("src/Media/HealthPackage.png"))
   def collect(c : Character) = {
-    c.health += 40
+    c.health += ((PowerupAttr(this.getClass) \ "@health") text).toInt
     this.destroy(c.owner)
   }
 }
@@ -74,14 +75,19 @@ object WeaponsDealer {
   )
 
   def deal() = {
-    this.weapons(toInt((this.weapons.length - 1)*Rng.getFloat())).asInstanceOf[Class[Weapon]]
+    var tmp = EnabledWeapons
+    /*val xml = WeaponAttr(classOf[])
+    for(w <- this.weapons){
+      if(
+    }*/
+    tmp(toInt((tmp.length - 1)*Rng.getFloat())).asInstanceOf[Class[Weapon]]
   }
 }
 
 class ScorePackage extends Powerup {
   val pic = ImageIO.read(new File("src/Media/ScorePackage.png"))
   def collect(c : Character) = {
-    c.owner.score += 30
+    c.owner.score += ((PowerupAttr(this.getClass) \ "@score") text).toInt
     this.destroy(c.owner)
   }
 }

src/Powerup.scala

@@ -5,12 +5,13 @@
  */
 
 import java.util.Random
+import Settings._
 
 object Rng {
   val rng = new Random()
 
   def getPos() = Vector.normal(50 + rng.nextFloat() * (GameObjectRoot.areaWidth - 100), 50 + rng.nextFloat() * (GameObjectRoot.areaHeight - 100))
   //def getInt(from : Int, to : Int) : Int = from + math.round((to - from)*rng.nextFloat())
   def getFloat() = rng.nextFloat()
-  def nextPowerupSpawnTime = System.currentTimeMillis() + 3000 + rng.nextInt(10000)
+  def nextPowerupSpawnTime = System.currentTimeMillis() + PowerupMinTime + rng.nextInt(PowerupInterval)
 }

src/Random.scala

@@ -1,9 +1,38 @@
+
 import math.round
-import scala.swing._
+import scala.xml.XML
+import scala.collection.mutable.Buffer
 
 object Utils {
   def toInt(a : Double) = round(a).asInstanceOf[Int]
   val FONT_WIDTH = 6
   val FONT_HEIGHT = 7
-  val KickThreshold = 15000L
+}
+
+object Settings {
+  private var xml = XML.loadFile("src/settings.xml")
+  //private var playerPath = xml \\ "settings" \\ "player"
+  
+  def reload() = xml = XML.loadFile("src/settings.xml")
+  
+  def Bounty = ((xml \\ "settings" \\ "score" \\ "@bounty") text).toInt
+  def SuicidePenalty = ((xml \\ "settings" \\ "score" \\ "@suicidePenalty") text).toInt
+  def KickThreshold = ((xml \\ "settings" \\ "player" \ "@KickThreshold") text).toLong * 1000
+  def RespawnTime = ((xml \\ "settings" \\ "player" \ "@RespawnTime") text).toLong * 1000
+  def SpawnProtection = ((xml \\ "settings" \\ "character" \ "@SpawnProtection") text).toLong * 1000
+  def Ammo(w : Class[_]) = ((xml \\ "settings" \\ "weapon" \\ w.getCanonicalName \ "@ammo") text).toInt
+  def InitialHealth = ((xml \\ "settings" \\ "character" \\ "@initialHealth") text).toInt
+  def MaxHealth = ((xml \\ "settings" \\ "character" \\ "@maxHealth") text).toInt
+  def Acceleration = ((xml \\ "settings" \\ "character" \\ "@acceleration") text).toInt
+  def Friction = ((xml \\ "settings" \\ "character" \\ "@friction") text).toDouble
+  def PowerupMinTime = ((xml \\ "settings" \\ "powerup" \\ "@minTime") text).toInt * 1000
+  def PowerupInterval = ((xml \\ "settings" \\ "powerup" \\ "@interval") text).toInt * 1000
+  def PowerupAttr(c : Class[_]) = xml \\ "settings" \\ "powerup" \\ c.getCanonicalName
+  def EnabledWeapons = {
+    val items = PowerupAttr(classOf[WeaponPackage])
+    val enabled = items.flatMap { x => x.attributes }.map{x => if(x.value.text.toBoolean) Some(x.key) else None}
+    val res = Buffer[Class[_]]()
+    enabled.foreach { x => if(x.isDefined) res += Class.forName(x.get.asInstanceOf[String]) }
+    res
+  }
 }

src/Utils.scala

@@ -8,7 +8,6 @@
 import scala.collection.mutable.Buffer
 
 class Colt45(owner : Player) extends Weapon(owner) {
-  var ammo = -1
   def fire() = {
     val c = this.holder
     val p = this.owner
@@ -17,7 +16,6 @@ class Colt45(owner : Player) extends Weapon(owner) {
 }
 
 class Shotgun(owner : Player) extends Weapon(owner) {
-  var ammo = 15
   val scattering = math.Pi/6.0
   def fire() = {
     this.ammo -= 1
@@ -40,7 +38,6 @@ class Shotgun(owner : Player) extends Weapon(owner) {
 }
 
 class AK47(owner : Player) extends Weapon(owner) {
-  var ammo = 100
   var shouldShoot = false
   val shootingInterval = 50L
   private var lastShot = System.currentTimeMillis()
@@ -64,5 +61,4 @@ class AK47(owner : Player) extends Weapon(owner) {
 }
 
 abstract class MissileLauncher(owner : Player) extends Weapon(owner){
-  ammo = 3
 }

src/WeaponImplementations.scala

@@ -6,6 +6,7 @@
 
 import scala.swing.Graphics2D
 import Utils._
+import Settings._
 
 abstract class Bullet(owner : Player, val dir : Double, var position : Vector) extends GameObject(Some(owner)) {
   val _lifetime : Long
@@ -46,7 +47,7 @@ abstract class Bullet(owner : Player, val dir : Double, var position : Vector) e
 }
 
 abstract class Weapon(owner : Player) {
-  var ammo : Int
+  var ammo = Ammo(this.getClass)
   val shootingThreshold = 200L
   def holder = owner.character
   def fire() : Unit

src/WeaponSuperClasses.scala

@@ -0,0 +1,13 @@
+<settings>
+	<score suicidePenalty="30" bounty="40"></score>
+	<character initialHealth="100" maxHealth="200" acceleration="400" friction="0.25" SpawnProtection="5"></character>
+	<weapon>
+		<AK47 ammo="100"></AK47>
+		<Shotgun ammo="15">
+		</Shotgun>
+		<Colt45 ammo="-1"></Colt45></weapon>
+	<powerup minTime="0" interval="3">
+		<ScorePackage score="30"></ScorePackage>
+		<WeaponPackage AK47="true" Shotgun="false"></WeaponPackage>
+		<HealthPackage health="40"></HealthPackage></powerup>
+	<player KickThreshold="15" RespawnTime="5"></player></settings>