Skip to content

Commit 21306c3

Browse files
committed
Fixed multiword enums.
1 parent 2f935aa commit 21306c3

2 files changed

Lines changed: 14 additions & 9 deletions

File tree

Deltinteger/Deltinteger/Elements/Actions.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,28 +41,28 @@ public class A_BigMessage : Element {}
4141
[Parameter("Variable", typeof(Variable))]
4242
[Parameter("Destination", ValueType.Any, typeof(V_Number))]
4343
[Parameter("Rate", ValueType.Number, typeof(V_Number))]
44-
[Parameter("Variable", typeof(ChaseReevaluation))]
44+
[Parameter("Reevaluation", typeof(RateChaseReevaluation))]
4545
public class A_ChaseGlobalVariableAtRate : Element {}
4646

4747
[ElementData("Chase Global Variable Over Time")]
4848
[Parameter("Variable", typeof(Variable))]
4949
[Parameter("Destination", ValueType.Any, typeof(V_Number))]
5050
[Parameter("Duration", ValueType.Number, typeof(V_Number))]
51-
[Parameter("Variable", typeof(ChaseReevaluation))]
51+
[Parameter("Reevaluation", typeof(TimeChaseReevaluation))]
5252
public class A_ChaseGlobalVariableOverTime : Element {}
5353

5454
[ElementData("Chase Player Variable At Rate")]
5555
[Parameter("Variable", typeof(Variable))]
5656
[Parameter("Destination", ValueType.Any, typeof(V_Number))]
5757
[Parameter("Rate", ValueType.Number, typeof(V_Number))]
58-
[Parameter("Variable", typeof(ChaseReevaluation))]
58+
[Parameter("Reevaluation", typeof(RateChaseReevaluation))]
5959
public class A_ChasePlayerVariableAtRate : Element {}
6060

6161
[ElementData("Chase Player Variable Over Time")]
6262
[Parameter("Variable", typeof(Variable))]
6363
[Parameter("Destination", ValueType.Any, typeof(V_Number))]
6464
[Parameter("Duration", ValueType.Number, typeof(V_Number))]
65-
[Parameter("Variable", typeof(ChaseReevaluation))]
65+
[Parameter("Reevaluation", typeof(TimeChaseReevaluation))]
6666
public class A_ChasePlayerVariableOverTime : Element {}
6767

6868
[ElementData("Clear Status")]

Deltinteger/Deltinteger/Elements/Enums.cs

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,16 +100,14 @@ public static Element Special(EnumMember enumMember)
100100
}
101101

102102
public string CodeName { get; private set; }
103-
public string WorkshopName { get; private set; }
104103
public EnumMember[] Members { get; private set; }
105104
public Type Type { get; private set; }
106105
public Type UnderlyingType { get; private set; }
107106

108107
public EnumData(Type type)
109108
{
110109
EnumOverride data = type.GetCustomAttribute<EnumOverride>();
111-
CodeName = data?.CodeName ?? type.Name;
112-
WorkshopName = data?.WorkshopName ?? type.Name;
110+
CodeName = data?.CodeName ?? type.Name;
113111

114112
Type = type;
115113
UnderlyingType = Enum.GetUnderlyingType(type);
@@ -122,7 +120,7 @@ public EnumData(Type type)
122120
{
123121
EnumOverride fieldData = fields[v].GetCustomAttribute<EnumOverride>();
124122
string fieldCodeName = fieldData?.CodeName ?? fields[v].Name;
125-
string fieldWorkshopName = fieldData?.WorkshopName ?? fields[v].Name;
123+
string fieldWorkshopName = fieldData?.WorkshopName ?? Extras.AddSpacesToSentence(fields[v].Name, false);
126124

127125
Members[v] = new EnumMember(this, fieldCodeName, fieldWorkshopName, values.GetValue(v));
128126
}
@@ -338,12 +336,19 @@ public enum ContraryMotion
338336
}
339337

340338
[EnumParameter]
341-
public enum ChaseReevaluation
339+
public enum RateChaseReevaluation
342340
{
343341
DestinationAndRate,
344342
None
345343
}
346344

345+
[EnumParameter]
346+
public enum TimeChaseReevaluation
347+
{
348+
DestinationAndDuration,
349+
None
350+
}
351+
347352
[EnumParameter]
348353
public enum Status
349354
{

0 commit comments

Comments
 (0)