commits for 7.5.0 pre-release tarball

[xconq] / lib / ww2-adv.g

diff --git a/lib/ww2-adv.g b/lib/ww2-adv.g
index 7c079f2cf63434cf05f7eb974aaf7aa98baf13a1..a6984d24b81507e2708c1ea34bf0b67c4759924d 100644 (file)
--- a/lib/ww2-adv.g
+++ b/lib/ww2-adv.g
@@ -1,8 +1,12 @@
 (game-module "ww2-adv"
-  (title "WWII Advanced")
+  (title "WWII Strategic Level")
   (version "1.1")
-  (blurb "base module for strategic-level WWII")
-  )
+  (blurb "Base module for strategic level WWII games. Uses armies and fleets as smallest units.")
+  (picture-name "tank-column")
+  (variants (world-seen true) (see-all false) (sequential false)
+   ("Last Alliance Wins" last-alliance-wins true
+     (true (scorekeeper (do last-alliance-wins)))))
+)
 
 ;;; Types.
 
@@ -101,7 +105,7 @@
   ;; Disable occupancy by default.
   (u* u* 99)
   (ground-types (convoy fleet) 1)
-  (ground-types place-types 20)
+  (ground-types place-types 10)
   (air-types (convoy fleet cv-fleet) 1)
   (air-types place-types 1)
   (ship-types place-types 1)
@@ -211,6 +215,10 @@
 
 ;;; Construction.
 
+(table can-toolup-for
+  (builders u* true)
+  )
+
 (table acp-to-toolup
   (builders u* 1)
   )
@@ -241,6 +249,13 @@
   (ground-types base 1)
   )
 
+(table can-create
+  (builders ground-types 1)
+  (builders air-types 1)
+  (builders ship-types 1)
+  (ground-types base 1)
+  )
+
 (table cp-on-creation
   (builders ground-types 1)
   (builders air-types 1)
@@ -248,6 +263,12 @@
   (ground-types base 1)
   )
 
+(table can-build
+  (builders ground-types 1)
+  (builders air-types 1)
+  (builders ship-types 1)
+  )
+
 (table acp-to-build
   (builders ground-types 1)
   (builders air-types 1)
@@ -426,7 +447,7 @@
   (air-types planes (100 50 100))
   )
 
-(table consumption-per-attack
+(table consumption-per-fire
   (air-types oil 50)
   (air-types planes 10)
   )
@@ -483,23 +504,40 @@
 
 (add place-types lost-vanish-chance 0)
 
+(set initial-date "Sep 1939")
+
+;; Need this to be month 9.
+
+(set initial-year-part 8)
+
 ;;; The world.
 
 (world 360 (year-length 12))
 
 ;;; Sides.
 
+(set sides-max 10)
+
+(include "ng-asian")
+(include "ng-european")
+(include "ng-english")
+(include "ng-german")
+(include "ng-american")
+(include "ng-chinese")
+(include "ng-japanese")
+(include "ng-italian")
+
 (set side-library '(
-  ((name "USA") (adjective "American") (emblem-name "flag-usa"))
-  ((name "UK") (adjective "British") (emblem-name "flag-uk"))
-  ((name "USSR") (adjective "Soviet") (emblem-name "flag-ussr"))
-  ((name "France") (adjective "French") (emblem-name "flag-france"))
-  ((name "Germany") (adjective "German") (emblem-name "flag-swastika"))
-  ((name "Italy") (adjective "Italian") (emblem-name "flag-italy"))
-  ((name "Japan") (adjective "Japanese") (emblem-name "flag-japan"))
-  ((name "China") (adjective "Chinese") (emblem-name "flag-china-old"))
-  ((name "Spain") (noun "Spaniard") (adjective "Spanish") (emblem-name "flag-spain"))
-  ((name "Turkey") (adjective "Turkish") (emblem-name "flag-turkey"))
+  ((name "USA") (adjective "American") (emblem-name "flag-usa") (unit-namers (place-types "american-place-names")))
+  ((name "UK") (adjective "British") (emblem-name "flag-uk") (unit-namers (place-types "english-place-names")))
+  ((name "USSR") (adjective "Soviet") (emblem-name "flag-ussr") (unit-namers (place-types "russian-place-names")))
+  ((name "France") (adjective "French") (emblem-name "flag-france") (unit-namers (place-types "french-place-names")))
+  ((name "Germany") (adjective "German") (emblem-name "flag-swastika") (unit-namers (place-types "german-place-names")))
+  ((name "Italy") (adjective "Italian") (emblem-name "flag-italy") (unit-namers (place-types "italian-place-names")))
+  ((name "Japan") (adjective "Japanese") (emblem-name "flag-japan") (unit-namers (place-types "japanese-place-names")))
+  ((name "China") (adjective "Chinese") (emblem-name "flag-china-old") (unit-namers (place-types "chinese-place-names")))
+  ((name "Spain") (noun "Spaniard") (adjective "Spanish") (emblem-name "flag-spain") (unit-namers (place-types "spanish-place-names")))
+  ((name "Turkey") (adjective "Turkish") (emblem-name "flag-turkey") (unit-namers (place-types "turkish-place-names")))
   ))
 
 (set calendar '(usual month))