From 3d17328d0d3f07cd6a52d80e02b1cde09a1cbb74 Mon Sep 17 00:00:00 2001 From: Smittytron Date: Tue, 26 May 2020 20:08:46 -0500 Subject: [PATCH] Fix regression and cleanup scu35ea --- .../soviet-soldier-volkov-n-chitzkoi/map.bin | Bin 81937 -> 81937 bytes .../soviet-soldier-volkov-n-chitzkoi/map.yaml | 134 +----------------- .../rules.yaml | 46 +----- ...> soviet-soldier-volkov-n-chitzkoi-AI.lua} | 0 ...a => soviet-soldier-volkov-n-chitzkoi.lua} | 0 .../weapons.yaml | 6 +- mods/ra/rules/campaign-tooltips.yaml | 6 + 7 files changed, 18 insertions(+), 174 deletions(-) rename mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/{scu35ea-AI.lua => soviet-soldier-volkov-n-chitzkoi-AI.lua} (100%) rename mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/{scu35ea.lua => soviet-soldier-volkov-n-chitzkoi.lua} (100%) diff --git a/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/map.bin b/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/map.bin index 174e320f272c8e2b87f37a39c48106bbc6fcab7c..bf2000c23023bf634b4176c0f9165bd89d50829e 100644 GIT binary patch delta 54 zcmbQ(z&f#kbwjZ3L7*~w2OHxSSSAuq5#ffx&Y0-XbN%K;A3 z@`(C#$T?J1VFg-2EzeCWzqSbjthta$$p~&4WW@(p3txW6_7=ptU)wLLux3?ZzMMmmY=EBM6~=w z-F<-FEyVBC*p!Y!jqu7QMvRp#Kg3x~8^(=rH;bxmT`+ur|wQ*F!s6 OpOn3ibX;CkpO?Qu#d(te diff --git a/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/map.yaml b/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/map.yaml index 0931fac2d8..2c1834aed3 100644 --- a/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/map.yaml +++ b/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/map.yaml @@ -31,11 +31,11 @@ Players: Enemies: Greece, GoodGuy, Spain, France, USSR PlayerReference@Greece: Name: Greece + Bot: campaign Faction: allies Color: ABB7E4 Allies: Spain, France, GoodGuy Enemies: USSR, Creeps - Bot: campaign PlayerReference@USSR: Name: USSR AllowBots: False @@ -50,25 +50,25 @@ Players: Enemies: Greece, GoodGuy, Spain, France, Creeps PlayerReference@GoodGuy: Name: GoodGuy + Bot: campaign Faction: allies Color: ABB7E4 Allies: Greece, Spain, France Enemies: USSR, Creeps - Bot: campaign PlayerReference@Spain: Name: Spain + Bot: campaign Faction: allies Color: F6D679 Allies: Greece, GoodGuy, France Enemies: USSR, Creeps - Bot: campaign PlayerReference@France: Name: France + Bot: campaign Faction: allies Color: 5DC2A5 Allies: Greece, GoodGuy, Spain Enemies: USSR, Creeps - Bot: campaign Actors: Actor0: cycl @@ -83,51 +83,18 @@ Actors: Actor3: cycl Location: 60,23 Owner: Greece - Actor4: brik - Location: 92,23 - Owner: Neutral Actor5: cycl Location: 50,24 Owner: Greece Actor6: cycl Location: 60,24 Owner: Greece - Actor7: brik - Location: 92,24 - Owner: Neutral - Actor8: brik - Location: 92,25 - Owner: Neutral - Actor9: brik - Location: 92,26 - Owner: Neutral - Actor10: brik - Location: 92,27 - Owner: Neutral - Actor11: brik - Location: 92,28 - Owner: Neutral - Actor12: brik - Location: 92,29 - Owner: Neutral - Actor13: brik - Location: 92,30 - Owner: Neutral - Actor14: brik - Location: 92,31 - Owner: Neutral - Actor15: brik - Location: 92,32 - Owner: Neutral Actor16: cycl Location: 50,33 Owner: Greece Actor17: cycl Location: 60,33 Owner: Greece - Actor18: brik - Location: 92,33 - Owner: Neutral Actor19: cycl Location: 50,34 Owner: Greece @@ -140,9 +107,6 @@ Actors: Actor22: cycl Location: 60,34 Owner: Greece - Actor23: brik - Location: 92,34 - Owner: Neutral Actor24: cycl Location: 71,35 Owner: Greece @@ -164,39 +128,24 @@ Actors: Actor30: cycl Location: 77,35 Owner: Greece - Actor31: brik - Location: 92,35 - Owner: Neutral Actor32: cycl Location: 71,36 Owner: Greece Actor33: cycl Location: 77,36 Owner: Greece - Actor34: brik - Location: 92,36 - Owner: Neutral Actor35: cycl Location: 77,37 Owner: Greece - Actor36: brik - Location: 92,37 - Owner: Neutral Actor37: cycl Location: 77,38 Owner: Greece - Actor38: brik - Location: 92,38 - Owner: Neutral Actor39: cycl Location: 71,39 Owner: Greece Actor40: cycl Location: 77,39 Owner: Greece - Actor41: brik - Location: 92,39 - Owner: Neutral Actor42: cycl Location: 71,40 Owner: Greece @@ -218,75 +167,6 @@ Actors: Actor48: cycl Location: 77,40 Owner: Greece - Actor49: brik - Location: 92,40 - Owner: Neutral - Actor50: brik - Location: 92,41 - Owner: Neutral - Actor51: brik - Location: 92,42 - Owner: Neutral - Actor52: brik - Location: 92,43 - Owner: Neutral - Actor53: brik - Location: 92,44 - Owner: Neutral - Actor54: brik - Location: 92,45 - Owner: Neutral - Actor55: brik - Location: 92,46 - Owner: Neutral - Actor56: brik - Location: 92,47 - Owner: Neutral - Actor57: brik - Location: 92,48 - Owner: Neutral - Actor58: brik - Location: 92,49 - Owner: Neutral - Actor59: brik - Location: 92,50 - Owner: Neutral - Actor60: brik - Location: 92,51 - Owner: Neutral - Actor61: brik - Location: 92,52 - Owner: Neutral - Actor62: brik - Location: 83,53 - Owner: Neutral - Actor63: brik - Location: 84,53 - Owner: Neutral - Actor64: brik - Location: 85,53 - Owner: Neutral - Actor65: brik - Location: 86,53 - Owner: Neutral - Actor66: brik - Location: 87,53 - Owner: Neutral - Actor67: brik - Location: 88,53 - Owner: Neutral - Actor68: brik - Location: 89,53 - Owner: Neutral - Actor69: brik - Location: 90,53 - Owner: Neutral - Actor70: brik - Location: 91,53 - Owner: Neutral - Actor71: brik - Location: 92,53 - Owner: Neutral Actor72: brik Location: 51,56 Owner: Greece @@ -506,12 +386,6 @@ Actors: Actor144: brik Location: 55,95 Owner: USSR - Actor145: brik - Location: 55,96 - Owner: Neutral - Actor146: brik - Location: 78,86 - Owner: Neutral Actor147: tc02 Location: 45,23 Owner: Neutral diff --git a/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/rules.yaml b/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/rules.yaml index 4507c599a1..7d3f8333f8 100644 --- a/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/rules.yaml +++ b/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/rules.yaml @@ -1,6 +1,6 @@ World: LuaScript: - Scripts: scu35ea.lua, scu35ea-AI.lua + Scripts: soviet-soldier-volkov-n-chitzkoi.lua, soviet-soldier-volkov-n-chitzkoi-AI.lua MissionData: Briefing: The Allies have stolen a new armor plating from us. With it, they can make structures nearly invulnerable. Their processing plant must be destroyed.\n\nFor this critical mission, we are allowing you access to Soldier Volkov. Use him and his cybernetic dog to sabotage the Allied control center, allowing our units in the southeast access to the alloy facility.\n\nThe mission is a success when Volkov destroys the control center, and our units destroy the alloy facility.\n WinVideo: grvestne.vqa @@ -14,18 +14,7 @@ World: hard: Hard Default: easy -Player: - LobbyPrerequisiteCheckbox@GLOBALBOUNTY: - Enabled: False - Locked: True - -MSLO: - Buildable: - Prerequisites: ~disabled - E7: - Buildable: - Prerequisites: ~disabled Health: HP: 25000 Armor: @@ -35,10 +24,6 @@ E7: Buildable: Prerequisites: ~vehicles.allies, ~techlevel.medium -CA: - Buildable: - Prerequisites: ~syrd, ~techlevel.high - C2: Inherits@2: ^ArmedCivilian @@ -68,15 +53,13 @@ V01: Actor: healcrate HOSP: - Tooltip: - GenericName: Hospital - GenericVisibility: Enemy, Ally, Neutral - GenericStancePrefix: false - -TooltipDescription@ally: - -TooltipDescription@other: SpawnActorOnDeath: Actor: healcrate +HEALCRATE: + Crate: + Lifetime: 0 + ^Vehicle: -Demolishable: @@ -86,8 +69,6 @@ HOSP: AFAC: Inherits: BIO - Buildable: - Prerequisites: ~disabled Health: HP: 400000 Tooltip: @@ -95,25 +76,16 @@ AFAC: GenericName: Alloy Facility GenericVisibility: Enemy, Ally, Neutral GenericStancePrefix: false - Capturable: - Types: ~disabled - -EngineerRepairable: - -GpsDot: RenderSprites: Image: BIO CCEN: Inherits: ATEK - Buildable: - Prerequisites: ~disabled Tooltip: Name: Control Center GenericName: Control Center GenericVisibility: Enemy, Ally, Neutral GenericStancePrefix: false - Capturable: - Types: ~disabled - -EngineerRepairable: GpsPower: Prerequisites: ~disabled Power: @@ -123,8 +95,6 @@ CCEN: HGUN: Inherits: GUN - Buildable: - Prerequisites: ~disabled Valued: Cost: 2800 Tooltip: @@ -142,8 +112,6 @@ HGUN: ZKOI: Inherits: DOG - Buildable: - Prerequisites: ~disabled Valued: Cost: 2000 Tooltip: @@ -161,8 +129,6 @@ ZKOI: VOLK: Inherits: GNRL - Buildable: - Prerequisites: ~disabled Valued: Cost: 3000 Tooltip: @@ -189,8 +155,6 @@ VOLK: VoiceSet: GenericVoice Armament: Weapon: VolkovWeapon - DetectCloaked: - CloakTypes: Cloak, Thief RenderSprites: Image: GNRL diff --git a/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/scu35ea-AI.lua b/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/soviet-soldier-volkov-n-chitzkoi-AI.lua similarity index 100% rename from mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/scu35ea-AI.lua rename to mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/soviet-soldier-volkov-n-chitzkoi-AI.lua diff --git a/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/scu35ea.lua b/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/soviet-soldier-volkov-n-chitzkoi.lua similarity index 100% rename from mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/scu35ea.lua rename to mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/soviet-soldier-volkov-n-chitzkoi.lua diff --git a/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/weapons.yaml b/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/weapons.yaml index f2ca5dff45..c4dc67e291 100644 --- a/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/weapons.yaml +++ b/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/weapons.yaml @@ -11,7 +11,7 @@ VolkovWeapon: ReloadDelay: 25 Range: 6c0 ValidTargets: Ground, GroundActor, Water, WaterActor - InvalidTargets: Bridge, Structure + InvalidTargets: Bridge, Structure, Wall Warhead@1Dam: SpreadDamage Spread: 256 Versus: @@ -20,7 +20,7 @@ VolkovWeapon: Light: 60 Heavy: 25 Concrete: 50 - -ValidTargets: + ValidTargets: Barrel, Infantry, Vehicle, Mine DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath Warhead@2Smu: LeaveSmudge SmudgeType: Crater @@ -28,7 +28,7 @@ VolkovWeapon: Warhead@3Eff: CreateEffect Explosions: artillery_explosion ImpactSounds: kaboom25.aud - ValidTargets: Ground, Ship, Trees + ValidTargets: Ground, GroundActor, Ship, Trees Warhead@4EffWater: CreateEffect Explosions: small_splash ImpactSounds: splash9.aud diff --git a/mods/ra/rules/campaign-tooltips.yaml b/mods/ra/rules/campaign-tooltips.yaml index 876861ce82..b21adf00ea 100644 --- a/mods/ra/rules/campaign-tooltips.yaml +++ b/mods/ra/rules/campaign-tooltips.yaml @@ -89,3 +89,9 @@ MISS: Name: Technology Center -TooltipDescription@ally: -TooltipDescription@other: + +HOSP: + Tooltip: + GenericVisibility: Enemy + -TooltipDescription@ally: + -TooltipDescription@other: