Skip to content

GitLab

Commit 0b865026 authored by dylan grafmyre's avatar dylan grafmyre
Browse files

trying to be less AHK to solve the hl2 problem

parent 454084fd
Hide whitespace changes
Inline Side-by-side
.gitignore
View file @ 0b865026
......@@ -29,3 +29,5 @@ addons/*/
*_fast.vmf
*_hdr.vmf
*_default.vmf
*.ain
*.nav
Makefile
View file @ 0b865026
......@@ -132,16 +132,20 @@ maps/%.bsp: %.bsp
# rm "$(MOD_DIR)/lua/autorun/runme.lua"
%.cubeldr: %.bsp
ln -f "$^" "$(MOD_DIR)/maps/cubeldr.bsp"
./workarounds/buildcubemaps.exe &
$(SHLEX_BIN) $(SHLEX_FLAGS) $(SHLEX_HL2LOG_FLAGS) \
"'$(GAME_DIR)$(GAME)'" -allowdebug $(VBIN_FLAGS) $(GAME_FLAGS) $(GAME_TTT_FLAGS) +sv_cheats 1 \
+mat_specular 0 +map $(notdir $(basename $^))
+mat_specular 0 +map cubeldr
rm -v "$(MOD_DIR)/maps/cubeldr.bsp"
%.cubehdr: %.bsp %.cubeldr
ln -f "$(word 1, $^)" "$(MOD_DIR)/maps/cubehdr.bsp"
./workarounds/buildcubemaps.exe &
$(SHLEX_BIN) $(SHLEX_FLAGS) $(SHLEX_HL2LOG_FLAGS) \
"'$(GAME_DIR)$(GAME)'" -allowdebug $(VBIN_FLAGS) $(GAME_FLAGS) $(GAME_TTT_FLAGS) +sv_cheats 1 \
+mat_specular 0 +mat_hdr_level 0 +map $(notdir $(basename $^))
+mat_specular 0 +mat_hdr_level 0 +map cubehdr
rm -v "$(MOD_DIR)/maps/cubehdr.bsp"
# settle physics
%.setphys: %.bsp
......@@ -161,11 +165,19 @@ maps/%.bsp: %.bsp
rm -i "$(MOD_DIR)/mapsrc/setphys.vmf"
%.nav: %.bsp
./workarounds/nav_generate.exe &
ln -f "$^" "$(MOD_DIR)/maps/navgen.bsp"
cp -v lua/nav_generate.txt "$(MOD_DIR)/data/runme.txt"
ln -f lua/nav_generate.lua "$(MOD_DIR)/lua/autorun/runme.lua"
$(SHLEX_BIN) $(SHLEX_FLAGS) $(SHLEX_HL2LOG_FLAGS) \
"'$(GAME_DIR)$(GAME)'" -allowdebug $(VBIN_FLAGS) $(GAME_FLAGS) $(GAME_TTT_FLAGS) \
+sv_cheats 1 +nav_edit 1 +map $(notdir $(basename $^))
cp -v "$(MOD_DIR)/maps/$(notdir $(basename $^)).nav" $@
+sv_cheats 1 +nav_edit 1 +map navgen
cp -v "$(MOD_DIR)/maps/navgen.nav" $@
rm -v \
"$(MOD_DIR)/lua/autorun/runme.lua" \
"$(MOD_DIR)/maps/navgen.bsp"
mkdir -p maps/graphs
cp -v "$(MOD_DIR)/maps/graphs/navgen.ain" $(basename $@).ain
rm -v "$(MOD_DIR)/maps/graphs/navgen.ain"
# only ents works on an existing bsp,
......@@ -190,12 +202,15 @@ maps/%.bsp: %.bsp
# addons-src/materials/vgui/maps/*.vtf
# addons-src/maps/*.res
# $(GMAD_BIN) $(GMAD_FLAGS) create -folder "addons-src" -out "$@"
addons/%.gma: %.bsp addons-src/addon.json
addons/%.gma: %.bsp %.nav %.cubehdr addons-src/addon.json
rm -rv \
addons-src/maps/*.bsp \
addons-src/maps/thumb/*.png \
|| true
cp $(word 1, $^) addons-src/maps/
cp $(word 2, $^) addons-src/maps/
mkdir -p addons-src/maps/graphs/
cp $(basename $(word 2, $^)).ain addons-src/maps/graphs/
cp thumbnail_map_128.png addons-src/maps/thumb/$(basename $(word 1, $^)).png
$(GMA_INSTALL_BSPZIP_ADDLIST_BIN) $(GMA_INSTALL_BSPZIP_ADDLIST_FLAGS) --bspzip-addlist $(basename $(word 1, $^)).bspzip-addlist --dst-prefix addons-src
$(GMAD_TAR_BIN) addons-src/ --output-tar $(@:.gma=.tar) --tar-prefix $(basename $(word 1, $^)) --gmad-bin $(GMAD_BIN) --output-gma $@ --output-index $(@:.gma=.tar-index) --output-digest $(@:.gma=.tar-sha1sums)
......@@ -230,7 +245,7 @@ publish: addons/ttt_terrorcon_v2_hdr_final.gma
# custom rules
.DEFAULT: all
all: lint maps/ttt_terrorcon_v2_hdr_final.bsp addons/ttt_terrorcon_v2_hdr_final.gma ttt_terrorcon_v2_hdr_final.game
all: lint addons/ttt_terrorcon_v2_hdr_final.gma ttt_terrorcon_v2_hdr_final.game-mount
fast: lint maps/ttt_terrorcon_v2_fast.bsp ttt_terrorcon_v2_fast.game
# use mount-dev instead
......@@ -246,3 +261,5 @@ fast: lint maps/ttt_terrorcon_v2_fast.bsp ttt_terrorcon_v2_fast.game
lint: ttt_terrorcon_v2.bspzip-addlist
$(PYTHON_BIN) ./contrib/bspzip-lint $^ 2>&1 | tee $^.lint
lua/nav_generate.lua 0 → 100644
View file @ 0b865026
function string_repr(str)
return string.format("%q", str):gsub("\\\n", "\\n")
end
local function main()
local state = file.Read('runme.txt')
if state == '' then
print( "nav_generate:main: start nav_generate ..." )
RunConsoleCommand( "nav_generate", nil )
print( "nav_generate:main: start nav_generate ... returned" )
print( "nav_generate:main: write state ..." )
file.Write('runme.txt', 'ng_2')
print( "nav_generate:main: write state ... done " )
return
end
if state == 'ng_2' then
print( "nav_generate:main: manual tasks: ['quit']" )
return
end
print( "nav_generate:main:unhandled state: " + string_repr(state) )
end
timer.Simple( 2, main )
ttt_terrorcon_v2.bspzip-addlist
View file @ 0b865026
......@@ -14,6 +14,86 @@ materials/ttt_terrorcon/props/passenger_seat/passenger_seat.vtf
materials/ttt_terrorcon/props/passenger_seat/passenger_seat.vtf
materials/ttt_terrorcon/props/passenger_seat/passenger_seat.vmt
materials/ttt_terrorcon/props/passenger_seat/passenger_seat.vmt
models/ttt_terrorcon/traitorcheck/mri_table.dx80.vtx
models/ttt_terrorcon/traitorcheck/mri_table.dx80.vtx
models/ttt_terrorcon/traitorcheck/mri_table.dx90.vtx
models/ttt_terrorcon/traitorcheck/mri_table.dx90.vtx
models/ttt_terrorcon/traitorcheck/mri_table.mdl
models/ttt_terrorcon/traitorcheck/mri_table.mdl
models/ttt_terrorcon/traitorcheck/mri_table.phy
models/ttt_terrorcon/traitorcheck/mri_table.phy
models/ttt_terrorcon/traitorcheck/mri_table.sw.vtx
models/ttt_terrorcon/traitorcheck/mri_table.sw.vtx
models/ttt_terrorcon/traitorcheck/mri_table.vvd
models/ttt_terrorcon/traitorcheck/mri_table.vvd
materials/ttt_terrorcon/props/traitorcheck/mri_table.vtf
materials/ttt_terrorcon/props/traitorcheck/mri_table.vtf
materials/ttt_terrorcon/props/traitorcheck/mri_table.vmt
materials/ttt_terrorcon/props/traitorcheck/mri_table.vmt
models/ttt_terrorcon/traitorcheck/mri_machine.dx80.vtx
models/ttt_terrorcon/traitorcheck/mri_machine.dx80.vtx
models/ttt_terrorcon/traitorcheck/mri_machine.dx90.vtx
models/ttt_terrorcon/traitorcheck/mri_machine.dx90.vtx
models/ttt_terrorcon/traitorcheck/mri_machine.mdl
models/ttt_terrorcon/traitorcheck/mri_machine.mdl
models/ttt_terrorcon/traitorcheck/mri_machine.phy
models/ttt_terrorcon/traitorcheck/mri_machine.phy
models/ttt_terrorcon/traitorcheck/mri_machine.sw.vtx
models/ttt_terrorcon/traitorcheck/mri_machine.sw.vtx
models/ttt_terrorcon/traitorcheck/mri_machine.vvd
models/ttt_terrorcon/traitorcheck/mri_machine.vvd
materials/ttt_terrorcon/props/traitorcheck/mri_machine.vtf
materials/ttt_terrorcon/props/traitorcheck/mri_machine.vtf
materials/ttt_terrorcon/props/traitorcheck/mri_machine.vmt
materials/ttt_terrorcon/props/traitorcheck/mri_machine.vmt
models/ttt_terrorcon/traitorcheck/mri_step.dx80.vtx
models/ttt_terrorcon/traitorcheck/mri_step.dx80.vtx
models/ttt_terrorcon/traitorcheck/mri_step.dx90.vtx
models/ttt_terrorcon/traitorcheck/mri_step.dx90.vtx
models/ttt_terrorcon/traitorcheck/mri_step.mdl
models/ttt_terrorcon/traitorcheck/mri_step.mdl
models/ttt_terrorcon/traitorcheck/mri_step.phy
models/ttt_terrorcon/traitorcheck/mri_step.phy
models/ttt_terrorcon/traitorcheck/mri_step.sw.vtx
models/ttt_terrorcon/traitorcheck/mri_step.sw.vtx
models/ttt_terrorcon/traitorcheck/mri_step.vvd
models/ttt_terrorcon/traitorcheck/mri_step.vvd
materials/ttt_terrorcon/props/traitorcheck/mri_step.vtf
materials/ttt_terrorcon/props/traitorcheck/mri_step.vtf
materials/ttt_terrorcon/props/traitorcheck/mri_step.vmt
materials/ttt_terrorcon/props/traitorcheck/mri_step.vmt
models/ttt_terrorcon/traitorcheck/mri_headcage.dx80.vtx
models/ttt_terrorcon/traitorcheck/mri_headcage.dx80.vtx
models/ttt_terrorcon/traitorcheck/mri_headcage.dx90.vtx
models/ttt_terrorcon/traitorcheck/mri_headcage.dx90.vtx
models/ttt_terrorcon/traitorcheck/mri_headcage.mdl
models/ttt_terrorcon/traitorcheck/mri_headcage.mdl
models/ttt_terrorcon/traitorcheck/mri_headcage.phy
models/ttt_terrorcon/traitorcheck/mri_headcage.phy
models/ttt_terrorcon/traitorcheck/mri_headcage.sw.vtx
models/ttt_terrorcon/traitorcheck/mri_headcage.sw.vtx
models/ttt_terrorcon/traitorcheck/mri_headcage.vvd
models/ttt_terrorcon/traitorcheck/mri_headcage.vvd
materials/ttt_terrorcon/props/plastic/medical.vtf
materials/ttt_terrorcon/props/plastic/medical.vtf
materials/ttt_terrorcon/props/plastic/medical.vmt
materials/ttt_terrorcon/props/plastic/medical.vmt
models/ttt_terrorcon/casino/monneygymbag020.dx80.vtx
models/ttt_terrorcon/casino/monneygymbag020.dx80.vtx
models/ttt_terrorcon/casino/monneygymbag020.dx90.vtx
models/ttt_terrorcon/casino/monneygymbag020.dx90.vtx
models/ttt_terrorcon/casino/monneygymbag020.mdl
models/ttt_terrorcon/casino/monneygymbag020.mdl
models/ttt_terrorcon/casino/monneygymbag020.phy
models/ttt_terrorcon/casino/monneygymbag020.phy
models/ttt_terrorcon/casino/monneygymbag020.sw.vtx
models/ttt_terrorcon/casino/monneygymbag020.sw.vtx
models/ttt_terrorcon/casino/monneygymbag020.vvd
models/ttt_terrorcon/casino/monneygymbag020.vvd
materials/ttt_terrorcon/props/casino/monneygymbag.vtf
materials/ttt_terrorcon/props/casino/monneygymbag.vtf
materials/ttt_terrorcon/props/casino/monneygymbag.vmt
materials/ttt_terrorcon/props/casino/monneygymbag.vmt
models/ttt_terrorcon/airplane_2/aft-gear-port-door.dx80.vtx
models/ttt_terrorcon/airplane_2/aft-gear-port-door.dx80.vtx
models/ttt_terrorcon/airplane_2/aft-gear-port-door.dx90.vtx
......@@ -150,3 +230,39 @@ materials/ttt_terrorcon/props/micstand/cable_vinyl.vtf
materials/ttt_terrorcon/props/micstand/cable_vinyl.vtf
materials/ttt_terrorcon/props/micstand/cable_vinyl.vmt
materials/ttt_terrorcon/props/micstand/cable_vinyl.vmt
models/ttt_terrorcon/casino/monneygymbag010.dx80.vtx
models/ttt_terrorcon/casino/monneygymbag010.dx80.vtx
models/ttt_terrorcon/casino/monneygymbag010.dx90.vtx
models/ttt_terrorcon/casino/monneygymbag010.dx90.vtx
models/ttt_terrorcon/casino/monneygymbag010.mdl
models/ttt_terrorcon/casino/monneygymbag010.mdl
models/ttt_terrorcon/casino/monneygymbag010.phy
models/ttt_terrorcon/casino/monneygymbag010.phy
models/ttt_terrorcon/casino/monneygymbag010.sw.vtx
models/ttt_terrorcon/casino/monneygymbag010.sw.vtx
models/ttt_terrorcon/casino/monneygymbag010.vvd
models/ttt_terrorcon/casino/monneygymbag010.vvd
materials/ttt_terrorcon/metal/metalwall020z.vtf
materials/ttt_terrorcon/metal/metalwall020z.vtf
materials/ttt_terrorcon/metal/metalwall020z.vmt
materials/ttt_terrorcon/metal/metalwall020z.vmt
materials/ttt_terrorcon/metal/galvanized_metal_wall020a.vtf
materials/ttt_terrorcon/metal/galvanized_metal_wall020a.vtf
materials/ttt_terrorcon/metal/galvanized_metal_wall020a.vmt
materials/ttt_terrorcon/metal/galvanized_metal_wall020a.vmt
materials/ttt_terrorcon/plastic/medical.vtf
materials/ttt_terrorcon/plastic/medical.vtf
materials/ttt_terrorcon/plastic/medical.vmt
materials/ttt_terrorcon/plastic/medical.vmt
materials/ttt_terrorcon/decals/tttindust_tcheckkit.vtf
materials/ttt_terrorcon/decals/tttindust_tcheckkit.vtf
materials/ttt_terrorcon/decals/tttindust_tcheckkit.vmt
materials/ttt_terrorcon/decals/tttindust_tcheckkit.vmt
materials/ttt_terrorcon/decals/nullset.vtf
materials/ttt_terrorcon/decals/nullset.vtf
materials/ttt_terrorcon/decals/nullset.vmt
materials/ttt_terrorcon/decals/nullset.vmt
materials/ttt_terrorcon/fabric/cloth015.vtf
materials/ttt_terrorcon/fabric/cloth015.vtf
materials/ttt_terrorcon/fabric/cloth015.vmt
materials/ttt_terrorcon/fabric/cloth015.vmt
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment