From 3ecafa4a192ad0cdf724ab5604ff9acfbd99a402 Mon Sep 17 00:00:00 2001 From: Patrick Wieth Date: Sat, 3 Feb 2024 22:16:04 +0100 Subject: [PATCH] fix harr.payload crash --- mods/ca/bits/harrieravionicsicon.shp | Bin 3108 -> 0 bytes mods/ca/bits/harrierpayloadicon.shp | Bin 3087 -> 0 bytes mods/ca/rules/aircraft.yaml | 140 ++--------------------- mods/ca/rules/allies/commander-tree.yaml | 58 ++++++++++ mods/ca/rules/commander-tree.yaml | 49 -------- mods/ca/sequences/aircraft.yaml | 8 -- 6 files changed, 65 insertions(+), 190 deletions(-) delete mode 100644 mods/ca/bits/harrieravionicsicon.shp delete mode 100644 mods/ca/bits/harrierpayloadicon.shp diff --git a/mods/ca/bits/harrieravionicsicon.shp b/mods/ca/bits/harrieravionicsicon.shp deleted file mode 100644 index 8994057f54865e7fbd3fc1cf4c6ebb0e9021c52c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3108 zcmZ8j+iu&~6=ji2CoL(`VkJ@!#i{BG3N*k}fS&4yT86BN0V@V(exeC7sN#%_N%A7z zuZK)B!K6rvpp-m{9|{ai%9#RvnaAWi#P1NgHkEYHF-%IN&R%=%wJ+!VLZH7r;ZMTq z*MhJk2orkV66yZa-|8=d?AGL&GaIh12$nm&Z7$7nbxkmx<#cLUcsVl;S679z)pcPX z@8|g3Gv45RVV!a|9vcQ;kD}5v0b<@d#Hu2Sb6UG-j6PNe#dt#FXSqo z6QL( zAu|!nhmUK5;f>7Y?R7F{@N)JdZ`b2kY4%-r;D%bND5=KVzr7?3Ta-;o{W=in;ZF=> z1P)8Enc|w^I!g`{QR+WZrEb654LQ~$293w78$uBPp_Gvc24AvemL)7qe4koFs8Ct! zN$5+DIE#W%YObw0zeEKTK4O6R+Sn-Zn`teVl{vo8aGkk_XP3Gc;44pczO{`!DoTU# zSXz*O3kYQ9u1gs~EseE3k%#@?-)wM%t*VU%k9i$M#N#*$7nOAk_MmJoms5C!EeKDM zkXdj`6In+}>M1akNF%Qa?AKjj1Rum(W{A{;(b6^nfwxnvpC$XbB&L2hQ8tjU3L+Fi zI_65y3(z%1jE(^FrJ0%K+A&O%q1%aALlN~(Bq|#~5)(z$)Kt}DmejS54^KIqqlWzo zz|1oEG+%%}{14qA=8ZZ^Rb4qdN~&U^_(V|?HEC_eT+_Sb1HZxmbTR*cU?O_ZFqe)W z#XL!sG)Yirai;;wsYvlZg?Jigtj#yO!O%$s7a!;IA*MK0KC34{_-@ah%C_H5TabVA&0!J7K^syO~$y+c_J$Hq?stl zcRf+r&C`f&#XGL&5d^NWbqYnU3;7cucnl09iN!4*Z{kN5@kG;;%2dHKl&oV#YxCwd zmwb1CS6kGOBd*-HIx4w ztnS?#kI~|}k8W_BSPSf+5xS^$M9g(Ht)u5q3Fut_@C0?h^xrJb4hGQ9d)e!G{aqk* zyJTJOx$Jj3u4C7NHdmnn zY6%+Szma07VhMM&*g-IWaeJQY^>S*kb#Z+}`Ob8_AaHFTO)RDmQfFbO<_4RaTa0rZ z%l3lIp|^LxF#D$tkI;Rt7Gnxj!^2iwebW10d@nq%>^z{SM3hn_@9*MLHFJm=OK z1p`qKM)7Z8WYi@l&+I6CC{>lm~@AS&Ty~;9xcYCD3a#AeFC@w0JPd` z62#0(!}29mM3SbhFaimk>uq;w!N>5WZ6DTb+gfcC5sausK1WuOn+hRVH)|OZz4$o= z%=s2eMU_cm4cxHzUlr`M=Gd0?U~p&m4~%ccl%+Y5FnV;yRlKTzvZ3eBW)^g@Bu!PY zFG`X{8v*5O`OG>w8VnrEb`Bnlx1|M_JV-G&^QvY2YCA_fNKy7rGqYpf6qQ#R<4ynm z2;@S&l~c?<3sNllxHBJ~?@C=jiU|cfWeS z3(SGx!C>wJBkzP*MQ4dJ%V@{RY)oTno6w|A{>cIBg^n#sbZH#N!gg#AIZG9k2BO$32~^i7HGOF zf)Qi};SdzYhh<<}#mNGVIeK1!oSgji=-s=|@7_E0Jsgm*XfOH{v+6Sb{Q~pxC0U0+K~0i?SHg z?Izu1(eKD&BohLd#O-#HG#cM4j~`Z2gn*53(W#A`t?v~P>I~T@A|MyigDEZ$_FIEE zP&D7$saB~G8+5dZO-8NPp2j@wpiw+L{;^e>n8lgh~ diff --git a/mods/ca/bits/harrierpayloadicon.shp b/mods/ca/bits/harrierpayloadicon.shp deleted file mode 100644 index edf60e0cc16c4b52c4303befc5b1bf2c46f15cb0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3087 zcmZWrU2ogg8Rn3Wb?c!>i<3xS3}>2SW55D*0(>=J%ray(2CQUgfdB>a1C}7e6lXG; zCl5|AR3Zv@}zs2t)#j7b}cidlGkZf;s-I`hR#U;sdXQPpAh%kng=)k0l_r{yVA9H2jY zKbUfKG#^v~91=j{FG@SsSpmYylcEd@j9u65${AC&bG$A8&XoQw<>qJa2UEcEKO~o= zoo8pANfG)%)b?F3~b zn#x#R@acQ_O~Bs`f}2P43O^nb+}b&T(w+FM6SM=@_9LO;S#>mVJ|&MH|DS@RBh$QL z5d|hz9A6gYWM}8hb85D;8*wPeQlm8meQ6^Q3t75lRsrw_*6jK+1Y?k&JTF@HBvG4P z&+B=So~df4i`LK23F$D!;(#)DfaPW|XM{1vI7#V)0(6N-#@e%41+I)m z)_Hp;=Y}8RQDla=vW{q}YJ-bJp3?f2!C2O$#Yaec*fKMh3?v^6e|fbcV6CP#8X^&O zB#TIrIGR>?(htc?1%!p*5i)%oUeg(G%V|9WhZ^g&ZVLP|@y+n9&t^F+wE&tq@WKpl zN0>iOcM6$h!DgziAUYLA#2`BnYS;-EAHZ;=KY}&0a`>-W7|^uuwPW5;nbD4!x&kJa zs+z84nvw9duD1iMRA6!BYEThac@D7k93I5_eJ@NzqmGo+7Vd_cX_&|!t6Hk1t80nS zjm_b1P;r2|oV;bQU_E45GdGA6k!EU^rbw!!-GJnbGD&>`=jnp;mRQ>yZv8e0BN9Rh zYcYj95Y8MQYl~(RAH?4b!F70A2(6*j8Ov6*G&OjVaNgbpU)LS}@i44}Oi{>i#C+yO z0`6U1P4v(S8hsDCsvN}o)nSeqC zfk=@D-1yn_WVZ+3`7b&hzq(M>RjxDX0~J!Fg)Pvd}am z6<>KCF+2&1qJ!cDLz}V+HF!Z9{1bU?*>IPWqmRm|W*~{{h{NjfY77e-YGyR$y&b>f zcRHXcM9_u}L-YaMj_!G{Sqz?@u&&jG^i>2PRI8H;*Ve9ZAqd^9JCp1X->G#Jujgy z(4xWMo8|WvfvP5r!~Y-ps}t{TGh2S92VD zu}(tJqNc?JQAKPjhHzP|^N8dn&&XgQuJDX$T#jnchHd_$JL4?gZ~4Y#%yo5Ob4J_7++FacW;!!Pe8d?4k*%55$d zCZM4~?PY*oMjVdg?B4-m>-f#Ez36@H`9Mx4IDSm1dsdF1-70@#<=^M|_oKkOabrFo z4DQ{7xr4{|;8o|~;QsCXJD=S7^P4Sj_DmmuiAP76c7$1_hvt>%wBzIsx-pf_+%s|P z7*r(BDiV0)_C9F#?`-wDRo9qU+Z2w_i~%TPoPXwKp5tG6#hIIPipG)iPR#Rr$TP>O z5zVKczS#l`@?)FMaFK<*5a&00ilW20E6h#eAu6;F+ce3>BNXP~Sw(Vi@Q3}^uRpnS z_b~8r5W=MG_#^bH^W>LP?1z{fVh4@?I4#0o0{*fTrNBoD(-rnWQP}7Bu2?Llo5MB~+E$e6n4;JWJeQ?! z?3S(*i>o%p4>Ts(7Uva_!nnc|meA!YT@)6y6&5SR03}JQm8Olx*XpAOl`A69#u#)u zqs5ljN(fbk5|9vxi|D~(Q<(jYNgBwSuboV5-l0iRHyYT9YH+>#Utk8 IjL(k#13?m)&;S4c diff --git a/mods/ca/rules/aircraft.yaml b/mods/ca/rules/aircraft.yaml index 5d93bb502..d7779931f 100644 --- a/mods/ca/rules/aircraft.yaml +++ b/mods/ca/rules/aircraft.yaml @@ -2242,99 +2242,6 @@ ORCA.Torp: Position: BottomLeft RequiresSelection: true -ORCB: - Inherits: ^Helicopter - Inherits: ^TDAircraftSprite - Inherits: ^BiologicalPilot - Inherits: ^PrioAntiHeavy - RenderSprites: - Image: orcab - Buildable: - Queue: Aircraft - BuildAtProductionType: Helicopter - BuildPaletteOrder: 40 - Prerequisites: ~hpad.td, ~aircraft.eagle, gtek - IconPalette: chrome - Description: VTOL bomber armed with EMP bombs.\n Strong vs Buildings, Vehicles\n Weak vs Aircraft, Infantry - Valued: - Cost: 1600 - Tooltip: - Name: Orca Bomber - Health: - HP: 36000 - RevealsShroud: - Range: 10c0 - MinRange: 8c0 - Type: GroundPosition - RevealGeneratedShroud: False - RevealsShroud@GAPGEN: - Range: 8c0 - Type: GroundPosition - Armament: - Weapon: OrcaBomb - LocalOffset: 2,-256,-43, 2,256,-43 - PauseOnCondition: !ammo - AttackAircraft: - FacingTolerance: 80 - Voice: Attack - PersistentTargeting: false - OpportunityFire: false - PauseOnCondition: empdisable || being-warped - Aircraft: - CruiseAltitude: 2560 - AltitudeVelocity: 0c120 - TurnSpeed: 16 - Speed: 180 - RepulsionSpeed: 40 - MaximumPitch: 56 - TakeoffSounds: orcaup1.aud - LandingSounds: orcadwn1.aud - CanHover: False - CanSlide: False - Voice: Move - AutoTarget: - InitialStance: HoldFire - InitialStanceAI: HoldFire - AmmoPool: - Ammo: 8 - AmmoCondition: ammo - WithAmmoPipsDecoration: - PipCount: 4 - Position: BottomLeft - Margin: 4, 3 - RequiresSelection: true - SpawnActorOnDeath: - Actor: ORCB.Husk - RequiresCondition: ammo && !empdisable && !being-warped - SpawnActorOnDeath@Empty: - Actor: ORCB.Husk.empty - RequiresCondition: !ammo && !empdisable && !being-warped - SpawnActorOnDeath@EMP: - Actor: ORCB.Husk.EMP - RequiresCondition: ammo && empdisable && !being-warped - SpawnActorOnDeath@EmptyEMP: - Actor: ORCB.Husk.empty.EMP - RequiresCondition: !ammo && empdisable && !being-warped - LeavesTrails: - Offsets: -853,0,171 - MovingInterval: 2 - Image: smokey - StationaryInterval: 2 - SpawnAtLastPosition: False - TrailWhileStationary: True - Type: CenterPosition - RequiresCondition: enable-smoke - WithMoveAnimation: - MoveSequence: move - ProducibleWithLevel: - Prerequisites: aircraft.upgraded - Rearmable: - RearmActors: hpad.td, hpad - Voiced: - VoiceSet: OrcaVoice - GrantConditionOnDamageState@SmokeTrail: - Condition: enable-smoke - UAV: Inherits: ^NeutralPlane Inherits: ^RobotPilot @@ -2596,6 +2503,9 @@ HARR: Inherits: ^VoxelPlane RenderVoxels: Scale: 0.5 + Image: harr + RenderSprites: + Image: harr Contrail@1: Offset: -400,-443,0 Contrail@2: @@ -2650,6 +2560,8 @@ HARR: HARR.avionics: Inherits: HARR + WithProductionIconOverlay@Air: + Types: Air Buildable: Queue: Aircraft BuildAtProductionType: Helicopter @@ -2665,6 +2577,8 @@ HARR.avionics: HARR.payload: Inherits: HARR + WithProductionIconOverlay@Bullets: + Types: Bullets Buildable: Queue: Aircraft BuildAtProductionType: Helicopter @@ -2685,46 +2599,6 @@ HARR.payload: Margin: 4, 3 RequiresSelection: true -Raptor: - Inherits: ^VoxelJet - RenderVoxels: - Scale: 0.5 - Contrail@1: - Offset: -350,-550,-50 - Contrail@2: - Offset: -350,550,-50 - Inherits: ^BiologicalPilot - Inherits: ^PrioAntiHeavyAA - Inherits: ^FightingPlane - Inherits: ^PlaneScoutVision - Inherits: ^RearmableAircraft - Buildable: - Queue: Aircraft - BuildAtProductionType: Plane - BuildPaletteOrder: 50 - IconPalette: chrome - Prerequisites: ~afld.allies, ~aircraft.allies, ~commander_tree.raptor - Description: Fast Fighter Jet armed\nwith powerful Air-to-Air missiles.\n Strong vs Aircraft\n Weak vs Ground - Valued: - Cost: 2000 - Tooltip: - Name: F-22 Raptor - Health: - HP: 16000 - Armament: - Weapon: Nike.Raptor - LocalOffset: 0,213,-85, 0,-213,-85 - PauseOnCondition: !ammo || being-warped - AttackAircraft: - FacingTolerance: 512 - Aircraft: - Speed: 260 - AmmoPool: - Ammo: 6 - SpawnActorOnDeath: - Actor: raptor.Husk - RequiresCondition: !being-warped - HORN: Inherits: ^Plane Inherits: ^TDAircraftSprite diff --git a/mods/ca/rules/allies/commander-tree.yaml b/mods/ca/rules/allies/commander-tree.yaml index e69de29bb..84fdcf740 100644 --- a/mods/ca/rules/allies/commander-tree.yaml +++ b/mods/ca/rules/allies/commander-tree.yaml @@ -0,0 +1,58 @@ +commander_tree.Harrier: + Inherits: ^default.commander_tree_item + RenderSprites: + Image: harr + Tooltip: + Name: Harrier + Buildable: + Queue: Commander_Tree + BuildPaletteOrder: 50 + ForceIconLocation: true + Prerequisites: prerequisite.has_points, techcenter, ~aircraft.allies, ~!aircraft.germany + Description: Enables to build the Harrier, a VTOL aircraft. \n Strong vs. groups of light armored ground units. + +commander_tree.Harrier.Avionics: + Inherits: ^default.commander_tree_item + WithProductionIconOverlay@Air: + Types: Air + RenderSprites: + Image: harr + Tooltip: + Name: Harrier Avionics Upgrade + Buildable: + Queue: Commander_Tree + BuildPaletteOrder: 51 + ForceIconLocation: true + Prerequisites: prerequisite.has_points, techcenter, commander_tree.harrier, ~!commander_tree.harrier.payload, ~aircraft.england + Description: Upgrades the Avionics of the Harrier, allowing it to hover when shooting \n + ProvidesPrerequisite@filler: + Prerequisite: filler.harrier + +commander_tree.Harrier.Payload: + Inherits: ^default.commander_tree_item + WithProductionIconOverlay@Bullets: + Types: Bullets + RenderSprites: + Image: harr + Tooltip: + Name: Harrier Payload Upgrade + Buildable: + Queue: Commander_Tree + BuildPaletteOrder: 51 + ForceIconLocation: true + Prerequisites: prerequisite.has_points, techcenter, commander_tree.harrier, ~!commander_tree.harrier.avionics, ~aircraft.allies, ~!aircraft.germany + Description: Increases the Payload of the Harrier \n + ProvidesPrerequisite@filler: + Prerequisite: filler.harrier + +hack.cameo_filler.28: + Inherits: ^default.cameo_filler + Buildable: + BuildPaletteOrder: 51 + Prerequisites: prerequisite.has_points, ~aircraft.france, techcenter, disabled + +hack.cameo_filler.29: + Inherits: ^default.cameo_filler + Buildable: + BuildPaletteOrder: 52 + Prerequisites: prerequisite.has_points, ~aircraft.england, techcenter, ~filler.harrier, disabled diff --git a/mods/ca/rules/commander-tree.yaml b/mods/ca/rules/commander-tree.yaml index e448f2f5a..601574753 100644 --- a/mods/ca/rules/commander-tree.yaml +++ b/mods/ca/rules/commander-tree.yaml @@ -752,55 +752,6 @@ hack.cameo_filler.27: BuildPaletteOrder: 49 Prerequisites: prerequisite.has_points, ~aircraft.allies, ~filler.longbow, disabled -commander_tree.Harrier: - Inherits: ^default.commander_tree_item - Tooltip: - Name: Harrier - Buildable: - Queue: Commander_Tree - BuildPaletteOrder: 50 - ForceIconLocation: true - Prerequisites: prerequisite.has_points, techcenter, ~aircraft.allies, ~!aircraft.germany - Description: Enables to build the Harrier, a VTOL aircraft. \n Strong vs. groups of light armored ground units. - -commander_tree.Harrier.Avionics: - Inherits: ^default.commander_tree_item - Tooltip: - Name: Harrier Avionics Upgrade - Buildable: - Queue: Commander_Tree - BuildPaletteOrder: 51 - ForceIconLocation: true - Prerequisites: prerequisite.has_points, techcenter, commander_tree.harrier, ~!commander_tree.harrier.payload, ~aircraft.england - Description: Upgrades the Avionics of the Harrier, allowing it to hover when shooting \n - ProvidesPrerequisite@filler: - Prerequisite: filler.harrier - -commander_tree.Harrier.Payload: - Inherits: ^default.commander_tree_item - Tooltip: - Name: Harrier Payload Upgrade - Buildable: - Queue: Commander_Tree - BuildPaletteOrder: 51 - ForceIconLocation: true - Prerequisites: prerequisite.has_points, techcenter, commander_tree.harrier, ~!commander_tree.harrier.avionics, ~aircraft.allies, ~!aircraft.germany - Description: Increases the Payload of the Harrier \n - ProvidesPrerequisite@filler: - Prerequisite: filler.harrier - -hack.cameo_filler.28: - Inherits: ^default.cameo_filler - Buildable: - BuildPaletteOrder: 51 - Prerequisites: prerequisite.has_points, ~aircraft.france, techcenter, disabled - -hack.cameo_filler.29: - Inherits: ^default.cameo_filler - Buildable: - BuildPaletteOrder: 52 - Prerequisites: prerequisite.has_points, ~aircraft.england, techcenter, ~filler.harrier, disabled - #Soviet commander_tree.Mortar: diff --git a/mods/ca/sequences/aircraft.yaml b/mods/ca/sequences/aircraft.yaml index 1474027b6..2bd4fef1f 100644 --- a/mods/ca/sequences/aircraft.yaml +++ b/mods/ca/sequences/aircraft.yaml @@ -401,14 +401,6 @@ harr: idle: invisibleitem icon: harricon -harr.avionics: - Inherits: harr - icon: harrieravionicsicon - -harr.payload: - Inherits: harr - icon: harrierpayloadicon - raptor: Inherits: ^VehicleOverlays idle: invisibleitem