Skip to content

Commit 3eb9f40

Browse files
lmichaelislmichaelis
committed
chore(*): code formatting
1 parent bd36d6b commit 3eb9f40

29 files changed

Lines changed: 212 additions & 96 deletions

‎ZenKit/Daedalus/CameraInstance.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ public class CameraInstance : DaedalusInstance
77
public CameraInstance(UIntPtr handle) : base(handle)
88
{
99
}
10-
10+
1111
public float BestRange => Native.ZkCameraInstance_getBestRange(Handle);
1212
public float MinRange => Native.ZkCameraInstance_getMinRange(Handle);
1313
public float MaxRange => Native.ZkCameraInstance_getMaxRange(Handle);

‎ZenKit/Daedalus/EffectBaseInstance.cs‎

Lines changed: 63 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,24 @@ public class EffectBaseInstance : DaedalusInstance
77
public EffectBaseInstance(UIntPtr handle) : base(handle)
88
{
99
}
10-
10+
1111
public string VisNameS => Native.ZkEffectBaseInstance_getVisNameS(Handle).MarshalAsString() ?? string.Empty;
1212
public string VisSizeS => Native.ZkEffectBaseInstance_getVisSizeS(Handle).MarshalAsString() ?? string.Empty;
1313
public float VisAlpha => Native.ZkEffectBaseInstance_getVisAlpha(Handle);
14-
public string VisAlphaBlendFuncS => Native.ZkEffectBaseInstance_getVisAlphaBlendFuncS(Handle).MarshalAsString() ?? string.Empty;
14+
15+
public string VisAlphaBlendFuncS =>
16+
Native.ZkEffectBaseInstance_getVisAlphaBlendFuncS(Handle).MarshalAsString() ?? string.Empty;
17+
1518
public float VisTexAniFps => Native.ZkEffectBaseInstance_getVisTexAniFps(Handle);
1619
public int VisTexAniIsLooping => Native.ZkEffectBaseInstance_getVisTexAniIsLooping(Handle);
1720
public string EmTrjModeS => Native.ZkEffectBaseInstance_getEmTrjModeS(Handle).MarshalAsString() ?? string.Empty;
18-
public string EmTrjOriginNode => Native.ZkEffectBaseInstance_getEmTrjOriginNode(Handle).MarshalAsString() ?? string.Empty;
19-
public string EmTrjTargetNode => Native.ZkEffectBaseInstance_getEmTrjTargetNode(Handle).MarshalAsString() ?? string.Empty;
21+
22+
public string EmTrjOriginNode =>
23+
Native.ZkEffectBaseInstance_getEmTrjOriginNode(Handle).MarshalAsString() ?? string.Empty;
24+
25+
public string EmTrjTargetNode =>
26+
Native.ZkEffectBaseInstance_getEmTrjTargetNode(Handle).MarshalAsString() ?? string.Empty;
27+
2028
public float EmTrjTargetRange => Native.ZkEffectBaseInstance_getEmTrjTargetRange(Handle);
2129
public float EmTrjTargetAzi => Native.ZkEffectBaseInstance_getEmTrjTargetAzi(Handle);
2230
public float EmTrjTargetElev => Native.ZkEffectBaseInstance_getEmTrjTargetElev(Handle);
@@ -25,34 +33,70 @@ public EffectBaseInstance(UIntPtr handle) : base(handle)
2533
public float EmTrjAngleElevVar => Native.ZkEffectBaseInstance_getEmTrjAngleElevVar(Handle);
2634
public float EmTrjAngleHeadVar => Native.ZkEffectBaseInstance_getEmTrjAngleHeadVar(Handle);
2735
public float EmTrjKeyDistVar => Native.ZkEffectBaseInstance_getEmTrjKeyDistVar(Handle);
28-
public string EmTrjLoopModeS => Native.ZkEffectBaseInstance_getEmTrjLoopModeS(Handle).MarshalAsString() ?? string.Empty;
29-
public string EmTrjEaseFuncS => Native.ZkEffectBaseInstance_getEmTrjEaseFuncS(Handle).MarshalAsString() ?? string.Empty;
36+
37+
public string EmTrjLoopModeS =>
38+
Native.ZkEffectBaseInstance_getEmTrjLoopModeS(Handle).MarshalAsString() ?? string.Empty;
39+
40+
public string EmTrjEaseFuncS =>
41+
Native.ZkEffectBaseInstance_getEmTrjEaseFuncS(Handle).MarshalAsString() ?? string.Empty;
42+
3043
public float EmTrjEaseVel => Native.ZkEffectBaseInstance_getEmTrjEaseVel(Handle);
3144
public float EmTrjDynUpdateDelay => Native.ZkEffectBaseInstance_getEmTrjDynUpdateDelay(Handle);
3245
public int EmTrjDynUpdateTargetOnly => Native.ZkEffectBaseInstance_getEmTrjDynUpdateTargetOnly(Handle);
33-
public string EmFxCreateS => Native.ZkEffectBaseInstance_getEmFxCreateS(Handle).MarshalAsString() ?? string.Empty;
34-
public string EmFxInvestOriginS => Native.ZkEffectBaseInstance_getEmFxInvestOriginS(Handle).MarshalAsString() ?? string.Empty;
35-
public string EmFxInvestTargetS => Native.ZkEffectBaseInstance_getEmFxInvestTargetS(Handle).MarshalAsString() ?? string.Empty;
46+
47+
public string EmFxCreateS =>
48+
Native.ZkEffectBaseInstance_getEmFxCreateS(Handle).MarshalAsString() ?? string.Empty;
49+
50+
public string EmFxInvestOriginS =>
51+
Native.ZkEffectBaseInstance_getEmFxInvestOriginS(Handle).MarshalAsString() ?? string.Empty;
52+
53+
public string EmFxInvestTargetS =>
54+
Native.ZkEffectBaseInstance_getEmFxInvestTargetS(Handle).MarshalAsString() ?? string.Empty;
55+
3656
public float EmFxTriggerDelay => Native.ZkEffectBaseInstance_getEmFxTriggerDelay(Handle);
3757
public int EmFxCreateDownTrj => Native.ZkEffectBaseInstance_getEmFxCreateDownTrj(Handle);
38-
public string EmActionCollDynS => Native.ZkEffectBaseInstance_getEmActionCollDynS(Handle).MarshalAsString() ?? string.Empty;
39-
public string EmActionCollStatS => Native.ZkEffectBaseInstance_getEmActionCollStatS(Handle).MarshalAsString() ?? string.Empty;
40-
public string EmFxCollStatS => Native.ZkEffectBaseInstance_getEmFxCollStatS(Handle).MarshalAsString() ?? string.Empty;
41-
public string EmFxCollDynS => Native.ZkEffectBaseInstance_getEmFxCollDynS(Handle).MarshalAsString() ?? string.Empty;
42-
public string EmFxCollStatAlignS => Native.ZkEffectBaseInstance_getEmFxCollStatAlignS(Handle).MarshalAsString() ?? string.Empty;
43-
public string EmFxCollDynAlignS => Native.ZkEffectBaseInstance_getEmFxCollDynAlignS(Handle).MarshalAsString() ?? string.Empty;
58+
59+
public string EmActionCollDynS =>
60+
Native.ZkEffectBaseInstance_getEmActionCollDynS(Handle).MarshalAsString() ?? string.Empty;
61+
62+
public string EmActionCollStatS =>
63+
Native.ZkEffectBaseInstance_getEmActionCollStatS(Handle).MarshalAsString() ?? string.Empty;
64+
65+
public string EmFxCollStatS =>
66+
Native.ZkEffectBaseInstance_getEmFxCollStatS(Handle).MarshalAsString() ?? string.Empty;
67+
68+
public string EmFxCollDynS =>
69+
Native.ZkEffectBaseInstance_getEmFxCollDynS(Handle).MarshalAsString() ?? string.Empty;
70+
71+
public string EmFxCollStatAlignS =>
72+
Native.ZkEffectBaseInstance_getEmFxCollStatAlignS(Handle).MarshalAsString() ?? string.Empty;
73+
74+
public string EmFxCollDynAlignS =>
75+
Native.ZkEffectBaseInstance_getEmFxCollDynAlignS(Handle).MarshalAsString() ?? string.Empty;
76+
4477
public float EmFxLifespan => Native.ZkEffectBaseInstance_getEmFxLifespan(Handle);
4578
public int EmCheckCollision => Native.ZkEffectBaseInstance_getEmCheckCollision(Handle);
4679
public int EmAdjustShpToOrigin => Native.ZkEffectBaseInstance_getEmAdjustShpToOrigin(Handle);
4780
public float EmInvestNextKeyDuration => Native.ZkEffectBaseInstance_getEmInvestNextKeyDuration(Handle);
4881
public float EmFlyGravity => Native.ZkEffectBaseInstance_getEmFlyGravity(Handle);
49-
public string EmSelfRotVelS => Native.ZkEffectBaseInstance_getEmSelfRotVelS(Handle).MarshalAsString() ?? string.Empty;
50-
public string LightPresetName => Native.ZkEffectBaseInstance_getLightPresetName(Handle).MarshalAsString() ?? string.Empty;
82+
83+
public string EmSelfRotVelS =>
84+
Native.ZkEffectBaseInstance_getEmSelfRotVelS(Handle).MarshalAsString() ?? string.Empty;
85+
86+
public string LightPresetName =>
87+
Native.ZkEffectBaseInstance_getLightPresetName(Handle).MarshalAsString() ?? string.Empty;
88+
5189
public string SfxId => Native.ZkEffectBaseInstance_getSfxId(Handle).MarshalAsString() ?? string.Empty;
5290
public int SfxIsAmbient => Native.ZkEffectBaseInstance_getSfxIsAmbient(Handle);
5391
public int SendAssessMagic => Native.ZkEffectBaseInstance_getSendAssessMagic(Handle);
5492
public float SecsPerDamage => Native.ZkEffectBaseInstance_getSecsPerDamage(Handle);
55-
public string EmFxCollDynPercS => Native.ZkEffectBaseInstance_getEmFxCollDynPercS(Handle).MarshalAsString() ?? string.Empty;
56-
public string UserString(ulong i) => Native.ZkEffectBaseInstance_getUserString(Handle, i).MarshalAsString() ?? string.Empty;
93+
94+
public string EmFxCollDynPercS =>
95+
Native.ZkEffectBaseInstance_getEmFxCollDynPercS(Handle).MarshalAsString() ?? string.Empty;
96+
97+
public string UserString(ulong i)
98+
{
99+
return Native.ZkEffectBaseInstance_getUserString(Handle, i).MarshalAsString() ?? string.Empty;
100+
}
57101
}
58102
}

‎ZenKit/Daedalus/FightAiInstance.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public enum FightAiMove
2121
StandUp = 18,
2222
Wait = 19,
2323
WaitLonger = 23,
24-
WaitExt = 24,
24+
WaitExt = 24
2525
}
2626

2727
public class FightAiInstance : DaedalusInstance
@@ -34,6 +34,5 @@ public FightAiMove GetMove(ulong i)
3434
{
3535
return Native.ZkFightAiInstance_getMove(Handle, i);
3636
}
37-
3837
}
3938
}

‎ZenKit/Daedalus/InfoInstance.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ public class InfoInstance : DaedalusInstance
77
public InfoInstance(UIntPtr handle) : base(handle)
88
{
99
}
10-
10+
1111
public int Npc => Native.ZkInfoInstance_getNpc(Handle);
1212
public int Nr => Native.ZkInfoInstance_getNr(Handle);
1313
public int Important => Native.ZkInfoInstance_getImportant(Handle);

‎ZenKit/Daedalus/ItemReactInstance.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ public class ItemReactInstance : DaedalusInstance
77
public ItemReactInstance(UIntPtr handle) : base(handle)
88
{
99
}
10-
10+
1111
public int Npc => Native.ZkItemReactInstance_getNpc(Handle);
1212
public int TradeItem => Native.ZkItemReactInstance_getTradeItem(Handle);
1313
public int TradeAmount => Native.ZkItemReactInstance_getTradeAmount(Handle);

‎ZenKit/Daedalus/MenuInstance.cs‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public enum MenuItemType
1111
Cursor = 4,
1212
ChoiceBox = 5,
1313
Button = 6,
14-
ListBox = 7,
14+
ListBox = 7
1515
}
1616

1717
public enum MenuItemFlag
@@ -31,7 +31,7 @@ public enum MenuItemFlag
3131
NeedsApply = 1 << 12,
3232
NeedsRestart = 1 << 13,
3333
ExtendedMenu = 1 << 14,
34-
HorSelectable = 1 << 15,
34+
HorSelectable = 1 << 15
3535
}
3636

3737
public class MenuInstance : DaedalusInstance
@@ -52,7 +52,11 @@ public MenuInstance(UIntPtr handle) : base(handle)
5252
public int Flags => Native.ZkMenuInstance_getFlags(Handle);
5353
public int DefaultOutGame => Native.ZkMenuInstance_getDefaultOutgame(Handle);
5454
public int DefaultInGame => Native.ZkMenuInstance_getDefaultIngame(Handle);
55-
public string GetItem(ulong i) => Native.ZkMenuInstance_getItem(Handle, i).MarshalAsString() ?? string.Empty;
55+
56+
public string GetItem(ulong i)
57+
{
58+
return Native.ZkMenuInstance_getItem(Handle, i).MarshalAsString() ?? string.Empty;
59+
}
5660
}
5761

5862
public class MenuItemInstance : DaedalusInstance
@@ -66,7 +70,9 @@ public MenuItemInstance(UIntPtr handle) : base(handle)
6670
public string AlphaMode => Native.ZkMenuItemInstance_getAlphaMode(Handle).MarshalAsString() ?? string.Empty;
6771
public int Alpha => Native.ZkMenuItemInstance_getAlpha(Handle);
6872
public MenuItemType MenuItemType => Native.ZkMenuItemInstance_getType(Handle);
69-
public string OnChgSetOption => Native.ZkMenuItemInstance_getOnChgSetOption(Handle).MarshalAsString() ?? string.Empty;
73+
74+
public string OnChgSetOption =>
75+
Native.ZkMenuItemInstance_getOnChgSetOption(Handle).MarshalAsString() ?? string.Empty;
7076

7177
public string OnChgSetOptionSection =>
7278
Native.ZkMenuItemInstance_getOnChgSetOptionSection(Handle).MarshalAsString() ?? string.Empty;
@@ -87,7 +93,9 @@ public MenuItemInstance(UIntPtr handle) : base(handle)
8793
public string HideIfOptionSectionSet =>
8894
Native.ZkMenuItemInstance_getHideIfOptionSectionSet(Handle).MarshalAsString() ?? string.Empty;
8995

90-
public string HideIfOptionSet => Native.ZkMenuItemInstance_getHideIfOptionSet(Handle).MarshalAsString() ?? string.Empty;
96+
public string HideIfOptionSet =>
97+
Native.ZkMenuItemInstance_getHideIfOptionSet(Handle).MarshalAsString() ?? string.Empty;
98+
9199
public int HideOnValue => Native.ZkMenuItemInstance_getHideOnValue(Handle);
92100

93101
public string GetText(ulong i)
@@ -120,4 +128,4 @@ public string GetUserString(ulong i)
120128
return Native.ZkMenuItemInstance_getUserString(Handle, i).MarshalAsString() ?? string.Empty;
121129
}
122130
}
123-
}
131+
}

‎ZenKit/Daedalus/MissionInstance.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
namespace ZenKit.Daedalus
44
{
5-
public class MissionInstance : DaedalusInstance
5+
public class MissionInstance : DaedalusInstance
66
{
77
public MissionInstance(UIntPtr handle) : base(handle)
88
{
9-
}
9+
}
1010

1111
public string Name => Native.ZkMissionInstance_getName(Handle).MarshalAsString() ?? string.Empty;
1212
public string Description => Native.ZkMissionInstance_getDescription(Handle).MarshalAsString() ?? string.Empty;
@@ -22,4 +22,4 @@ public MissionInstance(UIntPtr handle) : base(handle)
2222
public int ObsoleteFn => Native.ZkMissionInstance_getObsolete(Handle);
2323
public int RunningFn => Native.ZkMissionInstance_getRunning(Handle);
2424
}
25-
}
25+
}

‎ZenKit/Daedalus/MusicJingleInstance.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ public class MusicJingleInstance : DaedalusInstance
77
public MusicJingleInstance(UIntPtr handle) : base(handle)
88
{
99
}
10-
10+
1111
public string Name => Native.ZkMusicJingleInstance_getName(Handle).MarshalAsString() ?? string.Empty;
1212
public int Loop => Native.ZkMusicJingleInstance_getLoop(Handle);
1313
public float Vol => Native.ZkMusicJingleInstance_getVol(Handle);

‎ZenKit/Daedalus/MusicThemeInstance.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,23 @@ public enum MusicTransitionEffect
1111
Break = 4,
1212
Intro = 5,
1313
End = 6,
14-
EndAndInto = 7,
14+
EndAndInto = 7
1515
}
1616

1717
public enum MusicTransitionType
1818
{
1919
Unknown = 0,
2020
Immediate = 1,
2121
Beat = 2,
22-
Measure = 3,
22+
Measure = 3
2323
}
2424

2525
public class MusicThemeInstance : DaedalusInstance
2626
{
2727
public MusicThemeInstance(UIntPtr handle) : base(handle)
2828
{
2929
}
30-
30+
3131
public string File => Native.ZkMusicThemeInstance_getFile(Handle).MarshalAsString() ?? string.Empty;
3232
public float Vol => Native.ZkMusicThemeInstance_getVol(Handle);
3333
public int Loop => Native.ZkMusicThemeInstance_getLoop(Handle);

‎ZenKit/Daedalus/NpcInstance.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public enum NpcType
2020
G2OcMain = 4,
2121
G2BlAmbient = 5,
2222
G2TalAmbient = 6,
23-
G2BlMain = 7,
23+
G2BlMain = 7
2424
}
2525

2626
public enum NpcNameSlot
@@ -29,7 +29,7 @@ public enum NpcNameSlot
2929
Slot1 = 1,
3030
Slot2 = 2,
3131
Slot3 = 3,
32-
Slot4 = 4,
32+
Slot4 = 4
3333
}
3434

3535
public enum NpcMissionSlot
@@ -38,7 +38,7 @@ public enum NpcMissionSlot
3838
Slot1 = 1,
3939
Slot2 = 2,
4040
Slot3 = 3,
41-
Slot4 = 4,
41+
Slot4 = 4
4242
}
4343

4444
public enum NpcAttribute
@@ -50,7 +50,7 @@ public enum NpcAttribute
5050
Strength = 4,
5151
Dexterity = 5,
5252
RegenerateHp = 6,
53-
RegenerateMana = 7,
53+
RegenerateMana = 7
5454
}
5555

5656
public enum DamageType
@@ -62,7 +62,7 @@ public enum DamageType
6262
Fly = 4,
6363
Magic = 5,
6464
Point = 6,
65-
Fall = 7,
65+
Fall = 7
6666
}
6767

6868
public enum NpcTalent
@@ -71,7 +71,7 @@ public enum NpcTalent
7171
OneHanded = 1,
7272
TwoHanded = 2,
7373
Bow = 3,
74-
Crossbow = 4,
74+
Crossbow = 4
7575
}
7676

7777
public class NpcInstance : DaedalusInstance

0 commit comments

Comments
 (0)