Revert "Revert "Merge branch 'MSR-Alpha' into MSR-Scripts""

greatguys1 · greatguys1 · commit fe583a6ec059 · 2022-11-20T21:52:20.000-08:00
This reverts commit c8e5189.
diff --git a/scripts/beta_date.script b/scripts/beta_date.script
@@ -1,3 +1,3 @@
 { 
-	const BETA_TIMESTAMP "RELEASE: Sun 11/20/2022 20:34:55.24" 
+	const BETA_TIMESTAMP "RELEASE: Sun 11/20/2022 21:19:47.72" 
 } 
diff --git a/scripts/items/proj_web.script b/scripts/items/proj_web.script
@@ -46,7 +46,11 @@
 
 { game_projectile_hitnpc
 	if ( $get(PARAM1,isplayer) ) local L_PVP game.pvp
-	if L_PVP
+	if ( $get(ent_expowner,isplayer) )
+	{
+		if ( !L_PVP ) exitevent
+	}
+
 	if $get(ent_expowner,relationship,PARAM1) equals enemy
 	if !$get(PARAM1,scriptvar,'COCOON_ATTACHED')
 	local L_DOT -1

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- const BETA_TIMESTAMP "RELEASE: Sun 11/20/2022 20:34:55.24"`
	`2`	`+ const BETA_TIMESTAMP "RELEASE: Sun 11/20/2022 21:19:47.72"`
`3`	`3`	`}`