-
Notifications
You must be signed in to change notification settings - Fork 46
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add Physics Shield and Closed Solid Field #776
Closed
TheDarkBomber
wants to merge
10
commits into
BEEmod:dev
from
TheDarkBomber:revert-772-revert-765-fizz
Closed
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
dbb1220
Merge pull request #598 from TeamSpen210/dev
TeamSpen210 faa5d85
Added Closed Solid Field and Physics Shield!
TheDarkBomber 17df5e4
Merge pull request #765 from TheDarkBomber/fizz
FrozenDragon0 804f84c
Revert "Extra Fizzlers"
TeamSpen210 8d9df05
Merge pull request #772 from TeamSpen210/revert-765-fizz
TeamSpen210 cb88d98
Revert "Revert "Extra Fizzlers""
TheDarkBomber d7aefd3
Update Physics Shield Description
TheDarkBomber bb97b60
Merge pull request #1 from TheDarkBomber/fizz
TheDarkBomber dff5f08
Add 50s variant of Physics Shield
TheDarkBomber cfd1617
Add 50s variant of Closed Solid Field
TheDarkBomber File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 |
|---|---|---|
| @@ -0,0 +1,168 @@ | ||
| "Item" | ||
| { | ||
| "Type" "ITEM_PHYS_SHIELD" | ||
| "ItemClass" "ItemBarrierHazard" | ||
| "Editor" | ||
| { | ||
| "SubTypeProperty" "HazardType" | ||
| "SubType" | ||
| { | ||
| "Name" "Physics Shield" | ||
| "Model" | ||
| { | ||
| "ModelName" "laserfield.3ds" | ||
| } | ||
| "Palette" | ||
| { | ||
| "Tooltip" "PHYSICS SHIELD" | ||
| "Image" "palette/50s/phys_shield/phys_shield.png" | ||
| "Position" "1 6 0" | ||
| } | ||
| "Sounds" | ||
| { | ||
| "SOUND_CREATED" "P2Editor.PlaceOther" | ||
| "SOUND_EDITING_ACTIVATE" "P2Editor.ExpandOther" | ||
| "SOUND_EDITING_DEACTIVATE" "P2Editor.CollapseOther" | ||
| "SOUND_DELETED" "P2Editor.RemoveOther" | ||
| } | ||
| } | ||
| "SubType" | ||
| { | ||
| "Name" "UNUSED" | ||
| "Model" | ||
| { | ||
| "ModelName" "bee2_fizz_error.3ds" | ||
| } | ||
| "Sounds" | ||
| { | ||
| "SOUND_CREATED" "P2Editor.PlaceOther" | ||
| "SOUND_EDITING_ACTIVATE" "P2Editor.Error" | ||
| "SOUND_EDITING_DEACTIVATE" "P2Editor.Correction" | ||
| "SOUND_DELETED" "P2Editor.RemoveOther" | ||
| } | ||
| } | ||
| "MovementHandle" "HANDLE_6_POSITIONS" | ||
| "DesiredFacing" "DESIRES_HORIZONTAL" | ||
| } | ||
| "Properties" | ||
| { | ||
| "ConnectionCount" | ||
| { | ||
| "DefaultValue" "0" | ||
| "Index" "1" | ||
| } | ||
| "StartEnabled" | ||
| { | ||
| "DefaultValue" "1" | ||
| "Index" "2" | ||
| } | ||
| "HazardType" | ||
| { | ||
| "DefaultValue" "0" | ||
| "Index" "3" | ||
| } | ||
| } | ||
| "Exporting" | ||
| { | ||
| "Instances" | ||
| { | ||
| "0" | ||
| { | ||
| "Name" "instances/BEE2/50s/items/phys_shield/pshield_base.vmf" | ||
| "EntityCount" "5" | ||
| } | ||
| "1" | ||
| { | ||
| "Name" "instances/BEE2/50s/items/phys_shield/pshield_model.vmf" | ||
| "EntityCount" "5" | ||
| } | ||
| } | ||
| "TargetName" "phys_shield" | ||
| "Inputs" | ||
| { | ||
| "CONNECTION_STANDARD" | ||
| { | ||
| "Activate" "instance:counter;Add" | ||
| "Deactivate" "instance:counter;Subtract" | ||
| } | ||
| "CONNECTION_HAZARD_MODEL" | ||
| { | ||
| "Activate" "instance:mdl;FireUser2" | ||
| "Deactivate" "instance:mdl;FireUser1" | ||
| } | ||
| "CONNECTION_HAZARD_BRUSH" | ||
| { | ||
| "Activate" "Enable" | ||
| "Deactivate" "Disable" | ||
| } | ||
| } | ||
| "Outputs" | ||
| { | ||
| "CONNECTION_HAZARD" | ||
| { | ||
| "Activate" "instance:out;OnUser2" | ||
| "Deactivate" "instance:out;OnUser1" | ||
| } | ||
| } | ||
| "ConnectionPoints" | ||
| { | ||
| "Point" | ||
| { | ||
| "Dir" "1 0 0" | ||
| "Pos" "2 0 0" | ||
| "SignageOffset" "1 1 0" | ||
| "Priority" "0" | ||
| } | ||
| "Point" | ||
| { | ||
| "Dir" "1 0 0" | ||
| "Pos" "2 2 0" | ||
| "SignageOffset" "1 3 0" | ||
| "Priority" "0" | ||
| } | ||
| "Point" | ||
| { | ||
| "Dir" "1 0 0" | ||
| "Pos" "2 4 0" | ||
| "SignageOffset" "1 5 0" | ||
| "Priority" "0" | ||
| } | ||
| "Point" | ||
| { | ||
| "Dir" "1 0 0" | ||
| "Pos" "2 6 0" | ||
| "SignageOffset" "1 7 0" | ||
| "Priority" "0" | ||
| } | ||
| "Point" | ||
| { | ||
| "Dir" "-1 0 0" | ||
| "Pos" "5 0 0" | ||
| "SignageOffset" "6 1 0" | ||
| "Priority" "0" | ||
| } | ||
| "Point" | ||
| { | ||
| "Dir" "-1 0 0" | ||
| "Pos" "5 2 0" | ||
| "SignageOffset" "6 3 0" | ||
| "Priority" "0" | ||
| } | ||
| "Point" | ||
| { | ||
| "Dir" "-1 0 0" | ||
| "Pos" "5 4 0" | ||
| "SignageOffset" "6 5 0" | ||
| "Priority" "0" | ||
| } | ||
| "Point" | ||
| { | ||
| "Dir" "-1 0 0" | ||
| "Pos" "5 6 0" | ||
| "SignageOffset" "6 7 0" | ||
| "Priority" "0" | ||
| } | ||
| } | ||
| "Offset" "64 64 64" | ||
| } | ||
| } |
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,9 @@ | ||
| "Properties" | ||
| { | ||
| "Authors" "Felix Griffin, TheDarkBomber" | ||
| "Tags" "Felix Griffin; Custom; Fizzlers" | ||
| "Icon" | ||
| { | ||
| "0" "50s/phys_shield/phys_shield.png" | ||
| } | ||
| } |
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,55 @@ | ||
| "Conditions" | ||
| { | ||
| "Condition" | ||
| { | ||
| "instance" "instances/BEE2/50s/items/phys_shield/pshield_base.vmf" | ||
| "result" | ||
| { | ||
| "Pack" "PACK_FR_PLAYER_CLIP_ELECTRIC" | ||
| "Pack" "PACK_FR_PHYS_SHIELD_50S" | ||
| "Pack" "PACK_BEE2_CUST_FIZZ_MDL" | ||
| "Has" | ||
| { | ||
| "Fizzler" "1" | ||
| "FR_pshield" "1" | ||
| } | ||
| "CustFizzler" | ||
| { | ||
| "ModelName" "" | ||
| "UniqueModel" "0" | ||
| "Brush" | ||
| { | ||
| "Name" "fizz" | ||
| "Left" "BEE2/fizz/phys_shield/50s_pshield_left" | ||
| "Center" "BEE2/fizz/phys_shield/50s_pshield_center" | ||
| "Right" "BEE2/fizz/phys_shield/50s_pshield_right" | ||
| "Short" "BEE2/fizz/phys_shield/50s_pshield" | ||
| "Keys" | ||
| { | ||
| "classname" "trigger_portal_cleanser" | ||
| "Spawnflags" "4096" // Nothing | ||
| "visible" "1" | ||
| "usescanline" "1" | ||
| "StartDisabled" "1" | ||
| } | ||
| } | ||
| "Brush" | ||
| { | ||
| "Name" "clip" | ||
| "Left" "BEE2/fizz/fourthreaper/player_clip_electric" | ||
| "Center" "BEE2/fizz/fourthreaper/player_clip_electric" | ||
| "Right" "BEE2/fizz/fourthreaper/player_clip_electric" | ||
| "Short" "BEE2/fizz/fourthreaper/player_clip_electric" | ||
| "Nodraw" "BEE2/fizz/fourthreaper/player_clip_electric" | ||
| "Keys" | ||
| { | ||
| "classname" "func_clip_vphysics" | ||
| "Spawnflags" "2" // Ignore +USE | ||
| "solidity" "0" // Toggle | ||
| "solidbsp" "1" // Make footstep sounds work | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
Binary file not shown.
Binary file added
BIN
+6.48 KB
packages/phys_shield/resources/BEE2/items/50s/phys_shield/phys_shield.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+0 Bytes
(100%)
packages/phys_shield/resources/BEE2/items/clean/phys_shield/Thumbs.db
Binary file not shown.
135 changes: 135 additions & 0 deletions
135
packages/phys_shield/resources/instances/50s/items/phys_shield/pshield_base.vmf
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,135 @@ | ||
| versioninfo | ||
| { | ||
| "editorversion" "400" | ||
| "editorbuild" "6432" | ||
| "mapversion" "37" | ||
| "formatversion" "100" | ||
| "prefab" "0" | ||
| } | ||
| visgroups | ||
| { | ||
| } | ||
| viewsettings | ||
| { | ||
| "bSnapToGrid" "1" | ||
| "bShowGrid" "1" | ||
| "bShowLogicalGrid" "0" | ||
| "nGridSpacing" "8" | ||
| "bShow3DGrid" "0" | ||
| } | ||
| world | ||
| { | ||
| "id" "1" | ||
| "mapversion" "37" | ||
| "classname" "worldspawn" | ||
| "detailmaterial" "detail/detailsprites" | ||
| "detailvbsp" "detail.vbsp" | ||
| "maxblobcount" "250" | ||
| "maxpropscreenwidth" "-1" | ||
| "skyname" "sky_black_nofog" | ||
| } | ||
| entity | ||
| { | ||
| "id" "613" | ||
| "classname" "math_counter" | ||
| "max" "$connectioncount" | ||
| "targetname" "counter" | ||
| connections | ||
| { | ||
| "OnHitMax" "branch_toggleToggleTest0-1" | ||
| "OnChangedFromMax" "branch_toggleToggleTest0-1" | ||
| } | ||
| "origin" "0 16 32" | ||
| editor | ||
| { | ||
| "color" "220 30 220" | ||
| "visgroupshown" "1" | ||
| "visgroupautoshown" "1" | ||
| "logicalpos" "[0 0]" | ||
| } | ||
| } | ||
| entity | ||
| { | ||
| "id" "615" | ||
| "classname" "logic_branch" | ||
| "InitialValue" "$start_enabled" | ||
| "targetname" "branch_toggle" | ||
| connections | ||
| { | ||
| "OnFalse" "fizzDisable0-1" | ||
| "OnTrue" "fizzEnable0-1" | ||
| "OnTrue" "clipEnable0-1" | ||
| "OnFalse" "clipDisable0-1" | ||
| "OnTrue" "mdlSetAnimationopen0-1" | ||
| "OnFalse" "mdlSetAnimationclose0-1" | ||
| "OnFalse" "clipRemovePaint0-1" | ||
| } | ||
| "origin" "0 -16 32" | ||
| editor | ||
| { | ||
| "color" "220 30 220" | ||
| "visgroupshown" "1" | ||
| "visgroupautoshown" "1" | ||
| "logicalpos" "[0 0]" | ||
| } | ||
| } | ||
| entity | ||
| { | ||
| "id" "617" | ||
| "classname" "func_instance_io_proxy" | ||
| "targetname" "proxy" | ||
| connections | ||
| { | ||
| "OnProxyRelay" "counterAdd10-1" | ||
| "OnProxyRelay" "counterSubtract10-1" | ||
| } | ||
| "origin" "0 -8 48" | ||
| editor | ||
| { | ||
| "color" "220 30 220" | ||
| "visgroupshown" "1" | ||
| "visgroupautoshown" "1" | ||
| "logicalpos" "[0 9000]" | ||
| } | ||
| } | ||
| entity | ||
| { | ||
| "id" "619" | ||
| "classname" "logic_auto" | ||
| "spawnflags" "1" | ||
| connections | ||
| { | ||
| "OnMapSpawn" "branch_toggleTest0-1" | ||
| } | ||
| "origin" "0 0 32" | ||
| editor | ||
| { | ||
| "color" "220 30 220" | ||
| "visgroupshown" "1" | ||
| "visgroupautoshown" "1" | ||
| "logicalpos" "[0 1000]" | ||
| } | ||
| } | ||
| entity | ||
| { | ||
| "id" "623" | ||
| "classname" "func_instance_parms" | ||
| "parm1" "$connectioncount integer" | ||
| "parm2" "$start_enabled integer" | ||
| "origin" "0 8 48" | ||
| editor | ||
| { | ||
| "color" "220 30 220" | ||
| "visgroupshown" "1" | ||
| "visgroupautoshown" "1" | ||
| "logicalpos" "[0 0]" | ||
| } | ||
| } | ||
| cameras | ||
| { | ||
| "activecamera" "-1" | ||
| } | ||
| cordons | ||
| { | ||
| "active" "0" | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For clips, make it just use
tools/toolstrigger, and removesolidity/solidbsp/spawnflags- those aren't used forfunc_clip_vphysics.player_clip_electricis only useful for player clips.