From 6f20488ede425d4235c3da8bf88035afc2b1ae94 Mon Sep 17 00:00:00 2001 From: Flash4433 <38331230+Flash4433@users.noreply.github.com> Date: Tue, 17 Mar 2020 00:14:24 +0000 Subject: [PATCH 01/22] Made the Paint Gun disable itself once you pick up a Portal Gun --- items/paint_gun/vbsp_config.cfg | 15 +++++ .../clean/items/paint_gun_disable.vmf | 57 +++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 resources/instances/clean/items/paint_gun_disable.vmf diff --git a/items/paint_gun/vbsp_config.cfg b/items/paint_gun/vbsp_config.cfg index 73428b4..2f59075 100644 --- a/items/paint_gun/vbsp_config.cfg +++ b/items/paint_gun/vbsp_config.cfg @@ -26,6 +26,13 @@ "0" "stop" "1" "start" } + "GlobalInput" + { + "Name" "@disable_radelite_paintgun" + "Target" "Paintui" + "Input" "Disable" + "Output" "OnTrigger" + } } "Condition" { @@ -94,4 +101,12 @@ } } } + "Condition" + { + "instance" "" + "Result" + { + "AddOverlay" "instances/BEE2/clean/items/paint_gun_disable.vmf" + } + } } \ No newline at end of file diff --git a/resources/instances/clean/items/paint_gun_disable.vmf b/resources/instances/clean/items/paint_gun_disable.vmf new file mode 100644 index 0000000..2d99d65 --- /dev/null +++ b/resources/instances/clean/items/paint_gun_disable.vmf @@ -0,0 +1,57 @@ +versioninfo +{ + "editorversion" "400" + "editorbuild" "8419" + "mapversion" "1" + "formatversion" "100" + "prefab" "0" +} +visgroups +{ +} +viewsettings +{ + "bSnapToGrid" "1" + "bShowGrid" "1" + "bShowLogicalGrid" "0" + "nGridSpacing" "64" + "bShow3DGrid" "0" +} +world +{ + "id" "1" + "mapversion" "1" + "classname" "worldspawn" + "skyname" "sky_black_nofog" + "maxpropscreenwidth" "-1" + "detailvbsp" "detail.vbsp" + "detailmaterial" "detail/detailsprites" + "maxblobcount" "250" +} +entity +{ + "id" "2" + "classname" "comp_kv_setter" + "mode" "kv" + "target" "gun" + connections + { + "OnPlayerPickup" "@disable_radelite_paintgunTrigger0-1" + } + "origin" "0 0 0" + editor + { + "color" "220 30 220" + "visgroupshown" "1" + "visgroupautoshown" "1" + "logicalpos" "[0 0]" + } +} +cameras +{ + "activecamera" "-1" +} +cordons +{ + "active" "0" +} From 3b47c13d7ec47bfeed7ec090d08a549531ad6b92 Mon Sep 17 00:00:00 2001 From: Flash4433 <38331230+Flash4433@users.noreply.github.com> Date: Tue, 17 Mar 2020 00:16:17 +0000 Subject: [PATCH 02/22] Updated the Paint Gun to match with the normal Portal Gun better --- resources/instances/clean/items/paint_gun.vmf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/instances/clean/items/paint_gun.vmf b/resources/instances/clean/items/paint_gun.vmf index fd68861..ce60575 100644 --- a/resources/instances/clean/items/paint_gun.vmf +++ b/resources/instances/clean/items/paint_gun.vmf @@ -2,7 +2,7 @@ versioninfo { "editorversion" "400" "editorbuild" "8419" - "mapversion" "82" + "mapversion" "83" "formatversion" "100" "prefab" "0" } @@ -20,7 +20,7 @@ viewsettings world { "id" "1" - "mapversion" "82" + "mapversion" "83" "classname" "worldspawn" "detailmaterial" "detail/detailsprites" "detailvbsp" "detail.vbsp" @@ -890,7 +890,7 @@ entity "fadescale" "1" "ShowingPotatos" "0" "spawnflags" "1" - "targetname" "Portal_Gun" + "targetname" "gun" connections { "OnPlayerPickup" "pedestalSetAnimationretract1-1" From e0829c19f7dda3b6d7b49ecd46766880d9778903 Mon Sep 17 00:00:00 2001 From: Flash4433 <38331230+Flash4433@users.noreply.github.com> Date: Fri, 27 Mar 2020 20:31:49 +0000 Subject: [PATCH 03/22] Removed some useless lines of code --- items/living_panel_large/editoritems.txt | 1 - items/water_block/editoritems.txt | 1 - 2 files changed, 2 deletions(-) diff --git a/items/living_panel_large/editoritems.txt b/items/living_panel_large/editoritems.txt index c715d47..418cea2 100644 --- a/items/living_panel_large/editoritems.txt +++ b/items/living_panel_large/editoritems.txt @@ -11,7 +11,6 @@ "Model" { "ModelName" "piston_lift_grate.3ds" - "TextureName" "pistonlift.png" } "Palette" { diff --git a/items/water_block/editoritems.txt b/items/water_block/editoritems.txt index e6f9adf..043b27a 100644 --- a/items/water_block/editoritems.txt +++ b/items/water_block/editoritems.txt @@ -9,7 +9,6 @@ "Model" { "ModelName" "trigger_once.3ds" - "TextureName" "arm_4panel.png" } "Palette" { From adcfd9335230af52ba93a986393861d0255d80cb Mon Sep 17 00:00:00 2001 From: Flash4433 <38331230+Flash4433@users.noreply.github.com> Date: Fri, 27 Mar 2020 21:53:04 +0000 Subject: [PATCH 04/22] Improved and Updated all Guns Some more useless entities removed, changed the guns names to "gun" so they all work with the same disable coding and updated the entity counts. --- items/gravity_gun/editoritems.txt | 6 +- items/gravity_gun/properties.txt | 2 +- items/paint_gun/editoritems.txt | 12 +- items/paint_gun/properties.txt | 2 +- items/portivity_gun/editoritems.txt | 2 +- items/portivity_gun/properties.txt | 2 +- resources/instances/clean/items/paint_gun.vmf | 231 +++++++++--------- .../clean/items/radelite/gravity_gun.vmf | 207 +++++++--------- .../clean/items/radelite/portivity_gun.vmf | 28 +-- 9 files changed, 226 insertions(+), 266 deletions(-) diff --git a/items/gravity_gun/editoritems.txt b/items/gravity_gun/editoritems.txt index 66e4c68..dd59894 100644 --- a/items/gravity_gun/editoritems.txt +++ b/items/gravity_gun/editoritems.txt @@ -41,9 +41,9 @@ "0" { "Name" "instances/BEE2/clean/items/radelite/gravity_gun.vmf" - "EntityCount" "10" - "BrushCount" "11" - "BrushSideCount" "66" + "EntityCount" "24" + "BrushCount" "23" + "BrushSideCount" "142" } } "Offset" "64 64 64" diff --git a/items/gravity_gun/properties.txt b/items/gravity_gun/properties.txt index 7f3ca72..ad7e921 100644 --- a/items/gravity_gun/properties.txt +++ b/items/gravity_gun/properties.txt @@ -12,7 +12,7 @@ "" "> To-Do: Add Auto Disable when picking up another gun." } "infoURL" "https://github.com/ENDERZOMBI102/Radelite_BEE2_package/wiki/Gravity-Gun" -"ent_count" "10" +"ent_count" "24" "Icon" { "0" "clean/gravity_gun.png" diff --git a/items/paint_gun/editoritems.txt b/items/paint_gun/editoritems.txt index 3eef73c..50f7ced 100644 --- a/items/paint_gun/editoritems.txt +++ b/items/paint_gun/editoritems.txt @@ -82,42 +82,42 @@ "0" { "Name" "instances/BEE2/clean/items/pg_weighted_white.vmf" - "EntityCount" "8" + "EntityCount" "7" "BrushCount" "11" "BrushSideCount" "70" } "1" { "Name" "instances/BEE2/clean/items/pg_weighted_black.vmf" - "EntityCount" "8" + "EntityCount" "7" "BrushCount" "11" "BrushSideCount" "70" } "2" { "Name" "instances/BEE2/clean/items/pg_cube_white.vmf" - "EntityCount" "8" + "EntityCount" "7" "BrushCount" "11" "BrushSideCount" "70" } "3" { "Name" "instances/BEE2/clean/items/pg_cube_black.vmf" - "EntityCount" "8" + "EntityCount" "7" "BrushCount" "11" "BrushSideCount" "70" } "4" { "Name" "instances/BEE2/clean/items/pg_ball_white.vmf" - "EntityCount" "8" + "EntityCount" "7" "BrushCount" "11" "BrushSideCount" "70" } "5" { "Name" "instances/BEE2/clean/items/pg_ball_black.vmf" - "EntityCount" "8" + "EntityCount" "7" "BrushCount" "11" "BrushSideCount" "70" } diff --git a/items/paint_gun/properties.txt b/items/paint_gun/properties.txt index 8dd280a..3b554c0 100644 --- a/items/paint_gun/properties.txt +++ b/items/paint_gun/properties.txt @@ -36,7 +36,7 @@ "" "> To-Do: Add the Start Enabled, Auto Disable when picking up another gun." } "infoURL" "https://github.com/ENDERZOMBI102/Radelite_BEE2_package/wiki/Paint-Gun" -"ent_count" "8" +"ent_count" "7" "Icon" { "0" "clean/paint_gun.png" diff --git a/items/portivity_gun/editoritems.txt b/items/portivity_gun/editoritems.txt index 79bd260..723c26e 100644 --- a/items/portivity_gun/editoritems.txt +++ b/items/portivity_gun/editoritems.txt @@ -36,7 +36,7 @@ "0" { "Name" "instances/BEE2/clean/items/radelite/portivity_gun.vmf" - "EntityCount" "29" + "EntityCount" "28" "BrushCount" "24" "BrushSideCount" "148" } diff --git a/items/portivity_gun/properties.txt b/items/portivity_gun/properties.txt index 24d8b6e..d07900e 100644 --- a/items/portivity_gun/properties.txt +++ b/items/portivity_gun/properties.txt @@ -12,7 +12,7 @@ "" "> To-Do: Add Auto Disable when picking up another gun." } "infoURL" "https://github.com/ENDERZOMBI102/Radelite_BEE2_package/wiki/Portivity-Gun" -"ent_count" "29" +"ent_count" "28" "Icon" { "0" "clean/portivity_gun.png" diff --git a/resources/instances/clean/items/paint_gun.vmf b/resources/instances/clean/items/paint_gun.vmf index ce60575..35df523 100644 --- a/resources/instances/clean/items/paint_gun.vmf +++ b/resources/instances/clean/items/paint_gun.vmf @@ -2,7 +2,7 @@ versioninfo { "editorversion" "400" "editorbuild" "8419" - "mapversion" "83" + "mapversion" "84" "formatversion" "100" "prefab" "0" } @@ -20,7 +20,7 @@ viewsettings world { "id" "1" - "mapversion" "83" + "mapversion" "84" "classname" "worldspawn" "detailmaterial" "detail/detailsprites" "detailvbsp" "detail.vbsp" @@ -757,6 +757,104 @@ world } } entity +{ + "id" "542" + "classname" "trigger_weapon_strip" + "KillWeapons" "1" + "origin" "0 -0 14.58" + "solid" "6" + "spawnflags" "4097" + "StartDisabled" "0" + "targetname" "strip" + connections + { + "OnStartTouch" "stripDisable0.01-1" + } + solid + { + "id" "543" + side + { + "id" "206" + "plane" "(24 -24 40.9986) (-23.9985 -24 40.9986) (-23.9985 24 40.9986)" + "material" "TOOLS/TOOLSTRIGGER" + "uaxis" "[1 0 0 -35.9228] 1.29308" + "vaxis" "[0 -1 0 5.6873] 0.775" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + side + { + "id" "205" + "plane" "(24 24 -41.0014) (-23.9985 24 -41.0014) (-23.9985 -24 -41.0014)" + "material" "TOOLS/TOOLSTRIGGER" + "uaxis" "[1 0 0 -35.9228] 1.29308" + "vaxis" "[0 -1 0 5.6873] 0.775" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + side + { + "id" "204" + "plane" "(-24 -24 -41.001) (-24 24 -41.001) (-24 24 41.0014)" + "material" "TOOLS/TOOLSTRIGGER" + "uaxis" "[0 1 0 -5.6873] 0.775" + "vaxis" "[0 0 -1 15.0306] 0.441088" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + side + { + "id" "203" + "plane" "(-24 24 -41.001) (24 24 -41.001) (24 24 41.0014)" + "material" "TOOLS/TOOLSTRIGGER" + "uaxis" "[1 0 0 -35.9228] 1.29308" + "vaxis" "[0 0 -1 15.0306] 0.441088" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + side + { + "id" "202" + "plane" "(24 -24 -41.001) (-23.9971 -24 -41.001) (-24 -24 41.0014)" + "material" "TOOLS/TOOLSTRIGGER" + "uaxis" "[1 0 0 -35.9228] 1.29308" + "vaxis" "[0 0 -1 15.0306] 0.441088" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + side + { + "id" "201" + "plane" "(24 24 -41.001) (24 -24 -41.001) (24 -24 41.0014)" + "material" "TOOLS/TOOLSTRIGGER" + "uaxis" "[0 1 0 -5.6873] 0.775" + "vaxis" "[0 0 -1 15.0306] 0.441088" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + editor + { + "color" "220 30 220" + "visgroupshown" "1" + "visgroupautoshown" "1" + } + } + editor + { + "color" "220 30 220" + "visgroupshown" "1" + "visgroupautoshown" "1" + "logicalpos" "[0 7500]" + } +} +entity { "id" "505" "classname" "func_instance_parms" @@ -766,7 +864,7 @@ entity "parm6" "$start_locked boolean" "parm7" "$start_open boolean" "spawnflags" "0" - "origin" "-12 80 0" + "origin" "0 0 28" editor { "color" "220 30 220" @@ -802,6 +900,7 @@ entity "mingpulevel" "0" "model" "models/props/pedestal_base_reference.mdl" "performancemode" "0" + "physdamagescale" "1.0" "pressuredelay" "0" "randomanimation" "0" "renderamt" "255" @@ -851,6 +950,7 @@ entity "mingpulevel" "0" "model" "models/bee2/props_ingame/pgun_pedestal.mdl" "performancemode" "0" + "physdamagescale" "1.0" "pressuredelay" "0" "randomanimation" "0" "renderamt" "255" @@ -908,116 +1008,6 @@ entity } } entity -{ - "id" "166" - "classname" "trigger_once" - "origin" "0 0 -16.53" - "spawnflags" "4097" - "StartDisabled" "0" - connections - { - "OnTrigger" "weapon stripStrip0-1" - "OnTrigger" "pedestalSetAnimationopen0-1" - } - solid - { - "id" "164" - side - { - "id" "54" - "plane" "(-48 -48 48.9703) (-48 48 48.9703) (48 48 48.9703)" - "material" "TOOLS/TOOLSTRIGGER" - "uaxis" "[1 0 0 0] 0.25" - "vaxis" "[0 -1 0 0] 0.25" - "rotation" "0" - "lightmapscale" "16" - "smoothing_groups" "0" - } - side - { - "id" "53" - "plane" "(-48 48 -82.0297) (-48 -48 -82.0297) (48 -48 -82.0297)" - "material" "TOOLS/TOOLSTRIGGER" - "uaxis" "[1 0 0 0] 0.25" - "vaxis" "[0 -1 0 0] 0.25" - "rotation" "0" - "lightmapscale" "16" - "smoothing_groups" "0" - } - side - { - "id" "52" - "plane" "(-48 -48 -82.0305) (-48 48 -82.0305) (-48 48 48.9707)" - "material" "TOOLS/TOOLSTRIGGER" - "uaxis" "[0 1 0 0] 0.25" - "vaxis" "[0 0 -1 0] 0.25" - "rotation" "0" - "lightmapscale" "16" - "smoothing_groups" "0" - } - side - { - "id" "51" - "plane" "(48 48 -82.0305) (48 -48 -82.0305) (48 -48 48.9707)" - "material" "TOOLS/TOOLSTRIGGER" - "uaxis" "[0 1 0 0] 0.25" - "vaxis" "[0 0 -1 0] 0.25" - "rotation" "0" - "lightmapscale" "16" - "smoothing_groups" "0" - } - side - { - "id" "50" - "plane" "(-48 48 -82.0305) (48 48 -82.0305) (48 48 48.9707)" - "material" "TOOLS/TOOLSTRIGGER" - "uaxis" "[1 0 0 0] 0.25" - "vaxis" "[0 0 -1 0] 0.25" - "rotation" "0" - "lightmapscale" "16" - "smoothing_groups" "0" - } - side - { - "id" "49" - "plane" "(48 -48 -82.0305) (-48 -48 -82.0305) (-48 -48 48.9707)" - "material" "TOOLS/TOOLSTRIGGER" - "uaxis" "[1 0 0 0] 0.25" - "vaxis" "[0 0 -1 0] 0.25" - "rotation" "0" - "lightmapscale" "16" - "smoothing_groups" "0" - } - editor - { - "color" "220 30 220" - "visgroupshown" "1" - "visgroupautoshown" "1" - } - } - editor - { - "color" "220 30 220" - "visgroupshown" "1" - "visgroupautoshown" "1" - "logicalpos" "[0 500]" - } -} -entity -{ - "id" "173" - "classname" "player_weaponstrip" - "targetname" "weapon strip" - "origin" "28 72 0" - editor - { - "color" "220 30 220" - "visgroupshown" "1" - "visgroupautoshown" "1" - "logicalpos" "[0 1000]" - } -} -entity { "id" "65" "classname" "func_brush" @@ -1034,6 +1024,7 @@ entity "renderfx" "0" "rendermode" "0" "shadowdepthnocache" "0" + "solid" "6" "solidbsp" "0" "Solidity" "0" "spawnflags" "2" @@ -1128,6 +1119,7 @@ entity { "id" "68" "classname" "logic_measure_movement" + "angles" "0 0 0" "MeasureReference" "Gunbrush" "MeasureTarget" "$paintgunplayer" "MeasureType" "1" @@ -1135,10 +1127,10 @@ entity "targetname" "brushtoplayer" "TargetReference" "Gunbrush" "TargetScale" "1" - "origin" "4 80 -2.38419e-007" + "origin" "16 0 28" editor { - "color" "220 30 220" + "color" "0 100 250" "visgroupshown" "1" "visgroupautoshown" "1" "logicalpos" "[0 -16268]" @@ -1148,6 +1140,7 @@ entity { "id" "70" "classname" "game_ui" + "angles" "0 0 0" "FieldOfView" "-1.0" "spawnflags" "0" "targetname" "Paintui" @@ -1160,10 +1153,10 @@ entity "PressedAttack" "Paint$starta0.1-1" "PressedAttack2" "Paint$startb0.1-1" } - "origin" "-36 72 1" + "origin" "-16 0 29" editor { - "color" "220 30 220" + "color" "200 0 0" "visgroupshown" "1" "visgroupautoshown" "1" "logicalpos" "[0 10500]" @@ -1212,8 +1205,8 @@ cameras "activecamera" "0" camera { - "position" "[-106.319 -68.6118 93.2114]" - "look" "[-101.824 -66.3341 88.8904]" + "position" "[-83.8119 2.37979 48.4806]" + "look" "[-79.3169 4.65749 44.1596]" } } cordons diff --git a/resources/instances/clean/items/radelite/gravity_gun.vmf b/resources/instances/clean/items/radelite/gravity_gun.vmf index 62de8ce..e9ed0db 100644 --- a/resources/instances/clean/items/radelite/gravity_gun.vmf +++ b/resources/instances/clean/items/radelite/gravity_gun.vmf @@ -2,7 +2,7 @@ versioninfo { "editorversion" "400" "editorbuild" "8419" - "mapversion" "67" + "mapversion" "68" "formatversion" "100" "prefab" "0" } @@ -14,13 +14,13 @@ viewsettings "bSnapToGrid" "1" "bShowGrid" "1" "bShowLogicalGrid" "0" - "nGridSpacing" "1" + "nGridSpacing" "8" "bShow3DGrid" "0" } world { "id" "1" - "mapversion" "67" + "mapversion" "68" "classname" "worldspawn" "detailmaterial" "detail/detailsprites" "detailvbsp" "detail.vbsp" @@ -758,17 +758,100 @@ world } entity { - "id" "1505" - "classname" "player_weaponstrip" - "angles" "0 0 0" - "targetname" "weaponstrip" - "origin" "0 0 33" + "id" "1738" + "classname" "trigger_weapon_strip" + "KillWeapons" "1" + "origin" "-0 0 14.58" + "solid" "6" + "spawnflags" "4097" + "StartDisabled" "0" + "targetname" "strip" + connections + { + "OnStartTouch" "stripDisable0.01-1" + } + solid + { + "id" "1739" + side + { + "id" "608" + "plane" "(24 -24 40.9986) (-23.9985 -24 40.9986) (-23.9985 24 40.9986)" + "material" "TOOLS/TOOLSTRIGGER" + "uaxis" "[1 0 0 -35.9228] 1.29308" + "vaxis" "[0 -1 0 -58.3127] 0.775" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + side + { + "id" "607" + "plane" "(24 24 -41.0014) (-23.9985 24 -41.0014) (-23.9985 -24 -41.0014)" + "material" "TOOLS/TOOLSTRIGGER" + "uaxis" "[1 0 0 -35.9228] 1.29308" + "vaxis" "[0 -1 0 -58.3127] 0.775" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + side + { + "id" "606" + "plane" "(-24 -24 -41.001) (-24 24 -41.001) (-24 24 41.0014)" + "material" "TOOLS/TOOLSTRIGGER" + "uaxis" "[0 1 0 58.3127] 0.775" + "vaxis" "[0 0 -1 15.0306] 0.441088" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + side + { + "id" "605" + "plane" "(-24 24 -41.001) (24 24 -41.001) (24 24 41.0014)" + "material" "TOOLS/TOOLSTRIGGER" + "uaxis" "[1 0 0 -35.9228] 1.29308" + "vaxis" "[0 0 -1 15.0306] 0.441088" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + side + { + "id" "604" + "plane" "(24 -24 -41.001) (-23.9971 -24 -41.001) (-24 -24 41.0014)" + "material" "TOOLS/TOOLSTRIGGER" + "uaxis" "[1 0 0 -35.9228] 1.29308" + "vaxis" "[0 0 -1 15.0306] 0.441088" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + side + { + "id" "603" + "plane" "(24 24 -41.001) (24 -24 -41.001) (24 -24 41.0014)" + "material" "TOOLS/TOOLSTRIGGER" + "uaxis" "[0 1 0 58.3127] 0.775" + "vaxis" "[0 0 -1 15.0306] 0.441088" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + editor + { + "color" "220 30 220" + "visgroupshown" "1" + "visgroupautoshown" "1" + } + } editor { "color" "220 30 220" "visgroupshown" "1" "visgroupautoshown" "1" - "logicalpos" "[0 0]" + "logicalpos" "[0 7500]" } } entity @@ -1502,7 +1585,7 @@ entity "skin" "0" "spawnflags" "7" "StartingTeamNum" "0" - "targetname" "viewmodel" + "targetname" "gun" connections { "OnPlayerPickup" "portalTrigger0.01-1" @@ -1766,7 +1849,6 @@ entity "OnTrigger" "push_relayEnable0-1" "OnTrigger" "@portalgun_skin2Trigger0.01-1" "OnTrigger" "@client_commandCommandr_drawviewmodel 10.01-1" - "OnTrigger" "stripEnable0-1" } "origin" "-16 8 32" editor @@ -1796,7 +1878,6 @@ entity "OnTrigger" "push_relayDisable0-1" "OnTrigger" "pull_relayDisable0-1" "OnTrigger" "release_relayDisable0-1" - "OnTrigger" "stripEnable0-1" "OnTrigger" "@portalgun_skin1Trigger0-1" } "origin" "-16 32 32" @@ -2822,111 +2903,13 @@ entity "logicalpos" "[0 0]" } } -entity -{ - "id" "587" - "classname" "trigger_once" - "origin" "0 0 -10" - "solid" "6" - "spawnflags" "4097" - "startdisabled" "0" - "targetname" "open_trig" - connections - { - "OnTrigger" "pedestalSetAnimationopen0-1" - "OnTrigger" "weaponstripStrip0-1" - } - solid - { - "id" "588" - side - { - "id" "308" - "plane" "(-64 -64 76) (-64 64 76) (64 64 76)" - "material" "TOOLS/TOOLSTRIGGER" - "uaxis" "[1 0 0 0] 0.25" - "vaxis" "[0 -1 0 0] 0.25" - "rotation" "0" - "lightmapscale" "16" - "smoothing_groups" "0" - } - side - { - "id" "307" - "plane" "(-64 64 -96) (-64 -64 -96) (64 -64 -96)" - "material" "TOOLS/TOOLSTRIGGER" - "uaxis" "[-1 0 0 0] 0.25" - "vaxis" "[0 -1 0 0] 0.25" - "rotation" "0" - "lightmapscale" "16" - "smoothing_groups" "0" - } - side - { - "id" "306" - "plane" "(64 64 -96) (64 -64 -96) (64 -64 76)" - "material" "TOOLS/TOOLSTRIGGER" - "uaxis" "[0 1 0 0] 0.25" - "vaxis" "[0 0 -1 0] 0.25" - "rotation" "0" - "lightmapscale" "16" - "smoothing_groups" "0" - } - side - { - "id" "305" - "plane" "(-64 -64 -96) (-64 64 -96) (-64 64 76)" - "material" "TOOLS/TOOLSTRIGGER" - "uaxis" "[0 -1 0 0] 0.25" - "vaxis" "[0 0 -1 0] 0.25" - "rotation" "0" - "lightmapscale" "16" - "smoothing_groups" "0" - } - side - { - "id" "304" - "plane" "(64 -64 -96) (-64 -64 -96) (-64 -64 76)" - "material" "TOOLS/TOOLSTRIGGER" - "uaxis" "[1 0 0 0] 0.25" - "vaxis" "[0 0 -1 0] 0.25" - "rotation" "0" - "lightmapscale" "16" - "smoothing_groups" "0" - } - side - { - "id" "303" - "plane" "(-64 64 -96) (64 64 -96) (64 64 76)" - "material" "TOOLS/TOOLSTRIGGER" - "uaxis" "[-1 0 0 0] 0.25" - "vaxis" "[0 0 -1 0] 0.25" - "rotation" "0" - "lightmapscale" "16" - "smoothing_groups" "0" - } - editor - { - "color" "220 30 220" - "visgroupshown" "1" - "visgroupautoshown" "1" - } - } - editor - { - "color" "220 30 220" - "visgroupshown" "1" - "visgroupautoshown" "1" - "logicalpos" "[0 500]" - } -} cameras { "activecamera" "0" camera { - "position" "[-36.5167 -45.6661 -18.62]" - "look" "[16.2986 26.111 10.6451]" + "position" "[-7.53645 51.4625 40.105]" + "look" "[-26.2577 -17.4595 -20.6991]" } } cordons diff --git a/resources/instances/clean/items/radelite/portivity_gun.vmf b/resources/instances/clean/items/radelite/portivity_gun.vmf index c409ef7..0b04cfb 100644 --- a/resources/instances/clean/items/radelite/portivity_gun.vmf +++ b/resources/instances/clean/items/radelite/portivity_gun.vmf @@ -2,7 +2,7 @@ versioninfo { "editorversion" "400" "editorbuild" "8419" - "mapversion" "60" + "mapversion" "62" "formatversion" "100" "prefab" "0" } @@ -20,7 +20,7 @@ viewsettings world { "id" "1" - "mapversion" "60" + "mapversion" "62" "classname" "worldspawn" "detailmaterial" "detail/detailsprites" "detailvbsp" "detail.vbsp" @@ -757,21 +757,6 @@ world } } entity -{ - "id" "1505" - "classname" "player_weaponstrip" - "angles" "0 0 0" - "targetname" "weaponstrip" - "origin" "0 0 33" - editor - { - "color" "220 30 220" - "visgroupshown" "1" - "visgroupautoshown" "1" - "logicalpos" "[0 0]" - } -} -entity { "id" "1252" "classname" "comp_entity_mover" @@ -1659,10 +1644,10 @@ entity "fademindist" "-1" "fadescale" "1" "ShowingPotatos" "0" - "skin" "2" + "skin" "0" "spawnflags" "7" "StartingTeamNum" "0" - "targetname" "viewmodel" + "targetname" "gun" connections { "OnPlayerPickup" "portalTrigger0.01-1" @@ -3015,7 +3000,6 @@ entity connections { "OnTrigger" "pedestalSetAnimationopen0-1" - "OnTrigger" "weaponstripStrip0-1" } solid { @@ -3106,8 +3090,8 @@ cameras "activecamera" "0" camera { - "position" "[-37.1394 28.7192 36.7713]" - "look" "[-16.0106 43.4268 -53.4235]" + "position" "[-57.1906 35.2048 36.9401]" + "look" "[8.18396 24.6558 -29.4883]" } } cordons From e309db498128264d0284fb0be2ef0ab8570d5ba8 Mon Sep 17 00:00:00 2001 From: Flash4433 <38331230+Flash4433@users.noreply.github.com> Date: Fri, 27 Mar 2020 21:53:19 +0000 Subject: [PATCH 05/22] Renamed Gun Disable --- .../{paint_gun_disable.vmf => radelite/p2editor/gun_disable.vmf} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename resources/instances/clean/items/{paint_gun_disable.vmf => radelite/p2editor/gun_disable.vmf} (100%) diff --git a/resources/instances/clean/items/paint_gun_disable.vmf b/resources/instances/clean/items/radelite/p2editor/gun_disable.vmf similarity index 100% rename from resources/instances/clean/items/paint_gun_disable.vmf rename to resources/instances/clean/items/radelite/p2editor/gun_disable.vmf From a824cafa33f395b5931cf9faf777ea5cf61cf9ea Mon Sep 17 00:00:00 2001 From: Flash4433 <38331230+Flash4433@users.noreply.github.com> Date: Fri, 27 Mar 2020 22:10:39 +0000 Subject: [PATCH 06/22] Created a simple auto disable system for all guns --- items/gravity_gun/vbsp_config.cfg | 49 +++++++++++++++ items/paint_gun/vbsp_config.cfg | 26 +++++++- items/portivity_gun/vbsp_config.cfg | 47 ++++++++++++++ .../items/radelite/p2editor/gun_disable.vmf | 14 +++-- .../items/radelite/p2editor/gun_disable2.vmf | 61 +++++++++++++++++++ 5 files changed, 191 insertions(+), 6 deletions(-) create mode 100644 resources/instances/clean/items/radelite/p2editor/gun_disable2.vmf diff --git a/items/gravity_gun/vbsp_config.cfg b/items/gravity_gun/vbsp_config.cfg index b462105..8afc199 100644 --- a/items/gravity_gun/vbsp_config.cfg +++ b/items/gravity_gun/vbsp_config.cfg @@ -3,6 +3,23 @@ "Condition" { "instance" "" + "Result" + { + "GlobalInput" + { + "Name" "@disable_gravity_gun" + "Target" "portal" + "Input" "Disable" + "Output" "OnTrigger" + } + "GlobalInput" + { + "Name" "@disable_gravity_gun2" + "Target" "gravity" + "Input" "Disable" + "Output" "OnTrigger" + } + } "Condition" { "posIsSolid" @@ -49,4 +66,36 @@ } } } + "Condition" + { + "instance" "" + "Result" + { + "AddOverlay" "instances/BEE2/clean/items/radelite/p2editor/gun_disable.vmf" + } + } + "Condition" + { + "instance" "" + "Result" + { + "AddOverlay" "instances/BEE2/clean/items/radelite/p2editor/gun_disable.vmf" + } + } + "Condition" + { + "instance" "" + "Result" + { + "AddOverlay" "instances/BEE2/clean/items/radelite/p2editor/gun_disable.vmf" + } + } + "Condition" + { + "instance" "" + "Result" + { + "AddOverlay" "instances/BEE2/clean/items/radelite/p2editor/gun_disable2.vmf" + } + } } \ No newline at end of file diff --git a/items/paint_gun/vbsp_config.cfg b/items/paint_gun/vbsp_config.cfg index 2f59075..b9c1d40 100644 --- a/items/paint_gun/vbsp_config.cfg +++ b/items/paint_gun/vbsp_config.cfg @@ -106,7 +106,31 @@ "instance" "" "Result" { - "AddOverlay" "instances/BEE2/clean/items/paint_gun_disable.vmf" + "AddOverlay" "instances/BEE2/clean/items/radelite/p2editor/gun_disable.vmf" + } + } + "Condition" + { + "instance" "" + "Result" + { + "AddOverlay" "instances/BEE2/clean/items/radelite/p2editor/gun_disable.vmf" + } + } + "Condition" + { + "instance" "" + "Result" + { + "AddOverlay" "instances/BEE2/clean/items/radelite/p2editor/gun_disable.vmf" + } + } + "Condition" + { + "instance" "" + "Result" + { + "AddOverlay" "instances/BEE2/clean/items/radelite/p2editor/gun_disable2.vmf" } } } \ No newline at end of file diff --git a/items/portivity_gun/vbsp_config.cfg b/items/portivity_gun/vbsp_config.cfg index 6f6e93a..6da338e 100644 --- a/items/portivity_gun/vbsp_config.cfg +++ b/items/portivity_gun/vbsp_config.cfg @@ -10,6 +10,20 @@ "File" "instances/BEE2/clean/items/radelite/p2editor/portivity_gun_globallogic.vmf" "fixup_style" "2" } + "GlobalInput" + { + "Name" "@disable_portivity_gun" + "Target" "portal" + "Input" "Disable" + "Output" "OnTrigger" + } + "GlobalInput" + { + "Name" "@disable_portivity_gun2" + "Target" "gravity" + "Input" "Disable" + "Output" "OnTrigger" + } } "Condition" { @@ -44,4 +58,37 @@ } } } + "Condition" + { + "instance" "" + "Result" + { + "AddOverlay" "instances/BEE2/clean/items/radelite/p2editor/gun_disable.vmf" + } + } + "Condition" + { + "instance" "" + "Result" + { + "AddOverlay" "instances/BEE2/clean/items/radelite/p2editor/gun_disable.vmf" + } + } + "Condition" + { + "instance" "" + "Result" + { + "AddOverlay" "instances/BEE2/clean/items/radelite/p2editor/gun_disable.vmf" + } + } + "Condition" + { + "instance" "" + "Result" + { + "AddOverlay" "instances/BEE2/clean/items/radelite/p2editor/gun_disable2.vmf" + } + } + } } \ No newline at end of file diff --git a/resources/instances/clean/items/radelite/p2editor/gun_disable.vmf b/resources/instances/clean/items/radelite/p2editor/gun_disable.vmf index 2d99d65..ea605f5 100644 --- a/resources/instances/clean/items/radelite/p2editor/gun_disable.vmf +++ b/resources/instances/clean/items/radelite/p2editor/gun_disable.vmf @@ -2,7 +2,7 @@ versioninfo { "editorversion" "400" "editorbuild" "8419" - "mapversion" "1" + "mapversion" "2" "formatversion" "100" "prefab" "0" } @@ -20,13 +20,13 @@ viewsettings world { "id" "1" - "mapversion" "1" + "mapversion" "2" "classname" "worldspawn" - "skyname" "sky_black_nofog" - "maxpropscreenwidth" "-1" - "detailvbsp" "detail.vbsp" "detailmaterial" "detail/detailsprites" + "detailvbsp" "detail.vbsp" "maxblobcount" "250" + "maxpropscreenwidth" "-1" + "skyname" "sky_black_nofog" } entity { @@ -37,6 +37,10 @@ entity connections { "OnPlayerPickup" "@disable_radelite_paintgunTrigger0-1" + "OnPlayerPickup" "@disable_portivity_gunTrigger0-1" + "OnPlayerPickup" "@disable_portivity_gun2Trigger0-1" + "OnPlayerPickup" "@disable_gravity_gunTrigger0-1" + "OnPlayerPickup" "@disable_gravity_gun2Trigger0-1" } "origin" "0 0 0" editor diff --git a/resources/instances/clean/items/radelite/p2editor/gun_disable2.vmf b/resources/instances/clean/items/radelite/p2editor/gun_disable2.vmf new file mode 100644 index 0000000..d40af62 --- /dev/null +++ b/resources/instances/clean/items/radelite/p2editor/gun_disable2.vmf @@ -0,0 +1,61 @@ +versioninfo +{ + "editorversion" "400" + "editorbuild" "8419" + "mapversion" "2" + "formatversion" "100" + "prefab" "0" +} +visgroups +{ +} +viewsettings +{ + "bSnapToGrid" "1" + "bShowGrid" "1" + "bShowLogicalGrid" "0" + "nGridSpacing" "64" + "bShow3DGrid" "0" +} +world +{ + "id" "1" + "mapversion" "2" + "classname" "worldspawn" + "detailmaterial" "detail/detailsprites" + "detailvbsp" "detail.vbsp" + "maxblobcount" "250" + "maxpropscreenwidth" "-1" + "skyname" "sky_black_nofog" +} +entity +{ + "id" "2" + "classname" "comp_kv_setter" + "mode" "kv" + "target" "weaponstrip" + connections + { + "OnUser1" "@disable_radelite_paintgunTrigger0-1" + "OnUser1" "@disable_gravity_gun2Trigger0-1" + "OnUser1" "@disable_gravity_gunTrigger0-1" + "OnUser1" "@disable_portivity_gun2Trigger0-1" + "OnUser1" "@disable_portivity_gunTrigger0-1" + } + "origin" "0 0 0" + editor + { + "color" "220 30 220" + "visgroupshown" "1" + "visgroupautoshown" "1" + "logicalpos" "[0 0]" + } +} +cameras +{ + "activecamera" "-1" +} +cordons +{ + "active" "0" +} From 53ed510f9dd695ae7eae8d6116be1b91e63fadd0 Mon Sep 17 00:00:00 2001 From: Flash4433 <38331230+Flash4433@users.noreply.github.com> Date: Wed, 8 Apr 2020 22:54:12 +0100 Subject: [PATCH 07/22] Updated Portivity Gun AutoDisable --- items/portivity_gun/vbsp_config.cfg | 11 +----- .../items/radelite/p2editor/gun_disable.vmf | 1 - .../items/radelite/p2editor/gun_disable2.vmf | 1 - .../p2editor/portivity_gun_globallogic.vmf | 30 +++++++++++--- .../clean/items/radelite/portivity_gun.vmf | 39 +++++++++++++++++-- 5 files changed, 62 insertions(+), 20 deletions(-) diff --git a/items/portivity_gun/vbsp_config.cfg b/items/portivity_gun/vbsp_config.cfg index 6da338e..c09fa75 100644 --- a/items/portivity_gun/vbsp_config.cfg +++ b/items/portivity_gun/vbsp_config.cfg @@ -13,15 +13,8 @@ "GlobalInput" { "Name" "@disable_portivity_gun" - "Target" "portal" - "Input" "Disable" - "Output" "OnTrigger" - } - "GlobalInput" - { - "Name" "@disable_portivity_gun2" - "Target" "gravity" - "Input" "Disable" + "Target" "shutdown" + "Input" "Trigger" "Output" "OnTrigger" } } diff --git a/resources/instances/clean/items/radelite/p2editor/gun_disable.vmf b/resources/instances/clean/items/radelite/p2editor/gun_disable.vmf index ea605f5..186480f 100644 --- a/resources/instances/clean/items/radelite/p2editor/gun_disable.vmf +++ b/resources/instances/clean/items/radelite/p2editor/gun_disable.vmf @@ -38,7 +38,6 @@ entity { "OnPlayerPickup" "@disable_radelite_paintgunTrigger0-1" "OnPlayerPickup" "@disable_portivity_gunTrigger0-1" - "OnPlayerPickup" "@disable_portivity_gun2Trigger0-1" "OnPlayerPickup" "@disable_gravity_gunTrigger0-1" "OnPlayerPickup" "@disable_gravity_gun2Trigger0-1" } diff --git a/resources/instances/clean/items/radelite/p2editor/gun_disable2.vmf b/resources/instances/clean/items/radelite/p2editor/gun_disable2.vmf index d40af62..0039a03 100644 --- a/resources/instances/clean/items/radelite/p2editor/gun_disable2.vmf +++ b/resources/instances/clean/items/radelite/p2editor/gun_disable2.vmf @@ -39,7 +39,6 @@ entity "OnUser1" "@disable_radelite_paintgunTrigger0-1" "OnUser1" "@disable_gravity_gun2Trigger0-1" "OnUser1" "@disable_gravity_gunTrigger0-1" - "OnUser1" "@disable_portivity_gun2Trigger0-1" "OnUser1" "@disable_portivity_gunTrigger0-1" } "origin" "0 0 0" diff --git a/resources/instances/clean/items/radelite/p2editor/portivity_gun_globallogic.vmf b/resources/instances/clean/items/radelite/p2editor/portivity_gun_globallogic.vmf index 92865ff..0c60e12 100644 --- a/resources/instances/clean/items/radelite/p2editor/portivity_gun_globallogic.vmf +++ b/resources/instances/clean/items/radelite/p2editor/portivity_gun_globallogic.vmf @@ -2,7 +2,7 @@ versioninfo { "editorversion" "400" "editorbuild" "8419" - "mapversion" "4" + "mapversion" "5" "formatversion" "100" "prefab" "0" } @@ -20,13 +20,33 @@ viewsettings world { "id" "1" - "mapversion" "4" + "mapversion" "5" "classname" "worldspawn" - "skyname" "sky_black_nofog" - "maxpropscreenwidth" "-1" - "detailvbsp" "detail.vbsp" "detailmaterial" "detail/detailsprites" + "detailvbsp" "detail.vbsp" "maxblobcount" "250" + "maxpropscreenwidth" "-1" + "skyname" "sky_black_nofog" +} +entity +{ + "id" "70" + "classname" "logic_relay" + "angles" "0 0 0" + "startdisabled" "0" + "targetname" "@portalgun_skin0" + connections + { + "OnTrigger" "viewmodelSkin00-1" + } + "origin" "-8 -8 0" + editor + { + "color" "0 100 250" + "visgroupshown" "1" + "visgroupautoshown" "1" + "logicalpos" "[0 500]" + } } entity { diff --git a/resources/instances/clean/items/radelite/portivity_gun.vmf b/resources/instances/clean/items/radelite/portivity_gun.vmf index 0b04cfb..c3950d1 100644 --- a/resources/instances/clean/items/radelite/portivity_gun.vmf +++ b/resources/instances/clean/items/radelite/portivity_gun.vmf @@ -2,7 +2,7 @@ versioninfo { "editorversion" "400" "editorbuild" "8419" - "mapversion" "62" + "mapversion" "63" "formatversion" "100" "prefab" "0" } @@ -20,7 +20,7 @@ viewsettings world { "id" "1" - "mapversion" "62" + "mapversion" "63" "classname" "worldspawn" "detailmaterial" "detail/detailsprites" "detailvbsp" "detail.vbsp" @@ -757,6 +757,37 @@ world } } entity +{ + "id" "1493" + "classname" "logic_relay" + "angles" "0 0 0" + "startdisabled" "0" + "targetname" "shutdown" + connections + { + "OnTrigger" "gravityDisable0.02-1" + "OnTrigger" "stripEnable0-1" + "OnTrigger" "weapon_controlDeactivate0-1" + "OnTrigger" "portalDisable0.01-1" + "OnTrigger" "@portalgun_skin0Trigger0-1" + "OnTrigger" "release_relayDisable0-1" + "OnTrigger" "pull_relayDisable0-1" + "OnTrigger" "push_relayDisable0-1" + "OnTrigger" "holding_shiftDisable0-1" + "OnTrigger" "pushDisable0-1" + "OnTrigger" "pullDisable0-1" + "OnTrigger" "blap_crosshairDisable0-1" + } + "origin" "0 1 55" + editor + { + "color" "0 100 250" + "visgroupshown" "1" + "visgroupautoshown" "1" + "logicalpos" "[0 0]" + } +} +entity { "id" "1252" "classname" "comp_entity_mover" @@ -3090,8 +3121,8 @@ cameras "activecamera" "0" camera { - "position" "[-57.1906 35.2048 36.9401]" - "look" "[8.18396 24.6558 -29.4883]" + "position" "[-15.6183 20.3488 55.575]" + "look" "[47.6956 -44.5459 31.536]" } } cordons From 53f19e7f581e952f1de5645d09967473ebe430e9 Mon Sep 17 00:00:00 2001 From: Flash4433 <38331230+Flash4433@users.noreply.github.com> Date: Thu, 9 Apr 2020 12:39:32 +0100 Subject: [PATCH 08/22] Fixed BEE2 Crash --- items/portivity_gun/vbsp_config.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/items/portivity_gun/vbsp_config.cfg b/items/portivity_gun/vbsp_config.cfg index c09fa75..35dff2a 100644 --- a/items/portivity_gun/vbsp_config.cfg +++ b/items/portivity_gun/vbsp_config.cfg @@ -83,5 +83,4 @@ "AddOverlay" "instances/BEE2/clean/items/radelite/p2editor/gun_disable2.vmf" } } - } } \ No newline at end of file From 9cfa68dd15c316f85ef89490f4ae50c4f3306757 Mon Sep 17 00:00:00 2001 From: Flash4433 <38331230+Flash4433@users.noreply.github.com> Date: Thu, 9 Apr 2020 15:12:46 +0100 Subject: [PATCH 09/22] Updated Strip Trigger of Paint Gun --- resources/instances/clean/items/paint_gun.vmf | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/resources/instances/clean/items/paint_gun.vmf b/resources/instances/clean/items/paint_gun.vmf index 35df523..6a8b0dc 100644 --- a/resources/instances/clean/items/paint_gun.vmf +++ b/resources/instances/clean/items/paint_gun.vmf @@ -2,7 +2,7 @@ versioninfo { "editorversion" "400" "editorbuild" "8419" - "mapversion" "84" + "mapversion" "86" "formatversion" "100" "prefab" "0" } @@ -20,7 +20,7 @@ viewsettings world { "id" "1" - "mapversion" "84" + "mapversion" "86" "classname" "worldspawn" "detailmaterial" "detail/detailsprites" "detailvbsp" "detail.vbsp" @@ -761,7 +761,7 @@ entity "id" "542" "classname" "trigger_weapon_strip" "KillWeapons" "1" - "origin" "0 -0 14.58" + "origin" "0 0 14.58" "solid" "6" "spawnflags" "4097" "StartDisabled" "0" @@ -776,10 +776,10 @@ entity side { "id" "206" - "plane" "(24 -24 40.9986) (-23.9985 -24 40.9986) (-23.9985 24 40.9986)" + "plane" "(32 -32 41) (-32 -32 41) (-32 32 41)" "material" "TOOLS/TOOLSTRIGGER" - "uaxis" "[1 0 0 -35.9228] 1.29308" - "vaxis" "[0 -1 0 5.6873] 0.775" + "uaxis" "[1 0 0 -42.1096] 1.29308" + "vaxis" "[0 -1 0 -4.63528] 0.775" "rotation" "0" "lightmapscale" "16" "smoothing_groups" "0" @@ -787,10 +787,10 @@ entity side { "id" "205" - "plane" "(24 24 -41.0014) (-23.9985 24 -41.0014) (-23.9985 -24 -41.0014)" + "plane" "(32 32 -41) (-32 32 -41) (-32 -32 -41)" "material" "TOOLS/TOOLSTRIGGER" - "uaxis" "[1 0 0 -35.9228] 1.29308" - "vaxis" "[0 -1 0 5.6873] 0.775" + "uaxis" "[1 0 0 -42.1096] 1.29308" + "vaxis" "[0 -1 0 -4.63528] 0.775" "rotation" "0" "lightmapscale" "16" "smoothing_groups" "0" @@ -798,9 +798,9 @@ entity side { "id" "204" - "plane" "(-24 -24 -41.001) (-24 24 -41.001) (-24 24 41.0014)" + "plane" "(-32 -32 -41) (-32 32 -41) (-32 32 41)" "material" "TOOLS/TOOLSTRIGGER" - "uaxis" "[0 1 0 -5.6873] 0.775" + "uaxis" "[0 1 0 4.63528] 0.775" "vaxis" "[0 0 -1 15.0306] 0.441088" "rotation" "0" "lightmapscale" "16" @@ -809,9 +809,9 @@ entity side { "id" "203" - "plane" "(-24 24 -41.001) (24 24 -41.001) (24 24 41.0014)" + "plane" "(-32 32 -41) (32 32 -41) (32 32 41)" "material" "TOOLS/TOOLSTRIGGER" - "uaxis" "[1 0 0 -35.9228] 1.29308" + "uaxis" "[1 0 0 -42.1096] 1.29308" "vaxis" "[0 0 -1 15.0306] 0.441088" "rotation" "0" "lightmapscale" "16" @@ -820,9 +820,9 @@ entity side { "id" "202" - "plane" "(24 -24 -41.001) (-23.9971 -24 -41.001) (-24 -24 41.0014)" + "plane" "(32 -32 -41) (-32 -32 -41) (-32 -32 41)" "material" "TOOLS/TOOLSTRIGGER" - "uaxis" "[1 0 0 -35.9228] 1.29308" + "uaxis" "[1 0 0 -42.1096] 1.29308" "vaxis" "[0 0 -1 15.0306] 0.441088" "rotation" "0" "lightmapscale" "16" @@ -831,9 +831,9 @@ entity side { "id" "201" - "plane" "(24 24 -41.001) (24 -24 -41.001) (24 -24 41.0014)" + "plane" "(32 32 -41) (32 -32 -41) (32 -32 41)" "material" "TOOLS/TOOLSTRIGGER" - "uaxis" "[0 1 0 -5.6873] 0.775" + "uaxis" "[0 1 0 4.63528] 0.775" "vaxis" "[0 0 -1 15.0306] 0.441088" "rotation" "0" "lightmapscale" "16" @@ -1205,8 +1205,8 @@ cameras "activecamera" "0" camera { - "position" "[-83.8119 2.37979 48.4806]" - "look" "[-79.3169 4.65749 44.1596]" + "position" "[-66.034 -32.7903 48.5138]" + "look" "[-61.539 -30.5126 44.1928]" } } cordons From 3926d3dc7eb04875849a0e00c2a9f951746045c4 Mon Sep 17 00:00:00 2001 From: Flash4433 <38331230+Flash4433@users.noreply.github.com> Date: Thu, 9 Apr 2020 15:13:16 +0100 Subject: [PATCH 10/22] Updated Paint Gun's Pedestal's Animations --- resources/instances/clean/items/paint_gun.vmf | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/instances/clean/items/paint_gun.vmf b/resources/instances/clean/items/paint_gun.vmf index 6a8b0dc..396a1a3 100644 --- a/resources/instances/clean/items/paint_gun.vmf +++ b/resources/instances/clean/items/paint_gun.vmf @@ -769,6 +769,7 @@ entity connections { "OnStartTouch" "stripDisable0.01-1" + "OnStartTouch" "pedestalSetAnimationopen0-1" } solid { From a725cd3131ec55891cd76afebaffe6145fea0e42 Mon Sep 17 00:00:00 2001 From: Flash4433 <38331230+Flash4433@users.noreply.github.com> Date: Thu, 9 Apr 2020 15:20:35 +0100 Subject: [PATCH 11/22] Fixed Paint Gun AutoDisable --- items/paint_gun/vbsp_config.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/items/paint_gun/vbsp_config.cfg b/items/paint_gun/vbsp_config.cfg index b9c1d40..c5841a1 100644 --- a/items/paint_gun/vbsp_config.cfg +++ b/items/paint_gun/vbsp_config.cfg @@ -30,7 +30,7 @@ { "Name" "@disable_radelite_paintgun" "Target" "Paintui" - "Input" "Disable" + "Input" "Deactivate" "Output" "OnTrigger" } } From 225d485ae1bb4185d73372533391048e0a2e3d4c Mon Sep 17 00:00:00 2001 From: Flash4433 <38331230+Flash4433@users.noreply.github.com> Date: Thu, 9 Apr 2020 15:25:39 +0100 Subject: [PATCH 12/22] Updated Paint Gun Fixed some timers --- resources/instances/clean/items/paint_gun.vmf | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/resources/instances/clean/items/paint_gun.vmf b/resources/instances/clean/items/paint_gun.vmf index 396a1a3..a9e86f7 100644 --- a/resources/instances/clean/items/paint_gun.vmf +++ b/resources/instances/clean/items/paint_gun.vmf @@ -2,7 +2,7 @@ versioninfo { "editorversion" "400" "editorbuild" "8419" - "mapversion" "86" + "mapversion" "87" "formatversion" "100" "prefab" "0" } @@ -20,7 +20,7 @@ viewsettings world { "id" "1" - "mapversion" "86" + "mapversion" "87" "classname" "worldspawn" "detailmaterial" "detail/detailsprites" "detailvbsp" "detail.vbsp" @@ -1147,12 +1147,12 @@ entity "targetname" "Paintui" connections { - "UnpressedAttack2" "PaintStop0-1" - "UnpressedAttack" "PaintStop0-1" + "UnpressedAttack2" "PaintStop0.02-1" + "UnpressedAttack" "PaintStop0.02-1" "PressedAttack" "PaintChangePaintType$painta0-1" "PressedAttack2" "PaintChangePaintType$paintb0-1" - "PressedAttack" "Paint$starta0.1-1" - "PressedAttack2" "Paint$startb0.1-1" + "PressedAttack" "Paint$starta0.01-1" + "PressedAttack2" "Paint$startb0.01-1" } "origin" "-16 0 29" editor @@ -1206,8 +1206,8 @@ cameras "activecamera" "0" camera { - "position" "[-66.034 -32.7903 48.5138]" - "look" "[-61.539 -30.5126 44.1928]" + "position" "[-31.8697 -15.4786 31.8503]" + "look" "[-26.44 -12.7273 29.2021]" } } cordons From aa6bcf6e2363fd5f3244706a47690b84a83c758d Mon Sep 17 00:00:00 2001 From: Flash4433 <38331230+Flash4433@users.noreply.github.com> Date: Thu, 9 Apr 2020 16:04:22 +0100 Subject: [PATCH 13/22] Updated Strip Trigger of Paint Gun --- resources/instances/clean/items/paint_gun.vmf | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/resources/instances/clean/items/paint_gun.vmf b/resources/instances/clean/items/paint_gun.vmf index a9e86f7..5aacd01 100644 --- a/resources/instances/clean/items/paint_gun.vmf +++ b/resources/instances/clean/items/paint_gun.vmf @@ -2,7 +2,7 @@ versioninfo { "editorversion" "400" "editorbuild" "8419" - "mapversion" "87" + "mapversion" "89" "formatversion" "100" "prefab" "0" } @@ -20,7 +20,7 @@ viewsettings world { "id" "1" - "mapversion" "87" + "mapversion" "89" "classname" "worldspawn" "detailmaterial" "detail/detailsprites" "detailvbsp" "detail.vbsp" @@ -761,7 +761,7 @@ entity "id" "542" "classname" "trigger_weapon_strip" "KillWeapons" "1" - "origin" "0 0 14.58" + "origin" "0 0 7.17" "solid" "6" "spawnflags" "4097" "StartDisabled" "0" @@ -777,10 +777,10 @@ entity side { "id" "206" - "plane" "(32 -32 41) (-32 -32 41) (-32 32 41)" + "plane" "(40 -40 41) (-40 -40 41) (-40 40 41)" "material" "TOOLS/TOOLSTRIGGER" - "uaxis" "[1 0 0 -42.1096] 1.29308" - "vaxis" "[0 -1 0 -4.63528] 0.775" + "uaxis" "[1 0 0 -48.2964] 1.29308" + "vaxis" "[0 -1 0 -14.9579] 0.775" "rotation" "0" "lightmapscale" "16" "smoothing_groups" "0" @@ -788,10 +788,10 @@ entity side { "id" "205" - "plane" "(32 32 -41) (-32 32 -41) (-32 -32 -41)" + "plane" "(40 40 -64) (-40 40 -64) (-40 -40 -64)" "material" "TOOLS/TOOLSTRIGGER" - "uaxis" "[1 0 0 -42.1096] 1.29308" - "vaxis" "[0 -1 0 -4.63528] 0.775" + "uaxis" "[1 0 0 -48.2964] 1.29308" + "vaxis" "[0 -1 0 -14.9579] 0.775" "rotation" "0" "lightmapscale" "16" "smoothing_groups" "0" @@ -799,9 +799,9 @@ entity side { "id" "204" - "plane" "(-32 -32 -41) (-32 32 -41) (-32 32 41)" + "plane" "(-40 -40 -64) (-40 40 -64) (-40 40 41)" "material" "TOOLS/TOOLSTRIGGER" - "uaxis" "[0 1 0 4.63528] 0.775" + "uaxis" "[0 1 0 14.9579] 0.775" "vaxis" "[0 0 -1 15.0306] 0.441088" "rotation" "0" "lightmapscale" "16" @@ -810,9 +810,9 @@ entity side { "id" "203" - "plane" "(-32 32 -41) (32 32 -41) (32 32 41)" + "plane" "(-40 40 -64) (40 40 -64) (40 40 41)" "material" "TOOLS/TOOLSTRIGGER" - "uaxis" "[1 0 0 -42.1096] 1.29308" + "uaxis" "[1 0 0 -48.2964] 1.29308" "vaxis" "[0 0 -1 15.0306] 0.441088" "rotation" "0" "lightmapscale" "16" @@ -821,9 +821,9 @@ entity side { "id" "202" - "plane" "(32 -32 -41) (-32 -32 -41) (-32 -32 41)" + "plane" "(40 -40 -64) (-40 -40 -64) (-40 -40 41)" "material" "TOOLS/TOOLSTRIGGER" - "uaxis" "[1 0 0 -42.1096] 1.29308" + "uaxis" "[1 0 0 -48.2964] 1.29308" "vaxis" "[0 0 -1 15.0306] 0.441088" "rotation" "0" "lightmapscale" "16" @@ -832,9 +832,9 @@ entity side { "id" "201" - "plane" "(32 32 -41) (32 -32 -41) (32 -32 41)" + "plane" "(40 40 -64) (40 -40 -64) (40 -40 41)" "material" "TOOLS/TOOLSTRIGGER" - "uaxis" "[0 1 0 4.63528] 0.775" + "uaxis" "[0 1 0 14.9579] 0.775" "vaxis" "[0 0 -1 15.0306] 0.441088" "rotation" "0" "lightmapscale" "16" @@ -997,7 +997,7 @@ entity "OnPlayerPickup" "pedestalSetAnimationretract1-1" "OnPlayerPickup" "pedestalKill5.5-1" "OnPlayerPickup" "pedestal_baseSetAnimationclose3-1" - "OnPlayerPickup" "PaintuiActivate0-1" + "OnPlayerPickup" "PaintuiActivate0.01-1" } "origin" "12 0 -1" editor @@ -1206,8 +1206,8 @@ cameras "activecamera" "0" camera { - "position" "[-31.8697 -15.4786 31.8503]" - "look" "[-26.44 -12.7273 29.2021]" + "position" "[6.07189 173.649 -51.1823]" + "look" "[6.87655 167.326 -49.3303]" } } cordons From 67e53f5c91cd41e460fd04f4f38c9490c8dc67d2 Mon Sep 17 00:00:00 2001 From: Flash4433 <38331230+Flash4433@users.noreply.github.com> Date: Thu, 9 Apr 2020 16:05:31 +0100 Subject: [PATCH 14/22] Updated AutoDisables --- .../clean/items/radelite/p2editor/gun_disable.vmf | 9 ++++----- .../clean/items/radelite/p2editor/gun_disable2.vmf | 3 +-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/resources/instances/clean/items/radelite/p2editor/gun_disable.vmf b/resources/instances/clean/items/radelite/p2editor/gun_disable.vmf index 186480f..fe7b441 100644 --- a/resources/instances/clean/items/radelite/p2editor/gun_disable.vmf +++ b/resources/instances/clean/items/radelite/p2editor/gun_disable.vmf @@ -33,13 +33,12 @@ entity "id" "2" "classname" "comp_kv_setter" "mode" "kv" - "target" "gun" + "target" "strip" connections { - "OnPlayerPickup" "@disable_radelite_paintgunTrigger0-1" - "OnPlayerPickup" "@disable_portivity_gunTrigger0-1" - "OnPlayerPickup" "@disable_gravity_gunTrigger0-1" - "OnPlayerPickup" "@disable_gravity_gun2Trigger0-1" + "OnStartTouch" "@disable_radelite_paintgunTrigger0-1" + "OnStartTouch" "@disable_portivity_gunTrigger0-1" + "OnStartTouch" "@disable_gravity_gunTrigger0-1" } "origin" "0 0 0" editor diff --git a/resources/instances/clean/items/radelite/p2editor/gun_disable2.vmf b/resources/instances/clean/items/radelite/p2editor/gun_disable2.vmf index 0039a03..f11a922 100644 --- a/resources/instances/clean/items/radelite/p2editor/gun_disable2.vmf +++ b/resources/instances/clean/items/radelite/p2editor/gun_disable2.vmf @@ -37,9 +37,8 @@ entity connections { "OnUser1" "@disable_radelite_paintgunTrigger0-1" - "OnUser1" "@disable_gravity_gun2Trigger0-1" - "OnUser1" "@disable_gravity_gunTrigger0-1" "OnUser1" "@disable_portivity_gunTrigger0-1" + "OnUser1" "@disable_gravity_gunTrigger0-1" } "origin" "0 0 0" editor From 87e12b290ad960672b691ab2be50e7854a9c68ff Mon Sep 17 00:00:00 2001 From: Flash4433 <38331230+Flash4433@users.noreply.github.com> Date: Thu, 9 Apr 2020 19:30:23 +0100 Subject: [PATCH 15/22] Added Gravity Gun AutoDisable --- items/gravity_gun/vbsp_config.cfg | 11 +---- .../clean/items/radelite/gravity_gun.vmf | 40 ++++++++++++++++--- 2 files changed, 37 insertions(+), 14 deletions(-) diff --git a/items/gravity_gun/vbsp_config.cfg b/items/gravity_gun/vbsp_config.cfg index 8afc199..e2961a5 100644 --- a/items/gravity_gun/vbsp_config.cfg +++ b/items/gravity_gun/vbsp_config.cfg @@ -8,15 +8,8 @@ "GlobalInput" { "Name" "@disable_gravity_gun" - "Target" "portal" - "Input" "Disable" - "Output" "OnTrigger" - } - "GlobalInput" - { - "Name" "@disable_gravity_gun2" - "Target" "gravity" - "Input" "Disable" + "Target" "shutdown" + "Input" "Trigger" "Output" "OnTrigger" } } diff --git a/resources/instances/clean/items/radelite/gravity_gun.vmf b/resources/instances/clean/items/radelite/gravity_gun.vmf index e9ed0db..c4d3f0d 100644 --- a/resources/instances/clean/items/radelite/gravity_gun.vmf +++ b/resources/instances/clean/items/radelite/gravity_gun.vmf @@ -2,7 +2,7 @@ versioninfo { "editorversion" "400" "editorbuild" "8419" - "mapversion" "68" + "mapversion" "70" "formatversion" "100" "prefab" "0" } @@ -20,7 +20,7 @@ viewsettings world { "id" "1" - "mapversion" "68" + "mapversion" "70" "classname" "worldspawn" "detailmaterial" "detail/detailsprites" "detailvbsp" "detail.vbsp" @@ -757,11 +757,41 @@ world } } entity +{ + "id" "1960" + "classname" "logic_relay" + "angles" "0 0 0" + "startdisabled" "0" + "targetname" "shutdown" + connections + { + "OnTrigger" "gravityDisable0.02-1" + "OnTrigger" "stripEnable0-1" + "OnTrigger" "weapon_controlDeactivate0-1" + "OnTrigger" "portalDisable0.01-1" + "OnTrigger" "release_relayDisable0-1" + "OnTrigger" "pull_relayDisable0-1" + "OnTrigger" "push_relayDisable0-1" + "OnTrigger" "holding_shiftDisable0-1" + "OnTrigger" "pushDisable0-1" + "OnTrigger" "pullDisable0-1" + "OnTrigger" "blap_crosshairDisable0-1" + } + "origin" "0 1 55" + editor + { + "color" "0 100 250" + "visgroupshown" "1" + "visgroupautoshown" "1" + "logicalpos" "[0 0]" + } +} +entity { "id" "1738" "classname" "trigger_weapon_strip" "KillWeapons" "1" - "origin" "-0 0 14.58" + "origin" "0 0 14.58" "solid" "6" "spawnflags" "4097" "StartDisabled" "0" @@ -2908,8 +2938,8 @@ cameras "activecamera" "0" camera { - "position" "[-7.53645 51.4625 40.105]" - "look" "[-26.2577 -17.4595 -20.6991]" + "position" "[12.3137 83.0653 70.4995]" + "look" "[-6.40754 14.1433 9.69543]" } } cordons From 808ff01feca9e24f52b70ddae48fe4a66c21b358 Mon Sep 17 00:00:00 2001 From: Flash4433 <38331230+Flash4433@users.noreply.github.com> Date: Thu, 9 Apr 2020 19:57:29 +0100 Subject: [PATCH 16/22] Updated Animations for the Guns --- resources/instances/clean/items/paint_gun.vmf | 106 +++++++++++++++++- .../clean/items/radelite/gravity_gun.vmf | 105 ++++++++++++++++- 2 files changed, 202 insertions(+), 9 deletions(-) diff --git a/resources/instances/clean/items/paint_gun.vmf b/resources/instances/clean/items/paint_gun.vmf index 5aacd01..ae9eeb8 100644 --- a/resources/instances/clean/items/paint_gun.vmf +++ b/resources/instances/clean/items/paint_gun.vmf @@ -2,7 +2,7 @@ versioninfo { "editorversion" "400" "editorbuild" "8419" - "mapversion" "89" + "mapversion" "90" "formatversion" "100" "prefab" "0" } @@ -20,7 +20,7 @@ viewsettings world { "id" "1" - "mapversion" "89" + "mapversion" "90" "classname" "worldspawn" "detailmaterial" "detail/detailsprites" "detailvbsp" "detail.vbsp" @@ -757,6 +757,103 @@ world } } entity +{ + "id" "570" + "classname" "trigger_once" + "origin" "0 0 -10" + "solid" "6" + "spawnflags" "4097" + "startdisabled" "0" + "targetname" "open_trig" + connections + { + "OnTrigger" "pedestalSetAnimationopen0-1" + } + solid + { + "id" "571" + side + { + "id" "218" + "plane" "(-64 -64 76) (-64 64 76) (64 64 76)" + "material" "TOOLS/TOOLSTRIGGER" + "uaxis" "[1 0 0 0] 0.25" + "vaxis" "[0 -1 0 0] 0.25" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + side + { + "id" "217" + "plane" "(-64 64 -96) (-64 -64 -96) (64 -64 -96)" + "material" "TOOLS/TOOLSTRIGGER" + "uaxis" "[-1 0 0 0] 0.25" + "vaxis" "[0 -1 0 0] 0.25" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + side + { + "id" "216" + "plane" "(64 64 -96) (64 -64 -96) (64 -64 76)" + "material" "TOOLS/TOOLSTRIGGER" + "uaxis" "[0 1 0 0] 0.25" + "vaxis" "[0 0 -1 0] 0.25" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + side + { + "id" "215" + "plane" "(-64 -64 -96) (-64 64 -96) (-64 64 76)" + "material" "TOOLS/TOOLSTRIGGER" + "uaxis" "[0 -1 0 0] 0.25" + "vaxis" "[0 0 -1 0] 0.25" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + side + { + "id" "214" + "plane" "(64 -64 -96) (-64 -64 -96) (-64 -64 76)" + "material" "TOOLS/TOOLSTRIGGER" + "uaxis" "[1 0 0 0] 0.25" + "vaxis" "[0 0 -1 0] 0.25" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + side + { + "id" "213" + "plane" "(-64 64 -96) (64 64 -96) (64 64 76)" + "material" "TOOLS/TOOLSTRIGGER" + "uaxis" "[-1 0 0 0] 0.25" + "vaxis" "[0 0 -1 0] 0.25" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + editor + { + "color" "220 30 220" + "visgroupshown" "1" + "visgroupautoshown" "1" + } + } + editor + { + "color" "220 30 220" + "visgroupshown" "1" + "visgroupautoshown" "1" + "logicalpos" "[0 500]" + } +} +entity { "id" "542" "classname" "trigger_weapon_strip" @@ -769,7 +866,6 @@ entity connections { "OnStartTouch" "stripDisable0.01-1" - "OnStartTouch" "pedestalSetAnimationopen0-1" } solid { @@ -1206,8 +1302,8 @@ cameras "activecamera" "0" camera { - "position" "[6.07189 173.649 -51.1823]" - "look" "[6.87655 167.326 -49.3303]" + "position" "[-16.2236 148.926 -44.874]" + "look" "[-15.4189 142.603 -43.022]" } } cordons diff --git a/resources/instances/clean/items/radelite/gravity_gun.vmf b/resources/instances/clean/items/radelite/gravity_gun.vmf index c4d3f0d..58f91c8 100644 --- a/resources/instances/clean/items/radelite/gravity_gun.vmf +++ b/resources/instances/clean/items/radelite/gravity_gun.vmf @@ -2,7 +2,7 @@ versioninfo { "editorversion" "400" "editorbuild" "8419" - "mapversion" "70" + "mapversion" "71" "formatversion" "100" "prefab" "0" } @@ -20,7 +20,7 @@ viewsettings world { "id" "1" - "mapversion" "70" + "mapversion" "71" "classname" "worldspawn" "detailmaterial" "detail/detailsprites" "detailvbsp" "detail.vbsp" @@ -757,6 +757,103 @@ world } } entity +{ + "id" "2194" + "classname" "trigger_once" + "origin" "0 0 -10" + "solid" "6" + "spawnflags" "4097" + "startdisabled" "0" + "targetname" "open_trig" + connections + { + "OnTrigger" "pedestalSetAnimationopen0-1" + } + solid + { + "id" "2195" + side + { + "id" "620" + "plane" "(-64 -64 76) (-64 64 76) (64 64 76)" + "material" "TOOLS/TOOLSTRIGGER" + "uaxis" "[1 0 0 0] 0.25" + "vaxis" "[0 -1 0 0] 0.25" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + side + { + "id" "619" + "plane" "(-64 64 -96) (-64 -64 -96) (64 -64 -96)" + "material" "TOOLS/TOOLSTRIGGER" + "uaxis" "[-1 0 0 0] 0.25" + "vaxis" "[0 -1 0 0] 0.25" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + side + { + "id" "618" + "plane" "(64 64 -96) (64 -64 -96) (64 -64 76)" + "material" "TOOLS/TOOLSTRIGGER" + "uaxis" "[0 1 0 0] 0.25" + "vaxis" "[0 0 -1 0] 0.25" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + side + { + "id" "617" + "plane" "(-64 -64 -96) (-64 64 -96) (-64 64 76)" + "material" "TOOLS/TOOLSTRIGGER" + "uaxis" "[0 -1 0 0] 0.25" + "vaxis" "[0 0 -1 0] 0.25" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + side + { + "id" "616" + "plane" "(64 -64 -96) (-64 -64 -96) (-64 -64 76)" + "material" "TOOLS/TOOLSTRIGGER" + "uaxis" "[1 0 0 0] 0.25" + "vaxis" "[0 0 -1 0] 0.25" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + side + { + "id" "615" + "plane" "(-64 64 -96) (64 64 -96) (64 64 76)" + "material" "TOOLS/TOOLSTRIGGER" + "uaxis" "[-1 0 0 0] 0.25" + "vaxis" "[0 0 -1 0] 0.25" + "rotation" "0" + "lightmapscale" "16" + "smoothing_groups" "0" + } + editor + { + "color" "220 30 220" + "visgroupshown" "1" + "visgroupautoshown" "1" + } + } + editor + { + "color" "220 30 220" + "visgroupshown" "1" + "visgroupautoshown" "1" + "logicalpos" "[0 500]" + } +} +entity { "id" "1960" "classname" "logic_relay" @@ -2938,8 +3035,8 @@ cameras "activecamera" "0" camera { - "position" "[12.3137 83.0653 70.4995]" - "look" "[-6.40754 14.1433 9.69543]" + "position" "[39.6089 156.835 137.199]" + "look" "[20.8876 87.9125 76.3954]" } } cordons From 0faa2d64a32bf03401c8db82e51518990379b13d Mon Sep 17 00:00:00 2001 From: Flash4433 <38331230+Flash4433@users.noreply.github.com> Date: Thu, 9 Apr 2020 21:30:00 +0100 Subject: [PATCH 17/22] Added ButtonType to Portivity Gun --- items/portivity_gun/editoritems.txt | 45 ++++++++- items/portivity_gun/properties.txt | 6 +- items/portivity_gun/vbsp_config.cfg | 43 +++++++-- .../clean/items/radelite/portivity_gun.vmf | 91 ++++++++++++++----- 4 files changed, 149 insertions(+), 36 deletions(-) diff --git a/items/portivity_gun/editoritems.txt b/items/portivity_gun/editoritems.txt index 723c26e..ec5dabd 100644 --- a/items/portivity_gun/editoritems.txt +++ b/items/portivity_gun/editoritems.txt @@ -1,6 +1,7 @@ "Item" { "Type" "ITEM_PORTIVITY_GUN" + "ItemClass" "ItemButtonFloor" "Editor" { "SubType" @@ -8,7 +9,7 @@ "Name" "Portivity Gun" "Model" { - "ModelName" "bee2_pgun_pedestal_oran.3ds" + "ModelName" "bee2_pgun_pedestal_dual.3ds" } "Palette" { @@ -28,6 +29,11 @@ } "Properties" { + "ButtonType" + { + "DefaultValue" "0" + "Index" "1" + } } "Exporting" { @@ -35,7 +41,42 @@ { "0" { - "Name" "instances/BEE2/clean/items/radelite/portivity_gun.vmf" + "Name" "instances/BEE2/clean/items/radelite/portivity_gun0.vmf" + "EntityCount" "28" + "BrushCount" "24" + "BrushSideCount" "148" + } + "1" + { + "Name" "instances/BEE2/clean/items/radelite/portivity_gun1.vmf" + "EntityCount" "28" + "BrushCount" "24" + "BrushSideCount" "148" + } + "2" + { + "Name" "instances/BEE2/clean/items/radelite/portivity_gun2.vmf" + "EntityCount" "28" + "BrushCount" "24" + "BrushSideCount" "148" + } + "3" + { + "Name" "instances/BEE2/clean/items/radelite/portivity_gun3.vmf" + "EntityCount" "28" + "BrushCount" "24" + "BrushSideCount" "148" + } + "4" + { + "Name" "instances/BEE2/clean/items/radelite/portivity_gun4.vmf" + "EntityCount" "28" + "BrushCount" "24" + "BrushSideCount" "148" + } + "5" + { + "Name" "instances/BEE2/clean/items/radelite/portivity_gun5.vmf" "EntityCount" "28" "BrushCount" "24" "BrushSideCount" "148" diff --git a/items/portivity_gun/properties.txt b/items/portivity_gun/properties.txt index d07900e..4a5b84c 100644 --- a/items/portivity_gun/properties.txt +++ b/items/portivity_gun/properties.txt @@ -6,9 +6,13 @@ { "" "It's a Portal Gun with a Gravity Gun. You can switch between modes with Crouch." "" "* It's very similar with the one in Into the Multiverse, the Portal 2 workshop map series." +"" "* Unfortunately, there can't be more than one Portivity Gun per chamber, so both Co-Op players can't have the Portivity Gun." "" "" +"" "* **Weighted** fires both portals" +"" "* **Cube** is blue portal only" +"" "* **Ball** is orange portal only" +"" "* Unlike the normal Portal Gun, portals won't stack (blue-only with orange-only doesn't upgrades to dual, and vice versa)." "" "" -"" "* Unfortunately, there can't be more than one Portivity Gun per chamber, so both Co-Op players can't have the Portivity Gun." "" "> To-Do: Add Auto Disable when picking up another gun." } "infoURL" "https://github.com/ENDERZOMBI102/Radelite_BEE2_package/wiki/Portivity-Gun" diff --git a/items/portivity_gun/vbsp_config.cfg b/items/portivity_gun/vbsp_config.cfg index 35dff2a..af697e1 100644 --- a/items/portivity_gun/vbsp_config.cfg +++ b/items/portivity_gun/vbsp_config.cfg @@ -20,11 +20,7 @@ } "Condition" { - "posIsSolid" - { - "Pos" "0 0 0" - "type" "white" - } + "instance" "" "Result" { "TemplateBrush" @@ -36,11 +32,7 @@ } "Condition" { - "posIsSolid" - { - "Pos" "0 0 0" - "type" "black" - } + "instance" "" "Result" { "TemplateBrush" @@ -50,6 +42,37 @@ } } } + "Condition" + { + "instance" "" + "Result" + { + "setInstVar" "$portalblue 1" + "setInstVar" "$portalorange 1" + "ChangeInstance" "instances/BEE2/clean/items/radelite/portivity_gun.vmf" + } + } + "Condition" + { + "instance" "" + "Result" + { + "setInstVar" "$portalblue 1" + "setInstVar" "$portalorange 0" + "ChangeInstance" "instances/BEE2/clean/items/radelite/portivity_gun.vmf" + } + } + "Condition" + { + "instance" "" + "Result" + { + "setInstVar" "$portalblue 0" + "setInstVar" "$portalorange 1" + "ChangeInstance" "instances/BEE2/clean/items/radelite/portivity_gun.vmf" + } + } + } } "Condition" { diff --git a/resources/instances/clean/items/radelite/portivity_gun.vmf b/resources/instances/clean/items/radelite/portivity_gun.vmf index c3950d1..fd8a31a 100644 --- a/resources/instances/clean/items/radelite/portivity_gun.vmf +++ b/resources/instances/clean/items/radelite/portivity_gun.vmf @@ -2,7 +2,7 @@ versioninfo { "editorversion" "400" "editorbuild" "8419" - "mapversion" "63" + "mapversion" "65" "formatversion" "100" "prefab" "0" } @@ -20,7 +20,7 @@ viewsettings world { "id" "1" - "mapversion" "63" + "mapversion" "65" "classname" "worldspawn" "detailmaterial" "detail/detailsprites" "detailvbsp" "detail.vbsp" @@ -757,6 +757,67 @@ world } } entity +{ + "id" "2418" + "classname" "env_entity_maker" + "angles" "0 0 0" + "EntityTemplate" "gun_temp2" + "PostSpawnDirection" "0 0 0" + "PostSpawnDirectionVariance" "0.15" + "PostSpawnInheritAngles" "0" + "PostSpawnSpeed" "0" + "spawnflags" "0" + "targetname" "gun_maker2" + "origin" "-22.5 -9 -32" + editor + { + "color" "220 30 220" + "visgroupshown" "1" + "visgroupautoshown" "1" + "logicalpos" "[0 1000]" + } +} +entity +{ + "id" "2003" + "classname" "weapon_portalgun" + "angles" "0 270 0" + "CanFirePortal1" "$portalblue" + "CanFirePortal2" "$portalorange" + "fademaxdist" "0" + "fademindist" "-1" + "fadescale" "1" + "ShowingPotatos" "0" + "spawnflags" "0" + "StartingTeamNum" "0" + "targetname" "tempgun2" + "origin" "10 -9 -36" + editor + { + "color" "0 0 200" + "visgroupshown" "1" + "visgroupautoshown" "1" + "logicalpos" "[0 15000]" + } +} +entity +{ + "id" "2148" + "classname" "point_template" + "angles" "0 0 0" + "spawnflags" "2" + "targetname" "gun_temp2" + "Template01" "tempgun2" + "origin" "-22.5 -33 -32" + editor + { + "color" "220 30 220" + "visgroupshown" "1" + "visgroupautoshown" "1" + "logicalpos" "[0 1000]" + } +} +entity { "id" "1493" "classname" "logic_relay" @@ -1669,8 +1730,8 @@ entity "id" "861" "classname" "weapon_portalgun" "angles" "0 0 0" - "CanFirePortal1" "1" - "CanFirePortal2" "1" + "CanFirePortal1" "$portalblue" + "CanFirePortal2" "$portalorange" "fademaxdist" "0" "fademindist" "-1" "fadescale" "1" @@ -1962,8 +2023,6 @@ entity "targetname" "portal" connections { - "OnTrigger" "@commandCommandupgrade_portalgun0.02-1" - "OnTrigger" "@commandCommandgive_portalgun0.01-1" "OnTrigger" "portalDisable0.01-1" "OnTrigger" "gravityEnable0.01-1" "OnTrigger" "blap_crosshairDisable0-1" @@ -1975,6 +2034,7 @@ entity "OnTrigger" "release_relayDisable0-1" "OnTrigger" "stripEnable0-1" "OnTrigger" "@portalgun_skin1Trigger0-1" + "OnTrigger" "gun_maker2ForceSpawnAtEntityOrigin!player0.01-1" } "origin" "-16 32 32" editor @@ -2044,21 +2104,6 @@ entity } } entity -{ - "id" "879" - "classname" "point_clientcommand" - "angles" "0 0 0" - "targetname" "@command" - "origin" "16 -16 32" - editor - { - "color" "200 0 0" - "visgroupshown" "1" - "visgroupautoshown" "1" - "logicalpos" "[0 15000]" - } -} -entity { "id" "881" "classname" "logic_measure_movement" @@ -3121,8 +3166,8 @@ cameras "activecamera" "0" camera { - "position" "[-15.6183 20.3488 55.575]" - "look" "[47.6956 -44.5459 31.536]" + "position" "[-40.9516 -5.20394 34.7218]" + "look" "[25.5801 -5.50169 -31.3938]" } } cordons From 1207b57193d22d423378b87eb75acd8cb020350a Mon Sep 17 00:00:00 2001 From: Flash4433 <38331230+Flash4433@users.noreply.github.com> Date: Thu, 9 Apr 2020 22:33:37 +0100 Subject: [PATCH 18/22] Updated Portivity Gun AutoDisable and Fixed BEE2 Crash --- items/portivity_gun/vbsp_config.cfg | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/items/portivity_gun/vbsp_config.cfg b/items/portivity_gun/vbsp_config.cfg index af697e1..6c49f32 100644 --- a/items/portivity_gun/vbsp_config.cfg +++ b/items/portivity_gun/vbsp_config.cfg @@ -72,7 +72,6 @@ "ChangeInstance" "instances/BEE2/clean/items/radelite/portivity_gun.vmf" } } - } } "Condition" { @@ -98,6 +97,14 @@ "AddOverlay" "instances/BEE2/clean/items/radelite/p2editor/gun_disable.vmf" } } + "Condition" + { + "instance" "" + "Result" + { + "AddOverlay" "instances/BEE2/clean/items/radelite/p2editor/gun_disable.vmf" + } + } "Condition" { "instance" "" From 93a872b6d3878d994e98f0dee54c34514bac4911 Mon Sep 17 00:00:00 2001 From: Flash4433 <38331230+Flash4433@users.noreply.github.com> Date: Thu, 9 Apr 2020 22:35:05 +0100 Subject: [PATCH 19/22] Updated AutoDisables associated with Portivity Gun --- items/gravity_gun/vbsp_config.cfg | 2 +- items/paint_gun/vbsp_config.cfg | 2 +- resources/instances/clean/items/radelite/portivity_gun.vmf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/items/gravity_gun/vbsp_config.cfg b/items/gravity_gun/vbsp_config.cfg index e2961a5..d24f6fa 100644 --- a/items/gravity_gun/vbsp_config.cfg +++ b/items/gravity_gun/vbsp_config.cfg @@ -77,7 +77,7 @@ } "Condition" { - "instance" "" + "instance" "" "Result" { "AddOverlay" "instances/BEE2/clean/items/radelite/p2editor/gun_disable.vmf" diff --git a/items/paint_gun/vbsp_config.cfg b/items/paint_gun/vbsp_config.cfg index c5841a1..b4e5849 100644 --- a/items/paint_gun/vbsp_config.cfg +++ b/items/paint_gun/vbsp_config.cfg @@ -119,7 +119,7 @@ } "Condition" { - "instance" "" + "instance" "" "Result" { "AddOverlay" "instances/BEE2/clean/items/radelite/p2editor/gun_disable.vmf" diff --git a/resources/instances/clean/items/radelite/portivity_gun.vmf b/resources/instances/clean/items/radelite/portivity_gun.vmf index fd8a31a..968a532 100644 --- a/resources/instances/clean/items/radelite/portivity_gun.vmf +++ b/resources/instances/clean/items/radelite/portivity_gun.vmf @@ -1414,7 +1414,7 @@ entity "targetname" "strip" connections { - "OnStartTouch" "stripDisable0-1" + "OnStartTouch" "stripDisable0.01-1" } solid { From 4f4862a033ee945c4e900c37b46c78f733e339e5 Mon Sep 17 00:00:00 2001 From: Flash4433 <38331230+Flash4433@users.noreply.github.com> Date: Thu, 9 Apr 2020 23:27:37 +0100 Subject: [PATCH 20/22] Fixed Portivity Gun Strip Trigger --- resources/instances/clean/items/radelite/portivity_gun.vmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/instances/clean/items/radelite/portivity_gun.vmf b/resources/instances/clean/items/radelite/portivity_gun.vmf index 968a532..235db6d 100644 --- a/resources/instances/clean/items/radelite/portivity_gun.vmf +++ b/resources/instances/clean/items/radelite/portivity_gun.vmf @@ -1410,7 +1410,7 @@ entity "parentname" "gun_collision" "solid" "6" "spawnflags" "4097" - "StartDisabled" "1" + "StartDisabled" "0" "targetname" "strip" connections { From 9e190c8b0093e00eaf46f1ed0d1857a74d71f436 Mon Sep 17 00:00:00 2001 From: Flash4433 <38331230+Flash4433@users.noreply.github.com> Date: Thu, 9 Apr 2020 23:27:53 +0100 Subject: [PATCH 21/22] Final touches to the AutoDisable Mechanism --- items/gravity_gun/properties.txt | 3 --- items/paint_gun/properties.txt | 2 +- items/portivity_gun/properties.txt | 6 ++---- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/items/gravity_gun/properties.txt b/items/gravity_gun/properties.txt index ad7e921..c139f16 100644 --- a/items/gravity_gun/properties.txt +++ b/items/gravity_gun/properties.txt @@ -7,9 +7,6 @@ "" "Gravity Gun." "" "" "" "* **Start Reversed** makes the gun work for Co-Op. Uncheck for AtLAS, check for P-Body. Useless in SP." -"" "" -"" "" -"" "> To-Do: Add Auto Disable when picking up another gun." } "infoURL" "https://github.com/ENDERZOMBI102/Radelite_BEE2_package/wiki/Gravity-Gun" "ent_count" "24" diff --git a/items/paint_gun/properties.txt b/items/paint_gun/properties.txt index 3b554c0..91edde1 100644 --- a/items/paint_gun/properties.txt +++ b/items/paint_gun/properties.txt @@ -33,7 +33,7 @@ "" "* **Paint can get stuck on Portals if shot in specific directions.**" "" "" "" "" -"" "> To-Do: Add the Start Enabled, Auto Disable when picking up another gun." +"" "> To-Do: Add Start Enabled." } "infoURL" "https://github.com/ENDERZOMBI102/Radelite_BEE2_package/wiki/Paint-Gun" "ent_count" "7" diff --git a/items/portivity_gun/properties.txt b/items/portivity_gun/properties.txt index 4a5b84c..919230d 100644 --- a/items/portivity_gun/properties.txt +++ b/items/portivity_gun/properties.txt @@ -6,14 +6,12 @@ { "" "It's a Portal Gun with a Gravity Gun. You can switch between modes with Crouch." "" "* It's very similar with the one in Into the Multiverse, the Portal 2 workshop map series." -"" "* Unfortunately, there can't be more than one Portivity Gun per chamber, so both Co-Op players can't have the Portivity Gun." +"" "" +"" "> Unfortunately, there can't be more than one Portivity Gun per chamber, so both Co-Op players can't have the Portivity Gun and you can't upgrade the portals." "" "" "" "* **Weighted** fires both portals" "" "* **Cube** is blue portal only" "" "* **Ball** is orange portal only" -"" "* Unlike the normal Portal Gun, portals won't stack (blue-only with orange-only doesn't upgrades to dual, and vice versa)." -"" "" -"" "> To-Do: Add Auto Disable when picking up another gun." } "infoURL" "https://github.com/ENDERZOMBI102/Radelite_BEE2_package/wiki/Portivity-Gun" "ent_count" "28" From e0cd780469c76a9facfbe5308b27c901d37b4063 Mon Sep 17 00:00:00 2001 From: Flash4433 <38331230+Flash4433@users.noreply.github.com> Date: Thu, 9 Apr 2020 23:35:04 +0100 Subject: [PATCH 22/22] Improved Portivity Gun --- .../instances/clean/items/radelite/portivity_gun.vmf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/instances/clean/items/radelite/portivity_gun.vmf b/resources/instances/clean/items/radelite/portivity_gun.vmf index 235db6d..cd970b1 100644 --- a/resources/instances/clean/items/radelite/portivity_gun.vmf +++ b/resources/instances/clean/items/radelite/portivity_gun.vmf @@ -2,7 +2,7 @@ versioninfo { "editorversion" "400" "editorbuild" "8419" - "mapversion" "65" + "mapversion" "66" "formatversion" "100" "prefab" "0" } @@ -20,7 +20,7 @@ viewsettings world { "id" "1" - "mapversion" "65" + "mapversion" "66" "classname" "worldspawn" "detailmaterial" "detail/detailsprites" "detailvbsp" "detail.vbsp" @@ -791,7 +791,7 @@ entity "spawnflags" "0" "StartingTeamNum" "0" "targetname" "tempgun2" - "origin" "10 -9 -36" + "origin" "-22.5 -21 -19.0002" editor { "color" "0 0 200" @@ -1392,7 +1392,7 @@ entity "spawnflags" "0" "StartingTeamNum" "0" "targetname" "tempgun" - "origin" "9.5 -9 -47.9998" + "origin" "-23 -21 -31" editor { "color" "0 0 200" @@ -3166,8 +3166,8 @@ cameras "activecamera" "0" camera { - "position" "[-40.9516 -5.20394 34.7218]" - "look" "[25.5801 -5.50169 -31.3938]" + "position" "[-70.7417 -56.5284 -22.9996]" + "look" "[10.5327 -11.322 -35.1938]" } } cordons