diff --git a/scripts/effects/sfx_bunny.script b/scripts/effects/sfx_bunny.script deleted file mode 100644 index aaab9cb1..00000000 --- a/scripts/effects/sfx_bunny.script +++ /dev/null @@ -1,55 +0,0 @@ -{ client_activate - - setcallback render enable - //local OWNER_IDX game.localplayer.eyepos - local EYE_POS game.localplayer.eyepos - local EYE_ANGS game.localplayer.viewangles - vectoradd EYE_POS $relpos(EYE_ANGS,$vec(0,20,28)) - dbg *** client_activate EYE_POS EYE_ANGS - cleffect tempent sprite bunny.spr EYE_POS setup_bunny update_bunny - callevent 20.0 remove_script - //playsound 0 10 ambience/the_horror1.wav - sound.play3d ambience/the_horror1.wav 10 EYE_POS -} - -{ game_prerender - - -} - -{ remove_script - removescript -} - -{ update_bunny - //local OWNER_IDX game.localplayer.viewmodel.active.id - local EYE_POS game.localplayer.eyepos - local EYE_ANGS game.localplayer.viewangles - vectoradd EYE_POS $relpos(EYE_ANGS,$vec(0,20,28)) - cleffect tempent set_current_prop origin EYE_POS - - local CUR_ALPHA game.tempent.fuser1 - add CUR_ALPHA 1 - if ( CUR_ALPHA > 255 ) local CUR_ALPHA 200 - cleffect tempent set_current_prop fuser1 CUR_ALPHA - cleffect tempent set_current_prop renderamt CUR_ALPHA - - //sprites rendered "glow" cannot scale -// local CUR_SCALE game.tempent.fuser1 -// add CUR_SCALE 0.5 -// cleffect tempent set_current_prop fuser1 CUR_SCALE -// cleffect tempent set_current_prop scale CUR_SCALE -} - -{ setup_bunny - cleffect tempent set_current_prop death_delay 19.0 - cleffect tempent set_current_prop fadeout lifetime - cleffect tempent set_current_prop framerate 30 - cleffect tempent set_current_prop frames 1 - cleffect tempent set_current_prop scale 0.1 - cleffect tempent set_current_prop rendermode texture - cleffect tempent set_current_prop renderamt 255 - cleffect tempent set_current_prop gravity 0 - cleffect tempent set_current_prop collide none - cleffect tempent set_current_prop fuser1 200 -} \ No newline at end of file diff --git a/scripts/player/externals.script b/scripts/player/externals.script index 558852e2..30832ff6 100644 --- a/scripts/player/externals.script +++ b/scripts/player/externals.script @@ -2917,19 +2917,6 @@ hud.addimgicon ent_me PARAM1 PARAM2 PARAM3 PARAM4 PARAM5 PARAM6 PARAM7 } -{ ext_shender_telfdoor - dbg ext_shender_telfdoor PLR_DID_SHENDER_EVENT - callevent ext_darkenbloom 2 - if !PLR_DID_SHENDER_EVENT - local WIN_ELF $get_by_name(telf_win) - if ( $get(WIN_ELF,isalive) ) - { - if $get(GAME_MASTER,scriptvar,'GM_BUNNY_KILLED') - setvard PLR_DID_SHENDER_EVENT 1 - callexternal WIN_ELF ext_bunny_comment - } -} - { ext_conflict conflictcheck } diff --git a/scripts/shender_east/game_master.script b/scripts/shender_east/game_master.script index d1841dcb..865bfa1a 100644 --- a/scripts/shender_east/game_master.script +++ b/scripts/shender_east/game_master.script @@ -36,11 +36,4 @@ if ( GM_SHENDER_EAST_TELECOUNT == 3 ) setorigin CUR_TARG $vec(1704,-3568,296) if ( GM_SHENDER_EAST_TELECOUNT == 4 ) setorigin CUR_TARG $vec(1656,-3568,296) if ( GM_SHENDER_EAST_TELECOUNT == 5 ) setorigin CUR_TARG $vec(1640,-3616,296) -} - -{ gm_shender_east_bunny - //dbg gm_shender_east_bunny PARAM1 PARAM2 $get(PARAM1,name) - infomsg PARAM1 "HOW COULD YOU!" "Poor bunny!" - setvard GM_BUNNY_KILLED 1 - clientevent new PARAM1 effects/sfx_bunny } \ No newline at end of file diff --git a/scripts/shender_east/map_startup.script b/scripts/shender_east/map_startup.script index 8de79c3a..f873d02e 100644 --- a/scripts/shender_east/map_startup.script +++ b/scripts/shender_east/map_startup.script @@ -3,13 +3,9 @@ { [shared] const MAP_NAME 'shender_east' - const MAP_WEATHER "clear;clear;clear;clear;clear;clear" const MAP_ALLOWNIGHT 1 - setvarg G_MAP_NAME "East Shender" - setvarg G_MAP_DESC "A frozen wasteland that borders The Wall." setvarg G_MAP_DIFF "Levels 25-40 / 500-1250hp" - setvarg G_WARN_HP 500 setvarg G_MORC_CHESTS 0 } diff --git a/scripts/shender_east/telf_win.script b/scripts/shender_east/telf_win.script index ef3427c5..0f28f4a2 100644 --- a/scripts/shender_east/telf_win.script +++ b/scripts/shender_east/telf_win.script @@ -117,9 +117,4 @@ repeatdelay 10.0 { repeatdelay 90.0 callexternal $get_by_name(telf_chest) chest_glow -} - -{ ext_bunny_comment - callevent chat_now "Now... Where has my bunny Hazel run off to?" 5.0 convo_unarmed_norm none add_to_que - playsound 0 10 scientist/cough.wav } \ No newline at end of file