Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Some Objects In Wrong Faction In World Builder #332

Merged
merged 1 commit into from
Sep 12, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Patch104pZH/Design/Tasks/commy2_tasks.txt
Original file line number Diff line number Diff line change
Expand Up @@ -321,10 +321,10 @@ https://github.com/commy2/zerohour/issues/164 USA05 Tox

WORLD BUILDER

https://github.com/commy2/zerohour/issues/214 [IMPROVEMENT][NPROJECT] Air Force General Chinook Listed Under Vanilla USA In World Builder
https://github.com/commy2/zerohour/issues/213 [IMPROVEMENT][NPROJECT] Laser General Hellfire Drone Listed Under Super Weapon General In World Builder
https://github.com/commy2/zerohour/issues/212 [IMPROVEMENT][NPROJECT] All Bombs Listed Under USA In World Builder
https://github.com/commy2/zerohour/issues/211 [IMPROVEMENT][NPROJECT] Helix Wreck Props Listed Under USA In World Builder
https://github.com/commy2/zerohour/issues/79 [IMPROVEMENT][NPROJECT] Spectre Hardpoints Listed Under Normal China In World Builder
https://github.com/commy2/zerohour/issues/40 [IMPROVEMENT][NPROJECT] Infantry General Gattling Tank Listed Under Tank General In World Builder
https://github.com/commy2/zerohour/issues/39 [IMPROVEMENT][NPROJECT] Tank General Air Field Listed Under Vanilla China In World Builder
https://github.com/commy2/zerohour/issues/214 [DONE][NPROJECT] Air Force General Chinook Listed Under Vanilla USA In World Builder
https://github.com/commy2/zerohour/issues/213 [DONE][NPROJECT] Laser General Hellfire Drone Listed Under Super Weapon General In World Builder
https://github.com/commy2/zerohour/issues/212 [DONE][NPROJECT] All Bombs Listed Under USA In World Builder
https://github.com/commy2/zerohour/issues/211 [DONE][NPROJECT] Helix Wreck Props Listed Under USA In World Builder
https://github.com/commy2/zerohour/issues/79 [DONE][NPROJECT] Spectre Hardpoints Listed Under Normal China In World Builder
https://github.com/commy2/zerohour/issues/40 [DONE][NPROJECT] Infantry General Gattling Tank Listed Under Tank General In World Builder
https://github.com/commy2/zerohour/issues/39 [DONE][NPROJECT] Tank General Air Field Listed Under Vanilla China In World Builder
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ Object AirF_AuroraBomb
End

; ***DESIGN parameters ***
Side = America
Side = AmericaAirForceGeneral ; Patch104p @bugfix commy2 12/09/2021 Fix World Builder faction.
EditorSorting = SYSTEM
ArmorSet
Conditions = None
Expand Down Expand Up @@ -17416,7 +17416,7 @@ Object AFG_AmericaVehicleChinook
; ***DESIGN parameters ***
DisplayName = OBJECT:Chinook
EditorSorting = VEHICLE
Side = America
Side = AmericaAirForceGeneral ; Patch104p @bugfix commy2 12/09/2021 Fix World Builder faction.
TransportSlotCount = 0 ;how many "slots" we take in a transport (0 == not transportable)
VisionRange = 300.0
ShroudClearingRange = 600
Expand Down
4 changes: 2 additions & 2 deletions Patch104pZH/GameFilesEdited/Data/INI/Object/AmericaAir.ini
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ Object SpectreGunshipGattlingCannon
End

; ***DESIGN parameters ***
Side = China
Side = America ; Patch104p @bugfix commy2 12/09/2021 Fix World Builder faction.
EditorSorting = SYSTEM
TransportSlotCount = 1
WeaponSet
Expand Down Expand Up @@ -413,7 +413,7 @@ Object SpectreGunshipHowitzer
End

; ***DESIGN parameters ***
Side = China
Side = America ; Patch104p @bugfix commy2 12/09/2021 Fix World Builder faction.
EditorSorting = SYSTEM
TransportSlotCount = 1
WeaponSet
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1002,7 +1002,7 @@ Object HelixBlades

; ***DESIGN parameters ***
DisplayName = OBJECT:Comanche
Side = America
Side = China ; Patch104p @bugfix commy2 12/09/2021 Fix World Builder faction.

; *** ENGINEERING Parameters ***
KindOf = PRELOAD IMMOBILE
Expand Down
2 changes: 1 addition & 1 deletion Patch104pZH/GameFilesEdited/Data/INI/Object/Hulk.ini
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ Object HelixRubbleHull

; ***DESIGN parameters ***
DisplayName = OBJECT:ComancheHull
Side = America
Side = China ; Patch104p @bugfix commy2 12/09/2021 Fix World Builder faction.

; *** ENGINEERING Parameters ***
KindOf = IMMOBILE NO_COLLIDE HULK
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2469,7 +2469,7 @@ Object Infa_ChinaTankGattling

; ***DESIGN parameters ***
DisplayName = OBJECT:GattlingTank
Side = ChinaTankGeneral
Side = ChinaInfantryGeneral ; Patch104p @bugfix commy2 12/09/2021 Fix World Builder faction.
EditorSorting = VEHICLE
TransportSlotCount = 3 ;how many "slots" we take in a transport (0 == not transportable)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5496,7 +5496,7 @@ Object Lazr_AmericaVehicleHellfireDrone

; ***DESIGN parameters ***
DisplayName = OBJECT:HellfireDrone
Side = AmericaSuperWeaponGeneral
Side = AmericaLaserGeneral ; Patch104p @bugfix commy2 12/09/2021 Fix World Builder faction.
EditorSorting = VEHICLE
TransportSlotCount = 0 ;how many "slots" we take in a transport (0 == not transportable)
ArmorSet
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17222,7 +17222,7 @@ Object Nuke_ChinaCarpetBomb

; ***DESIGN parameters ***
DisplayName = OBJECT:CarpetBomb
Side = America
Side = ChinaNukeGeneral ; Patch104p @bugfix commy2 12/09/2021 Fix World Builder faction.
EditorSorting = SYSTEM
TransportSlotCount = 1 ;how many "slots" we take in a transport (0 == not transportable)
VisionRange = 300.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10421,7 +10421,7 @@ Object Tank_ChinaAirfield

; ***DESIGN parameters ***
DisplayName = OBJECT:Airfield
Side = China
Side = ChinaTankGeneral ; Patch104p @bugfix commy2 12/09/2021 Fix World Builder faction.
EditorSorting = STRUCTURE
Prerequisites
Object = Tank_ChinaSupplyCenter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ Object ChinaCarpetBomb

; ***DESIGN parameters ***
DisplayName = OBJECT:CarpetBomb
Side = America
Side = China ; Patch104p @bugfix commy2 12/09/2021 Fix World Builder faction.
EditorSorting = SYSTEM
TransportSlotCount = 1 ;how many "slots" we take in a transport (0 == not transportable)
VisionRange = 300.0
Expand Down