Skip to content

Commit

Permalink
Merge pull request BEEmod#268 from TeamSpen210/dev
Browse files Browse the repository at this point in the history
Pre-Release 18
  • Loading branch information
TeamSpen210 committed Feb 9, 2016
2 parents 2d58958 + 6d5dd78 commit 5095a00
Show file tree
Hide file tree
Showing 662 changed files with 70,004 additions and 19,697 deletions.
28 changes: 28 additions & 0 deletions compile_packages.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@
import os
import sys
import itertools
import subprocess
from zipfile import ZipFile, ZIP_LZMA, ZIP_DEFLATED
from concurrent import futures

# The location of the VPK.exe executable - if not found, this will be skipped.
VPK_BIN_LOC = r'F:\SteamLibrary\SteamApps\common\Portal 2\bin\vpk.exe'

BEE2_LOCATION = '../BEE2.4/src'
sys.path.append(BEE2_LOCATION)

Expand Down Expand Up @@ -143,11 +147,35 @@ def build_package(data):
zip_file.write(full_path, rel_path)
print('')
print('Finished "{}"'.format(package_path))

def gen_vpks():
with open('vpk/vpk_dest.cfg') as f:
config = Property.parse(f, 'vpk/vpk_dest.cfg').find_key("VPKDest", [])

if not os.path.isfile(VPK_BIN_LOC):
print('VPK.exe not present, skipping VPK generation.')
return

for prop in config:
src = os.path.join('vpk', prop.real_name)
dest = os.path.abspath('packages/{}/{}.vpk'.format(prop.value, src))

subprocess.call([
VPK_BIN_LOC,
src,
])

if os.path.isfile(dest):
os.remove(dest)
os.rename(src + '.vpk', dest)
print('Processed "{}"'.format(dest))


def main():
global OPTIMISE

gen_vpks()

OPTIMISE = utils.conv_bool(input('Optimise zips? '))

print('Optimising: ', OPTIMISE)
Expand Down
44 changes: 43 additions & 1 deletion packages/bee1/beemod/info.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,24 @@
{
"Styles"
{
"BEE2_CLEAN" "drawbridge"
"BEE2_CLEAN" "drawbridge"
"BEE2_1950s" "drawbridge_50s"
"BEE2_1970s" "drawbridge_70s"
"BEE2_1980s" "drawbridge_80s"
"BEE2_PORTAL_1" "drawbridge_p1"
}
}
}
"BrushTemplate"
{
"ID" "BEE2_P1_DRAWBRIDGE_DOWN"
"file" "drawbridge_p1_down.vmf"
}
"BrushTemplate"
{
"ID" "BEE2_P1_DRAWBRIDGE_UP"
"file" "drawbridge_p1_up.vmf"
}

"Item"
{
Expand Down Expand Up @@ -107,6 +121,34 @@
}
}

"PackList"
{
// An enhanced version of the crusher model, with dirty skins and better sound FX.
"ID" "PACK_BEE_CRUSHER"
"Config"
{
"File" "models/BEE2/props_ingame/crusher.mdl"
"File" "models/BEE2/props_ingame/crusher.vvd"
"File" "models/BEE2/props_ingame/crusher.dx90.vtx"

"File" "materials/BEE2/models/props_ingame/crusher_rusty.vmt"
"File" "materials/BEE2/models/props_ingame/arm_interior_192_bose_rusty.vmt"
}
}

"PackList"
{
// A version of the crusher head with a better origin, and dirty skins.
"ID" "PACK_BEE_CRUSHER_HEAD"
"Config"
{
"File" "models/BEE2/props_ingame/crusher_head.mdl"
"File" "models/BEE2/props_ingame/crusher_head.vvd"
"File" "models/BEE2/props_ingame/crusher_head.dx90.vtx"

"File" "materials/BEE2/models/props_ingame/crusher_rusty.vmt"
}
}

"Item"
{
Expand Down
1 change: 1 addition & 0 deletions packages/bee1/beemod/items/crusher/properties.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"Tags" "BEE;BEEMOD 1;Custom"
"Description" "Large crushers, seen in coop maps and during Chapter 10 of the singleplayer campaign. These oscillate repeatedly when enabled, killing all players and destroying objects that are in its path."
"InfoURL" "http:/\/theportalwiki.com/wiki/Crusher"
"Ent_count" "10"
"Icon"
{
"0" "clean/crusher.png"
Expand Down
2 changes: 2 additions & 0 deletions packages/bee1/beemod/items/crusher/vbsp_config.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"Deadly" "1"
"Crusher" "1"
}
"Pack" "PACK_BEE_CRUSHER"
}
}
"Condition"
Expand All @@ -20,6 +21,7 @@
"Result"
{
"Suffix" "static"
"Pack" "PACK_BEE_CRUSHER_HEAD"
}
}
}
158 changes: 158 additions & 0 deletions packages/bee1/beemod/items/drawbridge_50s/editoritems.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
"Item"
{
"Type" "ITEM_DRAW_BRIDGE"
"ItemClass" "ItemButtonFloor"
"Editor"
{
"SubType"
{
"Name" "Draw Bridge"
"Model"
{
"ModelName" "drawbridge.3ds"
}
"Palette"
{
"Tooltip" "DRAW BRIDGE"
"Image" "palette/drawbridge.png"
}
"Sounds"
{
"SOUND_CREATED" "P2Editor.PlaceOther"
"SOUND_EDITING_ACTIVATE" "P2Editor.ExpandOther"
"SOUND_EDITING_DEACTIVATE" "P2Editor.CollapseOther"
"SOUND_DELETED" "P2Editor.RemoveOther"
}
}
"MovementHandle" "HANDLE_4_DIRECTIONS"
}
"Properties"
{
"ConnectionCount"
{
"DefaultValue" "0"
"Index" "1"
}
"StartEnabled"
{
"DefaultValue" "0"
"Index" "2"
}
}
"Exporting"
{
"Instances"
{
"0"
{
"Name" "instances/BEE2/50s/items/bee/drawbridge/white.vmf"
"EntityCount" "12"
"BrushCount" "5"
"BrushSideCount" "32"
}
"1"
{
"Name" "instances/BEE2/50s/items/bee/drawbridge/black.vmf"
"EntityCount" "12"
"BrushCount" "5"
"BrushSideCount" "32"
}
"pan_logic" "instances/BEE2/50s/items/bee/drawbridge/logic.vmf"

"pan_rope_floor" "instances/BEE2/50s/items/bee/drawbridge/rope_floor.vmf"
"pan_rope_wall" "instances/BEE2/50s/items/bee/drawbridge/rope_wall.vmf"

"static_up" "instances/BEE2/50s/items/bee/drawbridge/static_up.vmf"
"static_down" "instances/BEE2/50s/items/bee/drawbridge/static_down.vmf"
}

"TargetName" "db"
"Inputs"
{
"CONNECTION_STANDARD"
{
"Activate" "instance:counter;Add"
"Deactivate" "instance:counter;Subtract"
}
}
"Offset" "64 64 64"

"OccupiedVoxels"
{
"Voxel"
{
"Pos" "0 0 0"
"Surface"
{
"Normal" "0 0 1"
}
}
}
"ConnectionPoints"
{
// left
"Point"
{
"Dir" "1 0 0"
"Pos" "-1 3 0"
"SignageOffset" "-2 2 0"
"Priority" "0"
}
"Point"
{
"Dir" "1 0 0"
"Pos" "-1 4 0"
"SignageOffset" "-2 5 0"
"Priority" "0"
}

// right
"Point"
{
"Dir" "-1 0 0"
"Pos" "8 3 0"
"SignageOffset" "9 2 0"
"Priority" "0"
}
"Point"
{
"Dir" "-1 0 0"
"Pos" "8 4 0"
"SignageOffset" "9 5 0"
"Priority" "0"
}

// up
"Point"
{
"Dir" "0 1 0"
"Pos" "3 -1 0"
"SignageOffset" "2 -2 0"
"Priority" "0"
}
"Point"
{
"Dir" "0 1 0"
"Pos" "4 -1 0"
"SignageOffset" "5 -2 0"
"Priority" "0"
}

// down
"Point"
{
"Dir" "0 -1 0"
"Pos" "3 8 0"
"SignageOffset" "2 9 0"
"Priority" "0"
}
"Point"
{
"Dir" "0 -1 0"
"Pos" "4 8 0"
"SignageOffset" "5 9 0"
"Priority" "0"
}
}
}
}
10 changes: 10 additions & 0 deletions packages/bee1/beemod/items/drawbridge_50s/properties.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
"Properties"
{
"Authors" "BenVlodgi, Rantis, TeamSpen210"
"Tags" "BEE;BEEMOD 1;Panels"
"Description" "A 1 1/2 sized black or white panel arm which extends up like a drawbridge."
"Icon"
{
"0" "clean/drawbridge.png"
}
}
Loading

0 comments on commit 5095a00

Please sign in to comment.