diff --git a/.gitignore b/.gitignore index a4bd1da..3286ec5 100644 --- a/.gitignore +++ b/.gitignore @@ -8,11 +8,10 @@ !/z_serverdev.bat !/z_server.bat !/z_bots.bat +!/z_client.bat # Folder to not ignore -!/mods/ -/mods/* -!/mods/bots/ +!/userraw !/main/ /main/* !/main/server.cfg diff --git a/mods/bots/bots.txt b/userraw/bots.txt similarity index 100% rename from mods/bots/bots.txt rename to userraw/bots.txt diff --git a/mods/bots/maps/mp/bots/_bot.gsc b/userraw/maps/mp/bots/_bot.gsc similarity index 95% rename from mods/bots/maps/mp/bots/_bot.gsc rename to userraw/maps/mp/bots/_bot.gsc index 79923b2..d50ea2c 100644 --- a/mods/bots/maps/mp/bots/_bot.gsc +++ b/userraw/maps/mp/bots/_bot.gsc @@ -87,6 +87,8 @@ init() level.bots_nonfullautoguns["striker"] = true; level.bots_nonfullautoguns["usp"] = true; level.bots_nonfullautoguns["wa2000"] = true; + + level.bots_bloodfx = loadfx("impacts/flesh_hit_body_fatal_exit"); level thread fixGamemodes(); diff --git a/mods/bots/maps/mp/bots/_bot_internal.gsc b/userraw/maps/mp/bots/_bot_internal.gsc similarity index 95% rename from mods/bots/maps/mp/bots/_bot_internal.gsc rename to userraw/maps/mp/bots/_bot_internal.gsc index 0877ef4..914399d 100644 --- a/mods/bots/maps/mp/bots/_bot_internal.gsc +++ b/userraw/maps/mp/bots/_bot_internal.gsc @@ -160,7 +160,7 @@ onPlayerSpawned() self thread UseRunThink(); self thread watchUsingRemote(); - // footsounds, anims + // anims self thread spawned(); } @@ -430,7 +430,7 @@ moveHack() self.bot.last_pos = self.origin; self.bot.moveTo = self.origin; - for (;;) + for (timer = 0;;timer += 0.05) { wait 0.05; @@ -517,6 +517,7 @@ moveHack() moveSpeed *= self.moveSpeedScaler; self.bot.script_move_speed = moveSpeed; + // self bots_hasPerk("specialty_quieter") moveTo = self.bot.moveTo; @@ -1983,7 +1984,7 @@ knife(ent, knifeDist) if (!usedRiot) { - //playFx( level.bots_bloodfx,target.origin + (0.0, 0.0, 30.0) ); + playFx( level.bots_bloodfx,ent.origin + (0.0, 0.0, 30.0) ); self playSound("melee_knife_hit_body"); } else diff --git a/mods/bots/maps/mp/bots/_bot_script.gsc b/userraw/maps/mp/bots/_bot_script.gsc similarity index 100% rename from mods/bots/maps/mp/bots/_bot_script.gsc rename to userraw/maps/mp/bots/_bot_script.gsc diff --git a/mods/bots/maps/mp/bots/_bot_utility.gsc b/userraw/maps/mp/bots/_bot_utility.gsc similarity index 100% rename from mods/bots/maps/mp/bots/_bot_utility.gsc rename to userraw/maps/mp/bots/_bot_utility.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/_custom_map.gsc b/userraw/maps/mp/bots/waypoints/_custom_map.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/_custom_map.gsc rename to userraw/maps/mp/bots/waypoints/_custom_map.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/afghan.gsc b/userraw/maps/mp/bots/waypoints/afghan.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/afghan.gsc rename to userraw/maps/mp/bots/waypoints/afghan.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/afghancaves.gsc b/userraw/maps/mp/bots/waypoints/afghancaves.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/afghancaves.gsc rename to userraw/maps/mp/bots/waypoints/afghancaves.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/afghanchase.gsc b/userraw/maps/mp/bots/waypoints/afghanchase.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/afghanchase.gsc rename to userraw/maps/mp/bots/waypoints/afghanchase.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/airport.gsc b/userraw/maps/mp/bots/waypoints/airport.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/airport.gsc rename to userraw/maps/mp/bots/waypoints/airport.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/arcadia.gsc b/userraw/maps/mp/bots/waypoints/arcadia.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/arcadia.gsc rename to userraw/maps/mp/bots/waypoints/arcadia.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/bailout.gsc b/userraw/maps/mp/bots/waypoints/bailout.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/bailout.gsc rename to userraw/maps/mp/bots/waypoints/bailout.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/bloc.gsc b/userraw/maps/mp/bots/waypoints/bloc.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/bloc.gsc rename to userraw/maps/mp/bots/waypoints/bloc.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/bog.gsc b/userraw/maps/mp/bots/waypoints/bog.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/bog.gsc rename to userraw/maps/mp/bots/waypoints/bog.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/boneyard.gsc b/userraw/maps/mp/bots/waypoints/boneyard.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/boneyard.gsc rename to userraw/maps/mp/bots/waypoints/boneyard.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/bridge.gsc b/userraw/maps/mp/bots/waypoints/bridge.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/bridge.gsc rename to userraw/maps/mp/bots/waypoints/bridge.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/burgertown.gsc b/userraw/maps/mp/bots/waypoints/burgertown.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/burgertown.gsc rename to userraw/maps/mp/bots/waypoints/burgertown.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/carnival.gsc b/userraw/maps/mp/bots/waypoints/carnival.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/carnival.gsc rename to userraw/maps/mp/bots/waypoints/carnival.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/cliffhanger.gsc b/userraw/maps/mp/bots/waypoints/cliffhanger.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/cliffhanger.gsc rename to userraw/maps/mp/bots/waypoints/cliffhanger.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/contingency.gsc b/userraw/maps/mp/bots/waypoints/contingency.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/contingency.gsc rename to userraw/maps/mp/bots/waypoints/contingency.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/crash.gsc b/userraw/maps/mp/bots/waypoints/crash.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/crash.gsc rename to userraw/maps/mp/bots/waypoints/crash.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/crossfire.gsc b/userraw/maps/mp/bots/waypoints/crossfire.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/crossfire.gsc rename to userraw/maps/mp/bots/waypoints/crossfire.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/dcburning.gsc b/userraw/maps/mp/bots/waypoints/dcburning.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/dcburning.gsc rename to userraw/maps/mp/bots/waypoints/dcburning.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/dcemp.gsc b/userraw/maps/mp/bots/waypoints/dcemp.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/dcemp.gsc rename to userraw/maps/mp/bots/waypoints/dcemp.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/derail.gsc b/userraw/maps/mp/bots/waypoints/derail.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/derail.gsc rename to userraw/maps/mp/bots/waypoints/derail.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/downtown.gsc b/userraw/maps/mp/bots/waypoints/downtown.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/downtown.gsc rename to userraw/maps/mp/bots/waypoints/downtown.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/estate.gsc b/userraw/maps/mp/bots/waypoints/estate.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/estate.gsc rename to userraw/maps/mp/bots/waypoints/estate.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/estatesp.gsc b/userraw/maps/mp/bots/waypoints/estatesp.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/estatesp.gsc rename to userraw/maps/mp/bots/waypoints/estatesp.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/favela.gsc b/userraw/maps/mp/bots/waypoints/favela.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/favela.gsc rename to userraw/maps/mp/bots/waypoints/favela.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/favelaescape.gsc b/userraw/maps/mp/bots/waypoints/favelaescape.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/favelaescape.gsc rename to userraw/maps/mp/bots/waypoints/favelaescape.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/favelasp.gsc b/userraw/maps/mp/bots/waypoints/favelasp.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/favelasp.gsc rename to userraw/maps/mp/bots/waypoints/favelasp.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/firingrange.gsc b/userraw/maps/mp/bots/waypoints/firingrange.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/firingrange.gsc rename to userraw/maps/mp/bots/waypoints/firingrange.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/fuel.gsc b/userraw/maps/mp/bots/waypoints/fuel.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/fuel.gsc rename to userraw/maps/mp/bots/waypoints/fuel.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/gulag.gsc b/userraw/maps/mp/bots/waypoints/gulag.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/gulag.gsc rename to userraw/maps/mp/bots/waypoints/gulag.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/highrise.gsc b/userraw/maps/mp/bots/waypoints/highrise.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/highrise.gsc rename to userraw/maps/mp/bots/waypoints/highrise.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/hunted.gsc b/userraw/maps/mp/bots/waypoints/hunted.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/hunted.gsc rename to userraw/maps/mp/bots/waypoints/hunted.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/invasion.gsc b/userraw/maps/mp/bots/waypoints/invasion.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/invasion.gsc rename to userraw/maps/mp/bots/waypoints/invasion.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/karachi.gsc b/userraw/maps/mp/bots/waypoints/karachi.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/karachi.gsc rename to userraw/maps/mp/bots/waypoints/karachi.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/killhouse.gsc b/userraw/maps/mp/bots/waypoints/killhouse.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/killhouse.gsc rename to userraw/maps/mp/bots/waypoints/killhouse.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/museum.gsc b/userraw/maps/mp/bots/waypoints/museum.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/museum.gsc rename to userraw/maps/mp/bots/waypoints/museum.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/nuketown.gsc b/userraw/maps/mp/bots/waypoints/nuketown.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/nuketown.gsc rename to userraw/maps/mp/bots/waypoints/nuketown.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/oilrig.gsc b/userraw/maps/mp/bots/waypoints/oilrig.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/oilrig.gsc rename to userraw/maps/mp/bots/waypoints/oilrig.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/overgrown.gsc b/userraw/maps/mp/bots/waypoints/overgrown.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/overgrown.gsc rename to userraw/maps/mp/bots/waypoints/overgrown.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/pripyat.gsc b/userraw/maps/mp/bots/waypoints/pripyat.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/pripyat.gsc rename to userraw/maps/mp/bots/waypoints/pripyat.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/quarry.gsc b/userraw/maps/mp/bots/waypoints/quarry.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/quarry.gsc rename to userraw/maps/mp/bots/waypoints/quarry.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/roadkill.gsc b/userraw/maps/mp/bots/waypoints/roadkill.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/roadkill.gsc rename to userraw/maps/mp/bots/waypoints/roadkill.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/rundown.gsc b/userraw/maps/mp/bots/waypoints/rundown.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/rundown.gsc rename to userraw/maps/mp/bots/waypoints/rundown.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/rust.gsc b/userraw/maps/mp/bots/waypoints/rust.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/rust.gsc rename to userraw/maps/mp/bots/waypoints/rust.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/rustlong.gsc b/userraw/maps/mp/bots/waypoints/rustlong.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/rustlong.gsc rename to userraw/maps/mp/bots/waypoints/rustlong.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/salvage.gsc b/userraw/maps/mp/bots/waypoints/salvage.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/salvage.gsc rename to userraw/maps/mp/bots/waypoints/salvage.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/scrapyard.gsc b/userraw/maps/mp/bots/waypoints/scrapyard.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/scrapyard.gsc rename to userraw/maps/mp/bots/waypoints/scrapyard.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/shipment.gsc b/userraw/maps/mp/bots/waypoints/shipment.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/shipment.gsc rename to userraw/maps/mp/bots/waypoints/shipment.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/shipmentlong.gsc b/userraw/maps/mp/bots/waypoints/shipmentlong.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/shipmentlong.gsc rename to userraw/maps/mp/bots/waypoints/shipmentlong.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/skidrow.gsc b/userraw/maps/mp/bots/waypoints/skidrow.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/skidrow.gsc rename to userraw/maps/mp/bots/waypoints/skidrow.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/storm.gsc b/userraw/maps/mp/bots/waypoints/storm.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/storm.gsc rename to userraw/maps/mp/bots/waypoints/storm.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/strike.gsc b/userraw/maps/mp/bots/waypoints/strike.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/strike.gsc rename to userraw/maps/mp/bots/waypoints/strike.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/subbase.gsc b/userraw/maps/mp/bots/waypoints/subbase.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/subbase.gsc rename to userraw/maps/mp/bots/waypoints/subbase.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/terminal.gsc b/userraw/maps/mp/bots/waypoints/terminal.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/terminal.gsc rename to userraw/maps/mp/bots/waypoints/terminal.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/testmap.gsc b/userraw/maps/mp/bots/waypoints/testmap.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/testmap.gsc rename to userraw/maps/mp/bots/waypoints/testmap.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/trailerpark.gsc b/userraw/maps/mp/bots/waypoints/trailerpark.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/trailerpark.gsc rename to userraw/maps/mp/bots/waypoints/trailerpark.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/trainer.gsc b/userraw/maps/mp/bots/waypoints/trainer.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/trainer.gsc rename to userraw/maps/mp/bots/waypoints/trainer.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/underpass.gsc b/userraw/maps/mp/bots/waypoints/underpass.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/underpass.gsc rename to userraw/maps/mp/bots/waypoints/underpass.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/vacant.gsc b/userraw/maps/mp/bots/waypoints/vacant.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/vacant.gsc rename to userraw/maps/mp/bots/waypoints/vacant.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/wasteland.gsc b/userraw/maps/mp/bots/waypoints/wasteland.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/wasteland.gsc rename to userraw/maps/mp/bots/waypoints/wasteland.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/wetwork.gsc b/userraw/maps/mp/bots/waypoints/wetwork.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/wetwork.gsc rename to userraw/maps/mp/bots/waypoints/wetwork.gsc diff --git a/mods/bots/maps/mp/bots/waypoints/whitehouse.gsc b/userraw/maps/mp/bots/waypoints/whitehouse.gsc similarity index 100% rename from mods/bots/maps/mp/bots/waypoints/whitehouse.gsc rename to userraw/maps/mp/bots/waypoints/whitehouse.gsc diff --git a/mods/bots/scripts/bots.gsc b/userraw/scripts/bots.gsc similarity index 100% rename from mods/bots/scripts/bots.gsc rename to userraw/scripts/bots.gsc diff --git a/z_client.bat b/z_client.bat new file mode 100644 index 0000000..962e81f --- /dev/null +++ b/z_client.bat @@ -0,0 +1 @@ +start iw4x.exe -nosteam +set r_fullscreen "1" +set r_monitor "0" +set drawlagometer "0" +set cg_drawfps "0" +set r_mode "1920x1080" \ No newline at end of file diff --git a/z_server.bat b/z_server.bat index 3dbfde9..734ebe4 100644 --- a/z_server.bat +++ b/z_server.bat @@ -1 +1 @@ -start iw4x.exe -dedicated +set sv_lanonly "1" +set net_port "28960" +set fs_game "mods/bots" +exec server.cfg +map_rotate \ No newline at end of file +start iw4x.exe -dedicated +set net_port "28960" +exec server.cfg +map_rotate \ No newline at end of file diff --git a/z_serverdev.bat b/z_serverdev.bat index abc989e..92958e7 100644 --- a/z_serverdev.bat +++ b/z_serverdev.bat @@ -1 +1 @@ -start iw4x.exe -dedicated -console +set sv_lanonly "1" +set fs_game "mods/dev" +set net_port "28960" +set developer "1" +set developer_script "1" +set scr_game_spectatetype "2" scr_war_scorelimit "0" +set sv_cheats "1" +set logfile "2" +devmap mp_rust \ No newline at end of file +start iw4x.exe -dedicated -console +set sv_lanonly "1" +set fs_game "mods/dev" +set net_port "28960" +set developer "1" +set developer_script "1" +set scr_game_spectatetype "2" scr_war_scorelimit "0" +set sv_cheats "1" +set logfile "2" +set bots_manage_add "8" +devmap mp_rust \ No newline at end of file