Bump r3553

info.json

@@ -1 +1 @@
-{"revision":3519,"launchTarget":"bin/plutonium-launcher-win32.exe"}
+{"revision":3553,"launchTarget":"bin/plutonium-launcher-win32.exe"}

launcher/assets/css/chunk-11e7bc78.a8fa0530.css

@@ -0,0 +1 @@
+button[data-v-e0882984]:focus,input[data-v-e0882984]:focus,select[data-v-e0882984]:focus,textarea[data-v-e0882984]:focus{outline:none}.w-notify-notification[data-v-e0882984]{position:absolute;left:50%;transofrm:translateX(-50%)}pre[data-v-e0882984]{overflow-x:auto;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space:-o-pre-wrap;word-wrap:break-word}.vue-notification[data-v-e0882984]{font-size:20px!important}.float-left[data-v-e0882984]{float:left}.float-right[data-v-e0882984]{float:right}.cursor-pointer[data-v-e0882984]{cursor:pointer}.clickable[data-v-e0882984]{position:relative}.clickable[data-v-e0882984]:hover{cursor:pointer;color:#fff;-webkit-transition:all .25s ease-in-out;transition:all .25s ease-in-out}.clickable:hover:not(.no-backdrop-highlight).clickable[data-v-e0882984]:hover:after{top:0;bottom:0;left:0;right:0;content:"";position:absolute;background-color:hsla(0,0%,100%,.15);z-index:1000;-webkit-transition:all .25s ease-in-out;transition:all .25s ease-in-out}.clickable:hover.round-highlight[data-v-e0882984]:after{border-radius:100%}.filePath[data-v-e0882984]{background-color:#262626;padding-top:13px;padding-left:12px;height:39px;position:relative;text-overflow:ellipsis;white-space:nowrap;overflow:hidden}.filePath .text[data-v-e0882984]{max-width:calc(100% - 1000px)}.filePath .button[data-v-e0882984]{position:absolute;top:0;bottom:0;right:0;width:100px;background-color:#4c4c4c;text-align:center;padding-top:13px}.verify[data-v-e0882984]{position:relative;white-space:nowrap}.verify .button[data-v-e0882984]{width:150px;height:39px;background-color:#4c4c4c;padding-top:13px;text-align:center}.header[data-v-e0882984]{font-family:politica,sans-serif;font-weight:700;margin-bottom:8px}.header[data-v-e0882984]:nth-child(n+2){margin-top:16px}.content[data-v-e0882984]{padding:16px}.footer[data-v-e0882984]{position:fixed;bottom:0;right:0;padding:16px}

launcher/assets/js/chunk-11e7bc78.2d0f245a.js

@@ -0,0 +1,2 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-11e7bc78"],{"63ee":function(t,e,a){"use strict";a("ca01")},"67f8":function(t,e,a){"use strict";a.r(e);var i=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",[a("div",{staticClass:"content"},[a("div",{staticClass:"header"},[a("div",{staticClass:"title"},[t._v(" "+t._s(t.game.title)+" ")]),t._v(" Game Settings ")]),a("div",{staticClass:"header"},[t._v(" Game Path ")]),a("div",{staticClass:"filePath"},[a("div",{staticClass:"text"},[t._v(" "+t._s(t.path)+" ")]),a("div",{staticClass:"button clickable",on:{click:function(e){return t.setGameDir()}}},[t._v(" Select Dir ")])]),a("div",{staticClass:"header"},[t._v(" Steam ")]),a("div",{staticClass:"verify"},[a("div",{staticClass:"button clickable",on:{click:function(e){return t.verifySteam()}}},[t._v(" Verify Ownership ")])])])])},s=[],n=a("5530"),c=(a("7db0"),a("d3b7"),a("2f62")),r=a("9193"),h={data:function(){return{gamePath:null}},computed:Object(n["a"])(Object(n["a"])({},Object(c["b"])({user:"authentication/user",gameTag:"ui/peekInfo"})),{},{game:function(){return r["a"].find(this.gameTag)},path:function(){var t=38,e=this.gamePath;if(e&&e.length>t){var a=e.length-t,i=e?Math.floor(.45*a):0;return"..."+e.substr(i)}return e}}),mounted:function(){this.refreshGamePath()},methods:{setGameDir:function(){var t=this;this.$store.dispatch("entities/games/selectDir",this.gameTag).then((function(e){t.gamePath=e||t.gamePath}))},refreshGamePath:function(){this.gamePath=launcherGetGameFolder(this.gameTag)},verifySteam:function(){this.$store.dispatch("entities/games/verifyOwnership",this.gameTag)}}},u=h,l=(a("63ee"),a("2877")),o=Object(l["a"])(u,i,s,!1,null,"e0882984",null);e["default"]=o.exports},ca01:function(t,e,a){}}]);
+//# sourceMappingURL=chunk-11e7bc78.2d0f245a.js.map

launcher/assets/js/chunk-4f6208b2.22635986.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["webpack:///./src/layouts/blank.vue?0161","webpack:///src/layouts/blank.vue","webpack:///./src/layouts/blank.vue?4b23","webpack:///./src/layouts/blank.vue","webpack:///./src/layouts/blank.vue?0aa1"],"names":["render","_vm","this","_h","$createElement","_c","_self","class","backgroundClass","attrs","staticClass","staticRenderFns","computed","path","includes","component"],"mappings":"uHAAA,IAAIA,EAAS,WAAa,IAAIC,EAAIC,KAASC,EAAGF,EAAIG,eAAmBC,EAAGJ,EAAIK,MAAMD,IAAIF,EAAG,OAAOE,EAAG,MAAM,CAACE,MAAMN,EAAIO,gBAAgBC,MAAM,CAAC,GAAK,QAAQ,CAACJ,EAAG,MAAM,CAACK,YAAY,QAAQ,CAACL,EAAG,gBAAgB,MACvMM,EAAkB,GCOP,G,oBAAA,CACbC,SAAUA,CACRJ,gBADJ,WAEM,IAAN,mBACM,OAAIK,EAAKC,SAAS,OAAe,MAC7BD,EAAKC,SAAS,OAAe,MAC1B,UCdkU,I,wBCQ3UC,EAAY,eACd,EACAf,EACAW,GACA,EACA,KACA,WACA,MAIa,aAAAI,E,2CCnBf,W","file":"js/chunk-4f6208b2.22635986.js","sourcesContent":["var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{class:_vm.backgroundClass,attrs:{\"id\":\"app\"}},[_c('div',{staticClass:\"main\"},[_c('router-view')],1)])}\nvar staticRenderFns = []\n\nexport { render, staticRenderFns }","<template>\r\n  <div id=\"app\" :class=\"backgroundClass\">\r\n    <div class=\"main\">\r\n      <router-view />\r\n    </div>\r\n  </div>\r\n</template>\r\n<script>\r\nexport default {\r\n  computed: {\r\n    backgroundClass () {\r\n      const path = this.$route.path\r\n      if (path.includes('mw3')) return 'mw3'\r\n      if (path.includes('bo2')) return 'bo2'\r\n      return 'mw3'\r\n    }\r\n  }\r\n}\r\n</script>\r\n<style lang=\"stylus\" scoped>\r\n#app\r\n  height 100vh\r\n  width 100vw\r\n  &::before\r\n    content \"\"\r\n    background-repeat no-repeat\r\n    background-size cover\r\n    background-position center bottom\r\n    position absolute\r\n    top 0\r\n    left 0\r\n    right 0\r\n    bottom 0\r\n    opacity 0.25\r\n    transition: background-image .40s ease-in-out;\r\n    z-index -1\r\n    background-image url('~assets/login_bg.png')\r\n</style>\r\n","import mod from \"-!../../node_modules/cache-loader/dist/cjs.js??ref--13-0!../../node_modules/thread-loader/dist/cjs.js!../../node_modules/babel-loader/lib/index.js!../../node_modules/cache-loader/dist/cjs.js??ref--1-0!../../node_modules/vue-loader/lib/index.js??vue-loader-options!./blank.vue?vue&type=script&lang=js&\"; export default mod; export * from \"-!../../node_modules/cache-loader/dist/cjs.js??ref--13-0!../../node_modules/thread-loader/dist/cjs.js!../../node_modules/babel-loader/lib/index.js!../../node_modules/cache-loader/dist/cjs.js??ref--1-0!../../node_modules/vue-loader/lib/index.js??vue-loader-options!./blank.vue?vue&type=script&lang=js&\"","import { render, staticRenderFns } from \"./blank.vue?vue&type=template&id=53a34254&scoped=true&\"\nimport script from \"./blank.vue?vue&type=script&lang=js&\"\nexport * from \"./blank.vue?vue&type=script&lang=js&\"\nimport style0 from \"./blank.vue?vue&type=style&index=0&id=53a34254&lang=stylus&scoped=true&\"\n\n\n/* normalize component */\nimport normalizer from \"!../../node_modules/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n  script,\n  render,\n  staticRenderFns,\n  false,\n  null,\n  \"53a34254\",\n  null\n  \n)\n\nexport default component.exports","export * from \"-!../../node_modules/mini-css-extract-plugin/dist/loader.js??ref--12-oneOf-1-0!../../node_modules/css-loader/dist/cjs.js??ref--12-oneOf-1-1!../../node_modules/vue-loader/lib/loaders/stylePostLoader.js!../../node_modules/postcss-loader/src/index.js??ref--12-oneOf-1-2!../../node_modules/stylus-loader/index.js??ref--12-oneOf-1-3!../../node_modules/cache-loader/dist/cjs.js??ref--1-0!../../node_modules/vue-loader/lib/index.js??vue-loader-options!./blank.vue?vue&type=style&index=0&id=53a34254&lang=stylus&scoped=true&\""],"sourceRoot":""}

launcher/assets/precache-manifest.ffe7e7296577571e1374ea47a276a68a.js

@@ -0,0 +1,166 @@
+self.__precacheManifest = (self.__precacheManifest || []).concat([
+  {
+    "revision": "fa7ec0a008b8b84f4d55",
+    "url": "css/app.5b0a1e7d.css"
+  },
+  {
+    "revision": "1db33393287b08b651af",
+    "url": "css/auth.4a6b27be.css"
+  },
+  {
+    "revision": "3e7bd25f7ab79efb263d",
+    "url": "css/chunk-11e7bc78.a8fa0530.css"
+  },
+  {
+    "revision": "32f058dcacc7c8ec9c93",
+    "url": "css/chunk-4f6208b2.def6a674.css"
+  },
+  {
+    "revision": "e68241c11dfe686e5120",
+    "url": "css/chunk-520ec366.3f565a45.css"
+  },
+  {
+    "revision": "64d7930daade3538fae7",
+    "url": "css/chunk-d15685cc.29ddedaf.css"
+  },
+  {
+    "revision": "94237cc6dd86c40ca16b",
+    "url": "css/games.b0791aa4.css"
+  },
+  {
+    "revision": "849d500f76d7850d3a46058e457ed5a5",
+    "url": "img/avatar-default.849d500f.jpg"
+  },
+  {
+    "revision": "fa555ecb0c62c09f285090ad08223a83",
+    "url": "img/iw5.fa555ecb.jpg"
+  },
+  {
+    "revision": "804ee0068586c992ba3b54bf66995971",
+    "url": "img/iw5_icon.804ee006.png"
+  },
+  {
+    "revision": "9bd3a45dbbc3f8d6452e720e38d886b5",
+    "url": "img/iw5_logo.9bd3a45d.png"
+  },
+  {
+    "revision": "62db7e114bbcdb7eddb6aac2bce0ec51",
+    "url": "img/login_bg.62db7e11.png"
+  },
+  {
+    "revision": "e77924d1eb12ac9e6c9d93d718a987b3",
+    "url": "img/t4mp.e77924d1.jpg"
+  },
+  {
+    "revision": "84a265b71adf15ada388eb8fcb2ea64c",
+    "url": "img/t4mp_icon.84a265b7.png"
+  },
+  {
+    "revision": "59e4aebdb4b97380adc358981ab29add",
+    "url": "img/t4mp_logo.59e4aebd.png"
+  },
+  {
+    "revision": "20d703034854d0fe7c5206920f01c0ab",
+    "url": "img/t4sp.20d70303.jpg"
+  },
+  {
+    "revision": "1e1987d84038aae38610cab9c999868d",
+    "url": "img/t4sp_icon.1e1987d8.png"
+  },
+  {
+    "revision": "3b95821fdcfda7fddfa9c7deb752b0d7",
+    "url": "img/t4sp_logo.3b95821f.png"
+  },
+  {
+    "revision": "a4c26415540278cc3c9886d360819716",
+    "url": "img/t5mp.a4c26415.jpg"
+  },
+  {
+    "revision": "215e7d942e2aec310bb6a617fa6a523f",
+    "url": "img/t5mp_icon.215e7d94.png"
+  },
+  {
+    "revision": "ab399f8ffd1d1bd26ba2af1f8f6ade8c",
+    "url": "img/t5mp_logo.ab399f8f.png"
+  },
+  {
+    "revision": "463f63afdb30d8193d8288e8474db8a2",
+    "url": "img/t5sp.463f63af.jpg"
+  },
+  {
+    "revision": "f951b0ced18db7f719c74cc4d98ec0f9",
+    "url": "img/t5sp_icon.f951b0ce.png"
+  },
+  {
+    "revision": "923e41065e3995b2b8a44265f12523b7",
+    "url": "img/t5sp_logo.923e4106.png"
+  },
+  {
+    "revision": "bf54e4370841e6353563854140089e1a",
+    "url": "img/t6mp.bf54e437.jpg"
+  },
+  {
+    "revision": "e4fc734b7e536d945d9fafaea2ea8e52",
+    "url": "img/t6mp_logo.e4fc734b.png"
+  },
+  {
+    "revision": "6ff8e1f7c0889c0ef56394ccb8cf67e3",
+    "url": "img/t6zm.6ff8e1f7.jpg"
+  },
+  {
+    "revision": "992fa331f512b4cb45b83e0720a9a5c5",
+    "url": "img/t6zm_icon.992fa331.png"
+  },
+  {
+    "revision": "6935c7f41ac75f5a14882b4a48bf7143",
+    "url": "img/t6zm_logo.6935c7f4.png"
+  },
+  {
+    "revision": "489744ec9237a5b1d189d9d1f37173ae",
+    "url": "index.html"
+  },
+  {
+    "revision": "fa7ec0a008b8b84f4d55",
+    "url": "js/app.880bc8f0.js"
+  },
+  {
+    "revision": "1db33393287b08b651af",
+    "url": "js/auth.688202d0.js"
+  },
+  {
+    "revision": "3e7bd25f7ab79efb263d",
+    "url": "js/chunk-11e7bc78.2d0f245a.js"
+  },
+  {
+    "revision": "32f058dcacc7c8ec9c93",
+    "url": "js/chunk-4f6208b2.22635986.js"
+  },
+  {
+    "revision": "e68241c11dfe686e5120",
+    "url": "js/chunk-520ec366.59e39e11.js"
+  },
+  {
+    "revision": "64d7930daade3538fae7",
+    "url": "js/chunk-d15685cc.589056ed.js"
+  },
+  {
+    "revision": "a86b0bef0e10c297ab3f",
+    "url": "js/chunk-vendors.d77b8b8e.js"
+  },
+  {
+    "revision": "94237cc6dd86c40ca16b",
+    "url": "js/games.2559cd9a.js"
+  },
+  {
+    "revision": "515e59f16e9296205663258d761e2471",
+    "url": "manifest.json"
+  },
+  {
+    "revision": "644c032e7a0f872e8f1b34598b3db70d",
+    "url": "nix-bridge.js"
+  },
+  {
+    "revision": "735ab4f94fbcd57074377afca324c813",
+    "url": "robots.txt"
+  }
+]);

storage/t4/raw/scripts/mp/callbacks.gsc

@@ -0,0 +1,20 @@
+#include common_scripts\utility;
+#include maps\mp\_utility;
+
+main()
+{
+	level.callbackActorSpawned = ::Callback_ActorSpawned;
+}
+
+Callback_ActorSpawned()
+{
+/*
+	PrintConsole( "Callback_ActorSpawned:" );
+	PrintConsole( "self.classname: " + self.classname );
+*/
+}
+
+CodeCallback_ActorSpawned()
+{
+	self [[level.callbackActorSpawned]]();
+}

storage/t4/raw/scripts/sp/zm_spawn_fix.gsc

@@ -44,6 +44,22 @@ main()
 
 		if ( isDefined( all_players_connected ) )
 			replaceFunc( all_players_connected, ::all_players_connected_func );
+
+
+		// fix monkeybomb ent leak
+		check_point_in_active_zone = getFunction( "maps/_zombiemode_utility", "check_point_in_active_zone" );
+
+		if ( isDefined( check_point_in_active_zone ) )
+			replaceFunc( check_point_in_active_zone, ::check_point_in_active_zone_func );
+
+		// fix riser ent leak
+		do_zombie_rise = getFunction( "maps/_zombiemode_spawner", "do_zombie_rise" );
+
+		if ( isDefined( do_zombie_rise ) )
+			replaceFunc( do_zombie_rise, ::do_zombie_rise_func );
+
+
+		// scripters could 'waittillframeend' in their 'main' to replace these replacefuncs with their own if needed
 	}
 }
 
@@ -172,6 +188,56 @@ all_players_connected_func()
 	SetDvar( "all_players_are_connected", "1" );
 }
 
+fixRiserEntLeak()
+{
+	self waittill( "death" );
+
+	if ( isDefined( self.anchor ) )
+		self.anchor delete ();
+}
+
+do_zombie_rise_func()
+{
+	self thread fixRiserEntLeak();
+
+	func = getFunction( "maps/_zombiemode_spawner", "do_zombie_rise" );
+
+	if ( !isDefined( func ) )
+		return;
+
+	disableDetourOnce( func );
+	self [[func]]();
+}
+
+check_point_in_active_zone_func( origin )
+{
+	player_zones = GetEntArray( "player_zone", "script_noteworthy" );
+
+	if ( !isDefined( level.zones ) || !isDefined( player_zones ) )
+	{
+		return true;
+	}
+
+	scr_org = spawn( "script_origin", origin + ( 0, 0, 40 ) );
+	one_valid_zone = false;
+
+	for ( i = 0; i < player_zones.size; i++ )
+	{
+		if ( scr_org isTouching( player_zones[i] ) )
+		{
+			if ( isDefined( level.zones[player_zones[i].targetname] ) &&
+			    isDefined( level.zones[player_zones[i].targetname].is_enabled ) )
+			{
+				one_valid_zone = true;
+			}
+		}
+	}
+
+	scr_org delete ();
+
+	return one_valid_zone;
+}
+
 ammo_dialog_timer_func()
 {
 	level notify( "ammo_out" );