Skip to content

Commit

Permalink
updated to reflect internal versions
Browse files Browse the repository at this point in the history
  • Loading branch information
TheBoxTrot committed Feb 11, 2023
1 parent 6f2ef5e commit 2fe4098
Show file tree
Hide file tree
Showing 3 changed files with 130 additions and 85 deletions.
156 changes: 83 additions & 73 deletions code/gameresources/BaseDefinition.cs
Original file line number Diff line number Diff line change
Expand Up @@ -67,50 +67,24 @@ public Vector3 PortalExtends
get;
set;
}
/// <summary>
/// legacy needs removing
/// </summary>
public float main_portal_width
{
get;
set;
}
/// <summary>
/// legacy needs removing
/// </summary>
public float main_portal_depth
{
get;
set;
}
/// <summary>
/// legacy needs removing
/// </summary>
public float main_portal_height
{
get;
set;
}
[DefaultValue( "1,1,1" )]



public float main_door_scale
{
get;
set;
} = 1;

public SoundFile Sound_on_pressed_main_door
{
get;
set;
}

[DefaultValue( "0 0 0" )]
public Vector3 Offset_main_door
{
get;
set;
}

public Rotation Rotation_main_door
public Vector3 Rotation_main_door
{
get;
set;
Expand Down Expand Up @@ -150,12 +124,7 @@ public string bone



[Title( "parts" )]
public List<tardisparts> parts
{
get;
set;
}



public enum Custompropetytype
Expand Down Expand Up @@ -193,6 +162,14 @@ public enum ActionType
TriggerButtonAction,
custom,
}
public enum ButtonState
{
Either,
Up,
Down,


}

public struct Bodygroup
{
Expand Down Expand Up @@ -236,7 +213,13 @@ public Vector3 offset
}

}
public struct tardisparts

public enum ButtonType
{
SinglePress,
DuelPress,
}
public struct tardisparts
{
///maybe need a way to have these selectable in editor if using a custom type. although keep what matt said in mind.
[ShowIf( nameof( Category ), partCategory.custom )]
Expand All @@ -252,7 +235,13 @@ public List<CustomProperties> customprop
get;
set;
}

[ShowIf( nameof( Category ), partCategory.custom )]
[Title( "classname" )]
public string CustomClassName
{
get;
set;
}

public string Name
{
Expand All @@ -266,13 +255,23 @@ public string Model
get;
set;
}
[ShowIf( nameof( Category ), partCategory.BaseButton )]
public SoundEvent Sound_on_pressed
{
get;
set;
}
[ShowIf( nameof( Needsparticle ), true )]
[Property, ResourceType( "vpcf" )]
public string particle
{
get;
set;
}

float? Model_scale;
[ShowIf( nameof( NeedsModel ), true )]
public float model_scale { get { return Model_scale ?? 1; } set { Model_scale = value; } }
[ShowIf( nameof( Needsparticle ), true )]
public List<ParticleControlPoints> particlecontrolpoint
{
Expand Down Expand Up @@ -326,12 +325,7 @@ public int skin
set;
}

[ShowIf( nameof( partCategory.BaseButton ), true )]
public SoundEvent Sound_on_pressed
{
get;
set;
}

[DefaultValue( "0 0 0" )]
public Vector3 Offset
{
Expand Down Expand Up @@ -387,7 +381,7 @@ public ToolTips Tooltips
}
[ShowIf( nameof( Category ), partCategory.BaseButton )]
[Title( "Action" )]
public List<actions> actions
public List<Actions> actions
{
get;
set;
Expand All @@ -407,9 +401,13 @@ public enum partCategory
throttle,
custom,
tparticle,
UIScreen,
etc5
}




//
// Summary:
// Rotation to apply when placing the decal.
Expand All @@ -420,7 +418,7 @@ public enum conditionTypes
IF,
IFNOT,
}
[Title( "conditions" )]
[Title( "Callbacks" )]
public List<conditionsstruct> conditionlist
{
get;
Expand All @@ -432,57 +430,55 @@ public List<conditionsstruct> conditionlist
// Rotation to apply when placing the decal.






public enum conditions
{
TardisIsDead,
VR,
TardisBelow20PercentHealth,
hadsEnabled,
custom,
}
public enum conditionsActions
{
activate,
Lock,
ChangeSkin,
IgnoreUse,
}


public struct conditionsstruct
{

public conditionTypes conditionstypes

public string callbackname
{
get;
set;
}
public conditions conditions
public string callbackmessage
{
get;
set;
}
public conditionsActions conditionsActions

public string callbackaction
{
get;
set;
}
public string actionmessage
{
get;
set;
}
public float callbackdelay
{
get;
set;
}
}







public struct actions
public struct Actions
{
public ActionType Actiontype
{
get;
set;
}
[ShowIf( nameof( Actiontype ), ActionType.TriggerButtonAction )]

[ShowIf( nameof( Actiontype ), ActionType.TriggerButtonAction )]
public string ActionTarget
{
get;
Expand All @@ -500,13 +496,27 @@ public string customname
get;
set;
}

public ButtonState buttonstate
{
get;
set;
}
}


}
}



}

[Title( "parts" )]
public List<tardisparts> parts
{
get;
set;
}




Expand Down
27 changes: 17 additions & 10 deletions code/gameresources/ExteriorDefinition.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,31 @@
[GameResource( "exterior Definition", "exterior", "add all the models and sounds to create a new tardis.", Icon = "approval", IconBgColor = "#0c45a8", IconFgColor = "blue" )]
public class exteriorDefinition : BaseDefinition
{




[Property, ResourceType( "vmdl" )]
[Title( "Allow external Shell Usage" )]
[Description( "Allow Exterior to be mixedmashed with interior/Use with chameleoncircuit" )]
public bool AllowMixing
{
get;
set;
} = false;


[Property, ResourceType( "vmdl" )]
[Title( "Model with all Exterior Parts together" )]
public string exterior_model_with_doors
{
get;
set;
}
[DefaultValue( "models/drmatt/tardis/exterior/exterior.vmdl" )]
[Property, ResourceType( "vmdl" )]
public string exterior_model
{
get;
set;
}

[Property, ResourceType( "vmdl" )]
public string exterior_model
{
get;
set;
} = "models/drmatt/tardis/exterior/exterior.vmdl";

[Property, ResourceType( "vmdl" )]
public string exterior_doors
Expand Down
32 changes: 30 additions & 2 deletions code/gameresources/TardisDefinition.cs
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,12 @@ public SoundEvent door_locked
set;
}
[Category( "Sounds" )]
public SoundEvent ChameleonCircuit
{
get;
set;
}
[Category( "Sounds" )]
public SoundEvent on_lock
{
get;
Expand Down Expand Up @@ -168,10 +174,32 @@ public string exteriordef
}


[Property]
public bool DefaultRandomExterior
{
get;
set;
}

[Property]
public bool DefaultRandomInterior
{
get;
set;
}
[Property, ResourceType( "interior" )]
public List<string> Altinteriordef
{
get;
set;
}



[Property, ResourceType( "exterior" )]
public List<string> Altexteriordef
{
get;
set;
}

}
}
Expand Down

0 comments on commit 2fe4098

Please sign in to comment.