This is the mail archive of the xconq7@sources.redhat.com mailing list for the Xconq project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

fixes to advance.g


The enclosed patch fixes several problems with advance.g (wouldn't
normally include various unrelated things in one patch, but I wanted
to include the same form in which I play tested it).

What do people think?  In particular adjusting the advance costs is
one of those subjective things - there would be a lot of different
ways to address that problem.

2001-02-19  Jim Kingdon  <kingdon@panix.com>

	* lib/advances.g: Comment out lots of advances, the cash material,
	and the forum and marketplace units - they don't do anything.
	Keep the mostly-useless ones like ships, corvees, &c.  Make advances
	cost more at higher generations (otherwise the game degenerates
	into massive numbers of legions on each side around turn 25 or 30).
	Also require the navigation advance for the trireme so you don't
	the situation where you can build a trireme without canvas &c.
	* kernel/run.c (run_population): Comment out code which hardcodes
	the unit name "Granary" (the hardcoding is just too gross to live,
	but the whole concept seems odd, see comment for discussion).

Index: kernel/run.c
===================================================================
RCS file: /cvs/xconq/xconq/kernel/run.c,v
retrieving revision 1.64
diff -u -r1.64 run.c
--- run.c	2000/12/28 16:04:08	1.64
+++ run.c	2001/02/20 08:23:35
@@ -1667,11 +1667,20 @@
       Unit *occ;
 
       consump = unit->size * um_consumption_to_grow(u, m);
+#if 0
+      /* Wait a minute.  Building a Granary *both* increases our
+	 production and means we need less to grow?  I suspect mostly
+	 we are in more need of keeping growth under control, rather
+	 than making it easier to grow.  Not sure whether the utype
+	 property would be um_occ_mult_production or a new one, but
+	 the whole concept seems dubious to me; why the need to tweak
+	 both production and consumption_to_grow?  */
       for_all_occupants(unit, occ) {
 	/* (Should use utype property instead). */
 	if (strcmp(u_type_name(occ->type), "Granary") == 0)
 	  consump /= 2;
       }
+#endif
       /* Use up more supplies as required to prepare growth. */
       unit->supply[m] -= consump;
     }
Index: lib/advances.g
===================================================================
RCS file: /cvs/xconq/xconq/lib/advances.g,v
retrieving revision 1.16
diff -u -r1.16 advances.g
--- advances.g	2001/02/19 03:52:01	1.16
+++ advances.g	2001/02/20 08:23:39
@@ -216,9 +216,9 @@
 (unit-type temple (name "Temple")(image-name "parthenon"))
 (unit-type workshops (name "Workshops")(image-name "village"))
 (unit-type granary (name "Granary")(image-name "granary"))
-(unit-type marketplace (name "Marketplace")(image-name "camp"))
+;(unit-type marketplace (name "Marketplace")(image-name "camp"))
 (unit-type school (name "Scribal School")(image-name "parthenon"))
-(unit-type forum (name "Forum")(image-name "parthenon"))
+;(unit-type forum (name "Forum")(image-name "parthenon"))
 (unit-type ziggurat (name "Ziggurat")(image-name "nest"))
 (unit-type palace (name "Palace")(image-name "parthenon"))
 
@@ -253,18 +253,19 @@
 	(append infantry mounted siege complex naval))
 
 (define facilities
+	(granary temple school workshops stockade city-walls ziggurat palace
+	; forum marketplace
+	))
 
-	(granary marketplace temple school workshops forum stockade city-walls ziggurat palace))
 
 
-
 ;;;	MATERIAL TYPES
 
 
 (material-type food (name "Food")(image-name "sheaf")(resource-icon 1))
 (material-type ores (name "Ores")(image-name "shield")(resource-icon 2))
 (material-type ideas (name "Ideas")(image-name "arrows")(resource-icon 3))
-(material-type cash (name "Cash")(resource-icon 4))
+;(material-type cash (name "Cash")(resource-icon 4))
 
 
 
@@ -290,10 +291,10 @@
 		    "barter by distance possible, from which trade and other economic activities soon developed."))    
 )		    
 
-(advance-type einkorn (name "Einkorn Wheat")(help "Diplod Wheat")
-	(notes ("Man's first crop was Einkorn Wheat which is a variant of the diploid wild wheat that grows in the Zagros"
-		    "and Taurus mountains. It has a poor yield and is not used anywhere today."))
-)
+;(advance-type einkorn (name "Einkorn Wheat")(help "Diplod Wheat")
+;	(notes ("Man's first crop was Einkorn Wheat which is a variant of the diploid wild wheat that grows in the Zagros"
+;		    "and Taurus mountains. It has a poor yield and is not used anywhere today."))
+;)
 	
 (advance-type elders-council (name "Elders Council"))
 (advance-type flax (name "Flax"))
@@ -305,6 +306,9 @@
 (advance-type pottery (name "Pottery"))
 (advance-type shaman (name "The Shaman"))
 (advance-type sheep (name "The Sheep"))
+(add (barley carpentry cattle charcoal clay-token
+      elders-council flax handicraft hemp idolatry leatherworking
+      mud-brick pottery shaman sheep) rp 10)
 
 ;	2nd generation advances.
 
@@ -313,18 +317,18 @@
 (advance-type bellows (name "Bellows"))
 (advance-type construction (name "Construction"))
 (advance-type donkey (name "The Donkey"))
-(advance-type emmer (name "Emmer Wheat")(help "Tetraploid Wheat")
-	(notes ("Tetraploid Emmer Wheat originated as a species hybrid between Emmer Wheat and Goat Grass. It has"
-		    "mostly been replaced by Modern Wheat today but a variant of Emmer Wheat still survives as Durum"
-		    "Wheat which is used to make pasta."))
-)
+;(advance-type emmer (name "Emmer Wheat")(help "Tetraploid Wheat")
+;	(notes ("Tetraploid Emmer Wheat originated as a species hybrid between Emmer Wheat and Goat Grass. It has"
+;		    "mostly been replaced by Modern Wheat today but a variant of Emmer Wheat still survives as Durum"
+;		    "Wheat which is used to make pasta."))
+;)
 		    
-(advance-type gardening (name "Gardening"))
-(advance-type harness (name "The Harness"))
+;(advance-type gardening (name "Gardening"))
+;(advance-type harness (name "The Harness"))
 (advance-type kiln (name "The Kiln"))
 (advance-type loom (name "The Loom"))
 (advance-type pictograms (name "Pictograms"))
-(advance-type potash (name "Potash"))
+;(advance-type potash (name "Potash"))
 (advance-type potters-wheel (name "Potter's Wheel"))
 (advance-type priesthood (name "Priesthood"))
 (advance-type ropemaking (name "Ropemaking"))
@@ -332,6 +336,9 @@
 (advance-type tribal-law (name "Tribal Law"))
 (advance-type the-village (name "The Village"))
 (advance-type yoke (name "The Yoke"))
+(add (barter beer bellows construction donkey kiln loom
+      pictograms potters-wheel priesthood ropemaking spindle
+      the-village tribal-law yoke) rp 20)
 
 ;	3rd generation advances.
 
@@ -340,12 +347,12 @@
 (advance-type boatbuilding (name "Boatbuilding"))
 (advance-type canvas (name "Canvas"))
 (advance-type ceramics (name "Ceramics"))
-(advance-type cloth (name "Cloth"))
+;(advance-type cloth (name "Cloth"))
 (advance-type festival (name "Festival"))
 (advance-type furnace (name "The Furnace"))
-(advance-type herbal-lore (name "Herbal Lore"))
+;(advance-type herbal-lore (name "Herbal Lore"))
 (advance-type horse (name "The Horse"))
-(advance-type irrigation (name "Irrigation"))
+;(advance-type irrigation (name "Irrigation"))
 (advance-type market (name "The Market"))
 (advance-type mining (name "Mining"))
 (advance-type numbers (name "Numbers"))
@@ -353,14 +360,19 @@
 (advance-type shrine (name "The Shrine"))
 (advance-type sledge (name "The Sledge"))
 (advance-type syllabary (name "Syllabary"))
-(advance-type trance (name "Trance"))
-(advance-type wheat (name "Modern Wheat")(help "Hexaploid Wheat")
-	(notes ("A second species hybridization between Emmer Wheat and Goat Grass created the hexaploid Modern"
-		    "Wheat which is used in agriculture all over the world. It has a much better yield and hardiness than"
-		    "the earlier diploid and tetraploid wheat species."))  
-)
-(advance-type wooden-plow (name "Wooden Plow"))
+;(advance-type trance (name "Trance"))
+; Maybe the intention here was to set advance-multiply-production
+; and/or advance-add-production on food?
+;(advance-type wheat (name "Modern Wheat")(help "Hexaploid Wheat")
+;	(notes ("A second species hybridization between Emmer Wheat and Goat Grass created the hexaploid Modern"
+;		    "Wheat which is used in agriculture all over the world. It has a much better yield and hardiness than"
+;		    "the earlier diploid and tetraploid wheat species."))  
+;)
+;(advance-type wooden-plow (name "Wooden Plow"))
 (advance-type solid-wheel (name "Solid Wheel"))
+(add (artisanry assembly boatbuilding canvas ceramics festival
+      furnace horse market mining numbers pulley shrine
+      sledge syllabary solid-wheel) rp 40)
 
 ;	4th generation advances.
 
@@ -368,29 +380,32 @@
 (advance-type camel (name "The Camel"))
 (advance-type copper (name "Copper Melting"))
 (advance-type cylinder-seal (name "Cylinder Seal"))
-(advance-type divination (name "Divination"))
-(advance-type dyeing (name "Dyeing"))
-(advance-type glassmaking (name "Glassmaking"))
+;(advance-type divination (name "Divination"))
+;(advance-type dyeing (name "Dyeing"))
+;(advance-type glassmaking (name "Glassmaking"))
 (advance-type joinery (name "Joinery"))
 (advance-type landsurvey (name "Land Survey"))
-(advance-type lime (name "Lime"))
-(advance-type merchant (name "The Merchant"))
+;(advance-type lime (name "Lime"))
+;(advance-type merchant (name "The Merchant"))
 (advance-type metalworking (name "Metalworking"))
 (advance-type river-transport (name "River Transport"))
 (advance-type saddle (name "The Saddle"))
 (advance-type sailing (name "Sailing"))
 (advance-type stonecutting (name "Stonecutting"))
 (advance-type temple-estate (name "The Temple Estate"))
-(advance-type till-farming (name "Till-Farming"))
+;(advance-type till-farming (name "Till-Farming"))
 (advance-type township (name "Township"))
 (advance-type wagon (name "The Wagon"))
 (advance-type writing (name "Writing"))
+(add (astronomy camel copper cylinder-seal joinery landsurvey
+      metalworking river-transport saddle sailing stonecutting
+      temple-estate township wagon writing) rp 80)
 
 ;	5th generation advances.
 
 (advance-type arithmetic (name "Arithmetic"))
-(advance-type astrology (name "Astrology"))
-(advance-type bookkeeping (name "Book Keeping"))
+;(advance-type astrology (name "Astrology"))
+;(advance-type bookkeeping (name "Book Keeping"))
 (advance-type the-border (name "The Border"))
 (advance-type bronze (name "Bronze"))
 (advance-type calendar (name "Calendar"))
@@ -398,54 +413,67 @@
 (advance-type elephant (name "The Elephant"))
 (advance-type ensi (name "The Ensi"))
 (advance-type forge (name "The Forge"))
-(advance-type leasehold (name "The Leasehold"))
+;(advance-type leasehold (name "The Leasehold"))
 (advance-type mapmaking (name "Map Making"))
-(advance-type masonry (name "Masonry"))
-(advance-type medicine (name "Medicine"))
+;(advance-type masonry (name "Masonry"))
+; medicine would seem like a logical candidate for size-limit-without-advance
+;(advance-type medicine (name "Medicine"))
 (advance-type navigation (name "Navigation"))
-(advance-type omen-books (name "Omen Books"))
+;(advance-type omen-books (name "Omen Books"))
 (advance-type scribe (name "The Scribe"))
 (advance-type spoked-wheel (name "The Spoked Wheel"))
+(add (arithmetic the-border bronze calendar contract elephant ensi
+      forge mapmaking navigation scribe spoked-wheel) rp 160)
 
 ;	6th generation advances.
 
-(advance-type agriculture (name "Agriculture"))
+;(advance-type agriculture (name "Agriculture"))
 (advance-type city-state (name "The City State"))
 (advance-type code-of-laws (name "Code of Laws"))
 (advance-type engineering (name "Engineering"))
-(advance-type foundry (name "The Foundry"))
+;(advance-type foundry (name "The Foundry"))
 (advance-type iron (name "Iron"))
 (advance-type letter (name "The Letter"))
 (advance-type mathematics (name "Mathematics"))
 (advance-type military (name "Military"))
 (advance-type trade (name "Trade"))
+(add (city-state code-of-laws engineering iron letter mathematics
+      military trade) rp 320)
 
 ;	7th generation advances.
 
 (advance-type court (name "Court of Law"))
-(advance-type diplomacy (name "Diplomacy"))
+;(advance-type diplomacy (name "Diplomacy"))
 (advance-type geometry (name "Geometry"))
 (advance-type kingship (name "Kingship"))
 (advance-type literature (name "Literature"))
 (advance-type road-building (name "Road Building"))
 (advance-type taxation (name "Taxation"))
 (advance-type the-bit (name "The Bit") (help "Advanced bridle for horses"))
+(add (court geometry kingship literature road-building taxation
+      the-bit) rp 640)
 
 ;	8th generation advances.
 
-(advance-type architecture (name "Architecture"))
-(advance-type currency (name "Currency"))
+;(advance-type architecture (name "Architecture"))
+;(advance-type currency (name "Currency"))
 (advance-type government (name "Government"))
 (advance-type philosophy (name "Philosophy"))
+(add (government philosophy) rp 1280)
 
 ;	9th generation advances.
 
 (advance-type elected-council (name "Elected Council"))
 (advance-type judiciary (name "Judiciary"))
+(add (elected-council judiciary) rp 2560)
 
 ;	10th generation advances.
 
+; The sheer number of prerequisites for this one might mean that
+; 5120 is a bit excessive.  But let's stick with the pattern (more
+; of a sense of accomplishment if you actually do achieve it :-)).
 (advance-type republic (name "The Republic"))
+(add republic rp 5120)
 
 
 
@@ -864,6 +892,7 @@
 	(chariots spoked-wheel true)
 	(onager engineering true)
 	(swordmen military true)
+	(trireme navigation true)
 	(trireme trade true)
 	(siege-ramp geometry true)
 	(sappers road-building true)
@@ -873,8 +902,8 @@
 
 	(stockade a* false)
 	(workshops artisanry true)
-	(marketplace market true)
-	(forum architecture true)
+;	(marketplace market true)
+;	(forum architecture true)
 	(temple shrine true)
 	(ziggurat stonecutting true)
 	(granary temple-estate true)
@@ -920,7 +949,7 @@
 ;;;	MATERIAL PRODUCTION AND CONSUMPTION
 
 
-(add cash treasury true)			;	Cash is globally available in the treasury.
+;(add cash treasury true)			;	Cash is globally available in the treasury.
 (add ideas treasury true)			;	Necessary for side-based research.
 	
 (table unit-storage-x				;	Only city can store materials.
@@ -936,7 +965,7 @@
 	((sea lake semi-desert) food 1)
 	((steppe forest) food 2)
 	((plain) food 3)
-	((plain) cash 2)
+;	((plain) cash 2)
 	((plain) ideas 2)
 	((sea lake) ideas 3)
 )
@@ -964,8 +993,8 @@
 	(school ideas 200)			;	School increases ideas production by 100%.
 	(workshops ores 150)		;	Workshops increase ores production by 50%.
 	(palace ores 200)			;	Palace increase ores production by 100%.
-	(marketplace cash 150)		;	Marketplace increases cash production by 50%
-	(forum cash 200)			;	Forum increases cash production by 100%
+;	(marketplace cash 150)		;	Marketplace increases cash production by 50%
+;	(forum cash 200)			;	Forum increases cash production by 100%
 )
 
 
@@ -973,8 +1002,6 @@
 ;;;	RESEARCH
 
 
-(add a* rp 10)		;	Every advance requires 10 research points.
-
 (table advance-needed-to-research
 
 	(a* a* false)
@@ -986,7 +1013,7 @@
 	(cattle a* false)
 	(charcoal a* false)
 	(clay-token a* false)
-	(einkorn a* false)
+;	(einkorn a* false)
 	(elders-council a* false)
 	(flax a* false)
 	(handicraft a* false)						;	slingers
@@ -997,7 +1024,7 @@
 	(pottery a* false)
 	(shaman a* false)
 	(sheep a* false)
-		
+
 ;	2nd generation advances (19).
 
 	(barter (clay-token sheep) true)
@@ -1005,13 +1032,13 @@
 	(bellows (carpentry leatherworking) true)
 	(construction (carpentry mud-brick) true)		;	city-wall
 	(donkey (cattle) true)						;	donkeys
-	(emmer (einkorn) true)
-	(gardening (flax hemp) true)
-	(harness (cattle leatherworking) true)
+;	(emmer (einkorn) true)
+;	(gardening (flax hemp) true)
+;	(harness (cattle leatherworking) true)
 	(kiln (charcoal mud-brick) true)
 	(loom (carpentry sheep) true)
 	(pictograms (clay-token shaman) true)
-	(potash (charcoal pottery) true)
+;	(potash (charcoal pottery) true)
 	(potters-wheel (carpentry pottery) true)
 	(priesthood (idolatry shaman) true)
 	(ropemaking (handicraft hemp) true)			;	battering-ram
@@ -1027,12 +1054,12 @@
 	(boatbuilding (carpentry ropemaking) true)		;	reed-boat
 	(canvas (flax loom) true)
 	(ceramics (kiln potters-wheel) true)
-	(cloth (spindle loom) true)
+;	(cloth (spindle loom) true)
 	(festival (beer priesthood) true)
 	(furnace (bellows kiln) true)
-	(herbal-lore (gardening shaman) true)
+;	(herbal-lore (gardening shaman) true)
 	(horse (donkey) true)	
-	(irrigation (construction gardening) true)
+;	(irrigation (construction gardening) true)
 	(market (barter construction) true)			;	marketplace
 	(mining (construction ropemaking) true)
 	(numbers (barter pictograms) true)
@@ -1040,9 +1067,9 @@
 	(shrine (construction priesthood) true)		; 	temple
 	(sledge (yoke ropemaking) true)				;	siege-tower
 	(syllabary (pictograms priesthood) true)
-	(trance (beer hemp) true)
-	(wheat (emmer) true)
-	(wooden-plow (harness yoke) true)
+;	(trance (beer hemp) true)
+;	(wheat (emmer) true)
+;	(wooden-plow (harness yoke) true)
 	(solid-wheel (donkey potters-wheel) true)
 
 ;	4th generation advances (21).
@@ -1051,20 +1078,20 @@
 	(camel (horse) true)						;	caravan
 	(copper (furnace mining) true)
 	(cylinder-seal (ceramics syllabary) true)
-	(divination (priesthood trance) true)
-	(dyeing (cloth herbal-lore) true)
-	(glassmaking (ceramics potash) true)
+;	(divination (priesthood trance) true)
+;	(dyeing (cloth herbal-lore) true)
+;	(glassmaking (ceramics potash) true)
 	(joinery (artisanry carpentry) true)			;	archers
 	(landsurvey (numbers ropemaking) true)
-	(lime (kiln mining) true)
-	(merchant (cloth market) true)
+;	(lime (kiln mining) true)
+;	(merchant (cloth market) true)
 	(metalworking (artisanry furnace) true)
 	(river-transport (boatbuilding pulley) true)	;	barge
 	(saddle (horse leatherworking) true)			;	horsemen			
 	(sailing (boatbuilding canvas) true)			;	longship
 	(stonecutting (artisanry mining) true)			;	ziggurat
 	(temple-estate (festival shrine) true)			;	granary
-	(till-farming (irrigation wooden-plow) true)
+;	(till-farming (irrigation wooden-plow) true)
 	(township (assembly market) true)
 	(wagon (sledge solid-wheel) true)			;	war cart
 	(writing (artisanry syllabary) true)
@@ -1072,8 +1099,8 @@
 ;	5th generation advances (18).
 	
 	(arithmetic (numbers writing) true)
-	(astrology (astronomy divination) true)
-	(bookkeeping (numbers merchant) true)
+;	(astrology (astronomy divination) true)
+;	(bookkeeping (numbers merchant) true)
 	(the-border (landsurvey township) true)
 	(bronze (copper metalworking) true)
 	(calendar (astronomy writing) true)
@@ -1081,22 +1108,22 @@
 	(elephant (camel) true)					;	elephants
 	(ensi (temple-estate township) true)
 	(forge (kiln metalworking) true)
-	(leasehold (till-farming landsurvey) true)
+;	(leasehold (till-farming landsurvey) true)
 	(mapmaking (landsurvey writing) true)
-	(masonry (lime stonecutting) true)			;		
-	(medicine (divination herbal-lore) true)
+;	(masonry (lime stonecutting) true)
+;	(medicine (divination herbal-lore) true)
 	(navigation (astronomy sailing) true)			;	bireme
-	(omen-books (divination writing) true)
+;	(omen-books (divination writing) true)
 	(scribe (temple-estate writing) true)			;	school
 	(spoked-wheel (joinery wagon) true)			;	chariots	
-	
+
 ;	6th generation advances (10).
 
-	(agriculture (calendar leasehold) true)
+;	(agriculture (calendar leasehold) true)
 	(city-state (the-border ensi) true)
 	(code-of-laws (ensi contract) true)
 	(engineering (bronze spoked-wheel) true)		;	onager
-	(foundry (bronze forge) true)
+;	(foundry (bronze forge) true)
 	(iron (bronze forge) true)
 	(letter (calendar writing) true)
 	(mathematics (arithmetic calendar) true)		
@@ -1106,18 +1133,18 @@
 ;	7th generation advances (8).
 
 	(court (city-state code-of-laws) true)
-	(diplomacy (letter military) true)
+;	(diplomacy (letter military) true)
 	(geometry (mapmaking mathematics) true)		;	siege-ramp
 	(kingship (city-state military) true)
 	(literature (letter scribe) true)
 	(road-building (engineering military) true)		;	sappers
 	(taxation (city-state military) true)			;	palace
 	(the-bit (iron saddle) true)				;	cavalry
-	
+
 ;	8th generation advances (4).
 
-	(architecture (engineering kingship) true)		;	forum
-	(currency (kingship trade) true)
+;	(architecture (engineering kingship) true)		;	forum
+;	(currency (kingship trade) true)
 	(government (kingship taxation) true)			;	phalanx
 	(philosophy (geometry literature) true)
 	


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]