added harvester, trike/quad now working, fixed mod inheritances

RenderCargo: works, moved R8Reader to Utility namespace
2012-05-22 21:02:25 +02:00
parent 5426a5fd3c
commit 66f82c6c2a
15 changed files with 270 additions and 95 deletions
--- a/mods/d2k/rules/aircraft.yaml
+++ b/mods/d2k/rules/aircraft.yaml
@@ -21,11 +21,11 @@ CARRYALL:
 		RearmBuildings: hightecha
 		InitialFacing: 0
 		ROT: 5
-		Speed: 12
+		Speed: 15
 		LandableTerrainTypes: Clear,Rough,Road,Ore,Beach
 	RenderUnit:
 		PlayerPalette: d2kplayer
-#	RenderCargo:
+	RenderCargo:
 	WithShadow:
 	Cargo:
 		Types: Vehicle
--- a/mods/d2k/rules/structures.yaml
+++ b/mods/d2k/rules/structures.yaml
@@ -163,7 +163,7 @@ REFA:
 	CustomSellValue:
 		Value: 600
 	FreeActor:
-		Actor: HARV
+		Actor: HARVESTER
 		InitialActivity: FindResources
 		SpawnOffset: 1,2
 		Facing: 64
--- a/mods/d2k/rules/system.yaml
+++ b/mods/d2k/rules/system.yaml
@@ -1,9 +1,111 @@
 Player:
+	TechTree:
+	ClassicProductionQueue@Building:
+		Type: Building
+		BuildSpeed: .4
+		LowPowerSlowdown: 3
+		QueuedAudio: abldgin1.aud
+		ReadyAudio: conscmp1.aud
+	ClassicProductionQueue@Defense:
+		Type: Defense
+		BuildSpeed: .4
+		LowPowerSlowdown: 3
+		QueuedAudio: abldgin1.aud
+		ReadyAudio: conscmp1.aud
+	ClassicProductionQueue@Vehicle:
+		Type: Vehicle
+		BuildSpeed: .4
+		LowPowerSlowdown: 3
+	ClassicProductionQueue@Infantry:
+		Type: Infantry
+		BuildSpeed: .4
+		LowPowerSlowdown: 3
+	ClassicProductionQueue@Plane:
+		Type: Plane
+		BuildSpeed: .4
+		LowPowerSlowdown: 3
+	PlaceBuilding:
+	SupportPowerManager:
+	ConquestVictoryConditions:
+		WinNotification:misnwon1.aud
+		LoseNotification:misnlst1.aud
+	PowerManager:
+	AllyRepair:
+	PlayerResources:
+		InitialCash: 5000
+	ActorGroupProxy:
+	DeveloperMode:
 	PlayerColorPalette@d2kplayer:
 		BasePalette: d2k
 		BaseName: d2kplayer
 		PaletteFormat: d2k
+	DebugResourceCash:
+	DebugResourceOre:
+	DebugResourceOreCapacity:
+	GpsWatcher:
+	BaseAttackNotifier:
+
 World:	
+	OpenWidgetAtGameStart:
+		Widget: INGAME_ROOT
+		ObserverWidget: OBSERVER_ROOT
+	ScreenShaker:
+	WaterPaletteRotation:
+	NukePaletteEffect:
+	LightPaletteRotator:
+	BuildingInfluence:
+	ChooseBuildTabOnSelect:
+	CrateDrop:
+		Minimum: 1
+		Maximum: 3
+		SpawnInterval: 120
+		WaterChance: .2
+	PaletteFromCurrentTileset:
+		Name: terrain
+	PaletteFromFile@d2k:
+		Name: d2k
+		Filename: d2k.pal
+	PaletteFromFile@chrome:
+		Name: chrome
+		Filename: d2k.pal
+	PaletteFromFile@effect:
+		Name: effect
+		Filename: temperat.pal
+	PaletteFromRGBA@shadow:
+		Name: shadow
+		R: 0
+		G: 0
+		B: 0
+		A: 140
+	PaletteFromRGBA@cloak:
+		Name: cloak
+		R: 0
+		G: 0
+		B: 0
+		A: 140
+	PaletteFromRGBA@highlight:
+		Name: highlight
+		R: 255
+		G: 255
+		B: 255
+		A: 128
+	PaletteFromRGBA@invuln:
+		Name: invuln
+		R: 128
+		G: 0
+		B: 0
+		A: 128
+	PaletteFromRGBA@disabled:
+		Name: disabled
+		R: 0
+		G: 0
+		B: 0
+		A: 180
+	ColorPickerPaletteModifier:
+	ShroudPalette@shroud:
+	ShroudPalette@fog:
+		IsFog: yes
+		Name: fog
 	Country@2:
 		Name: Atreides
 		Race: atreides
@@ -13,12 +115,8 @@ World:
 #	Country@4:
 #		Name: Ordos
 #		Race: ordos
-	PaletteFromFile@d2k:
-		Name: d2k
-		Filename: d2k.pal
-	PaletteFromFile@chrome:
-		Name: chrome
-		Filename: d2k.pal
+	BibLayer:
+	ResourceLayer:
 #	ResourceType@spice:
 #		ResourceType: 1
 #		Palette: d2k
@@ -27,4 +125,76 @@ World:
 #		Name: Spice
 #		PipColor: Yellow
 #		AllowedTerrainTypes: Sand
-#		AllowUnderActors: false
+#		AllowUnderActors: false
+	SmudgeLayer@SCORCH:
+		Type:Scorch
+		SmokePercentage:50
+		Types:sc1,sc2,sc3,sc4,sc5,sc6
+		Depths:1,1,1,1,1,1
+	SmudgeLayer@CRATER:
+		Type:Crater
+		Types:cr1,cr2,cr3,cr4,cr5,cr6
+		Depths:5,5,5,5,5,5
+	SpawnMapActors:
+	CreateMPPlayers:
+	MPStartLocations:
+	SpawnMPUnits:
+	EvaAlerts:
+	SpatialBins:
+		BinSize: 4
+	Shroud:
+	PathFinder:
+	ValidateOrder:
+CRATE:
+	Tooltip:
+		Name: Crate
+	Crate:
+		Lifetime: 120
+		TerrainTypes: Clear, Rough, Road, Water, Ore, Beach
+	GiveCashCrateAction:
+		Amount: 1000
+		SelectionShares: 50
+		UseCashTick: yes
+	LevelUpCrateAction:
+		SelectionShares: 40
+	ExplodeCrateAction@fire:
+		Weapon: CrateNapalm
+		SelectionShares: 5
+	ExplodeCrateAction@boom:
+		Weapon: CrateExplosion
+		SelectionShares: 5
+	ExplodeCrateAction@nuke:
+		Weapon: CrateNuke
+		SelectionShares: 5
+	HideMapCrateAction:
+		SelectionShares: 5
+		Effect: hide-map
+	RevealMapCrateAction:
+		SelectionShares: 1
+		Effect: reveal-map
+	SupportPowerCrateAction@parabombs:
+		SelectionShares: 5
+		Proxy: powerproxy.parabombs
+	GiveMcvCrateAction:
+		SelectionShares: 2
+		NoBaseSelectionShares: 9001
+		Unit: mcv
+	GiveUnitCrateAction@trike:
+		SelectionShares: 7
+		Unit: trike
+	GiveUnitCrateAction@quad:
+		SelectionShares: 6
+		Unit: quad
+	RenderSimple:
+	BelowUnits:
+	ProximityCaptor:
+		Types:Crate
+	Passenger:
+
+mpspawn:
+	Waypoint:
+	RenderEditorOnly:
+
+waypoint:
+	Waypoint:
+	RenderEditorOnly:
--- a/mods/d2k/rules/vehicles.yaml
+++ b/mods/d2k/rules/vehicles.yaml
@@ -5,65 +5,95 @@ MCV:
 		Image: MCV
 		PlayerPalette: d2kplayer

+HARVESTER:
+	Inherits: ^Vehicle
+	Buildable:
+		Queue: Vehicle
+		BuildPaletteOrder: 10
+		Prerequisites: refa
+		Owner: atreides
+	Valued:
+		Cost: 1100
+	Tooltip:
+		Name: Spice Harvester
+		Description: Collects Spice for processing.\n  Unarmed
+	Selectable:
+		Priority: 7
+		Bounds: 42,42
+	Harvester:
+		Capacity: 20
+		Resources: Ore,Gems
+		UnloadTicksPerBale: 1
+	Health:
+		HP: 600
+	Armor:
+		Type: Heavy
+	Mobile:
+		Speed: 6
+		Crushes: wall, atmine, crate, infantry
+	RevealsShroud:
+		Range: 4
+	RenderUnit::
+		PlayerPalette: d2kplayer
+	-AttackMove:
+	GpsDot:
+		String:Harvester
+
 TRIKE:
 	Inherits: ^Vehicle
+	Buildable:
+		Queue: Vehicle
+		BuildPaletteOrder: 15
+		Prerequisites: lighta
+		Owner: atreides
 	Valued:
 		Cost: 200
 	Tooltip:
 		Name: Scout Trike
-		Icon: trikeicon
 		Description: Weak Scout.\n Decent vs. Infantry
-	Buildable:
-		BuildPaletteOrder: 15
-		Prerequisites: lighta
-		Owner: atreides
 	Selectable:
 		Bounds: 24,24
-	Mobile:
-		ROT: 15
-		Speed: 20
 	Health:
 		HP: 75
 	Armor:
 		Type: Light
+	Mobile:
+		ROT: 15
+		Speed: 20
 	RevealsShroud:
 		Range: 8
+	RenderUnit:
+		PlayerPalette: d2kplayer
 	AttackFrontal:
 		PrimaryWeapon: M60mg
 		PrimaryOffset: 0,0,0,-4
-	RenderUnit:
-		PlayerPalette: d2kplayer
-	WithMuzzleFlash:
-		PrimaryOffset: 0,3,0,0
 	AutoTarget:

 QUAD:
 	Inherits: ^Vehicle
+	Buildable:
+		Queue: Vehicle
+		BuildPaletteOrder: 30
+		Prerequisites: lighta
+		Owner: atreides
 	Valued:
 		Cost: 400
 	Tooltip:
 		Name: Quad
-		Description: Fast scout vehicle, armed with \nrockets.\n  Strong vs Vehicles, Aircraft\n  Weak vs Infantry
-	Buildable:
-		BuildPaletteOrder: 30
-		Prerequisites: lighta
-		Owner: atreides
-	Mobile:
-		ROT: 10
-		Speed: 13
+		Description: Fast scout vehicle, armed with \nrockets.\n  Strong vs Vehicles\n  Weak vs Infantry
 	Health:
 		HP: 120
 	Armor: 
 		Type: Light
+	Mobile:
+		ROT: 10
+		Speed: 13
 	RevealsShroud:
 		Range: 7
-	AttackFrontal:
-		PrimaryWeapon: RedEye
-		SecondaryWeapon: Dragon
-		PrimaryOffset: 0,0,0,-2
-		PrimaryLocalOffset: -4,0,0,0,25, 4,0,0,0,-25
-		SecondaryOffset: 0,0,0,-2
-		SecondaryLocalOffset: -4,0,0,0,25, 4,0,0,0,-25
 	RenderUnit:
 		PlayerPalette: d2kplayer
+	AttackFrontal:
+		PrimaryWeapon: RedEye
+		PrimaryOffset: 0,0,0,-2
+		PrimaryLocalOffset: -4,0,0,0,25, 4,0,0,0,-25
 	AutoTarget: