kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updates/MAXHHITS changed to 6000 (was blocking ac_edifice @ 5,776)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@6500 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Bukz
2011-06-05 07:32:58 +00:00
parent 0e212b7b6c
commit 175fb7ae8e
5 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/defaults.cfg
+2 -1
View File
@@ -35,4 +35,5 @@ survBotsToAdd = 1
timeBetChkPts = 60000 timeBetChkPts = 60000
timeUntilTele = 120000 timeUntilTele = 120000
survMaxBots = 32 survMaxBots = 32
spamSurvMsgs = 0 spamSurvMsgs = 0
nonSurvDefaults = 0
config/menus_bot.cfg
+6 -6
View File
@@ -108,17 +108,17 @@ survDifList = [ "10 1 60000 120000 20" "12 1 45000 90000 30" "14 2 30000 45000 5
newmenu "Survival Mode" 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 "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" ] [ survDifficulty = $arg1; tmpSurvCtr = 0; loop sdl 5 [ (at $survSetsList $sdl) = (at (at $survDifList $survDifficulty) $tmpSurvCtr); += tmpSurvCtr 1 ] ] menuitemslider "Difficulty: " 0 3 "$survDifficulty" 1 [ "easy" "intermediate" "hard" "impossible" ] [ survDifficulty = $arg1; tmpSurvCtr = 0; loop sdl 5 [ (at $survSetsList $sdl) = (at (at $survDifList $survDifficulty) $tmpSurvCtr); += tmpSurvCtr 1 ]; nonSurvDefaults = 0 ]
menuitem [] -1 menuitem [] -1
menuitem " Customize" [ showmenu "Survival Mode - Customize" ] menuitem " Customize" [ showmenu "Survival Mode - Customize" ]
menuitem " Start!" [ survival (at $defaultmaps $survMap) ] menuitem " Start!" [ survival (at $defaultmaps $survMap) ]
newmenu "Survival Mode - Customize" newmenu "Survival Mode - Customize"
menuitemslider "# of bots to spawn on start: " 6 20 "$survNumBots" 1 [] [ survNumBots = $arg1 ] menuitemslider "# of bots to spawn on start: " 6 20 "$survNumBots" 1 [] [ survNumBots = $arg1; nonSurvDefaults = 1 ]
menuitemslider "# of bots to spawn at checkpoints: " 1 5 "$survBotsToAdd" 1 [] [ survBotsToAdd = $arg1 ] menuitemslider "# of bots to spawn at checkpoints: " 1 5 "$survBotsToAdd" 1 [] [ survBotsToAdd = $arg1; nonSurvDefaults = 1 ]
menuitemslider "# of milliseconds between checkpoints: " 10000 120000 "$timeBetChkPts" 10000 [] [ timeBetChkPts = $arg1 ] menuitemslider "# of milliseconds between checkpoints: " 10000 120000 "$timeBetChkPts" 10000 [] [ timeBetChkPts = $arg1; nonSurvDefaults = 1 ]
menuitemslider "# of milliseconds before teleporting: " 10000 180000 "$timeUntilTele" 10000 [] [ timeUntilTele = $arg1 ] menuitemslider "# of milliseconds before teleporting: " 10000 180000 "$timeUntilTele" 10000 [] [ timeUntilTele = $arg1; nonSurvDefaults = 1 ]
menuitemslider "Maximum # of bots in survival mode: " 10 50 "$survMaxBots" 2 [] [ survMaxBots = $arg1 ] menuitemslider "Maximum # of bots in survival mode: " 10 50 "$survMaxBots" 2 [] [ survMaxBots = $arg1; nonSurvDefaults = 1 ]
menuitemslider "Spam survival mode messages: " 0 1 "$spamSurvMsgs" 1 [ "no" "yes" ] [ spamSurvMsgs = $arg1 ] menuitemslider "Spam survival mode messages: " 0 1 "$spamSurvMsgs" 1 [ "no" "yes" ] [ spamSurvMsgs = $arg1 ]
menuitem [] -1 menuitem [] -1
menuitem " Back" [ closemenu "Survival Mode - Customize" ] menuitem " Back" [ closemenu "Survival Mode - Customize" ]
config/menus_settings.cfg
+12 -12
View File
@@ -599,18 +599,18 @@ menuitemcheckbox "Awesome (2): " "(soundmuted 98)" [ mutesound 98 (!
newmenu "Kill Messages" newmenu "Kill Messages"
menuitemvar [concat (c 9)Frag messages: ] [] [] menuitemvar [concat (c 9)Frag messages: ] [] []
menuitemtextinput [Pistol: ] [fragmessage 1] [ fragmessage 1 $arg1 ] [] 256 menuitemtextinput [Pistol: ] [fragmessage 1] [ fragmessage 1 $arg1 ] [] 15
menuitemtextinput [Carbine: ] [fragmessage 2] [ fragmessage 2 $arg1 ] [] 256 menuitemtextinput [Carbine: ] [fragmessage 2] [ fragmessage 2 $arg1 ] [] 15
menuitemtextinput [Shotgun: ] [fragmessage 3] [ fragmessage 3 $arg1 ] [] 256 menuitemtextinput [Shotgun: ] [fragmessage 3] [ fragmessage 3 $arg1 ] [] 15
menuitemtextinput [SMG: ] [fragmessage 4] [ fragmessage 4 $arg1 ] [] 256 menuitemtextinput [SMG: ] [fragmessage 4] [ fragmessage 4 $arg1 ] [] 15
menuitemtextinput [Sniper: ] [fragmessage 5] [ fragmessage 5 $arg1 ] [] 256 menuitemtextinput [Sniper: ] [fragmessage 5] [ fragmessage 5 $arg1 ] [] 15
menuitemtextinput [AR: ] [fragmessage 6] [ fragmessage 6 $arg1 ] [] 256 menuitemtextinput [AR: ] [fragmessage 6] [ fragmessage 6 $arg1 ] [] 15
menuitemtextinput [CPistol: ] [fragmessage 7] [ fragmessage 7 $arg1 ] [] 256 menuitemtextinput [CPistol: ] [fragmessage 7] [ fragmessage 7 $arg1 ] [] 15
menuitemtextinput [Akimbo: ] [fragmessage 9] [ fragmessage 9 $arg1 ] [] 256 menuitemtextinput [Akimbo: ] [fragmessage 9] [ fragmessage 9 $arg1 ] [] 15
menuitem [] -1 menuitem [] -1
menuitemvar [concat (c 9)Gib messages: ] [] [] menuitemvar [concat (c 9)Gib messages: ] [] []
menuitemtextinput [Knife: ] [gibmessage 0] [ gibmessage 0 $arg1 ] [] 256 menuitemtextinput [Knife: ] [gibmessage 0] [ gibmessage 0 $arg1 ] [] 15
menuitemtextinput [Shotgun: ] [gibmessage 3] [ gibmessage 3 $arg1 ] [] 256 menuitemtextinput [Shotgun: ] [gibmessage 3] [ gibmessage 3 $arg1 ] [] 15
menuitemtextinput [Sniper: ] [gibmessage 5] [ gibmessage 5 $arg1 ] [] 256 menuitemtextinput [Sniper: ] [gibmessage 5] [ gibmessage 5 $arg1 ] [] 15
menuitemtextinput [Grenades: ] [gibmessage 8] [ gibmessage 8 $arg1 ] [] 256 menuitemtextinput [Grenades: ] [gibmessage 8] [ gibmessage 8 $arg1 ] [] 15
config/survival.cfg
+8 -1
View File
@@ -105,7 +105,14 @@ checkzone = [
if (&& (! $startedSurvival) (>= (- (millis) $startPreSurvMillis) $timeUntilTele)) [ teleportPlayer ] if (&& (! $startedSurvival) (>= (- (millis) $startPreSurvMillis) $timeUntilTele)) [ teleportPlayer ]
if (&& (>= (- (millis) $lastCheckPoint) $timeBetChkPts) (&& $startedSurvival $gotCheckPoint)) [ increaseDifficulty ] if (&& (>= (- (millis) $lastCheckPoint) $timeBetChkPts) (&& $startedSurvival $gotCheckPoint)) [ increaseDifficulty ]
if (&& (! $startedOBCount) (&& (! (isInZone)) $startedSurvival)) [ startOBCount ] if (&& (! $startedOBCount) (&& (! (isInZone)) $startedSurvival)) [ startOBCount ]
if (&& $startedSurvival (&& (! (alive)) (>= (- (millis) $startSurvMillis) 500))) [ finalSurvMillis = (- (millis) $startSurvMillis); endSurvival (concatword (at (concat (concatword (c 0) "[EASY]") (concatword (c 2) "[INTERMEDIATE]") (concatword (c 9) "[HARD]") (concatword (c 7) "[IMPOSSIBLE]")) $survDifficulty) (c 3) " You survived for " (c 5) (divf $finalSurvMillis 1000) (c 3) " seconds, and killed " (c 5) $survKills (c 3) " enemies.") ] if (&& $startedSurvival (&& (! (alive)) (>= (- (millis) $startSurvMillis) 500))) [
finalSurvMillis = (- (millis) $startSurvMillis);
if $nonSurvDefaults [
endSurvival (concatword "[CUSTOM] " (c 3) "You survived for " (c 5) (divf $finalSurvMillis 1000) (c 3) " seconds, and killed " (c 5) $survKills (c 3) " enemies.")
] [
endSurvival (concatword (at (concat (concatword (c 0) "[EASY]") (concatword (c 2) "[INTERMEDIATE]") (concatword (c 9) "[HARD]") (concatword (c 7) "[IMPOSSIBLE]")) $survDifficulty) (c 3) " You survived for " (c 5) (divf $finalSurvMillis 1000) (c 3) " seconds, and killed " (c 5) $survKills (c 3) " enemies.")
]
]
if (&& (! (curteam)) (! $startedSurvival)) [ team RVSF ]; sleep 0 [ checkzone ] if (&& (! (curteam)) (! $startedSurvival)) [ team RVSF ]; sleep 0 [ checkzone ]
] ]
] ]
source/src/world.h
+1 -1
View File
@@ -127,7 +127,7 @@ struct mapstats
#define OUTBORDRAD(x,y,rad) (int(x-rad)<MINBORD || int(y-rad)<MINBORD || int(x+rad)>=ssize-MINBORD || (y+rad)>=ssize-MINBORD) #define OUTBORDRAD(x,y,rad) (int(x-rad)<MINBORD || int(y-rad)<MINBORD || int(x+rad)>=ssize-MINBORD || (y+rad)>=ssize-MINBORD)
#define MAXMHEIGHT 30 #define MAXMHEIGHT 30
#define MAXMAREA 10000 #define MAXMAREA 10000
#define MAXHHITS 5000 #define MAXHHITS 6000
#define MINFF 2500 #define MINFF 2500
struct block { int x, y, xs, ys; }; struct block { int x, y, xs, ys; };