Skip to content
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.

Sign up for GitHub

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

Guns AutoDisable and overall improvements #28

Merged
merged 24 commits into from
Apr 9, 2020
Merged

Guns AutoDisable and overall improvements #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
6f20488
Made the Paint Gun disable itself once you pick up a Portal Gun
Flash4433 Mar 17, 2020
3b47c13
Updated the Paint Gun to match with the normal Portal Gun better
Flash4433 Mar 17, 2020
e207a21
Merge branch 'master' into paint-gun_autodisable
Flash4433 Mar 21, 2020
e0829c1
Removed some useless lines of code
Flash4433 Mar 27, 2020
adcfd93
Improved and Updated all Guns
Flash4433 Mar 27, 2020
e309db4
Renamed Gun Disable
Flash4433 Mar 27, 2020
a824caf
Created a simple auto disable system for all guns
Flash4433 Mar 27, 2020
53ed510
Updated Portivity Gun AutoDisable
Flash4433 Apr 8, 2020
53f19e7
Fixed BEE2 Crash
Flash4433 Apr 9, 2020
9cfa68d
Updated Strip Trigger of Paint Gun
Flash4433 Apr 9, 2020
3926d3d
Updated Paint Gun's Pedestal's Animations
Flash4433 Apr 9, 2020
a725cd3
Fixed Paint Gun AutoDisable
Flash4433 Apr 9, 2020
225d485
Updated Paint Gun
Flash4433 Apr 9, 2020
aa6bcf6
Updated Strip Trigger of Paint Gun
Flash4433 Apr 9, 2020
67e53f5
Updated AutoDisables
Flash4433 Apr 9, 2020
87e12b2
Added Gravity Gun AutoDisable
Flash4433 Apr 9, 2020
808ff01
Updated Animations for the Guns
Flash4433 Apr 9, 2020
0faa2d6
Added ButtonType to Portivity Gun
Flash4433 Apr 9, 2020
1207b57
Updated Portivity Gun AutoDisable and Fixed BEE2 Crash
Flash4433 Apr 9, 2020
93a872b
Updated AutoDisables associated with Portivity Gun
Flash4433 Apr 9, 2020
4f4862a
Fixed Portivity Gun Strip Trigger
Flash4433 Apr 9, 2020
9e190c8
Final touches to the AutoDisable Mechanism
Flash4433 Apr 9, 2020
e0cd780
Improved Portivity Gun
Flash4433 Apr 9, 2020
56d39c7
Merge branch 'master' into paint-gun_autodisable
Flash4433 Apr 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions items/gravity_gun/properties.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" "26"
Expand Down
42 changes: 42 additions & 0 deletions items/gravity_gun/vbsp_config.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,16 @@
"Condition"
{
"instance" "<ITEM_GRAVITY_GUN>"
"Result"
{
"GlobalInput"
{
"Name" "@disable_gravity_gun"
"Target" "shutdown"
"Input" "Trigger"
"Output" "OnTrigger"
}
}
"Condition"
{
"posIsSolid"
Expand Down Expand Up @@ -49,4 +59,36 @@
}
}
}
"Condition"
{
"instance" "<ITEM_BEE2_PORTALGUN>"
"Result"
{
"AddOverlay" "instances/BEE2/clean/items/radelite/p2editor/gun_disable.vmf"
}
}
"Condition"
{
"instance" "<ITEM_PAINT_GUN>"
"Result"
{
"AddOverlay" "instances/BEE2/clean/items/radelite/p2editor/gun_disable.vmf"
}
}
"Condition"
{
"instance" "<ITEM_PORTIVITY_GUN>"
"Result"
{
"AddOverlay" "instances/BEE2/clean/items/radelite/p2editor/gun_disable.vmf"
}
}
"Condition"
{
"instance" "<ITEM_WEAPON_STRIP>"
"Result"
{
"AddOverlay" "instances/BEE2/clean/items/radelite/p2editor/gun_disable2.vmf"
}
}
}
1 change: 0 additions & 1 deletion items/living_panel_large/editoritems.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
"Model"
{
"ModelName" "piston_lift_grate.3ds"
"TextureName" "pistonlift.png"
}
"Palette"
{
Expand Down
12 changes: 6 additions & 6 deletions items/paint_gun/editoritems.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
4 changes: 2 additions & 2 deletions items/paint_gun/properties.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
"" "* **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" "8"
"ent_count" "7"
"Icon"
{
"0" "clean/paint_gun.png"
Expand Down
39 changes: 39 additions & 0 deletions items/paint_gun/vbsp_config.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,13 @@
"0" "stop"
"1" "start"
}
"GlobalInput"
{
"Name" "@disable_radelite_paintgun"
"Target" "Paintui"
"Input" "Deactivate"
"Output" "OnTrigger"
}
}
"Condition"
{
Expand Down Expand Up @@ -94,4 +101,36 @@
}
}
}
"Condition"
{
"instance" "<ITEM_BEE2_PORTALGUN>"
"Result"
{
"AddOverlay" "instances/BEE2/clean/items/radelite/p2editor/gun_disable.vmf"
}
}
"Condition"
{
"instance" "<ITEM_GRAVITY_GUN>"
"Result"
{
"AddOverlay" "instances/BEE2/clean/items/radelite/p2editor/gun_disable.vmf"
}
}
"Condition"
{
"instance" "<ITEM_PORTIVITY_GUN>"
"Result"
{
"AddOverlay" "instances/BEE2/clean/items/radelite/p2editor/gun_disable.vmf"
}
}
"Condition"
{
"instance" "<ITEM_WEAPON_STRIP>"
"Result"
{
"AddOverlay" "instances/BEE2/clean/items/radelite/p2editor/gun_disable2.vmf"
}
}
}
47 changes: 44 additions & 3 deletions items/portivity_gun/editoritems.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
"Item"
{
"Type" "ITEM_PORTIVITY_GUN"
"ItemClass" "ItemButtonFloor"
"Editor"
{
"SubType"
{
"Name" "Portivity Gun"
"Model"
{
"ModelName" "bee2_pgun_pedestal_oran.3ds"
"ModelName" "bee2_pgun_pedestal_dual.3ds"
}
"Palette"
{
Expand All @@ -28,15 +29,55 @@
}
"Properties"
{
"ButtonType"
{
"DefaultValue" "0"
"Index" "1"
}
}
"Exporting"
{
"Instances"
{
"0"
{
"Name" "instances/BEE2/clean/items/radelite/portivity_gun.vmf"
"EntityCount" "31"
"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"
}
Expand Down
10 changes: 6 additions & 4 deletions items/portivity_gun/properties.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,16 @@
"Description"
{
"" "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."
"" ""
"" "> To-Do: Add Auto Disable when picking up another 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"
}
"infoURL" "https://github.com/ENDERZOMBI102/Radelite_BEE2_package/wiki/Portivity-Gun"
"ent_count" "31"
"ent_count" "28"
"Icon"
{
"0" "clean/portivity_gun.png"
Expand Down
89 changes: 79 additions & 10 deletions items/portivity_gun/vbsp_config.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,17 @@
"File" "instances/BEE2/clean/items/radelite/p2editor/portivity_gun_globallogic.vmf"
"fixup_style" "2"
}
"GlobalInput"
{
"Name" "@disable_portivity_gun"
"Target" "shutdown"
"Input" "Trigger"
"Output" "OnTrigger"
}
}
"Condition"
{
"posIsSolid"
{
"Pos" "0 0 0"
"type" "white"
}
"instance" "<ITEM_PORTIVITY_GUN:btn_white>"
"Result"
{
"TemplateBrush"
Expand All @@ -29,11 +32,7 @@
}
"Condition"
{
"posIsSolid"
{
"Pos" "0 0 0"
"type" "black"
}
"instance" "<ITEM_PORTIVITY_GUN:btn_black>"
"Result"
{
"TemplateBrush"
Expand All @@ -43,5 +42,75 @@
}
}
}
"Condition"
{
"instance" "<ITEM_PORTIVITY_GUN:btn_weighted>"
"Result"
{
"setInstVar" "$portalblue 1"
"setInstVar" "$portalorange 1"
"ChangeInstance" "instances/BEE2/clean/items/radelite/portivity_gun.vmf"
}
}
"Condition"
{
"instance" "<ITEM_PORTIVITY_GUN:btn_cube>"
"Result"
{
"setInstVar" "$portalblue 1"
"setInstVar" "$portalorange 0"
"ChangeInstance" "instances/BEE2/clean/items/radelite/portivity_gun.vmf"
}
}
"Condition"
{
"instance" "<ITEM_PORTIVITY_GUN:btn_ball>"
"Result"
{
"setInstVar" "$portalblue 0"
"setInstVar" "$portalorange 1"
"ChangeInstance" "instances/BEE2/clean/items/radelite/portivity_gun.vmf"
}
}
}
"Condition"
{
"instance" "<ITEM_BEE2_PORTALGUN>"
"Result"
{
"AddOverlay" "instances/BEE2/clean/items/radelite/p2editor/gun_disable.vmf"
}
}
"Condition"
{
"instance" "<ITEM_GRAVITY_GUN>"
"Result"
{
"AddOverlay" "instances/BEE2/clean/items/radelite/p2editor/gun_disable.vmf"
}
}
"Condition"
{
"instance" "<ITEM_PAINT_GUN>"
"Result"
{
"AddOverlay" "instances/BEE2/clean/items/radelite/p2editor/gun_disable.vmf"
}
}
"Condition"
{
"instance" "<ITEM_PORTIVITY_GUN>"
"Result"
{
"AddOverlay" "instances/BEE2/clean/items/radelite/p2editor/gun_disable.vmf"
}
}
"Condition"
{
"instance" "<ITEM_WEAPON_STRIP>"
"Result"
{
"AddOverlay" "instances/BEE2/clean/items/radelite/p2editor/gun_disable2.vmf"
}
}
}
Loading