Merge remote branches 'alzeih/master', 'pchote/walls' and 'origin/dev'

This commit is contained in:
Chris Forbes
2010-02-27 09:53:17 +13:00
36 changed files with 534 additions and 189 deletions

16
mods/cnc/blue.rem Normal file
View File

@@ -0,0 +1,16 @@
176: 255,216,252,252
177: 255,220,220,228
178: 255,192,192,208
179: 255,164,164,188
180: 255,100,100,124
181: 255,72,72,92
182: 255,44,44,60
183: 255,0,0,0
184: 255,192,192,208
185: 255,164,164,188
186: 255,132,132,156
187: 255,100,100,124
188: 255,72,72,92
189: 255,56,72,76
190: 255,52,52,52
191: 255,36,44,52

16
mods/cnc/orange.rem Normal file
View File

@@ -0,0 +1,16 @@
176: 255,236,172,72
177: 255,228,148,48
178: 255,212,120,16
179: 255,196,96,0
180: 255,164,56,0
181: 255,136,24,0
182: 255,96,8,0
183: 255,16,0,0
184: 255,212,120,16
185: 255,196,96,0
186: 255,180,72,0
187: 255,164,56,0
188: 255,152,40,0
189: 255,136,24,0
190: 255,112,8,0
191: 255,16,0,0

16
mods/cnc/red.rem Normal file
View File

@@ -0,0 +1,16 @@
176: 255,244,0,0
177: 255,220,20,8
178: 255,196,40,20
179: 255,172,52,28
180: 255,120,48,36
181: 255,96,8,0
182: 255,56,32,20
183: 255,16,0,0
184: 255,196,40,20
185: 255,172,52,28
186: 255,152,48,36
187: 255,120,48,36
188: 255,112,24,0
189: 255,88,44,28
190: 255,56,32,20
191: 255,56,32,20

View File

@@ -41,44 +41,26 @@ World:
Name: player1
DisplayName: Blue
BasePalette: player
# Remap: blue.rem
Remap: blue.rem
DisplayColor: 56, 72, 125
PlayerColorPalette@player2:
Name: player2
DisplayName: Red
BasePalette: player
# Remap: red.rem
Remap: red.rem
DisplayColor: 238, 0, 0
PlayerColorPalette@player3:
Name: player3
DisplayName: Orange
BasePalette: player
# Remap: orange.rem
Remap: orange.rem
DisplayColor: 198,97,0
PlayerColorPalette@player4:
Name: player4
DisplayName: Teal
BasePalette: player
# Remap: teal.rem
Remap: teal.rem
DisplayColor: 28,109,97
PlayerColorPalette@player5:
Name: player5
DisplayName: Salmon
BasePalette: player
# Remap: salmon.rem
DisplayColor: 153,76,53
PlayerColorPalette@player6:
Name: player6
DisplayName: Green
BasePalette: player
# Remap: green.rem
DisplayColor: 76,101,60
# PlayerColorPalette@player7:
# Name: player7
# DisplayName: Gray
# BasePalette: player
# Remap: gray.rem
# DisplayColor: 133,113,101
PaletteFromFile@chrome:
Name: chrome
Filename: temperat.pal
@@ -117,4 +99,6 @@ World:
Race: gdi
Country@nod:
Name: Nod
Race: nod
Race: nod
SellButton:
RepairButton:

16
mods/cnc/teal.rem Normal file
View File

@@ -0,0 +1,16 @@
176: 255,0,168,168
177: 255,116,148,156
178: 255,100,128,136
179: 255,0,112,112
180: 255,4,92,100
181: 255,20,52,72
182: 255,4,4,8
183: 255,0,0,0
184: 255,100,128,136
185: 255,0,112,112
186: 255,4,92,100
187: 255,8,76,92
188: 255,16,60,80
189: 255,20,52,72
190: 255,36,44,52
191: 255,4,4,8

View File

@@ -74,8 +74,6 @@ HeatSeeker
Cannon
[Invisible]
Inviso=yes
Image=none
[HeatSeeker]
Arm=2
@@ -83,13 +81,12 @@ High=yes
Shadow=no
Proximity=yes
Trail=smokey
Ranged=yes
Inaccurate=yes
AA=yes
Image=DRAGON
ROT=5
Rotates=yes
Translucent=yes
RangeLimit=6
[Cannon]
Image=120MM

View File

@@ -1 +1,16 @@
âæöÎÒê¶¾Þ¡ªÊ<EFBFBD>•º}…®iu¡Yi•DU‰8H}0@u(8m ,a,U D4
80: 255,226,230,246
81: 255,206,210,234
82: 255,182,190,222
83: 255,161,170,202
84: 255,141,149,186
85: 255,125,133,174
86: 255,105,117,161
87: 255,89,105,149
88: 255,68,85,137
89: 255,56,72,125
90: 255,48,64,117
91: 255,40,56,109
92: 255,32,44,97
93: 255,24,44,85
94: 255,12,32,68
95: 255,8,20,52

View File

@@ -45,3 +45,19 @@
Footprint: x
RenderBuilding:
^Wall:
Category: Building
Building:
Dimensions: 1,1
Footprint: x
Capturable: false
Bib: no
Crewed: no
Sight: 0
Wall:
Selectable:
RenderBuildingWall:
HasMakeAnimation: false
Palette: terrain
DamageStates: 2

View File

@@ -1 +1,16 @@
<EFBFBD>y賁qヨセiニイaカ・Yェ儷痩L爽@<40>8me8YU,UL$HD 844,( 
80: 255,246,214,121
81: 255,230,202,113
82: 255,214,190,105
83: 255,198,178,97
84: 255,182,165,89
85: 255,170,153,85
86: 255,145,137,76
87: 255,145,117,64
88: 255,133,113,56
89: 255,109,101,56
90: 255,89,85,44
91: 255,85,76,36
92: 255,72,68,32
93: 255,56,52,28
94: 255,52,44,20
95: 255,40,32,8

View File

@@ -1 +1,16 @@
<EFBFBD><EFBFBD>籘゙ホニホコイコ・勍槽扶q<EFBFBD>eqYP]H@P<4P<4<,(<,(,,
80: 255,238,238,238
81: 255,238,226,218
82: 255,222,206,198
83: 255,206,186,178
84: 255,186,165,153
85: 255,165,145,133
86: 255,149,125,113
87: 255,133,113,101
88: 255,113,89,80
89: 255,93,72,64
90: 255,80,60,52
91: 255,80,60,52
92: 255,60,44,40
93: 255,60,44,40
94: 255,44,28,24
95: 255,44,28,24

View File

@@ -1 +1,16 @@
ÿæ•ÿæ•Ææ…²Ò}<7D>¾u‰®my™ei‰]YuLLe<<U00D$$4$4$
80: 255,255,230,149
81: 255,255,230,149
82: 255,198,230,133
83: 255,178,210,125
84: 255,157,190,117
85: 255,137,174,109
86: 255,121,153,101
87: 255,105,137,93
88: 255,89,117,76
89: 255,76,101,60
90: 255,60,85,48
91: 255,48,68,36
92: 255,36,52,24
93: 255,36,52,24
94: 255,24,36,16
95: 255,20,20,20

Binary file not shown.

Binary file not shown.

View File

@@ -456,35 +456,27 @@ Report=MISSILE1
; AA = Can this weapon fire upon flying aircraft (def=no)?
; AG = Can this weapon fire upon ground objects (def=yes)?
; ASW = Is this an Anti-Submarine-Warfare projectile (def=no)?
; Animates = Does it animate [this means smoke puffs] (def=no)?
; Arcing = Does it have a ballistic trajectory (def=no)?
; Arm = arming delay (def=0)
; Degenerates = Does the bullet strength weaken as it travels (def=no)?
; Dropping = Does it fall from a starting height (def=no)?
; Frames = number of image frames for animation purposes (def=1)
; Gigundo = Is the projectile larger than normal (def=no)?
; High = Can it fly over walls (def=no)?
; Image = image to use during flight
; Inaccurate = Is it inherently inaccurate (def=no)?
; Inviso = Is the projectile invisible as it travels (def=no)?
; Parachuted = Equipped with a parachute for dropping from plane (def=no)?
; Proximity = Does it blow up when near its target (def=no)?
; ROT = Rate Of Turn [non zero implies homing] (def=0)
; Ranged = Can it run out of fuel (def=no)?
; Rotates = Does the projectile have rotation specific imagery (def=no)?
; Shadow = If High, does this bullet need to have a shadow drawn? (def = yes)
; Translucent = Are translucent colors used in artwork (def=no)?
; UnderWater = Does the projectile travel under water?
; Trail = image to use for smoke puffs etc (def=null)
; RangeLimit = maximum flight time (def=0=unlimited)
; invisible flight to target
[Invisible]
Inviso=yes
Image=none
; special case for dog
[LeapDog]
Image=DOGBULLT
Translucent=yes
Rotates=yes
Proximity=yes
ROT=20
@@ -495,8 +487,6 @@ Image=120MM
; anti aircraft artillery projectile
[Ack]
Image=none
Inviso=yes
AA=true
AG=false
@@ -514,7 +504,6 @@ High=yes
Shadow=no
Proximity=yes
Trail=smokey
Ranged=yes
Inaccurate=yes
Image=V2
Rotates=yes
@@ -526,13 +515,12 @@ High=yes
Shadow=no
Proximity=yes
Trail=smokey
Ranged=yes
Inaccurate=yes
AA=yes
Image=DRAGON
ROT=5
Rotates=yes
Translucent=yes
RangeLimit=5
; small missile with deadly accuracy
[LaserGuided]
@@ -541,12 +529,11 @@ High=yes
Shadow=no
Proximity=yes
Trail=smokey
Ranged=yes
AA=yes
Image=DRAGON
ROT=20
Rotates=yes
Translucent=yes
RangeLimit=5
; anti aircraft missile
[AAMissile]
@@ -555,13 +542,12 @@ High=yes
Shadow=no
Proximity=yes
Trail=smokey
Ranged=yes
AA=yes
AG=no
Image=MISSILE
ROT=20
Rotates=yes
Translucent=yes
RangeLimit=5
; lobbed tumbling grenade
[Lobbed]
@@ -569,8 +555,6 @@ High=yes
Arcing=yes
Inaccurate=yes
Image=BOMB
Frames=8
Translucent=yes
; Depth charge catapult
[Catapult]
@@ -578,20 +562,15 @@ High=yes
Arcing=yes
Inaccurate=yes
Image=BOMB
Frames=8
ASW=yes
AG=no
Translucent=yes
; dropped from plane tumbling object
[Bomblet]
Arm=24
RangeLimit=24
High=yes
Dropping=yes
Image=BOMBLET
Frames=6
Translucent=yes
; arcing ballistic projectile
[Ballistic]
@@ -605,37 +584,27 @@ Image=120MM
Arm=24
RangeLimit=24
High=yes
Dropping=yes
Parachuted=yes
;Image=PARABOMB
; Allied free radar (GPS satellite)
[GPSSatellite]
Gigundo=yes
High=yes
Image=SPUTNIK
Frames=4
; Nuclear missile, flying up
[NukeUp]
Gigundo=yes
High=yes
Image=ATOMICUP
Frames=4
; Nuclear missile, flying down
[NukeDown]
Gigundo=yes
High=yes
Image=ATOMICDN
Frames=4
; wizard's fireball
[Fireball]
Trail=fb2
Image=FB1
Frames=8
; ******* Warhead Characteristics *******
; This is what gives the "rock, paper, scissors" character to the game.

View File

@@ -113,18 +113,18 @@ World:
BasePalette: terrain
Remap: salmon.rem
DisplayColor: 153,76,53
# PlayerColorPalette@player6:
# Name: player6
# DisplayName: Green
# BasePalette: terrain
# Remap: green.rem
# DisplayColor: 76,101,60
# PlayerColorPalette@player7:
# Name: player7
# DisplayName: Gray
# BasePalette: terrain
# Remap: gray.rem
# DisplayColor: 133,113,101
PlayerColorPalette@player6:
Name: player6
DisplayName: Green
BasePalette: terrain
Remap: green.rem
DisplayColor: 76,101,60
PlayerColorPalette@player7:
Name: player7
DisplayName: Gray
BasePalette: terrain
Remap: gray.rem
DisplayColor: 133,113,101
PaletteFromFile@chrome:
Name: chrome
Filename: temperat.pal
@@ -188,7 +188,9 @@ World:
Country@7:
Name: Spain
Race: allies
SellButton:
RepairButton:
PowerDownButton:
MGG:
GeneratesGap:
@@ -2494,3 +2496,62 @@ MEDI:
TakeCover:
-AutoTarget:
SBAG:
Inherits: ^Wall
Buildable:
TechLevel: 2
Prerequisites: fact
Owner: allies
Cost: 25
Description: Sandbag Wall
LongDesc: Stops infantry and blocks enemy fire.\n Can be crushed by tanks.
Building:
HP: 100
Armor: none
FENC:
Inherits: ^Wall
Buildable:
TechLevel: 2
Prerequisites: fact
Owner: soviet
Cost: 25
Description: Wire Fence
LongDesc: Stops infantry and blocks enemy fire.\n Can be crushed by tanks.
Building:
HP: 100
Armor: none
BRIK:
Inherits: ^Wall
Buildable:
TechLevel: 8
Prerequisites: fact
Owner: allies,soviet
Cost: 100
Description: Concrete Wall
LongDesc: Stop units from passing and block enemy fire.
Building:
HP: 100
Armor: none
RenderBuildingWall:
DamageStates: 4
CYCL:
Inherits: ^Wall
Building:
HP: 100
Armor: none
RenderBuildingWall:
DamageStates: 3
BARB:
Inherits: ^Wall
Building:
HP: 100
Armor: none
WOOD:
Inherits: ^Wall
Building:
HP: 100
Armor: none

Binary file not shown.

View File

@@ -859,4 +859,31 @@
<unit name="badr">
<sequence name="idle" start="0" facings="16" />
</unit>
<unit name="brik">
<sequence name="idle" start="0" length="16" />
<sequence name="minor-damaged-idle" start="16" length="16" />
<sequence name="damaged-idle" start="32" length="16" />
<sequence name="critical-idle" start="48" length="16" />
</unit>
<unit name="sbag">
<sequence name="idle" start="0" length="16" />
<sequence name="damaged-idle" start="16" length="16" />
</unit>
<unit name="fenc">
<sequence name="idle" start="0" length="16" />
<sequence name="damaged-idle" start="16" length="16" />
</unit>
<unit name="cycl">
<sequence name="idle" start="0" length="16" />
<sequence name="damaged-idle" start="16" length="16" />
<sequence name="critical-idle" start="32" length="16" />
</unit>
<unit name="barb">
<sequence name="idle" start="0" length="16" />
<sequence name="damaged-idle" start="16" length="16" />
</unit>
<unit name="wood">
<sequence name="idle" start="0" length="16" />
<sequence name="damaged-idle" start="16" length="16" />
</unit>
</sequences>

Binary file not shown.