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 Civilian vehicle crush levels #1625

Merged
merged 12 commits into from
Feb 21, 2023
Merged

Fix Civilian vehicle crush levels #1625

merged 12 commits into from
Feb 21, 2023

Conversation

xezon
Copy link
Collaborator

@xezon xezon commented Feb 4, 2023

Merge with Rebase

This change fixes crush levels of Civilian, Unused vehicles.

  • Civilian Humvee1 can now crush trees
  • Civilian MilitiaTank can now crush trees
  • Civilian Tractor (small) can now be crushed by vehicles
  • Civilian ForkliftSmall can now be crushed by vehicles, can no longer crush trees
  • Civilian TruckChicken can now crush trees
  • Civilian FarmerChickenTruck can no longer be crushed by vehicles, can now crush trees
  • Civilian SupplyTruck can no longer be crushed by vehicles, can now crush trees
  • Civilian FarmerTruck can no longer be crushed by vehicles, can now crush trees
  • Civilian TruckWork can no longer be crushed by vehicles, can now crush trees
  • Civilian TruckWork2 can no longer be crushed by vehicles, can now crush trees
  • Civilian TruckFarmer can no longer be crushed by vehicles, can now crush trees
  • Civilian ForkliftLarge can now be crushed by Overlord and similar
  • USA AmericaVehicleRepairDrone can now be crushed by Overlord and similar

Controversial

TruckWork is used in popular Defcon 6 map. If cars in Defcon 6 are meant to be crushable, then cars in Defcon 6 need to be replaced with similar car that is crushable by general vehicles.

Affected vehicles

shot_20230204_190536_2

@xezon xezon added Bug Something is not working right Controversial Is controversial Minor Severity: Minor < Major < Critical < Blocker labels Feb 4, 2023
@commy2
Copy link
Collaborator

commy2 commented Feb 4, 2023

For simplicity, all civ vehicles should be crushable imho.

Humvee1, MilitiaTank and Repair Drone changes are good.

@xezon
Copy link
Collaborator Author

xezon commented Feb 4, 2023

For simplicity, all civ vehicles should be crushable imho.

I thought about that too, but came to the conclusion that this is not the proper way. There are other big civilian cars, such as Big Rigs, Buses, Cranes. They all are set up to not be crushable by vehicles. The big trucks here are the only outliers, where some trucks can be crushed, and others not. Since they have about the same size of China Supply Truck, it makes sense to behave just like that one. Plus, different levels of crushable terror cars makes the game more diverse in functionality - which is favorable. It is up to the level designer to pick the desired bomb car for his map.

@commy2
Copy link
Collaborator

commy2 commented Feb 4, 2023

Maybe needs a lineup of what civ cars exist and what their properties are. Sorry for the burden.

@xezon
Copy link
Collaborator Author

xezon commented Feb 4, 2023

I made a test map for it. It contains all cars minus 3 trucks I forgot to put.
https://github.com/TheSuperHackers/GeneralsGamePatch/tree/main/Maps/SkirmishOnly/!SkirmishTestCarCrush

I reviewed all cars by crushing them with Gattling Tank and Overlord.

@xezon
Copy link
Collaborator Author

xezon commented Feb 4, 2023

Here are some other big cars that cannot be crushed by regular vehicles. If we were to make them all crushable, we would end up touching many more cars than this change currently does. And it look weird, because these cars are bigger than GLA Technicals & Co.

cars

@xezon xezon changed the title Fix vehicle crush levels Fix Civilian vehicle crush levels Feb 14, 2023
@xezon xezon force-pushed the fix-vehicle-crushlevel branch from 2ae26f7 to 5f2ad8c Compare February 21, 2023 17:46
@xezon
Copy link
Collaborator Author

xezon commented Feb 21, 2023

Fixed two more inconsistencies

  • Civilian TruckFarmer can no longer be crushed by vehicles, can now crush trees
  • Civilian ForkliftLarge can now be crushed by Overlord and similar

@xezon
Copy link
Collaborator Author

xezon commented Feb 21, 2023

Looks good to me.

@xezon xezon merged commit 52e772f into main Feb 21, 2023
xezon added a commit that referenced this pull request Feb 21, 2023
xezon added a commit that referenced this pull request Feb 21, 2023
xezon added a commit that referenced this pull request Feb 21, 2023
xezon added a commit that referenced this pull request Feb 21, 2023
xezon added a commit that referenced this pull request Feb 21, 2023
xezon added a commit that referenced this pull request Feb 21, 2023
xezon added a commit that referenced this pull request Feb 21, 2023
@xezon xezon deleted the fix-vehicle-crushlevel branch February 21, 2023 17:58
xezon added a commit that referenced this pull request Feb 21, 2023
@xezon xezon added the Civilian Affects Civilian faction label Mar 19, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Something is not working right Civilian Affects Civilian faction Controversial Is controversial Minor Severity: Minor < Major < Critical < Blocker
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Some vehicles cannot be crushed but should be
2 participants