epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'openra/bleed' into bleed

Browse Source
This commit is contained in:
Matthias Mailänder
2012-06-18 16:38:17 +02:00
parent 677efcbced 21ab0b461c
commit 45a5e317c0
57 changed files with 797 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mods/cnc/chrome/ingame.yaml
View File

@@ -197,7 +197,7 @@ Container@PLAYER_WIDGETS:
ToggleButton@BUILDING:
Width:30
Height:30
Key: y
Key: q
TooltipText: Buildings
TooltipContainer:TOOLTIP_CONTAINER
ClickSound:button.aud
@@ -211,7 +211,7 @@ Container@PLAYER_WIDGETS:
X:35
Width:30
Height:30
Key: u
Key: w
TooltipText: Defense
TooltipContainer:TOOLTIP_CONTAINER
ClickSound:button.aud
@@ -225,7 +225,7 @@ Container@PLAYER_WIDGETS:
X:70
Width:30
Height:30
Key: i
Key: e
TooltipText: Infantry
TooltipContainer:TOOLTIP_CONTAINER
ClickSound:button.aud
@@ -239,7 +239,7 @@ Container@PLAYER_WIDGETS:
X:105
Width:30
Height:30
Key: o
Key: r
TooltipText: Vehicles
TooltipContainer:TOOLTIP_CONTAINER
ClickSound:button.aud
@@ -253,7 +253,7 @@ Container@PLAYER_WIDGETS:
X:140
Width:30
Height:30
Key: p
Key: t
TooltipText: Aircraft
TooltipContainer:TOOLTIP_CONTAINER
ClickSound:button.aud

29
mods/cnc/chrome/settings.yaml
View File

@@ -14,7 +14,7 @@ Container@SETTINGS_PANEL:
Text:Settings
Background@GENERAL_CONTROLS:
Width:740
Height:250
Height:290
Background:panel-black
Children:
Label@TITLE:
@@ -142,49 +142,56 @@ Container@SETTINGS_PANEL:
Height:20
Font:Regular
Text:Enable Pixel Doubling
Checkbox@SHOW_SHELLMAP:
X:375
Y:120
Width:200
Height:20
Font:Regular
Text:Show Shellmap
Label@AUDIO_TITLE:
X:375
Y:130
Y:160
Width:340
Font:Bold
Text:Sound
Align:Center
Label@SOUND_LABEL:
X:375
Y:145
Y:175
Width:95
Height:25
Align:Right
Text:Sound Volume:
Slider@SOUND_SLIDER:
X:475
Y:150
Y:180
Width:240
Height:20
Ticks:5
Label@MUSIC_LABEL:
X:375
Y:175
Y:205
Width:95
Height:25
Align:Right
Text:Music Volume:
Slider@MUSIC_SLIDER:
X:475
Y:180
Y:210
Width:240
Height:20
Ticks:5
Checkbox@SHELLMAP_MUSIC:
X:375
Y:210
Y:240
Width:200
Height:20
Font:Regular
Text:Shellmap Music
Background@INPUT_CONTROLS:
Width:740
Height:250
Height:290
Background:panel-black
Visible:false
Children:
@@ -260,20 +267,20 @@ Container@SETTINGS_PANEL:
Font:Regular
Text:Shift-Enter Toggles Team Chat
Button@GENERAL_BUTTON:
Y:249
Y:289
Width:140
Height:35
Text:General
Button@INPUT_BUTTON:
X:150
Y:249
Y:289
Width:140
Height:35
Text:Input
Button@BACK_BUTTON:
Key:escape
X:600
Y:249
Y:289
Width:140
Height:35
Text:Back

6
mods/cnc/rules/aircraft.yaml
View File

@@ -11,6 +11,8 @@ TRAN:
Prerequisites: hpad
BuiltAt: hpad
Owner: gdi,nod
Selectable:
Bounds: 41,41
Helicopter:
LandWhenIdle: true
ROT: 5
@@ -49,6 +51,8 @@ HELI:
Prerequisites: hpad, hq
BuiltAt: hpad
Owner: nod
Selectable:
Bounds: 30,24
Helicopter:
ROT: 4
Speed: 20
@@ -93,6 +97,8 @@ ORCA:
Prerequisites: hpad, hq
BuiltAt: hpad
Owner: gdi
Selectable:
Bounds: 30,24
Helicopter:
ROT: 4
Speed: 20

3
mods/cnc/rules/defaults.yaml
View File

@@ -69,8 +69,9 @@
^Helicopter:
AppearsOnRadar:
UseLocation: yes
TargetableUnit:
TargetableAircraft:
TargetTypes: Air
GroundedTargetTypes: Ground
SelectionDecorations:
Selectable:
Voice: VehicleVoice

23
mods/cnc/rules/structures.yaml
View File

@@ -12,7 +12,9 @@ FACT:
Footprint: xxx xxx
Dimensions: 3,2
Health:
HP: 1750
HP: 2000
Armor:
Type: Heavy
RevealsShroud:
Range: 10
Bib:
@@ -240,7 +242,7 @@ AFLD:
Footprint: xxxx xxxx
Dimensions: 4,2
Health:
HP: 1000
HP: 1750
RevealsShroud:
Range: 7
Bib:
@@ -282,7 +284,7 @@ WEAP:
Footprint: ___ xxx ===
Dimensions: 3,3
Health:
HP: 1000
HP: 1750
RevealsShroud:
Range: 4
Bib:
@@ -362,7 +364,7 @@ NUK2:
Footprint: xx xx
Dimensions: 2,2
Health:
HP: 600
HP: 650
RevealsShroud:
Range: 4
Bib:
@@ -409,7 +411,7 @@ HPAD:
Footprint: xx xx
Dimensions: 2,2
Health:
HP: 800
HP: 400
RevealsShroud:
Range: 5
Exit@1:
@@ -561,7 +563,7 @@ CYCL:
Prerequisites: fact
Owner: nod
Health:
HP: 300
HP: 100
Armor:
Type: Light
@@ -581,7 +583,7 @@ SBAG:
Prerequisites: fact
Owner: gdi
Health:
HP: 250
HP: 100
Armor:
Type: Light
@@ -601,7 +603,7 @@ BRIK:
Prerequisites: vehicleproduction
Owner: gdi,nod
Health:
HP: 1000
HP: 250
Armor:
Type: Heavy
Wall:
@@ -620,7 +622,7 @@ GUN:
Description: Anti-Armor base defense.\n Strong vs Tanks\n Weak vs Infantry, Aircraft
Buildable:
Queue: Defense
BuildPaletteOrder: 40
BuildPaletteOrder: 45
Prerequisites: barracks
Owner: gdi,nod
Building:
@@ -678,7 +680,6 @@ SAM:
PrimaryWeapon: SAMMissile
WithMuzzleFlash:
AutoTarget:
-AutoTargetIgnore:
-RenderBuilding:
RenderRangeCircle:
@@ -692,7 +693,7 @@ GTWR:
Description: Basic defensive structure.\n Strong vs Infantry, Light Vehicles\n Weak vs Tanks, Aircraft
Buildable:
Queue: Defense
BuildPaletteOrder: 50
BuildPaletteOrder: 40
Prerequisites: barracks
Owner: gdi,nod
Building:

25
mods/cnc/rules/vehicles.yaml
View File

@@ -19,7 +19,7 @@ MCV:
Armor:
Type: Light
RevealsShroud:
Range: 4
Range: 8
Transforms:
IntoActor: fact
Offset:-1,-1
@@ -84,7 +84,7 @@ APC:
Owner: gdi
Mobile:
ROT: 5
Speed: 11
Speed: 10
Health:
HP: 200
Armor:
@@ -186,7 +186,7 @@ BGGY:
Owner: nod
Mobile:
ROT: 10
Speed: 12
Speed: 16
Health:
HP: 140
Armor:
@@ -218,7 +218,14 @@ BIKE:
Owner: nod
Mobile:
ROT: 10
Speed: 13
Speed: 20
TerrainSpeeds:
Clear: 42
Rough: 25
Road: 100
Tiberium: 25
BlueTiberium: 25
Beach: 25
Health:
HP: 120
Armor:
@@ -248,7 +255,7 @@ JEEP:
Owner: gdi
Mobile:
ROT: 10
Speed: 10
Speed: 14
Health:
HP: 150
Armor:
@@ -314,7 +321,7 @@ MTNK:
Prerequisites: hq
Owner: gdi
Mobile:
Speed: 9
Speed: 7
Health:
HP: 400
Armor:
@@ -373,6 +380,8 @@ HTNK:
AutoTarget:
SelfHealing:
Ticks: 10
HealIfBelow: 50%
DamageCooldown: 200
LeavesHusk:
HuskActor: HTNK.Husk
Explodes:
@@ -384,7 +393,7 @@ HTNK:
MSAM:
Inherits: ^Tank
Valued:
Cost: 800
Cost: 1200
Tooltip:
Name: Rocket Launcher
Icon: msamicnh
@@ -400,7 +409,7 @@ MSAM:
Armor:
Type: Light
RevealsShroud:
Range: 6
Range: 10
Turreted:
ROT: 255
AttackFrontal:

4
mods/cnc/sequences/misc.yaml
View File

@@ -94,6 +94,10 @@ explosion:
6w: atomsfx
Start: 0
Length: *
chemball: chemball
Start: 0
Length: *
rank:
rank:
Start: 0

22
mods/cnc/weapons.yaml
View File

@@ -530,18 +530,18 @@ MammothMissiles:
Damage: 75
227mm:
ROF: 80
Range: 10
MinRange: 2
Burst: 6
BurstDelay: 1
ROF: 45
Range: 15
MinRange: 4
Burst: 8
BurstDelay: 3
Report: ROCKET1
ValidTargets: Ground
Projectile: Bullet
Arm: 5
High: yes
Shadow: yes
Inaccuracy: 30
Inaccuracy: 60
Angle: 0.1
Image: DRAGON
ROT: 5
@@ -551,8 +551,8 @@ MammothMissiles:
Spread: 10
Versus:
None: 30%
Wood: 75%
Light: 75%
Wood: 50%
Light: 100%
Heavy: 50%
InfDeath: 3
Explosion: 4
@@ -597,11 +597,11 @@ ArtilleryShell:
MinRange: 2
Report: TNKFIRE2
Projectile: Bullet
ContrailLength: 30
Speed: 12
High: yes
Angle: .09
Inaccuracy: 30
ContrailLength: 30
Image: 120MM
Warhead:
Damage: 150
@@ -612,7 +612,7 @@ ArtilleryShell:
Light: 60%
Heavy: 25%
InfDeath: 2
Explosion: 5
Explosion: 8
SmudgeType: Crater
ImpactSound: XPLOSML2
@@ -815,4 +815,4 @@ APCGun:
Versus:
Light: 100%
Explosion: 5
Damage: 6
Damage: 12

6
mods/ra/chrome/create-server.yaml
View File

@@ -60,6 +60,12 @@ Background@CREATESERVER_BG:
Width:300
Height:20
Text:Advertise game Online
Checkbox@UPNP_CHECKBOX:
X:165
Y:165
Width:300
Height:20
Text:Allow UPnP port forwarding
Button@CREATE_BUTTON:
X:130
Y:PARENT_BOTTOM - 45

38
mods/ra/chrome/settings.yaml
View File

@@ -136,6 +136,17 @@ Background@SETTINGS_MENU:
Width:250
Height:20
Ticks:5
Label@SOUND_TICK_TYPE_LABEL:
X:0
Y:70
Text: Cash ticks
DropDownButton@CASH_TICK_TYPE:
X:100
Y:60
Width:250
Height:20
Font:Regular
Text:Extreme
Container@DISPLAY_PANE:
X:37
Y:100
@@ -143,22 +154,35 @@ Background@SETTINGS_MENU:
Height:PARENT_BOTTOM - 100
Visible: false
Children:
Label@MODE_LABEL:
Label@RENDERER_LABEL:
X:0
Y:0
Width:75
Height:25
Text:Renderer:
DropDownButton@GRAPHICS_RENDERER:
X:80
Y:1
Width:120
Height:25
Font:Regular
Text:OpenGL
Label@MODE_LABEL:
X:0
Y:30
Width:45
Height:25
Text:Mode:
DropDownButton@MODE_DROPDOWN:
X:50
Y:1
Y:30
Width:170
Height:25
Font:Regular
Text:Windowed
Container@WINDOW_RESOLUTION:
X:220
Y:0
X:225
Y:30
Children:
Label@At:
Text:@
@@ -186,14 +210,14 @@ Background@SETTINGS_MENU:
Height:25
MaxLength:5
Label@VIDEO_DESC:
Y:25
Y:60
Width:PARENT_RIGHT
Height:25
Font:Tiny
Align:Center
Text:Mode/Resolution changes will be applied after the game is restarted
Text:Renderer/Mode/Resolution changes will be applied after the game is restarted.
Checkbox@PIXELDOUBLE_CHECKBOX:
Y:50
Y:90
Width:200
Height:20
Font:Regular

BIN
mods/ra/maps/bomber-john.oramap Normal file
View File

Binary file not shown.

BIN
mods/ra/maps/free-coasts.oramap
View File

Binary file not shown.

BIN
mods/ra/maps/ice-woods.oramap Normal file
View File

Binary file not shown.

BIN
mods/ra/maps/nishnekolymsk.oramap Normal file
View File

Binary file not shown.

8
mods/ra/rules/civilian.yaml
View File

@@ -89,11 +89,9 @@ V18:
Inherits: ^CivField
BARL:
Inherits: ^Building
Inherits: ^CivBuilding
Selectable:
Priority: 0
-RepairableBuilding:
-GivesBuildableArea:
Health:
HP: 10
Explodes:
@@ -101,11 +99,9 @@ BARL:
Name: Explosive Barrel
BRL3:
Inherits: ^Building
Inherits: ^CivBuilding
Selectable:
Priority: 0
-RepairableBuilding:
-GivesBuildableArea:
Health:
HP: 10
Explodes:

138
mods/ra/rules/structures.yaml
View File

@@ -497,36 +497,142 @@ PBOX.SHOK:
HBOX:
Inherits: ^Building
# Buildable:
# Queue: Defense
# BuildPaletteOrder: 30
# Prerequisites: tent
# Owner: allies
# Hotkey: c
Valued:
Cost: 600
Tooltip:
Name: Camo Pillbox
Description: Hidden defensive structure.\n Strong vs Infantry, Light Vehicles\n Weak vs Tanks, Aircraft
Name: Camo Pillbox (Unarmed)
Building:
Power: -15
-GivesBuildableArea:
Valued:
Cost: 600
Health:
HP: 600
Armor:
Type: Wood
RevealsShroud:
Range: 6
Cloak:
InitialDelay: 125
CloakDelay: 60
CloakSound: appear1.aud
UncloakSound: appear1.aud
IronCurtainable:
-AcceptsSupplies:
Turreted:
ROT: 255
Cargo:
Types: Infantry
MaxWeight: 1
PipCount: 1
-EmitInfantryOnSell:
# EmitCargoOnSell:
TransformOnPassenger@e1:
PassengerTypes: e1
OnEnter: HBOX.e1
OnExit: HBOX
SkipMakeAnims: true
# TransformOnPassenger@e2:
# PassengerTypes: e2
# OnEnter: HBOX.e2
# OnExit: HBOX
# SkipMakeAnims: true
TransformOnPassenger@e3:
PassengerTypes: e3
OnEnter: HBOX.e3
OnExit: HBOX
SkipMakeAnims: true
TransformOnPassenger@e4:
PassengerTypes: e4
OnEnter: HBOX.e4
OnExit: HBOX
SkipMakeAnims: true
TransformOnPassenger@e7:
PassengerTypes: e7
OnEnter: HBOX.e7
OnExit: HBOX
SkipMakeAnims: true
TransformOnPassenger@SHOK:
PassengerTypes: shok
OnEnter: HBOX.shok
OnExit: HBOX
SkipMakeAnims: true
HBOX.E1:
Inherits: HBOX
Buildable:
Queue: Defense
BuildPaletteOrder: 20
Prerequisites: tent
Owner: allies
Hotkey: p
Tooltip:
Name: Camo Pillbox (Guns)
Description: Hidden defensive structure.\n Strong vs Infantry, Light Vehicles\n Weak vs Tanks, Aircraft
Icon: HBOXICON
RenderBuilding:
Image: HBOX
RenderRangeCircle:
AutoTarget:
AttackTurreted:
PrimaryWeapon: Vulcan
PrimaryLocalOffset: 0,-11,0,0,0
AutoTarget:
IronCurtainable:
RenderRangeCircle:
-AcceptsSupplies:
WithMuzzleFlash:
Turreted:
ROT: 255
Cargo:
InitialUnits: e1
#HBOX.E2:
# Inherits: HBOX
# Tooltip:
# Name: Camo Pillbox (Grenades)
# RenderBuilding:
# Image: HBOX
HBOX.E3:
Inherits: HBOX
Tooltip:
Name: Camo Pillbox (Rockets)
RenderBuilding:
Image: HBOX
RenderRangeCircle:
AutoTarget:
AttackTurreted:
PrimaryWeapon: Dragon
PrimaryLocalOffset: 0,-11,0,0,0
HBOX.E4:
Inherits: HBOX
Tooltip:
Name: Camo Pillbox (Flamethrower)
RenderBuilding:
Image: HBOX
RenderRangeCircle:
AutoTarget:
AttackTurreted:
PrimaryWeapon: Flamer
PrimaryLocalOffset: 0,-11,0,0,0
HBOX.E7:
Inherits: HBOX
Tooltip:
Name: Camo Pillbox (Tanya)
RenderBuilding:
Image: HBOX
RenderRangeCircle:
AutoTarget:
AttackTurreted:
PrimaryWeapon: Colt45
PrimaryLocalOffset: 0,-11,0,0,0
HBOX.SHOK:
Inherits: HBOX
Tooltip:
Name: Camo Pillbox (Tesla)
RenderBuilding:
Image: HBOX
RenderRangeCircle:
AutoTarget:
AttackTurreted:
PrimaryWeapon: PortaTesla
PrimaryLocalOffset: 0,-11,0,0,0
GUN:
Inherits: ^Building

51
mods/ra/rules/system.yaml
View File

@@ -47,7 +47,7 @@ Player:
barr: 1%
tent: 1%
weap: 1%
pbox: 7%
pbox.e1: 7%
gun: 7%
tsla: 5%
ftur: 10%
@@ -77,7 +77,7 @@ Player:
tent: 1%
barr: 1%
weap: 1%
pbox: 7%
pbox.e1: 7%
gun: 7%
ftur: 10%
tsla: 5%
@@ -98,15 +98,44 @@ Player:
2tnk: 25%
3tnk: 50%
SquadSize: 10
HackyAI@OptiAI:
Name:Eisenhower AI
BuildingFractions:
proc: 25.1%
powr: 35%
tent: 0.1%
barr: 0.1%
weap: 0.1%
fix: 0.1%
dome: 0.1%
atek: 0.1%
stek: 0.1%
UnitsToBuild:
e1: 50%
e2: 1%
e3: 10%
medi: 0.01%
e7: 0.01%
apc: 10%
jeep: 10%
ftrk: 25%
1tnk: 25%
2tnk: 50%
3tnk: 75%
4tnk: 100%
arty: 30%
v2rl: 30%
SquadSize: 10
HackyAI@ZhukovAI:
Name:Zhukov AI
BuildingFractions:
proc: 30%
proc: 20%
powr: 35%
tent: 1%
barr: 1%
weap: 1%
pbox: 7%
pbox.e1: 4%
hbox.e1: 3%
gun: 10%
ftur: 10%
tsla: 5%
@@ -117,16 +146,16 @@ Player:
atek: 1%
stek: 1%
UnitsToBuild:
e1: 40%
e3: 10%
e1: 4%
e3: 1%
harv: 10%
ftrk: 5%
v2rl: 40%
arty: 40%
1tnk: 20%
2tnk: 20%
3tnk: 20%
SquadSize: 30
1tnk: 15%
2tnk: 15%
3tnk: 15%
SquadSize: 25
HackyAI@RommelAI:
Name:Rommel AI
BuildingFractions:
@@ -135,7 +164,7 @@ Player:
tent: 1%
barr: 1%
weap: 1%
pbox: 7%
pbox.e1: 7%
gun: 7%
ftur: 10%
tsla: 5%