Skip to content

Commit

Permalink
fix merge of gdi grenadier
Browse files Browse the repository at this point in the history
  • Loading branch information
patrickwieth committed Jul 20, 2024
1 parent 85cf8fd commit b6e9179
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
6 changes: 4 additions & 2 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
The YMCA OpenRA mod has grown from a personal Combined Arms fork
modding project, to a small, but passionate community. We are very thankful
for the inspiration Combined Arms has given us, so that we even copied the sentence
before this one.
for the inspiration Combined Arms has given us, so that we even copied the first sentence
of the text you just read.
There are still many things from Combined Arms left in this mod and we do not intend
to steal any of their original creations. If you find assets that are still in this
mod but are taken without consent, please let us know, we will remove that.
Expand All @@ -13,6 +13,8 @@ the C&C modding community is insane and their endurance doing this for decades i
unparalleled.

In this sense, big thanks go to
YMCA developers:
* GDI Grenadier (descriptions)

Combined Arms developers:
* Inq (Project lead)
Expand Down
2 changes: 1 addition & 1 deletion mods/ca/rules/gdi/commander-tree.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ commander_tree.Mammoth_Tank_GDI.Reflector:
ProvidesPrerequisite@filler:
Prerequisite: filler.gdimammoth2

commander_tree.Mammoth_Tank_GDI.PLD:
commander_tree.Mammoth_Tank_GDI.PDL:
Inherits: ^default.commander_tree_item
Tooltip:
Name: Mammoth Tank Point Laser Defense
Expand Down
4 changes: 2 additions & 2 deletions mods/ca/rules/player.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,8 @@ Player:
Prerequisites: global.balancedharvesting
LobbyPrerequisiteCheckbox@NukularConyard:
ID: nukular
Label: Nuclear MCV
Description: Enables Nuclear MCV Mode - The first conyard of each player is nuclear, this means if you lose it, you lose the game and it will explode in a gigantic nuclear detonation. Great for FFA.
Label: Nukular MCV
Description: Enables Nukular MCV Mode - The first conyard of each player is Nukular, this means if you lose it, you lose the game and it will explode in a gigantic nuclear detonation. Great for FFA.
Enabled: False
DisplayOrder: 19
Prerequisites: global.nukular
Expand Down

0 comments on commit b6e9179

Please sign in to comment.