Skip to content

Commit

Permalink
Fix #2965, fix #2851: Old Aperture Sendificators not working
Browse files Browse the repository at this point in the history
  • Loading branch information
@TeamSpen210
TeamSpen210 committed Jun 3, 2019
1 parent c9a687f commit 493cbcb
Show file tree
Hide file tree
Showing 12 changed files with 703 additions and 2,296 deletions.
93 changes: 23 additions & 70 deletions packages/sendificator/items/sendtor_50s.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"Condition"
{
"Priority" "-10" // Ensure we run before laser emitter items
"Priority" "-300" // Ensure we run before laser emitter items
"instance" "<ITEM_HMW_SENDIFICATOR>"
"Condition"
{
Expand Down Expand Up @@ -32,81 +32,34 @@
"Sendificator" "1"
"Sendtor" "1"
}
"Pack" "PACK_HMW_SENDTOR_RETRO"
"Pack" "PACK_HMW_SENDTOR_ANT_RETRO"
"custOutput"
"Sendificator"
{
"decConCount" "1"
"sign_type" "none"
"addOut"
{
"targ_out" "fire"
"output" "OnTrigger"
// ->
"targ_in" "fire"
"input" "Trigger"
}
"targCondition"
{
"instance" "<ITEM_LASER_EMITTER_CENTER>"
"Result"
{
"changeInstance" "<ITEM_HMW_SENDIFICATOR:bee2_las_center>"
}
}
"targCondition"
{
"instance" "<ITEM_LASER_EMITTER_OFFSET>"
"Result"
{
"changeInstance" "<ITEM_HMW_SENDIFICATOR:bee2_las_offset>"
}
}
"targCondition"
{
"instvar" "$connectioncount = 0"
"Result"
{
"setinstvar" "$start_enabled 1"
}
}
}
"custAntline"
{
"instance" "instances/bee2/logic/hmw/sendtor_antline.vmf"

"straight" "1|BEE2/sendtor/sendificator_neon_indicator_1"
"straight" "1|BEE2/sendtor/sendificator_neon_indicator_2"
"corner" "1|BEE2/sendtor/sendificator_neon_indicator_1"
"corner" "1|BEE2/sendtor/sendificator_neon_indicator_2"

"BrokenStraight" "1|BEE2/50s/indicator_broken_1|static"
"BrokenStraight" "1|BEE2/50s/indicator_broken_2|static"
"BrokenCorner" "1|BEE2/50s/indicator_broken_1|static"
"BrokenCorner" "1|BEE2/50s/indicator_broken_2|static"

"addOut"
{
"targ_out" "target"
"output" "OnUser1"
"input" "FireUser1"
"targ_in" "tog"
}
"addOut"
"wall"
{
"targ_out" "target"
"output" "OnUser2"
"input" "FireUser2"
"targ_in" "tog"
}
"addOut"
{
"targ_out" "target"
"output" "OnUser3"
"input" "FireUser3"
"targ_in" "tog"
"straight" "1|BEE2/sendtor/sendificator_neon_indicator_1"
"straight" "1|BEE2/sendtor/sendificator_neon_indicator_2"
"corner" "1|BEE2/sendtor/sendificator_neon_indicator_1"
"corner" "1|BEE2/sendtor/sendificator_neon_indicator_2"

"broken_straight" "1|BEE2/50s/indicator_broken_1|static"
"broken_straight" "1|BEE2/50s/indicator_broken_2|static"
"broken_corner" "1|BEE2/50s/indicator_broken_1|static"
"broken_corner" "1|BEE2/50s/indicator_broken_2|static"

"broken_chance" "15"
}

"remove_signs" "1"
"toggle_var" "$ind_name"
}
"CubeFilter"
{
"Cube" "<sphere>"
"ResultVar" "$ball_filt"
}
}
}
}
}
95 changes: 24 additions & 71 deletions packages/sendificator/items/sendtor_70s.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"Condition"
{
"Priority" "-10" // Ensure we run before laser emitter items
"Priority" "-300" // Ensure we run before laser emitter items
"instance" "<ITEM_HMW_SENDIFICATOR>"
"Condition"
{
Expand All @@ -24,89 +24,42 @@
}
}
}

"Result"
{
"Has"
{
"Sendificator" "1"
"Sendtor" "1"
}
"Pack" "PACK_HMW_SENDTOR_ANT_RETRO"
"Pack" "PACK_HMW_SENDTOR_RETRO"
"custOutput"
"Sendificator"
{
"decConCount" "1"
"sign_type" "none"
"addOut"
{
"targ_out" "fire"
"output" "OnTrigger"
// ->
"targ_in" "fire"
"input" "Trigger"
}
"targCondition"
{
"instance" "<ITEM_LASER_EMITTER_CENTER>"
"Result"
{
"changeInstance" "<ITEM_HMW_SENDIFICATOR:bee2_las_center>"
}
}
"targCondition"
{
"instance" "<ITEM_LASER_EMITTER_OFFSET>"
"Result"
{
"changeInstance" "<ITEM_HMW_SENDIFICATOR:bee2_las_offset>"
}
}
"targCondition"
{
"instvar" "$connectioncount = 0"
"Result"
{
"setinstvar" "$start_enabled 1"
}
}
}
"custAntline"
{
"instance" "instances/bee2/logic/hmw/sendtor_antline.vmf"

"straight" "1|BEE2/sendtor/sendificator_neon_indicator_1"
"straight" "1|BEE2/sendtor/sendificator_neon_indicator_2"
"corner" "1|BEE2/sendtor/sendificator_neon_indicator_1"
"corner" "1|BEE2/sendtor/sendificator_neon_indicator_2"

"BrokenStraight" "1|BEE2/50s/indicator_broken_1|static"
"BrokenStraight" "1|BEE2/50s/indicator_broken_2|static"
"BrokenCorner" "1|BEE2/50s/indicator_broken_1|static"
"BrokenCorner" "1|BEE2/50s/indicator_broken_2|static"

"addOut"
{
"targ_out" "target"
"output" "OnUser1"
"input" "FireUser1"
"targ_in" "tog"
}
"addOut"
"wall"
{
"targ_out" "target"
"output" "OnUser2"
"input" "FireUser2"
"targ_in" "tog"
}
"addOut"
{
"targ_out" "target"
"output" "OnUser3"
"input" "FireUser3"
"targ_in" "tog"
"straight" "1|BEE2/sendtor/sendificator_neon_indicator_1"
"straight" "1|BEE2/sendtor/sendificator_neon_indicator_2"
"corner" "1|BEE2/sendtor/sendificator_neon_indicator_1"
"corner" "1|BEE2/sendtor/sendificator_neon_indicator_2"

"broken_straight" "1|BEE2/50s/indicator_broken_1|static"
"broken_straight" "1|BEE2/50s/indicator_broken_2|static"
"broken_corner" "1|BEE2/50s/indicator_broken_1|static"
"broken_corner" "1|BEE2/50s/indicator_broken_2|static"

"broken_chance" "35"
}

"remove_signs" "1"
"toggle_var" "$ind_name"
}
"CubeFilter"
{
"Cube" "<sphere>"
"ResultVar" "$ball_filt"
}
}
}
}
}
78 changes: 15 additions & 63 deletions packages/sendificator/items/sendtor_80s.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"Condition"
{
"Priority" "-10" // Ensure we run before laser emitter items
"Priority" "-300" // Ensure we run before laser emitter items
"instance" "<ITEM_HMW_SENDIFICATOR>"
"Condition"
{
Expand All @@ -25,81 +25,33 @@
}
}
}

"Result"
{
"Has"
{
"Sendificator" "1"
"Sendtor" "1"
}
"Pack" "PACK_HMW_SENDTOR_RETRO"
"Pack" "PACK_HMW_SENDTOR_ANT_CLEAN"
"Pack" "PACK_BEE2_BULLSEYE_RETRO_80S_DECAL" // Non-glowing version of the bullseye
"custOutput"
"Sendificator"
{
"decConCount" "1"
"sign_type" "none"
"addOut"
{
"targ_out" "fire"
"output" "OnTrigger"
// ->
"targ_in" "fire"
"input" "Trigger"
}
"targCondition"
{
"instance" "<ITEM_LASER_EMITTER_CENTER>"
"Result"
{
"changeInstance" "<ITEM_HMW_SENDIFICATOR:bee2_las_center>"
}
}
"targCondition"
{
"instance" "<ITEM_LASER_EMITTER_OFFSET>"
"Result"
{
"changeInstance" "<ITEM_HMW_SENDIFICATOR:bee2_las_offset>"
}
}
"targCondition"
{
"instvar" "$connectioncount = 0"
"Result"
{
"setinstvar" "$start_enabled 1"
}
}
}
"custAntline"
{
"straight" "0.25|BEE2/sendtor/sendificator_antlines"
"corner" "0.25|BEE2/sendtor/sendificator_antlines"
"instance" "instances/bee2/logic/hmw/sendtor_antline.vmf"
"addOut"
{
"targ_out" "target"
"output" "OnUser1"
"input" "FireUser1"
"targ_in" "tog"
}
"addOut"
"wall"
{
"targ_out" "target"
"output" "OnUser2"
"input" "FireUser2"
"targ_in" "tog"
}
"addOut"
{
"targ_out" "target"
"output" "OnUser3"
"input" "FireUser3"
"targ_in" "tog"
"straight" "0.25|BEE2/sendtor/sendificator_antlines"
"corner" "0.25|BEE2/sendtor/sendificator_antlines"
}

"remove_signs" "1"
"toggle_var" "$ind_name"
}
"CubeFilter"
{
"Cube" "<sphere>"
"ResultVar" "$ball_filt"
}
}
}
}
}
Loading

0 comments on commit 493cbcb

Please sign in to comment.