From 75faaaa02675d42bf99efee322d91874c0abd9e2 Mon Sep 17 00:00:00 2001 From: Bukz Date: Wed, 8 Jun 2011 23:57:45 +0000 Subject: [PATCH] some isInZone simplification/updates git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6523 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- config/menus_bot.cfg | 6 +++--- config/survival.cfg | 15 +++++---------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/config/menus_bot.cfg b/config/menus_bot.cfg index 19befdab..5c68482b 100644 --- a/config/menus_bot.cfg +++ b/config/menus_bot.cfg @@ -106,12 +106,12 @@ newmenu "team enemies" genenemyitems "4 8 12 16 24 32" 1 survSetsList = "survNumBots survBotsToAdd timeBetChkPts timeUntilTele survMaxBots" -survDifList = [ "10 1 60000 120000 20" "12 1 45000 90000 30" "14 2 30000 45000 50" "16 5 10000 30000 50" ] -survSetDif = [ survDifficulty = $arg1; tmpSurvCtr = 0; loop sdl 5 [ (at $survSetsList $sdl) = (at (at $survDifList $survDifficulty) $tmpSurvCtr); += tmpSurvCtr 1 ] ] +survDifList = [ "6 1 60000 90000 20" "8 2 45000 60000 30" "10 3 30000 45000 40" "12 5 10000 20000 50" ] +survSetDif = [ if (checkrange $arg1 0 3) [ survDifficulty = $arg1; loop sdl 5 [ (at $survSetsList $sdl) = (at (at $survDifList $survDifficulty) $sdl) ] ] [ sleep 1000 [ echo (c 3)Error: (c 5)invalid difficulty, defaulting to (genSurvDifStr 0) ] 1; survSetDif 0 ]; nonSurvDefaults = 0 ] newmenu "Survival Mode" menuitemslider "Map: " 0 28 "$survMap" 1 [ "ac_aqueous" "ac_arabian" "ac_arctic" "ac_arid" "ac_complex" "ac_depot" "ac_desert" "ac_desert2" "ac_desert3" "ac_douze" "ac_edifice" "ac_elevation" "ac_gothic" "ac_iceroad" "ac_industrial" "ac_ingress" "ac_keller" "ac_mines" "ac_outpost" "ac_power" "ac_rattrap" "ac_scaffold" "ac_shine" "ac_snow" "ac_stellar" "ac_sunset" "ac_toxic" "ac_urban" "ac_werk" ] [ survMap = $arg1 ] -menuitemslider "Difficulty: " 0 3 "$survDifficulty" 1 [ "easy" "intermediate" "hard" "impossible" ] [ survSetDif $arg1; nonSurvDefaults = 0 ] +menuitemslider "Difficulty: " 0 3 "$survDifficulty" 1 [ "easy" "intermediate" "hard" "impossible" ] [ survSetDif $arg1 ] menuitem [] -1 menuitem " Customize" [ showmenu "Survival Mode - Customize" ] menuitem " Start!" [ survival (at $defaultmaps $survMap) ] diff --git a/config/survival.cfg b/config/survival.cfg index 98c9e174..be5649e0 100644 --- a/config/survival.cfg +++ b/config/survival.cfg @@ -20,12 +20,13 @@ resetSurvAliases; if (! (checkalias afterinit)) [ afterinit = "" ]; if (! (strst genSurvDifStr = [ if $nonSurvDefaults [ result "[CUSTOM]" ] [ - result (at (concat (concatword (c 0) "[EASY]") (concatword (c 2) "[INTERMEDIATE]") (concatword (c 9) "[HARD]") (concatword (c 7) "[IMPOSSIBLE]")) $survDifficulty) + tmpstrlist = (concat (concatword (c 0) "[EASY]") (concatword (c 2) "[INTERMEDIATE]") (concatword (c 9) "[HARD]") (concatword (c 7) "[IMPOSSIBLE]")) + if (&& $numargs (checkrange $arg1 0 3)) [ result (at $tmpstrlist $arg1) ] [ result (at $tmpstrlist $survDifficulty) ] ] ] survival = [ - kickallbots; if (! (curteam)) [ team RVSF ]; if (> $numargs 1) [ survSetDif $arg2; nonSurvDefaults = 0 ] + kickallbots; if (! (curteam)) [ team RVSF ]; if (> $numargs 1) [ survSetDif $arg2 ] tmpSurvSets = $survNumBots; curSurvDifficulty = 0; survLastKill = ""; survTimeBetKills = ""; resetSurvAliases if (! (checkalias onKill)) [ onKill = "" ] if (! (strstr $onKill survKills)) [ @@ -110,13 +111,7 @@ findCenter = [ teleportPlayer = [ if (! (alive)) [ attack ]; if (!= $gamespeed 100) [ gamespeed 100 ]; survTeleported = 1; findCenter; if (! $editing) [ edittoggle ]; go_to (at $tmpZoneCenter 0) (at $tmpZoneCenter 1); sleep 25 [ edittoggle ] ] -isInZone = [ - if (&& (&& (>= (player1 x) (at $zone 0)) (>= (player1 y) (at $zone 2))) (&& (<= (player1 x) (at $zone 1)) (<= (player1 y) (at $zone 3)))) [ - result 1 - ] [ - result 0 - ] -] +isInZone = [ if (&& (checkrange (player1 x) (at $zone 0) (at $zone 1)) (checkrange (player1 y) (at $zone 2) (at $zone 3))) [ result 1 ] [ result 0 ] ] checkzone = [ if (! $survIsFinished) [ @@ -161,6 +156,6 @@ endSurvival = [ ] // List of aliases that need to be cleared from saved.cfg on quit: -survAliases = (concat $survResetAliases "backInZone checkzone curSurvDifficulty endSurvival finalSurvMillis genSurvDifStr increaseDifficulty isInZone midZoneX midZoneY onKill resetSurvAliases setOfcZones setzone startOBCount startOBMillis startSurvival survLastKill survMapIndex survOfcZones survTimeBetKills tmpSCtr tmpSurvCtr tmpSurvInt tmpSurvSets tmp_sum tmp_survstr tmpSurvZone tmpZoneCenter zone aliasinit survResetAliases survAliases") +survAliases = (concat $survResetAliases "backInZone checkzone curSurvDifficulty endSurvival finalSurvMillis genSurvDifStr increaseDifficulty isInZone midZoneX midZoneY onKill resetSurvAliases setOfcZones setzone startOBCount startOBMillis startSurvival survLastKill survMapIndex survOfcZones survTimeBetKills tmpSCtr tmpstrlist tmpSurvCtr tmpSurvInt tmpSurvSets tmp_sum tmp_survstr tmpSurvZone tmpZoneCenter zone aliasinit survResetAliases survAliases") addListOnQuit $survAliases \ No newline at end of file