Innate -> innate; Acquired -> acquired

godfat · Dec 13, 2010 · 55d35a6 · 55d35a6
1 parent 8cf9e1b
commit 55d35a6
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/bin/check.scala b/bin/check.scala
@@ -5,11 +5,11 @@ import org.scalacheck._
 import org.spbk.pure._
 
 object CheckElement extends Properties("Element"){
-  val gen = Gen.oneOf(Earth.Innate, Earth.Acquired,
-                      Water.Innate, Water.Acquired,
-                       Fire.Innate,  Fire.Acquired,
-                        Air.Innate,   Air.Acquired,
-                      Light.Innate, Light.Acquired)
+  val gen = Gen.oneOf(Earth.innate, Earth.acquired,
+                      Water.innate, Water.acquired,
+                       Fire.innate,  Fire.acquired,
+                        Air.innate,   Air.acquired,
+                      Light.innate, Light.acquired)
 
   implicit def arbEle: Arbitrary[Element] = Arbitrary(gen)
 

diff --git a/bin/test.scala b/bin/test.scala
@@ -10,7 +10,7 @@ import org.spbk.prelude._
 
 import scala.collection.immutable.TreeMap
 
-println(Fire.Innate(Water.Innate) == Ampify(-200)) // Ampify(-200)
+println(Fire.innate(Water.innate) == Ampify(-200)) // Ampify(-200)
 println(Footman.name == "Footman") // Footman
 println((Footman - Health(10)).state.health == Health(90)) // Health(90)
 println(Footman.state.health - Health(5) == Health(95)) // Health(95)

diff --git a/src/org/spbk/pure/CreatureMap.scala b/src/org/spbk/pure/CreatureMap.scala
@@ -5,7 +5,7 @@ import scala.collection.immutable.TreeMap
 
 package object pure{
   object Footman extends Creature( "Footman",
-                                   List(Fire.Innate),
+                                   List(Fire.innate),
                                    State(Health(100), Mana(10), Energy(50), Vigor(50),
                                    Strength(40), Constitution(20), Imagination(10), Will(10),
                                    Agility(15)),

diff --git a/src/org/spbk/pure/Terrain.scala b/src/org/spbk/pure/Terrain.scala
@@ -22,28 +22,28 @@ case class Plains(val state: State = StateTerrain) extends
 }
 
 case class Forest(val state: State = StateTerrain) extends
-  Terrain("Forest", List(Earth.Innate))
+  Terrain("Forest", List(Earth.innate))
 {
   type  This = Forest
   val create = Forest(_)
 }
 
 case class River(val state: State = StateTerrain) extends
-  Terrain("River",  List(Water.Innate))
+  Terrain("River",  List(Water.innate))
 {
   type  This = River
   val create = River(_)
 }
 
 case class Lava(val state: State = StateTerrain) extends
-  Terrain("Lava",   List(Fire.Innate))
+  Terrain("Lava",   List(Fire.innate))
 {
   type  This = Lava
   val create = Lava(_)
 }
 
 case class Valley(val state: State = StateTerrain) extends
-  Terrain("Valley", List(Air.Innate))
+  Terrain("Valley", List(Air.innate))
 {
   type  This = Valley
   val create = Valley(_)

diff --git a/src/org/spbk/pure/TraitElement.scala b/src/org/spbk/pure/TraitElement.scala
@@ -3,6 +3,6 @@ package org.spbk.pure
 
 trait TraitElement[T]{
   val create: Int => T            // abstract value
-  lazy val Innate   = create(100) // lazy value
-  lazy val Acquired = create(25)
+  lazy val innate   = create(100) // lazy value
+  lazy val acquired = create(25)
 }
diff --git a/src/org/spbk/rb/core-set.rb b/src/org/spbk/rb/core-set.rb
@@ -20,7 +20,7 @@ def array2list array
   }
 end
 
-$footman = Creature.new("Footman", array2list([Fire.Innate]),
+$footman = Creature.new("Footman", array2list([Fire.innate]),
                         State.new(Health.new(100),
                                   Mana.new(10),
                                   Energy.new(50),