-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixed customization and camera, added commanders choice, added dialog…
… for deployment
- Loading branch information
1 parent
fb944d0
commit 3ec3dd9
Showing
18 changed files
with
1,118 additions
and
149 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,17 @@ | ||
| [WOTCWaveCOM.X2DownloadableContentInfo_WOTCWaveCOM] | ||
| DLCIdentifier="WOTCWaveCOM" | ||
| DLCIdentifier="WOTCWaveCOM" | ||
|
|
||
| [BetterSecondWaveSupport.X2DownloadableContentInfo_BetterSecondWaveSupport] | ||
| +AddSecondWave=(ID="WaveCOMCommandersChoice", DifficultyValue=0) | ||
|
|
||
| [ExtendedMissionTimers SecondWaveOptionObject] | ||
| Disabled=true | ||
|
|
||
| [ExtendedAvatarProject SecondWaveOptionObject] | ||
| Disabled=true | ||
|
|
||
| [PlayingForKeeps SecondWaveOptionObject] | ||
| Disabled=true | ||
|
|
||
| [WaveCOMCommandersChoice SecondWaveOptionObject] | ||
| CanChangeInCampaign=true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| [WaveCOMCommandersChoice SecondWaveOptionObject] | ||
| Tooltip="Allows you to choose the soldier class of each promoted rookie. This is the only Commander's Choice Second Wave option that works with WaveCOM" | ||
| Description="(WaveCOM) Commander's Choice: Allow you to select classes of promoted rookies" |
13 changes: 13 additions & 0 deletions
13
WaveCOMWOTC/Src/WOTCWaveCOM/Classes/WaveCOM_Camera_Customization.uc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| class WaveCOM_Camera_Customization extends X2Camera_Fixed; | ||
|
|
||
| var public TPOV CameraViewX; | ||
|
|
||
| function SetCameraView(const out TPOV InCameraView) | ||
| { | ||
| CameraViewX = InCameraView; | ||
| } | ||
|
|
||
| function TPOV GetCameraLocationAndOrientation() | ||
| { | ||
| return CameraViewX; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
78 changes: 78 additions & 0 deletions
78
WaveCOMWOTC/Src/WOTCWaveCOM/Classes/WaveCOM_UIChooseClass.uc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| class WaveCOM_UIChooseClass extends UIChooseClass; | ||
|
|
||
| simulated function array<Commodity> ConvertClassesToCommodities() | ||
| { | ||
| local X2SoldierClassTemplate ClassTemplate; | ||
| local int iClass; | ||
| local array<Commodity> arrCommodoties; | ||
| local Commodity ClassComm; | ||
|
|
||
| m_arrClasses.Remove(0, m_arrClasses.Length); | ||
| m_arrClasses = GetClasses(); | ||
| m_arrClasses.Sort(SortClassesByName); | ||
|
|
||
| for (iClass = 0; iClass < m_arrClasses.Length; iClass++) | ||
| { | ||
| ClassTemplate = m_arrClasses[iClass]; | ||
|
|
||
| ClassComm.Title = ClassTemplate.DisplayName; | ||
| ClassComm.Image = ClassTemplate.IconImage; | ||
| ClassComm.Desc = ClassTemplate.ClassSummary; | ||
| ClassComm.OrderHours = 0; | ||
|
|
||
| arrCommodoties.AddItem(ClassComm); | ||
| } | ||
|
|
||
| return arrCommodoties; | ||
| } | ||
|
|
||
| function bool OnClassSelected(int iOption) | ||
| { | ||
| local XComGameState NewGameState; | ||
| local XComGameState_Unit UnitState; | ||
| local XComGameState_HeadquartersXCom NewXComHQ; | ||
| local XComGameState_Item InventoryItem; | ||
| local array<XComGameState_Item> InventoryItems; | ||
| local XGItem ItemVisualizer; | ||
|
|
||
| if (m_UnitRef.ObjectID <= 0) | ||
| { | ||
| return false; | ||
| } | ||
|
|
||
| NewGameState = class'XComGameStateContext_ChangeContainer'.static.CreateChangeState("Training new rookie"); | ||
| UnitState = XComGameState_Unit(NewGameState.ModifyStateObject(class'XComGameState_Unit', m_UnitRef.ObjectID)); | ||
|
|
||
| NewXComHQ = XComGameState_HeadquartersXCom(NewGameState.ModifyStateObject(class'XComGameState_HeadquartersXCom', XComHQ.ObjectID)); | ||
| class'WaveCOM_UIArmory_FieldLoadout'.static.CleanUpStats(NewGameState, UnitState); | ||
| UnitState.RankUpSoldier(NewGameState, m_arrClasses[iOption].DataName); | ||
| InventoryItems = UnitState.GetAllInventoryItems(NewGameState); | ||
|
|
||
| foreach InventoryItems(InventoryItem) | ||
| { | ||
| NewXComHQ.PutItemInInventory(NewGameState, InventoryItem); | ||
| UnitState.RemoveItemFromInventory(InventoryItem, NewGameState); | ||
| ItemVisualizer = XGItem(`XCOMHISTORY.GetVisualizer(InventoryItem.GetReference().ObjectID)); | ||
| ItemVisualizer.Destroy(); | ||
| `XCOMHISTORY.SetVisualizer(InventoryItem.GetReference().ObjectID, none); | ||
| } | ||
| UnitState.ApplySquaddieLoadout(NewGameState, NewXComHQ); | ||
| UnitState.ApplyBestGearLoadout(NewGameState); // Make sure the squaddie has the best gear available | ||
|
|
||
| UnitState.ValidateLoadout(NewGameState); | ||
| if (UnitState.GetSoldierRank() < UnitState.StartingRank) | ||
| { | ||
| UnitState.bRankedUp = false; // Keep leveling up until it catches up to the appropriate rank. | ||
| } | ||
|
|
||
| `XCOMGAME.GameRuleset.SubmitGameState(NewGameState); | ||
|
|
||
| `XSTRATEGYSOUNDMGR.PlaySoundEvent("StrategyUI_Staff_Assign"); | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| defaultproperties | ||
| { | ||
| bConsumeMouseEvents = true; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -251,4 +251,4 @@ function SetNewResearchProject(int iOption) | |
| defaultproperties | ||
| { | ||
| bConsumeMouseEvents = true; | ||
| } | ||
| } | ||
Oops, something went wrong.