Merge pull request #5749 from MustaphaTR/bleed

Some fixes at TS
2014-06-27 08:33:30 +02:00
parent 2ad6af6801 9a4b4f5841
commit ea6f76e4f6
3 changed files with 58 additions and 8 deletions
--- a/mods/ts/rules/infantry.yaml
+++ b/mods/ts/rules/infantry.yaml
@@ -30,7 +30,7 @@ E2:
 		Queue: Infantry
 		BuildPaletteOrder: 10
 		Owner: gdi
-		Hotkey: n
+		Hotkey: d
 	Valued:
 		Cost: 200
 	Tooltip:
@@ -91,6 +91,7 @@ WEEDGUY:
 		Queue: Infantry
 		BuildPaletteOrder: 50
 		Owner: gdi
+		Hothey: c
 	Selectable:
 		Bounds: 12,17,0,-6
 		Voice: Weed
@@ -119,6 +120,7 @@ MEDIC:
 		Queue: Infantry
 		BuildPaletteOrder: 60
 		Owner: gdi
+		Hotkey: m
 	Selectable:
 		Bounds: 12,17,0,-6
 		Voice: Medic
@@ -150,6 +152,7 @@ ENGINEER:
 		Queue: Infantry
 		BuildPaletteOrder: 30
 		Owner: gdi,nod
+		Hotkey: e
 	Selectable:
 		Bounds: 12,17,0,-6
 		Voice: Engineer
@@ -244,6 +247,7 @@ JUMPJET:
 		Queue: Infantry
 		BuildPaletteOrder: 50
 		Owner: gdi
+		Hotkey: j
 	Selectable:
 		Bounds: 12,17,0,-6
 		Voice: JumpJet
@@ -270,7 +274,7 @@ CHAMSPY:
 		Queue: Infantry
 		BuildPaletteOrder: 60
 		Owner: nod
-		Hotkey: p
+		Hotkey: s
 	Valued:
 		Cost: 700
 	DisguiseToolTip:
@@ -308,6 +312,7 @@ CYBORG:
 		Queue: Infantry
 		BuildPaletteOrder: 50
 		Owner: nod
+		Hotkey: n
 	-CrushableInfantry:
 		CrushSound: squish2.aud
 	Selectable:
@@ -341,6 +346,7 @@ CYC2:
 		Queue: Infantry
 		BuildPaletteOrder: 50
 		Owner: nod
+		Hotkey: o
 	-CrushableInfantry:
 		CrushSound: squish2.aud
 	Selectable:
--- a/mods/ts/rules/structures.yaml
+++ b/mods/ts/rules/structures.yaml
@@ -123,6 +123,7 @@ PROC:
 		BuildPaletteOrder: 20
 		Prerequisites: anypower
 		Owner: gdi,nod
+		Hotkey: r
 	Building:
 		Power: -30
 		Footprint: xxx xxx x==
@@ -141,7 +142,7 @@ PROC:
 		Value: 600
 	FreeActor:
 		Actor: HARV
-		SpawnOffset: 1,2
+		SpawnOffset: 3,4
 		Facing: 64
 	WithIdleOverlay@REDLIGHTS:
 		Sequence: idle-redlights
@@ -159,6 +160,7 @@ GAWEAP:
 		Queue: Building
 		BuildPaletteOrder: 50
 		Owner: gdi
+		Hotkey: w
 	Building:
 		Power: -30
 		Footprint: ___ xxx ===
@@ -191,7 +193,7 @@ NAPOWR:
 		Queue: Building
 		BuildPaletteOrder: 0
 		Owner: nod
-		Hotkey: p
+		Hotkey: q
 	Valued:
 		Cost: 300
 	Tooltip:
@@ -219,7 +221,7 @@ NAAPWR:
 		BuildPaletteOrder: 5
 		Prerequisites: factory
 		Owner: nod
-		Hotkey: p
+		Hotkey: a
 	Valued:
 		Cost: 600
 	Tooltip:
@@ -247,7 +249,7 @@ NAHAND:
 		BuildPaletteOrder: 30
 		Prerequisites: anypower
 		Owner: nod
-		Hotkey: b
+		Hotkey: h
 	Valued:
 		Cost: 300
 	Tooltip:
@@ -291,6 +293,7 @@ NAWEAP:
 		Queue: Building
 		BuildPaletteOrder: 50
 		Owner: nod
+		Hotkey: f
 	Building:
 		Power: -30
 		Footprint: ___ xxx ===
@@ -349,7 +352,7 @@ GAWALL:
 		BuildPaletteOrder: 1001
 		Prerequisites: gacnst
 		Owner: gdi
-		Hotkey: b
+		Hotkey: w
 	SoundOnDamageTransition:
 		DamagedSound:
 		DestroyedSound:
@@ -372,7 +375,7 @@ NAWALL:
 		BuildPaletteOrder: 1001
 		Prerequisites: gacnst
 		Owner: nod
-		Hotkey: b
+		Hotkey: n
 	SoundOnDamageTransition:
 		DamagedSound:
 		DestroyedSound:
@@ -535,6 +538,7 @@ GASPOT:
 		Queue: Defense
 		BuildPaletteOrder: 10
 		Owner: gdi, nod
+		Hotkey: p
 	Valued:
 		Cost: 300
 	Tooltip:
@@ -561,6 +565,7 @@ GALITE:
 		Queue: Defense
 		BuildPaletteOrder: 10
 		Owner: gdi, nod
+		Hotkey: m
 	Valued:
 		Cost: 200
 	Tooltip:
@@ -588,6 +593,7 @@ GARADR:
 		BuildPaletteOrder: 90
 		Owner: gdi
 		Prerequisites: anypower, factory
+		Hotkey: d
 	Valued:
 		Cost: 1000
 	Tooltip:
@@ -625,6 +631,7 @@ NARADR:
 		BuildPaletteOrder: 90
 		Owner: nod
 		Prerequisites: anypower, factory
+		Hotkey: e
 	Valued:
 		Cost: 1000
 	Tooltip:
@@ -662,6 +669,7 @@ GATECH:
 		BuildPaletteOrder: 100
 		Owner: gdi
 		Prerequisites: garadr
+		Hotkey: t
 	Valued:
 		Cost: 2000
 	Tooltip:
@@ -689,6 +697,7 @@ NATECH:
 		BuildPaletteOrder: 100
 		Owner: nod
 		Prerequisites: naradr
+		Hotkey: x
 	Valued:
 		Cost: 2000
 	Tooltip:
@@ -720,6 +729,7 @@ GAHPAD:
 		BuildPaletteOrder: 60
 		Owner: gdi
 		Queue: Building
+		Hotkey: i
 	Building:
 		Power: -10
 		Footprint: xx xx
@@ -753,6 +763,7 @@ NAHPAD:
 		BuildPaletteOrder: 60
 		Owner: nod
 		Queue: Building
+		Hotkey: j
 	Building:
 		Power: -10
 		Footprint: xx xx
@@ -787,6 +798,7 @@ GADEPT:
 		Prerequisites: factory
 		Owner: gdi
 		Queue: Building
+		Hotkey: v
 	Building:
 		Power: -30
 		Footprint: _x_ xxx _x_
@@ -821,6 +833,7 @@ GAVULC:
 		Queue: Defense
 		BuildPaletteOrder: 30
 		Owner: gdi
+		Hotkey: v
 	Building:
 		Power: -20
 	DisabledOverlay:
@@ -873,6 +886,7 @@ GAROCK:
 		Queue: Defense
 		BuildPaletteOrder: 40
 		Owner: gdi
+		Hotkey: r
 	Building:
 		Power: -50
 	RequiresPower:
@@ -916,6 +930,7 @@ GACSAM:
 		Queue: Defense
 		BuildPaletteOrder: 60
 		Owner: gdi
+		Hotkey: a
 	Building:
 		Power: -30
 	RequiresPower:
@@ -958,6 +973,7 @@ NASAM:
 		Queue: Defense
 		BuildPaletteOrder: 60
 		Owner: nod
+		Hotkey: s
 	Building:
 		Power: -30
 	RequiresPower:
@@ -998,6 +1014,7 @@ NALASR:
 		Queue: Defense
 		BuildPaletteOrder: 50
 		Owner: nod
+		Hotkey: l
 	Building:
 		Power: -40
 	RequiresPower:
@@ -1036,6 +1053,7 @@ NAOBEL:
 		BuildPaletteOrder: 90
 		Prerequisites: tech
 		Owner: nod
+		Hotkey: o
 	Building:
 		Power: -150
 		Footprint: xx xx
--- a/mods/ts/rules/vehicles.yaml
+++ b/mods/ts/rules/vehicles.yaml
@@ -45,6 +45,7 @@ APC:
 		Queue: Vehicle
 		BuildPaletteOrder: 30
 		Owner: gdi
+		Hotkey: a
 	Mobile:
 		ROT: 5
 		Speed: 113
@@ -75,9 +76,16 @@ HARV:
 		Queue: Vehicle
 		BuildPaletteOrder: 10
 		Owner: gdi,nod
+		Hotkey: h
 	Selectable:
 		Priority: 7
 		Bounds: 36,36
+	Harvester:
+		Capacity: 20
+		Resources: Tiberium
+		UnloadTicksPerBale: 1
+		SearchFromProcRadius: 24
+		SearchFromOrderRadius: 12
 	Mobile:
 		Speed: 71
 	Health:
@@ -106,6 +114,7 @@ HVR:
 		Queue: Vehicle
 		BuildPaletteOrder: 50
 		Owner: gdi
+		Hothey: v
 	Mobile:
 		Speed: 99
 	Health:
@@ -133,6 +142,7 @@ HVR:
 	Tooltip:
 		Name: Mammoth Tank
 		Description: Heavily armored GDI Tank.\n  Strong vs Everything
+		Hotkey: m
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 60
@@ -174,6 +184,7 @@ TRUCKB:
 		Queue: Vehicle
 		BuildPaletteOrder: 120
 		Owner: gdi, nod
+		Hotkey: t
 	Valued:
 		Cost: 500
 	Tooltip:
@@ -203,6 +214,7 @@ LPST:
 		Queue: Vehicle
 		BuildPaletteOrder: 100
 		Owner: gdi, nod
+		Hotkey: y
 	Health:
 		HP: 600
 	Armor:
@@ -232,6 +244,7 @@ ICBM:
 		Queue: Vehicle
 		BuildPaletteOrder: 100
 		Owner: gdi
+		Hotkey: l
 	Health:
 		HP: 500
 	Armor:
@@ -257,6 +270,7 @@ REPAIR:
 		Queue: Vehicle
 		BuildPaletteOrder: 70
 		Owner: nod
+		Hotkey: r
 	Valued:
 		Cost: 1000
 	Tooltip:
@@ -288,6 +302,7 @@ ART2:
 		Queue: Vehicle
 		BuildPaletteOrder: 100
 		Owner: nod
+		Hotkey: i
 	Health:
 		HP: 300
 	Armor:
@@ -318,6 +333,7 @@ WEED:
 		Queue: Vehicle
 		BuildPaletteOrder: 10
 		Owner: nod
+		Hotkey: w
 	Mobile:
 		Speed: 71
 		ROT: 5
@@ -475,6 +491,7 @@ MMCH:
 		Queue: Vehicle
 		BuildPaletteOrder: 30
 		Owner: gdi
+		Hotkey: e
 	Mobile:
 		ROT: 5
 		Speed: 56
@@ -510,6 +527,7 @@ HMEC:
 		Queue: Vehicle
 		BuildPaletteOrder: 80
 		Owner: gdi
+		Hotkey: o
 	Mobile:
 		ROT: 3
 		Speed: 42
@@ -543,6 +561,7 @@ SMECH:
 		Queue: Vehicle
 		BuildPaletteOrder: 10
 		Owner: gdi
+		Hotkey: n
 	Mobile:
 		ROT: 5
 		Speed: 99
@@ -572,6 +591,7 @@ BIKE:
 		Queue: Vehicle
 		BuildPaletteOrder: 30
 		Owner: nod
+		Hotkey: c
 	Mobile:
 		ROT: 8
 		Speed: 170
@@ -602,6 +622,7 @@ BGGY:
 		Queue: Vehicle
 		BuildPaletteOrder: 40
 		Owner: nod
+		Hotkey: g
 	Mobile:
 		ROT: 8
 		Speed: 142
@@ -634,6 +655,7 @@ SAPC:
 		Queue: Vehicle
 		BuildPaletteOrder: 30
 		Owner: nod
+		Hotkey: s
 	Mobile:
 		ROT: 5
 		Speed: 71
@@ -662,6 +684,7 @@ SUBTANK:
 		Queue: Vehicle
 		BuildPaletteOrder: 40
 		Owner: nod
+		Hotkey: d
 	Mobile:
 		ROT: 6
 		Speed: 71
@@ -689,6 +712,7 @@ SONIC:
 		Queue: Vehicle
 		BuildPaletteOrder: 70
 		Owner: gdi
+		Hotkey: p
 	Mobile:
 		ROT: 4
 		Speed: 56
@@ -720,6 +744,7 @@ TTNK:
 		Queue: Vehicle
 		BuildPaletteOrder: 60
 		Owner: nod
+		Hotkey: j
 	Mobile:
 		ROT: 5
 		Speed: 85
@@ -750,6 +775,7 @@ STNK:
 		BuildPaletteOrder: 90
 		Queue: Vehicle
 		Owner: nod
+		Hotkey: q
 	Mobile:
 		ROT: 5
 		Speed: 85